More work on combat

2025-10-09 14:52:47 -04:00
parent 7563e99059
commit 9a216d3285
44 changed files with 547 additions and 103 deletions
--- a/templates/enemies/goo.tscn
+++ b/templates/enemies/goo.tscn
@@ -1,13 +1,192 @@
-[gd_scene load_steps=9 format=3 uid="uid://c31w28fcqw4ra"]
+[gd_scene load_steps=18 format=3 uid="uid://c31w28fcqw4ra"]

 [ext_resource type="Script" uid="uid://fxixa11vqdrn" path="res://scripts/enemy.gd" id="1_82j8k"]
-[ext_resource type="Texture2D" uid="uid://1mkagt2y0jah" path="res://graphics/questview/goo.png" id="2_87tms"]
 [ext_resource type="Script" uid="uid://727tgvtmq4nb" path="res://data/statblock.gd" id="2_fehp8"]
+[ext_resource type="Texture2D" uid="uid://cf31h0xgcc2yi" path="res://graphics/questview/goo shadow.png" id="3_bfuvr"]
+[ext_resource type="Shader" uid="uid://ctod7r3yre02d" path="res://shaders/nonvariant_sprite.gdshader" id="4_h6sl2"]
+[ext_resource type="Texture2D" uid="uid://bmkpn7sex6buo" path="res://graphics/questview/goo-sheet.png" id="4_rigyd"]

 [sub_resource type="Resource" id="Resource_bfuvr"]
 script = ExtResource("2_fehp8")
 metadata/_custom_type_script = "uid://727tgvtmq4nb"

