the damage system refactor!

killing is now done based on groups, the same way enemies already killed
the player.

these groups go on the entity's hitbox, not the entity itself.
enemies' hitboxes have all been put in "enemy_hitbox"

the arrow_projectile has a variable for the target group, so it could
easily be simply set to "player" for arrows shot by enemies

blocking is also done with groups. any hitbox with "blocks_arrow"
will block arrows, same with "blocks_sword" and "blocks_squash"

objects/player/arrow_projectile.gd

@@ -1,16 +1,24 @@
 extends Node2D
 
-onready var cull_edge = Vector2(5 * scale.x,0) #Edge to check culling, if this edge is offscreen, delete the arrow
+export var speed = 240.0
+
+# group to kill
+var target_group = "enemy_hitbox"
+# direction to fly
+var direction = 1.0
+
+#Edge to check culling, if this edge is offscreen, delete the arrow
+onready var cull_edge = Vector2(5 * direction,0)
 onready var player = get_parent().get_node("Player")
 onready var initial_sector = Game.get_sector(player.global_position)
 
 func _ready():
-	#Flip depending on player facing
-	scale.x = player.sprite.scale.x
+	#Flip depending on direction
+	scale.x = direction
 
 func _physics_process(delta):
-	#Move in flip direction
-	position.x += 4 * scale.x
+	#Move in right direction
+	position.x += speed * direction * delta
 	#Delete when offscreen
 	if Game.get_sector(global_position + cull_edge) != initial_sector:
 		queue_free()
@@ -22,10 +30,24 @@ func _exit_tree():
 	particles.global_position = global_position
 	particles.emitting = false
 	get_parent().add_child(particles)
-	particles.get_node("DeathTimer").start()
+	get_tree().create_timer(particles.lifetime, false).connect("timeout", particles, "queue_free")
 
 #Wall Collision
-func _on_Area2D_body_entered(body):
+func _on_Hitbox_body_entered(body):
 	if body is TileMap or body is StaticBody2D:
 		queue_free()
 
+# kill entity if in target group
+func _on_Hitbox_area_entered(area):
+	# block if collided area is in "blocks_arrow" group
+	if area.is_in_group(target_group):
+		var target = area.get_parent()
+		# create block text and return if blocked
+		if area.is_in_group("blocks_arrow"):
+			var pos = target.global_position
+			Game.instance_node(Game.block_text, pos.x, pos.y, target.get_parent())
+		else:
+			# kill targeted node
+			target.die()
+			Game.arrows = max(0, Game.arrows - 1) # clamp arrows above 0
+		queue_free()

objects/player/arrow_projectile.tscn

@@ -52,15 +52,12 @@ local_coords = false
 process_material = SubResource( 5 )
 texture = ExtResource( 4 )
 
-[node name="DeathTimer" type="Timer" parent="DustParticles"]
-one_shot = true
+[node name="Hitbox" type="Area2D" parent="." groups=["arrow"]]
+collision_layer = 0
 
-[node name="Area2D" type="Area2D" parent="." groups=["arrow"]]
-visible = false
-
-[node name="CollisionShape2D" type="CollisionShape2D" parent="Area2D"]
+[node name="CollisionShape2D" type="CollisionShape2D" parent="Hitbox"]
 position = Vector2( -0.5, -0.5 )
 shape = SubResource( 2 )
 
-[connection signal="timeout" from="DustParticles/DeathTimer" to="DustParticles" method="queue_free"]
-[connection signal="body_entered" from="Area2D" to="." method="_on_Area2D_body_entered"]
+[connection signal="area_entered" from="Hitbox" to="." method="_on_Hitbox_area_entered"]
+[connection signal="body_entered" from="Hitbox" to="." method="_on_Hitbox_body_entered"]

objects/player/player.gd

@@ -1,5 +1,7 @@
 extends KinematicBody2D
 
+const ArrowProjectile = preload("res://objects/player/arrow_projectile.tscn")
+
 ##CLEAN UP CODE LATER
 ##Children
 onready var sprite = $Sprite
@@ -30,7 +32,6 @@ var can_move_in_air = false
 	#Positions
 var arrowpos = Vector2(5,3)
 ##Preload
-var pre_arrow = preload("res://objects/player/arrow_projectile.tscn")
 
 #Set initial respawn point
 func _ready():
@@ -187,7 +188,13 @@ func _process_shoot():
 
 func spawn_arrow():
 	Game.play_sound(Game.a_shoot,Game.ac_jump)
-	Game.instance_node(pre_arrow,global_position.x+(arrowpos.x*sprite.scale.x),global_position.y+arrowpos.y,map)
+	var arrow = ArrowProjectile.instance()
+	arrow.global_position = Vector2(
+		global_position.x + arrowpos.x * sprite.scale.x,
+		global_position.y + arrowpos.y
+	)
+	arrow.direction = sprite.scale.x
+	map.add_child(arrow)
 
 func check_jump():
 	if Input.is_action_just_pressed("jump"):
@@ -291,3 +298,15 @@ func _on_AnimationPlayer_animation_finished(anim_name):
 		else:
 			current_state = State.FALL
 			return
+
+
+func _on_SwordArea_area_entered(area):
+	if area.is_in_group("enemy_hitbox"):
+		var target = area.get_parent()
+		# create block text and return if blocked
+		if area.is_in_group("blocks_sword"):
+			var pos = target.global_position
+			Game.instance_node(Game.block_text, pos.x, pos.y, target.get_parent())
+			return
+		else:
+			target.die()

objects/player/player.tscn

@@ -731,3 +731,4 @@ process_material = SubResource( 45 )
 texture = ExtResource( 16 )
 
 [connection signal="animation_finished" from="AnimationPlayer" to="." method="_on_AnimationPlayer_animation_finished"]
+[connection signal="area_entered" from="SwordArea" to="." method="_on_SwordArea_area_entered"]