Merge commit '623abea57eb6107675130e16d1e65673b07bf904'

deepnight · Sep 22, 2023 · b215003 · b215003
2 parents fcfcfa5 + 623abea
commit b215003
Show file tree

Hide file tree

Showing 16 changed files with 1,244 additions and 92 deletions.
diff --git a/samples/_assets/sample.ldtk b/samples/_assets/sample.ldtk
@@ -5,12 +5,12 @@
 		"doc": "https://ldtk.io/json",
 		"schema": "https://ldtk.io/files/JSON_SCHEMA.json",
 		"appAuthor": "Sebastien 'deepnight' Benard",
-		"appVersion": "1.3.3",
+		"appVersion": "1.4.0",
 		"url": "https://ldtk.io"
 	},
 	"iid": "a8ea85a0-7820-11ed-b6fd-4507f1bd5fbf",
-	"jsonVersion": "1.3.3",
-	"appBuildId": 467696,
+	"jsonVersion": "1.4.0",
+	"appBuildId": 470941,
 	"nextUid": 59,
 	"identifierStyle": "Capitalize",
 	"toc": [{
@@ -30,6 +30,8 @@
 	"defaultPivotX": 0.5,
 	"defaultPivotY": 1,
 	"defaultGridSize": 8,
+	"defaultEntityWidth": 16,
+	"defaultEntityHeight": 16,
 	"bgColor": "#18131B",
 	"defaultLevelBgColor": "#121331",
 	"minifyJson": false,
@@ -71,6 +73,7 @@
 			"requiredTags": [],
 			"excludedTags": [],
 			"intGridValues": [],
+			"intGridValuesGroups": [],
 			"autoRuleGroups": [],
 			"autoSourceLayerDefUid": null,
 			"tilesetDefUid": null,
@@ -101,6 +104,7 @@
 			"requiredTags": [],
 			"excludedTags": [],
 			"intGridValues": [],
+			"intGridValuesGroups": [],
 			"autoRuleGroups": [],
 			"autoSourceLayerDefUid": null,
 			"tilesetDefUid": 1,
@@ -131,12 +135,13 @@
 			"requiredTags": [],
 			"excludedTags": [],
 			"intGridValues": [
-				{ "value": 1, "identifier": "walls", "color": "#2A2B61", "tile": null },
-				{ "value": 2, "identifier": "ladders", "color": "#A36433", "tile": null },
-				{ "value": 3, "identifier": "lava", "color": "#FF0000", "tile": null }
+				{ "value": 1, "identifier": "walls", "color": "#2A2B61", "tile": null, "groupUid": 0 },
+				{ "value": 2, "identifier": "ladders", "color": "#A36433", "tile": null, "groupUid": 0 },
+				{ "value": 3, "identifier": "lava", "color": "#FF0000", "tile": null, "groupUid": 0 }
 			],
+			"intGridValuesGroups": [],
 			"autoRuleGroups": [
-				{ "uid": 42, "name": "Lava", "active": true, "isOptional": false, "rules": [
+				{ "uid": 42, "name": "Lava", "color": null, "icon": null, "active": true, "isOptional": false, "rules": [
 					{
 						"uid": 44,
 						"active": true,
@@ -200,7 +205,7 @@
 						"perlinOctaves": 2
 					}
 				], "usesWizard": false },
-				{ "uid": 16, "name": "Ladders", "active": true, "isOptional": false, "rules": [
+				{ "uid": 16, "name": "Ladders", "color": null, "icon": null, "active": true, "isOptional": false, "rules": [
 					{
 						"uid": 19,
 						"active": true,
@@ -264,7 +269,7 @@
 						"perlinOctaves": 2
 					}
 				], "usesWizard": false },
-				{ "uid": 10, "name": "Props", "active": true, "isOptional": false, "rules": [
+				{ "uid": 10, "name": "Props", "color": null, "icon": null, "active": true, "isOptional": false, "rules": [
 					{
 						"uid": 14,
 						"active": true,
@@ -390,7 +395,7 @@
 						"perlinOctaves": 2
 					}
 				], "usesWizard": false },
-				{ "uid": 3, "name": "Walls", "active": true, "isOptional": false, "rules": [
+				{ "uid": 3, "name": "Walls", "color": null, "icon": null, "active": true, "isOptional": false, "rules": [
 					{
 						"uid": 15,
 						"active": true,
@@ -638,8 +643,9 @@
 			"parallaxScaling": true,
 			"requiredTags": [],
 			"excludedTags": [],
-			"intGridValues": [{ "value": 1, "identifier": "bg_walls", "color": "#6A6A6A", "tile": null }],
-			"autoRuleGroups": [{ "uid": 49, "name": "walls", "active": true, "isOptional": false, "rules": [
+			"intGridValues": [{ "value": 1, "identifier": "bg_walls", "color": "#6A6A6A", "tile": null, "groupUid": 0 }],
+			"intGridValuesGroups": [],
+			"autoRuleGroups": [{ "uid": 49, "name": "walls", "color": null, "icon": null, "active": true, "isOptional": false, "rules": [
 				{
 					"uid": 56,
 					"active": true,
@@ -858,6 +864,7 @@
 			"tilesetId": null,
 			"tileRenderMode": "Stretch",
 			"tileRect": null,
+			"uiTileRect": null,
 			"nineSliceBorders": [],
 			"maxCount": 1,
 			"limitScope": "PerLevel",
@@ -891,6 +898,7 @@
 			"tilesetId": null,
 			"tileRenderMode": "Stretch",
 			"tileRect": null,
+			"uiTileRect": null,
 			"nineSliceBorders": [],
 			"maxCount": 0,
 			"limitScope": "PerLevel",
@@ -912,6 +920,7 @@
 					"editorDisplayScale": 1,
 					"editorDisplayPos": "Above",
 					"editorLinkStyle": "StraightArrow",
+					"editorDisplayColor": null,
 					"editorAlwaysShow": false,
 					"editorShowInWorld": true,
 					"editorCutLongValues": true,
@@ -1019,9 +1028,9 @@
 			}
 		}
 	], "enums": [{ "identifier": "Items", "uid": 30, "values": [
-		{ "id": "Pickaxe", "tileRect": { "tilesetUid": 31, "x": 0, "y": 0, "w": 16, "h": 16 }, "tileId": -1, "color": 6710903, "__tileSrcRect": [0,0,16,16] },
-		{ "id": "Potion", "tileRect": { "tilesetUid": 31, "x": 96, "y": 0, "w": 16, "h": 16 }, "tileId": -1, "color": 6710903, "__tileSrcRect": [96,0,16,16] },
-		{ "id": "Food", "tileRect": { "tilesetUid": 31, "x": 16, "y": 96, "w": 16, "h": 16 }, "tileId": -1, "color": 10048836, "__tileSrcRect": [16,96,16,16] }
+		{ "id": "Pickaxe", "tileRect": { "tilesetUid": 31, "x": 0, "y": 0, "w": 16, "h": 16 }, "color": 6710903 },
+		{ "id": "Potion", "tileRect": { "tilesetUid": 31, "x": 96, "y": 0, "w": 16, "h": 16 }, "color": 6710903 },
+		{ "id": "Food", "tileRect": { "tilesetUid": 31, "x": 16, "y": 96, "w": 16, "h": 16 }, "color": 10048836 }
 	], "iconTilesetUid": 31, "externalRelPath": null, "externalFileChecksum": null, "tags": [] }], "externalEnums": [], "levelFields": [] },
 	"levels": [
 		{

diff --git a/samples/_assets/sample/0000-West.ldtkl b/samples/_assets/sample/0000-West.ldtkl
@@ -5,7 +5,7 @@
 		"doc": "https://ldtk.io/json",
 		"schema": "https://ldtk.io/files/JSON_SCHEMA.json",
 		"appAuthor": "Sebastien 'deepnight' Benard",
-		"appVersion": "1.3.3",
+		"appVersion": "1.4.0",
 		"url": "https://ldtk.io"
 	},
 	"identifier": "West",
@@ -59,6 +59,8 @@
 					"__tags": [],
 					"__tile": null,
 					"__smartColor": "#00BFFF",
+					"__worldX": 84,
+					"__worldY": 232,
 					"iid": "60018d46-66b0-11ec-a36b-a9ab7da03bee",
 					"width": 8,
 					"height": 10,
@@ -73,6 +75,8 @@
 					"__tags": [],
 					"__tile": { "tilesetUid": 31, "x": 96, "y": 0, "w": 16, "h": 16 },
 					"__smartColor": "#FFDD00",
+					"__worldX": 164,
+					"__worldY": 280,
 					"iid": "60018d47-66b0-11ec-a36b-1f92c653d135",
 					"width": 10,
 					"height": 10,
@@ -90,6 +94,8 @@
 					"__tags": [],
 					"__tile": { "tilesetUid": 31, "x": 16, "y": 96, "w": 16, "h": 16 },
 					"__smartColor": "#FFDD00",
+					"__worldX": 244,
+					"__worldY": 144,
 					"iid": "60018d48-66b0-11ec-a36b-7f7609ac6c0e",
 					"width": 10,
 					"height": 10,
@@ -107,6 +113,8 @@
 					"__tags": [],
 					"__tile": { "tilesetUid": 31, "x": 0, "y": 0, "w": 16, "h": 16 },
 					"__smartColor": "#FFDD00",
+					"__worldX": 100,
+					"__worldY": 280,
 					"iid": "60018d49-66b0-11ec-a36b-07b80604cf98",
 					"width": 10,
 					"height": 10,

diff --git a/samples/_assets/sample/0001-East.ldtkl b/samples/_assets/sample/0001-East.ldtkl
@@ -5,7 +5,7 @@
 		"doc": "https://ldtk.io/json",
 		"schema": "https://ldtk.io/files/JSON_SCHEMA.json",
 		"appAuthor": "Sebastien 'deepnight' Benard",
-		"appVersion": "1.3.3",
+		"appVersion": "1.4.0",
 		"url": "https://ldtk.io"
 	},
 	"identifier": "East",
@@ -59,6 +59,8 @@
 					"__tags": [],
 					"__tile": { "tilesetUid": 31, "x": 96, "y": 0, "w": 16, "h": 16 },
 					"__smartColor": "#FFDD00",
+					"__worldX": 348,
+					"__worldY": 248,
 					"iid": "60038916-66b0-11ec-a36b-953273b2a0be",
 					"width": 10,
 					"height": 10,

diff --git a/samples/_assets/sample/0002-Pit.ldtkl b/samples/_assets/sample/0002-Pit.ldtkl
@@ -5,7 +5,7 @@
 		"doc": "https://ldtk.io/json",
 		"schema": "https://ldtk.io/files/JSON_SCHEMA.json",
 		"appAuthor": "Sebastien 'deepnight' Benard",
-		"appVersion": "1.3.3",
+		"appVersion": "1.4.0",
 		"url": "https://ldtk.io"
 	},
 	"identifier": "Pit",

diff --git a/samples/_assets/sample/0003-Treasure_room.ldtkl b/samples/_assets/sample/0003-Treasure_room.ldtkl
@@ -5,7 +5,7 @@
 		"doc": "https://ldtk.io/json",
 		"schema": "https://ldtk.io/files/JSON_SCHEMA.json",
 		"appAuthor": "Sebastien 'deepnight' Benard",
-		"appVersion": "1.3.3",
+		"appVersion": "1.4.0",
 		"url": "https://ldtk.io"
 	},
 	"identifier": "Treasure_room",
@@ -59,6 +59,8 @@
 					"__tags": [],
 					"__tile": { "tilesetUid": 31, "x": 0, "y": 0, "w": 16, "h": 16 },
 					"__smartColor": "#FFDD00",
+					"__worldX": 628,
+					"__worldY": 304,
 					"iid": "6004c196-66b0-11ec-a36b-230838ef99d1",
 					"width": 10,
 					"height": 10,