creyD/ludum_dare_46
1
0
Fork 0
mirror of https://github.com/creyD/ludum_dare_46.git synced 2026-06-13 14:02: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:26:34 +02:00
parent 92b97972bf dd227744ac
commit 19dcf6e135
5 changed files with 40 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/Player/Player.gd
View File

@@ -56,6 +56,7 @@ func _physics_process(delta):
while(totaldamage < -1):
totaldamage+=1
player_stats.health+=1
adjustPrio(player_stats.health, player_stats.max_health)
_debug_update()
if debug == true:
match movementState:
@@ -185,7 +186,7 @@ func _on_Hurtbox_area_exited(area):
func _on_Stats_no_health():
queue_free()
get_tree().change_scene(title_scene)
get_tree().change_scene("res://Menus/TitleScreen/TitleScreen.tscn")
func _on_Hitbox_area_entered(area):

1
src/Player/Player.tscn
View File

@@ -627,7 +627,6 @@ font_data = ExtResource( 6 )
[node name="Player" type="KinematicBody2D"]
script = ExtResource( 1 )
FRICTION = 270
title_scene = "res://Menus/TitleScreen/TitleScreen.tscn"
[node name="Kind" parent="." instance=ExtResource( 7 )]
kind = 1