Puppyfruit-Games/Decked-Out-Defense
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev'

Browse Source
This commit is contained in:
Lexi Quinn
2026-02-11 10:30:32 +11:00
parent 0fc6603ec5 7ae8090c38
commit e29db75123
10 changed files with 85 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
Enemies/Crystalisk/scn_crystalisk.tscn
View File

@@ -4,7 +4,7 @@
[ext_resource type="PackedScene" uid="uid://o6whohcbalui" path="res://Enemies/Crystalisk/mdl_crystalisk.glb" id="2_myjng"] [ext_resource type="PackedScene" uid="uid://o6whohcbalui" path="res://Enemies/Crystalisk/mdl_crystalisk.glb" id="2_myjng"]
[ext_resource type="Script" uid="uid://cummt2be3r1gq" path="res://Scripts/hitbox.gd" id="3_myjng"] [ext_resource type="Script" uid="uid://cummt2be3r1gq" path="res://Scripts/hitbox.gd" id="3_myjng"]
[sub_resource type="ViewportTexture" id="ViewportTexture_ij8ev"] [sub_resource type="ViewportTexture" id="ViewportTexture_ngren"]
viewport_path = NodePath("SubViewport") viewport_path = NodePath("SubViewport")
[sub_resource type="CapsuleShape3D" id="CapsuleShape3D_c5uwa"] [sub_resource type="CapsuleShape3D" id="CapsuleShape3D_c5uwa"]
@@ -15,48 +15,54 @@ height = 1.415
radius = 0.133503 radius = 0.133503
height = 0.56 height = 0.56
[node name="Dog" unique_id=1355419805 instance=ExtResource("1_aormu")] [node name="Dog" unique_id=1355419805 node_paths=PackedStringArray("model") instance=ExtResource("1_aormu")]
model = NodePath("Model")
[node name="Sprite3D" parent="." index="0" unique_id=2020998819] [node name="Sprite3D" parent="." index="0" unique_id=2020998819]
texture = SubResource("ViewportTexture_ij8ev") texture = SubResource("ViewportTexture_ngren")
[node name="crystal_enemy" parent="." index="6" unique_id=86826412 instance=ExtResource("2_myjng")] [node name="MainHitbox" type="CollisionShape3D" parent="." index="6" unique_id=1521729609]
[node name="Cube_001" parent="crystal_enemy" index="1" unique_id=1809229845]
transform = Transform3D(0.99999994, 0, 0, 0, 1, 0, 0, 0, 0.99999994, -0.59980416, -0.60039425, 0)
[node name="RemoteTransform3D" type="RemoteTransform3D" parent="crystal_enemy/Cube_001" index="0" unique_id=1303209050]
remote_path = NodePath("../../../MiniHitbox2")
[node name="Cube_002" parent="crystal_enemy" index="2" unique_id=2142282279]
transform = Transform3D(0.99999994, 0, 0, 0, 1, 0, 0, 0, 0.99999994, 0.60133517, 0.5952302, 0)
[node name="RemoteTransform3D" type="RemoteTransform3D" parent="crystal_enemy/Cube_002" index="0" unique_id=42756288]
remote_path = NodePath("../../../MiniHitbox")
[node name="AnimationPlayer" parent="crystal_enemy" index="3" unique_id=807474404]
autoplay = &"Spin"
speed_scale = 2.0
[node name="MainHitbox" type="CollisionShape3D" parent="." index="7" unique_id=1521729609]
shape = SubResource("CapsuleShape3D_c5uwa") shape = SubResource("CapsuleShape3D_c5uwa")
script = ExtResource("3_myjng") script = ExtResource("3_myjng")
metadata/_custom_type_script = "uid://cummt2be3r1gq" metadata/_custom_type_script = "uid://cummt2be3r1gq"
[node name="MiniHitbox" type="CollisionShape3D" parent="." index="8" unique_id=1324997842] [node name="MiniHitbox" type="CollisionShape3D" parent="." index="7" unique_id=1324997842]
transform = Transform3D(0.99999994, 0, 0, 0, 1, 0, 0, 0, 0.99999994, 0.60133517, 0.5952302, 0) transform = Transform3D(0.20648184, 0, 0.97845036, 0, 1, 0, -0.97845036, 0, 0.20648184, 0.11321902, 0.5952302, 0.5539899)
shape = SubResource("CapsuleShape3D_d7aub") shape = SubResource("CapsuleShape3D_d7aub")
script = ExtResource("3_myjng") script = ExtResource("3_myjng")
critical_zone = true critical_zone = true
metadata/_custom_type_script = "uid://cummt2be3r1gq" metadata/_custom_type_script = "uid://cummt2be3r1gq"
[node name="MiniHitbox2" type="CollisionShape3D" parent="." index="9" unique_id=723617284] [node name="MiniHitbox2" type="CollisionShape3D" parent="." index="8" unique_id=723617284]
transform = Transform3D(0.99999994, 0, 0, 0, 1, 0, 0, 0, 0.99999994, -0.59980416, -0.60039425, 0) transform = Transform3D(0.20648184, 0, 0.97845036, 0, 1, 0, -0.97845036, 0, 0.20648184, -0.111688085, -0.60039425, -0.5539899)
shape = SubResource("CapsuleShape3D_d7aub") shape = SubResource("CapsuleShape3D_d7aub")
script = ExtResource("3_myjng") script = ExtResource("3_myjng")
critical_zone = true critical_zone = true
metadata/_custom_type_script = "uid://cummt2be3r1gq" metadata/_custom_type_script = "uid://cummt2be3r1gq"
[node name="Model" type="Node3D" parent="." index="9" unique_id=219224928]
[node name="crystal_enemy" parent="Model" index="0" unique_id=86826412 instance=ExtResource("2_myjng")]
[node name="Cube" parent="Model/crystal_enemy" index="0" unique_id=91305469]
transform = Transform3D(-0.77668554, 0, 0.6298886, 0, 1, 0, -0.6298886, 0, -0.77668554, 0, 0, 0)
[node name="Cube_001" parent="Model/crystal_enemy" index="1" unique_id=2082517745]
transform = Transform3D(0.20648184, 0, 0.97845036, 0, 1, 0, -0.97845036, 0, 0.20648184, -0.111688085, -0.60039425, -0.5539899)
[node name="RemoteTransform3D" type="RemoteTransform3D" parent="Model/crystal_enemy/Cube_001" index="0" unique_id=1303209050]
remote_path = NodePath("../../../../MiniHitbox2")
[node name="Cube_002" parent="Model/crystal_enemy" index="2" unique_id=216197994]
transform = Transform3D(0.20648184, 0, 0.97845036, 0, 1, 0, -0.97845036, 0, 0.20648184, 0.11321902, 0.5952302, 0.5539899)
[node name="RemoteTransform3D" type="RemoteTransform3D" parent="Model/crystal_enemy/Cube_002" index="0" unique_id=42756288]
remote_path = NodePath("../../../../MiniHitbox")
[node name="AnimationPlayer" parent="Model/crystal_enemy" index="3" unique_id=1597075659]
autoplay = &"Spin"
speed_scale = 2.0
[connection signal="recieved_effect" from="MainHitbox" to="StatusEffector" method="add_effect"] [connection signal="recieved_effect" from="MainHitbox" to="StatusEffector" method="add_effect"]
[connection signal="took_damage" from="MainHitbox" to="." method="take_damage"] [connection signal="took_damage" from="MainHitbox" to="." method="take_damage"]
[connection signal="recieved_effect" from="MiniHitbox" to="StatusEffector" method="add_effect"] [connection signal="recieved_effect" from="MiniHitbox" to="StatusEffector" method="add_effect"]
@@ -64,4 +70,4 @@ metadata/_custom_type_script = "uid://cummt2be3r1gq"
[connection signal="recieved_effect" from="MiniHitbox2" to="StatusEffector" method="add_effect"] [connection signal="recieved_effect" from="MiniHitbox2" to="StatusEffector" method="add_effect"]
[connection signal="took_damage" from="MiniHitbox2" to="." method="take_damage"] [connection signal="took_damage" from="MiniHitbox2" to="." method="take_damage"]
[editable path="crystal_enemy"] [editable path="Model/crystal_enemy"]

