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

Springs don't reset combo

Browse Source
This commit is contained in:
theo@manjaro 2021-11-20 22:01:44 +01:00
parent c3c45854bb
commit 1fc2e15a8f
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gamedata/objects/combat/ennemies/spring.py
View File

@ -62,7 +62,7 @@ class Spring(Ennemy):
self.longsfx.play() self.longsfx.play()
else: else:
self.sfx.play() self.sfx.play()
self.player.yeet(self.ratiox*force,self.ratioy*force) self.player.yeet(self.ratiox*force,self.ratioy*force,resetcombo=False)
self.spriteindex = len(self.sprites) self.spriteindex = len(self.sprites)
self.spriteindex-=self.animspeed*self.game.dt self.spriteindex-=self.animspeed*self.game.dt

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

@ -262,12 +262,13 @@ class Player(Movable):
self.combo+=1 self.combo+=1
self.combotimer = 1 self.combotimer = 1
def yeet(self,hor,ver): def yeet(self,hor,ver,resetcombo=True):
self.verspd = 0 self.verspd = 0
self.combo = 0
self.horkb = hor self.horkb = hor
self.verkb = ver self.verkb = ver
self.canfastfall = True self.canfastfall = True
if resetcombo:
self.combo = 0
def draw(self): def draw(self):
flipy = (self.gravityway<0 and not self.leaptimer<0) flipy = (self.gravityway<0 and not self.leaptimer<0)