Small player refactor

global/ExtraPhysicsAttributes.gd

@@ -1,3 +1,4 @@
 extends Node
 
+## Prevents the player from sliding/walljumping
 @export var no_wallslide := false

player/Player.tscn

@@ -11,7 +11,6 @@
 [ext_resource type="Script" path="res://state_machine/Dash.gd" id="8_cenpi"]
 [ext_resource type="Script" path="res://state_machine/Wallslide.gd" id="8_g5obm"]
 [ext_resource type="Shape2D" uid="uid://c1iuvxx2i661g" path="res://player/shape.tres" id="9_lka70"]
-[ext_resource type="Script" path="res://state_machine/misc/HitBox.gd" id="10_anmyf"]
 [ext_resource type="Script" path="res://state_machine/misc/HurtBox.gd" id="10_mejgj"]
 [ext_resource type="Script" path="res://state_machine/Death.gd" id="12_33ksn"]
 [ext_resource type="Texture2D" uid="uid://c25ofwwebxe3m" path="res://assets/characters/player/atk/atk d.png" id="12_hw4yd"]
@@ -39,6 +38,7 @@
 [ext_resource type="Texture2D" uid="uid://bqxyd08o0jo33" path="res://assets/characters/player/respawn/respawn.png" id="28_opbni"]
 [ext_resource type="Texture2D" uid="uid://8cpq5vfdeio4" path="res://assets/characters/player/wallslide/wallslide l.png" id="29_3n5cc"]
 [ext_resource type="AudioStream" uid="uid://bahjna6lj84iw" path="res://assets/sounds/hurt.mp3" id="37_3cxyn"]
+[ext_resource type="PackedScene" uid="uid://1x4yec1dhsr2" path="res://state_machine/misc/HitBox.tscn" id="39_n188b"]
 
 [sub_resource type="Curve" id="Curve_w1mwi"]
 max_value = 300.0
@@ -507,36 +507,27 @@ stream = ExtResource("37_3cxyn")
 
 [node name="Hitboxes" type="Node2D" parent="."]
 
-[node name="Up" type="Area2D" parent="Hitboxes"]
-collision_layer = 0
+[node name="Up" parent="Hitboxes" instance=ExtResource("39_n188b")]
 collision_mask = 2
-script = ExtResource("10_anmyf")
 active = false
-damage = 10
 
 [node name="Shape" type="CollisionShape2D" parent="Hitboxes/Up"]
 position = Vector2(0, -70)
 rotation = 1.5708
 shape = SubResource("CapsuleShape2D_tyvbo")
 
-[node name="Down" type="Area2D" parent="Hitboxes"]
-collision_layer = 0
+[node name="Down" parent="Hitboxes" instance=ExtResource("39_n188b")]
 collision_mask = 2
-script = ExtResource("10_anmyf")
 active = false
-damage = 10
 
 [node name="Shape" type="CollisionShape2D" parent="Hitboxes/Down"]
 position = Vector2(0, 72)
 rotation = 1.5708
 shape = SubResource("CapsuleShape2D_vt7h5")
 
-[node name="Side" type="Area2D" parent="Hitboxes"]
-collision_layer = 0
+[node name="Side" parent="Hitboxes" instance=ExtResource("39_n188b")]
 collision_mask = 2
-script = ExtResource("10_anmyf")
 active = false
-damage = 10
 
 [node name="Shape" type="CollisionShape2D" parent="Hitboxes/Side"]
 position = Vector2(77, -6)

state_machine/misc/HitBox.gd

@@ -1,4 +1,4 @@
-extends Area2D
+extends Node2D
 ## Generic hitbox, lingering or not
 
 signal hit(data)  ## If actor using this wants to know if something is hit
@@ -20,34 +20,32 @@ signal hit(data)  ## If actor using this wants to know if something is hit
 # During one hit, the same hurtbox can only be hit once
 var hits := {}
 
-func _ready():
-	area_entered.connect(_on_area_entered)
-	area_exited.connect(_on_area_exited)
-
 ## Hitting something emits a signal and calls hit on the victim
 func _hit_something(what):
-	var data := {
-		"damage": damage,
-		"hitbox": self,
-		"knockback": Vector2(
-			knockback.x if what.global_position.x - global_position.x > 0 
-					else -knockback.x, 
-			knockback.y
-		)
-	}
-	what.hit(data)
-	hit.emit(data)
+	if active:
+		var data := {
+			"damage": damage,
+			"hitbox": self,
+			"knockback": Vector2(
+				knockback.x if what.global_position.x - global_position.x > 0 
+						else -knockback.x, 
+				knockback.y
+			)
+		}
+		what.hit(data)
+		hit.emit(data)
 
 func _process(_delta):
 	if lingering:
 		for node in hits:
 			_hit_something(node)
 