23
Enemies/Driftling/scn_driftling.tscn
View File

@@ -5,16 +5,16 @@
[ext_resource type="Script" uid="uid://cxu1voan64i5g" path="res://Scripts/driftling_drippler.gd" id="3_j6vnr"] [ext_resource type="Script" uid="uid://cxu1voan64i5g" path="res://Scripts/driftling_drippler.gd" id="3_j6vnr"]
[ext_resource type="Script" uid="uid://cummt2be3r1gq" path="res://Scripts/hitbox.gd" id="3_w6hpp"] [ext_resource type="Script" uid="uid://cummt2be3r1gq" path="res://Scripts/hitbox.gd" id="3_w6hpp"]
[sub_resource type="ViewportTexture" id="ViewportTexture_jw1s4"] [sub_resource type="ViewportTexture" id="ViewportTexture_j6vnr"]
viewport_path = NodePath("SubViewport") viewport_path = NodePath("SubViewport")
[sub_resource type="CapsuleShape3D" id="CapsuleShape3D_c5uwa"] [sub_resource type="CapsuleShape3D" id="CapsuleShape3D_j6vnr"]
radius = 0.98339844 radius = 9.576172
height = 1.977041 height = 80.757
[sub_resource type="CapsuleShape3D" id="CapsuleShape3D_d7aub"] [sub_resource type="CapsuleShape3D" id="CapsuleShape3D_d7aub"]
radius = 0.133503 radius = 39.50537
height = 2.1241307 height = 83.97125
[sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_w6hpp"] [sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_w6hpp"]
animation = &"Deflated" animation = &"Deflated"
@@ -25,7 +25,7 @@ animation = &"Bloated"
[sub_resource type="AnimationNodeBlend2" id="AnimationNodeBlend2_s1mj6"] [sub_resource type="AnimationNodeBlend2" id="AnimationNodeBlend2_s1mj6"]
[sub_resource type="AnimationNodeBlendTree" id="AnimationNodeBlendTree_bw4p2"] [sub_resource type="AnimationNodeBlendTree" id="AnimationNodeBlendTree_bw4p2"]
graph_offset = Vector2(-290, 122) graph_offset = Vector2(-280, 253.70001)
nodes/Blend2/node = SubResource("AnimationNodeBlend2_s1mj6") nodes/Blend2/node = SubResource("AnimationNodeBlend2_s1mj6")
nodes/Blend2/position = Vector2(138, 208) nodes/Blend2/position = Vector2(138, 208)
nodes/Animation/node = SubResource("AnimationNodeAnimation_lgos0") nodes/Animation/node = SubResource("AnimationNodeAnimation_lgos0")
@@ -34,15 +34,16 @@ nodes/Animation/position = Vector2(-94, 177)
"nodes/Animation 2/position" = Vector2(-66, 358) "nodes/Animation 2/position" = Vector2(-66, 358)
node_connections = [&"output", 0, &"Blend2", &"Blend2", 0, &"Animation", &"Blend2", 1, &"Animation 2"] node_connections = [&"output", 0, &"Blend2", &"Blend2", 0, &"Animation", &"Blend2", 1, &"Animation 2"]
[node name="Driftling" unique_id=1355419805 instance=ExtResource("1_8yn7v")] [node name="Driftling" unique_id=1355419805 node_paths=PackedStringArray("model") instance=ExtResource("1_8yn7v")]
collision_mask = 0
model = NodePath("Model")
[node name="Sprite3D" parent="." index="0" unique_id=2020998819] [node name="Sprite3D" parent="." index="0" unique_id=2020998819]
texture = SubResource("ViewportTexture_jw1s4") texture = SubResource("ViewportTexture_j6vnr")
[node name="MainHitbox" type="CollisionShape3D" parent="." index="6" unique_id=1521729609] [node name="MainHitbox" type="CollisionShape3D" parent="." index="6" unique_id=1521729609]
transform = Transform3D(0.025398083, 0, 0, 0, 0.025398083, 0, 0, 0, 0.025398083, 0, 0.23003143, 0) transform = Transform3D(0.025398083, 0, 0, 0, 0.025398083, 0, 0, 0, 0.025398083, 0, 0.23003143, 0)
visible = false shape = SubResource("CapsuleShape3D_j6vnr")
shape = SubResource("CapsuleShape3D_c5uwa")
script = ExtResource("3_w6hpp") script = ExtResource("3_w6hpp")
metadata/_custom_type_script = "uid://cummt2be3r1gq" metadata/_custom_type_script = "uid://cummt2be3r1gq"

