Removed pre-CSV export option (#358)

Added ExportPreCsvIntGridFormat flag
deepnight · Jan 7, 2022 · 3ac2513 · 3ac2513
1 parent 3b26472
commit 3ac2513
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 21 deletions.
diff --git a/src/electron.renderer/data/Project.hx b/src/electron.renderer/data/Project.hx
@@ -145,7 +145,6 @@ class Project {
 	public static function createEmpty(filePath:String) {
 		var p = new Project();
 		p.filePath.parseFilePath(filePath);
-		p.setFlag(DiscardPreCsvIntGrid, true);
 		p.createLevel();
 
 		return p;
@@ -246,7 +245,7 @@ class Project {
 		if( json.flags!=null )
 			for(f in json.flags ) {
 				var ev = try JsonTools.readEnum(ldtk.Json.ProjectFlag, f, true)
-					catch(e:Dynamic) null;
+					catch(_) null;
 
 				if( ev!=null )
 					p.flags.set(ev, true);

diff --git a/src/electron.renderer/data/inst/LayerInstance.hx b/src/electron.renderer/data/inst/LayerInstance.hx
@@ -139,17 +139,6 @@ class LayerInstance {
 				arr;
 			},
 
-			intGrid: { // old IntGrid format
-				var arr = [];
-				if( !_project.hasFlag(DiscardPreCsvIntGrid) )
-					for(e in intGrid.keyValueIterator())
-						arr.push({
-							coordId: e.key,
-							v: e.value-1,
-						});
-				arr;
-			},
-
 			intGridCsv: {
 				var csv : Array<Int> = [];
 				if( def.type==IntGrid )
@@ -208,8 +197,18 @@ class LayerInstance {
 			entityInstances: entityInstances.map( function(ei) return ei.toJson(this) ),
 		}
 
-		if( _project.hasFlag(DiscardPreCsvIntGrid) )
+		if( _project.hasFlag(ExportPreCsvIntGridFormat) ) {
+			json.intGrid = {
+				var arr = [];
+				for(e in intGrid.keyValueIterator())
+					arr.push({
+						coordId: e.key,
+						v: e.value-1,
+					});
+				arr;
+			}
 			Reflect.deleteField(json, "intGrid");
+		}
 
 		return json;
 	}

diff --git a/src/electron.renderer/ui/modal/DebugMenu.hx b/src/electron.renderer/ui/modal/DebugMenu.hx
@@ -84,9 +84,6 @@ class DebugMenu extends ui.modal.ContextMenu {
 									for(l in p.levels)
 										l.invalidateJsonCache();
 
-									// IntGrid CSV change
-									p.setFlag(DiscardPreCsvIntGrid, true);
-
 									// Tilesets
 									log.general(" -> Updating tileset data...");
 									for(td in p.defs.tilesets) {

diff --git a/src/electron.renderer/ui/modal/panel/EditProject.hx b/src/electron.renderer/ui/modal/panel/EditProject.hx
@@ -4,7 +4,7 @@ class EditProject extends ui.modal.Panel {
 
 	var showAdvanced = false;
 	var allAdvancedOptions = [
-		ldtk.Json.ProjectFlag.DiscardPreCsvIntGrid,
+		ldtk.Json.ProjectFlag.ExportPreCsvIntGridFormat,
 	];
 
 	public function new() {
@@ -288,9 +288,9 @@ class EditProject extends ui.modal.Panel {
 			var jLabel = new J('<label for="$e"/>');
 			jLabel.appendTo(jLi);
 			switch e {
-				case DiscardPreCsvIntGrid:
-					jLabel.text("Discard pre-CSV IntGrid layer data in level data");
-					jInput.attr("title", L.t._("If enabled, the exported JSON will not contain the deprecated array \"intGrid\", making the file smaller. Only use this if your game API supports LDtk 0.8.x or more."));
+				case ExportPreCsvIntGridFormat:
+					jLabel.text("Export legacy pre-CSV IntGrid layers data");
+					jInput.attr("title", L.t._("If enabled, the exported JSON file will also contain the now deprecated array \"intGrid\". The file will be significantly larger.\nOnly use this if your game API only supports LDtk 0.8.x or less."));
 				case _:
 			}