diff --git a/gamedata/objects/combat/ennemies/spring.py b/gamedata/objects/combat/ennemies/spring.py index 094a785..f70fcdf 100644 --- a/gamedata/objects/combat/ennemies/spring.py +++ b/gamedata/objects/combat/ennemies/spring.py @@ -62,7 +62,7 @@ class Spring(Ennemy): self.longsfx.play() else: 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-=self.animspeed*self.game.dt diff --git a/gamedata/objects/combat/player.py b/gamedata/objects/combat/player.py index 6f4637c..5a03663 100644 --- a/gamedata/objects/combat/player.py +++ b/gamedata/objects/combat/player.py @@ -262,12 +262,13 @@ class Player(Movable): self.combo+=1 self.combotimer = 1 - def yeet(self,hor,ver): + def yeet(self,hor,ver,resetcombo=True): self.verspd = 0 - self.combo = 0 self.horkb = hor self.verkb = ver self.canfastfall = True + if resetcombo: + self.combo = 0 def draw(self): flipy = (self.gravityway<0 and not self.leaptimer<0)