Merge branch 'devEffects' into devRefactor

This commit is contained in:
Paul Norberger
2020-04-19 13:13:03 +02:00
11 changed files with 141 additions and 24 deletions

View File

@@ -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"]