diff --git a/gamedata/maps/TulipFields/base.png b/gamedata/maps/TulipFields/base.png index e8739ed..5381229 100644 Binary files a/gamedata/maps/TulipFields/base.png and b/gamedata/maps/TulipFields/base.png differ diff --git a/gamedata/maps/TulipFields/map.json b/gamedata/maps/TulipFields/map.json index 9971262..2141ee9 100644 --- a/gamedata/maps/TulipFields/map.json +++ b/gamedata/maps/TulipFields/map.json @@ -6,8 +6,8 @@ "offsetY": 0, "layers": [ { - "name": "Platforms", - "_eid": "16983036", + "name": "1Platforms", + "_eid": "26655533", "offsetX": 0, "offsetY": 0, "gridCellWidth": 16, @@ -588,7 +588,7 @@ [-1], [-1], [-1], - [10, 3], + [-1], [-1], [-1], [-1], @@ -1035,8 +1035,8 @@ [-1], [-1], [-1], - [7, 4], - [8, 4], + [-1], + [-1], [6, 1], [7, 1], [7, 1], @@ -1115,17 +1115,17 @@ [-1], [-1], [-1], - [0, 0], - [1, 0], - [1, 0], - [1, 0], - [1, 0], - [1, 0], - [2, 0], [-1], [-1], - [7, 5], - [8, 5], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], [6, 1], [7, 1], [7, 1], @@ -1204,17 +1204,17 @@ [-1], [-1], [-1], - [0, 1], - [1, 1], - [1, 1], - [1, 1], - [1, 1], - [1, 1], - [2, 1], - [7, 4], - [8, 4], - [7, 4], - [8, 4], + [0, 0], + [1, 0], + [1, 0], + [1, 0], + [1, 0], + [1, 0], + [2, 0], + [-1], + [-1], + [-1], + [-1], [6, 1], [7, 1], [7, 1], @@ -1239,7 +1239,7 @@ [-1], [-1], [-1], - [4, 5], + [4, 6], [7, 4], [8, 4], [7, 4], @@ -1254,7 +1254,7 @@ [6, 4], [4, 4], [-1], - [10, 4], + [-1], [-1], [-1], [-1], @@ -1290,8 +1290,8 @@ [4, 4], [5, 4], [6, 4], - [6, 0], - [8, 0], + [0, 0], + [1, 0], [1, 0], [5, 2], [1, 1], @@ -1300,10 +1300,10 @@ [1, 1], [1, 1], [2, 1], - [7, 5], - [8, 5], - [7, 5], - [8, 5], + [-1], + [-1], + [-1], + [-1], [6, 1], [7, 1], [7, 1], @@ -1328,7 +1328,7 @@ [-1], [-1], [-1], - [4, 6], + [-1], [7, 5], [8, 5], [7, 5], @@ -1343,7 +1343,7 @@ [6, 5], [4, 5], [-1], - [10, 5], + [-1], [-1], [-1], [-1], @@ -1379,9 +1379,9 @@ [4, 5], [5, 5], [6, 5], - [6, 1], - [9, 2], - [8, 0], + [0, 1], + [1, 1], + [1, 1], [1, 1], [1, 1], [1, 1], @@ -1389,8 +1389,8 @@ [1, 1], [1, 1], [2, 1], - [7, 4], - [8, 4], + [-1], + [-1], [-1], [-1], [6, 2], @@ -1402,12 +1402,103 @@ [-1], [-1], [-1], - [0, 0], - [1, 0], + [6, 0], + [7, 0], + [7, 0], + [8, 0], + [7, 4], + [8, 4], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [0, 5], + [1, 5], + [7, 4], + [8, 4], + [-1], + [-1], + [-1], + [-1], + [7, 4], + [8, 4], + [7, 4], + [8, 4], + [4, 6], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1] + ], + [ + [-1], + [0, 1], + [1, 1], + [1, 1], + [1, 1], + [1, 1], + [1, 1], + [1, 1], + [1, 1], + [1, 1], + [1, 1], + [1, 1], + [1, 1], + [2, 1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [4, 5], + [7, 4], + [8, 4], + [0, 1], + [1, 1], + [1, 1], + [1, 1], + [1, 1], + [1, 1], + [1, 1], + [1, 1], + [1, 1], + [2, 1], + [-1], + [-1], + [-1], + [-1], + [-1], + [0, 5], + [1, 5], + [0, 5], + [1, 5], + [-1], + [-1], + [-1], + [-1], + [6, 2], + [11, 0], + [7, 1], + [9, 2], + [7, 0], + [8, 0], [1, 0], [2, 0], - [7, 4], - [8, 4], [-1], [-1], [-1], @@ -1416,178 +1507,87 @@ [-1], [-1], [-1], - [-1], - [4, 6], - [7, 4], - [8, 4], - [7, 4], - [8, 4], - [-1], - [-1], - [-1], - [-1], - [7, 4], - [8, 4], - [7, 4], - [8, 4], - [4, 5], - [-1], - [-1], - [-1], - [-1], - [-1], - [-1], - [-1], - [-1] - ], - [ - [-1], - [0, 1], - [1, 1], - [1, 1], - [1, 1], - [1, 1], - [1, 1], - [1, 1], - [1, 1], - [1, 1], - [1, 1], - [1, 1], - [1, 1], - [2, 1], - [-1], - [-1], - [-1], - [-1], - [-1], - [-1], - [-1], - [-1], - [-1], - [-1], - [4, 6], - [7, 4], - [8, 4], - [6, 1], - [7, 1], - [9, 2], - [8, 0], - [1, 1], - [1, 1], - [1, 1], - [1, 1], - [1, 1], - [2, 1], - [7, 5], - [8, 5], - [-1], - [-1], - [-1], - [-1], - [0, 5], - [1, 5], - [-1], - [-1], - [-1], - [-1], - [2, 6], - [0, 2], - [5, 0], - [1, 1], - [3, 2], - [1, 0], - [1, 0], - [6, 0], - [8, 0], - [-1], - [-1], - [-1], - [-1], - [-1], - [-1], - [-1], - [4, 6], - [7, 5], - [8, 5], - [7, 5], - [8, 5], - [-1], - [-1], - [-1], - [-1], - [7, 5], - [8, 5], - [7, 5], - [8, 5], - [4, 6], - [-1], - [-1], - [-1], - [-1], - [-1], - [-1], - [-1], - [-1] - ], - [ - [-1], - [0, 1], - [1, 1], - [1, 1], - [1, 1], - [1, 1], - [1, 1], - [1, 1], - [1, 1], - [1, 1], - [1, 1], - [1, 1], - [1, 1], - [2, 1], - [-1], - [-1], - [-1], - [-1], - [-1], - [-1], - [-1], - [-1], - [-1], - [-1], - [-1], - [7, 5], - [8, 5], - [6, 1], - [7, 1], - [7, 1], - [8, 1], - [1, 1], - [1, 1], - [1, 1], - [1, 1], - [1, 1], - [2, 1], - [-1], - [-1], - [-1], - [-1], - [-1], - [-1], [0, 6], [1, 6], + [7, 5], + [8, 5], [-1], [-1], [-1], [-1], - [0, 5], - [1, 5], + [7, 5], + [8, 5], + [7, 5], + [8, 5], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1] + ], + [ + [-1], [0, 1], [1, 1], [1, 1], + [1, 1], + [1, 1], + [1, 1], + [1, 1], + [1, 1], + [1, 1], + [1, 1], + [1, 1], + [1, 1], + [2, 1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [4, 6], + [7, 5], + [8, 5], + [0, 1], + [1, 1], + [1, 1], + [1, 1], + [1, 1], [6, 0], - [7, 0], - [11, 2], + [8, 0], + [1, 1], + [1, 1], + [2, 1], + [-1], + [-1], + [-1], + [-1], + [-1], + [0, 6], + [1, 6], + [0, 6], + [1, 6], + [-1], + [-1], + [-1], + [-1], + [-1], + [6, 1], + [7, 1], + [7, 1], + [7, 1], [8, 1], + [1, 1], + [2, 1], [-1], [-1], [-1], @@ -1596,6 +1596,14 @@ [-1], [-1], [-1], + [-1], + [-1], + [0, 5], + [1, 5], + [-1], + [-1], + [-1], + [-1], [7, 4], [8, 4], [0, 5], @@ -1604,14 +1612,6 @@ [-1], [-1], [-1], - [0, 5], - [1, 5], - [7, 4], - [8, 4], - [4, 6], - [-1], - [-1], - [-1], [-1], [-1], [-1], @@ -1646,126 +1646,37 @@ [-1], [0, 5], [1, 5], + [0, 1], + [1, 1], + [1, 1], + [1, 1], + [1, 1], [6, 1], - [7, 1], - [7, 1], [8, 1], [1, 1], [1, 1], - [1, 1], - [1, 1], - [1, 1], [2, 1], [-1], [-1], [-1], - [-1], - [-1], - [-1], + [0, 5], + [1, 5], [0, 5], [1, 5], [-1], [-1], [-1], [-1], - [0, 6], - [1, 6], - [0, 2], - [6, 0], - [7, 0], - [11, 2], - [7, 1], - [7, 1], - [8, 1], [-1], [-1], [-1], - [-1], - [-1], - [-1], - [-1], - [-1], - [7, 5], - [8, 5], - [0, 6], - [1, 6], - [-1], - [-1], - [-1], - [-1], - [0, 6], - [1, 6], - [7, 5], - [8, 5], - [-1], - [-1], - [-1], - [-1], - [-1], - [-1], - [-1], - [-1], - [-1] - ], - [ - [-1], - [-1], - [-1], - [-1], - [-1], - [-1], - [-1], - [-1], - [-1], - [-1], - [-1], - [-1], - [-1], - [-1], - [-1], - [-1], - [-1], - [-1], - [-1], - [-1], - [-1], - [-1], - [-1], - [-1], - [-1], - [0, 6], - [1, 6], - [6, 1], - [7, 1], - [7, 1], - [9, 2], - [8, 0], - [1, 1], - [1, 1], - [1, 1], - [1, 1], - [2, 1], - [-1], - [-1], - [-1], - [-1], - [-1], - [-1], - [0, 6], - [1, 6], - [-1], - [-1], - [-1], - [-1], - [0, 5], - [1, 5], - [0, 5], [6, 2], [11, 0], [7, 1], [7, 1], - [7, 1], [8, 1], + [1, 1], + [2, 1], [-1], [-1], [-1], @@ -1774,18 +1685,18 @@ [-1], [-1], [-1], - [0, 5], - [1, 5], + [-1], + [-1], + [0, 6], + [1, 6], [-1], [-1], [-1], [-1], - [-1], - [-1], - [-1], - [-1], - [0, 5], - [1, 5], + [7, 5], + [8, 5], + [0, 6], + [1, 6], [-1], [-1], [-1], @@ -1798,6 +1709,19 @@ ], [ [-1], + [0, 1], + [1, 1], + [1, 1], + [1, 1], + [1, 1], + [1, 1], + [1, 1], + [1, 1], + [1, 1], + [1, 1], + [1, 1], + [1, 1], + [2, 1], [-1], [-1], [-1], @@ -1809,13 +1733,25 @@ [-1], [-1], [-1], + [0, 6], + [1, 6], + [0, 1], + [1, 1], + [1, 1], + [1, 1], + [1, 1], + [6, 1], + [9, 2], + [8, 0], + [1, 1], + [2, 1], [-1], [-1], [-1], - [-1], - [-1], - [-1], - [-1], + [0, 6], + [1, 6], + [0, 6], + [1, 6], [-1], [-1], [-1], @@ -1826,15 +1762,80 @@ [-1], [6, 1], [7, 1], - [7, 1], + [9, 0], + [8, 2], + [1, 1], + [2, 1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [0, 5], + [1, 5], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1] + ], + [ + [-1], + [0, 1], + [1, 1], + [1, 1], + [1, 1], + [1, 1], + [1, 1], + [1, 1], + [1, 1], + [1, 1], + [1, 1], + [1, 1], + [1, 1], + [2, 1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [0, 1], + [1, 1], + [1, 1], + [1, 1], + [6, 0], + [11, 2], [7, 1], [9, 2], - [7, 0], [8, 0], - [1, 1], - [1, 1], [3, 2], - [2, 0], + [1, 0], + [1, 0], [6, 0], [7, 0], [7, 0], @@ -1845,16 +1846,23 @@ [7, 0], [7, 0], [7, 0], - [7, 0], [8, 0], - [1, 6], - [0, 6], - [0, 2], - [6, 1], - [7, 1], - [7, 1], - [9, 0], - [8, 2], + [-1], + [-1], + [6, 2], + [11, 0], + [8, 1], + [1, 1], + [3, 0], + [2, 2], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], [-1], [-1], [-1], @@ -1873,20 +1881,25 @@ [-1], [-1], [-1], - [0, 6], - [1, 6], - [-1], - [-1], - [-1], - [-1], - [-1], - [-1], [-1], [-1], [-1] ], [ [-1], + [0, 1], + [1, 1], + [1, 1], + [1, 1], + [1, 1], + [1, 1], + [1, 1], + [1, 1], + [1, 1], + [1, 1], + [1, 1], + [1, 1], + [2, 1], [-1], [-1], [-1], @@ -1900,30 +1913,18 @@ [-1], [-1], [-1], - [-1], - [-1], - [-1], - [-1], - [-1], - [-1], - [-1], - [-1], - [-1], - [-1], - [-1], - [-1], - [-1], + [0, 1], + [1, 1], + [1, 1], + [1, 1], [6, 1], [7, 1], [7, 1], [7, 1], - [7, 1], - [7, 1], [9, 2], [7, 0], [7, 0], [7, 0], - [7, 0], [11, 2], [7, 1], [7, 1], @@ -1934,463 +1935,2880 @@ [7, 1], [7, 1], [7, 1], - [7, 1], - [8, 1], - [-1], - [0, 5], - [1, 5], - [6, 1], - [7, 1], - [7, 1], [8, 1], [-1], [-1], - [-1], - [-1], - [-1], - [-1], - [-1], - [-1], - [-1], - [-1], - [-1], - [-1], - [-1], - [-1], - [-1], - [-1], - [-1], - [-1], - [-1], - [-1], - [-1], - [-1], - [-1], - [-1], - [-1], - [-1], - [-1], - [-1], - [-1], - [-1] - ], - [ - [-1], - [-1], - [-1], - [-1], - [-1], - [-1], - [-1], - [-1], - [-1], - [-1], - [-1], - [-1], - [-1], - [-1], - [-1], - [-1], - [-1], - [-1], - [-1], - [-1], - [-1], - [-1], - [-1], - [-1], - [-1], - [-1], - [-1], - [6, 1], - [7, 1], - [7, 1], - [7, 1], - [7, 1], - [7, 1], - [7, 1], - [7, 1], - [7, 1], - [7, 1], - [7, 1], - [7, 1], - [7, 1], - [7, 1], - [7, 1], - [7, 1], - [7, 1], - [7, 1], - [7, 1], - [7, 1], - [7, 1], - [7, 1], - [8, 1], - [-1], - [0, 6], - [1, 6], - [6, 1], - [7, 1], - [7, 1], - [8, 1], - [-1], - [-1], - [-1], - [-1], - [-1], - [-1], - [-1], - [-1], - [-1], - [-1], - [-1], - [-1], - [-1], - [-1], - [-1], - [-1], - [-1], - [-1], - [-1], - [-1], - [-1], - [-1], - [-1], - [-1], - [-1], - [-1], - [-1], - [-1], - [-1], - [-1] - ], - [ - [-1], - [-1], - [-1], - [-1], - [-1], - [-1], - [-1], - [-1], - [-1], - [-1], - [-1], - [-1], - [-1], - [-1], - [-1], - [-1], - [-1], - [-1], - [-1], - [-1], - [-1], - [-1], - [-1], - [-1], - [-1], - [-1], - [-1], - [6, 1], - [7, 1], - [7, 1], - [7, 1], - [7, 1], - [7, 1], - [7, 1], - [7, 1], - [7, 1], - [7, 1], - [7, 1], - [7, 1], - [7, 1], - [7, 1], - [7, 1], - [7, 1], - [7, 1], - [7, 1], - [7, 1], - [7, 1], - [7, 1], - [7, 1], - [8, 1], - [-1], - [-1], - [-1], - [6, 1], - [7, 1], - [7, 1], - [8, 1], - [-1], - [-1], - [-1], - [-1], - [-1], - [-1], - [-1], - [-1], - [-1], - [-1], - [-1], - [-1], - [-1], - [-1], - [-1], - [-1], - [-1], - [-1], - [-1], - [-1], - [-1], - [-1], - [-1], - [-1], - [-1], - [-1], - [-1], - [-1], - [-1], - [-1] - ], - [ - [-1], - [-1], - [-1], - [-1], - [-1], - [-1], - [-1], - [-1], - [-1], - [-1], - [-1], - [-1], - [-1], - [-1], - [-1], - [-1], - [-1], - [-1], - [-1], - [-1], - [-1], - [-1], - [-1], - [-1], - [-1], - [-1], - [-1], - [6, 1], - [7, 1], - [7, 1], - [7, 1], - [7, 1], - [7, 1], - [7, 1], - [7, 1], - [7, 1], - [7, 1], - [7, 1], - [7, 1], - [7, 1], - [7, 1], - [7, 1], - [7, 1], - [7, 1], - [7, 1], - [7, 1], - [7, 1], - [7, 1], - [7, 1], - [8, 1], - [-1], - [-1], - [-1], - [6, 1], - [7, 1], - [7, 1], - [8, 1], - [-1], - [-1], - [-1], - [-1], - [-1], - [-1], - [-1], - [-1], - [-1], - [-1], - [-1], - [-1], - [-1], - [-1], - [-1], - [-1], - [-1], - [-1], - [-1], - [-1], - [-1], - [-1], - [-1], - [-1], - [-1], - [-1], - [-1], - [-1], - [-1], - [-1] - ], - [ - [-1], - [-1], - [-1], - [-1], - [-1], - [-1], - [-1], - [-1], - [-1], - [-1], - [-1], - [-1], - [-1], - [-1], - [-1], - [-1], - [-1], - [-1], - [-1], - [-1], - [-1], - [-1], - [-1], - [-1], - [-1], - [-1], - [-1], - [6, 1], - [7, 1], - [7, 1], - [7, 1], - [7, 1], - [7, 1], - [7, 1], - [7, 1], - [7, 1], - [7, 1], - [7, 1], - [7, 1], - [7, 1], - [7, 1], - [7, 1], - [7, 1], - [7, 1], - [7, 1], - [7, 1], - [7, 1], - [7, 1], - [7, 1], - [8, 1], - [-1], - [-1], - [-1], - [6, 1], - [7, 1], - [7, 1], - [8, 1], - [-1], - [-1], - [-1], - [-1], - [-1], - [-1], - [-1], - [-1], - [-1], - [-1], - [-1], - [-1], - [-1], - [-1], - [-1], - [-1], - [-1], - [-1], - [-1], - [-1], - [-1], - [-1], - [-1], - [-1], - [-1], - [-1], - [-1], - [-1], - [-1], - [-1] - ], - [ - [-1], - [-1], - [-1], - [-1], - [-1], - [-1], - [-1], - [-1], - [-1], - [-1], - [-1], - [-1], - [-1], - [-1], - [-1], - [-1], - [-1], - [-1], - [-1], - [-1], - [-1], - [-1], - [-1], - [-1], - [-1], - [-1], - [-1], + [0, 1], [6, 2], - [7, 1], - [7, 1], - [7, 1], - [7, 1], - [7, 1], - [7, 1], - [7, 1], - [7, 1], - [7, 1], - [7, 1], - [7, 1], - [7, 1], - [7, 1], - [7, 1], - [7, 1], - [7, 1], - [7, 1], - [7, 1], - [7, 1], - [7, 1], - [7, 1], [8, 2], + [1, 1], + [3, 1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1] + ], + [ + [0, 0], + [5, 2], + [1, 1], + [1, 1], + [1, 1], + [1, 1], + [6, 0], + [7, 0], + [7, 0], + [7, 0], + [7, 0], + [7, 0], + [8, 0], + [2, 1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [0, 1], + [1, 1], + [6, 0], + [7, 0], + [11, 2], + [7, 1], + [7, 1], + [7, 1], + [7, 1], + [7, 1], + [7, 1], + [7, 1], + [7, 1], + [7, 1], + [7, 1], + [7, 1], + [7, 1], + [7, 1], + [7, 1], + [7, 1], + [7, 1], + [7, 1], + [8, 1], + [-1], + [-1], + [0, 2], + [5, 0], + [1, 1], + [1, 1], + [3, 1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1] + ], + [ + [0, 1], + [1, 1], + [1, 1], + [6, 0], + [7, 0], + [7, 0], + [11, 2], + [7, 1], + [7, 1], + [7, 1], + [7, 1], + [7, 1], + [9, 2], + [7, 0], + [8, 0], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [6, 0], + [7, 0], + [11, 2], + [7, 1], + [7, 1], + [7, 1], + [7, 1], + [7, 1], + [7, 1], + [7, 1], + [7, 1], + [7, 1], + [7, 1], + [7, 1], + [7, 1], + [7, 1], + [7, 1], + [7, 1], + [7, 1], + [7, 1], + [7, 1], + [7, 1], + [8, 1], + [-1], + [-1], + [-1], + [0, 1], + [1, 1], + [1, 1], + [3, 1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1] + ], + [ + [0, 1], + [6, 0], + [7, 0], + [11, 2], + [7, 1], + [7, 1], + [7, 1], + [7, 1], + [7, 1], + [7, 1], + [7, 1], + [7, 1], + [7, 1], + [7, 1], + [9, 2], + [7, 0], + [8, 0], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], [-1], [-1], [-1], [6, 1], [7, 1], [7, 1], + [7, 1], + [7, 1], + [7, 1], + [7, 1], + [7, 1], + [7, 1], + [7, 1], + [7, 1], + [7, 1], + [7, 1], + [7, 1], + [7, 1], + [7, 1], + [7, 1], + [7, 1], + [7, 1], + [7, 1], + [7, 1], + [7, 1], [8, 1], [-1], [-1], [-1], + [0, 1], + [1, 1], + [1, 1], + [3, 1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1] + ], + [ + [6, 0], + [11, 2], + [7, 1], + [7, 1], + [7, 1], + [7, 1], + [7, 1], + [7, 1], + [7, 1], + [7, 1], + [7, 1], + [7, 1], + [7, 1], + [7, 1], + [7, 1], + [7, 1], + [8, 1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [6, 1], + [7, 1], + [7, 1], + [7, 1], + [7, 1], + [7, 1], + [7, 1], + [7, 1], + [7, 1], + [7, 1], + [7, 1], + [7, 1], + [7, 1], + [7, 1], + [7, 1], + [7, 1], + [7, 1], + [7, 1], + [7, 1], + [7, 1], + [7, 1], + [7, 1], + [8, 1], + [-1], + [-1], + [-1], + [0, 1], + [1, 1], + [1, 1], + [3, 1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1] + ], + [ + [6, 1], + [7, 1], + [7, 1], + [7, 1], + [7, 1], + [7, 1], + [7, 1], + [7, 1], + [7, 1], + [7, 1], + [7, 1], + [7, 1], + [7, 1], + [7, 1], + [7, 1], + [7, 1], + [8, 1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [6, 1], + [7, 1], + [7, 1], + [7, 1], + [7, 1], + [7, 1], + [7, 1], + [7, 1], + [7, 1], + [7, 1], + [7, 1], + [7, 1], + [7, 1], + [7, 1], + [7, 1], + [7, 1], + [7, 1], + [7, 1], + [7, 1], + [7, 1], + [7, 1], + [7, 1], + [8, 1], + [-1], + [-1], + [-1], + [0, 1], + [1, 1], + [1, 1], + [3, 1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1] + ] + ], + "exportMode": 1, + "arrayMode": 1 + }, + { + "name": "2Background", + "_eid": "25867920", + "offsetX": 0, + "offsetY": 0, + "gridCellWidth": 16, + "gridCellHeight": 16, + "gridCellsX": 87, + "gridCellsY": 27, + "tileset": "base.png", + "dataCoords2D": [ + [ + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1] + ], + [ + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1] + ], + [ + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1] + ], + [ + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1] + ], + [ + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1] + ], + [ + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1] + ], + [ + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1] + ], + [ + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1] + ], + [ + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1] + ], + [ + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1] + ], + [ + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1] + ], + [ + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1] + ], + [ + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [14, 0], + [15, 0], + [14, 0], + [15, 0], + [14, 0], + [15, 0], + [14, 0], + [15, 0], + [-1], + [-1], + [-1], + [-1], + [-1], + [15, 0], + [14, 0], + [15, 0], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [15, 0], + [14, 0], + [15, 0], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1] + ], + [ + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [15, 1], + [14, 1], + [15, 1], + [14, 1], + [15, 1], + [14, 1], + [15, 1], + [14, 1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [14, 1], + [15, 1], + [14, 1], + [15, 1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [15, 1], + [14, 1], + [15, 1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1] + ], + [ + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [14, 0], + [15, 0], + [14, 0], + [15, 0], + [14, 0], + [15, 0], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [14, 0], + [15, 0], + [14, 0], + [15, 0], + [-1], + [-1], + [-1], + [-1], + [-1], + [14, 0], + [15, 0], + [14, 0], + [15, 0], + [14, 0], + [15, 0], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1] + ], + [ + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [14, 1], + [15, 1], + [14, 4], + [15, 4], + [14, 1], + [15, 1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [14, 1], + [15, 1], + [14, 1], + [15, 1], + [-1], + [-1], + [-1], + [-1], + [-1], + [14, 1], + [15, 1], + [14, 1], + [15, 1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1] + ], + [ + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [14, 0], + [15, 0], + [15, 4], + [14, 5], + [15, 5], + [14, 4], + [14, 0], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [14, 0], + [15, 0], + [14, 0], + [15, 0], + [14, 4], + [15, 4], + [14, 4], + [15, 4], + [14, 4], + [14, 4], + [15, 4], + [14, 0], + [15, 0], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1] + ], + [ + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [14, 5], + [14, 1], + [15, 1], + [15, 5], + [14, 5], + [15, 5], + [14, 5], + [14, 4], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [14, 1], + [15, 1], + [14, 1], + [14, 4], + [15, 4], + [15, 5], + [14, 5], + [15, 5], + [14, 5], + [14, 5], + [15, 5], + [14, 1], + [15, 1], + [14, 4], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1] + ], + [ + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [14, 4], + [15, 4], + [14, 4], + [15, 4], + [14, 4], + [15, 4], + [14, 4], + [15, 4], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [14, 0], + [14, 4], + [15, 4], + [14, 5], + [15, 5], + [15, 4], + [14, 4], + [15, 4], + [14, 4], + [15, 4], + [14, 4], + [15, 4], + [14, 4], + [14, 5], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1] + ], + [ + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [14, 5], + [15, 5], + [14, 5], + [15, 5], + [14, 5], + [15, 5], + [14, 5], + [15, 5], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [14, 4], + [15, 4], + [15, 5], + [15, 5], + [14, 5], + [15, 5], + [14, 5], + [15, 5], + [14, 5], + [15, 5], + [14, 5], + [15, 5], + [14, 5], + [15, 5], + [15, 4], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1] + ], + [ + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [14, 4], + [15, 4], + [14, 4], + [15, 4], + [14, 4], + [15, 4], + [14, 4], + [15, 4], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [14, 5], + [15, 5], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1] + ], + [ + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [14, 5], + [15, 5], + [14, 5], + [15, 5], + [14, 5], + [15, 5], + [14, 5], + [15, 5], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [14, 4], + [15, 4], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1] + ], + [ + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [14, 4], + [15, 4], + [14, 4], + [15, 4], + [14, 4], + [15, 4], + [14, 4], + [15, 4], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [14, 5], + [15, 5], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1] + ], + [ + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [14, 5], + [15, 5], + [14, 5], + [15, 5], + [14, 5], + [15, 5], + [14, 5], + [15, 5], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [14, 5], + [14, 4], + [15, 4], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1] + ], + [ + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [14, 4], + [15, 4], + [14, 4], + [15, 4], + [14, 4], + [15, 4], + [14, 4], + [15, 4], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [14, 4], + [14, 5], + [15, 5], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1] + ], + [ + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [14, 5], + [15, 5], + [14, 5], + [15, 5], + [14, 5], + [15, 5], + [14, 5], + [15, 5], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [14, 5], + [15, 5], + [14, 5], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1] + ], + [ + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [14, 4], + [15, 4], + [14, 4], + [15, 4], + [14, 4], + [15, 4], + [14, 4], + [15, 4], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [14, 4], + [15, 4], + [14, 4], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], [-1], [-1], [-1], @@ -2435,11 +4853,10 @@ "entities": [ {"name": "Solid", "id": 25, "_eid": "17026310", "x": 16, "y": 224, "width": 208, "height": 80, "originX": 0, "originY": 0}, {"name": "Solid", "id": 26, "_eid": "17026310", "x": 432, "y": 224, "width": 160, "height": 208, "originX": 0, "originY": 0}, - {"name": "Solid", "id": 27, "_eid": "17026310", "x": 480, "y": 192, "width": 112, "height": 32, "originX": 0, "originY": 0}, + {"name": "Solid", "id": 27, "_eid": "17026310", "x": 480, "y": 208, "width": 112, "height": 16, "originX": 0, "originY": 0}, {"name": "SemiSolid", "id": 28, "_eid": "59763689", "x": 384, "y": 224, "width": 48, "height": 16, "originX": 0, "originY": 0}, {"name": "Solid", "id": 29, "_eid": "17026310", "x": 592, "y": 320, "width": 208, "height": 112, "originX": 0, "originY": 0}, {"name": "Solid", "id": 30, "_eid": "17026310", "x": 656, "y": 160, "width": 32, "height": 96, "originX": 0, "originY": 0}, - {"name": "Solid", "id": 31, "_eid": "17026310", "x": 592, "y": 96, "width": 16, "height": 16, "originX": 0, "originY": 0}, {"name": "Solid", "id": 32, "_eid": "17026310", "x": 704, "y": 48, "width": 32, "height": 208, "originX": 0, "originY": 0}, {"name": "Solid", "id": 33, "_eid": "17026310", "x": 736, "y": 64, "width": 16, "height": 160, "originX": 0, "originY": 0}, {"name": "Solid", "id": 34, "_eid": "17026310", "x": 688, "y": 144, "width": 16, "height": 112, "originX": 0, "originY": 0}, @@ -2450,7 +4867,8 @@ {"name": "Solid", "id": 39, "_eid": "17026310", "x": 848, "y": 336, "width": 64, "height": 96, "originX": 0, "originY": 0}, {"name": "SemiSolid", "id": 40, "_eid": "59763689", "x": 832, "y": 208, "width": 64, "height": 16, "originX": 0, "originY": 0}, {"name": "SemiSolid", "id": 42, "_eid": "59763689", "x": 1040, "y": 176, "width": 80, "height": 16, "originX": 0, "originY": 0}, - {"name": "SemiSolid", "id": 43, "_eid": "59763689", "x": 1184, "y": 208, "width": 80, "height": 16, "originX": 0, "originY": 0} + {"name": "SemiSolid", "id": 43, "_eid": "59763689", "x": 1184, "y": 208, "width": 80, "height": 16, "originX": 0, "originY": 0}, + {"name": "Solid", "id": 44, "_eid": "17026310", "x": 832, "y": 336, "width": 16, "height": 32, "originX": 0, "originY": 0} ] }, { @@ -2489,10 +4907,6 @@ {"x": 576, "y": 160} ] }, - {"name": "Crate", "id": 9, "_eid": "16023910", "x": 592, "y": 192, "originX": 0, "originY": 0}, - {"name": "Crate", "id": 10, "_eid": "16023910", "x": 608, "y": 192, "originX": 0, "originY": 0}, - {"name": "Crate", "id": 11, "_eid": "16023910", "x": 624, "y": 192, "originX": 0, "originY": 0}, - {"name": "Crate", "id": 12, "_eid": "16023910", "x": 640, "y": 192, "originX": 0, "originY": 0}, {"name": "Crate", "id": 13, "_eid": "16023910", "x": 640, "y": 208, "originX": 0, "originY": 0}, {"name": "Crate", "id": 14, "_eid": "16023910", "x": 624, "y": 208, "originX": 0, "originY": 0}, {"name": "Crate", "id": 15, "_eid": "16023910", "x": 608, "y": 208, "originX": 0, "originY": 0}, @@ -2506,7 +4920,10 @@ "originX": 0, "originY": 0, "values": {"angle": 45, "strength": 8} - } + }, + {"name": "Balloon", "id": 36, "_eid": "16494694", "x": 1296, "y": 176, "originX": 0, "originY": 0}, + {"name": "Balloon", "id": 37, "_eid": "16494694", "x": 1360, "y": 160, "originX": 0, "originY": 0}, + {"name": "Balloon", "id": 38, "_eid": "16494694", "x": 1264, "y": 128, "originX": 0, "originY": 0} ] } ] diff --git a/gamedata/objects/combat/ennemies/spring.py b/gamedata/objects/combat/ennemies/spring.py index 4eec465..094a785 100644 --- a/gamedata/objects/combat/ennemies/spring.py +++ b/gamedata/objects/combat/ennemies/spring.py @@ -13,7 +13,9 @@ class Spring(Ennemy): self.rect[2],self.rect[3] = self.sprite.get_width(),round(self.sprite.get_height()/2) self.spriteindex = 0 self.animspeed = 8 - + self.sfx = self.game.sound_lib["sfx/spring.wav"] + self.longsfx = self.game.sound_lib["sfx/longspring.wav"] + # Zone in with the player is colliding # Formatting the angle ( clockwise, in degrees, starting at the top ) @@ -57,6 +59,9 @@ class Spring(Ennemy): force = self.jumpstrength if self.player.fastfall: force*=1.5 + self.longsfx.play() + else: + self.sfx.play() self.player.yeet(self.ratiox*force,self.ratioy*force) self.spriteindex = len(self.sprites) diff --git a/gamedata/objects/combat/player.py b/gamedata/objects/combat/player.py index 353791a..6f4637c 100644 --- a/gamedata/objects/combat/player.py +++ b/gamedata/objects/combat/player.py @@ -22,13 +22,15 @@ class Player(Movable): self.animationspeed = 2.5 self.sprite = self.spritestill - self.rect[2] = self.sprite.get_width() + collisionratio = 0.7 + self.rect[2] = self.sprite.get_width()*collisionratio self.rect[3] = self.sprite.get_height() + self.spriteoffset = self.sprite.get_width()*(1-collisionratio)/2 self.water = self.game.gameloop.findname("Water")[0] self.hitrect = self.rect.copy() - self.hitrect[2] = round(self.hitrect[2]*0.7) + self.hitrect[2] = round(self.hitrect[2]*1) self.hitrect[3] = round(self.hitrect[3]*0.7) self.canhit = False @@ -71,12 +73,18 @@ class Player(Movable): self.combo = 0 self.combosprites = self.game.getSpriteDir("player/combo/") + self.combosfxs = self.game.getSpriteDir("sfx/combo/",ext=".wav",assetdir="sound_lib") + self.combodefault = self.game.sound_lib["sfx/combo/default.wav"] self.combotimer = 1 + # SFXs + self.landsfx = self.game.sound_lib["sfx/land.wav"] + self.slamsfx = self.game.sound_lib["sfx/slam.wav"] + self.jumpsfx = self.game.sound_lib["sfx/jump.wav"] + def step(self): if not self.hitpose: - if self.water and self.rect.center[1]>self.water.rect.y: # Reverse gravity underwater if self.gravityway == 1: self.gravityway = -1 @@ -138,14 +146,17 @@ class Player(Movable): self.leaptimer = self.leapmaxtimer self.candash = True self.canfastfall = True - if self.fastfall: - self.fastfall = 0 - # Spawns dust - self.game.addParticle(self.dustparticles,self.rect.right+4,self.rect.center[1]+self.rect[3]/2*self.gravityway,fps=25) - self.game.addParticle(self.dustparticles,self.rect.left-4,self.rect.center[1]+self.rect[3]/2*self.gravityway,fps=25) if self.verspd!=0: self.sprite=self.spritelanding self.landingtimer = self.maxlandtime + if self.fastfall: + self.fastfall = 0 + # Spawns dust + self.game.addParticle(self.dustparticles,self.rect.right+4,self.rect.center[1]+self.rect[3]/2*self.gravityway,fps=25) + self.game.addParticle(self.dustparticles,self.rect.left-4,self.rect.center[1]+self.rect[3]/2*self.gravityway,fps=25) + self.slamsfx.play() + else: + self.landsfx.play() if self.gravityway > 0: self.verspd=min(0,self.verspd) else: @@ -185,6 +196,8 @@ class Player(Movable): self.verspd= self.jump*self.gravityway if self.leaptimer<0 and not self.onground: self.verspd = -abs(self.verspd) # Small leap + else: + self.jumpsfx.play() self.jumped = True super().step() # Actually move # Updated hitrect @@ -243,6 +256,9 @@ class Player(Movable): if self.combo>=1: index = min(self.combo-1,len(self.combosprites)-1) self.game.addParticle([self.combosprites[index]],self.rect.center[0],self.rect.top,fps=1) + self.combosfxs[index].play() + else: + self.combodefault.play() self.combo+=1 self.combotimer = 1 @@ -258,4 +274,4 @@ class Player(Movable): if self.fastfall: flipy = self.fastfall<0 sprite = self.game.pygame.transform.flip(self.sprite,self.flipx,flipy) - self.game.window.blit(sprite,[self.rect[0]-self.game.globals["camerax"],self.rect[1]-self.game.globals["cameray"]]) + self.game.window.blit(sprite,[self.rect[0]-self.game.globals["camerax"]-self.spriteoffset,self.rect[1]-self.game.globals["cameray"]]) diff --git a/gamedata/objects/combat/tileset.py b/gamedata/objects/combat/tileset.py index db476a0..1264d90 100644 --- a/gamedata/objects/combat/tileset.py +++ b/gamedata/objects/combat/tileset.py @@ -76,7 +76,7 @@ class TilesetRenderer(BaseObject): tilew,tileh = layer["gridCellWidth"],layer["gridCellHeight"] tileoffx,tileoffy = layer["offsetX"],layer["offsetY"] nbtilesx,nbtilesy = layer["gridCellsX"],layer["gridCellsY"] - storedlayer = {"offsets":[tileoffx,tileoffy]} + storedlayer = {"offsets":[tileoffx,tileoffy],"name":layer["name"]} surface = self.game.pygame.Surface((tilew*nbtilesx,tileh*nbtilesy),flags=self.game.pygame.SRCALPHA) for y in range(len(layer["dataCoords2D"])): for x in range(len(layer["dataCoords2D"][y])): @@ -111,5 +111,7 @@ class TilesetRenderer(BaseObject): else: self.game.log("Erreur",name,"Il manque les collisions, Entity Layer nommé Solids") + self.layers.sort(key=lambda x: x["name"]) + self.layers.reverse() else: self.game.log("Erreur",name,"Pas de layers") diff --git a/gamedata/sounds/sfx/combo/0.wav b/gamedata/sounds/sfx/combo/0.wav new file mode 100644 index 0000000..0f264bd Binary files /dev/null and b/gamedata/sounds/sfx/combo/0.wav differ diff --git a/gamedata/sounds/sfx/combo/1.wav b/gamedata/sounds/sfx/combo/1.wav new file mode 100644 index 0000000..e359999 Binary files /dev/null and b/gamedata/sounds/sfx/combo/1.wav differ diff --git a/gamedata/sounds/sfx/combo/2.wav b/gamedata/sounds/sfx/combo/2.wav new file mode 100644 index 0000000..49e09d9 Binary files /dev/null and b/gamedata/sounds/sfx/combo/2.wav differ diff --git a/gamedata/sounds/sfx/combo/3.wav b/gamedata/sounds/sfx/combo/3.wav new file mode 100644 index 0000000..2670a04 Binary files /dev/null and b/gamedata/sounds/sfx/combo/3.wav differ diff --git a/gamedata/sounds/sfx/combo/4.wav b/gamedata/sounds/sfx/combo/4.wav new file mode 100644 index 0000000..89ce5cb Binary files /dev/null and b/gamedata/sounds/sfx/combo/4.wav differ diff --git a/gamedata/sounds/sfx/combo/5.wav b/gamedata/sounds/sfx/combo/5.wav new file mode 100644 index 0000000..d5dddbf Binary files /dev/null and b/gamedata/sounds/sfx/combo/5.wav differ diff --git a/gamedata/sounds/sfx/combo/6.wav b/gamedata/sounds/sfx/combo/6.wav new file mode 100644 index 0000000..cef6061 Binary files /dev/null and b/gamedata/sounds/sfx/combo/6.wav differ diff --git a/gamedata/sounds/sfx/combo/default.wav b/gamedata/sounds/sfx/combo/default.wav new file mode 100644 index 0000000..c3515bf Binary files /dev/null and b/gamedata/sounds/sfx/combo/default.wav differ diff --git a/gamedata/sounds/sfx/jump.wav b/gamedata/sounds/sfx/jump.wav new file mode 100644 index 0000000..ddcc785 Binary files /dev/null and b/gamedata/sounds/sfx/jump.wav differ diff --git a/gamedata/sounds/sfx/land.wav b/gamedata/sounds/sfx/land.wav new file mode 100644 index 0000000..ffee4b4 Binary files /dev/null and b/gamedata/sounds/sfx/land.wav differ diff --git a/gamedata/sounds/sfx/longspring.wav b/gamedata/sounds/sfx/longspring.wav new file mode 100644 index 0000000..04a7b97 Binary files /dev/null and b/gamedata/sounds/sfx/longspring.wav differ diff --git a/gamedata/sounds/sfx/slam.wav b/gamedata/sounds/sfx/slam.wav new file mode 100644 index 0000000..dcac44d Binary files /dev/null and b/gamedata/sounds/sfx/slam.wav differ diff --git a/gamedata/sounds/sfx/spring.wav b/gamedata/sounds/sfx/spring.wav new file mode 100644 index 0000000..c92a818 Binary files /dev/null and b/gamedata/sounds/sfx/spring.wav differ