7
Enemies/ElderEyeDog/scn_elder_eye_dog.tscn
View File

@@ -18,7 +18,7 @@ radius = 0.325
[sub_resource type="ViewportTexture" id="ViewportTexture_1kwxq"] [sub_resource type="ViewportTexture" id="ViewportTexture_1kwxq"]
viewport_path = NodePath("SubViewport") viewport_path = NodePath("SubViewport")
[node name="ElderEyeDog" type="CharacterBody3D" unique_id=1106613653 node_paths=PackedStringArray("status_manager", "movement_controller", "d_n", "health_bar") groups=["Enemies"]] [node name="ElderEyeDog" type="CharacterBody3D" unique_id=1106613653 node_paths=PackedStringArray("status_manager", "movement_controller", "d_n", "health_bar", "model") groups=["Enemies"]]
collision_layer = 4 collision_layer = 4
collision_mask = 0 collision_mask = 0
script = ExtResource("1_7wwbi") script = ExtResource("1_7wwbi")
@@ -27,6 +27,7 @@ movement_controller = NodePath("PathingController")
d_n = NodePath("Node3D") d_n = NodePath("Node3D")
corpse_scene = ExtResource("2_k8w4y") corpse_scene = ExtResource("2_k8w4y")
health_bar = NodePath("SubViewport/HealthBar") health_bar = NodePath("SubViewport/HealthBar")
model = NodePath("elder_eyedog")
metadata/_custom_type_script = "uid://ejqql2660u6h" metadata/_custom_type_script = "uid://ejqql2660u6h"
[node name="Hitbox" type="CollisionShape3D" parent="." unique_id=542685682] [node name="Hitbox" type="CollisionShape3D" parent="." unique_id=542685682]
@@ -88,7 +89,7 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.39813, 0)
[node name="elder_eyedog" parent="." unique_id=1528468919 instance=ExtResource("8_fil5h")] [node name="elder_eyedog" parent="." unique_id=1528468919 instance=ExtResource("8_fil5h")]
transform = Transform3D(-1, 0, -8.74228e-08, 0, 1, 0, 8.74228e-08, 0, -1, 0, 0, 0) transform = Transform3D(-1, 0, -8.74228e-08, 0, 1, 0, 8.74228e-08, 0, -1, 0, 0, 0)
[node name="Skeleton3D" parent="elder_eyedog/Armature" parent_id_path=PackedInt32Array(1528468919, 1628745338) index="0" unique_id=1532207150] [node name="Skeleton3D" parent="elder_eyedog/Armature" parent_id_path=PackedInt32Array(1528468919, 2081899383) index="0" unique_id=7671726]
bones/1/rotation = Quaternion(-0.43930408, -1.0709028e-07, 5.2369117e-08, 0.89833844) bones/1/rotation = Quaternion(-0.43930408, -1.0709028e-07, 5.2369117e-08, 0.89833844)
bones/3/rotation = Quaternion(0.23378512, 0.3248512, 0.54275554, 0.7383987) bones/3/rotation = Quaternion(0.23378512, 0.3248512, 0.54275554, 0.7383987)
bones/4/rotation = Quaternion(0.20259592, 0.73083645, 0.1334472, 0.637985) bones/4/rotation = Quaternion(0.20259592, 0.73083645, 0.1334472, 0.637985)
@@ -113,7 +114,7 @@ bones/23/position = Vector3(0.25597548, 0.022818465, 0.20058686)
bones/23/scale = Vector3(0.89347196, 1, 1) bones/23/scale = Vector3(0.89347196, 1, 1)
bones/24/position = Vector3(0.08454189, 0.014853473, 0.12984678) bones/24/position = Vector3(0.08454189, 0.014853473, 0.12984678)
[node name="AnimationPlayer" parent="elder_eyedog" index="1" unique_id=1165387739] [node name="AnimationPlayer" parent="elder_eyedog" index="1" unique_id=1439920918]
autoplay = &"ArmatureAction" autoplay = &"ArmatureAction"
[connection signal="recieved_effect" from="Hitbox" to="StatusEffector" method="add_effect"] [connection signal="recieved_effect" from="Hitbox" to="StatusEffector" method="add_effect"]

