creyD/ludum_dare_46
1
0
Fork 0
mirror of https://github.com/creyD/ludum_dare_46.git synced 2026-06-13 22:12:23 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bos_testing' into devRefactor

Browse Source
This commit is contained in:
Jan Schuffenhauer
2020-04-19 18:30:31 +02:00
parent 1df204e987 1a58a9689e
commit bc37f6c010
1 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/Player/Player.gd
View File

@@ -56,28 +56,30 @@ func _physics_process(delta):
while(totaldamage < -1): while(totaldamage < -1):
totaldamage+=1 totaldamage+=1
player_stats.health+=1 player_stats.health+=1
adjustPrio(player_stats.health, player_stats.max_health) #adjustPrio(player_stats.health, player_stats.max_health)
_debug_update() _debug_update()
if debug == true: if debug == true:
match movementState: match movementState:
moveState.MOVE: moveState.MOVE:
movement_move(delta) movement_move(delta)
moveState.IDLE:
movement_move(delta)
moveState.ROLL: moveState.ROLL:
movement_roll() movement_roll()
moveState.HIT: moveState.HIT:
movement_hit() movement_hit()
elif movementState == moveState.ROLL:
movement_roll()
elif movementState == moveState.HIT:
movement_hit()
elif movementState == moveState.IDLE:
movement_idle()
else: else:
movement_run(Vector2(0,0), delta) if movementState == moveState.ROLL:
$"Effects/HealEffect".emitting = heal_per_second > 0 movement_roll()
makeMove(delta) elif movementState == moveState.HIT:
movement_hit()
elif movementState == moveState.IDLE:
movement_idle()
else:
movement_run(Vector2(0,0), delta)
makeMove(delta)
move() move()
$"Effects/HealEffect".emitting = heal_per_second > 0
# IMPORTANT: If you are using move_and_slide don't multiply by delta # IMPORTANT: If you are using move_and_slide don't multiply by delta
# Godots physics system does that internally # Godots physics system does that internally