From 92e9351766d91bb3111e58c9985eed36227c9a89 Mon Sep 17 00:00:00 2001 From: Zenny Date: Thu, 11 Sep 2025 21:15:56 -0700 Subject: [PATCH] Fix up audio issue and resolve errors in godot log Replace label style settings with new fonts, need to resolve stretching issue still --- Zennysoft.Game.Ma/src/app/App.cs | 1 - Zennysoft.Game.Ma/src/audio/AudioManager.cs | 2 +- .../08a. Ambassador/AmbassadorModelView.tscn | 12 --------- .../14. horse_head/HorseFaceModelView.tscn | 26 +++++++++---------- .../15. ox_face/OxFaceModelView.tscn | 24 ++++++++--------- .../16. demon wall/DemonWallModelView.tscn | 24 ----------------- .../rooms/Set A/06. Balcony Room A.tscn | 20 -------------- .../src/ui/inventory_menu/InventoryMenu.cs | 3 ++- .../InventoryFullAlertLabelSetting.tres | 4 +-- .../ui/label_settings/MainTextApplied.tres | 4 +-- .../label_settings/MainTextFontEquipped.tres | 4 +-- .../MainTextFontItalicized.tres | 4 +-- 12 files changed, 36 insertions(+), 92 deletions(-) diff --git a/Zennysoft.Game.Ma/src/app/App.cs b/Zennysoft.Game.Ma/src/app/App.cs index 84ceaea1..730e3238 100644 --- a/Zennysoft.Game.Ma/src/app/App.cs +++ b/Zennysoft.Game.Ma/src/app/App.cs @@ -2,7 +2,6 @@ using Chickensoft.AutoInject; using Chickensoft.GodotNodeInterfaces; using Chickensoft.Introspection; using Godot; -using SimpleInjector; using SimpleInjector.Lifestyles; using Zennysoft.Game.Abstractions; using Zennysoft.Ma.Adapter; diff --git a/Zennysoft.Game.Ma/src/audio/AudioManager.cs b/Zennysoft.Game.Ma/src/audio/AudioManager.cs index 7f2bd8b3..b1644bc7 100644 --- a/Zennysoft.Game.Ma/src/audio/AudioManager.cs +++ b/Zennysoft.Game.Ma/src/audio/AudioManager.cs @@ -13,6 +13,7 @@ public partial class AudioManager : Node public override void _Ready() { _audioPlayer = new AudioStreamPlayer(); + AddChild(_audioPlayer); _sfxDictionary = new Dictionary(); var soundEffects = Enum.GetValues(typeof(SoundEffect)); foreach (var effect in soundEffects) @@ -26,7 +27,6 @@ public partial class AudioManager : Node _audioPlayer.Play(); } } - public enum SoundEffect { Cancel, diff --git a/Zennysoft.Game.Ma/src/enemy/enemy_types/08a. Ambassador/AmbassadorModelView.tscn b/Zennysoft.Game.Ma/src/enemy/enemy_types/08a. Ambassador/AmbassadorModelView.tscn index f8a34e72..d5f52b74 100644 --- a/Zennysoft.Game.Ma/src/enemy/enemy_types/08a. Ambassador/AmbassadorModelView.tscn +++ b/Zennysoft.Game.Ma/src/enemy/enemy_types/08a. Ambassador/AmbassadorModelView.tscn @@ -1889,15 +1889,3 @@ libraries = { [node name="AnimationTree" parent="." instance=ExtResource("261_a705x")] unique_name_in_owner = true - -[node name="EnemyDeathSoundMedium" parent="."] -_import_path = NodePath("") -unique_name_in_owner = false -process_mode = 0 -process_priority = 0 -process_physics_priority = 0 -process_thread_group = 0 -physics_interpolation_mode = 0 -auto_translate_mode = 0 -editor_description = "" -script = null diff --git a/Zennysoft.Game.Ma/src/enemy/enemy_types/14. horse_head/HorseFaceModelView.tscn b/Zennysoft.Game.Ma/src/enemy/enemy_types/14. horse_head/HorseFaceModelView.tscn index c0aa9048..ccb58641 100644 --- a/Zennysoft.Game.Ma/src/enemy/enemy_types/14. horse_head/HorseFaceModelView.tscn +++ b/Zennysoft.Game.Ma/src/enemy/enemy_types/14. horse_head/HorseFaceModelView.tscn @@ -949,7 +949,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.0996386, -0.419385, -1.53144) +bones/0/position = Vector3(0.0996386, -0.275575, -1.53144) bones/0/rotation = Quaternion(0.0256267, -0.805691, 0.0118477, 0.591662) bones/0/scale = Vector3(1, 1, 1) bones/1/name = "spine0" @@ -978,7 +978,7 @@ bones/4/parent = 3 bones/4/rest = Transform3D(0.901905, -0.410135, 0.135488, 0.412416, 0.910915, 0.0120912, -0.128377, 0.0449723, 0.990705, 2.5332e-07, 0.990515, -7.07805e-08) bones/4/enabled = true bones/4/position = Vector3(2.5332e-07, 0.990515, -7.07805e-08) -bones/4/rotation = Quaternion(-0.00497051, 0.0598761, 0.185939, 0.980723) +bones/4/rotation = Quaternion(0.00823408, 0.0675355, 0.210519, 0.975219) bones/4/scale = Vector3(1, 1, 1) bones/5/name = "neck4" bones/5/parent = 4 @@ -992,7 +992,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.32876, 0.0507484, -0.454554, 0.82627) +bones/6/rotation = Quaternion(-0.343412, 0.052141, -0.495863, 0.795908) bones/6/scale = Vector3(1, 1, 1) bones/7/name = "Bone.007" bones/7/parent = 6 @@ -1027,7 +1027,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.813642, -0.0938833, -0.0238148, 0.573242) +bones/11/rotation = Quaternion(-0.805856, -0.0793298, -0.0234794, 0.586303) bones/11/scale = Vector3(1, 1, 1) bones/12/name = "arm2_L" bones/12/parent = 11 @@ -1054,7 +1054,7 @@ bones/15/name = "arm1_R" 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.172026, 3.4158, 0.119968) +bones/15/position = Vector3(-0.203473, 3.65763, 0.074242) bones/15/rotation = Quaternion(-0.502686, 0.531044, 0.680821, -0.0422068) bones/15/scale = Vector3(1, 1, 1) bones/16/name = "arm2_R" @@ -1069,7 +1069,7 @@ bones/17/parent = 16 bones/17/rest = Transform3D(0.998789, 0.0488077, -0.00615137, -0.0491113, 0.996528, -0.0672226, 0.00284903, 0.0674433, 0.997719, -5.21541e-08, 3.04263, -1.31503e-06) bones/17/enabled = true bones/17/position = Vector3(-5.21541e-08, 3.04263, -1.31503e-06) -bones/17/rotation = Quaternion(-0.0115315, 0.0961663, 0.276882, 0.95601) +bones/17/rotation = Quaternion(-0.046921, 0.0973887, 0.264564, 0.95829) bones/17/scale = Vector3(1, 1, 1) bones/18/name = "hand_R" bones/18/parent = 17 @@ -1082,7 +1082,7 @@ 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.147751, -0.363205, -1.49267) +bones/19/position = Vector3(0.147751, -0.279981, -1.49267) bones/19/rotation = Quaternion(0.427793, 0.34021, 0.687061, -0.478745) bones/19/scale = Vector3(1, 1, 1) bones/20/name = "leg1_L" @@ -1090,14 +1090,14 @@ 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.434001, -0.329977, -0.375171, 0.74967) +bones/20/rotation = Quaternion(-0.437866, -0.325186, -0.36926, 0.752446) bones/20/scale = Vector3(1, 1, 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.0493011, 0.00187748, 0.394362, 0.91763) +bones/21/rotation = Quaternion(-0.0474618, 0.00189033, 0.37965, 0.92391) bones/21/scale = Vector3(1, 1, 1) bones/22/name = "foot1_L" bones/22/parent = 21 @@ -1131,7 +1131,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.0289172, -0.352094, -1.59603) +bones/26/position = Vector3(0.0289172, -0.296612, -1.59603) bones/26/rotation = Quaternion(0.695067, -0.09936, -0.377924, -0.603475) bones/26/scale = Vector3(1, 1, 1) bones/27/name = "leg1_R" @@ -1139,14 +1139,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.312319, 0.177803, 0.184263, 0.914817) +bones/27/rotation = Quaternion(-0.317769, 0.173907, 0.183876, 0.913766) bones/27/scale = Vector3(1, 1, 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.277712, 0.0201374, -0.181203, 0.943205) +bones/28/rotation = Quaternion(-0.267722, 0.0202251, -0.174685, 0.947312) bones/28/scale = Vector3(1, 1, 1) bones/29/name = "foot1_R" bones/29/parent = 28 @@ -1183,7 +1183,7 @@ mesh = SubResource("ArrayMesh_6e63x") skin = SubResource("Skin_yvw71") [node name="BoneAttachment3D" type="BoneAttachment3D" parent="Armature/Skeleton3D"] -transform = Transform3D(-0.370164, -0.13327, -0.919357, -0.299728, -0.919595, 0.253985, -0.879285, 0.369573, 0.300456, -2.00357, 8.72687, 6.31395) +transform = Transform3D(-0.370165, -0.13327, -0.919357, -0.25739, -0.936197, 0.239345, -0.892596, 0.32523, 0.312245, -2.00356, 8.78642, 6.13561) bone_name = "TOP OF SKULL" bone_idx = 8 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 abc6b5cb..2563492f 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 @@ -200,7 +200,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.259916, -1.01272, -1.97047) +bones/0/position = Vector3(-0.259469, -0.961723, -1.97391) bones/0/rotation = Quaternion(0.0915277, -0.692111, -0.0341586, 0.715149) bones/0/scale = Vector3(1, 1, 1) bones/1/name = "spine0" @@ -243,7 +243,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.0632592, -0.299983, -0.744595, 0.592947) +bones/6/rotation = Quaternion(-0.0704928, -0.302607, -0.744723, 0.590633) bones/6/scale = Vector3(1, 1, 1) bones/7/name = "Bone.007" bones/7/parent = 6 @@ -278,7 +278,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.781861, -0.0591304, 0.0775836, 0.615775) +bones/11/rotation = Quaternion(-0.784852, -0.0617623, 0.0715771, 0.612429) bones/11/scale = Vector3(1, 0.999999, 1) bones/12/name = "arm2_L" bones/12/parent = 11 @@ -306,7 +306,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.213342, 0.742048, 0.617147, -0.151593) +bones/15/rotation = Quaternion(-0.210556, 0.737696, 0.621827, -0.157488) bones/15/scale = Vector3(1, 1, 1) bones/16/name = "arm2_R" bones/16/parent = 15 @@ -333,22 +333,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.348408, -1.16905, -1.82543) -bones/19/rotation = Quaternion(0.621031, 0.301051, 0.556216, -0.462939) +bones/19/position = Vector3(-0.307336, -1.13019, -1.96076) +bones/19/rotation = Quaternion(0.612399, 0.311274, 0.569887, -0.450895) 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.320831, -0.43062, -0.289064, 0.792512) +bones/20/rotation = Quaternion(-0.311865, -0.440436, -0.274256, 0.795952) 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.0603916, 0.00129908, 0.488873, 0.870261) +bones/21/rotation = Quaternion(-0.0601624, 0.00130066, 0.487017, 0.871317) bones/21/scale = Vector3(1, 1, 1) bones/22/name = "foot1_L" bones/22/parent = 21 @@ -382,7 +382,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.119273, -1.11395, -2.01852) +bones/26/position = Vector3(-0.239999, -1.11395, -2.0177) bones/26/rotation = Quaternion(0.608697, -0.3155, -0.575514, -0.445793) bones/26/scale = Vector3(1, 1, 1) bones/27/name = "leg1_R" @@ -390,14 +390,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.20434, 0.423509, 0.139511, 0.871448) +bones/27/rotation = Quaternion(-0.20785, 0.421571, 0.141986, 0.871158) 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.0633194, -0.00116104, -0.505536, 0.860478) +bones/28/rotation = Quaternion(-0.0640726, -0.00115616, -0.511551, 0.85686) bones/28/scale = Vector3(1, 1, 1) bones/29/name = "foot1_R" bones/29/parent = 28 @@ -429,7 +429,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.284352, -0.0642184, -0.956567, -0.33108, -0.929794, 0.160838, -0.899738, 0.362435, 0.243127, -1.67347, 8.24844, 4.9525) +transform = Transform3D(-0.292622, -0.0771386, -0.953112, -0.329652, -0.9275, 0.176274, -0.897608, 0.365778, 0.245978, -1.66576, 8.30266, 4.94823) bone_name = "TOP OF SKULL" bone_idx = 8 diff --git a/Zennysoft.Game.Ma/src/enemy/enemy_types/16. demon wall/DemonWallModelView.tscn b/Zennysoft.Game.Ma/src/enemy/enemy_types/16. demon wall/DemonWallModelView.tscn index c880df71..0db96b60 100644 --- a/Zennysoft.Game.Ma/src/enemy/enemy_types/16. demon wall/DemonWallModelView.tscn +++ b/Zennysoft.Game.Ma/src/enemy/enemy_types/16. demon wall/DemonWallModelView.tscn @@ -157,57 +157,33 @@ unique_name_in_owner = true [node name="Arm1" parent="LeftArms" instance=ExtResource("1_ell80")] unique_name_in_owner = true -Damage = null -PrimaryAttackElementalDamageBonus = null [node name="Arm2" parent="LeftArms" instance=ExtResource("2_kblru")] unique_name_in_owner = true -Damage = null -PrimaryAttackElementalType = null -PrimaryAttackElementalDamageBonus = null [node name="Arm3" parent="LeftArms" instance=ExtResource("3_nqxqr")] unique_name_in_owner = true -Damage = null -PrimaryAttackElementalType = null -PrimaryAttackElementalDamageBonus = null [node name="Arm4" parent="LeftArms" instance=ExtResource("4_r5yku")] unique_name_in_owner = true -Damage = null -PrimaryAttackElementalType = null -PrimaryAttackElementalDamageBonus = null [node name="Arm5" parent="LeftArms" instance=ExtResource("5_5oa7x")] unique_name_in_owner = true -Damage = null -PrimaryAttackElementalType = null -PrimaryAttackElementalDamageBonus = null [node name="RightArms" type="Node3D" parent="."] unique_name_in_owner = true [node name="Arm6" parent="RightArms" instance=ExtResource("6_h1yna")] unique_name_in_owner = true -Damage = null -PrimaryAttackElementalDamageBonus = null [node name="Arm7" parent="RightArms" instance=ExtResource("7_6s6sq")] unique_name_in_owner = true -Damage = null -PrimaryAttackElementalDamageBonus = null [node name="Arm8" parent="RightArms" instance=ExtResource("8_e82oe")] unique_name_in_owner = true -Damage = null -PrimaryAttackElementalType = null -PrimaryAttackElementalDamageBonus = null [node name="Arm9" parent="RightArms" instance=ExtResource("9_c826n")] unique_name_in_owner = true -Damage = null -PrimaryAttackElementalType = null -PrimaryAttackElementalDamageBonus = null [node name="Base" type="Node3D" parent="."] diff --git a/Zennysoft.Game.Ma/src/map/dungeon/rooms/Set A/06. Balcony Room A.tscn b/Zennysoft.Game.Ma/src/map/dungeon/rooms/Set A/06. Balcony Room A.tscn index 5c96cee5..0d1e5cf7 100644 --- a/Zennysoft.Game.Ma/src/map/dungeon/rooms/Set A/06. Balcony Room A.tscn +++ b/Zennysoft.Game.Ma/src/map/dungeon/rooms/Set A/06. Balcony Room A.tscn @@ -21,26 +21,22 @@ [sub_resource type="StandardMaterial3D" id="StandardMaterial3D_ta5ix"] resource_name = "Material.003" transparency = 4 -shading_mode = 1 albedo_texture = ExtResource("2_40w7a") texture_filter = 2 [sub_resource type="StandardMaterial3D" id="StandardMaterial3D_f1m05"] resource_name = "Material.179" transparency = 4 -shading_mode = 1 albedo_texture = ExtResource("3_87bce") [sub_resource type="StandardMaterial3D" id="StandardMaterial3D_4ujpa"] resource_name = "Material.001" transparency = 4 -shading_mode = 1 albedo_texture = ExtResource("4_j2bdg") texture_filter = 2 [sub_resource type="StandardMaterial3D" id="StandardMaterial3D_d7xkq"] resource_name = "Material.249" -shading_mode = 1 albedo_color = Color(0.619351, 0.856174, 0.814509, 1) [sub_resource type="ArrayMesh" id="ArrayMesh_gha4v"] @@ -145,14 +141,12 @@ shadow_mesh = SubResource("ArrayMesh_gha4v") [sub_resource type="StandardMaterial3D" id="StandardMaterial3D_0d00g"] resource_name = "Material.248" -shading_mode = 1 albedo_texture = ExtResource("5_ipyas") texture_filter = 2 [sub_resource type="StandardMaterial3D" id="StandardMaterial3D_fmqpu"] resource_name = "Material.360" transparency = 4 -shading_mode = 1 albedo_texture = ExtResource("4_j2bdg") texture_filter = 2 @@ -215,7 +209,6 @@ shadow_mesh = SubResource("ArrayMesh_lebro") [sub_resource type="StandardMaterial3D" id="StandardMaterial3D_hwywj"] resource_name = "Material.008" transparency = 4 -shading_mode = 1 albedo_texture = ExtResource("6_l60l0") texture_filter = 2 @@ -278,12 +271,10 @@ shadow_mesh = SubResource("ArrayMesh_32yn2") [sub_resource type="StandardMaterial3D" id="StandardMaterial3D_8cs7c"] resource_name = "Material.139" transparency = 4 -shading_mode = 1 albedo_texture = ExtResource("3_87bce") [sub_resource type="StandardMaterial3D" id="StandardMaterial3D_88tja"] resource_name = "Material.141" -shading_mode = 1 albedo_texture = ExtResource("7_0a6f8") [sub_resource type="ArrayMesh" id="ArrayMesh_vwi8f"] @@ -347,12 +338,10 @@ shadow_mesh = SubResource("ArrayMesh_vwi8f") [sub_resource type="StandardMaterial3D" id="StandardMaterial3D_p4px3"] resource_name = "Material.142" transparency = 4 -shading_mode = 1 albedo_texture = ExtResource("3_87bce") [sub_resource type="StandardMaterial3D" id="StandardMaterial3D_1scl6"] resource_name = "Material.144" -shading_mode = 1 albedo_texture = ExtResource("7_0a6f8") [sub_resource type="ArrayMesh" id="ArrayMesh_280nf"] @@ -416,7 +405,6 @@ shadow_mesh = SubResource("ArrayMesh_280nf") [sub_resource type="StandardMaterial3D" id="StandardMaterial3D_wcogv"] resource_name = "Material.147" transparency = 4 -shading_mode = 1 albedo_texture = ExtResource("8_y7arm") texture_filter = 2 @@ -457,13 +445,11 @@ shadow_mesh = SubResource("ArrayMesh_1f1lu") [sub_resource type="StandardMaterial3D" id="StandardMaterial3D_bov2t"] resource_name = "Material.178" transparency = 4 -shading_mode = 1 albedo_texture = ExtResource("3_87bce") [sub_resource type="StandardMaterial3D" id="StandardMaterial3D_o17nd"] resource_name = "Material.023" transparency = 4 -shading_mode = 1 albedo_texture = ExtResource("9_85rlu") texture_filter = 2 @@ -550,7 +536,6 @@ resource_name = "Material.019" transparency = 2 alpha_scissor_threshold = 0.5 alpha_antialiasing_mode = 0 -shading_mode = 1 albedo_texture = ExtResource("10_cug6o") [sub_resource type="ArrayMesh" id="ArrayMesh_ebmst"] @@ -587,13 +572,11 @@ shadow_mesh = SubResource("ArrayMesh_ebmst") [sub_resource type="StandardMaterial3D" id="StandardMaterial3D_3qwpo"] resource_name = "Material.177" -shading_mode = 1 albedo_texture = ExtResource("11_layqk") [sub_resource type="StandardMaterial3D" id="StandardMaterial3D_lkxf0"] resource_name = "Material.002" transparency = 4 -shading_mode = 1 albedo_texture = ExtResource("12_7tgyc") texture_filter = 2 @@ -742,14 +725,12 @@ shadow_mesh = SubResource("ArrayMesh_vk5q6") [sub_resource type="StandardMaterial3D" id="StandardMaterial3D_ai4ye"] resource_name = "Material.152" transparency = 4 -shading_mode = 1 albedo_texture = ExtResource("4_j2bdg") texture_filter = 2 [sub_resource type="StandardMaterial3D" id="StandardMaterial3D_hfoul"] resource_name = "Material.153" transparency = 4 -shading_mode = 1 albedo_texture = ExtResource("8_y7arm") texture_filter = 2 @@ -852,7 +833,6 @@ data = PackedVector3Array(1.20722, -1, 0, 0.853632, -1, 0.853632, 0.853632, 1, 0 data = PackedVector3Array(0.983567, -1, 0, 0.695487, -1, 0.695487, 0.695487, 1, 0.695487, 0.695487, 1, 0.695487, 0.983567, 1, 0, 0.983567, -1, 0, 0.695487, -1, 0.695487, 0.983567, -1, 0, 0, -1, 0, 0.983567, 1, 0, 0.695487, 1, 0.695487, 0, 1, 0, 0.695487, -1, 0.695487, -4.29931e-08, -1, 0.983567, -4.29931e-08, 1, 0.983567, -4.29931e-08, 1, 0.983567, 0.695487, 1, 0.695487, 0.695487, -1, 0.695487, -4.29931e-08, -1, 0.983567, 0.695487, -1, 0.695487, 0, -1, 0, 0.695487, 1, 0.695487, -4.29931e-08, 1, 0.983567, 0, 1, 0, -4.29931e-08, -1, 0.983567, -0.695487, -1, 0.695487, -0.695487, 1, 0.695487, -0.695487, 1, 0.695487, -4.29931e-08, 1, 0.983567, -4.29931e-08, -1, 0.983567, -0.695487, -1, 0.695487, -4.29931e-08, -1, 0.983567, 0, -1, 0, -4.29931e-08, 1, 0.983567, -0.695487, 1, 0.695487, 0, 1, 0, -0.695487, -1, 0.695487, -0.983567, -1, -8.59862e-08, -0.983567, 1, -8.59862e-08, -0.983567, 1, -8.59862e-08, -0.695487, 1, 0.695487, -0.695487, -1, 0.695487, -0.983567, -1, -8.59862e-08, -0.695487, -1, 0.695487, 0, -1, 0, -0.695487, 1, 0.695487, -0.983567, 1, -8.59862e-08, 0, 1, 0, -0.983567, -1, -8.59862e-08, -0.695487, -1, -0.695487, -0.695487, 1, -0.695487, -0.695487, 1, -0.695487, -0.983567, 1, -8.59862e-08, -0.983567, -1, -8.59862e-08, -0.695487, -1, -0.695487, -0.983567, -1, -8.59862e-08, 0, -1, 0, -0.983567, 1, -8.59862e-08, -0.695487, 1, -0.695487, 0, 1, 0, -0.695487, -1, -0.695487, 1.17289e-08, -1, -0.983567, 1.17289e-08, 1, -0.983567, 1.17289e-08, 1, -0.983567, -0.695487, 1, -0.695487, -0.695487, -1, -0.695487, 1.17289e-08, -1, -0.983567, -0.695487, -1, -0.695487, 0, -1, 0, -0.695487, 1, -0.695487, 1.17289e-08, 1, -0.983567, 0, 1, 0, 1.17289e-08, -1, -0.983567, 0.695487, -1, -0.695487, 0.695487, 1, -0.695487, 0.695487, 1, -0.695487, 1.17289e-08, 1, -0.983567, 1.17289e-08, -1, -0.983567, 0.695487, -1, -0.695487, 1.17289e-08, -1, -0.983567, 0, -1, 0, 1.17289e-08, 1, -0.983567, 0.695487, 1, -0.695487, 0, 1, 0, 0.695487, -1, -0.695487, 0.983567, -1, 0, 0.983567, 1, 0, 0.983567, 1, 0, 0.695487, 1, -0.695487, 0.695487, -1, -0.695487, 0.983567, -1, 0, 0.695487, -1, -0.695487, 0, -1, 0, 0.695487, 1, -0.695487, 0.983567, 1, 0, 0, 1, 0) [sub_resource type="StandardMaterial3D" id="StandardMaterial3D_fgovc"] -shading_mode = 1 albedo_texture = ExtResource("13_66rjw") texture_filter = 0 diff --git a/Zennysoft.Game.Ma/src/ui/inventory_menu/InventoryMenu.cs b/Zennysoft.Game.Ma/src/ui/inventory_menu/InventoryMenu.cs index 2d7858e2..d4913cbc 100644 --- a/Zennysoft.Game.Ma/src/ui/inventory_menu/InventoryMenu.cs +++ b/Zennysoft.Game.Ma/src/ui/inventory_menu/InventoryMenu.cs @@ -5,6 +5,7 @@ using Godot; using System.Linq; using System.Threading.Tasks; using Zennysoft.Ma.Adapter; +using static Zennysoft.Game.Ma.AudioManager; namespace Zennysoft.Game.Ma; @@ -177,8 +178,8 @@ public partial class InventoryMenu : Control, IInventoryMenu Player.Stats.CurrentLevel.Sync -= CurrentLevel_Sync; Player.Stats.BonusAttack.Sync -= BonusAttack_Sync; Player.Stats.BonusDefense.Sync -= BonusDefense_Sync; - _gameRepo.CloseInventory(); Autoload.AudioManager.Play(SoundEffect.Cancel); + _gameRepo.CloseInventory(); } } diff --git a/Zennysoft.Game.Ma/src/ui/label_settings/InventoryFullAlertLabelSetting.tres b/Zennysoft.Game.Ma/src/ui/label_settings/InventoryFullAlertLabelSetting.tres index 94b67aef..bca26a2b 100644 --- a/Zennysoft.Game.Ma/src/ui/label_settings/InventoryFullAlertLabelSetting.tres +++ b/Zennysoft.Game.Ma/src/ui/label_settings/InventoryFullAlertLabelSetting.tres @@ -1,8 +1,8 @@ [gd_resource type="LabelSettings" load_steps=2 format=3 uid="uid://bqdq5r46uduvd"] -[ext_resource type="FontFile" uid="uid://dit3vylt7hmmx" path="res://src/ui/fonts/FT88-Regular.ttf" id="1_gld51"] +[ext_resource type="FontFile" uid="uid://duu4matpexcq4" path="res://src/ui/fonts/LSANS.TTF" id="1_kxooq"] [resource] -font = ExtResource("1_gld51") +font = ExtResource("1_kxooq") font_size = 24 font_color = Color(0.737255, 0.705882, 0.690196, 1) diff --git a/Zennysoft.Game.Ma/src/ui/label_settings/MainTextApplied.tres b/Zennysoft.Game.Ma/src/ui/label_settings/MainTextApplied.tres index bbe76c3d..74d88ef7 100644 --- a/Zennysoft.Game.Ma/src/ui/label_settings/MainTextApplied.tres +++ b/Zennysoft.Game.Ma/src/ui/label_settings/MainTextApplied.tres @@ -1,8 +1,8 @@ [gd_resource type="LabelSettings" load_steps=2 format=3 uid="uid://ckvxvx2tiwttt"] -[ext_resource type="FontFile" uid="uid://cb41qqmxqurj8" path="res://src/ui/fonts/FT88-Bold.ttf" id="1_roceg"] +[ext_resource type="FontFile" uid="uid://ddvfnyovqnvew" path="res://src/ui/fonts/LSANSI.TTF" id="1_fr1ua"] [resource] -font = ExtResource("1_roceg") +font = ExtResource("1_fr1ua") font_size = 36 font_color = Color(1, 0.94902, 0, 1) diff --git a/Zennysoft.Game.Ma/src/ui/label_settings/MainTextFontEquipped.tres b/Zennysoft.Game.Ma/src/ui/label_settings/MainTextFontEquipped.tres index c3482b11..11452fd6 100644 --- a/Zennysoft.Game.Ma/src/ui/label_settings/MainTextFontEquipped.tres +++ b/Zennysoft.Game.Ma/src/ui/label_settings/MainTextFontEquipped.tres @@ -1,8 +1,8 @@ [gd_resource type="LabelSettings" load_steps=2 format=3 uid="uid://ur3wpe2kp2j2"] -[ext_resource type="FontFile" uid="uid://cb41qqmxqurj8" path="res://src/ui/fonts/FT88-Bold.ttf" id="1_t2ic4"] +[ext_resource type="FontFile" uid="uid://duu4matpexcq4" path="res://src/ui/fonts/LSANS.TTF" id="1_jsy43"] [resource] -font = ExtResource("1_t2ic4") +font = ExtResource("1_jsy43") font_size = 36 font_color = Color(0, 0.682353, 0.937255, 1) diff --git a/Zennysoft.Game.Ma/src/ui/label_settings/MainTextFontItalicized.tres b/Zennysoft.Game.Ma/src/ui/label_settings/MainTextFontItalicized.tres index 6fe3ff3a..4a4865ff 100644 --- a/Zennysoft.Game.Ma/src/ui/label_settings/MainTextFontItalicized.tres +++ b/Zennysoft.Game.Ma/src/ui/label_settings/MainTextFontItalicized.tres @@ -1,8 +1,8 @@ [gd_resource type="LabelSettings" load_steps=2 format=3 uid="uid://c4wbba5mo7qcp"] -[ext_resource type="FontFile" uid="uid://bohbd123672ea" path="res://src/ui/fonts/FT88-Italic.ttf" id="1_ofouc"] +[ext_resource type="FontFile" uid="uid://ddvfnyovqnvew" path="res://src/ui/fonts/LSANSI.TTF" id="1_gvqi7"] [resource] -font = ExtResource("1_ofouc") +font = ExtResource("1_gvqi7") font_size = 36 font_color = Color(1, 0.94902, 0, 1)