7
Enemies/EyeDog/scn_eye_dog.tscn
View File

@@ -18,7 +18,7 @@ radius = 0.25
[sub_resource type="ViewportTexture" id="ViewportTexture_1kwxq"] [sub_resource type="ViewportTexture" id="ViewportTexture_1kwxq"]
viewport_path = NodePath("SubViewport") viewport_path = NodePath("SubViewport")
[node name="EyeDog" type="CharacterBody3D" unique_id=1016179251 node_paths=PackedStringArray("status_manager", "movement_controller", "d_n", "health_bar") groups=["Enemies"]] [node name="EyeDog" type="CharacterBody3D" unique_id=1016179251 node_paths=PackedStringArray("status_manager", "movement_controller", "d_n", "health_bar", "model") groups=["Enemies"]]
collision_layer = 4 collision_layer = 4
collision_mask = 0 collision_mask = 0
script = ExtResource("1_1dh2f") script = ExtResource("1_1dh2f")
@@ -27,6 +27,7 @@ movement_controller = NodePath("PathingController")
d_n = NodePath("Node3D") d_n = NodePath("Node3D")
corpse_scene = ExtResource("2_1dh2f") corpse_scene = ExtResource("2_1dh2f")
health_bar = NodePath("SubViewport/HealthBar") health_bar = NodePath("SubViewport/HealthBar")
model = NodePath("eyedog")
metadata/_custom_type_script = "uid://ejqql2660u6h" metadata/_custom_type_script = "uid://ejqql2660u6h"
[node name="Hitbox" type="CollisionShape3D" parent="." unique_id=1815903905] [node name="Hitbox" type="CollisionShape3D" parent="." unique_id=1815903905]
@@ -88,7 +89,7 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.39813, 0)
[node name="eyedog" parent="." unique_id=588577646 instance=ExtResource("10_h25mw")] [node name="eyedog" parent="." unique_id=588577646 instance=ExtResource("10_h25mw")]
transform = Transform3D(-1, 0, -8.74228e-08, 0, 1, 0, 8.74228e-08, 0, -1, 0, 0, 0) transform = Transform3D(-1, 0, -8.74228e-08, 0, 1, 0, 8.74228e-08, 0, -1, 0, 0, 0)
[node name="Skeleton3D" parent="eyedog/Armature" parent_id_path=PackedInt32Array(588577646, 473381473) index="0" unique_id=323158019] [node name="Skeleton3D" parent="eyedog/Armature" parent_id_path=PackedInt32Array(588577646, 675643400) index="0" unique_id=28344697]
bones/1/rotation = Quaternion(-0.43930408, -1.0709029e-07, 5.2369124e-08, 0.89833844) bones/1/rotation = Quaternion(-0.43930408, -1.0709029e-07, 5.2369124e-08, 0.89833844)
bones/3/rotation = Quaternion(0.23378512, 0.32485124, 0.5427555, 0.7383988) bones/3/rotation = Quaternion(0.23378512, 0.32485124, 0.5427555, 0.7383988)
bones/4/rotation = Quaternion(0.2025959, 0.7308365, 0.13344719, 0.637985) bones/4/rotation = Quaternion(0.2025959, 0.7308365, 0.13344719, 0.637985)
@@ -113,7 +114,7 @@ bones/23/position = Vector3(0.25597548, 0.022818465, 0.20058686)
bones/23/scale = Vector3(0.89347196, 1, 1) bones/23/scale = Vector3(0.89347196, 1, 1)
bones/24/position = Vector3(0.08454189, 0.014853473, 0.12984678) bones/24/position = Vector3(0.08454189, 0.014853473, 0.12984678)
[node name="AnimationPlayer" parent="eyedog" index="1" unique_id=993841819] [node name="AnimationPlayer" parent="eyedog" index="1" unique_id=815829767]
autoplay = &"ArmatureAction" autoplay = &"ArmatureAction"
[connection signal="recieved_effect" from="Hitbox" to="StatusEffector" method="add_effect"] [connection signal="recieved_effect" from="Hitbox" to="StatusEffector" method="add_effect"]

17
Enemies/Skitter/scn_skitter.tscn
View File

@@ -19,7 +19,7 @@ size = Vector3(1, 0.25274658, 1.2819824)
radius = 0.19042969 radius = 0.19042969
height = 0.7624512 height = 0.7624512
[node name="Skitter" type="CharacterBody3D" unique_id=1710427344 node_paths=PackedStringArray("status_manager", "movement_controller", "d_n", "health_bar") groups=["Enemies"]] [node name="Skitter" type="CharacterBody3D" unique_id=1710427344 node_paths=PackedStringArray("status_manager", "movement_controller", "d_n", "health_bar", "model") groups=["Enemies"]]
collision_layer = 4 collision_layer = 4
collision_mask = 0 collision_mask = 0
script = ExtResource("1_8k5ts") script = ExtResource("1_8k5ts")
@@ -28,6 +28,7 @@ movement_controller = NodePath("PathingController")
d_n = NodePath("Node3D") d_n = NodePath("Node3D")
corpse_scene = ExtResource("2_vl30x") corpse_scene = ExtResource("2_vl30x")
health_bar = NodePath("SubViewport/HealthBar") health_bar = NodePath("SubViewport/HealthBar")
model = NodePath("mdl_skitter")
metadata/_custom_type_script = "uid://ejqql2660u6h" metadata/_custom_type_script = "uid://ejqql2660u6h"
[node name="HealthBar" type="Sprite3D" parent="." unique_id=395203513] [node name="HealthBar" type="Sprite3D" parent="." unique_id=395203513]
@@ -75,15 +76,15 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.39813, 0)
[node name="mdl_skitter" parent="." unique_id=1753143851 instance=ExtResource("7_pxxbh")] [node name="mdl_skitter" parent="." unique_id=1753143851 instance=ExtResource("7_pxxbh")]
[node name="Skeleton3D" parent="mdl_skitter/Armature" parent_id_path=PackedInt32Array(1753143851, 1635157965) index="0" unique_id=1089123257] [node name="Skeleton3D" parent="mdl_skitter/Armature" parent_id_path=PackedInt32Array(1753143851, 181874703) index="0" unique_id=1683908579]
bones/1/rotation = Quaternion(-0.32276848, -0.08836041, 0.37510455, 0.86447066) bones/1/rotation = Quaternion(-0.32276848, -0.08836041, 0.37510455, 0.86447066)
bones/3/rotation = Quaternion(0.05774434, -0.027616108, 0.8835519, 0.46393853) bones/3/rotation = Quaternion(0.06005325, -0.026217883, 0.88538456, 0.46021783)
bones/5/rotation = Quaternion(0.27334806, -0.034516517, 0.89473575, 0.3514789) bones/5/rotation = Quaternion(0.27340084, -0.034470994, 0.8947543, 0.35139534)
bones/7/rotation = Quaternion(-0.34224942, 0.09999892, -0.3036359, 0.8835558) bones/7/rotation = Quaternion(-0.34211865, 0.09991861, -0.3041486, 0.8834392)
bones/9/rotation = Quaternion(-0.19445433, 0.17105538, -0.5590174, 0.7876719) bones/9/rotation = Quaternion(-0.19451223, 0.17108603, -0.55891204, 0.7877258)
bones/11/rotation = Quaternion(-0.28836852, -0.021420462, 0.89958346, -0.32731378) bones/11/rotation = Quaternion(-0.29005635, -0.019931562, 0.90007704, -0.32454818)
[node name="AnimationPlayer" parent="mdl_skitter" index="1" unique_id=966022087] [node name="AnimationPlayer" parent="mdl_skitter" index="1" unique_id=1337990875]
autoplay = &"Walk" autoplay = &"Walk"
[node name="Hitbox" type="CollisionShape3D" parent="." unique_id=438909712] [node name="Hitbox" type="CollisionShape3D" parent="." unique_id=438909712]

