From 3c1a2215223d1fce37584e9b6c0a461f30d46330 Mon Sep 17 00:00:00 2001 From: Zenny Date: Mon, 23 Feb 2026 10:36:08 -0800 Subject: [PATCH] Enemy viewer fixes --- .../enemy/behaviors/EngagePlayerBehavior.cs | 3 +- .../03. filth_eater/FilthEater.tscn | 16 ++++----- .../08b. Ambassador (red)/AmbassadorRed.tscn | 1 + .../AmbassadorSmallModelView.tscn | 18 +++++----- .../enemy/enemy_types/09. Agni/AgniDemon.tscn | 12 +++---- .../09. Agni/AgniDemonModelView.tscn | 6 ++-- .../enemy_types/14. horse_head/HorseFace.tscn | 5 ++- .../enemy/enemy_types/15. ox_face/OxFace.tscn | 2 +- .../15. ox_face/OxFaceModelView.tscn | 35 ++++++++++--------- .../enemy_types/16. demon wall/DemonWall.cs | 7 ---- .../9b. Aqueos Demon/AqueosDemon.tscn | 12 +++---- .../src/enemy_viewer/EnemyViewer.tscn | 11 +++--- .../items/jewels/resources/AeolicJewel.tres | 2 +- .../items/jewels/resources/HydricJewel.tres | 2 +- .../items/jewels/resources/IgenousJewel.tres | 2 +- .../items/jewels/resources/TelluricJewel.tres | 2 +- .../Special Floors/Floor 08 Boss Floor A.tscn | 2 +- Zennysoft.Game.Ma/src/player/Player.tscn | 1 + Zennysoft.Game.Ma/src/utils/SceneLoader.cs | 2 +- 19 files changed, 67 insertions(+), 74 deletions(-) diff --git a/Zennysoft.Game.Ma/src/enemy/behaviors/EngagePlayerBehavior.cs b/Zennysoft.Game.Ma/src/enemy/behaviors/EngagePlayerBehavior.cs index 1209d66c6..533d138d7 100644 --- a/Zennysoft.Game.Ma/src/enemy/behaviors/EngagePlayerBehavior.cs +++ b/Zennysoft.Game.Ma/src/enemy/behaviors/EngagePlayerBehavior.cs @@ -23,7 +23,7 @@ public partial class EngagePlayerBehavior : Node, IEngagePlayerBehavior { _actionTimer = new Timer(); _acquireTargetTimer = new Timer() { WaitTime = _acquireTargetTime }; - _actionTimer.WaitTime = RandomizeTimer(_minimumAttackTime, _maximumAttackTime); + _actionTimer.WaitTime = 0.8f; _actionTimer.Timeout += OnAttackTimeout; _acquireTargetTimer.Timeout += OnAcquireTargetTimeout; AddChild(_actionTimer); @@ -34,7 +34,6 @@ public partial class EngagePlayerBehavior : Node, IEngagePlayerBehavior { _actionTimer.Start(); _acquireTargetTimer.Start(); - EmitSignal(SignalName.TakeAction); } public void Disengage() diff --git a/Zennysoft.Game.Ma/src/enemy/enemy_types/03. filth_eater/FilthEater.tscn b/Zennysoft.Game.Ma/src/enemy/enemy_types/03. filth_eater/FilthEater.tscn index 992998d1d..276d32ecf 100644 --- a/Zennysoft.Game.Ma/src/enemy/enemy_types/03. filth_eater/FilthEater.tscn +++ b/Zennysoft.Game.Ma/src/enemy/enemy_types/03. filth_eater/FilthEater.tscn @@ -48,7 +48,7 @@ script = ExtResource("1_p438s") [node name="LineOfSight" type="Area3D" parent="."] unique_name_in_owner = true -transform = Transform3D(-1, 0, -8.74228e-08, 0, 1, 0, 8.74228e-08, 0, -1, 0, 0.515302, 0) +transform = Transform3D(-1, 0, -8.74228e-08, 0, 1, 0, 8.74228e-08, 0, -1, 0, 2.5865, 0) collision_layer = 2 collision_mask = 2 @@ -58,17 +58,17 @@ shape = SubResource("CylinderShape3D_jbgmx") [node name="CollisionShape" type="CollisionShape3D" parent="."] unique_name_in_owner = true -transform = Transform3D(-1, 0, -8.74228e-08, 0, 1, 0, 8.74228e-08, 0, -1, 0, 0.515302, 0) +transform = Transform3D(-1, 0, -8.74228e-08, 0, 1, 0, 8.74228e-08, 0, -1, 0, 2.5865, 0) shape = SubResource("CapsuleShape3D_cwfph") [node name="Raycast" type="RayCast3D" parent="."] unique_name_in_owner = true -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.56859, 0) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 3.63979, 0) target_position = Vector3(0, 0, -5) collision_mask = 3 [node name="Collision" type="Area3D" parent="."] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.515302, 0) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 2.5865, 0) collision_layer = 2048 collision_mask = 0 @@ -78,12 +78,12 @@ shape = SubResource("SphereShape3D_0y048") [node name="EnemyModelView" parent="." instance=ExtResource("3_rrwed")] unique_name_in_owner = true -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.0153018, 0) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.114099, 0) EnemyLoreInfo = SubResource("Resource_fv5vf") [node name="PlayerDetector" type="Area3D" parent="."] unique_name_in_owner = true -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.515302, 0) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 2.5865, 0) collision_layer = 0 collision_mask = 34 @@ -92,7 +92,7 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.179932, 0) shape = SubResource("CylinderShape3D_qbmfg") [node name="Components" type="Node3D" parent="."] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.515302, 0) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 2.5865, 0) [node name="PatrolBehavior" parent="Components" instance=ExtResource("5_pvjvo")] unique_name_in_owner = true @@ -111,7 +111,7 @@ avoidance_enabled = true radius = 1.0 [node name="HitSounds" type="Node3D" parent="."] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.515302, 0) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 2.5865, 0) [node name="AbsorbSFX" type="AudioStreamPlayer3D" parent="HitSounds"] unique_name_in_owner = true diff --git a/Zennysoft.Game.Ma/src/enemy/enemy_types/08b. Ambassador (red)/AmbassadorRed.tscn b/Zennysoft.Game.Ma/src/enemy/enemy_types/08b. Ambassador (red)/AmbassadorRed.tscn index 0489ee5d6..8063c0570 100644 --- a/Zennysoft.Game.Ma/src/enemy/enemy_types/08b. Ambassador (red)/AmbassadorRed.tscn +++ b/Zennysoft.Game.Ma/src/enemy/enemy_types/08b. Ambassador (red)/AmbassadorRed.tscn @@ -69,6 +69,7 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.69068, 0) [node name="EnemyModelView" parent="Visual" instance=ExtResource("4_hqkeq")] unique_name_in_owner = true +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -1.61338, 0) [node name="PlayerDetector" type="Area3D" parent="."] unique_name_in_owner = true diff --git a/Zennysoft.Game.Ma/src/enemy/enemy_types/08b. Ambassador (red)/AmbassadorSmallModelView.tscn b/Zennysoft.Game.Ma/src/enemy/enemy_types/08b. Ambassador (red)/AmbassadorSmallModelView.tscn index e546ac766..359d6c0bb 100644 --- a/Zennysoft.Game.Ma/src/enemy/enemy_types/08b. Ambassador (red)/AmbassadorSmallModelView.tscn +++ b/Zennysoft.Game.Ma/src/enemy/enemy_types/08b. Ambassador (red)/AmbassadorSmallModelView.tscn @@ -1954,7 +1954,7 @@ EnemyLoreInfo = SubResource("Resource_f45wt") [node name="Sprite3D" type="Sprite3D" parent="."] unique_name_in_owner = true -transform = Transform3D(1.5, 0, 0, 0, 1.5, 0, 0, 0, 1.5, 0, -0.941682, 0) +transform = Transform3D(1.5, 0, 0, 0, 1.5, 0, 0, 0, 1.5, 0, -0.961751, 0) offset = Vector2(0, 75) pixel_size = 0.015 billboard = 2 @@ -1986,14 +1986,6 @@ scale = Vector2(0.25, 0.25) sprite_frames = SubResource("SpriteFrames_6drt6") animation = &"idle_front" -[node name="Shadow" type="Sprite3D" parent="Sprite3D"] -transform = Transform3D(0.29, 0, 0, 0, -1.26763e-08, 0.29, 0, -0.29, -1.26763e-08, 0.00393164, 0.594971, 0.0077811) -transparency = 0.1 -cast_shadow = 0 -modulate = Color(1, 1, 1, 0.591) -texture_filter = 0 -texture = ExtResource("261_xxvov") - [node name="Hitbox" type="Area3D" parent="."] unique_name_in_owner = true transform = Transform3D(-1, 0, -8.74228e-08, 0, 1, 0, 8.74228e-08, 0, -1, -0.152949, 1.11387, 0) @@ -2025,3 +2017,11 @@ unique_name_in_owner = true transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.63159, 0) autoplay = true bus = &"SFX" + +[node name="Shadow" type="Sprite3D" parent="."] +transform = Transform3D(0.435, 0, 0, 0, -1.90145e-08, 0.435, 0, -0.435, -1.90145e-08, 0.00589746, -0.0492254, 0.0116717) +transparency = 0.1 +cast_shadow = 0 +modulate = Color(1, 1, 1, 0.591) +texture_filter = 0 +texture = ExtResource("261_xxvov") diff --git a/Zennysoft.Game.Ma/src/enemy/enemy_types/09. Agni/AgniDemon.tscn b/Zennysoft.Game.Ma/src/enemy/enemy_types/09. Agni/AgniDemon.tscn index acae3c37c..0f5ec9ebd 100644 --- a/Zennysoft.Game.Ma/src/enemy/enemy_types/09. Agni/AgniDemon.tscn +++ b/Zennysoft.Game.Ma/src/enemy/enemy_types/09. Agni/AgniDemon.tscn @@ -33,12 +33,12 @@ script = ExtResource("1_e2477") [node name="CollisionShape" type="CollisionShape3D" parent="."] unique_name_in_owner = true -transform = Transform3D(-1, 0, -8.74228e-08, 0, 1, 0, 8.74228e-08, 0, -1, 0, 1.47389, 0) +transform = Transform3D(-1, 0, -8.74228e-08, 0, 1, 0, 8.74228e-08, 0, -1, 0, 2.83179, 0) shape = SubResource("CapsuleShape3D_cwfph") [node name="LineOfSight" type="Area3D" parent="."] unique_name_in_owner = true -transform = Transform3D(-1, 0, -8.74228e-08, 0, 1, 0, 8.74228e-08, 0, -1, 0, 1.47389, 0) +transform = Transform3D(-1, 0, -8.74228e-08, 0, 1, 0, 8.74228e-08, 0, -1, 0, 2.83179, 0) collision_layer = 2 collision_mask = 2 @@ -53,7 +53,7 @@ target_position = Vector3(0, 0, -5) collision_mask = 3 [node name="Collision" type="Area3D" parent="."] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.47389, 0) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 2.83179, 0) collision_layer = 2048 collision_mask = 0 @@ -66,7 +66,7 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -0.0147337, 0) [node name="PlayerDetector" type="Area3D" parent="."] unique_name_in_owner = true -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.47389, 0) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 2.83179, 0) collision_layer = 0 collision_mask = 34 @@ -74,7 +74,7 @@ collision_mask = 34 shape = SubResource("CylinderShape3D_tbkej") [node name="Components" type="Node3D" parent="."] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.47389, 0) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 2.83179, 0) [node name="PatrolBehavior" parent="Components" instance=ExtResource("4_dxxe5")] unique_name_in_owner = true @@ -93,7 +93,7 @@ avoidance_enabled = true radius = 1.0 [node name="HitSounds" type="Node3D" parent="."] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.47389, 0) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 2.83179, 0) [node name="AbsorbSFX" type="AudioStreamPlayer3D" parent="HitSounds"] unique_name_in_owner = true diff --git a/Zennysoft.Game.Ma/src/enemy/enemy_types/09. Agni/AgniDemonModelView.tscn b/Zennysoft.Game.Ma/src/enemy/enemy_types/09. Agni/AgniDemonModelView.tscn index 163d8be64..4f258c101 100644 --- a/Zennysoft.Game.Ma/src/enemy/enemy_types/09. Agni/AgniDemonModelView.tscn +++ b/Zennysoft.Game.Ma/src/enemy/enemy_types/09. Agni/AgniDemonModelView.tscn @@ -2090,7 +2090,7 @@ EnemyLoreInfo = SubResource("Resource_f45wt") [node name="Sprite3D" type="Sprite3D" parent="."] unique_name_in_owner = true -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.48862, 0) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.0250915, 1.985, 0) billboard = 2 texture_filter = 0 render_priority = 100 @@ -2113,11 +2113,11 @@ unique_name_in_owner = true texture_filter = 1 sprite_frames = SubResource("SpriteFrames_6drt6") animation = &"idle_front" -offset = Vector2(400, 325) +offset = Vector2(400, 375) [node name="AnimatedSprite2D" type="AnimatedSprite2D" parent="Sprite3D/SubViewportContainer/SubViewport"] sprite_frames = SubResource("SpriteFrames_d844v") -offset = Vector2(400, 325) +offset = Vector2(400, 375) [node name="Hitbox" type="Area3D" parent="."] unique_name_in_owner = true diff --git a/Zennysoft.Game.Ma/src/enemy/enemy_types/14. horse_head/HorseFace.tscn b/Zennysoft.Game.Ma/src/enemy/enemy_types/14. horse_head/HorseFace.tscn index 014338b37..084dfc4ae 100644 --- a/Zennysoft.Game.Ma/src/enemy/enemy_types/14. horse_head/HorseFace.tscn +++ b/Zennysoft.Game.Ma/src/enemy/enemy_types/14. horse_head/HorseFace.tscn @@ -28,12 +28,12 @@ InitialHP = 100 [node name="CollisionShape" type="CollisionShape3D" parent="."] unique_name_in_owner = true -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.182602, 0.542515, -0.127861) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.182602, 1.9992, -0.127861) shape = SubResource("CapsuleShape3D_nt5fo") [node name="EnemyModelView" parent="." instance=ExtResource("2_x21p4")] unique_name_in_owner = true -transform = Transform3D(0.15, 0, 0, 0, 0.15, 0, 0, 0, 0.15, 0, 0.0857229, 0) +transform = Transform3D(0.15, 0, 0, 0, 0.15, 0, 0, 0, 0.15, 0, 0.0655911, 0) [node name="Collision" type="Area3D" parent="."] collision_layer = 2048 @@ -69,7 +69,6 @@ unique_name_in_owner = true unique_name_in_owner = true avoidance_enabled = true radius = 1.0 -debug_enabled = true [node name="HitSounds" type="Node3D" parent="."] diff --git a/Zennysoft.Game.Ma/src/enemy/enemy_types/15. ox_face/OxFace.tscn b/Zennysoft.Game.Ma/src/enemy/enemy_types/15. ox_face/OxFace.tscn index b0b654247..25da19e0f 100644 --- a/Zennysoft.Game.Ma/src/enemy/enemy_types/15. ox_face/OxFace.tscn +++ b/Zennysoft.Game.Ma/src/enemy/enemy_types/15. ox_face/OxFace.tscn @@ -33,6 +33,7 @@ shape = SubResource("CapsuleShape3D_i0akf") [node name="EnemyModelView" parent="." instance=ExtResource("2_v6b2s")] unique_name_in_owner = true +transform = Transform3D(0.15, 0, 0, 0, 0.15, 0, 0, 0, 0.15, 0, -0.276134, 0) [node name="Collision" type="Area3D" parent="."] collision_layer = 2048 @@ -69,7 +70,6 @@ unique_name_in_owner = true unique_name_in_owner = true avoidance_enabled = true radius = 1.0 -debug_enabled = true [node name="HitSounds" type="Node3D" parent="."] diff --git a/Zennysoft.Game.Ma/src/enemy/enemy_types/15. ox_face/OxFaceModelView.tscn b/Zennysoft.Game.Ma/src/enemy/enemy_types/15. ox_face/OxFaceModelView.tscn index f4f40a999..8235289b0 100644 --- a/Zennysoft.Game.Ma/src/enemy/enemy_types/15. ox_face/OxFaceModelView.tscn +++ b/Zennysoft.Game.Ma/src/enemy/enemy_types/15. ox_face/OxFaceModelView.tscn @@ -2712,7 +2712,7 @@ script = ExtResource("1_1ch7e") [node name="Armature" type="Node3D" parent="."] unique_name_in_owner = true -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 1.82665, 13.216, 2.37244) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 1.82665, 13.6658, 2.37244) script = ExtResource("1_6miqu") [node name="Skeleton3D" type="Skeleton3D" parent="Armature"] @@ -2720,7 +2720,7 @@ bones/0/name = "spine1" bones/0/parent = -1 bones/0/rest = Transform3D(1.49012e-06, 0.00846654, -0.999964, 2.93367e-08, 0.999964, 0.00846654, 1, -4.23752e-08, 1.49012e-06, 0.000155807, -0.00105953, -2.01735) bones/0/enabled = true -bones/0/position = Vector3(-0.259785, -0.997786, -1.97148) +bones/0/position = Vector3(-0.25956, -0.972131, -1.97321) bones/0/rotation = Quaternion(0.0915277, -0.692111, -0.0341586, 0.715149) bones/0/scale = Vector3(1, 1, 1) bones/1/name = "spine0" @@ -2763,7 +2763,7 @@ bones/6/parent = 5 bones/6/rest = Transform3D(0.0598389, 0.98531, 0.15995, -0.975271, 0.0235553, 0.219755, 0.212759, -0.169144, 0.962353, 3.65078e-07, 1.40318, 0) bones/6/enabled = true bones/6/position = Vector3(3.65078e-07, 1.40318, 0) -bones/6/rotation = Quaternion(-0.059088, -0.298461, -0.7445, 0.594264) +bones/6/rotation = Quaternion(-0.0670708, -0.301368, -0.744668, 0.591733) bones/6/scale = Vector3(1, 1, 1) bones/7/name = "Bone.007" bones/7/parent = 6 @@ -2798,7 +2798,7 @@ bones/11/parent = 1 bones/11/rest = Transform3D(0.981457, 0.0769315, -0.175568, 0.18837, -0.217537, 0.957703, 0.035485, -0.973015, -0.227995, -1.09896e-07, 3.84743, -2.10479e-07) bones/11/enabled = true bones/11/position = Vector3(-1.09896e-07, 3.84743, -2.10479e-07) -bones/11/rotation = Quaternion(-0.782742, -0.0599016, 0.075825, 0.614799) +bones/11/rotation = Quaternion(-0.784228, -0.0612103, 0.0728381, 0.613135) bones/11/scale = Vector3(1, 0.999999, 1) bones/12/name = "arm2_L" bones/12/parent = 11 @@ -2826,7 +2826,7 @@ bones/15/parent = 1 bones/15/rest = Transform3D(-0.98213, 0.0512573, -0.181089, -0.187541, -0.185921, 0.964501, 0.0157694, 0.981227, 0.192212, 0.00107862, 3.8461, -0.0821097) bones/15/enabled = true bones/15/position = Vector3(0.00107886, 3.8461, -0.0821095) -bones/15/rotation = Quaternion(-0.212527, 0.74078, 0.618523, -0.153321) +bones/15/rotation = Quaternion(-0.211126, 0.738589, 0.620876, -0.156287) bones/15/scale = Vector3(1, 1, 1) bones/16/name = "arm2_R" bones/16/parent = 15 @@ -2853,22 +2853,22 @@ bones/19/name = "hip_L" bones/19/parent = -1 bones/19/rest = Transform3D(0.138486, 0.897208, 0.419333, -0.129033, -0.403458, 0.905854, 0.981923, -0.179556, 0.059896, 0.000155807, -0.00105953, -2.01735) bones/19/enabled = true -bones/19/position = Vector3(-0.336379, -1.15767, -1.86507) -bones/19/rotation = Quaternion(0.618535, 0.304061, 0.560249, -0.459436) +bones/19/position = Vector3(-0.315718, -1.13813, -1.93315) +bones/19/rotation = Quaternion(0.614186, 0.3092, 0.567121, -0.453371) bones/19/scale = Vector3(1, 1, 1) bones/20/name = "leg1_L" bones/20/parent = 19 bones/20/rest = Transform3D(0.945603, 0.113405, 0.304916, -0.324072, 0.410457, 0.852351, -0.0284943, -0.9048, 0.424881, 2.08616e-07, 2.00996, -7.1153e-07) bones/20/enabled = true bones/20/position = Vector3(2.08616e-07, 2.00996, -7.1153e-07) -bones/20/rotation = Quaternion(-0.318224, -0.43351, -0.284751, 0.793549) +bones/20/rotation = Quaternion(-0.313706, -0.438448, -0.277302, 0.795271) bones/20/scale = Vector3(1, 0.999999, 1) bones/21/name = "leg2_L" bones/21/parent = 20 bones/21/rest = Transform3D(0.990336, -0.138679, 0.00180777, 0.138628, 0.990193, 0.0173138, -0.00419111, -0.0168959, 0.999848, 5.96046e-08, 5.85994, -5.23403e-07) bones/21/enabled = true bones/21/position = Vector3(5.96046e-08, 5.85994, -5.23403e-07) -bones/21/rotation = Quaternion(-0.0603283, 0.00129951, 0.48836, 0.870553) +bones/21/rotation = Quaternion(-0.0602155, 0.00130028, 0.487448, 0.871073) bones/21/scale = Vector3(1, 1, 1) bones/22/name = "foot1_L" bones/22/parent = 21 @@ -2902,7 +2902,7 @@ bones/26/name = "hip_R" bones/26/parent = -1 bones/26/rest = Transform3D(0.138486, -0.897208, -0.419333, 0.129033, -0.403458, 0.905854, -0.981923, -0.179556, 0.059896, -0.000155807, -0.00105953, -2.01735) bones/26/enabled = true -bones/26/position = Vector3(-0.15463, -1.11395, -2.01828) +bones/26/position = Vector3(-0.215361, -1.11395, -2.01786) bones/26/rotation = Quaternion(0.608697, -0.3155, -0.575514, -0.445793) bones/26/scale = Vector3(1, 1, 1) bones/27/name = "leg1_R" @@ -2910,14 +2910,14 @@ bones/27/parent = 26 bones/27/rest = Transform3D(0.945603, -0.113405, -0.304916, 0.324072, 0.410457, 0.852351, 0.0284943, -0.9048, 0.424881, -9.54606e-09, 2.00996, -3.52971e-07) bones/27/enabled = true bones/27/position = Vector3(-9.54606e-09, 2.00996, -3.52971e-07) -bones/27/rotation = Quaternion(-0.205351, 0.42295, 0.140242, 0.871365) +bones/27/rotation = Quaternion(-0.20711, 0.421979, 0.141477, 0.87122) bones/27/scale = Vector3(1, 0.999999, 1) bones/28/name = "leg2_R" bones/28/parent = 27 bones/28/rest = Transform3D(0.990336, 0.138679, -0.00180777, -0.138628, 0.990193, 0.0173138, 0.00419111, -0.0168959, 0.999848, 4.51691e-08, 5.85994, -3.72529e-09) bones/28/enabled = true bones/28/position = Vector3(4.51691e-08, 5.85994, -3.72529e-09) -bones/28/rotation = Quaternion(-0.0635433, -0.00115959, -0.507324, 0.859409) +bones/28/rotation = Quaternion(-0.0639214, -0.00115716, -0.510343, 0.857591) bones/28/scale = Vector3(1, 1, 1) bones/29/name = "foot1_R" bones/29/parent = 28 @@ -2949,7 +2949,7 @@ bones/32/rotation = Quaternion(0.456756, 0.539878, -0.539587, -0.456893) bones/32/scale = Vector3(1, 1, 1) [node name="BoneAttachment3D" type="BoneAttachment3D" parent="Armature/Skeleton3D"] -transform = Transform3D(-0.279572, -0.0567501, -0.958446, -0.331841, -0.931021, 0.151922, -0.900955, 0.360526, 0.241455, -1.67751, 8.26145, 4.95195) +transform = Transform3D(-0.288712, -0.0710311, -0.954777, -0.330345, -0.928611, 0.168976, -0.898619, 0.364192, 0.244636, -1.66929, 8.29074, 4.94933) bone_name = "TOP OF SKULL" bone_idx = 8 @@ -2972,7 +2972,7 @@ mesh = SubResource("ArrayMesh_5ew54") skin = SubResource("Skin_e330f") [node name="BoneAttachment3D2" type="BoneAttachment3D" parent="Armature/Skeleton3D"] -transform = Transform3D(-0.0460326, 0.0140066, -0.998841, -0.0839117, -0.996421, -0.010106, -0.995408, 0.0833502, 0.0470426, -6.23163, -1.27295, -0.152871) +transform = Transform3D(-0.0452009, 0.0230325, -0.998712, -0.0858095, -0.996127, -0.0190896, -0.995284, 0.084837, 0.0470018, -6.18808, -1.29869, -0.147832) bone_name = "hand_R" bone_idx = 18 @@ -2993,7 +2993,7 @@ anim_player = NodePath("../AnimationPlayer") [node name="Hitbox" type="Area3D" parent="."] unique_name_in_owner = true -transform = Transform3D(1, 0, 0, 0, -4.37114e-08, -1, 0, 1, -4.37114e-08, 1.82665, 13.216, 2.37244) +transform = Transform3D(1, 0, 0, 0, -4.37114e-08, -1, 0, 1, -4.37114e-08, 1.82665, 13.6658, 2.37244) collision_layer = 64 collision_mask = 64 @@ -3009,15 +3009,16 @@ disabled = true [node name="WalkSFX" type="AudioStreamPlayer3D" parent="."] unique_name_in_owner = true -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 1.82665, 13.216, 2.37244) +transform = Transform3D(6.66667, 0, 0, 0, 6.66667, 0, 0, 0, 6.66667, 1.82665, 13.6658, 2.37244) autoplay = true bus = &"SFX" [node name="Walk2" type="AudioStreamPlayer3D" parent="."] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 1.82665, 13.216, 2.37244) +transform = Transform3D(6.66667, 0, 0, 0, 6.66667, 0, 0, 0, 6.66667, 1.82665, 13.6658, 2.37244) [node name="ExplodingModel" type="Node3D" parent="."] unique_name_in_owner = true +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.44977, 0) visible = false [node name="Ox-face" type="Node3D" parent="ExplodingModel"] diff --git a/Zennysoft.Game.Ma/src/enemy/enemy_types/16. demon wall/DemonWall.cs b/Zennysoft.Game.Ma/src/enemy/enemy_types/16. demon wall/DemonWall.cs index 1bf56daaa..ff543e0dc 100644 --- a/Zennysoft.Game.Ma/src/enemy/enemy_types/16. demon wall/DemonWall.cs +++ b/Zennysoft.Game.Ma/src/enemy/enemy_types/16. demon wall/DemonWall.cs @@ -14,8 +14,6 @@ public partial class DemonWall : Enemy3D [Node] private new DemonWallModelView EnemyModelView { get; set; } = default!; - [Node] private Label DemonWallHP { get; set; } = default!; - private Timer _attackTimer; public void OnReady() @@ -25,11 +23,6 @@ public partial class DemonWall : Enemy3D AddChild(_attackTimer); } - public void OnPhysicsProcess(double delta) - { - DemonWallHP.Text = HealthComponent.CurrentHP.Value + "/" + HealthComponent.MaximumHP.Value; - } - public override void Activate() { SetPhysicsProcess(true); diff --git a/Zennysoft.Game.Ma/src/enemy/enemy_types/9b. Aqueos Demon/AqueosDemon.tscn b/Zennysoft.Game.Ma/src/enemy/enemy_types/9b. Aqueos Demon/AqueosDemon.tscn index b7825cc7e..a1b46d1aa 100644 --- a/Zennysoft.Game.Ma/src/enemy/enemy_types/9b. Aqueos Demon/AqueosDemon.tscn +++ b/Zennysoft.Game.Ma/src/enemy/enemy_types/9b. Aqueos Demon/AqueosDemon.tscn @@ -33,12 +33,12 @@ script = ExtResource("1_8b86o") [node name="CollisionShape" type="CollisionShape3D" parent="."] unique_name_in_owner = true -transform = Transform3D(-1, 0, -8.74228e-08, 0, 1, 0, 8.74228e-08, 0, -1, 0, 1.64877, 0) +transform = Transform3D(-1, 0, -8.74228e-08, 0, 1, 0, 8.74228e-08, 0, -1, 0, 2.82091, 0) shape = SubResource("CapsuleShape3D_cwfph") [node name="LineOfSight" type="Area3D" parent="."] unique_name_in_owner = true -transform = Transform3D(-1, 0, -8.74228e-08, 0, 1, 0, 8.74228e-08, 0, -1, 0, 1.64877, 0) +transform = Transform3D(-1, 0, -8.74228e-08, 0, 1, 0, 8.74228e-08, 0, -1, 0, 2.82091, 0) collision_layer = 2 collision_mask = 2 @@ -53,7 +53,7 @@ target_position = Vector3(0, 0, -5) collision_mask = 3 [node name="Collision" type="Area3D" parent="."] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.64877, 0) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 2.82091, 0) collision_layer = 2048 collision_mask = 0 @@ -66,7 +66,7 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.0124374, 0) [node name="PlayerDetector" type="Area3D" parent="."] unique_name_in_owner = true -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.64877, 0) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 2.82091, 0) collision_layer = 0 collision_mask = 34 @@ -74,7 +74,7 @@ collision_mask = 34 shape = SubResource("CylinderShape3D_gxowl") [node name="Components" type="Node3D" parent="."] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.64877, 0) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 2.82091, 0) [node name="PatrolBehavior" parent="Components" instance=ExtResource("4_5pbfd")] unique_name_in_owner = true @@ -93,7 +93,7 @@ avoidance_enabled = true radius = 1.0 [node name="HitSounds" type="Node3D" parent="."] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.64877, 0) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 2.82091, 0) [node name="AbsorbSFX" type="AudioStreamPlayer3D" parent="HitSounds"] unique_name_in_owner = true diff --git a/Zennysoft.Game.Ma/src/enemy_viewer/EnemyViewer.tscn b/Zennysoft.Game.Ma/src/enemy_viewer/EnemyViewer.tscn index 30326251d..f1699cc85 100644 --- a/Zennysoft.Game.Ma/src/enemy_viewer/EnemyViewer.tscn +++ b/Zennysoft.Game.Ma/src/enemy_viewer/EnemyViewer.tscn @@ -112,25 +112,24 @@ visible = false ViewerSize = 3.5 [node name="AmbassadorGreen" parent="CenterContainer2/SubViewportContainer/SubViewport/ModelPivot" instance=ExtResource("10_rdiwx")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -0.509494, 0) visible = false -ViewerSize = 3.5 +ViewerSize = 5.0 [node name="AmbassadorRed" parent="CenterContainer2/SubViewportContainer/SubViewport/ModelPivot" instance=ExtResource("11_elpsj")] visible = false -ViewerSize = 2.5 +ViewerSize = 4.0 [node name="AmbassadorSteel" parent="CenterContainer2/SubViewportContainer/SubViewport/ModelPivot" instance=ExtResource("12_3kprl")] visible = false -ViewerSize = 3.0 +ViewerSize = 5.0 [node name="AgniDemon" parent="CenterContainer2/SubViewportContainer/SubViewport/ModelPivot" instance=ExtResource("12_dr0jx")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -0.5, 0) visible = false -ViewerSize = 4.0 +ViewerSize = 4.5 [node name="AqueosDemon" parent="CenterContainer2/SubViewportContainer/SubViewport/ModelPivot" instance=ExtResource("13_dr0jx")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -0.3, 0) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -0.25, 0) visible = false ViewerSize = 4.0 diff --git a/Zennysoft.Game.Ma/src/items/jewels/resources/AeolicJewel.tres b/Zennysoft.Game.Ma/src/items/jewels/resources/AeolicJewel.tres index a5d1740b2..d7956c8c8 100644 --- a/Zennysoft.Game.Ma/src/items/jewels/resources/AeolicJewel.tres +++ b/Zennysoft.Game.Ma/src/items/jewels/resources/AeolicJewel.tres @@ -8,7 +8,7 @@ script = ExtResource("1_u0a3e") JewelTag = 1 Name = "Aeolic Jewel" StatDescription = "Augment -Weapon: Weapon type because Aeolic. +Weapon: Weapon type becomes Aeolic. Armor/Accessory: Increases Aeolic resistance." FlavorText = "" SpawnRate = 0.5 diff --git a/Zennysoft.Game.Ma/src/items/jewels/resources/HydricJewel.tres b/Zennysoft.Game.Ma/src/items/jewels/resources/HydricJewel.tres index e740e3d95..dce1ddbe9 100644 --- a/Zennysoft.Game.Ma/src/items/jewels/resources/HydricJewel.tres +++ b/Zennysoft.Game.Ma/src/items/jewels/resources/HydricJewel.tres @@ -8,7 +8,7 @@ script = ExtResource("1_cyti8") JewelTag = 7 Name = "Hydric Jewel" StatDescription = "Augment -Weapon: Weapon type because Hydric. +Weapon: Weapon type becomes Hydric. Armor/Accessory: Increases Hydric resistance." FlavorText = "" SpawnRate = 0.5 diff --git a/Zennysoft.Game.Ma/src/items/jewels/resources/IgenousJewel.tres b/Zennysoft.Game.Ma/src/items/jewels/resources/IgenousJewel.tres index 604737d56..07b3ba30a 100644 --- a/Zennysoft.Game.Ma/src/items/jewels/resources/IgenousJewel.tres +++ b/Zennysoft.Game.Ma/src/items/jewels/resources/IgenousJewel.tres @@ -8,7 +8,7 @@ script = ExtResource("1_qh03l") JewelTag = 8 Name = "Igneous Jewel" StatDescription = "Augment -Weapon: Weapon type because Igneous. +Weapon: Weapon type becomes Igneous. Armor/Accessory: Increases Igneous resistance." FlavorText = "" SpawnRate = 0.5 diff --git a/Zennysoft.Game.Ma/src/items/jewels/resources/TelluricJewel.tres b/Zennysoft.Game.Ma/src/items/jewels/resources/TelluricJewel.tres index b99ce293f..19fbbc6f0 100644 --- a/Zennysoft.Game.Ma/src/items/jewels/resources/TelluricJewel.tres +++ b/Zennysoft.Game.Ma/src/items/jewels/resources/TelluricJewel.tres @@ -8,7 +8,7 @@ script = ExtResource("2_c8kww") JewelTag = 14 Name = "Telluric Jewel" StatDescription = "Augment -Weapon: Weapon type because Telluric. +Weapon: Weapon type becomes Telluric. Armor/Accessory: Increases Telluric resistance." FlavorText = "" SpawnRate = 0.5 diff --git a/Zennysoft.Game.Ma/src/map/dungeon/floors/Special Floors/Floor 08 Boss Floor A.tscn b/Zennysoft.Game.Ma/src/map/dungeon/floors/Special Floors/Floor 08 Boss Floor A.tscn index c205e6334..9819d202c 100644 --- a/Zennysoft.Game.Ma/src/map/dungeon/floors/Special Floors/Floor 08 Boss Floor A.tscn +++ b/Zennysoft.Game.Ma/src/map/dungeon/floors/Special Floors/Floor 08 Boss Floor A.tscn @@ -1418,7 +1418,7 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 10.2518, -1.9839, -1.2916) [node name="OxFace" parent="Bosses/OxFace" instance=ExtResource("27_g6y6v")] unique_name_in_owner = true -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 10.5263, -2.15637, -2.35483) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 10.5263, -2.01715, -2.35483) visible = false InitialHP = 125 diff --git a/Zennysoft.Game.Ma/src/player/Player.tscn b/Zennysoft.Game.Ma/src/player/Player.tscn index 3b792b4e5..ca7a2ace0 100644 --- a/Zennysoft.Game.Ma/src/player/Player.tscn +++ b/Zennysoft.Game.Ma/src/player/Player.tscn @@ -10636,6 +10636,7 @@ animations = [{ collision_layer = 802 collision_mask = 775 script = ExtResource("1_xcol5") +RotationSpeed = 1.6 HealthTimerIsActive = true [node name="MainCollision" type="CollisionShape3D" parent="."] diff --git a/Zennysoft.Game.Ma/src/utils/SceneLoader.cs b/Zennysoft.Game.Ma/src/utils/SceneLoader.cs index bd61011b6..1c84004dd 100644 --- a/Zennysoft.Game.Ma/src/utils/SceneLoader.cs +++ b/Zennysoft.Game.Ma/src/utils/SceneLoader.cs @@ -41,7 +41,7 @@ public partial class SceneLoader : Node var progress = new Godot.Collections.Array(); ResourceLoader.LoadThreadedGetStatus(_sceneToLoad, progress); EmitSignal(SignalName.SceneReportedProgress, progress.Single()); - if ((double)progress.Single() == 1) + if (Mathf.IsEqualApprox((double)progress.Single(), 1)) LoadScene(); } }