From a6e7e0a436ee038eb192dc0cc4107068ed32bdda Mon Sep 17 00:00:00 2001 From: "theo@manjaro" Date: Tue, 16 Nov 2021 15:34:12 +0100 Subject: [PATCH] Smaller player --- gamedata/assets/player/0.png | Bin 0 -> 14873 bytes gamedata/maps/TulipFields/map.json | 1810 +++++++++++++++++++++++++++- gamedata/objects/combat/player.py | 21 +- gamedata/scenes.py | 2 +- 4 files changed, 1790 insertions(+), 43 deletions(-) create mode 100644 gamedata/assets/player/0.png diff --git a/gamedata/assets/player/0.png b/gamedata/assets/player/0.png new file mode 100644 index 0000000000000000000000000000000000000000..ef51f05f6660d0e7b46868f1aee52b5e6b01b5f5 GIT binary patch literal 14873 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 literal 0 HcmV?d00001 diff --git a/gamedata/maps/TulipFields/map.json b/gamedata/maps/TulipFields/map.json index 09b4c73..e239618 100644 --- a/gamedata/maps/TulipFields/map.json +++ b/gamedata/maps/TulipFields/map.json @@ -1,7 +1,7 @@ { "ogmoVersion": "3.4.0", - "width": 592, - "height": 272, + "width": 1392, + "height": 432, "offsetX": 0, "offsetY": 0, "layers": [ @@ -12,8 +12,8 @@ "offsetY": 0, "gridCellWidth": 16, "gridCellHeight": 16, - "gridCellsX": 37, - "gridCellsY": 17, + "gridCellsX": 87, + "gridCellsY": 27, "tileset": "base.png", "dataCoords2D": [ [ @@ -53,9 +53,20 @@ [-1], [-1], [-1], - [-1] - ], - [ + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], [-1], [-1], [-1], @@ -131,9 +142,20 @@ [-1], [-1], [-1], - [-1] - ], - [ + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], [-1], [-1], [-1], @@ -209,9 +231,20 @@ [-1], [-1], [-1], - [-1] - ], - [ + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], [-1], [-1], [-1], @@ -287,9 +320,20 @@ [-1], [-1], [-1], - [-1] - ], - [ + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [6, 0], + [8, 0], + [-1], + [-1], + [-1], + [-1], [-1], [-1], [-1], @@ -329,6 +373,56 @@ [-1] ], [ + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-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], + [-1], + [8, 0], + [-1], + [-1], + [-1], [-1], [-1], [-1], @@ -368,6 +462,590 @@ [-1] ], [ + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-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], + [-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], + [-1], + [-1], + [-1], + [-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], + [-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], + [-1], + [-1], + [-1], + [-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], + [-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], + [-1], + [-1], + [-1], + [-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], + [-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], + [-1], + [-1], + [-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], + [-1], + [-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], + [-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], + [7, 0], + [-1], + [-1], + [-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], + [-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], + [-1], + [-1], + [-1], + [-1], + [8, 1], + [-1], + [-1], + [-1], [-1], [-1], [-1], @@ -443,7 +1121,57 @@ [1, 0], [1, 0], [1, 0], - [1, 0] + [1, 0], + [-1], + [-1], + [-1], + [-1], + [6, 1], + [-1], + [-1], + [-1], + [-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], @@ -482,7 +1210,57 @@ [1, 1], [1, 1], [1, 1], - [1, 1] + [1, 1], + [-1], + [-1], + [-1], + [-1], + [6, 1], + [-1], + [-1], + [-1], + [9, 0], + [8, 2], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1] ], [ [-1], @@ -521,7 +1299,57 @@ [1, 1], [1, 1], [1, 1], - [1, 1] + [1, 1], + [-1], + [-1], + [-1], + [-1], + [6, 1], + [-1], + [-1], + [-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], @@ -560,7 +1388,57 @@ [1, 1], [1, 1], [1, 1], - [1, 1] + [1, 1], + [-1], + [-1], + [-1], + [-1], + [6, 2], + [7, 2], + [7, 2], + [7, 2], + [8, 2], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1] ], [ [-1], @@ -599,7 +1477,57 @@ [1, 1], [1, 1], [1, 1], - [1, 1] + [1, 1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1] ], [ [-1], @@ -638,7 +1566,57 @@ [1, 1], [1, 1], [1, 1], - [1, 1] + [1, 1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1] ], [ [-1], @@ -677,7 +1655,769 @@ [1, 1], [1, 1], [1, 1], - [1, 1] + [1, 1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1] + ], + [ + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1] + ], + [ + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1] + ], + [ + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1] + ], + [ + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1] + ], + [ + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1] + ], + [ + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1] + ], + [ + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1] + ], + [ + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-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, @@ -690,13 +2430,19 @@ "offsetY": 0, "gridCellWidth": 16, "gridCellHeight": 16, - "gridCellsX": 37, - "gridCellsY": 17, + "gridCellsX": 87, + "gridCellsY": 27, "entities": [ - {"name": "Solid", "id": 25, "_eid": "17026310", "x": 16, "y": 192, "width": 208, "height": 64, "originX": 0, "originY": 0}, - {"name": "Solid", "id": 26, "_eid": "17026310", "x": 432, "y": 192, "width": 160, "height": 48, "originX": 0, "originY": 0}, - {"name": "Solid", "id": 27, "_eid": "17026310", "x": 480, "y": 160, "width": 112, "height": 32, "originX": 0, "originY": 0}, - {"name": "SemiSolid", "id": 28, "_eid": "59763689", "x": 368, "y": 192, "width": 64, "height": 16, "originX": 0, "originY": 0} + {"name": "Solid", "id": 25, "_eid": "17026310", "x": 16, "y": 224, "width": 208, "height": 64, "originX": 0, "originY": 0}, + {"name": "Solid", "id": 26, "_eid": "17026310", "x": 432, "y": 224, "width": 160, "height": 48, "originX": 0, "originY": 0}, + {"name": "Solid", "id": 27, "_eid": "17026310", "x": 480, "y": 192, "width": 112, "height": 32, "originX": 0, "originY": 0}, + {"name": "SemiSolid", "id": 28, "_eid": "59763689", "x": 368, "y": 224, "width": 64, "height": 16, "originX": 0, "originY": 0}, + {"name": "Solid", "id": 29, "_eid": "17026310", "x": 592, "y": 320, "width": 192, "height": 32, "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} ] }, { @@ -706,10 +2452,10 @@ "offsetY": 0, "gridCellWidth": 16, "gridCellHeight": 16, - "gridCellsX": 37, - "gridCellsY": 17, + "gridCellsX": 87, + "gridCellsY": 27, "entities": [ - {"name": "Spawns", "id": 4, "_eid": "25816588", "x": 64, "y": 144, "originX": 0, "originY": 0} + {"name": "Spawns", "id": 4, "_eid": "25816588", "x": 64, "y": 176, "originX": 0, "originY": 0} ] } ] diff --git a/gamedata/objects/combat/player.py b/gamedata/objects/combat/player.py index 2e7da34..8262fe2 100644 --- a/gamedata/objects/combat/player.py +++ b/gamedata/objects/combat/player.py @@ -8,7 +8,9 @@ class Player(Movable): spawnpoint = game.lib.choice(self.tileset.spawns) self.rect.move_ip(spawnpoint.center) - self.sprite = game.sprite_lib["icon.png"] + self.sprite = game.sprite_lib["player/0.png"] + self.rect[2] = self.sprite.get_width() + self.rect[3] = self.sprite.get_height() self.speed = 200 @@ -33,13 +35,14 @@ class Player(Movable): self.attackstate = None - self.stepsize = 20 - self.gravity = 15 self.maxgravity = 30 self.jump = -5 self.verspd = self.maxgravity + self.candash = False + self.canfastfall = False + self.gravityway = 1 def step(self): @@ -60,6 +63,8 @@ class Player(Movable): self.onceilling = False if self.checkcollisions(0,self.gravityway): self.onground = True + self.candash = True + self.canfastfall = True if self.gravityway > 0: self.verspd=min(0,self.verspd) else: @@ -86,12 +91,7 @@ class Player(Movable): if 00: @@ -112,8 +112,9 @@ class Player(Movable): self.rect.bottom = semi.top+1 falled = True if not falled: # Check for fastfall - if abs(self.verspd) <= self.fastfallmargin and not self.onground: + if self.canfastfall and abs(self.verspd) <= self.fastfallmargin and not self.onground: self.verspd = self.maxgravity/5*self.gravityway + self.canfastfall = False else: # If I'm in hitpose if self.hitposetimer.tick(self.game.dt): diff --git a/gamedata/scenes.py b/gamedata/scenes.py index f6372d7..a551320 100644 --- a/gamedata/scenes.py +++ b/gamedata/scenes.py @@ -28,7 +28,7 @@ def fight(game): game.gameloop.summon(tileset) box = Hitbox(100,80,game) game.gameloop.summon(box) - water = Water(200,game) + water = Water(250,game) game.gameloop.summon(water) p1 = Player(game) game.gameloop.summon(p1)