1
Scenes/CardPrinter/card_printer.tscn
View File

@@ -47,6 +47,7 @@ shape = SubResource("BoxShape3D_ikdwj")
[node name="AudioStreamPlayer3D" type="AudioStreamPlayer3D" parent="StaticBody3D" unique_id=2125771228] [node name="AudioStreamPlayer3D" type="AudioStreamPlayer3D" parent="StaticBody3D" unique_id=2125771228]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.578748, -0.587001) transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.578748, -0.587001)
stream = SubResource("AudioStreamRandomizer_73g2w") stream = SubResource("AudioStreamRandomizer_73g2w")
volume_db = -6.5
bus = &"SFX" bus = &"SFX"
[node name="CSGBox3D3" type="CSGBox3D" parent="." unique_id=1739651585] [node name="CSGBox3D3" type="CSGBox3D" parent="." unique_id=1739651585]

2
Scripts/Affectors/spawn_affect.gd
View File

@@ -12,7 +12,7 @@ func apply_effect(effect: Effect, targets: Array[EnemyController]) -> void:
for target: EnemyController in targets: for target: EnemyController in targets:
var projectile: Projectile = spawn_scene.instantiate() as Projectile var projectile: Projectile = spawn_scene.instantiate() as Projectile
if projectile is HomingProjectile: if projectile is HomingProjectile:
projectile.target = target projectile.target = target.model
projectile.position = tower.yaw_model.global_position projectile.position = tower.yaw_model.global_position
projectile.effect = effect projectile.effect = effect
projectile.direction = -tower.yaw_model.global_transform.basis.z projectile.direction = -tower.yaw_model.global_transform.basis.z

