2121578
/
sep-pm-platformer
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main' into main 

# Conflicts:
#	project/data/levels/level-01.csv
main
Yan Wittmann 2023-03-28 20:01:23 +02:00
parent 33ada24b84 6770e9495a
commit beea6b1ee8
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
project/physics/sprites/PlayerSprite.py
View File

@ -16,7 +16,7 @@ class PlayerSprite(DynamicSprite):
self.deceleration_horizontal_air = 0.2 self.deceleration_horizontal_air = 0.2
self.deceleration_horizontal_ground = 0.4 self.deceleration_horizontal_ground = 0.4
self.gravity = 9.81 / 12 self.gravity = 9.81 / 10
self.max_motion_horizontal_via_input = 5 self.max_motion_horizontal_via_input = 5
@ -34,7 +34,7 @@ class PlayerSprite(DynamicSprite):
if tick_data.key_manager.is_keymap_down(KeyManager.KEY_UP): if tick_data.key_manager.is_keymap_down(KeyManager.KEY_UP):
if self.jump_time < 0 and self.get_collides_with_direction(CollisionDirection.BOTTOM): if self.jump_time < 0 and self.get_collides_with_direction(CollisionDirection.BOTTOM):
self.jump_time = self.allowed_jump_time self.jump_time = self.allowed_jump_time
self.motion = (self.motion[0], self.motion[1] - 8) self.motion = (self.motion[0], self.motion[1] - 6)
if self.jump_time >= 0: if self.jump_time >= 0:
self.motion = (self.motion[0], self.motion[1] - 0.55) self.motion = (self.motion[0], self.motion[1] - 0.55)
if self.jump_time >= 0: if self.jump_time >= 0: