diff --git a/gamedata/maps/TulipFields/map.json b/gamedata/maps/TulipFields/map.json index de6e30c..83d98f1 100644 --- a/gamedata/maps/TulipFields/map.json +++ b/gamedata/maps/TulipFields/map.json @@ -1,6 +1,6 @@ { "ogmoVersion": "3.4.0", - "width": 320, + "width": 512, "height": 240, "offsetX": 0, "offsetY": 0, @@ -12,7 +12,7 @@ "offsetY": 0, "gridCellWidth": 16, "gridCellHeight": 16, - "gridCellsX": 20, + "gridCellsX": 32, "gridCellsY": 15, "tileset": "base.png", "dataCoords2D": [ @@ -36,6 +36,18 @@ [-1], [-1], [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], [-1] ], [ @@ -58,6 +70,18 @@ [-1], [-1], [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], [-1] ], [ @@ -80,6 +104,18 @@ [-1], [-1], [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], [-1] ], [ @@ -102,6 +138,18 @@ [-1], [-1], [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], [-1] ], [ @@ -124,6 +172,18 @@ [-1], [-1], [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], [-1] ], [ @@ -146,6 +206,18 @@ [-1], [-1], [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], [-1] ], [ @@ -168,7 +240,19 @@ [-1], [-1], [-1], - [-1] + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [0, 0], + [2, 0] ], [ [-1], @@ -190,7 +274,19 @@ [-1], [-1], [-1], - [-1] + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [0, 0], + [1, 0], + [1, 0], + [5, 2], + [2, 1] ], [ [-1], @@ -212,7 +308,19 @@ [-1], [-1], [-1], - [-1] + [-1], + [-1], + [-1], + [-1], + [-1], + [-1], + [0, 0], + [1, 0], + [5, 2], + [1, 1], + [1, 1], + [1, 1], + [2, 1] ], [ [-1], @@ -234,7 +342,19 @@ [-1], [-1], [-1], - [-1] + [-1], + [-1], + [-1], + [-1], + [0, 0], + [1, 0], + [5, 2], + [1, 1], + [1, 1], + [1, 1], + [1, 1], + [1, 1], + [2, 1] ], [ [-1], @@ -256,7 +376,19 @@ [2, 0], [-1], [-1], - [-1] + [-1], + [0, 0], + [1, 0], + [1, 0], + [5, 2], + [1, 1], + [1, 1], + [1, 1], + [1, 1], + [1, 1], + [1, 1], + [1, 1], + [2, 1] ], [ [-1], @@ -278,7 +410,19 @@ [2, 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], + [2, 1] ], [ [-1], @@ -300,7 +444,19 @@ [2, 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], + [2, 1] ], [ [-1], @@ -322,7 +478,19 @@ [7, 0], [8, 0], [-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], + [2, 1] ], [ [-1], @@ -344,7 +512,19 @@ [7, 1], [8, 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], + [2, 1] ] ], "exportMode": 1, @@ -357,15 +537,20 @@ "offsetY": 0, "gridCellWidth": 16, "gridCellHeight": 16, - "gridCellsX": 20, + "gridCellsX": 32, "gridCellsY": 15, "entities": [ {"name": "Solid", "id": 1, "_eid": "17026310", "x": 16, "y": 144, "width": 48, "height": 96, "originX": 0, "originY": 0}, {"name": "Solid", "id": 2, "_eid": "17026310", "x": 112, "y": 112, "width": 32, "height": 32, "originX": 0, "originY": 0}, {"name": "Solid", "id": 3, "_eid": "17026310", "x": 192, "y": 160, "width": 80, "height": 48, "originX": 0, "originY": 0}, {"name": "Solid", "id": 4, "_eid": "17026310", "x": 96, "y": 208, "width": 192, "height": 32, "originX": 0, "originY": 0}, - {"name": "Solid", "id": 6, "_eid": "17026310", "x": 64, "y": 224, "width": 16, "height": 16, "originX": 0, "originY": 0} + {"name": "Solid", "id": 6, "_eid": "17026310", "x": 64, "y": 224, "width": 16, "height": 16, "originX": 0, "originY": 0}, + {"name": "Solid", "id": 7, "_eid": "17026310", "x": 320, "y": 160, "width": 48, "height": 80, "originX": 0, "originY": 0}, + {"name": "Solid", "id": 8, "_eid": "17026310", "x": 368, "y": 144, "width": 32, "height": 96, "originX": 0, "originY": 0}, + {"name": "Solid", "id": 9, "_eid": "17026310", "x": 400, "y": 128, "width": 80, "height": 112, "originX": 0, "originY": 0}, + {"name": "Solid", "id": 10, "_eid": "17026310", "x": 432, "y": 112, "width": 48, "height": 16, "originX": 0, "originY": 0}, + {"name": "Solid", "id": 11, "_eid": "17026310", "x": 480, "y": 96, "width": 32, "height": 144, "originX": 0, "originY": 0} ] } ] -} +} \ No newline at end of file diff --git a/gamedata/objects/combat/player.py b/gamedata/objects/combat/player.py index 1e69c8d..d43b994 100644 --- a/gamedata/objects/combat/player.py +++ b/gamedata/objects/combat/player.py @@ -15,6 +15,8 @@ class Player(BaseObject): self.speed = 300 + self.stepsize = 20 + self.gravity = 1500 self.maxgravity = 800 self.jump = -600 @@ -44,7 +46,12 @@ class Player(BaseObject): self.vertical = self.jump self.jumped = True - self.move(hor*self.speed*self.game.dt,self.vertical*self.game.dt) + if self.vertical==0: + self.move(0,-self.stepsize) + self.move(hor*self.speed*self.game.dt,self.vertical*self.game.dt) + self.move(0,self.stepsize) + else: + self.move(hor*self.speed*self.game.dt,self.vertical*self.game.dt) def move(self,movex,movey): hstoped = False