29
UI/Menus/MixingMenu/track_editor.gd
View File

@@ -38,7 +38,6 @@ var cards: Array[Card]
var card_selected: Card var card_selected: Card
var temp_card: Card var temp_card: Card
var cost: int = 0 var cost: int = 0
var check_button_pressed: bool = false
func _ready() -> void: func _ready() -> void:
@@ -57,12 +56,12 @@ func set_money(money: int) -> void:
func press_check_button(value: bool) -> void: func press_check_button(value: bool) -> void:
check_button_pressed = value switch_button.button_pressed = value
if check_button_pressed: if !value:
switch_button.text = tr(SIDE_B_STR)
else:
switch_button.text = tr(SIDE_A_STR) switch_button.text = tr(SIDE_A_STR)
card_desc.set_card(temp_card, !check_button_pressed) else:
switch_button.text = tr(SIDE_B_STR)
card_desc.set_card(temp_card, switch_button.button_pressed)
func _process(_delta: float) -> void: func _process(_delta: float) -> void:
@@ -98,11 +97,19 @@ func select_card(option: int) -> void:
temp_card = card_selected.duplicate() temp_card = card_selected.duplicate()
temp_card.tower_stats = temp_card.tower_stats.get_duplicate() temp_card.tower_stats = temp_card.tower_stats.get_duplicate()
temp_card.weapon_stats = temp_card.weapon_stats.get_duplicate() temp_card.weapon_stats = temp_card.weapon_stats.get_duplicate()
press_check_button(check_button_pressed) press_check_button(switch_button.button_pressed)
var x: int = 0
for feature: Feature in temp_card.tower_stats.features: for feature: Feature in temp_card.tower_stats.features:
if x > 0:
tower_prices[x - 1].visible = false
add_feature(feature, 0, false) add_feature(feature, 0, false)
x += 1
x = 0
for feature: Feature in temp_card.weapon_stats.features: for feature: Feature in temp_card.weapon_stats.features:
if x > 0:
weapon_prices[x - 1].visible = false
add_feature(feature, 1, false) add_feature(feature, 1, false)
x += 1
func add_option(card_options: Array[Card]) -> void: func add_option(card_options: Array[Card]) -> void:
@@ -186,7 +193,8 @@ func add_feature(feature: Feature, track: int, modify_resource: bool = true) ->
tower_prices[tower_feature_uis.size() - 2].visible = false tower_prices[tower_feature_uis.size() - 2].visible = false
cost += Data.slot_prices[tower_feature_uis.size() - 2] cost += Data.slot_prices[tower_feature_uis.size() - 2]
price_label.text = tr(PRICE_STR) + str(cost) price_label.text = tr(PRICE_STR) + str(cost)
card_desc.set_card(temp_card, check_button_pressed) press_check_button(false)
card_desc.set_card(temp_card, switch_button.button_pressed)
if cost > hero.currency: if cost > hero.currency:
confirm_button.disabled = true confirm_button.disabled = true
elif track == 1: elif track == 1:
@@ -202,7 +210,8 @@ func add_feature(feature: Feature, track: int, modify_resource: bool = true) ->
weapon_prices[weapon_feature_uis.size() - 2].visible = false weapon_prices[weapon_feature_uis.size() - 2].visible = false
cost += Data.slot_prices[weapon_feature_uis.size() - 2] cost += Data.slot_prices[weapon_feature_uis.size() - 2]
price_label.text = tr(PRICE_STR) + str(cost) price_label.text = tr(PRICE_STR) + str(cost)
card_desc.set_card(temp_card, check_button_pressed) press_check_button(true)
card_desc.set_card(temp_card, switch_button.button_pressed)
if cost > hero.currency: if cost > hero.currency:
confirm_button.disabled = true confirm_button.disabled = true
@@ -215,7 +224,7 @@ func change_feature(existing_feature: FeatureUI, new_feature: Feature, track: in
elif track == 1: elif track == 1:
var i: int = weapon_feature_uis.find(existing_feature) var i: int = weapon_feature_uis.find(existing_feature)
temp_card.weapon_stats.features[i] = new_feature temp_card.weapon_stats.features[i] = new_feature
card_desc.set_card(temp_card, check_button_pressed) card_desc.set_card(temp_card, switch_button.button_pressed)
func attach_feat_to_mouse(feature: Feature) -> void: func attach_feat_to_mouse(feature: Feature) -> void:

2
UI/card_description_ui.gd
View File

@@ -21,7 +21,7 @@ func hide_card_name() -> void:
func set_card(new_card: Card, side: bool) -> void: func set_card(new_card: Card, side: bool) -> void:
card = new_card card = new_card
side_a = side side_a = !side
card_name_label.text = tr(card.display_name) card_name_label.text = tr(card.display_name)
card_description_label.text = process_card_text(card.tower_stats.tower_features_applied()) if side_a else process_card_text(card.weapon_stats.weapon_features_applied()) card_description_label.text = process_card_text(card.tower_stats.tower_features_applied()) if side_a else process_card_text(card.weapon_stats.weapon_features_applied())
populate_features() populate_features()

1
Worlds/GreenPlanet/Enemies/enemy_controller.gd
View File

@@ -12,6 +12,7 @@ signal health_changed(health: int)
#@export var sprite: Sprite3D #@export var sprite: Sprite3D
@export var corpse_scene: PackedScene @export var corpse_scene: PackedScene
@export var health_bar: HealthBar @export var health_bar: HealthBar
@export var model: Node3D
var damage_particle_scene: PackedScene = preload("res://UI/DamageParticle/damage_particle.tscn") var damage_particle_scene: PackedScene = preload("res://UI/DamageParticle/damage_particle.tscn")
var current_health: int var current_health: int