fix version mergin

stillonearth · Feb 27, 2024 · 199b973 · 199b973
1 parent 85c32e0
commit 199b973
Show file tree

Hide file tree

Showing 13 changed files with 69 additions and 11,356 deletions.
diff --git a/assets/levels/Typical_2D_platformer_example.ldtk b/assets/levels/Typical_2D_platformer_example.ldtk
diff --git a/assets/levels/atlas/MV Icons Complete Sheet Free - ALL.png b/assets/levels/atlas/MV Icons Complete Sheet Free - ALL.png
diff --git a/assets/levels/atlas/NuclearBlaze_by_deepnight.png b/assets/levels/atlas/NuclearBlaze_by_deepnight.png
diff --git a/assets/levels/atlas/SunnyLand_by_Ansimuz-extended.png b/assets/levels/atlas/SunnyLand_by_Ansimuz-extended.png
diff --git a/assets/levels/example.ldtk b/assets/levels/example.ldtk
@@ -27,7 +27,7 @@
  "levelIid": "d53f9950-c640-11ed-8430-4942c04951ff",
  "layerIid": "d53f9951-c640-11ed-8430-3f3f71a3daf1",
  "entityIid": "9fcdc4b0-8990-11ee-9697-350728b4e14a"
- }, "worldX": 534, "worldY": 244, "widPx": 8, "heiPx": 8, "fields" : {} }]
+ }, "worldX": 615, "worldY": 263, "widPx": 8, "heiPx": 8, "fields" : {} }]
  },
  {
  "identifier": "Pizza",
@@ -721,187 +721,6 @@
  "pivotY": 0.5,
  "fieldDefs": []
  },
