Smaller player

gamedata/objects/combat/player.py

@@ -8,7 +8,9 @@ class Player(Movable):
         spawnpoint = game.lib.choice(self.tileset.spawns)
         self.rect.move_ip(spawnpoint.center)
 
-        self.sprite = game.sprite_lib["icon.png"]
+        self.sprite = game.sprite_lib["player/0.png"]
+        self.rect[2] = self.sprite.get_width()
+        self.rect[3] = self.sprite.get_height()
 
         self.speed = 200
 
@@ -33,13 +35,14 @@ class Player(Movable):
 
         self.attackstate = None
 
-        self.stepsize = 20
-
         self.gravity = 15
         self.maxgravity = 30
         self.jump = -5
         self.verspd = self.maxgravity
 
+        self.candash = False
+        self.canfastfall = False
+
         self.gravityway = 1
 
     def step(self):
@@ -60,6 +63,8 @@ class Player(Movable):
                 self.onceilling = False
                 if self.checkcollisions(0,self.gravityway):
                     self.onground = True
+                    self.candash = True
+                    self.canfastfall = True
                     if self.gravityway > 0:
                         self.verspd=min(0,self.verspd)
                     else:
@@ -86,12 +91,7 @@ class Player(Movable):
                     if 0<keys["up"]["timer"]<=3:
                         self.verspd= self.jump*self.gravityway
                         self.jumped = True
-                if self.verspd==0:
+                super().step()
-                    self.move(0,-self.stepsize*self.gravityway)
-                    super().step()
-                    self.move(0,self.stepsize*self.gravityway)
-                else:
-                    super().step()
 
                 # Reducing the knockback
                 if self.horkb>0:
@@ -112,8 +112,9 @@ class Player(Movable):
                             self.rect.bottom = semi.top+1
                             falled = True
                     if not falled: # Check for fastfall
-                        if abs(self.verspd) <= self.fastfallmargin and not self.onground:
+                        if self.canfastfall and abs(self.verspd) <= self.fastfallmargin and not self.onground:
                             self.verspd = self.maxgravity/5*self.gravityway
+                            self.canfastfall = False
 
         else: # If I'm in hitpose
             if self.hitposetimer.tick(self.game.dt):

gamedata/scenes.py

@@ -28,7 +28,7 @@ def fight(game):
     game.gameloop.summon(tileset)
     box = Hitbox(100,80,game)
     game.gameloop.summon(box)
-    water = Water(200,game)
+    water = Water(250,game)
     game.gameloop.summon(water)
     p1 = Player(game)
     game.gameloop.summon(p1)