a game about throwing hammers made for the github game off
Diffstat (limited to 'player/player.tscn')
-rw-r--r--player/player.tscn36
1 files changed, 27 insertions, 9 deletions
diff --git a/player/player.tscn b/player/player.tscn
index b5e9665..3c22ede 100644
--- a/player/player.tscn
+++ b/player/player.tscn
@@ -1,11 +1,10 @@
-[gd_scene load_steps=9 format=3 uid="uid://c1fgxkkh72npw"]
+[gd_scene load_steps=11 format=3 uid="uid://c1fgxkkh72npw"]
[ext_resource type="Script" path="res://player/player.gd" id="1_lnsyt"]
[ext_resource type="Texture2D" uid="uid://b36hv0jwfmb1u" path="res://assets/player/animations.png" id="2_dgplu"]
-
-[sub_resource type="CapsuleShape2D" id="CapsuleShape2D_bxmud"]
-radius = 3.0
-height = 12.0
+[ext_resource type="Shape2D" uid="uid://f1oxba248m0l" path="res://player/player_collision.tres" id="3_uoann"]
+[ext_resource type="PackedScene" uid="uid://qliv2erkwokh" path="res://colliders/hurtbox.tscn" id="4_yd6uo"]
+[ext_resource type="PackedScene" uid="uid://cdpkxaateaqdf" path="res://colliders/hitbox.tscn" id="5_wpn72"]
[sub_resource type="Animation" id="Animation_sbyxw"]
resource_name = "idle"
@@ -102,6 +101,7 @@ _data = {
[node name="player" type="CharacterBody2D"]
collision_layer = 2
+floor_max_angle = 0.802851
script = ExtResource("1_lnsyt")
[node name="Sprite" type="Sprite2D" parent="."]
@@ -110,10 +110,9 @@ position = Vector2(0, -14)
texture = ExtResource("2_dgplu")
hframes = 30
-[node name="CollisionShape2D" type="CollisionShape2D" parent="."]
-position = Vector2(0, -6)
-shape = SubResource("CapsuleShape2D_bxmud")
-debug_color = Color(0.811765, 0.360784, 0.529412, 0.419608)
+[node name="Collision" type="CollisionShape2D" parent="."]
+position = Vector2(0, -7)
+shape = ExtResource("3_uoann")
[node name="Player" type="AnimationPlayer" parent="."]
libraries = {
@@ -123,3 +122,22 @@ libraries = {
[node name="CoyoteJump" type="Timer" parent="."]
wait_time = 0.2
one_shot = true
+
+[node name="Hurtbox" parent="." instance=ExtResource("4_yd6uo")]
+collision_layer = 4
+
+[node name="Collision" parent="Hurtbox" index="0"]
+visible = false
+position = Vector2(0, -7)
+shape = ExtResource("3_uoann")
+
+[node name="Hitbox" parent="." instance=ExtResource("5_wpn72")]
+collision_mask = 8
+
+[node name="Collision" parent="Hitbox" index="0"]
+visible = false
+position = Vector2(0, -7)
+shape = ExtResource("3_uoann")
+
+[editable path="Hurtbox"]
+[editable path="Hitbox"]