- {
- "identifier": "Door",
- "uid": 62,
- "tags": ["environment"],
- "exportToToc": false,
- "allowOutOfBounds": false,
- "doc": null,
- "width": 16,
- "height": 16,
- "resizableX": true,
- "resizableY": true,
- "minWidth": null,
- "maxWidth": null,
- "minHeight": null,
- "maxHeight": null,
- "keepAspectRatio": false,
- "tileOpacity": 1,
- "fillOpacity": 0.27,
- "lineOpacity": 0,
- "hollow": false,
- "color": "#B86F50",
- "renderMode": "Tile",
- "showName": true,
- "tilesetId": 104,
- "tileRenderMode": "NineSlice",
- "tileRect": { "tilesetUid": 104, "x": 384, "y": 64, "w": 16, "h": 16 },
- "uiTileRect": null,
- "nineSliceBorders": [4,4,4,4],
- "maxCount": 0,
- "limitScope": "PerLevel",
- "limitBehavior": "MoveLastOne",
- "pivotX": 0,
- "pivotY": 0,
- "fieldDefs": [
- {
- "identifier": "lockedWith",
- "doc": null,
- "__type": "LocalEnum.Item",
- "uid": 69,
- "type": "F_Enum(66)",
- "isArray": false,
- "canBeNull": true,
- "arrayMinLength": null,
- "arrayMaxLength": null,
- "editorDisplayMode": "ValueOnly",
- "editorDisplayScale": 1,
- "editorDisplayPos": "Center",
- "editorLinkStyle": "CurvedArrow",
- "editorDisplayColor": null,
- "editorAlwaysShow": false,
- "editorShowInWorld": true,
- "editorCutLongValues": true,
- "editorTextSuffix": null,
- "editorTextPrefix": null,
- "useForSmartColor": false,
- "exportToToc": false,
- "searchable": false,
- "min": null,
- "max": null,
- "regex": null,
- "acceptFileTypes": null,
- "defaultOverride": null,
- "textLanguageMode": null,
- "symmetricalRef": false,
- "autoChainRef": false,
- "allowOutOfLevelRef": true,
- "allowedRefs": "OnlySame",
- "allowedRefsEntityUid": null,
- "allowedRefTags": [],
- "tilesetUid": null
- }
- ]
- },
- {
- "identifier": "Button",
- "uid": 105,
- "tags": ["environment"],
- "exportToToc": false,
- "allowOutOfBounds": false,
- "doc": null,
- "width": 10,
- "height": 10,
- "resizableX": false,
- "resizableY": false,
- "minWidth": null,
- "maxWidth": null,
- "minHeight": null,
- "maxHeight": null,
- "keepAspectRatio": false,
- "tileOpacity": 1,
- "fillOpacity": 0.08,
- "lineOpacity": 0,
- "hollow": false,
- "color": "#FF0000",
- "renderMode": "Tile",
- "showName": true,
- "tilesetId": 104,
- "tileRenderMode": "NineSlice",
- "tileRect": { "tilesetUid": 104, "x": 272, "y": 32, "w": 16, "h": 16 },
- "uiTileRect": null,
- "nineSliceBorders": [4,4,4,4],
- "maxCount": 0,
- "limitScope": "PerLevel",
- "limitBehavior": "MoveLastOne",
- "pivotX": 0.5,
- "pivotY": 0.5,
- "fieldDefs": [
- {
- "identifier": "targets",
- "doc": null,
- "__type": "Array<EntityRef>",
- "uid": 106,
- "type": "F_EntityRef",
- "isArray": true,
- "canBeNull": false,
- "arrayMinLength": null,
- "arrayMaxLength": null,
- "editorDisplayMode": "RefLinkBetweenCenters",
- "editorDisplayScale": 1,
- "editorDisplayPos": "Above",
- "editorLinkStyle": "CurvedArrow",
- "editorDisplayColor": null,
- "editorAlwaysShow": false,
- "editorShowInWorld": true,
- "editorCutLongValues": true,
- "editorTextSuffix": null,
- "editorTextPrefix": null,
- "useForSmartColor": false,
- "exportToToc": false,
- "searchable": false,
- "min": null,
- "max": null,
- "regex": null,
- "acceptFileTypes": null,
- "defaultOverride": null,
- "textLanguageMode": null,
- "symmetricalRef": false,
- "autoChainRef": true,
- "allowOutOfLevelRef": false,
- "allowedRefs": "Any",
- "allowedRefsEntityUid": null,
- "allowedRefTags": [],
- "tilesetUid": null
- }
- ]
- },
- {
- "identifier": "SecretWall",
- "uid": 148,
- "tags": ["environment"],
- "exportToToc": false,
- "allowOutOfBounds": false,
- "doc": null,
- "width": 16,
- "height": 16,
- "resizableX": false,
- "resizableY": false,
- "minWidth": null,
- "maxWidth": null,
- "minHeight": null,
- "maxHeight": null,
- "keepAspectRatio": false,
- "tileOpacity": 0.73,
- "fillOpacity": 0.33,
- "lineOpacity": 1,
- "hollow": false,
- "color": "#B55088",
- "renderMode": "Tile",
- "showName": true,
- "tilesetId": 104,
- "tileRenderMode": "NineSlice",
- "tileRect": { "tilesetUid": 104, "x": 320, "y": 0, "w": 16, "h": 16 },
- "uiTileRect": null,
- "nineSliceBorders": [4,4,4,4],
- "maxCount": 0,
- "limitScope": "PerLevel",
- "limitBehavior": "MoveLastOne",
- "pivotX": 0,
- "pivotY": 0,
- "fieldDefs": []
- },
  {
  "identifier": "Mierda",
  "uid": 192,
@@ -1215,16 +1034,7 @@
  "padding": 0,
  "tags": [],
  "tagsSourceEnumUid": 66,
- "enumTags": [
- { "enumValueId": "Wood", "tileIds": [] },
- { "enumValueId": "Metal", "tileIds": [] },
- { "enumValueId": "Food", "tileIds": [] },
- { "enumValueId": "Health", "tileIds": [] },
- { "enumValueId": "Rifle", "tileIds": [] },
- { "enumValueId": "KeyA", "tileIds": [] },
- { "enumValueId": "KeyB", "tileIds": [] },
- { "enumValueId": "Gold", "tileIds": [] }
- ],
+ "enumTags": [],
  "customData": [ { "tileId": 14, "data": "1" }, { "tileId": 87, "data": "1" } ],
  "savedSelections": [
  { "ids": [83,84,85], "mode": "Random" },
@@ -1348,16 +1158,7 @@
  "savedSelections": [],
  "cachedPixelData": { "opaqueTiles": "0", "averageColors": "b755" }
  }
- ], "enums": [{ "identifier": "Item", "uid": 66, "values": [
- { "id": "Wood", "tileRect": { "tilesetUid": 104, "x": 192, "y": 944, "w": 16, "h": 16 }, "color": 11171669 },
- { "id": "Metal", "tileRect": { "tilesetUid": 104, "x": 224, "y": 960, "w": 16, "h": 16 }, "color": 7833736 },
- { "id": "Food", "tileRect": { "tilesetUid": 104, "x": 16, "y": 320, "w": 16, "h": 16 }, "color": 12953206 },
- { "id": "Health", "tileRect": { "tilesetUid": 104, "x": 80, "y": 272, "w": 16, "h": 16 }, "color": 10964028 },
- { "id": "Rifle", "tileRect": { "tilesetUid": 104, "x": 96, "y": 560, "w": 16, "h": 16 }, "color": 3359829 },
- { "id": "KeyA", "tileRect": { "tilesetUid": 104, "x": 272, "y": 112, "w": 16, "h": 16 }, "color": 10066329 },
- { "id": "KeyB", "tileRect": { "tilesetUid": 104, "x": 288, "y": 112, "w": 16, "h": 16 }, "color": 8939059 },
- { "id": "Gold", "tileRect": { "tilesetUid": 104, "x": 0, "y": 416, "w": 16, "h": 16 }, "color": 15389866 }
- ], "iconTilesetUid": 104, "externalRelPath": null, "externalFileChecksum": null, "tags": [] }], "externalEnums": [], "levelFields": [
+ ], "enums": [{ "identifier": "Item", "uid": 66, "values": [], "iconTilesetUid": 104, "externalRelPath": null, "externalFileChecksum": null, "tags": [] }], "externalEnums": [], "levelFields": [
  {
  "identifier": "LevelID",
  "doc": null,
@@ -1515,7 +1316,7 @@
  },
  {
  "__identifier": "Player",
- "__grid": [17,15],
+ "__grid": [22,16],
  "__pivot": [0.5,0.5],
  "__tags": ["actor"],
  "__tile": { "tilesetUid": 104, "x": 0, "y": 240, "w": 16, "h": 16 },
@@ -1524,10 +1325,10 @@
  "width": 8,
  "height": 8,
  "defUid": 59,
- "px": [278,244],
+ "px": [359,263],
  "fieldInstances": [],
- "__worldX": 534,
- "__worldY": 244
+ "__worldX": 615,
+ "__worldY": 263
  }
  ]
  },