Merge branch 'devEffects' into devRefactor

src/Player/Player.gd

@@ -24,6 +24,8 @@ var _rng = RandomNumberGenerator.new()
 var is_playing_sound = false
 
 
+export(String, FILE, "*.tscn,*.scn") var title_scene = ""
+
 enum moveState{
 	MOVE,
 	ROLL,
@@ -34,6 +36,7 @@ enum moveState{
 var movementState = moveState.MOVE
 
 var damage_per_second := 0.0
+var heal_per_second := 0.0
 var totaldamage := 0.0
 
 var currency := 0
@@ -44,7 +47,7 @@ func _debug_update():
 	
 
 func _physics_process(delta):
-	totaldamage+=damage_per_second*delta
+	totaldamage+=(damage_per_second - heal_per_second)*delta
 	player_stats.speed+=10*delta
 	while(totaldamage>1):
 		totaldamage-=1
@@ -62,6 +65,8 @@ func _physics_process(delta):
 			moveState.HIT:
 				movement_hit()
 	
+	print(heal_per_second)
+	$"Effects/HealEffect".emitting = heal_per_second > 0.0
 	move()
 
 # IMPORTANT: If you are using move_and_slide don't multiply by delta
@@ -122,18 +127,30 @@ func roll_finished():
 
 func _on_Hurtbox_area_entered(area):
 	player_stats.health-=area.damage
-	damage_per_second = damage_per_second + area.damage
+	
+	print("enter")
+	
+	if area.damage > 0:
+		damage_per_second += area.damage
+	else:
+		heal_per_second += abs(area.damage)
 
 func _on_Hurtbox_area_exited(area):
-	damage_per_second = damage_per_second - area.damage
+	
+	if area.damage > 0:
+		damage_per_second -= area.damage
+	else:
+		heal_per_second -= abs(area.damage)
 
 
 func _on_Stats_no_health():
 	queue_free()
-	get_tree().change_scene("res://Menus/TitleScreen/TitleScreen.tscn")
+	get_tree().change_scene(title_scene)
 	
 
 func _on_Hitbox_area_entered(area):
 	currency += area.currency_value
 	player_stats.health = player_stats.health+area.health_value
 	player_stats.speed -= area.slowdown_value
+	
+	

src/Player/Player.tscn

@@ -11,6 +11,7 @@
 [ext_resource path="res://Player/States/Attack.gd" type="Script" id=14]
 [ext_resource path="res://Player/PlayerStateMachine.gd" type="Script" id=15]
 [ext_resource path="res://Player/States/Roll.gd" type="Script" id=16]
+[ext_resource path="res://Effects/Heal/HealEffect.tscn" type="PackedScene" id=7]
 
 [sub_resource type="CapsuleShape2D" id=1]
 radius = 2.15976
@@ -625,6 +626,7 @@ font_data = ExtResource( 6 )
 [node name="Player" type="KinematicBody2D"]
 script = ExtResource( 1 )
 FRICTION = 270
+title_scene = "res://Menus/TitleScreen/TitleScreen.tscn"
 
 [node name="Sprite" type="Sprite" parent="."]
 position = Vector2( 0.273621, 3.88423 )
@@ -731,6 +733,11 @@ script = ExtResource( 14 )
 
 [node name="Roll" type="Node" parent="AnimationStates"]
 script = ExtResource( 16 )
+[node name="Effects" type="Node" parent="."]
+
+[node name="HealEffect" parent="Effects" instance=ExtResource( 7 )]
+position = Vector2( 0, -3.24489 )
+emitting = false
 [connection signal="area_entered" from="Hitbox" to="." method="_on_Hitbox_area_entered"]
 [connection signal="area_entered" from="Hurtbox" to="." method="_on_Hurtbox_area_entered"]
 [connection signal="area_exited" from="Hurtbox" to="." method="_on_Hurtbox_area_exited"]