-func _on_area_entered(area):
+
+func actor_enter(area):
 	if hits.has(area):
 		return
 	hits[area] = true
 	_hit_something(area)
 
-func _on_area_exited(area):
+func actor_exit(area):
 	hits.erase(area)

state_machine/misc/HitBox.tscn

@@ -7,3 +7,6 @@ collision_layer = 0
 collision_mask = 4
 script = ExtResource("1_wc5uu")
 knockback = Vector2(200, -200)
+
+[connection signal="area_entered" from="." to="." method="actor_enter"]
+[connection signal="area_exited" from="." to="." method="actor_exit"]

test_levels/feature_showcase/world_hazards.tscn

@@ -19,7 +19,7 @@ inherit_limit = true
 
 [node name="Collision" type="TileMapLayer" parent="."]
 scale = Vector2(0.5, 0.5)
-tile_map_data = PackedByteArray("AAAAABAAAAAAAAAAAAABABAAAAAAAAAAAAACABAAAAAAAAAAAAADABAAAAAAAAAAAAAEABAAAAAAAAAAAAAFABAAAAAAAAAAAAAGABAAAAAAAAAAAAAHABAAAAAAAAAAAAAIABAAAAAAAAAAAAAJABAAAAAAAAAAAAAKABAAAAAAAAAAAAALABAAAAAAAAAAAAAMABAAAAAAAAAAAAANABAAAAAAAAAAAAAOABAAAAAAAAAAAAAPABAAAAAAAAAAAAAQABAAAAAAAAAAAAARABAAAAAAAAAAAAASABAAAAAAAAAAAAATABAAAAAAAAAAAAAUABAAAAAAAAAAAAAVABAAAAAAAAAAAAAWABAAAAAAAAAAAAAXABAAAAAAAAAAAAAYABAAAAAAAAAAAAAZABAAAAAAAAAAAAAaABAAAAAAAAAAAAAbABAAAAAAAAAAAAAcABAAAAAAAAAAAAAdABAAAAAAAAAAAAA=")
+tile_map_data = PackedByteArray("AAAAABAAAAAAAAAAAAABABAAAAAAAAAAAAACABAAAAAAAAAAAAADABAAAAAAAAAAAAAEABAAAAAAAAAAAAAFABAAAAAAAAAAAAAGABAAAAAAAAAAAAAHABAAAAAAAAAAAAAIABAAAAAAAAAAAAAJABAAAAAAAAAAAAAKABAAAAAAAAAAAAALABAAAAAAAAAAAAAMABAAAAAAAAAAAAANABAAAAAAAAAAAAAOABAAAAAAAAAAAAAPABAAAAAAAAAAAAAQABAAAAAAAAAAAAARABAAAAAAAAAAAAASABAAAAAAAAAAAAATABAAAAAAAAAAAAAUABAAAAAAAAAAAAAVABAAAAAAAAAAAAAWABAAAAAAAAAAAAAXABAAAAAAAAAAAAAYABAAAAAAAAAAAAAZABAAAAAAAAAAAAAaABAAAAAAAAAAAAAbABAAAAAAAAAAAAAcABAAAAAAAAAAAAAdABAAAAAAAAAAAAANAA4AAAAAAAAAAAANAA8AAAAAAAAAAAASAA4AAAAAAAAAAAASAA8AAAAAAAAAAAA=")
 tile_set = ExtResource("2_l8ggp")
 
 [node name="NoSlide" type="TileMapLayer" parent="."]
@@ -30,6 +30,14 @@ tile_set = ExtResource("2_l8ggp")
 script = ExtResource("3_g21q1")
 no_wallslide = true
 
+[node name="Acid" type="TileMapLayer" parent="."]
+modulate = Color(0.900298, 0.753927, 0.894313, 1)
+scale = Vector2(0.5, 0.5)
+tile_map_data = PackedByteArray("AAAOAA8AAAAAAAAAAAAPAA8AAAAAAAAAAAAQAA8AAAAAAAAAAAARAA8AAAAAAAAAAAA=")
+tile_set = ExtResource("2_l8ggp")
+script = ExtResource("3_g21q1")
+no_wallslide = true
+
 [node name="SceneTransition" parent="." instance=ExtResource("3_fe1fg")]
 position = Vector2(161, 958)
 walk = false