diff --git a/src/components/Hurtbox_Component.tscn b/src/components/Hurtbox_Component.tscn index ab88124..1fadb17 100644 --- a/src/components/Hurtbox_Component.tscn +++ b/src/components/Hurtbox_Component.tscn @@ -1,13 +1,10 @@ [gd_scene load_steps=2 format=2] -[sub_resource type="RectangleShape2D" id=148] -extents = Vector2( 11.5, 14.5 ) +[ext_resource path="res://src/components/Hurtbox_Component.gd" type="Script" id=1] [node name="Hurtbox_Component" type="Area2D"] collision_layer = 16 collision_mask = 128 +script = ExtResource( 1 ) -[node name="CollisionShape2D" type="CollisionShape2D" parent="."] -self_modulate = Color( 1, 0, 0, 1 ) -position = Vector2( 0, -4 ) -shape = SubResource( 148 ) +[connection signal="body_entered" from="." to="." method="_on_Hurtbox_Component_body_entered"] diff --git a/src/enemyC/EnemyC.tscn b/src/enemyC/EnemyC.tscn index 67ee225..7c395f6 100644 --- a/src/enemyC/EnemyC.tscn +++ b/src/enemyC/EnemyC.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=25 format=2] +[gd_scene load_steps=26 format=2] [ext_resource path="res://src/templates/Actor/ActorTemplate.tscn" type="PackedScene" id=1] [ext_resource path="res://src/enemyC/enemyC_movement_component.gd" type="Script" id=2] @@ -107,6 +107,9 @@ animations = [ { "speed": 10.0 } ] +[sub_resource type="RectangleShape2D" id=22] +extents = Vector2( 10, 16 ) + [sub_resource type="RectangleShape2D" id=21] extents = Vector2( 9, 3.5 ) @@ -117,7 +120,7 @@ actor_type = "Enemy" position = Vector2( 11, -7 ) frames = SubResource( 20 ) animation = "idle" -frame = 0 +frame = 1 __meta__ = { "_aseprite_wizard_config_": { "layer": "", @@ -156,6 +159,10 @@ animation_sequence = [ "attack" ] [node name="move" parent="movement_state_machine" index="3"] animation_sequence = [ "walk" ] +[node name="CollisionShape2D" parent="Hurtbox_Component" index="0"] +position = Vector2( -1, -2 ) +shape = SubResource( 22 ) + [node name="EdgeDetection" type="RayCast2D" parent="." index="6"] modulate = Color( 0.054902, 1, 0, 1 ) show_behind_parent = true diff --git a/src/playerC/Player.tscn b/src/playerC/Player.tscn index 88706a6..9c9504c 100644 --- a/src/playerC/Player.tscn +++ b/src/playerC/Player.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=90 format=2] +[gd_scene load_steps=91 format=2] [ext_resource path="res://src/playerC/Player-KinematicBody2D.gd" type="Script" id=1] [ext_resource path="res://src/playerC/states/idle.gd" type="Script" id=2] @@ -414,6 +414,9 @@ animations = [ { [sub_resource type="RectangleShape2D" id=74] extents = Vector2( 14, 18.5 ) +[sub_resource type="RectangleShape2D" id=149] +extents = Vector2( 10.5, 16.5 ) + [node name="Player" type="KinematicBody2D"] collision_layer = 2 script = ExtResource( 1 ) @@ -507,6 +510,11 @@ animation_suffix = true [node name="Hurtbox_Component" parent="." instance=ExtResource( 12 )] +[node name="CollisionShape2D" type="CollisionShape2D" parent="Hurtbox_Component"] +modulate = Color( 1, 0, 0, 1 ) +position = Vector2( 0.5, -3.5 ) +shape = SubResource( 149 ) + [node name="Gun" type="Position2D" parent="."] physics_interpolation_mode = 1 position = Vector2( 25, -5 ) diff --git a/src/templates/Actor/ActorTemplate.tscn b/src/templates/Actor/ActorTemplate.tscn index d976779..ce78fe1 100644 --- a/src/templates/Actor/ActorTemplate.tscn +++ b/src/templates/Actor/ActorTemplate.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=17 format=2] +[gd_scene load_steps=18 format=2] [ext_resource path="res://src/components/Hurtbox_Component.tscn" type="PackedScene" id=1] [ext_resource path="res://src/state_machine_animated_actor.gd" type="Script" id=2] @@ -44,13 +44,15 @@ animations = [ { [sub_resource type="RectangleShape2D" id=74] extents = Vector2( 14, 18.5 ) +[sub_resource type="CircleShape2D" id=82] + [node name="ActorTemplate" type="KinematicBody2D"] collision_layer = 2 script = ExtResource( 8 ) [node name="AnimatedSprite" type="AnimatedSprite" parent="."] frames = SubResource( 75 ) -frame = 1 +frame = 4 playing = true flip_h = true __meta__ = { @@ -96,4 +98,9 @@ idle_node = NodePath("../idle") [node name="Hurtbox_Component" parent="." instance=ExtResource( 1 )] +[node name="CollisionShape2D" type="CollisionShape2D" parent="Hurtbox_Component"] +modulate = Color( 1, 0, 0, 1 ) +position = Vector2( -1, 1 ) +shape = SubResource( 82 ) + [node name="SE_Player" type="AudioStreamPlayer" parent="."]