ayte/Overflown
ayte
/
Overflown
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Added Scaffoldings to tileset

This commit is contained in:
theo@manjaro 2021-11-17 14:31:55 +01:00
parent 535de3c1b4
commit 3d7e6a981c
3 changed files with 47 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
gamedata/maps/TulipFields/base.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 19 KiB

After

Width:  |  Height:  |  Size: 23 KiB

82
gamedata/maps/TulipFields/map.json
View File

@ -1035,8 +1035,8 @@
[-1], [-1],
[-1], [-1],
[-1], [-1],
[-1], [7, 4],
[-1], [8, 4],
[6, 1], [6, 1],
[7, 1], [7, 1],
[7, 1], [7, 1],
@ -1124,8 +1124,8 @@
[1, 0], [1, 0],
[-1], [-1],
[-1], [-1],
[-1], [7, 5],
[-1], [8, 5],
[6, 1], [6, 1],
[7, 1], [7, 1],
[7, 1], [7, 1],
@ -1211,10 +1211,10 @@
[1, 1], [1, 1],
[1, 1], [1, 1],
[1, 1], [1, 1],
[-1], [7, 4],
[-1], [8, 4],
[-1], [7, 4],
[-1], [8, 4],
[6, 1], [6, 1],
[7, 1], [7, 1],
[7, 1], [7, 1],
@ -1286,10 +1286,10 @@
[-1], [-1],
[-1], [-1],
[-1], [-1],
[0, 4], [-1],
[1, 4], [4, 4],
[1, 4], [5, 4],
[1, 4], [6, 4],
[6, 0], [6, 0],
[8, 0], [8, 0],
[1, 0], [1, 0],
@ -1300,10 +1300,10 @@
[1, 1], [1, 1],
[1, 1], [1, 1],
[1, 1], [1, 1],
[-1], [7, 5],
[-1], [8, 5],
[-1], [7, 5],
[-1], [8, 5],
[6, 1], [6, 1],
[7, 1], [7, 1],
[7, 1], [7, 1],
@ -1376,9 +1376,9 @@
[-1], [-1],
[-1], [-1],
[-1], [-1],
[-1], [4, 5],
[-1], [5, 5],
[-1], [6, 5],
[6, 1], [6, 1],
[9, 2], [9, 2],
[8, 0], [8, 0],
@ -1389,8 +1389,8 @@
[1, 1], [1, 1],
[1, 1], [1, 1],
[1, 1], [1, 1],
[-1], [7, 4],
[-1], [8, 4],
[-1], [-1],
[-1], [-1],
[6, 2], [6, 2],
@ -1465,9 +1465,9 @@
[-1], [-1],
[-1], [-1],
[-1], [-1],
[-1], [4, 6],
[-1], [7, 4],
[-1], [8, 4],
[6, 1], [6, 1],
[7, 1], [7, 1],
[9, 2], [9, 2],
@ -1478,14 +1478,14 @@
[1, 1], [1, 1],
[1, 1], [1, 1],
[1, 1], [1, 1],
[7, 5],
[8, 5],
[-1], [-1],
[-1], [-1],
[-1], [-1],
[-1], [-1],
[-1], [0, 5],
[-1], [1, 5],
[-1],
[-1],
[-1], [-1],
[-1], [-1],
[-1], [-1],
@ -1555,8 +1555,8 @@
[-1], [-1],
[-1], [-1],
[-1], [-1],
[-1], [7, 5],
[-1], [8, 5],
[6, 1], [6, 1],
[7, 1], [7, 1],
[7, 1], [7, 1],
@ -1573,8 +1573,8 @@
[-1], [-1],
[-1], [-1],
[-1], [-1],
[-1], [0, 6],
[-1], [1, 6],
[-1], [-1],
[-1], [-1],
[-1], [-1],
@ -1644,8 +1644,8 @@
[-1], [-1],
[-1], [-1],
[-1], [-1],
[-1], [0, 5],
[-1], [1, 5],
[6, 1], [6, 1],
[7, 1], [7, 1],
[7, 1], [7, 1],
@ -1662,8 +1662,8 @@
[-1], [-1],
[-1], [-1],
[-1], [-1],
[-1], [0, 5],
[-1], [1, 5],
[-1], [-1],
[-1], [-1],
[-1], [-1],
@ -1733,8 +1733,8 @@
[-1], [-1],
[-1], [-1],
[-1], [-1],
[-1], [0, 6],
[-1], [1, 6],
[6, 1], [6, 1],
[7, 1], [7, 1],
[7, 1], [7, 1],
@ -1751,8 +1751,8 @@
[-1], [-1],
[-1], [-1],
[-1], [-1],
[-1], [0, 6],
[-1], [1, 6],
[-1], [-1],
[-1], [-1],
[-1], [-1],
@ -2436,7 +2436,7 @@
{"name": "Solid", "id": 25, "_eid": "17026310", "x": 16, "y": 224, "width": 208, "height": 80, "originX": 0, "originY": 0}, {"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": 128, "originX": 0, "originY": 0}, {"name": "Solid", "id": 26, "_eid": "17026310", "x": 432, "y": 224, "width": 160, "height": 128, "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": 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": "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": 192, "height": 32, "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": 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": 31, "_eid": "17026310", "x": 592, "y": 96, "width": 16, "height": 16, "originX": 0, "originY": 0},

10
gamedata/objects/combat/player.py
View File

@ -19,8 +19,6 @@ class Player(Movable):
self.controlled = True self.controlled = True
self.fastfallmargin = 3
self.playerid = 0 self.playerid = 0
self.teamid = self.playerid self.teamid = self.playerid
@ -45,6 +43,7 @@ class Player(Movable):
self.candash = False self.candash = False
self.canfastfall = False self.canfastfall = False
self.fastfall = False
# Small leap in order to get out of the water # Small leap in order to get out of the water
self.leaptimer = 1 self.leaptimer = 1
@ -80,14 +79,14 @@ class Player(Movable):
if self.controlled: if self.controlled:
self.horspd=(keys["right"]["pressed"]-keys["left"]["pressed"])*self.game.dt*self.speed self.horspd=(keys["right"]["pressed"]-keys["left"]["pressed"])*self.game.dt*self.speed
if self.attackstate: if self.attackstate:
self.attackstate(self) self.attackstate(self) # Si je suis sur le sol
# Si je suis sur le sol
self.onground = False self.onground = False
self.onceilling = False self.onceilling = False
if self.checkcollisions(0,self.gravityway): if self.checkcollisions(0,self.gravityway):
self.onground = True self.onground = True
self.candash = True self.candash = True
self.canfastfall = True self.canfastfall = True
self.fastfall = False
if self.gravityway > 0: if self.gravityway > 0:
self.verspd=min(0,self.verspd) self.verspd=min(0,self.verspd)
else: else:
@ -140,6 +139,9 @@ class Player(Movable):
if self.canfastfall and not self.onground: if self.canfastfall and not self.onground:
self.verspd = self.maxgravity/5*self.gravityway self.verspd = self.maxgravity/5*self.gravityway
self.canfastfall = False self.canfastfall = False
self.fastfall = True
else:
self.fastfall = False
else: # If I'm in hitpose else: # If I'm in hitpose
if self.hitposetimer.tick(self.game.dt): if self.hitposetimer.tick(self.game.dt):