diff --git a/gamedata/assets/player/combo/2.png b/gamedata/assets/player/combo/2.png index ced6ddd..3c58ea4 100644 Binary files a/gamedata/assets/player/combo/2.png and b/gamedata/assets/player/combo/2.png differ diff --git a/gamedata/assets/player/combo/3.png b/gamedata/assets/player/combo/3.png index 7315467..7b6758e 100644 Binary files a/gamedata/assets/player/combo/3.png and b/gamedata/assets/player/combo/3.png differ diff --git a/gamedata/assets/player/combo/4.png b/gamedata/assets/player/combo/4.png index 554f9fa..58b4d9d 100644 Binary files a/gamedata/assets/player/combo/4.png and b/gamedata/assets/player/combo/4.png differ diff --git a/gamedata/assets/player/combo/5.png b/gamedata/assets/player/combo/5.png new file mode 100644 index 0000000..1b8b2ba Binary files /dev/null and b/gamedata/assets/player/combo/5.png differ diff --git a/gamedata/assets/player/combo/6.png b/gamedata/assets/player/combo/6.png new file mode 100644 index 0000000..64ee9b5 Binary files /dev/null and b/gamedata/assets/player/combo/6.png differ diff --git a/gamedata/objects/combat/player.py b/gamedata/objects/combat/player.py index 8f242a8..c2a7d86 100644 --- a/gamedata/objects/combat/player.py +++ b/gamedata/objects/combat/player.py @@ -71,6 +71,7 @@ class Player(Movable): self.combo = 0 self.combosprites = self.game.getSpriteDir("player/combo/") + self.combotimer = 1 def step(self): @@ -126,6 +127,8 @@ class Player(Movable): self.attackstate(self) # Si je suis sur le sol self.onground = False self.onceilling = False + if self.combotimer>=0: + self.combotimer-=self.game.dt*5 # Cancel fastfall if not enough speed if abs(self.verspd)<5: self.fastfall = 0 @@ -233,12 +236,13 @@ class Player(Movable): def upcombo(self): - # Up the combo and spawn particles - if self.combo>=1: - index = min(self.combo-1,len(self.combosprites)-1) - self.game.addParticle([self.combosprites[index]],self.rect.center[0],self.rect.top,fps=1) - - self.combo+=1 + if self.combotimer<=0: + # Up the combo and spawn particles + if self.combo>=1: + index = min(self.combo-1,len(self.combosprites)-1) + self.game.addParticle([self.combosprites[index]],self.rect.center[0],self.rect.top,fps=1) + self.combo+=1 + self.combotimer = 1 def draw(self): flipy = (self.gravityway<0 and not self.leaptimer<0)