Skip to content

Commit

Permalink
Merge commit '7b9d94a1961d53ef13314eae3a547c665f5f584b'
Browse files Browse the repository at this point in the history
  • Loading branch information
deepnight committed Jan 11, 2024
2 parents 8e70641 + 7b9d94a commit 56bb917
Show file tree
Hide file tree
Showing 14 changed files with 53 additions and 17 deletions.
27 changes: 24 additions & 3 deletions samples/_assets/sample.ldtk
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@
"doc": "https://ldtk.io/json",
"schema": "https://ldtk.io/files/JSON_SCHEMA.json",
"appAuthor": "Sebastien 'deepnight' Benard",
"appVersion": "1.5.1",
"appVersion": "1.5.2",
"url": "https://ldtk.io"
},
"iid": "a8ea85a0-7820-11ed-b6fd-4507f1bd5fbf",
"jsonVersion": "1.5.1",
"appBuildId": 473601,
"jsonVersion": "1.5.2",
"appBuildId": 473607,
"nextUid": 59,
"identifierStyle": "Capitalize",
"toc": [{
Expand Down Expand Up @@ -192,6 +192,7 @@
"pivotX": 0,
"pivotY": 0,
"outOfBoundsValue": null,
"invalidated": false,
"perlinActive": false,
"perlinSeed": 2357148,
"perlinScale": 0.2,
Expand Down Expand Up @@ -223,6 +224,7 @@
"pivotX": 0,
"pivotY": 0,
"outOfBoundsValue": null,
"invalidated": false,
"perlinActive": false,
"perlinSeed": 6024002,
"perlinScale": 0.2,
Expand Down Expand Up @@ -267,6 +269,7 @@
"pivotX": 0,
"pivotY": 0,
"outOfBoundsValue": null,
"invalidated": false,
"perlinActive": false,
"perlinSeed": 2975287,
"perlinScale": 0.2,
Expand Down Expand Up @@ -298,6 +301,7 @@
"pivotX": 0,
"pivotY": 0,
"outOfBoundsValue": null,
"invalidated": false,
"perlinActive": false,
"perlinSeed": 847472,
"perlinScale": 0.2,
Expand Down Expand Up @@ -342,6 +346,7 @@
"pivotX": 0,
"pivotY": 0,
"outOfBoundsValue": null,
"invalidated": false,
"perlinActive": false,
"perlinSeed": 3920188,
"perlinScale": 0.2,
Expand Down Expand Up @@ -373,6 +378,7 @@
"pivotX": 0,
"pivotY": 0,
"outOfBoundsValue": null,
"invalidated": false,
"perlinActive": false,
"perlinSeed": 4007511,
"perlinScale": 0.2,
Expand Down Expand Up @@ -413,6 +419,7 @@
"pivotX": 0,
"pivotY": 0,
"outOfBoundsValue": null,
"invalidated": false,
"perlinActive": true,
"perlinSeed": 2530931,
"perlinScale": 0.2,
Expand Down Expand Up @@ -444,6 +451,7 @@
"pivotX": 0,
"pivotY": 0,
"outOfBoundsValue": null,
"invalidated": false,
"perlinActive": false,
"perlinSeed": 4359617,
"perlinScale": 0.2,
Expand Down Expand Up @@ -488,6 +496,7 @@
"pivotX": 0,
"pivotY": 0,
"outOfBoundsValue": null,
"invalidated": false,
"perlinActive": false,
"perlinSeed": 8199321,
"perlinScale": 0.2,
Expand Down Expand Up @@ -519,6 +528,7 @@
"pivotX": 0,
"pivotY": 0,
"outOfBoundsValue": null,
"invalidated": false,
"perlinActive": false,
"perlinSeed": 9065732,
"perlinScale": 0.2,
Expand Down Expand Up @@ -550,6 +560,7 @@
"pivotX": 0,
"pivotY": 0,
"outOfBoundsValue": null,
"invalidated": false,
"perlinActive": false,
"perlinSeed": 4760070,
"perlinScale": 0.2,
Expand Down Expand Up @@ -581,6 +592,7 @@
"pivotX": 0,
"pivotY": 0,
"outOfBoundsValue": null,
"invalidated": false,
"perlinActive": false,
"perlinSeed": 4633502,
"perlinScale": 0.2,
Expand Down Expand Up @@ -612,6 +624,7 @@
"pivotX": 0,
"pivotY": 0,
"outOfBoundsValue": null,
"invalidated": false,
"perlinActive": false,
"perlinSeed": 6132148,
"perlinScale": 0.2,
Expand Down Expand Up @@ -643,6 +656,7 @@
"pivotX": 0,
"pivotY": 0,
"outOfBoundsValue": null,
"invalidated": false,
"perlinActive": true,
"perlinSeed": 44676336,
"perlinScale": 0.38,
Expand Down Expand Up @@ -674,6 +688,7 @@
"pivotX": 0,
"pivotY": 0,
"outOfBoundsValue": null,
"invalidated": false,
"perlinActive": false,
"perlinSeed": 259529,
"perlinScale": 0.2,
Expand Down Expand Up @@ -754,6 +769,7 @@
"pivotX": 0,
"pivotY": 0,
"outOfBoundsValue": null,
"invalidated": false,
"perlinActive": false,
"perlinSeed": 5253545,
"perlinScale": 0.2,
Expand Down Expand Up @@ -785,6 +801,7 @@
"pivotX": 0,
"pivotY": 0,
"outOfBoundsValue": null,
"invalidated": false,
"perlinActive": false,
"perlinSeed": 2597597,
"perlinScale": 0.2,
Expand Down Expand Up @@ -816,6 +833,7 @@
"pivotX": 0,
"pivotY": 0,
"outOfBoundsValue": null,
"invalidated": false,
"perlinActive": false,
"perlinSeed": 5096226,
"perlinScale": 0.2,
Expand Down Expand Up @@ -847,6 +865,7 @@
"pivotX": 0,
"pivotY": 0,
"outOfBoundsValue": null,
"invalidated": false,
"perlinActive": false,
"perlinSeed": 5534570,
"perlinScale": 0.2,
Expand Down Expand Up @@ -885,6 +904,7 @@
"pivotX": 0,
"pivotY": 0,
"outOfBoundsValue": null,
"invalidated": false,
"perlinActive": true,
"perlinSeed": 3539893,
"perlinScale": 0.2,
Expand Down Expand Up @@ -916,6 +936,7 @@
"pivotX": 0,
"pivotY": 0,
"outOfBoundsValue": null,
"invalidated": false,
"perlinActive": false,
"perlinSeed": 4280659,
"perlinScale": 0.2,
Expand Down
2 changes: 1 addition & 1 deletion samples/_assets/sample/0000-West.ldtkl
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"doc": "https://ldtk.io/json",
"schema": "https://ldtk.io/files/JSON_SCHEMA.json",
"appAuthor": "Sebastien 'deepnight' Benard",
"appVersion": "1.5.1",
"appVersion": "1.5.2",
"url": "https://ldtk.io"
},
"identifier": "West",
Expand Down
2 changes: 1 addition & 1 deletion samples/_assets/sample/0001-East.ldtkl
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"doc": "https://ldtk.io/json",
"schema": "https://ldtk.io/files/JSON_SCHEMA.json",
"appAuthor": "Sebastien 'deepnight' Benard",
"appVersion": "1.5.1",
"appVersion": "1.5.2",
"url": "https://ldtk.io"
},
"identifier": "East",
Expand Down
2 changes: 1 addition & 1 deletion samples/_assets/sample/0002-Pit.ldtkl
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"doc": "https://ldtk.io/json",
"schema": "https://ldtk.io/files/JSON_SCHEMA.json",
"appAuthor": "Sebastien 'deepnight' Benard",
"appVersion": "1.5.1",
"appVersion": "1.5.2",
"url": "https://ldtk.io"
},
"identifier": "Pit",
Expand Down
2 changes: 1 addition & 1 deletion samples/_assets/sample/0003-Treasure_room.ldtkl
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"doc": "https://ldtk.io/json",
"schema": "https://ldtk.io/files/JSON_SCHEMA.json",
"appAuthor": "Sebastien 'deepnight' Benard",
"appVersion": "1.5.1",
"appVersion": "1.5.2",
"url": "https://ldtk.io"
},
"identifier": "Treasure_room",
Expand Down
17 changes: 14 additions & 3 deletions samples/_assets/unitTest.ldtk
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@
"doc": "https://ldtk.io/json",
"schema": "https://ldtk.io/files/JSON_SCHEMA.json",
"appAuthor": "Sebastien 'deepnight' Benard",
"appVersion": "1.5.1",
"appVersion": "1.5.2",
"url": "https://ldtk.io"
},
"iid": "a6731d00-7820-11ed-b6fd-8d5e0e3d5314",
"jsonVersion": "1.5.1",
"appBuildId": 473601,
"jsonVersion": "1.5.2",
"appBuildId": 473607,
"nextUid": 124,
"identifierStyle": "Free",
"toc": [ {
Expand Down Expand Up @@ -136,6 +136,7 @@
"pivotX": 0.5,
"pivotY": 0.5,
"outOfBoundsValue": null,
"invalidated": false,
"perlinActive": false,
"perlinSeed": 9046842,
"perlinScale": 0.2,
Expand Down Expand Up @@ -167,6 +168,7 @@
"pivotX": 0.5,
"pivotY": 1,
"outOfBoundsValue": null,
"invalidated": false,
"perlinActive": false,
"perlinSeed": 1562123,
"perlinScale": 0.2,
Expand Down Expand Up @@ -220,6 +222,7 @@
"pivotX": 0,
"pivotY": 0,
"outOfBoundsValue": null,
"invalidated": false,
"perlinActive": false,
"perlinSeed": 9576609,
"perlinScale": 0.2,
Expand Down Expand Up @@ -251,6 +254,7 @@
"pivotX": 0,
"pivotY": 0,
"outOfBoundsValue": null,
"invalidated": false,
"perlinActive": false,
"perlinSeed": 2918122,
"perlinScale": 0.2,
Expand Down Expand Up @@ -295,6 +299,7 @@
"pivotX": 0,
"pivotY": 0,
"outOfBoundsValue": null,
"invalidated": false,
"perlinActive": false,
"perlinSeed": 2612059,
"perlinScale": 0.2,
Expand Down Expand Up @@ -326,6 +331,7 @@
"pivotX": 0,
"pivotY": 0,
"outOfBoundsValue": null,
"invalidated": false,
"perlinActive": false,
"perlinSeed": 4227586,
"perlinScale": 0.2,
Expand Down Expand Up @@ -357,6 +363,7 @@
"pivotX": 0,
"pivotY": 0,
"outOfBoundsValue": null,
"invalidated": false,
"perlinActive": false,
"perlinSeed": 123013,
"perlinScale": 0.2,
Expand Down Expand Up @@ -388,6 +395,7 @@
"pivotX": 0,
"pivotY": 0,
"outOfBoundsValue": null,
"invalidated": false,
"perlinActive": false,
"perlinSeed": 4111779,
"perlinScale": 0.2,
Expand Down Expand Up @@ -426,6 +434,7 @@
"pivotX": 0,
"pivotY": 0,
"outOfBoundsValue": null,
"invalidated": false,
"perlinActive": false,
"perlinSeed": 7005472,
"perlinScale": 0.2,
Expand Down Expand Up @@ -506,6 +515,7 @@
"pivotX": 0,
"pivotY": 0,
"outOfBoundsValue": null,
"invalidated": false,
"perlinActive": false,
"perlinSeed": 4295232,
"perlinScale": 0.2,
Expand Down Expand Up @@ -537,6 +547,7 @@
"pivotX": 0,
"pivotY": 0,
"outOfBoundsValue": null,
"invalidated": false,
"perlinActive": false,
"perlinSeed": 2059932,
"perlinScale": 0.2,
Expand Down
2 changes: 1 addition & 1 deletion samples/_assets/unitTest/Main_tests.ldtkl
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"doc": "https://ldtk.io/json",
"schema": "https://ldtk.io/files/JSON_SCHEMA.json",
"appAuthor": "Sebastien 'deepnight' Benard",
"appVersion": "1.5.1",
"appVersion": "1.5.2",
"url": "https://ldtk.io"
},
"identifier": "Main_tests",
Expand Down
2 changes: 1 addition & 1 deletion samples/_assets/unitTest/Offset_tests.ldtkl
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"doc": "https://ldtk.io/json",
"schema": "https://ldtk.io/files/JSON_SCHEMA.json",
"appAuthor": "Sebastien 'deepnight' Benard",
"appVersion": "1.5.1",
"appVersion": "1.5.2",
"url": "https://ldtk.io"
},
"identifier": "Offset_tests",
Expand Down
2 changes: 1 addition & 1 deletion samples/_assets/unitTest/Target_level_ref.ldtkl
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"doc": "https://ldtk.io/json",
"schema": "https://ldtk.io/files/JSON_SCHEMA.json",
"appAuthor": "Sebastien 'deepnight' Benard",
"appVersion": "1.5.1",
"appVersion": "1.5.2",
"url": "https://ldtk.io"
},
"identifier": "Target_level_ref",
Expand Down
2 changes: 1 addition & 1 deletion samples/_assets/unitTest/World1_Level_3.ldtkl
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"doc": "https://ldtk.io/json",
"schema": "https://ldtk.io/files/JSON_SCHEMA.json",
"appAuthor": "Sebastien 'deepnight' Benard",
"appVersion": "1.5.1",
"appVersion": "1.5.2",
"url": "https://ldtk.io"
},
"identifier": "World1_Level_3",
Expand Down
2 changes: 1 addition & 1 deletion samples/_assets/unitTest/World2_Level_0.ldtkl
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"doc": "https://ldtk.io/json",
"schema": "https://ldtk.io/files/JSON_SCHEMA.json",
"appAuthor": "Sebastien 'deepnight' Benard",
"appVersion": "1.5.1",
"appVersion": "1.5.2",
"url": "https://ldtk.io"
},
"identifier": "World2_Level_0",
Expand Down
2 changes: 1 addition & 1 deletion samples/_assets/unitTest/v1_4_0.ldtkl
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"doc": "https://ldtk.io/json",
"schema": "https://ldtk.io/files/JSON_SCHEMA.json",
"appAuthor": "Sebastien 'deepnight' Benard",
"appVersion": "1.5.1",
"appVersion": "1.5.2",
"url": "https://ldtk.io"
},
"identifier": "v1_4_0",
Expand Down
2 changes: 1 addition & 1 deletion samples/_assets/unitTest/v1_4_0_overlap.ldtkl
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"doc": "https://ldtk.io/json",
"schema": "https://ldtk.io/files/JSON_SCHEMA.json",
"appAuthor": "Sebastien 'deepnight' Benard",
"appVersion": "1.5.1",
"appVersion": "1.5.2",
"url": "https://ldtk.io"
},
"identifier": "v1_4_0_overlap",
Expand Down
4 changes: 4 additions & 0 deletions src/ldtk/Json.hx
Original file line number Diff line number Diff line change
Expand Up @@ -1050,6 +1050,10 @@ typedef AutoRuleDef = {
var perlinOctaves: Float;

var perlinSeed: Float;

/** If TRUE, then the rule should be re-evaluated by the editor at one point **/
@added("1.5.2")
var invalidated: Bool;
};


Expand Down

0 comments on commit 56bb917

Please sign in to comment.