+[sub_resource type="ShaderMaterial" id="ShaderMaterial_h6sl2"]
+resource_local_to_scene = true
+shader = ExtResource("4_h6sl2")
+shader_parameter/flash = false
+shader_parameter/flash_strength = 0.4
+shader_parameter/highlight = Color(1, 1, 1, 0)
+
+[sub_resource type="Animation" id="Animation_fnqwt"]
+resource_name = "idle"
+tracks/0/type = "value"
+tracks/0/imported = false
+tracks/0/enabled = true
+tracks/0/path = NodePath("Sprite:frame")
+tracks/0/interp = 1
+tracks/0/loop_wrap = true
+tracks/0/keys = {
+"times": PackedFloat32Array(0),
+"transitions": PackedFloat32Array(1),
+"update": 1,
+"values": [0]
+}
+
+[sub_resource type="Animation" id="Animation_q2yeo"]
+resource_name = "attack"
+length = 0.80000335
+tracks/0/type = "value"
+tracks/0/imported = false
+tracks/0/enabled = true
+tracks/0/path = NodePath("Sprite:frame")
+tracks/0/interp = 1
+tracks/0/loop_wrap = true
+tracks/0/keys = {
+"times": PackedFloat32Array(0, 0.16666667, 0.33333334, 0.36666667, 0.43333334, 0.49999997),
+"transitions": PackedFloat32Array(1, 1, 1, 1, 1, 1),
+"update": 1,
+"values": [8, 9, 10, 11, 12, 13]
+}
+tracks/1/type = "method"
+tracks/1/imported = false
+tracks/1/enabled = true
+tracks/1/path = NodePath(".")
+tracks/1/interp = 1
+tracks/1/loop_wrap = true
+tracks/1/keys = {
+"times": PackedFloat32Array(0.33333334, 0.5),
+"transitions": PackedFloat32Array(1, 1),
+"values": [{
+"args": [],
+"method": &"trigger_hit"
+}, {
+"args": [true, "idle"],
+"method": &"complete_action"
+}]
+}
+
+[sub_resource type="Animation" id="Animation_rfgh2"]
+length = 0.001
+tracks/0/type = "value"
+tracks/0/imported = false
+tracks/0/enabled = true
+tracks/0/path = NodePath("Sprite:frame")
+tracks/0/interp = 1
+tracks/0/loop_wrap = true
+tracks/0/keys = {
+"times": PackedFloat32Array(0),
+"transitions": PackedFloat32Array(1),
+"update": 1,
+"values": [9]
+}
+tracks/1/type = "value"
+tracks/1/imported = false
+tracks/1/enabled = true
+tracks/1/path = NodePath("Sprite:position")
+tracks/1/interp = 1
+tracks/1/loop_wrap = true
+tracks/1/keys = {
+"times": PackedFloat32Array(0),
+"transitions": PackedFloat32Array(1),
+"update": 0,
+"values": [Vector2(0, -48)]
+}
+tracks/2/type = "value"
+tracks/2/imported = false
+tracks/2/enabled = true
+tracks/2/path = NodePath("Sprite:material:shader_parameter/highlight")
+tracks/2/interp = 1
+tracks/2/loop_wrap = true
+tracks/2/keys = {
+"times": PackedFloat32Array(0),
+"transitions": PackedFloat32Array(1),
+"update": 0,
+"values": [Color(1, 1, 1, 0)]
+}
+
+[sub_resource type="Animation" id="Animation_t5s0y"]
+resource_name = "running"
+length = 0.46667004
+loop_mode = 1
+tracks/0/type = "value"
+tracks/0/imported = false
+tracks/0/enabled = true
+tracks/0/path = NodePath("Sprite:frame")
+tracks/0/interp = 1
+tracks/0/loop_wrap = true
+tracks/0/keys = {
+"times": PackedFloat32Array(0, 0.06666667, 0.13333333, 0.20000002, 0.26666668, 0.33333334, 0.40000004),
+"transitions": PackedFloat32Array(1, 1, 1, 1, 1, 1, 1),
+"update": 1,
+"values": [2, 3, 4, 5, 6, 7, 1]
+}
+
+[sub_resource type="Animation" id="Animation_in6p1"]
+resource_name = "hurt"
+length = 0.23333667
+tracks/0/type = "value"
+tracks/0/imported = false
+tracks/0/enabled = true
+tracks/0/path = NodePath("Sprite:frame")
+tracks/0/interp = 1
+tracks/0/loop_wrap = true
+tracks/0/keys = {
+"times": PackedFloat32Array(0, 0.099999994, 0.13333333, 0.16666667, 0.2),
+"transitions": PackedFloat32Array(1, 1, 1, 1, 1),
+"update": 1,
+"values": [14, 15, 16, 17, 18]
+}
+tracks/1/type = "value"
+tracks/1/imported = false
+tracks/1/enabled = true
+tracks/1/path = NodePath("Sprite:position")
+tracks/1/interp = 1
+tracks/1/loop_wrap = true
+tracks/1/keys = {
+"times": PackedFloat32Array(0, 0.06666667, 0.16666667, 0.23333335),
+"transitions": PackedFloat32Array(1, 1, 1, 1),
+"update": 0,
+"values": [Vector2(0, -48), Vector2(0, -60), Vector2(0, -48), Vector2(0, -48)]
+}
+tracks/2/type = "value"
+tracks/2/imported = false
+tracks/2/enabled = true
+tracks/2/path = NodePath("Sprite:material:shader_parameter/highlight")
+tracks/2/interp = 1
+tracks/2/loop_wrap = true
+tracks/2/keys = {
+"times": PackedFloat32Array(0, 0.1, 0.16666667),
+"transitions": PackedFloat32Array(1, 1, 1),
+"update": 0,
+"values": [Color(1, 1, 1, 0), Color(1, 1, 1, 1), Color(1, 1, 1, 0)]
+}
+tracks/3/type = "method"
+tracks/3/imported = false
+tracks/3/enabled = true
+tracks/3/path = NodePath(".")
+tracks/3/interp = 1
+tracks/3/loop_wrap = true
+tracks/3/keys = {
+"times": PackedFloat32Array(0, 0.23333333),
+"transitions": PackedFloat32Array(1, 1),
+"values": [{
+"args": [0.2],
+"method": &"knockback"
+}, {
+"args": [false, "idle"],
+"method": &"complete_action"
+}]
+}
+
+[sub_resource type="AnimationLibrary" id="AnimationLibrary_45clm"]
+_data = {
+&"RESET": SubResource("Animation_rfgh2"),
+&"attack": SubResource("Animation_q2yeo"),
+&"hurt": SubResource("Animation_in6p1"),
+&"idle": SubResource("Animation_fnqwt"),
+&"running": SubResource("Animation_t5s0y")
+}
+
 [sub_resource type="Gradient" id="Gradient_nqdtq"]
 offsets = PackedFloat32Array(0)
 colors = PackedColorArray(0, 0, 0, 1)
@@ -28,13 +207,27 @@ width = 1
 layout_mode = 3
 anchors_preset = 0
 script = ExtResource("1_82j8k")
+life = 10
+max_life = 10
 stats = SubResource("Resource_bfuvr")

-[node name="Sprite2D" type="Sprite2D" parent="."]
+[node name="Shadow" type="Sprite2D" parent="."]
+modulate = Color(0, 0, 0, 0.57254905)
 position = Vector2(0, -48)
-texture = ExtResource("2_87tms")
+texture = ExtResource("3_bfuvr")
+
+[node name="Sprite" type="Sprite2D" parent="."]
+material = SubResource("ShaderMaterial_h6sl2")
+position = Vector2(0, -48)
+texture = ExtResource("4_rigyd")
+hframes = 8
+vframes = 3
+frame = 9

 [node name="AnimationPlayer" type="AnimationPlayer" parent="."]
+libraries = {
+&"": SubResource("AnimationLibrary_45clm")
+}

 [node name="LifeBar" type="TextureProgressBar" parent="."]
 layout_mode = 0
@@ -47,3 +240,6 @@ texture_under = SubResource("GradientTexture1D_fehp8")
 texture_progress = SubResource("GradientTexture1D_bfuvr")
 tint_over = Color(1, 0, 0, 1)
 tint_progress = Color(1, 0, 0, 1)
+
+[node name="BannerOffset" type="Node2D" parent="."]
+position = Vector2(0, -57)