From 765821895b419914511f1c2f722be5111ab05d71 Mon Sep 17 00:00:00 2001 From: Zenny Date: Sat, 6 Jun 2026 11:57:59 -0700 Subject: [PATCH] Add attack descriptions to lore info --- Zennysoft.Game.Ma/src/enemy/EnemyLoreInfo.cs | 16 ++++- .../01. sproingy/SproingyLoreInfo.tres | 8 ++- .../02. michael/MichaelLoreInfo.tres | 8 ++- .../03. filth_eater/FilthEaterLoreInfo.tres | 8 ++- .../enemy_types/04. sara/SaraLoreInfo.tres | 8 ++- .../05. ballos/BallosLoreInfo.tres | 8 ++- .../06. Planter/PlanterLoreInfo.tres | 8 ++- .../07. chinthe/ChinteLoreInfo.tres | 8 ++- .../08a. Ambassador/AmbassadorLoreInfo.tres | 8 ++- .../09. Agni/AgniDemonLoreInfo.tres | 8 ++- .../10. Eden Pillar/EdenPillarLore.tres | 8 ++- .../enemy_types/11. Palan/PalanLoreInfo.tres | 8 ++- .../ShieldOfHeavenLoreInfo.tres | 8 ++- .../GoldSproingyLoreInfo.tres | 8 ++- .../14. horse_head/HorseFaceLoreInfo.tres | 8 ++- .../15. ox_face/OxHeadLoreInfo.tres | 8 ++- .../enemy_types/16. demon wall/Arm1.tscn | 64 ++++++++++++----- .../enemy_types/16. demon wall/Arm2.tscn | 70 +++++++++++------- .../enemy_types/16. demon wall/Arm3.tscn | 68 ++++++++++++------ .../enemy_types/16. demon wall/Arm4.tscn | 31 ++++++-- .../enemy_types/16. demon wall/Arm5.tscn | 53 +++++++++----- .../enemy_types/16. demon wall/Arm6.tscn | 38 +++++----- .../enemy_types/16. demon wall/Arm7.tscn | 71 ++++++++++++------- .../enemy_types/16. demon wall/Arm8.tscn | 33 +++++++-- .../enemy_types/16. demon wall/Arm9.tscn | 69 +++++++++++------- .../16. demon wall/DemonWallLoreInfo.tres | 8 ++- .../9b. Aqueos Demon/AqueosDemonLoreInfo.tres | 8 ++- .../src/enemy_viewer/EnemyViewer.cs | 2 - 28 files changed, 452 insertions(+), 199 deletions(-) diff --git a/Zennysoft.Game.Ma/src/enemy/EnemyLoreInfo.cs b/Zennysoft.Game.Ma/src/enemy/EnemyLoreInfo.cs index 6a7f1a82..373bb6e2 100644 --- a/Zennysoft.Game.Ma/src/enemy/EnemyLoreInfo.cs +++ b/Zennysoft.Game.Ma/src/enemy/EnemyLoreInfo.cs @@ -1,4 +1,5 @@ using Godot; +using Zennysoft.Ma.Adapter; namespace Zennysoft.Game.Ma; @@ -25,9 +26,20 @@ public partial class EnemyLoreInfo : Resource public string Weakness { get; set; } [Export] - public string Drop1 { get; set; } + public string PrimaryAttackName { get; set; } [Export] - public string Drop2 { get; set; } + public ElementType PrimaryAttackType { get; set; } + [Export] + public string SecondaryAttackName { get; set; } + + [Export] + public ElementType SecondaryAttackType { get; set; } + + [Export] + public string TertiaryAttackName { get; set; } + + [Export] + public ElementType TertiaryAttackType { get; set; } } diff --git a/Zennysoft.Game.Ma/src/enemy/enemy_types/01. sproingy/SproingyLoreInfo.tres b/Zennysoft.Game.Ma/src/enemy/enemy_types/01. sproingy/SproingyLoreInfo.tres index fba4a63f..1536810e 100644 --- a/Zennysoft.Game.Ma/src/enemy/enemy_types/01. sproingy/SproingyLoreInfo.tres +++ b/Zennysoft.Game.Ma/src/enemy/enemy_types/01. sproingy/SproingyLoreInfo.tres @@ -11,6 +11,10 @@ ATK = "" DEF = "" Affinity = "Igneous" Weakness = "" -Drop1 = "" -Drop2 = "" +PrimaryAttackName = "Baleful Strike" +PrimaryAttackType = 0 +SecondaryAttackName = "" +SecondaryAttackType = 0 +TertiaryAttackName = "" +TertiaryAttackType = 0 metadata/_custom_type_script = "uid://dlsgyx4i1jmp3" diff --git a/Zennysoft.Game.Ma/src/enemy/enemy_types/02. michael/MichaelLoreInfo.tres b/Zennysoft.Game.Ma/src/enemy/enemy_types/02. michael/MichaelLoreInfo.tres index e34ded2e..8b6fe594 100644 --- a/Zennysoft.Game.Ma/src/enemy/enemy_types/02. michael/MichaelLoreInfo.tres +++ b/Zennysoft.Game.Ma/src/enemy/enemy_types/02. michael/MichaelLoreInfo.tres @@ -13,6 +13,10 @@ ATK = "" DEF = "" Affinity = "Ferrum" Weakness = "" -Drop1 = "" -Drop2 = "" +PrimaryAttackName = "Limbic Shock" +PrimaryAttackType = 6 +SecondaryAttackName = "" +SecondaryAttackType = 0 +TertiaryAttackName = "" +TertiaryAttackType = 0 metadata/_custom_type_script = "uid://dlsgyx4i1jmp3" diff --git a/Zennysoft.Game.Ma/src/enemy/enemy_types/03. filth_eater/FilthEaterLoreInfo.tres b/Zennysoft.Game.Ma/src/enemy/enemy_types/03. filth_eater/FilthEaterLoreInfo.tres index aae38678..b5747b5f 100644 --- a/Zennysoft.Game.Ma/src/enemy/enemy_types/03. filth_eater/FilthEaterLoreInfo.tres +++ b/Zennysoft.Game.Ma/src/enemy/enemy_types/03. filth_eater/FilthEaterLoreInfo.tres @@ -13,6 +13,10 @@ ATK = "" DEF = "" Affinity = "Eolic" Weakness = "" -Drop1 = "" -Drop2 = "" +PrimaryAttackName = "Aero Cannon" +PrimaryAttackType = 1 +SecondaryAttackName = "Metal Cutter" +SecondaryAttackType = 5 +TertiaryAttackName = "" +TertiaryAttackType = 0 metadata/_custom_type_script = "uid://dlsgyx4i1jmp3" diff --git a/Zennysoft.Game.Ma/src/enemy/enemy_types/04. sara/SaraLoreInfo.tres b/Zennysoft.Game.Ma/src/enemy/enemy_types/04. sara/SaraLoreInfo.tres index dafb29a3..4b56056e 100644 --- a/Zennysoft.Game.Ma/src/enemy/enemy_types/04. sara/SaraLoreInfo.tres +++ b/Zennysoft.Game.Ma/src/enemy/enemy_types/04. sara/SaraLoreInfo.tres @@ -13,6 +13,10 @@ ATK = "" DEF = "" Affinity = "Telluric" Weakness = "" -Drop1 = "" -Drop2 = "" +PrimaryAttackName = "Tetra Strike" +PrimaryAttackType = 5 +SecondaryAttackName = "Miasma Vex" +SecondaryAttackType = 7 +TertiaryAttackName = "" +TertiaryAttackType = 0 metadata/_custom_type_script = "uid://dlsgyx4i1jmp3" diff --git a/Zennysoft.Game.Ma/src/enemy/enemy_types/05. ballos/BallosLoreInfo.tres b/Zennysoft.Game.Ma/src/enemy/enemy_types/05. ballos/BallosLoreInfo.tres index 9ea3f07e..568a3201 100644 --- a/Zennysoft.Game.Ma/src/enemy/enemy_types/05. ballos/BallosLoreInfo.tres +++ b/Zennysoft.Game.Ma/src/enemy/enemy_types/05. ballos/BallosLoreInfo.tres @@ -13,6 +13,10 @@ ATK = "" DEF = "" Affinity = "Telluric" Weakness = "" -Drop1 = "" -Drop2 = "" +PrimaryAttackName = "Telluric Strike" +PrimaryAttackType = 2 +SecondaryAttackName = "Three Colors Gaze" +SecondaryAttackType = 0 +TertiaryAttackName = "" +TertiaryAttackType = 0 metadata/_custom_type_script = "uid://dlsgyx4i1jmp3" diff --git a/Zennysoft.Game.Ma/src/enemy/enemy_types/06. Planter/PlanterLoreInfo.tres b/Zennysoft.Game.Ma/src/enemy/enemy_types/06. Planter/PlanterLoreInfo.tres index 455e36da..3669f9ac 100644 --- a/Zennysoft.Game.Ma/src/enemy/enemy_types/06. Planter/PlanterLoreInfo.tres +++ b/Zennysoft.Game.Ma/src/enemy/enemy_types/06. Planter/PlanterLoreInfo.tres @@ -14,6 +14,10 @@ ATK = "" DEF = "" Affinity = "Telluric" Weakness = "" -Drop1 = "" -Drop2 = "" +PrimaryAttackName = "Biohazard Spray" +PrimaryAttackType = 5 +SecondaryAttackName = "Green-Earth Flare" +SecondaryAttackType = 2 +TertiaryAttackName = "" +TertiaryAttackType = 0 metadata/_custom_type_script = "uid://dlsgyx4i1jmp3" diff --git a/Zennysoft.Game.Ma/src/enemy/enemy_types/07. chinthe/ChinteLoreInfo.tres b/Zennysoft.Game.Ma/src/enemy/enemy_types/07. chinthe/ChinteLoreInfo.tres index 5b8b9684..d89fcef9 100644 --- a/Zennysoft.Game.Ma/src/enemy/enemy_types/07. chinthe/ChinteLoreInfo.tres +++ b/Zennysoft.Game.Ma/src/enemy/enemy_types/07. chinthe/ChinteLoreInfo.tres @@ -13,6 +13,10 @@ ATK = "" DEF = "" Affinity = "Eolic" Weakness = "" -Drop1 = "" -Drop2 = "" +PrimaryAttackName = "Matter Shift" +PrimaryAttackType = 0 +SecondaryAttackName = "Mid-Century Pulsar" +SecondaryAttackType = 0 +TertiaryAttackName = "" +TertiaryAttackType = 0 metadata/_custom_type_script = "uid://dlsgyx4i1jmp3" diff --git a/Zennysoft.Game.Ma/src/enemy/enemy_types/08a. Ambassador/AmbassadorLoreInfo.tres b/Zennysoft.Game.Ma/src/enemy/enemy_types/08a. Ambassador/AmbassadorLoreInfo.tres index 245d2602..8242ae5b 100644 --- a/Zennysoft.Game.Ma/src/enemy/enemy_types/08a. Ambassador/AmbassadorLoreInfo.tres +++ b/Zennysoft.Game.Ma/src/enemy/enemy_types/08a. Ambassador/AmbassadorLoreInfo.tres @@ -13,6 +13,10 @@ ATK = "" DEF = "" Affinity = "Ferrum" Weakness = "" -Drop1 = "" -Drop2 = "" +PrimaryAttackName = "Embargo Kick" +PrimaryAttackType = 5 +SecondaryAttackName = "Treaty Punch" +SecondaryAttackType = 5 +TertiaryAttackName = "" +TertiaryAttackType = 0 metadata/_custom_type_script = "uid://dlsgyx4i1jmp3" diff --git a/Zennysoft.Game.Ma/src/enemy/enemy_types/09. Agni/AgniDemonLoreInfo.tres b/Zennysoft.Game.Ma/src/enemy/enemy_types/09. Agni/AgniDemonLoreInfo.tres index a4cc0f2c..5fcd8f3d 100644 --- a/Zennysoft.Game.Ma/src/enemy/enemy_types/09. Agni/AgniDemonLoreInfo.tres +++ b/Zennysoft.Game.Ma/src/enemy/enemy_types/09. Agni/AgniDemonLoreInfo.tres @@ -13,6 +13,10 @@ ATK = "" DEF = "" Affinity = "Igneous" Weakness = "" -Drop1 = "" -Drop2 = "" +PrimaryAttackName = "Fifth Sun Neutral" +PrimaryAttackType = 4 +SecondaryAttackName = "Pompeii Slash" +SecondaryAttackType = 4 +TertiaryAttackName = "" +TertiaryAttackType = 0 metadata/_custom_type_script = "uid://dlsgyx4i1jmp3" diff --git a/Zennysoft.Game.Ma/src/enemy/enemy_types/10. Eden Pillar/EdenPillarLore.tres b/Zennysoft.Game.Ma/src/enemy/enemy_types/10. Eden Pillar/EdenPillarLore.tres index dfe2e9a7..d88f3463 100644 --- a/Zennysoft.Game.Ma/src/enemy/enemy_types/10. Eden Pillar/EdenPillarLore.tres +++ b/Zennysoft.Game.Ma/src/enemy/enemy_types/10. Eden Pillar/EdenPillarLore.tres @@ -13,6 +13,10 @@ ATK = "" DEF = "" Affinity = "Sankta" Weakness = "" -Drop1 = "" -Drop2 = "" +PrimaryAttackName = "Cyanobacteria Bomb" +PrimaryAttackType = 3 +SecondaryAttackName = "Oxygen Destroyer" +SecondaryAttackType = 4 +TertiaryAttackName = "Catalyst Bolt" +TertiaryAttackType = 1 metadata/_custom_type_script = "uid://dlsgyx4i1jmp3" diff --git a/Zennysoft.Game.Ma/src/enemy/enemy_types/11. Palan/PalanLoreInfo.tres b/Zennysoft.Game.Ma/src/enemy/enemy_types/11. Palan/PalanLoreInfo.tres index 13fca53d..83cbefd5 100644 --- a/Zennysoft.Game.Ma/src/enemy/enemy_types/11. Palan/PalanLoreInfo.tres +++ b/Zennysoft.Game.Ma/src/enemy/enemy_types/11. Palan/PalanLoreInfo.tres @@ -13,6 +13,10 @@ ATK = "" DEF = "" Affinity = "Eolic" Weakness = "" -Drop1 = "" -Drop2 = "" +PrimaryAttackName = "Sol Spear" +PrimaryAttackType = 6 +SecondaryAttackName = "Variable Scepter" +SecondaryAttackType = 0 +TertiaryAttackName = "" +TertiaryAttackType = 0 metadata/_custom_type_script = "uid://dlsgyx4i1jmp3" diff --git a/Zennysoft.Game.Ma/src/enemy/enemy_types/12. Shield of Heaven/ShieldOfHeavenLoreInfo.tres b/Zennysoft.Game.Ma/src/enemy/enemy_types/12. Shield of Heaven/ShieldOfHeavenLoreInfo.tres index 2dbc632c..15e84356 100644 --- a/Zennysoft.Game.Ma/src/enemy/enemy_types/12. Shield of Heaven/ShieldOfHeavenLoreInfo.tres +++ b/Zennysoft.Game.Ma/src/enemy/enemy_types/12. Shield of Heaven/ShieldOfHeavenLoreInfo.tres @@ -13,6 +13,10 @@ ATK = "" DEF = "" Affinity = "Sankta" Weakness = "" -Drop1 = "" -Drop2 = "" +PrimaryAttackName = "Chromatic Void" +PrimaryAttackType = 6 +SecondaryAttackName = "Photon Liner" +SecondaryAttackType = 6 +TertiaryAttackName = "" +TertiaryAttackType = 0 metadata/_custom_type_script = "uid://dlsgyx4i1jmp3" diff --git a/Zennysoft.Game.Ma/src/enemy/enemy_types/13. gold sproingy/GoldSproingyLoreInfo.tres b/Zennysoft.Game.Ma/src/enemy/enemy_types/13. gold sproingy/GoldSproingyLoreInfo.tres index d072771b..19385db4 100644 --- a/Zennysoft.Game.Ma/src/enemy/enemy_types/13. gold sproingy/GoldSproingyLoreInfo.tres +++ b/Zennysoft.Game.Ma/src/enemy/enemy_types/13. gold sproingy/GoldSproingyLoreInfo.tres @@ -11,6 +11,10 @@ ATK = "" DEF = "" Affinity = "Ferrum" Weakness = "" -Drop1 = "" -Drop2 = "" +PrimaryAttackName = "Greed Strike" +PrimaryAttackType = 0 +SecondaryAttackName = "" +SecondaryAttackType = 0 +TertiaryAttackName = "" +TertiaryAttackType = 0 metadata/_custom_type_script = "uid://dlsgyx4i1jmp3" diff --git a/Zennysoft.Game.Ma/src/enemy/enemy_types/14. horse_head/HorseFaceLoreInfo.tres b/Zennysoft.Game.Ma/src/enemy/enemy_types/14. horse_head/HorseFaceLoreInfo.tres index 6a3f6a87..8eade18d 100644 --- a/Zennysoft.Game.Ma/src/enemy/enemy_types/14. horse_head/HorseFaceLoreInfo.tres +++ b/Zennysoft.Game.Ma/src/enemy/enemy_types/14. horse_head/HorseFaceLoreInfo.tres @@ -13,6 +13,10 @@ ATK = "" DEF = "" Affinity = "Ferrum" Weakness = "" -Drop1 = "" -Drop2 = "" +PrimaryAttackName = "Diyu Strike" +PrimaryAttackType = 0 +SecondaryAttackName = "Diyu Strike XL" +SecondaryAttackType = 0 +TertiaryAttackName = "" +TertiaryAttackType = 0 metadata/_custom_type_script = "uid://dlsgyx4i1jmp3" diff --git a/Zennysoft.Game.Ma/src/enemy/enemy_types/15. ox_face/OxHeadLoreInfo.tres b/Zennysoft.Game.Ma/src/enemy/enemy_types/15. ox_face/OxHeadLoreInfo.tres index 781719f9..1cd4d8d3 100644 --- a/Zennysoft.Game.Ma/src/enemy/enemy_types/15. ox_face/OxHeadLoreInfo.tres +++ b/Zennysoft.Game.Ma/src/enemy/enemy_types/15. ox_face/OxHeadLoreInfo.tres @@ -13,6 +13,10 @@ ATK = "" DEF = "" Affinity = "Ferrum" Weakness = "" -Drop1 = "" -Drop2 = "" +PrimaryAttackName = "Hell's Skewer" +PrimaryAttackType = 0 +SecondaryAttackName = "Pacification Bash" +SecondaryAttackType = 0 +TertiaryAttackName = "" +TertiaryAttackType = 0 metadata/_custom_type_script = "uid://dlsgyx4i1jmp3" diff --git a/Zennysoft.Game.Ma/src/enemy/enemy_types/16. demon wall/Arm1.tscn b/Zennysoft.Game.Ma/src/enemy/enemy_types/16. demon wall/Arm1.tscn index e5f275cd..09a8a644 100644 --- a/Zennysoft.Game.Ma/src/enemy/enemy_types/16. demon wall/Arm1.tscn +++ b/Zennysoft.Game.Ma/src/enemy/enemy_types/16. demon wall/Arm1.tscn @@ -1,7 +1,9 @@ -[gd_scene load_steps=63 format=4 uid="uid://b14iooyw6v7e0"] +[gd_scene load_steps=67 format=4 uid="uid://b14iooyw6v7e0"] [ext_resource type="Texture2D" uid="uid://bid5r6mhevna3" path="res://src/enemy/enemy_types/16. demon wall/model/ARM1_AREA_2_MAIN_222STONE.png" id="2_pkcrx"] +[ext_resource type="Script" uid="uid://ctshiyffvt4y5" path="res://src/system/AttackDataResource.cs" id="2_r2xb1"] [ext_resource type="Script" uid="uid://vgvrmwsrwakf" path="res://src/enemy/enemy_types/16. demon wall/DemonWallArm.cs" id="2_w0a5p"] +[ext_resource type="Script" uid="uid://dlsgyx4i1jmp3" path="res://src/enemy/EnemyLoreInfo.cs" id="3_lpw0h"] [ext_resource type="Texture2D" uid="uid://dkh83g7ce40i7" path="res://src/enemy/enemy_types/16. demon wall/model/concrete_0003_ao_1k.jpg" id="3_tn8ay"] [ext_resource type="Texture2D" uid="uid://cpvgy5t6shoex" path="res://src/enemy/enemy_types/16. demon wall/model/concrete_0003_normal_directx_1k.png" id="4_crk52"] [ext_resource type="Texture2D" uid="uid://brgmdx0p03syp" path="res://src/enemy/enemy_types/16. demon wall/model/concrete_0003_roughness_1k.jpg" id="5_ij2i2"] @@ -9,6 +11,30 @@ [ext_resource type="PackedScene" uid="uid://b7mijan3fgiu0" path="res://src/enemy/enemy_types/16. demon wall/DemonArm1Projectile.tscn" id="7_673l8"] [ext_resource type="Texture2D" uid="uid://cp6jald32fyon" path="res://src/vfx/Enemy/demon wall holyorb blast section.png" id="7_ij2i2"] +[sub_resource type="Resource" id="Resource_cq1mk"] +script = ExtResource("2_r2xb1") +Damage = 10 +ElementType = 0 +SpecialEffectType = 0 +metadata/_custom_type_script = "uid://ctshiyffvt4y5" + +[sub_resource type="Resource" id="Resource_m8ri3"] +script = ExtResource("3_lpw0h") +Name = "Arm 1" +Description = "" +MaximumHP = "" +ATK = "" +DEF = "" +Affinity = "" +Weakness = "" +PrimaryAttackName = "Agartha Sphere" +PrimaryAttackType = 6 +SecondaryAttackName = "" +SecondaryAttackType = 0 +TertiaryAttackName = "" +TertiaryAttackType = 0 +metadata/_custom_type_script = "uid://dlsgyx4i1jmp3" + [sub_resource type="StandardMaterial3D" id="StandardMaterial3D_673l8"] resource_name = "STONE" albedo_texture = ExtResource("2_pkcrx") @@ -858,6 +884,8 @@ animations = [{ [node name="Arm1" type="Node3D"] script = ExtResource("2_w0a5p") +_demonArmAttackData = SubResource("Resource_cq1mk") +EnemyLoreInfo = SubResource("Resource_m8ri3") [node name="Pivot" type="Node3D" parent="."] unique_name_in_owner = true @@ -874,43 +902,43 @@ bones/0/name = "Bone" bones/0/parent = -1 bones/0/rest = Transform3D(0.664239, -0.5079, 0.548475, 0.747326, 0.467912, -0.471764, -0.017029, 0.723254, 0.690372, 1.32537, -1.1447, -1.67359) bones/0/enabled = true -bones/0/position = Vector3(1.34945, -0.948312, -0.950759) -bones/0/rotation = Quaternion(0.0873315, 0.583365, 0.636617, 0.496768) +bones/0/position = Vector3(1.4003, -1.05427, -0.966389) +bones/0/rotation = Quaternion(0.022097, 0.664641, 0.466357, 0.583331) bones/0/scale = Vector3(1, 1, 1) bones/1/name = "Bone.001" bones/1/parent = 0 bones/1/rest = Transform3D(0.997342, -0.0728408, -0.00159767, 0.0728462, 0.996536, 0.0401248, -0.00133059, -0.0401345, 0.999193, 1.19209e-07, 1.85949, 3.57628e-07) bones/1/enabled = true bones/1/position = Vector3(1.19209e-07, 1.85949, 3.57628e-07) -bones/1/rotation = Quaternion(-0.0484918, 0.0587992, 0.0792598, 0.993936) +bones/1/rotation = Quaternion(-0.173579, 0.321281, 0.267247, 0.891755) bones/1/scale = Vector3(1, 1, 1) bones/2/name = "Bone.002" bones/2/parent = 1 bones/2/rest = Transform3D(0.175378, 0.963955, 0.200084, -0.983796, 0.179284, -0.00142574, -0.0372462, -0.196592, 0.979778, -1.19209e-07, 0.416929, 0) bones/2/enabled = true bones/2/position = Vector3(-1.19209e-07, 0.416929, 0) -bones/2/rotation = Quaternion(-0.0621575, 0.0817564, -0.649369, 0.753507) +bones/2/rotation = Quaternion(-0.0542776, 0.0998266, -0.700871, 0.704179) bones/2/scale = Vector3(1, 1, 1) bones/3/name = "Bone.003" bones/3/parent = 2 bones/3/rest = Transform3D(0.795965, -0.570793, -0.201581, 0.584249, 0.811523, 0.00907765, 0.158406, -0.124999, 0.97943, 0, 0.298125, -7.15256e-07) bones/3/enabled = true bones/3/position = Vector3(0, 0.298125, -7.15256e-07) -bones/3/rotation = Quaternion(-0.020316, -0.101129, 0.322228, 0.941026) +bones/3/rotation = Quaternion(0.047513, -0.12772, 0.397456, 0.907446) bones/3/scale = Vector3(1, 1, 1) bones/4/name = "Bone.004" bones/4/parent = 3 bones/4/rest = Transform3D(0.989609, -0.143492, 0.00920886, 0.143739, 0.98559, -0.0891694, 0.00371892, 0.0895665, 0.995974, 2.38419e-07, 0.217615, -1.19209e-07) bones/4/enabled = true bones/4/position = Vector3(2.38419e-07, 0.217615, -1.19209e-07) -bones/4/rotation = Quaternion(0.0345352, -0.0100563, 0.114707, 0.992748) +bones/4/rotation = Quaternion(-0.0127613, -0.0612568, 0.303654, 0.950725) bones/4/scale = Vector3(1, 1, 1) bones/5/name = "Bone.005" bones/5/parent = 1 bones/5/rest = Transform3D(0.891186, 0.451267, 0.0463144, -0.453483, 0.888891, 0.0650073, -0.0118328, -0.0789364, 0.996809, -1.19209e-07, 0.416929, 0) bones/5/enabled = true bones/5/position = Vector3(-1.19209e-07, 0.416929, 0) -bones/5/rotation = Quaternion(-0.0272263, 0.0114086, -0.236335, 0.971223) +bones/5/rotation = Quaternion(0.0167708, -0.00452614, -0.251951, 0.967584) bones/5/scale = Vector3(1, 1, 1) bones/6/name = "Bone.006" bones/6/parent = 5 @@ -945,35 +973,35 @@ bones/10/parent = 9 bones/10/rest = Transform3D(0.999465, -0.0299684, -0.0130876, 0.0321775, 0.972617, 0.230175, 0.00583128, -0.230473, 0.973061, -5.96046e-07, 0.347821, -4.76837e-07) bones/10/enabled = true bones/10/position = Vector3(-5.96046e-07, 0.347821, -4.76837e-07) -bones/10/rotation = Quaternion(-0.0906078, -0.00196568, 0.0164855, 0.995748) +bones/10/rotation = Quaternion(0.023916, 0.0106032, 0.0201277, 0.999455) bones/10/scale = Vector3(1, 1, 1) bones/11/name = "Bone.011" bones/11/parent = 10 bones/11/rest = Transform3D(0.999927, -0.00347527, -0.0115401, 0.00624295, 0.968404, 0.249307, 0.0103091, -0.249361, 0.968356, 5.36442e-07, 0.236611, 0) bones/11/enabled = true bones/11/position = Vector3(5.36442e-07, 0.236611, 0) -bones/11/rotation = Quaternion(-0.163023, -0.0142894, 0.00481489, 0.986507) +bones/11/rotation = Quaternion(-0.327915, -0.0535086, 0.0153609, 0.943066) bones/11/scale = Vector3(1, 1, 1) bones/12/name = "Bone.012" bones/12/parent = 11 bones/12/rest = Transform3D(0.997952, 0.0219232, -0.0600952, -0.0135761, 0.990624, 0.13594, 0.062512, -0.134846, 0.988893, 1.07288e-06, 0.172989, -1.19209e-07) bones/12/enabled = true bones/12/position = Vector3(1.07288e-06, 0.172989, -1.19209e-07) -bones/12/rotation = Quaternion(-0.105444, -0.0400933, -0.00687751, 0.993593) +bones/12/rotation = Quaternion(-0.272302, -0.0813955, 0.00234429, 0.95876) bones/12/scale = Vector3(1, 1, 1) bones/13/name = "Bone.013" bones/13/parent = 1 bones/13/rest = Transform3D(0.924677, -0.380197, -0.0205529, 0.380735, 0.922776, 0.0593796, -0.0036102, -0.0627321, 0.998024, -1.19209e-07, 0.416929, 0) bones/13/enabled = true bones/13/position = Vector3(-1.19209e-07, 0.416929, 0) -bones/13/rotation = Quaternion(-0.00258112, 0.00702077, 0.190069, 0.981742) +bones/13/rotation = Quaternion(0.125684, 0.0578676, 0.170074, 0.975669) bones/13/scale = Vector3(1, 1, 1) bones/14/name = "Bone.014" bones/14/parent = 13 bones/14/rest = Transform3D(0.961502, 0.268958, 0.0563539, -0.274785, 0.938956, 0.207014, 0.00276425, -0.214529, 0.976714, -5.36442e-07, 0.369994, -4.76837e-07) bones/14/enabled = true bones/14/position = Vector3(-5.36442e-07, 0.369994, -4.76837e-07) -bones/14/rotation = Quaternion(-0.124591, 0.00781174, -0.139643, 0.982301) +bones/14/rotation = Quaternion(-0.202729, -0.0182063, -0.146082, 0.968106) bones/14/scale = Vector3(1, 1, 1) bones/15/name = "Bone.015" bones/15/parent = 14 @@ -987,14 +1015,14 @@ bones/16/parent = 15 bones/16/rest = Transform3D(0.985406, 0.151262, 0.0780702, -0.133163, 0.97071, -0.199976, -0.106032, 0.186662, 0.976686, 3.20375e-07, 0.160424, -2.98023e-07) bones/16/enabled = true bones/16/position = Vector3(3.20375e-07, 0.160424, -2.98023e-07) -bones/16/rotation = Quaternion(0.0539095, 0.0317788, -0.0864368, 0.99429) +bones/16/rotation = Quaternion(-0.143876, -0.0350678, -0.150221, 0.977499) bones/16/scale = Vector3(1, 1, 1) bones/17/name = "Bone.017" bones/17/parent = 1 bones/17/rest = Transform3D(0.731154, -0.681923, -0.0198731, 0.682037, 0.729994, 0.0439829, -0.0154858, -0.0457125, 0.998835, -1.19209e-07, 0.416929, 0) bones/17/enabled = true bones/17/position = Vector3(-1.19209e-07, 0.416929, 0) -bones/17/rotation = Quaternion(-0.0335263, -0.0136824, 0.392643, 0.918978) +bones/17/rotation = Quaternion(-0.0753863, -0.0696647, 0.504383, 0.857358) bones/17/scale = Vector3(1, 1, 1) bones/18/name = "Bone.018" bones/18/parent = 17 @@ -1021,8 +1049,8 @@ bones/21/name = "Bone.021" bones/21/parent = -1 bones/21/rest = Transform3D(0.638395, -0.466665, -0.612107, -0.416251, 0.459614, -0.784532, 0.647447, 0.755632, 0.0991655, 2.29161, -2.09633, -3.23813) bones/21/enabled = true -bones/21/position = Vector3(2.24289, -0.370979, -2.79776) -bones/21/rotation = Quaternion(0.687189, 0.0367239, 0.421705, 0.590413) +bones/21/position = Vector3(2.19204, -0.265026, -2.78213) +bones/21/rotation = Quaternion(0.720771, 0.04445, 0.423788, 0.546733) bones/21/scale = Vector3(1, 1, 1) [node name="CHEST_006" type="MeshInstance3D" parent="Pivot/ARM1/1_ R TELLERIC PROJECTILE ARM/Skeleton3D"] @@ -1030,7 +1058,7 @@ mesh = SubResource("ArrayMesh_5cjg8") skin = SubResource("Skin_my7ts") [node name="BoneAttachment3D" type="BoneAttachment3D" parent="Pivot/ARM1/1_ R TELLERIC PROJECTILE ARM/Skeleton3D"] -transform = Transform3D(-0.704554, -0.501397, 0.502199, 0.697845, -0.360976, 0.618635, -0.1289, 0.786319, 0.604224, 0.0967098, -0.913052, 1.4488) +transform = Transform3D(-0.921268, 0.0167121, 0.388568, 0.348573, -0.407676, 0.843977, 0.172514, 0.912974, 0.369753, 0.555799, -0.204088, 1.10028) bone_name = "Bone.019" bone_idx = 19 diff --git a/Zennysoft.Game.Ma/src/enemy/enemy_types/16. demon wall/Arm2.tscn b/Zennysoft.Game.Ma/src/enemy/enemy_types/16. demon wall/Arm2.tscn index 1d413dfe..d4b83ac7 100644 --- a/Zennysoft.Game.Ma/src/enemy/enemy_types/16. demon wall/Arm2.tscn +++ b/Zennysoft.Game.Ma/src/enemy/enemy_types/16. demon wall/Arm2.tscn @@ -1,7 +1,8 @@ -[gd_scene load_steps=34 format=4 uid="uid://cv4ja1vgoxb11"] +[gd_scene load_steps=36 format=4 uid="uid://cv4ja1vgoxb11"] [ext_resource type="Script" uid="uid://vgvrmwsrwakf" path="res://src/enemy/enemy_types/16. demon wall/DemonWallArm.cs" id="1_jkuo4"] [ext_resource type="Script" uid="uid://ctshiyffvt4y5" path="res://src/system/AttackDataResource.cs" id="2_phvjc"] +[ext_resource type="Script" uid="uid://dlsgyx4i1jmp3" path="res://src/enemy/EnemyLoreInfo.cs" id="3_ctuoa"] [ext_resource type="Texture2D" uid="uid://dkh83g7ce40i7" path="res://src/enemy/enemy_types/16. demon wall/model/concrete_0003_ao_1k.jpg" id="3_wpd4r"] [ext_resource type="Texture2D" uid="uid://bx25c4uynoy1r" path="res://src/enemy/enemy_types/16. demon wall/model/concrete_0003_normal_opengl_1k.png" id="4_phvjc"] [ext_resource type="Texture2D" uid="uid://brgmdx0p03syp" path="res://src/enemy/enemy_types/16. demon wall/model/concrete_0003_roughness_1k.jpg" id="5_ctuoa"] @@ -14,6 +15,23 @@ ElementType = 0 SpecialEffectType = 0 metadata/_custom_type_script = "uid://ctshiyffvt4y5" +[sub_resource type="Resource" id="Resource_8dmxd"] +script = ExtResource("3_ctuoa") +Name = "Arm 2" +Description = "" +MaximumHP = "" +ATK = "" +DEF = "" +Affinity = "" +Weakness = "" +PrimaryAttackName = "Anti-God Laser" +PrimaryAttackType = 0 +SecondaryAttackName = "" +SecondaryAttackType = 0 +TertiaryAttackName = "" +TertiaryAttackType = 0 +metadata/_custom_type_script = "uid://dlsgyx4i1jmp3" + [sub_resource type="StandardMaterial3D" id="StandardMaterial3D_pchf4"] resource_name = "STONE" cull_mode = 2 @@ -637,6 +655,7 @@ states/attack/position = Vector2(660, 109) states/idle/node = SubResource("AnimationNodeAnimation_dqcrh") states/idle/position = Vector2(402, 109) transitions = ["idle", "attack", SubResource("AnimationNodeStateMachineTransition_xj37f"), "attack", "idle", SubResource("AnimationNodeStateMachineTransition_jlfdv"), "Start", "idle", SubResource("AnimationNodeStateMachineTransition_hmqyn")] +graph_offset = Vector2(185, -8) [sub_resource type="Shader" id="Shader_phvjc"] code = "/* @@ -1187,6 +1206,7 @@ _data = { [node name="Arm2" type="Node3D"] script = ExtResource("1_jkuo4") _demonArmAttackData = SubResource("Resource_ctuoa") +EnemyLoreInfo = SubResource("Resource_8dmxd") [node name="Pivot" type="Node3D" parent="."] unique_name_in_owner = true @@ -1204,78 +1224,78 @@ bones/0/name = "Bone" bones/0/parent = -1 bones/0/rest = Transform3D(0.0151222, 0.673616, -0.738927, -0.999829, 0.0180683, -0.00399019, 0.0106633, 0.738861, 0.673774, -1.71286, 0.00923252, -1.71285) bones/0/enabled = true -bones/0/position = Vector3(-1.93333, 0.744099, -1.70791) -bones/0/rotation = Quaternion(0.0945618, -0.453812, -0.637125, 0.615779) +bones/0/position = Vector3(-1.95789, 0.7347, -1.72867) +bones/0/rotation = Quaternion(0.0970727, -0.454097, -0.633948, 0.618452) bones/0/scale = Vector3(1, 1, 1) bones/1/name = "Bone.001" bones/1/parent = 0 bones/1/rest = Transform3D(0.997342, 0.0728408, -0.00158073, -0.072718, 0.996536, 0.0403565, 0.00451486, -0.0401343, 0.999184, -4.4331e-07, 1.85949, -4.81494e-07) bones/1/enabled = true bones/1/position = Vector3(-4.4331e-07, 1.85949, -4.81494e-07) -bones/1/rotation = Quaternion(-0.052215, -0.214147, 0.100597, 0.970204) +bones/1/rotation = Quaternion(-0.0858219, -0.215205, 0.106215, 0.966975) bones/1/scale = Vector3(1, 1, 1) bones/2/name = "Bone.002" bones/2/parent = 1 bones/2/rest = Transform3D(0.189846, -0.964577, -0.183168, 0.981103, 0.179283, 0.0727582, -0.037342, -0.19352, 0.980385, -9.68575e-08, 0.416929, 8.61473e-09) bones/2/enabled = true bones/2/position = Vector3(-9.68575e-08, 0.416929, 8.61473e-09) -bones/2/rotation = Quaternion(-0.322791, 0.138136, 0.635741, 0.687428) +bones/2/rotation = Quaternion(-0.331391, 0.121395, 0.618262, 0.702279) bones/2/scale = Vector3(1, 1, 1) bones/3/name = "Bone.003" bones/3/parent = 2 bones/3/rest = Transform3D(0.810203, 0.578594, -0.0938093, -0.560363, 0.811523, 0.165602, 0.171945, -0.0816043, 0.981721, -4.76837e-07, 0.298125, -2.68221e-07) bones/3/enabled = true bones/3/position = Vector3(-4.76837e-07, 0.298125, -2.68221e-07) -bones/3/rotation = Quaternion(-0.0334883, -0.0606594, -0.355641, 0.932051) +bones/3/rotation = Quaternion(-0.0315846, -0.0553061, -0.347077, 0.935672) bones/3/scale = Vector3(1, 1, 1) bones/4/name = "Bone.004" bones/4/parent = 3 bones/4/rest = Transform3D(0.986624, 0.16227, 0.0155213, -0.161299, 0.98559, -0.050939, -0.0235636, 0.0477541, 0.998581, 2.38419e-07, 0.217614, 5.96046e-08) bones/4/enabled = true bones/4/position = Vector3(2.38419e-07, 0.217614, 5.96046e-08) -bones/4/rotation = Quaternion(0.0319531, -0.0321472, -0.147632, 0.988003) +bones/4/rotation = Quaternion(0.0297356, -0.0191021, -0.127038, 0.991268) bones/4/scale = Vector3(1, 1, 1) bones/5/name = "Bone.005" bones/5/parent = 1 bones/5/rest = Transform3D(0.89182, -0.451516, 0.0281062, 0.446851, 0.888891, 0.100982, -0.0705786, -0.0774989, 0.994491, -9.68575e-08, 0.416929, 8.61473e-09) bones/5/enabled = true bones/5/position = Vector3(-9.68575e-08, 0.416929, 8.61473e-09) -bones/5/rotation = Quaternion(0.0386319, 0.0171066, 0.271699, 0.961455) +bones/5/rotation = Quaternion(0.0125553, 0.0196826, 0.259447, 0.965475) bones/5/scale = Vector3(1, 1, 1) bones/6/name = "Bone.006" bones/6/parent = 5 bones/6/rest = Transform3D(0.941856, 0.326827, -0.0780507, -0.307446, 0.931929, 0.192316, 0.135592, -0.157137, 0.978224, 0, 0.366571, -7.45058e-08) bones/6/enabled = true bones/6/position = Vector3(0, 0.366571, -7.45058e-08) -bones/6/rotation = Quaternion(-0.374565, -0.0639082, -0.0433425, 0.92398) +bones/6/rotation = Quaternion(-0.364887, -0.0647015, -0.0451243, 0.927704) bones/6/scale = Vector3(1, 1, 1) bones/7/name = "Bone.007" bones/7/parent = 6 bones/7/rest = Transform3D(0.999908, -0.0133759, -0.00243115, 0.0135617, 0.968863, 0.247224, -0.000951389, -0.247234, 0.968955, 8.75443e-08, 0.229155, 1.19209e-07) bones/7/enabled = true bones/7/position = Vector3(8.75443e-08, 0.229155, 1.19209e-07) -bones/7/rotation = Quaternion(-0.150784, -0.00247783, 0.0127444, 0.988482) +bones/7/rotation = Quaternion(-0.142785, -0.00183437, 0.0109239, 0.989692) bones/7/scale = Vector3(1, 1, 1) bones/8/name = "Bone.008" bones/8/parent = 7 bones/8/rest = Transform3D(0.996542, 0.0206638, -0.0804854, -0.00720722, 0.986431, 0.164018, 0.0827825, -0.162871, 0.983168, -1.49012e-08, 0.142665, 6.85453e-07) bones/8/enabled = true bones/8/position = Vector3(-1.49012e-08, 0.142665, 6.85453e-07) -bones/8/rotation = Quaternion(-0.145795, -0.0489666, 0.00899675, 0.988061) +bones/8/rotation = Quaternion(-0.126305, -0.0465419, 0.00409212, 0.990891) bones/8/scale = Vector3(1, 1, 1) bones/9/name = "Bone.009" bones/9/parent = 1 bones/9/rest = Transform3D(0.998879, -0.0472251, 0.00320398, 0.0469487, 0.997098, 0.0599298, -0.00602488, -0.0597122, 0.998197, -9.68575e-08, 0.416929, 8.61473e-09) bones/9/enabled = true bones/9/position = Vector3(-9.68575e-08, 0.416929, 8.61473e-09) -bones/9/rotation = Quaternion(0.0263726, 0.0298859, 0.0440528, 0.998234) +bones/9/rotation = Quaternion(0.00910542, 0.0214366, 0.0377844, 0.999014) bones/9/scale = Vector3(1, 1, 1) bones/10/name = "Bone.010" bones/10/parent = 9 bones/10/rest = Transform3D(0.999443, 0.0307123, -0.0130676, -0.0268696, 0.972617, 0.230853, 0.0197998, -0.230373, 0.972901, 1.21567e-07, 0.347822, -2.08616e-07) bones/10/enabled = true bones/10/position = Vector3(1.21567e-07, 0.347822, -2.08616e-07) -bones/10/rotation = Quaternion(-0.355759, -0.113644, 0.058844, 0.925774) +bones/10/rotation = Quaternion(-0.356706, -0.107051, 0.0650947, 0.925777) bones/10/scale = Vector3(1, 1, 1) bones/11/name = "Bone.011" bones/11/parent = 10 @@ -1289,70 +1309,70 @@ bones/12/parent = 11 bones/12/rest = Transform3D(0.997806, -0.0280254, -0.0599811, 0.0357503, 0.990623, 0.131861, 0.0557232, -0.133716, 0.989452, 1.18278e-07, 0.172989, 2.01166e-07) bones/12/enabled = true bones/12/position = Vector3(1.18278e-07, 0.172989, 2.01166e-07) -bones/12/rotation = Quaternion(-0.115995, -0.0130379, 0.0333287, 0.992605) +bones/12/rotation = Quaternion(-0.100886, -0.0179366, 0.0280244, 0.994342) bones/12/scale = Vector3(1, 1, 1) bones/13/name = "Bone.013" bones/13/parent = 1 bones/13/rest = Transform3D(0.92488, 0.379995, -0.0141585, -0.377983, 0.922776, 0.0749236, 0.0415357, -0.0639437, 0.997089, -9.68575e-08, 0.416929, 8.61473e-09) bones/13/enabled = true bones/13/position = Vector3(-9.68575e-08, 0.416929, 8.61473e-09) -bones/13/rotation = Quaternion(0.0259424, 0.0342451, -0.180501, 0.982636) +bones/13/rotation = Quaternion(0.00702911, 0.0193197, -0.184565, 0.982605) bones/13/scale = Vector3(1, 1, 1) bones/14/name = "Bone.014" bones/14/parent = 13 bones/14/rest = Transform3D(0.959373, -0.277519, 0.050852, 0.259649, 0.938956, 0.225709, -0.110386, -0.203336, 0.972867, 1.78814e-07, 0.369994, -3.53903e-07) bones/14/enabled = true bones/14/position = Vector3(1.78814e-07, 0.369994, -3.53903e-07) -bones/14/rotation = Quaternion(-0.307079, -0.111059, 0.155546, 0.932295) +bones/14/rotation = Quaternion(-0.312549, -0.111422, 0.171004, 0.927715) bones/14/scale = Vector3(1, 1, 1) bones/15/name = "Bone.015" bones/15/parent = 14 bones/15/rest = Transform3D(0.987789, 0.153061, -0.029059, -0.126507, 0.896881, 0.423794, 0.0909288, -0.414943, 0.905292, -5.96046e-08, 0.248162, 5.96046e-08) bones/15/enabled = true bones/15/position = Vector3(-5.96046e-08, 0.248162, 5.96046e-08) -bones/15/rotation = Quaternion(-0.248723, -0.0227069, -0.0257242, 0.967967) +bones/15/rotation = Quaternion(-0.2386, -0.0252013, -0.0398598, 0.969972) bones/15/scale = Vector3(1, 1, 1) bones/16/name = "Bone.016" bones/16/parent = 15 bones/16/rest = Transform3D(0.985539, -0.152261, 0.0743639, 0.163269, 0.970709, -0.17626, -0.0453481, 0.185853, 0.98153, -1.78814e-07, 0.160425, -4.02331e-07) bones/16/enabled = true bones/16/position = Vector3(-1.78814e-07, 0.160425, -4.02331e-07) -bones/16/rotation = Quaternion(0.0293807, 0.0366699, 0.0759248, 0.996006) +bones/16/rotation = Quaternion(0.0483685, 0.0346893, 0.077054, 0.995249) bones/16/scale = Vector3(1, 1, 1) bones/17/name = "Bone.017" bones/17/parent = 1 bones/17/rest = Transform3D(0.731563, 0.681774, 8.39818e-05, -0.680319, 0.729994, 0.0653797, 0.0445129, -0.0478865, 0.99786, -9.68575e-08, 0.416929, 8.61473e-09) bones/17/enabled = true bones/17/position = Vector3(-9.68575e-08, 0.416929, 8.61473e-09) -bones/17/rotation = Quaternion(0.0302661, -0.00199977, -0.371182, 0.928065) +bones/17/rotation = Quaternion(0.0116633, -0.00504934, -0.369795, 0.929027) bones/17/scale = Vector3(1, 1, 1) bones/18/name = "Bone.018" bones/18/parent = 17 bones/18/rest = Transform3D(0.858902, -0.5087, 0.059257, 0.482273, 0.842315, 0.240663, -0.172338, -0.178128, 0.968798, 3.57628e-07, 0.400229, -2.95229e-07) bones/18/enabled = true bones/18/position = Vector3(3.57628e-07, 0.400229, -2.95229e-07) -bones/18/rotation = Quaternion(-0.300612, -0.192881, 0.326916, 0.87496) +bones/18/rotation = Quaternion(-0.297388, -0.176457, 0.322428, 0.881171) bones/18/scale = Vector3(1, 1, 1) bones/19/name = "Bone.019" bones/19/parent = 18 bones/19/rest = Transform3D(0.998851, -0.0332967, -0.0344649, 0.0348099, 0.998413, 0.0442783, 0.0329358, -0.0454271, 0.998425, 0, 0.196712, 3.57628e-07) bones/19/enabled = true bones/19/position = Vector3(0, 0.196712, 3.57628e-07) -bones/19/rotation = Quaternion(-0.0396222, -0.0155455, 0.009579, 0.999048) +bones/19/rotation = Quaternion(-0.0343716, -0.0159477, 0.0118585, 0.999212) bones/19/scale = Vector3(1, 1, 1) bones/20/name = "Bone.020" bones/20/parent = 19 bones/20/rest = Transform3D(0.982791, 0.183548, -0.0207611, -0.170809, 0.945817, 0.276144, 0.0703217, -0.267845, 0.960892, 2.98023e-07, 0.127214, 5.96046e-08) bones/20/enabled = true bones/20/position = Vector3(2.98023e-07, 0.127214, 5.96046e-08) -bones/20/rotation = Quaternion(-0.170787, -0.0295346, -0.059412, 0.983072) +bones/20/rotation = Quaternion(-0.160761, -0.0275687, -0.0687398, 0.984211) bones/20/scale = Vector3(1, 1, 1) bones/21/name = "Bone.021" bones/21/parent = -1 bones/21/rest = Transform3D(0.769842, 0.636233, -0.0505042, -0.0970478, 0.0384815, -0.994536, -0.630813, 0.770536, 0.0913697, -3.03019, -0.0704439, -3.30826) bones/21/enabled = true -bones/21/position = Vector3(-2.13924, 0.769268, -3.75659) -bones/21/rotation = Quaternion(0.20369, -0.66472, -0.665743, 0.271004) +bones/21/position = Vector3(-2.12654, 0.776918, -3.78337) +bones/21/rotation = Quaternion(0.205888, -0.666839, -0.668019, 0.258238) bones/21/scale = Vector3(1, 1, 1) [node name="CHEST_004" type="MeshInstance3D" parent="Pivot/ARM2/2_ R MAGIC ARM 4/Skeleton3D"] @@ -1360,7 +1380,7 @@ mesh = SubResource("ArrayMesh_ddgyy") skin = SubResource("Skin_lcoox") [node name="BoneAttachment3D" type="BoneAttachment3D" parent="Pivot/ARM2/2_ R MAGIC ARM 4/Skeleton3D"] -transform = Transform3D(0.878929, 0.424329, 0.217782, -0.367219, 0.31067, 0.876718, 0.304359, -0.850546, 0.428878, -0.292953, 1.16478, -0.199779) +transform = Transform3D(0.861654, 0.430276, 0.2691, -0.406773, 0.268487, 0.873184, 0.303461, -0.861845, 0.406368, -0.308771, 1.15677, -0.236524) bone_name = "Bone.002" bone_idx = 2 diff --git a/Zennysoft.Game.Ma/src/enemy/enemy_types/16. demon wall/Arm3.tscn b/Zennysoft.Game.Ma/src/enemy/enemy_types/16. demon wall/Arm3.tscn index dff98733..faf44f06 100644 --- a/Zennysoft.Game.Ma/src/enemy/enemy_types/16. demon wall/Arm3.tscn +++ b/Zennysoft.Game.Ma/src/enemy/enemy_types/16. demon wall/Arm3.tscn @@ -1,10 +1,36 @@ -[gd_scene load_steps=89 format=4 uid="uid://bphie5voqk8aq"] +[gd_scene load_steps=93 format=4 uid="uid://bphie5voqk8aq"] [ext_resource type="Script" uid="uid://vgvrmwsrwakf" path="res://src/enemy/enemy_types/16. demon wall/DemonWallArm.cs" id="1_fhrhk"] [ext_resource type="Material" uid="uid://dt1cu8j3gmri" path="res://src/enemy/enemy_types/16. demon wall/Arm1 Proper Material.tres" id="2_gcbec"] +[ext_resource type="Script" uid="uid://ctshiyffvt4y5" path="res://src/system/AttackDataResource.cs" id="2_o1lds"] +[ext_resource type="Script" uid="uid://dlsgyx4i1jmp3" path="res://src/enemy/EnemyLoreInfo.cs" id="3_j8w5h"] [ext_resource type="Texture2D" uid="uid://blqlb7bc65cv1" path="res://src/vfx/Enemy/DEMONWALL_MOVE_VISUALCUE.png" id="4_gcbec"] [ext_resource type="AudioStream" uid="uid://bjo0q2tyf7vff" path="res://src/audio/sfx/ENEMY_DEMON_WALLMOVE.ogg" id="5_o1lds"] +[sub_resource type="Resource" id="Resource_6vw33"] +script = ExtResource("2_o1lds") +Damage = 10 +ElementType = 0 +SpecialEffectType = 0 +metadata/_custom_type_script = "uid://ctshiyffvt4y5" + +[sub_resource type="Resource" id="Resource_o7v4u"] +script = ExtResource("3_j8w5h") +Name = "" +Description = "" +MaximumHP = "" +ATK = "" +DEF = "" +Affinity = "" +Weakness = "" +PrimaryAttackName = "Engineer's Crusher" +PrimaryAttackType = 0 +SecondaryAttackName = "" +SecondaryAttackType = 0 +TertiaryAttackName = "" +TertiaryAttackType = 0 +metadata/_custom_type_script = "uid://dlsgyx4i1jmp3" + [sub_resource type="ArrayMesh" id="ArrayMesh_ma85w"] resource_name = "arm3_CHEST_003" _surfaces = [{ @@ -1429,6 +1455,8 @@ _data = { [node name="Arm3" type="Node3D"] script = ExtResource("1_fhrhk") +_demonArmAttackData = SubResource("Resource_6vw33") +EnemyLoreInfo = SubResource("Resource_o7v4u") [node name="ARM3(REIMPORT FIX)" type="Node3D" parent="."] @@ -1611,64 +1639,64 @@ bones/0/name = "Bone" bones/0/parent = -1 bones/0/rest = Transform3D(-0.0590079, 0.671656, -0.73851, -0.998184, -0.0307104, 0.0518259, 0.0121292, 0.740227, 0.672248, -1.70411, 0.133377, -1.71641) bones/0/enabled = true -bones/0/position = Vector3(-2.84254, 0.521975, -1.22134) -bones/0/rotation = Quaternion(0.178348, -0.40524, -0.739516, 0.507039) +bones/0/position = Vector3(-2.93201, 0.567555, -1.21794) +bones/0/rotation = Quaternion(0.158798, -0.415627, -0.758035, 0.476886) bones/0/scale = Vector3(1, 1, 1) bones/1/name = "Bone.001" bones/1/parent = 0 bones/1/rest = Transform3D(0.997342, 0.0728404, -0.00158077, -0.0727175, 0.996536, 0.0403564, 0.00451487, -0.0401342, 0.999184, 1.2666e-07, 1.85949, 0) bones/1/enabled = true bones/1/position = Vector3(1.2666e-07, 1.85949, 0) -bones/1/rotation = Quaternion(-0.131293, -0.454061, 0.187953, 0.860967) +bones/1/rotation = Quaternion(-0.113872, -0.416346, 0.21466, 0.876134) bones/1/scale = Vector3(1, 1, 1) bones/2/name = "Bone.002" bones/2/parent = 1 bones/2/rest = Transform3D(0.189847, -0.964576, -0.183168, 0.981104, 0.179283, 0.0727586, -0.0373423, -0.19352, 0.980386, 8.9407e-08, 0.416929, -2.38419e-07) bones/2/enabled = true bones/2/position = Vector3(8.9407e-08, 0.416929, -2.38419e-07) -bones/2/rotation = Quaternion(-0.339028, -0.0896675, 0.741208, 0.57239) +bones/2/rotation = Quaternion(-0.33906, -0.0849842, 0.763966, 0.542376) bones/2/scale = Vector3(1, 1, 1) bones/3/name = "Bone.003" bones/3/parent = 2 bones/3/rest = Transform3D(0.810203, 0.578594, -0.0938098, -0.560363, 0.811523, 0.165603, 0.171946, -0.0816042, 0.981721, -1.78814e-07, 0.298124, 5.96046e-08) bones/3/enabled = true bones/3/position = Vector3(-1.78814e-07, 0.298124, 5.96046e-08) -bones/3/rotation = Quaternion(-0.159393, 0.013864, -0.394138, 0.905018) +bones/3/rotation = Quaternion(-0.161693, -0.00224077, -0.427307, 0.889527) bones/3/scale = Vector3(1, 1, 1) bones/4/name = "Bone.004" bones/4/parent = 3 bones/4/rest = Transform3D(0.986624, 0.16227, 0.0155225, -0.161298, 0.98559, -0.0509395, -0.0235648, 0.0477544, 0.998581, -2.98023e-07, 0.217615, 2.83122e-07) bones/4/enabled = true bones/4/position = Vector3(-2.98023e-07, 0.217615, 2.83122e-07) -bones/4/rotation = Quaternion(-0.133339, 0.0668097, -0.4588, 0.875934) +bones/4/rotation = Quaternion(-0.158547, 0.0300075, -0.38603, 0.908264) bones/4/scale = Vector3(1, 1, 1) bones/5/name = "Bone.005" bones/5/parent = 1 bones/5/rest = Transform3D(0.89182, -0.451516, 0.0281058, 0.446851, 0.888891, 0.100983, -0.0705783, -0.0774992, 0.994491, 8.9407e-08, 0.416929, -2.38419e-07) bones/5/enabled = true bones/5/position = Vector3(8.9407e-08, 0.416929, -2.38419e-07) -bones/5/rotation = Quaternion(-0.242043, 0.219457, 0.0519384, 0.943693) +bones/5/rotation = Quaternion(-0.252243, 0.225327, 0.0500556, 0.939732) bones/5/scale = Vector3(1, 1, 1) bones/6/name = "Bone.006" bones/6/parent = 5 bones/6/rest = Transform3D(0.941855, 0.326829, -0.0780507, -0.307447, 0.931929, 0.192315, 0.135592, -0.157136, 0.978224, 2.98023e-07, 0.36657, -5.96046e-08) bones/6/enabled = true bones/6/position = Vector3(2.98023e-07, 0.36657, -5.96046e-08) -bones/6/rotation = Quaternion(-0.370201, 0.306786, -0.137622, 0.865964) +bones/6/rotation = Quaternion(-0.31201, 0.300991, -0.17525, 0.883935) bones/6/scale = Vector3(1, 1, 1) bones/7/name = "Bone.007" bones/7/parent = 6 bones/7/rest = Transform3D(0.999908, -0.0133746, -0.00243148, 0.0135605, 0.968863, 0.247226, -0.000950764, -0.247236, 0.968955, -5.36442e-07, 0.229155, 3.57628e-07) bones/7/enabled = true bones/7/position = Vector3(-5.36442e-07, 0.229155, 3.57628e-07) -bones/7/rotation = Quaternion(-0.554234, -0.0693739, -0.242702, 0.793163) +bones/7/rotation = Quaternion(-0.493366, -0.103627, -0.27291, 0.819373) bones/7/scale = Vector3(1, 1, 1) bones/8/name = "Bone.008" bones/8/parent = 7 bones/8/rest = Transform3D(0.996542, 0.0206576, -0.0804851, -0.00720127, 0.986431, 0.164017, 0.0827812, -0.162871, 0.983169, -5.96046e-08, 0.142665, -3.12924e-07) bones/8/enabled = true bones/8/position = Vector3(-5.96046e-08, 0.142665, -3.12924e-07) -bones/8/rotation = Quaternion(-0.110355, -0.0516143, 0.0164426, 0.992415) +bones/8/rotation = Quaternion(-0.0820701, -0.0409904, -0.0069944, 0.995759) bones/8/scale = Vector3(1, 1, 1) bones/9/name = "Bone.009" bones/9/parent = 1 @@ -1682,21 +1710,21 @@ bones/10/parent = 9 bones/10/rest = Transform3D(0.999443, 0.0307126, -0.0130675, -0.0268698, 0.972617, 0.230855, 0.0197998, -0.230375, 0.9729, 4.787e-07, 0.347821, -1.78814e-07) bones/10/enabled = true bones/10/position = Vector3(4.787e-07, 0.347821, -1.78814e-07) -bones/10/rotation = Quaternion(-0.43922, 0.284163, -0.0326604, 0.851628) +bones/10/rotation = Quaternion(-0.418828, 0.268042, -0.053925, 0.865927) bones/10/scale = Vector3(1, 1, 1) bones/11/name = "Bone.011" bones/11/parent = 10 bones/11/rest = Transform3D(0.999931, -0.0022606, -0.0115383, 0.00506641, 0.968404, 0.249334, 0.0106101, -0.249375, 0.968349, 8.49366e-07, 0.236611, 4.17233e-07) bones/11/enabled = true bones/11/position = Vector3(8.49366e-07, 0.236611, 4.17233e-07) -bones/11/rotation = Quaternion(-0.465794, -0.112721, -0.310577, 0.820897) +bones/11/rotation = Quaternion(-0.445537, -0.132568, -0.326403, 0.823033) bones/11/scale = Vector3(1, 1, 1) bones/12/name = "Bone.012" bones/12/parent = 11 bones/12/rest = Transform3D(0.997806, -0.0280227, -0.0599811, 0.0357475, 0.990624, 0.13186, 0.0557236, -0.133715, 0.989452, -5.93718e-07, 0.172989, 1.78814e-07) bones/12/enabled = true bones/12/position = Vector3(-5.93718e-07, 0.172989, 1.78814e-07) -bones/12/rotation = Quaternion(-0.140568, -0.0201509, 0.0256171, 0.989534) +bones/12/rotation = Quaternion(-0.0665782, -0.0290065, 0.0159869, 0.997231) bones/12/scale = Vector3(1, 1, 1) bones/13/name = "Bone.013" bones/13/parent = 1 @@ -1710,14 +1738,14 @@ bones/14/parent = 13 bones/14/rest = Transform3D(0.959373, -0.277519, 0.0508523, 0.259649, 0.938956, 0.225709, -0.110386, -0.203335, 0.972867, 1.19209e-07, 0.369994, -3.57628e-07) bones/14/enabled = true bones/14/position = Vector3(1.19209e-07, 0.369994, -3.57628e-07) -bones/14/rotation = Quaternion(-0.506064, 0.206623, 0.076956, 0.833837) +bones/14/rotation = Quaternion(-0.47282, 0.213317, 0.0551757, 0.853166) bones/14/scale = Vector3(1, 1, 1) bones/15/name = "Bone.015" bones/15/parent = 14 bones/15/rest = Transform3D(0.987789, 0.153063, -0.029059, -0.126508, 0.89688, 0.423794, 0.0909294, -0.414943, 0.905292, -4.17233e-07, 0.248162, 1.19209e-07) bones/15/enabled = true bones/15/position = Vector3(-4.17233e-07, 0.248162, 1.19209e-07) -bones/15/rotation = Quaternion(-0.457285, -0.175746, -0.407335, 0.770767) +bones/15/rotation = Quaternion(-0.443631, -0.175899, -0.440825, 0.760214) bones/15/scale = Vector3(1, 1, 1) bones/16/name = "Bone.016" bones/16/parent = 15 @@ -1738,14 +1766,14 @@ bones/18/parent = 17 bones/18/rest = Transform3D(0.858902, -0.508701, 0.0592547, 0.482273, 0.842314, 0.240665, -0.172338, -0.178131, 0.968798, 4.17233e-07, 0.400229, 0) bones/18/enabled = true bones/18/position = Vector3(4.17233e-07, 0.400229, 0) -bones/18/rotation = Quaternion(-0.533744, 0.115237, 0.156076, 0.823091) +bones/18/rotation = Quaternion(-0.498708, 0.139406, 0.136107, 0.844589) bones/18/scale = Vector3(1, 1, 1) bones/19/name = "Bone.019" bones/19/parent = 18 bones/19/rest = Transform3D(0.998851, -0.0332957, -0.0344645, 0.0348088, 0.998413, 0.0442743, 0.0329356, -0.0454231, 0.998425, 4.17233e-07, 0.196711, -2.38419e-07) bones/19/enabled = true bones/19/position = Vector3(4.17233e-07, 0.196711, -2.38419e-07) -bones/19/rotation = Quaternion(-0.257711, -0.243862, -0.309904, 0.882086) +bones/19/rotation = Quaternion(-0.240197, -0.252963, -0.349941, 0.8694) bones/19/scale = Vector3(1, 1, 1) bones/20/name = "Bone.020" bones/20/parent = 19 @@ -1758,8 +1786,8 @@ bones/21/name = "Bone.021" bones/21/parent = -1 bones/21/rest = Transform3D(0.761771, 0.635827, -0.12422, -0.154809, -0.00753344, -0.987916, -0.629079, 0.771795, 0.0926928, -3.0206, 0.148975, -3.31442) bones/21/enabled = true -bones/21/position = Vector3(-3.00331, 1.12355, -3.26021) -bones/21/rotation = Quaternion(0.718775, -0.189836, -0.332722, 0.58019) +bones/21/position = Vector3(-3.02657, 1.16657, -3.2636) +bones/21/rotation = Quaternion(0.703695, -0.23118, -0.3636, 0.564947) bones/21/scale = Vector3(1, 1, 1) [node name="CHEST_005" type="MeshInstance3D" parent="ARM3/3_ R STATUS ARM/Skeleton3D"] diff --git a/Zennysoft.Game.Ma/src/enemy/enemy_types/16. demon wall/Arm4.tscn b/Zennysoft.Game.Ma/src/enemy/enemy_types/16. demon wall/Arm4.tscn index 102d0a29..3297799b 100644 --- a/Zennysoft.Game.Ma/src/enemy/enemy_types/16. demon wall/Arm4.tscn +++ b/Zennysoft.Game.Ma/src/enemy/enemy_types/16. demon wall/Arm4.tscn @@ -1,7 +1,8 @@ -[gd_scene load_steps=34 format=4 uid="uid://cl0sf7ovakpvs"] +[gd_scene load_steps=36 format=4 uid="uid://cl0sf7ovakpvs"] [ext_resource type="Script" uid="uid://vgvrmwsrwakf" path="res://src/enemy/enemy_types/16. demon wall/DemonWallArm.cs" id="1_nwywg"] [ext_resource type="Script" uid="uid://ctshiyffvt4y5" path="res://src/system/AttackDataResource.cs" id="2_sb6ar"] +[ext_resource type="Script" uid="uid://dlsgyx4i1jmp3" path="res://src/enemy/EnemyLoreInfo.cs" id="3_iw3hx"] [ext_resource type="Material" uid="uid://dt1cu8j3gmri" path="res://src/enemy/enemy_types/16. demon wall/Arm1 Proper Material.tres" id="6_8swsd"] [ext_resource type="Texture2D" uid="uid://7ncuc2802a7c" path="res://src/vfx/Enemy/processed lightning bolts/plightning1.png" id="7_iw3hx"] [ext_resource type="AudioStream" uid="uid://coux7hls1vils" path="res://src/audio/sfx/ENEMY_DEMONWALL_THUNDER.ogg" id="8_el805"] @@ -16,6 +17,23 @@ ElementType = 5 SpecialEffectType = 0 metadata/_custom_type_script = "uid://ctshiyffvt4y5" +[sub_resource type="Resource" id="Resource_wbqyb"] +script = ExtResource("3_iw3hx") +Name = "" +Description = "" +MaximumHP = "" +ATK = "" +DEF = "" +Affinity = "" +Weakness = "" +PrimaryAttackName = "Vajra Conductor" +PrimaryAttackType = 6 +SecondaryAttackName = "" +SecondaryAttackType = 0 +TertiaryAttackName = "" +TertiaryAttackType = 0 +metadata/_custom_type_script = "uid://dlsgyx4i1jmp3" + [sub_resource type="ArrayMesh" id="ArrayMesh_b74ix"] resource_name = "Arm4_CHEST_002" _surfaces = [{ @@ -1271,6 +1289,7 @@ albedo_texture = ExtResource("9_el805") [node name="Arm4" type="Node3D"] script = ExtResource("1_nwywg") _demonArmAttackData = SubResource("Resource_2fqbk") +EnemyLoreInfo = SubResource("Resource_wbqyb") [node name="Arm4 (Re-Import Fix)" type="Node3D" parent="."] @@ -1475,8 +1494,8 @@ bones/0/name = "Bone" bones/0/parent = -1 bones/0/rest = Transform3D(0.0151219, 0.673616, -0.738927, -0.999828, 0.0180682, -0.00398999, 0.0106634, 0.738861, 0.673774, -1.71741, 0.00290632, -1.71742) bones/0/enabled = true -bones/0/position = Vector3(-2.10642, -0.236125, -1.66067) -bones/0/rotation = Quaternion(0.0876694, -0.51646, -0.432213, 0.734013) +bones/0/position = Vector3(-2.11496, -0.247764, -1.67428) +bones/0/rotation = Quaternion(0.0893283, -0.515667, -0.434759, 0.732866) bones/0/scale = Vector3(0.999999, 1, 1) bones/1/name = "Bone.001" bones/1/parent = 0 @@ -1629,8 +1648,8 @@ bones/22/name = "Bone.021" bones/22/parent = -1 bones/22/rest = Transform3D(0.769842, 0.636233, -0.050504, -0.0970476, 0.0384815, -0.994536, -0.630813, 0.770536, 0.0913696, -3.03474, -0.0767703, -3.31282) bones/22/enabled = true -bones/22/position = Vector3(-2.03221, 0.808276, -3.64001) -bones/22/rotation = Quaternion(0.833297, -0.116398, -0.16647, 0.514155) +bones/22/position = Vector3(-2.03004, 0.819027, -3.63927) +bones/22/rotation = Quaternion(0.836223, -0.118352, -0.167822, 0.508487) bones/22/scale = Vector3(1, 0.999999, 1) [node name="CHEST_003" type="MeshInstance3D" parent="ARM4/4_ R WEAPON ARM/Skeleton3D"] @@ -1638,7 +1657,7 @@ mesh = SubResource("ArrayMesh_k01v5") skin = SubResource("Skin_f7n3b") [node name="BoneAttachment3D" type="BoneAttachment3D" parent="ARM4/4_ R WEAPON ARM/Skeleton3D"] -transform = Transform3D(0.201407, -0.926783, 0.31703, -0.815947, -0.337809, -0.469162, 0.541906, -0.164187, -0.824245, -0.364014, 1.30568, -0.481431) +transform = Transform3D(0.198512, -0.927582, 0.316518, -0.819734, -0.334158, -0.46516, 0.537239, -0.167121, -0.826706, -0.36933, 1.28198, -0.484146) bone_name = "Bone.008" bone_idx = 8 diff --git a/Zennysoft.Game.Ma/src/enemy/enemy_types/16. demon wall/Arm5.tscn b/Zennysoft.Game.Ma/src/enemy/enemy_types/16. demon wall/Arm5.tscn index 9d44d058..b04a03e1 100644 --- a/Zennysoft.Game.Ma/src/enemy/enemy_types/16. demon wall/Arm5.tscn +++ b/Zennysoft.Game.Ma/src/enemy/enemy_types/16. demon wall/Arm5.tscn @@ -1,9 +1,10 @@ -[gd_scene load_steps=57 format=4 uid="uid://cllbvvqer05cr"] +[gd_scene load_steps=59 format=4 uid="uid://cllbvvqer05cr"] [ext_resource type="Script" uid="uid://vgvrmwsrwakf" path="res://src/enemy/enemy_types/16. demon wall/DemonWallArm.cs" id="1_j3ruw"] [ext_resource type="Script" uid="uid://ctshiyffvt4y5" path="res://src/system/AttackDataResource.cs" id="2_flp87"] [ext_resource type="Texture2D" uid="uid://hhkrujf0lr46" path="res://src/enemy/enemy_types/16. demon wall/model/ROCK SMASH_AREA_2_MAIN_STON2E.png" id="2_mq4nh"] [ext_resource type="Texture2D" uid="uid://dkh83g7ce40i7" path="res://src/enemy/enemy_types/16. demon wall/model/concrete_0003_ao_1k.jpg" id="3_b7812"] +[ext_resource type="Script" uid="uid://dlsgyx4i1jmp3" path="res://src/enemy/EnemyLoreInfo.cs" id="3_gju43"] [ext_resource type="Texture2D" uid="uid://bid5r6mhevna3" path="res://src/enemy/enemy_types/16. demon wall/model/ARM1_AREA_2_MAIN_222STONE.png" id="4_mx4ao"] [ext_resource type="Texture2D" uid="uid://brgmdx0p03syp" path="res://src/enemy/enemy_types/16. demon wall/model/concrete_0003_roughness_1k.jpg" id="5_flp87"] [ext_resource type="Texture2D" uid="uid://cpvgy5t6shoex" path="res://src/enemy/enemy_types/16. demon wall/model/concrete_0003_normal_directx_1k.png" id="6_gju43"] @@ -17,6 +18,23 @@ ElementType = 2 SpecialEffectType = 0 metadata/_custom_type_script = "uid://ctshiyffvt4y5" +[sub_resource type="Resource" id="Resource_lvplo"] +script = ExtResource("3_gju43") +Name = "" +Description = "" +MaximumHP = "" +ATK = "" +DEF = "" +Affinity = "" +Weakness = "" +PrimaryAttackName = "" +PrimaryAttackType = 0 +SecondaryAttackName = "" +SecondaryAttackType = 0 +TertiaryAttackName = "" +TertiaryAttackType = 0 +metadata/_custom_type_script = "uid://dlsgyx4i1jmp3" + [sub_resource type="StandardMaterial3D" id="StandardMaterial3D_so2su"] resource_name = "Material.004" cull_mode = 2 @@ -1404,13 +1422,14 @@ transitions = ["Start", "idle", SubResource("AnimationNodeStateMachineTransition [node name="Arm5" type="Node3D"] script = ExtResource("1_j3ruw") _demonArmAttackData = SubResource("Resource_mx4ao") +EnemyLoreInfo = SubResource("Resource_lvplo") [node name="ROCK SMASH" type="Node3D" parent="."] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -3.59119, 7.25161, 10.1115) visible = false [node name="Cube_cell_036" type="MeshInstance3D" parent="ROCK SMASH"] -transform = Transform3D(-0.77596, 0.249848, 0.399317, 0.229652, 0.872535, -0.099671, -0.411264, 0.0158231, -0.809076, 7.35226, -3.57915, 0.545726) +transform = Transform3D(-0.77596, 0.249848, 0.399317, 0.229652, 0.872535, -0.0996711, -0.411264, 0.0158231, -0.809076, 7.35226, -3.57915, 0.545726) mesh = SubResource("ArrayMesh_mwsfi") skeleton = NodePath("") @@ -1425,12 +1444,12 @@ mesh = SubResource("ArrayMesh_mf0fv") skeleton = NodePath("") [node name="Cube_cell_005_cell_001" type="MeshInstance3D" parent="ROCK SMASH"] -transform = Transform3D(-0.151836, -0.221721, 0.867051, -0.889419, 0.135014, -0.121227, -0.0993517, -0.869829, -0.23983, -0.447331, -3.51994, -9.17886) +transform = Transform3D(-0.151836, -0.221721, 0.867051, -0.889419, 0.135014, -0.121227, -0.0993518, -0.869829, -0.23983, -0.447331, -3.51994, -9.17886) mesh = SubResource("ArrayMesh_ftrgi") skeleton = NodePath("") [node name="Cube_cell_cell" type="MeshInstance3D" parent="ROCK SMASH"] -transform = Transform3D(0.634157, 0.294344, -0.323215, -0.605196, 0.353464, -0.0082817, 0.235741, 0.115613, 0.848207, -0.592601, -3.56393, 0.335403) +transform = Transform3D(0.634157, 0.294344, -0.323215, -0.605196, 0.353464, -0.00828171, 0.235741, 0.115613, 0.848207, -0.592601, -3.56393, 0.335403) mesh = SubResource("ArrayMesh_puagn") skeleton = NodePath("") @@ -1445,7 +1464,7 @@ mesh = SubResource("ArrayMesh_fugsc") skeleton = NodePath("") [node name="Cube_cell_cell_004_cell_007" type="MeshInstance3D" parent="ROCK SMASH"] -transform = Transform3D(0.171285, 0.376762, -0.807901, -0.0681688, 0.825807, 0.370659, 0.888823, -0.00927001, 0.184118, 2.93068, -3.53875, -3.42814) +transform = Transform3D(0.171285, 0.376762, -0.807901, -0.0681688, 0.825807, 0.370659, 0.888823, -0.00927, 0.184118, 2.93068, -3.53875, -3.42814) mesh = SubResource("ArrayMesh_8hrhs") skeleton = NodePath("") @@ -1489,29 +1508,29 @@ bones/0/name = "Bone" bones/0/parent = -1 bones/0/rest = Transform3D(0.0151219, -0.673616, 0.738927, 0.999829, 0.0180681, -0.00399013, -0.0106631, 0.738861, 0.673774, 1.71286, 0.00923371, -1.71285) bones/0/enabled = true -bones/0/position = Vector3(2.61375, -0.227838, -1.42886) -bones/0/rotation = Quaternion(0.305417, 0.545009, 0.643565, 0.442165) +bones/0/position = Vector3(2.61096, -0.172268, -1.43563) +bones/0/rotation = Quaternion(0.316808, 0.52838, 0.659645, 0.430483) bones/0/scale = Vector3(1, 1, 1) bones/1/name = "Bone.001" bones/1/parent = 0 bones/1/rest = Transform3D(0.997342, -0.0728417, -0.00159788, 0.0728471, 0.996536, 0.040124, -0.00133035, -0.0401337, 0.999193, -2.93367e-07, 1.85949, 2.16067e-07) bones/1/enabled = true bones/1/position = Vector3(-2.93367e-07, 1.85949, 2.16067e-07) -bones/1/rotation = Quaternion(0.116591, 0.249485, 0.0713478, 0.958683) +bones/1/rotation = Quaternion(0.197285, 0.246443, -0.0269522, 0.948482) bones/1/scale = Vector3(1, 1, 1) bones/2/name = "Bone.002" bones/2/parent = 1 bones/2/rest = Transform3D(0.175376, 0.963955, 0.200086, -0.983797, 0.179282, -0.00142622, -0.0372466, -0.196594, 0.979777, 5.40167e-08, 0.416929, 1.78814e-07) bones/2/enabled = true bones/2/position = Vector3(5.40167e-08, 0.416929, 1.78814e-07) -bones/2/rotation = Quaternion(-0.124622, 0.0489082, -0.685684, 0.715482) +bones/2/rotation = Quaternion(-0.124541, 0.0489225, -0.685719, 0.715462) bones/2/scale = Vector3(1, 1, 1) bones/3/name = "Bone.003" bones/3/parent = 2 bones/3/rest = Transform3D(0.795966, -0.570792, -0.201583, 0.584248, 0.811525, 0.00907693, 0.158408, -0.124999, 0.97943, -1.04308e-07, 0.298126, 2.5332e-07) bones/3/enabled = true bones/3/position = Vector3(-1.04308e-07, 0.298126, 2.5332e-07) -bones/3/rotation = Quaternion(0.0845888, -0.669349, 0.324274, 0.663071) +bones/3/rotation = Quaternion(0.0943482, -0.585354, 0.261695, 0.76156) bones/3/scale = Vector3(1, 1, 1) bones/4/name = "Bone.004" bones/4/parent = 3 @@ -1525,7 +1544,7 @@ bones/5/parent = 1 bones/5/rest = Transform3D(0.891185, 0.451269, 0.046316, -0.453486, 0.88889, 0.0650086, -0.0118334, -0.0789384, 0.996809, 5.40167e-08, 0.416929, 1.78814e-07) bones/5/enabled = true bones/5/position = Vector3(5.40167e-08, 0.416929, 1.78814e-07) -bones/5/rotation = Quaternion(-0.109719, -0.0132125, -0.159254, 0.981033) +bones/5/rotation = Quaternion(0.0114719, 0.000969072, -0.246314, 0.969122) bones/5/scale = Vector3(1, 1, 1) bones/6/name = "Bone.006" bones/6/parent = 5 @@ -1553,7 +1572,7 @@ bones/9/parent = 1 bones/9/rest = Transform3D(0.998888, 0.0470357, 0.00321129, -0.0471435, 0.997098, 0.0597784, -0.000390256, -0.0598634, 0.998206, 5.40167e-08, 0.416929, 1.78814e-07) bones/9/enabled = true bones/9/position = Vector3(5.40167e-08, 0.416929, 1.78814e-07) -bones/9/rotation = Quaternion(-0.0714744, -0.00196466, 0.117841, 0.990455) +bones/9/rotation = Quaternion(0.0440573, -0.0259886, 0.0294497, 0.998257) bones/9/scale = Vector3(1, 1, 1) bones/10/name = "Bone.010" bones/10/parent = 9 @@ -1581,7 +1600,7 @@ bones/13/parent = 1 bones/13/rest = Transform3D(0.924678, -0.380194, -0.0205531, 0.380732, 0.922777, 0.0593806, -0.00361027, -0.0627332, 0.998024, 5.40167e-08, 0.416929, 1.78814e-07) bones/13/enabled = true bones/13/position = Vector3(5.40167e-08, 0.416929, 1.78814e-07) -bones/13/rotation = Quaternion(0.0120644, -0.0246361, 0.307199, 0.95125) +bones/13/rotation = Quaternion(0.11625, -0.0809472, 0.220637, 0.965015) bones/13/scale = Vector3(1, 1, 1) bones/14/name = "Bone.014" bones/14/parent = 13 @@ -1609,7 +1628,7 @@ bones/17/parent = 1 bones/17/rest = Transform3D(0.731155, -0.681922, -0.0198745, 0.682036, 0.729995, 0.0439837, -0.0154852, -0.045714, 0.998834, 5.40167e-08, 0.416929, 1.78814e-07) bones/17/enabled = true bones/17/position = Vector3(5.40167e-08, 0.416929, 1.78814e-07) -bones/17/rotation = Quaternion(0.113405, -0.109289, 0.424894, 0.891437) +bones/17/rotation = Quaternion(0.201437, -0.185109, 0.333349, 0.90224) bones/17/scale = Vector3(1, 1, 0.999999) bones/18/name = "Bone.018" bones/18/parent = 17 @@ -1636,8 +1655,8 @@ bones/21/name = "Bone.021" bones/21/parent = -1 bones/21/rest = Transform3D(0.769842, -0.636234, 0.0505046, 0.0970479, 0.038481, -0.994536, 0.630814, 0.770536, 0.0913694, 3.03019, -0.0704418, -3.30826) bones/21/enabled = true -bones/21/position = Vector3(2.36961, -0.310568, -3.4757) -bones/21/rotation = Quaternion(0.583325, 0.459644, 0.378052, 0.552754) +bones/21/position = Vector3(2.37182, -0.36614, -3.4699) +bones/21/rotation = Quaternion(0.568262, 0.467144, 0.36309, 0.571857) bones/21/scale = Vector3(1, 1, 1) [node name="CHEST_008" type="MeshInstance3D" parent="ARM5/5_ R MELEE ARM/Skeleton3D"] @@ -1645,7 +1664,7 @@ mesh = SubResource("ArrayMesh_mat8l") skin = SubResource("Skin_em6a3") [node name="BoneAttachment3D" type="BoneAttachment3D" parent="ARM5/5_ R MELEE ARM/Skeleton3D"] -transform = Transform3D(-0.732284, 0.152625, 0.663675, 0.404468, -0.686574, 0.60417, 0.547874, 0.710859, 0.441036, 2.47676, -0.383446, 1.03426) +transform = Transform3D(-0.706745, 0.129691, 0.695479, 0.648477, -0.274237, 0.71012, 0.282822, 0.952876, 0.109715, 2.47764, -0.233566, 1.05436) bone_name = "Bone.018" bone_idx = 18 diff --git a/Zennysoft.Game.Ma/src/enemy/enemy_types/16. demon wall/Arm6.tscn b/Zennysoft.Game.Ma/src/enemy/enemy_types/16. demon wall/Arm6.tscn index 173f5d75..7f248f0c 100644 --- a/Zennysoft.Game.Ma/src/enemy/enemy_types/16. demon wall/Arm6.tscn +++ b/Zennysoft.Game.Ma/src/enemy/enemy_types/16. demon wall/Arm6.tscn @@ -18,15 +18,19 @@ metadata/_custom_type_script = "uid://ctshiyffvt4y5" [sub_resource type="Resource" id="Resource_f844v"] script = ExtResource("2_3jiko") -Name = "" +Name = "Arm 6" Description = "" MaximumHP = "" ATK = "" DEF = "" Affinity = "" Weakness = "" -Drop1 = "" -Drop2 = "" +PrimaryAttackName = "Strong Slash" +PrimaryAttackType = 5 +SecondaryAttackName = "" +SecondaryAttackType = 0 +TertiaryAttackName = "" +TertiaryAttackType = 0 metadata/_custom_type_script = "uid://dlsgyx4i1jmp3" [sub_resource type="StandardMaterial3D" id="StandardMaterial3D_kv7mn"] @@ -552,29 +556,29 @@ bones/0/name = "Bone" bones/0/parent = -1 bones/0/rest = Transform3D(0.351559, -0.633916, 0.68888, 0.936032, 0.250429, -0.247241, -0.0157858, 0.731734, 0.681407, 1.6292, -0.58344, -1.69503) bones/0/enabled = true -bones/0/position = Vector3(2.33342, -0.687147, -1.91261) -bones/0/rotation = Quaternion(0.234862, 0.559252, 0.453205, 0.653209) +bones/0/position = Vector3(2.3387, -0.690867, -1.91654) +bones/0/rotation = Quaternion(0.234138, 0.563413, 0.449207, 0.652655) bones/0/scale = Vector3(1, 1, 1) bones/1/name = "Bone.001" bones/1/parent = 0 bones/1/rest = Transform3D(0.997342, -0.0728406, -0.00159759, 0.072846, 0.996536, 0.0401254, -0.0013307, -0.0401352, 0.999193, -2.57045e-07, 1.85949, -1.63913e-07) bones/1/enabled = true bones/1/position = Vector3(-2.57045e-07, 1.85949, -1.63913e-07) -bones/1/rotation = Quaternion(-0.0200825, -6.67805e-05, 0.0364532, 0.999134) +bones/1/rotation = Quaternion(-0.0202188, 0.0018593, 0.0329312, 0.999251) bones/1/scale = Vector3(1, 1, 1) bones/2/name = "Bone.002" bones/2/parent = 1 bones/2/rest = Transform3D(0.175377, 0.963955, 0.200084, -0.983797, 0.179282, -0.00142542, -0.0372455, -0.196592, 0.979778, -2.04891e-08, 0.416929, -1.19209e-07) bones/2/enabled = true bones/2/position = Vector3(-2.04891e-08, 0.416929, -1.19209e-07) -bones/2/rotation = Quaternion(-0.464257, 0.232683, -0.547169, 0.656453) +bones/2/rotation = Quaternion(-0.465462, 0.231711, -0.547525, 0.655646) bones/2/scale = Vector3(1, 1, 1) bones/3/name = "Bone.003" bones/3/parent = 2 bones/3/rest = Transform3D(0.795964, -0.570795, -0.201579, 0.584251, 0.811522, 0.00907907, 0.158404, -0.125, 0.97943, -2.79397e-07, 0.298125, 7.07805e-08) bones/3/enabled = true bones/3/position = Vector3(-2.79397e-07, 0.298125, 7.07805e-08) -bones/3/rotation = Quaternion(0.143653, -0.0285067, 0.515388, 0.844349) +bones/3/rotation = Quaternion(0.144555, -0.0278559, 0.516329, 0.843642) bones/3/scale = Vector3(1, 1, 1) bones/4/name = "Bone.004" bones/4/parent = 3 @@ -588,14 +592,14 @@ bones/5/parent = 1 bones/5/rest = Transform3D(0.891186, 0.451268, 0.0463134, -0.453484, 0.888891, 0.0650076, -0.0118317, -0.0789362, 0.996809, -2.04891e-08, 0.416929, -1.19209e-07) bones/5/enabled = true bones/5/position = Vector3(-2.04891e-08, 0.416929, -1.19209e-07) -bones/5/rotation = Quaternion(-0.0550595, 0.0166141, -0.0757134, 0.99547) +bones/5/rotation = Quaternion(-0.0568361, 0.0165193, -0.0756837, 0.995374) bones/5/scale = Vector3(1, 1, 1) bones/6/name = "Bone.006" bones/6/parent = 5 bones/6/rest = Transform3D(0.94556, -0.31325, -0.0882615, 0.323948, 0.931928, 0.162993, 0.0311958, -0.182712, 0.982671, 0, 0.366571, 4.47035e-08) bones/6/enabled = true bones/6/position = Vector3(0, 0.366571, 4.47035e-08) -bones/6/rotation = Quaternion(-0.654594, -0.210106, 0.0679959, 0.723007) +bones/6/rotation = Quaternion(-0.656845, -0.210169, 0.068365, 0.720909) bones/6/scale = Vector3(1, 1, 1) bones/7/name = "Bone.007" bones/7/parent = 6 @@ -623,7 +627,7 @@ bones/10/parent = 9 bones/10/rest = Transform3D(0.999465, -0.0299655, -0.0130879, 0.0321747, 0.972617, 0.230176, 0.00583219, -0.230474, 0.973061, -2.98023e-08, 0.347821, 2.23517e-07) bones/10/enabled = true bones/10/position = Vector3(-2.98023e-08, 0.347821, 2.23517e-07) -bones/10/rotation = Quaternion(-0.675095, -0.0610144, -0.0962713, 0.728873) +bones/10/rotation = Quaternion(-0.678619, -0.0606315, -0.0960293, 0.725657) bones/10/scale = Vector3(1, 1, 1) bones/11/name = "Bone.011" bones/11/parent = 10 @@ -651,7 +655,7 @@ bones/14/parent = 13 bones/14/rest = Transform3D(0.961502, 0.268958, 0.056354, -0.274785, 0.938956, 0.207015, 0.00276436, -0.21453, 0.976713, 4.93601e-08, 0.369994, -2.08616e-07) bones/14/enabled = true bones/14/position = Vector3(4.93601e-08, 0.369994, -2.08616e-07) -bones/14/rotation = Quaternion(-0.731906, 0.096456, -0.170995, 0.652511) +bones/14/rotation = Quaternion(-0.735124, 0.0967693, -0.169839, 0.64914) bones/14/scale = Vector3(1, 1, 1) bones/15/name = "Bone.015" bones/15/parent = 14 @@ -672,14 +676,14 @@ bones/17/parent = 1 bones/17/rest = Transform3D(0.731154, -0.681923, -0.0198726, 0.682037, 0.729994, 0.0439829, -0.0154861, -0.0457121, 0.998834, -2.04891e-08, 0.416929, -1.19209e-07) bones/17/enabled = true bones/17/position = Vector3(-2.04891e-08, 0.416929, -1.19209e-07) -bones/17/rotation = Quaternion(-0.0199501, 0.00705526, 0.334738, 0.942074) +bones/17/rotation = Quaternion(-0.0208939, 0.007416, 0.334761, 0.942042) bones/17/scale = Vector3(1, 1, 1) bones/18/name = "Bone.018" bones/18/parent = 17 bones/18/rest = Transform3D(0.857941, 0.502855, 0.105234, -0.513706, 0.842315, 0.163132, -0.00660832, -0.194017, 0.980976, -1.56462e-07, 0.400229, 2.23517e-07) bones/18/enabled = true bones/18/position = Vector3(-1.56462e-07, 0.400229, 2.23517e-07) -bones/18/rotation = Quaternion(-0.695336, 0.104526, -0.215964, 0.677452) +bones/18/rotation = Quaternion(-0.698485, 0.105732, -0.214076, 0.67462) bones/18/scale = Vector3(1, 1, 1) bones/19/name = "Bone.019" bones/19/parent = 18 @@ -699,8 +703,8 @@ bones/21/name = "Bone.021" bones/21/parent = -1 bones/21/rest = Transform3D(0.752405, -0.592093, -0.288639, -0.162915, 0.257308, -0.952497, 0.638236, 0.763687, 0.0971389, 2.85513, -1.1162, -3.27626) bones/21/enabled = true -bones/21/position = Vector3(1.21143, -0.972924, -3.57818) -bones/21/rotation = Quaternion(0.642021, 0.331106, -0.056294, 0.689209) +bones/21/position = Vector3(1.20615, -0.969204, -3.57426) +bones/21/rotation = Quaternion(0.643277, 0.334387, -0.0583805, 0.686274) bones/21/scale = Vector3(1, 1, 1) [node name="CHEST_001" type="MeshInstance3D" parent="ARM6/6_ L WEAPON ARM/Skeleton3D"] @@ -708,7 +712,7 @@ mesh = SubResource("ArrayMesh_4ec00") skin = SubResource("Skin_37t5x") [node name="BoneAttachment3D" type="BoneAttachment3D" parent="ARM6/6_ L WEAPON ARM/Skeleton3D"] -transform = Transform3D(0.216771, 0.848718, -0.482378, 0.906272, -0.35863, -0.223729, -0.362878, -0.388668, -0.84691, 1.24707, 0.226933, 0.130769) +transform = Transform3D(0.213142, 0.851627, -0.478855, 0.901508, -0.360365, -0.239627, -0.376635, -0.380617, -0.844557, 1.27062, 0.245905, 0.123812) bone_name = "Bone.020" bone_idx = 20 diff --git a/Zennysoft.Game.Ma/src/enemy/enemy_types/16. demon wall/Arm7.tscn b/Zennysoft.Game.Ma/src/enemy/enemy_types/16. demon wall/Arm7.tscn index 88cb80a8..54f7f8da 100644 --- a/Zennysoft.Game.Ma/src/enemy/enemy_types/16. demon wall/Arm7.tscn +++ b/Zennysoft.Game.Ma/src/enemy/enemy_types/16. demon wall/Arm7.tscn @@ -1,8 +1,9 @@ -[gd_scene load_steps=29 format=4 uid="uid://b6ov0gf3ax84"] +[gd_scene load_steps=31 format=4 uid="uid://b6ov0gf3ax84"] [ext_resource type="Script" uid="uid://vgvrmwsrwakf" path="res://src/enemy/enemy_types/16. demon wall/DemonWallArm.cs" id="1_enq7k"] [ext_resource type="Texture2D" uid="uid://bid5r6mhevna3" path="res://src/enemy/enemy_types/16. demon wall/model/ARM1_AREA_2_MAIN_222STONE.png" id="2_1gdpg"] [ext_resource type="Script" uid="uid://ctshiyffvt4y5" path="res://src/system/AttackDataResource.cs" id="2_ssyb0"] +[ext_resource type="Script" uid="uid://dlsgyx4i1jmp3" path="res://src/enemy/EnemyLoreInfo.cs" id="3_1dags"] [ext_resource type="Texture2D" uid="uid://dkh83g7ce40i7" path="res://src/enemy/enemy_types/16. demon wall/model/concrete_0003_ao_1k.jpg" id="3_11f7o"] [ext_resource type="Texture2D" uid="uid://bx25c4uynoy1r" path="res://src/enemy/enemy_types/16. demon wall/model/concrete_0003_normal_opengl_1k.png" id="4_xpy5w"] [ext_resource type="Texture2D" uid="uid://brgmdx0p03syp" path="res://src/enemy/enemy_types/16. demon wall/model/concrete_0003_roughness_1k.jpg" id="5_v88k1"] @@ -16,6 +17,23 @@ ElementType = 4 SpecialEffectType = 0 metadata/_custom_type_script = "uid://ctshiyffvt4y5" +[sub_resource type="Resource" id="Resource_p6y6o"] +script = ExtResource("3_1dags") +Name = "Arm 7" +Description = "" +MaximumHP = "" +ATK = "" +DEF = "" +Affinity = "" +Weakness = "" +PrimaryAttackName = "Vizier Flame" +PrimaryAttackType = 4 +SecondaryAttackName = "" +SecondaryAttackType = 0 +TertiaryAttackName = "" +TertiaryAttackType = 0 +metadata/_custom_type_script = "uid://dlsgyx4i1jmp3" + [sub_resource type="StandardMaterial3D" id="StandardMaterial3D_o18ct"] resource_name = "STONE" cull_mode = 2 @@ -613,6 +631,7 @@ transitions = ["idle", "attack", SubResource("AnimationNodeStateMachineTransitio [node name="Arm7" type="Node3D"] script = ExtResource("1_enq7k") _demonArmAttackData = SubResource("Resource_1dags") +EnemyLoreInfo = SubResource("Resource_p6y6o") [node name="Pivot" type="Node3D" parent="."] unique_name_in_owner = true @@ -629,155 +648,155 @@ bones/0/name = "Bone" bones/0/parent = -1 bones/0/rest = Transform3D(0.0151218, -0.673616, 0.738927, 0.999829, 0.0180678, -0.0039901, -0.010663, 0.738861, 0.673774, 1.71286, 0.009233, -1.71285) bones/0/enabled = true -bones/0/position = Vector3(2.24687, -0.603565, -1.50375) -bones/0/rotation = Quaternion(0.200314, 0.336823, 0.597388, 0.69968) +bones/0/position = Vector3(2.26619, -0.583371, -1.49151) +bones/0/rotation = Quaternion(0.294849, 0.216133, 0.658347, 0.657974) bones/0/scale = Vector3(1, 1, 1) bones/1/name = "Bone.001" bones/1/parent = 0 bones/1/rest = Transform3D(0.997342, -0.0728417, -0.00159799, 0.0728471, 0.996536, 0.0401243, -0.00133027, -0.0401341, 0.999193, 3.45986e-07, 1.85949, 1.30385e-07) bones/1/enabled = true bones/1/position = Vector3(3.45986e-07, 1.85949, 1.30385e-07) -bones/1/rotation = Quaternion(0.0439019, 0.561069, 0.181771, 0.806371) +bones/1/rotation = Quaternion(0.135774, 0.599731, 0.125796, 0.778501) bones/1/scale = Vector3(1, 1, 1) bones/2/name = "Bone.002" bones/2/parent = 1 bones/2/rest = Transform3D(0.175376, 0.963955, 0.200084, -0.983797, 0.179281, -0.0014251, -0.0372451, -0.196592, 0.979778, 5.59958e-08, 0.416929, 4.28408e-08) bones/2/enabled = true bones/2/position = Vector3(5.59958e-08, 0.416929, 4.28408e-08) -bones/2/rotation = Quaternion(-0.0502628, 0.159361, -0.617504, 0.768613) +bones/2/rotation = Quaternion(-0.044244, 0.194457, -0.607471, 0.7689) bones/2/scale = Vector3(1, 1, 1) bones/3/name = "Bone.003" bones/3/parent = 2 bones/3/rest = Transform3D(0.795965, -0.570793, -0.20158, 0.584249, 0.811523, 0.0090791, 0.158405, -0.125, 0.97943, -3.50177e-07, 0.298125, 3.20375e-07) bones/3/enabled = true bones/3/position = Vector3(-3.50177e-07, 0.298125, 3.20375e-07) -bones/3/rotation = Quaternion(-0.145398, -0.132355, 0.316618, 0.927952) +bones/3/rotation = Quaternion(-0.09413, -0.115107, 0.311698, 0.938474) bones/3/scale = Vector3(1, 1, 1) bones/4/name = "Bone.004" bones/4/parent = 3 bones/4/rest = Transform3D(0.989609, -0.143493, 0.00920777, 0.14374, 0.98559, -0.089171, 0.00372037, 0.0895679, 0.995974, 6.03497e-07, 0.217615, -2.83122e-07) bones/4/enabled = true bones/4/position = Vector3(6.03497e-07, 0.217615, -2.83122e-07) -bones/4/rotation = Quaternion(0.0106567, 0.0372919, 0.235428, 0.971118) +bones/4/rotation = Quaternion(0.026829, 0.0204845, 0.159225, 0.986665) bones/4/scale = Vector3(1, 1, 1) bones/5/name = "Bone.005" bones/5/parent = 1 bones/5/rest = Transform3D(0.891185, 0.45127, 0.0463153, -0.453486, 0.888889, 0.0650082, -0.011833, -0.0789377, 0.996809, 5.59958e-08, 0.416929, 4.28408e-08) bones/5/enabled = true bones/5/position = Vector3(5.59958e-08, 0.416929, 4.28408e-08) -bones/5/rotation = Quaternion(-0.0188493, 0.0241119, -0.235656, 0.971355) +bones/5/rotation = Quaternion(-0.0272062, 0.019908, -0.234344, 0.971569) bones/5/scale = Vector3(1, 1, 1) bones/6/name = "Bone.006" bones/6/parent = 5 bones/6/rest = Transform3D(0.94556, -0.313252, -0.0882626, 0.323951, 0.931928, 0.162992, 0.0311969, -0.182711, 0.982671, -1.56462e-07, 0.366571, -7.45058e-08) bones/6/enabled = true bones/6/position = Vector3(-1.56462e-07, 0.366571, -7.45058e-08) -bones/6/rotation = Quaternion(-0.169635, -0.0329126, 0.191356, 0.96619) +bones/6/rotation = Quaternion(-0.131722, -0.0317734, 0.177928, 0.97467) bones/6/scale = Vector3(1, 1, 1) bones/7/name = "Bone.007" bones/7/parent = 6 bones/7/rest = Transform3D(0.999951, -0.00959686, -0.00243394, 0.00990068, 0.968863, 0.247401, -1.61149e-05, -0.247413, 0.96891, 2.14204e-07, 0.229155, -1.71363e-07) bones/7/enabled = true bones/7/position = Vector3(2.14204e-07, 0.229155, -1.71363e-07) -bones/7/rotation = Quaternion(-0.00283236, 0.05759, 0.0166798, 0.998197) +bones/7/rotation = Quaternion(-0.0600251, 0.0304076, 0.0111955, 0.997671) bones/7/scale = Vector3(1, 1, 1) bones/8/name = "Bone.008" bones/8/parent = 7 bones/8/rest = Transform3D(0.996094, -0.0359841, -0.0806318, 0.0483356, 0.986431, 0.156898, 0.0738919, -0.160182, 0.984318, 1.47149e-07, 0.142665, 1.63913e-07) bones/8/enabled = true bones/8/position = Vector3(1.47149e-07, 0.142665, 1.63913e-07) -bones/8/rotation = Quaternion(-0.203504, -0.0903457, 0.00232082, 0.974894) +bones/8/rotation = Quaternion(-0.145828, -0.0663613, 0.0111721, 0.987019) bones/8/scale = Vector3(1, 1, 1) bones/9/name = "Bone.009" bones/9/parent = 1 bones/9/rest = Transform3D(0.998888, 0.0470356, 0.00321137, -0.0471435, 0.997098, 0.0597771, -0.000390392, -0.0598621, 0.998207, 5.59958e-08, 0.416929, 4.28408e-08) bones/9/enabled = true bones/9/position = Vector3(5.59958e-08, 0.416929, 4.28408e-08) -bones/9/rotation = Quaternion(-0.021688, 0.0261656, -0.0132732, 0.999334) +bones/9/rotation = Quaternion(-0.0254237, 0.0147258, -0.0179343, 0.999407) bones/9/scale = Vector3(1, 1, 1) bones/10/name = "Bone.010" bones/10/parent = 9 bones/10/rest = Transform3D(0.999465, -0.0299664, -0.0130889, 0.0321758, 0.972617, 0.230175, 0.00583295, -0.230473, 0.973061, 2.34169e-07, 0.347821, 2.51457e-07) bones/10/enabled = true bones/10/position = Vector3(2.34169e-07, 0.347821, 2.51457e-07) -bones/10/rotation = Quaternion(-0.0487945, -0.00206109, -0.00554914, 0.998791) +bones/10/rotation = Quaternion(-0.0801324, -0.00332191, 0.00432565, 0.996769) bones/10/scale = Vector3(1, 1, 1) bones/11/name = "Bone.011" bones/11/parent = 10 bones/11/rest = Transform3D(0.999927, -0.00348307, -0.0115382, 0.00625005, 0.968404, 0.249308, 0.0103053, -0.249362, 0.968356, -4.47035e-07, 0.236611, -1.2666e-07) bones/11/enabled = true bones/11/position = Vector3(-4.47035e-07, 0.236611, -1.2666e-07) -bones/11/rotation = Quaternion(-0.120739, 0.00924265, 0.0130704, 0.992555) +bones/11/rotation = Quaternion(-0.122987, 0.00252996, 0.00823774, 0.992371) bones/11/scale = Vector3(1, 1, 1) bones/12/name = "Bone.012" bones/12/parent = 11 bones/12/rest = Transform3D(0.997952, 0.0219325, -0.0600964, -0.0135852, 0.990624, 0.13594, 0.0625145, -0.134845, 0.988893, -2.6077e-08, 0.172989, -8.9407e-08) bones/12/enabled = true bones/12/position = Vector3(-2.6077e-08, 0.172989, -8.9407e-08) -bones/12/rotation = Quaternion(-0.116755, -0.0467339, -0.00610559, 0.992042) +bones/12/rotation = Quaternion(-0.094187, -0.0393502, -0.00740247, 0.994749) bones/12/scale = Vector3(1, 1, 1) bones/13/name = "Bone.013" bones/13/parent = 1 bones/13/rest = Transform3D(0.924678, -0.380194, -0.020553, 0.380732, 0.922777, 0.0593802, -0.00361024, -0.0627328, 0.998024, 5.59958e-08, 0.416929, 4.28408e-08) bones/13/enabled = true bones/13/position = Vector3(5.59958e-08, 0.416929, 4.28408e-08) -bones/13/rotation = Quaternion(-0.081089, -0.0319464, 0.184809, 0.978902) +bones/13/rotation = Quaternion(-0.102612, -0.0438627, 0.180634, 0.977199) bones/13/scale = Vector3(1, 1, 1) bones/14/name = "Bone.014" bones/14/parent = 13 bones/14/rest = Transform3D(0.961502, 0.268956, 0.0563545, -0.274783, 0.938957, 0.207014, 0.00276324, -0.21453, 0.976713, -5.96046e-08, 0.369994, -1.19209e-07) bones/14/enabled = true bones/14/position = Vector3(-5.96046e-08, 0.369994, -1.19209e-07) -bones/14/rotation = Quaternion(-0.0126931, 0.0925276, -0.168593, 0.981251) +bones/14/rotation = Quaternion(-0.0570081, 0.0556669, -0.154604, 0.984758) bones/14/scale = Vector3(1, 1, 1) bones/15/name = "Bone.015" bones/15/parent = 14 bones/15/rest = Transform3D(0.991898, -0.123696, -0.0289435, 0.124233, 0.89688, 0.424467, -0.0265461, -0.424624, 0.904981, 3.35276e-07, 0.248162, 2.98023e-08) bones/15/enabled = true bones/15/position = Vector3(3.35276e-07, 0.248162, 2.98023e-08) -bones/15/rotation = Quaternion(-0.250047, -0.0946701, 0.040612, 0.962738) +bones/15/rotation = Quaternion(-0.235345, -0.0507294, 0.0514562, 0.969222) bones/15/scale = Vector3(1, 1, 1) bones/16/name = "Bone.016" bones/16/parent = 15 bones/16/rest = Transform3D(0.985405, 0.151269, 0.0780704, -0.133169, 0.970709, -0.199973, -0.106033, 0.186658, 0.976686, 2.5332e-07, 0.160425, 2.38419e-07) bones/16/enabled = true bones/16/position = Vector3(2.5332e-07, 0.160425, 2.38419e-07) -bones/16/rotation = Quaternion(-0.0938047, -0.00250931, -0.0712783, 0.993033) +bones/16/rotation = Quaternion(-0.00371816, 0.0206382, -0.0718336, 0.997196) bones/16/scale = Vector3(1, 1, 1) bones/17/name = "Bone.017" bones/17/parent = 1 bones/17/rest = Transform3D(0.731155, -0.681922, -0.0198728, 0.682036, 0.729995, 0.0439838, -0.0154864, -0.0457129, 0.998835, 5.59958e-08, 0.416929, 4.28408e-08) bones/17/enabled = true bones/17/position = Vector3(5.59958e-08, 0.416929, 4.28408e-08) -bones/17/rotation = Quaternion(-0.0322957, -0.0895413, 0.360132, 0.928033) +bones/17/rotation = Quaternion(-0.0285077, -0.0483922, 0.363522, 0.929891) bones/17/scale = Vector3(1, 1, 1) bones/18/name = "Bone.018" bones/18/parent = 17 bones/18/rest = Transform3D(0.857941, 0.502855, 0.105234, -0.513706, 0.842315, 0.163131, -0.00660895, -0.194016, 0.980976, 3.20375e-07, 0.400228, 5.21541e-08) bones/18/enabled = true bones/18/position = Vector3(3.20375e-07, 0.400228, 5.21541e-08) -bones/18/rotation = Quaternion(-0.0652603, 0.162373, -0.237994, 0.955372) +bones/18/rotation = Quaternion(-0.0784737, 0.100221, -0.251205, 0.959528) bones/18/scale = Vector3(1, 1, 1) bones/19/name = "Bone.019" bones/19/parent = 18 bones/19/rest = Transform3D(0.998612, 0.039922, -0.0343595, -0.0384998, 0.998413, 0.041105, 0.035946, -0.0397251, 0.998564, -1.11759e-08, 0.196711, 2.08616e-07) bones/19/enabled = true bones/19/position = Vector3(-1.11759e-08, 0.196711, 2.08616e-07) -bones/19/rotation = Quaternion(-0.0157505, -0.0675744, -0.035086, 0.996973) +bones/19/rotation = Quaternion(-0.0178229, -0.0444727, -0.0279416, 0.998461) bones/19/scale = Vector3(1, 1, 1) bones/20/name = "Bone.020" bones/20/parent = 19 bones/20/rest = Transform3D(0.986971, -0.159729, -0.0193674, 0.158629, 0.945818, 0.283312, -0.0269352, -0.282693, 0.958832, -2.01166e-07, 0.127215, 4.47035e-08) bones/20/enabled = true bones/20/position = Vector3(-2.01166e-07, 0.127215, 4.47035e-08) -bones/20/rotation = Quaternion(-0.184006, -0.0379018, 0.0740986, 0.979395) +bones/20/rotation = Quaternion(-0.165173, -0.0193485, 0.0772032, 0.983048) bones/20/scale = Vector3(1, 1, 1) bones/21/name = "Bone.021" bones/21/parent = -1 bones/21/rest = Transform3D(0.769842, -0.636234, 0.0505047, 0.097048, 0.038481, -0.994536, 0.630814, 0.770536, 0.0913695, 3.03019, -0.0704427, -3.30826) bones/21/enabled = true -bones/21/position = Vector3(2.73962, 0.0651682, -3.39547) -bones/21/rotation = Quaternion(0.758743, 0.0667581, 0.293831, 0.577508) +bones/21/position = Vector3(2.7203, 0.0449751, -3.40773) +bones/21/rotation = Quaternion(0.754122, 0.0784529, 0.288871, 0.58455) bones/21/scale = Vector3(1, 1, 1) [node name="CHEST_002" type="MeshInstance3D" parent="Pivot/ARM7/7_ L AGNI CONE ARM/Skeleton3D"] @@ -785,7 +804,7 @@ mesh = SubResource("ArrayMesh_x24rv") skin = SubResource("Skin_pqs8c") [node name="BoneAttachment3D" type="BoneAttachment3D" parent="Pivot/ARM7/7_ L AGNI CONE ARM/Skeleton3D"] -transform = Transform3D(-0.853686, -0.471197, 0.221795, 0.257455, -0.0116382, 0.96622, -0.452699, 0.881951, 0.131248, 0.943333, -0.220504, -0.234203) +transform = Transform3D(-0.860292, -0.445889, 0.247144, 0.32589, -0.108197, 0.939196, -0.392037, 0.888525, 0.238392, 0.892218, -0.659078, -0.240836) bone_name = "Bone.001" bone_idx = 1 diff --git a/Zennysoft.Game.Ma/src/enemy/enemy_types/16. demon wall/Arm8.tscn b/Zennysoft.Game.Ma/src/enemy/enemy_types/16. demon wall/Arm8.tscn index dcbd71cd..2f132a59 100644 --- a/Zennysoft.Game.Ma/src/enemy/enemy_types/16. demon wall/Arm8.tscn +++ b/Zennysoft.Game.Ma/src/enemy/enemy_types/16. demon wall/Arm8.tscn @@ -1,8 +1,9 @@ -[gd_scene load_steps=23 format=4 uid="uid://dy0wkrxxmoja4"] +[gd_scene load_steps=25 format=4 uid="uid://dy0wkrxxmoja4"] [ext_resource type="Script" uid="uid://vgvrmwsrwakf" path="res://src/enemy/enemy_types/16. demon wall/DemonWallArm.cs" id="1_5tnjc"] [ext_resource type="Texture2D" uid="uid://bid5r6mhevna3" path="res://src/enemy/enemy_types/16. demon wall/model/ARM1_AREA_2_MAIN_222STONE.png" id="2_8jyke"] [ext_resource type="Script" uid="uid://ctshiyffvt4y5" path="res://src/system/AttackDataResource.cs" id="2_cglns"] +[ext_resource type="Script" uid="uid://dlsgyx4i1jmp3" path="res://src/enemy/EnemyLoreInfo.cs" id="3_iq2ud"] [ext_resource type="Texture2D" uid="uid://dkh83g7ce40i7" path="res://src/enemy/enemy_types/16. demon wall/model/concrete_0003_ao_1k.jpg" id="3_udgo6"] [ext_resource type="Texture2D" uid="uid://bx25c4uynoy1r" path="res://src/enemy/enemy_types/16. demon wall/model/concrete_0003_normal_opengl_1k.png" id="4_yary7"] [ext_resource type="Texture2D" uid="uid://brgmdx0p03syp" path="res://src/enemy/enemy_types/16. demon wall/model/concrete_0003_roughness_1k.jpg" id="5_cglns"] @@ -15,6 +16,23 @@ ElementType = 0 SpecialEffectType = 0 metadata/_custom_type_script = "uid://ctshiyffvt4y5" +[sub_resource type="Resource" id="Resource_1qfue"] +script = ExtResource("3_iq2ud") +Name = "Arm 8" +Description = "" +MaximumHP = "" +ATK = "" +DEF = "" +Affinity = "" +Weakness = "" +PrimaryAttackName = "" +PrimaryAttackType = 0 +SecondaryAttackName = "" +SecondaryAttackType = 0 +TertiaryAttackName = "" +TertiaryAttackType = 0 +metadata/_custom_type_script = "uid://dlsgyx4i1jmp3" + [sub_resource type="StandardMaterial3D" id="StandardMaterial3D_iye06"] resource_name = "STONE" cull_mode = 2 @@ -540,6 +558,7 @@ transitions = ["attack", "idle", SubResource("AnimationNodeStateMachineTransitio [node name="Arm8" type="Node3D"] script = ExtResource("1_5tnjc") _demonArmAttackData = SubResource("Resource_iq2ud") +EnemyLoreInfo = SubResource("Resource_1qfue") [node name="ARM8" type="Node3D" parent="."] @@ -551,15 +570,15 @@ bones/0/name = "Bone" bones/0/parent = -1 bones/0/rest = Transform3D(-0.0590079, 0.671656, -0.73851, -0.998184, -0.0307105, 0.0518258, 0.0121291, 0.740227, 0.672248, -1.70411, 0.133377, -1.7164) bones/0/enabled = true -bones/0/position = Vector3(-2.75853, 0.387106, -1.2089) -bones/0/rotation = Quaternion(0.109971, -0.403118, -0.709968, 0.566876) +bones/0/position = Vector3(-2.90092, 0.816296, -1.19943) +bones/0/rotation = Quaternion(-0.0292844, -0.638578, -0.703058, 0.311561) bones/0/scale = Vector3(1, 1, 1) bones/1/name = "Bone.001" bones/1/parent = 0 bones/1/rest = Transform3D(0.997342, 0.0728404, -0.00158078, -0.0727175, 0.996536, 0.0403564, 0.00451488, -0.0401342, 0.999184, -2.90573e-07, 1.85949, 2.08616e-07) bones/1/enabled = true bones/1/position = Vector3(-2.90573e-07, 1.85949, 2.08616e-07) -bones/1/rotation = Quaternion(-0.239113, 0.0279603, 0.0582617, 0.968839) +bones/1/rotation = Quaternion(-0.0528784, 0.0109231, 0.237015, 0.970004) bones/1/scale = Vector3(1, 1, 1) bones/2/name = "Bone.002" bones/2/parent = 1 @@ -698,8 +717,8 @@ bones/21/name = "Bone.021" bones/21/parent = -1 bones/21/rest = Transform3D(0.761771, 0.635827, -0.12422, -0.154809, -0.00753331, -0.987916, -0.629079, 0.771795, 0.0926929, -3.0206, 0.148976, -3.31442) bones/21/enabled = true -bones/21/position = Vector3(-3.1023, 0.798832, -3.27264) -bones/21/rotation = Quaternion(0.650867, -0.218052, -0.400441, 0.60702) +bones/21/position = Vector3(-2.9599, 0.369642, -3.28211) +bones/21/rotation = Quaternion(0.476835, -0.458575, -0.406243, 0.630321) bones/21/scale = Vector3(1, 1, 1) [node name="CHEST_007" type="MeshInstance3D" parent="ARM8/8_ L MELEE ARM/Skeleton3D"] @@ -707,7 +726,7 @@ mesh = SubResource("ArrayMesh_3e72b") skin = SubResource("Skin_v7bct") [node name="BoneAttachment3D" type="BoneAttachment3D" parent="ARM8/8_ L MELEE ARM/Skeleton3D"] -transform = Transform3D(-0.533193, -0.669659, 0.516974, -0.814306, 0.240569, -0.528235, 0.229369, -0.702626, -0.673577, -0.731961, 0.109618, -0.221657) +transform = Transform3D(-0.744713, -0.442524, 0.499574, -0.374788, -0.342066, -0.861699, 0.55221, -0.828953, 0.0888883, -1.34628, 0.448353, 0.600059) bone_name = "Bone.012" bone_idx = 12 diff --git a/Zennysoft.Game.Ma/src/enemy/enemy_types/16. demon wall/Arm9.tscn b/Zennysoft.Game.Ma/src/enemy/enemy_types/16. demon wall/Arm9.tscn index c79766ad..ecfc48f3 100644 --- a/Zennysoft.Game.Ma/src/enemy/enemy_types/16. demon wall/Arm9.tscn +++ b/Zennysoft.Game.Ma/src/enemy/enemy_types/16. demon wall/Arm9.tscn @@ -1,9 +1,10 @@ -[gd_scene load_steps=158 format=4 uid="uid://br5x3wqrhxbaj"] +[gd_scene load_steps=160 format=4 uid="uid://br5x3wqrhxbaj"] [ext_resource type="Script" uid="uid://vgvrmwsrwakf" path="res://src/enemy/enemy_types/16. demon wall/DemonWallArm.cs" id="1_fjfqv"] [ext_resource type="Texture2D" uid="uid://bid5r6mhevna3" path="res://src/enemy/enemy_types/16. demon wall/model/ARM1_AREA_2_MAIN_222STONE.png" id="2_bbf6x"] [ext_resource type="Texture2D" uid="uid://b7kb4avagq566" path="res://src/vfx/Enemy/demon_wall_status_inflicter.png" id="2_fk886"] [ext_resource type="Script" uid="uid://ctshiyffvt4y5" path="res://src/system/AttackDataResource.cs" id="2_g28ne"] +[ext_resource type="Script" uid="uid://dlsgyx4i1jmp3" path="res://src/enemy/EnemyLoreInfo.cs" id="3_43ovo"] [ext_resource type="Texture2D" uid="uid://dkh83g7ce40i7" path="res://src/enemy/enemy_types/16. demon wall/model/concrete_0003_ao_1k.jpg" id="3_ydud8"] [ext_resource type="Texture2D" uid="uid://bx25c4uynoy1r" path="res://src/enemy/enemy_types/16. demon wall/model/concrete_0003_normal_opengl_1k.png" id="4_fk886"] [ext_resource type="Texture2D" uid="uid://brgmdx0p03syp" path="res://src/enemy/enemy_types/16. demon wall/model/concrete_0003_roughness_1k.jpg" id="5_jltgb"] @@ -16,6 +17,23 @@ ElementType = 0 SpecialEffectType = 0 metadata/_custom_type_script = "uid://ctshiyffvt4y5" +[sub_resource type="Resource" id="Resource_gcle0"] +script = ExtResource("3_43ovo") +Name = "Arm 9" +Description = "" +MaximumHP = "" +ATK = "" +DEF = "" +Affinity = "" +Weakness = "" +PrimaryAttackName = "Hexation" +PrimaryAttackType = 0 +SecondaryAttackName = "" +SecondaryAttackType = 0 +TertiaryAttackName = "" +TertiaryAttackType = 0 +metadata/_custom_type_script = "uid://dlsgyx4i1jmp3" + [sub_resource type="AtlasTexture" id="AtlasTexture_jltgb"] atlas = ExtResource("2_fk886") region = Rect2(0, 0, 512, 512) @@ -1551,6 +1569,7 @@ transitions = ["Start", "idle", SubResource("AnimationNodeStateMachineTransition [node name="Arm9" type="Node3D"] script = ExtResource("1_fjfqv") _demonArmAttackData = SubResource("Resource_43ovo") +EnemyLoreInfo = SubResource("Resource_gcle0") [node name="AnimatedSprite3D" type="AnimatedSprite3D" parent="."] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 12.0684, 8.17799, 10.6701) @@ -1574,141 +1593,141 @@ bones/0/name = "Bone" bones/0/parent = -1 bones/0/rest = Transform3D(0.664239, -0.5079, 0.548475, 0.747327, 0.467912, -0.471764, -0.0170288, 0.723254, 0.690372, 1.32537, -1.1447, -1.67359) bones/0/enabled = true -bones/0/position = Vector3(1.54421, -1.06181, -1.40182) -bones/0/rotation = Quaternion(-0.0211041, 0.755244, 0.561088, 0.338144) +bones/0/position = Vector3(1.45308, -1.07359, -1.44406) +bones/0/rotation = Quaternion(0.068047, 0.597134, 0.649751, 0.465429) bones/0/scale = Vector3(1, 1, 1) bones/1/name = "Bone.001" bones/1/parent = 0 bones/1/rest = Transform3D(0.997342, -0.0728411, -0.00159727, 0.0728464, 0.996536, 0.0401251, -0.00133102, -0.0401348, 0.999193, 4.76837e-07, 1.85949, -3.57628e-07) bones/1/enabled = true bones/1/position = Vector3(4.76837e-07, 1.85949, -3.57628e-07) -bones/1/rotation = Quaternion(-0.170082, -0.143424, 0.07727, 0.97187) +bones/1/rotation = Quaternion(-0.0416461, -0.0206221, 0.0424079, 0.998019) bones/1/scale = Vector3(1, 1, 1) bones/2/name = "Bone.002" bones/2/parent = 1 bones/2/rest = Transform3D(0.175377, 0.963955, 0.200084, -0.983796, 0.179283, -0.00142535, -0.0372456, -0.196592, 0.979778, 2.38419e-07, 0.416929, 0) bones/2/enabled = true bones/2/position = Vector3(2.38419e-07, 0.416929, 0) -bones/2/rotation = Quaternion(-0.19007, 0.134955, -0.646655, 0.72629) +bones/2/rotation = Quaternion(-0.0821716, 0.0860369, -0.639553, 0.759485) bones/2/scale = Vector3(1, 1, 1) bones/3/name = "Bone.003" bones/3/parent = 2 bones/3/rest = Transform3D(0.795965, -0.570793, -0.20158, 0.584249, 0.811523, 0.00907775, 0.158406, -0.124999, 0.97943, -3.57628e-07, 0.298125, 2.98023e-07) bones/3/enabled = true bones/3/position = Vector3(-3.57628e-07, 0.298125, 2.98023e-07) -bones/3/rotation = Quaternion(-0.0197312, -0.0904482, 0.364712, 0.926507) +bones/3/rotation = Quaternion(-0.0331334, -0.0943967, 0.313687, 0.944241) bones/3/scale = Vector3(1, 1, 1) bones/4/name = "Bone.004" bones/4/parent = 3 bones/4/rest = Transform3D(0.989609, -0.143491, 0.00920793, 0.143738, 0.98559, -0.0891698, 0.00371984, 0.0895667, 0.995974, -1.19209e-07, 0.217615, 0) bones/4/enabled = true bones/4/position = Vector3(-1.19209e-07, 0.217615, 0) -bones/4/rotation = Quaternion(0.113505, 0.00589514, 0.161637, 0.980283) +bones/4/rotation = Quaternion(0.0548197, 0.00203207, 0.0850897, 0.994862) bones/4/scale = Vector3(1, 1, 1) bones/5/name = "Bone.005" bones/5/parent = 1 bones/5/rest = Transform3D(0.891187, 0.451267, 0.0463142, -0.453483, 0.888891, 0.0650071, -0.0118327, -0.0789361, 0.99681, 2.38419e-07, 0.416929, 0) bones/5/enabled = true bones/5/position = Vector3(2.38419e-07, 0.416929, 0) -bones/5/rotation = Quaternion(-0.0883845, 0.0204876, -0.216366, 0.972088) +bones/5/rotation = Quaternion(-0.0446208, 0.0157787, -0.230393, 0.971946) bones/5/scale = Vector3(1, 1, 1) bones/6/name = "Bone.006" bones/6/parent = 5 bones/6/rest = Transform3D(0.945561, -0.313247, -0.0882632, 0.323946, 0.931929, 0.162995, 0.0311974, -0.182714, 0.982671, 2.38419e-07, 0.366571, 2.38419e-07) bones/6/enabled = true bones/6/position = Vector3(2.38419e-07, 0.366571, 2.38419e-07) -bones/6/rotation = Quaternion(-0.198845, -0.0456129, 0.160621, 0.965702) +bones/6/rotation = Quaternion(-0.104096, -0.0326273, 0.162064, 0.980732) bones/6/scale = Vector3(1, 1, 1) bones/7/name = "Bone.007" bones/7/parent = 6 bones/7/rest = Transform3D(0.999951, -0.00959863, -0.00243464, 0.00990257, 0.968864, 0.247396, -1.58236e-05, -0.247408, 0.968911, -3.57628e-07, 0.229155, -4.76837e-07) bones/7/enabled = true bones/7/position = Vector3(-3.57628e-07, 0.229155, -4.76837e-07) -bones/7/rotation = Quaternion(-0.241854, 0.0221694, 0.0245934, 0.969748) +bones/7/rotation = Quaternion(-0.141742, 0.00268493, 0.00776498, 0.98987) bones/7/scale = Vector3(1, 1, 1) bones/8/name = "Bone.008" bones/8/parent = 7 bones/8/rest = Transform3D(0.996094, -0.0359844, -0.080632, 0.0483362, 0.986431, 0.156901, 0.0738919, -0.160186, 0.984317, -1.19209e-07, 0.142665, 5.96046e-08) bones/8/enabled = true bones/8/position = Vector3(-1.19209e-07, 0.142665, 5.96046e-08) -bones/8/rotation = Quaternion(-0.227989, -0.0110915, 0.0575271, 0.9719) +bones/8/rotation = Quaternion(-0.101125, -0.034856, 0.0264443, 0.993911) bones/8/scale = Vector3(1, 1, 1) bones/9/name = "Bone.009" bones/9/parent = 1 bones/9/rest = Transform3D(0.998888, 0.0470345, 0.00320965, -0.0471423, 0.997098, 0.0597765, -0.000388783, -0.0598614, 0.998207, 2.38419e-07, 0.416929, 0) bones/9/enabled = true bones/9/position = Vector3(2.38419e-07, 0.416929, 0) -bones/9/rotation = Quaternion(-0.122463, 0.0294864, -0.0139798, 0.991937) +bones/9/rotation = Quaternion(-0.043351, 0.0050411, -0.0221875, 0.998801) bones/9/scale = Vector3(1, 1, 1) bones/10/name = "Bone.010" bones/10/parent = 9 bones/10/rest = Transform3D(0.999465, -0.0299688, -0.013087, 0.0321776, 0.972617, 0.230175, 0.00583061, -0.230473, 0.973061, 1.19209e-07, 0.347821, -4.76837e-07) bones/10/enabled = true bones/10/position = Vector3(1.19209e-07, 0.347821, -4.76837e-07) -bones/10/rotation = Quaternion(-0.213465, -0.0308023, 0.0224072, 0.976208) +bones/10/rotation = Quaternion(-0.130154, -0.00853575, 0.0166336, 0.991318) bones/10/scale = Vector3(1, 1, 1) bones/11/name = "Bone.011" bones/11/parent = 10 bones/11/rest = Transform3D(0.999927, -0.00347542, -0.0115401, 0.00624306, 0.968405, 0.249306, 0.010309, -0.24936, 0.968356, -1.19209e-07, 0.23661, -3.57628e-07) bones/11/enabled = true bones/11/position = Vector3(-1.19209e-07, 0.23661, -3.57628e-07) -bones/11/rotation = Quaternion(-0.227934, 0.0212189, 0.025793, 0.973104) +bones/11/rotation = Quaternion(-0.140562, -0.00164182, 0.00582983, 0.990053) bones/11/scale = Vector3(1, 1, 1) bones/12/name = "Bone.012" bones/12/parent = 11 bones/12/rest = Transform3D(0.997952, 0.0219231, -0.0600952, -0.0135757, 0.990623, 0.135945, 0.062512, -0.13485, 0.988892, -7.15256e-07, 0.172989, -3.57628e-07) bones/12/enabled = true bones/12/position = Vector3(-7.15256e-07, 0.172989, -3.57628e-07) -bones/12/rotation = Quaternion(-0.15897, -0.0120007, 0.0194784, 0.987018) +bones/12/rotation = Quaternion(-0.0811245, -0.0280424, -0.00479417, 0.996298) bones/12/scale = Vector3(1, 1, 1) bones/13/name = "Bone.013" bones/13/parent = 1 bones/13/rest = Transform3D(0.924677, -0.380196, -0.0205531, 0.380734, 0.922776, 0.0593795, -0.00360998, -0.0627321, 0.998024, 2.38419e-07, 0.416929, 0) bones/13/enabled = true bones/13/position = Vector3(2.38419e-07, 0.416929, 0) -bones/13/rotation = Quaternion(-0.0657085, 0.00554767, 0.194883, 0.978607) +bones/13/rotation = Quaternion(-0.0361979, -0.00287615, 0.194159, 0.980298) bones/13/scale = Vector3(1, 1, 1) bones/14/name = "Bone.014" bones/14/parent = 13 bones/14/rest = Transform3D(0.961502, 0.268959, 0.0563536, -0.274785, 0.938956, 0.207013, 0.00276419, -0.214528, 0.976714, -4.76837e-07, 0.369994, 1.19209e-07) bones/14/enabled = true bones/14/position = Vector3(-4.76837e-07, 0.369994, 1.19209e-07) -bones/14/rotation = Quaternion(-0.144447, 0.0263355, -0.134682, 0.97995) +bones/14/rotation = Quaternion(-0.112576, 0.015489, -0.137585, 0.98395) bones/14/scale = Vector3(1, 1, 1) bones/15/name = "Bone.015" bones/15/parent = 14 bones/15/rest = Transform3D(0.991898, -0.123694, -0.0289441, 0.12423, 0.896878, 0.424473, -0.0265452, -0.42463, 0.904978, 4.17233e-07, 0.248162, 0) bones/15/enabled = true bones/15/position = Vector3(4.17233e-07, 0.248162, 0) -bones/15/rotation = Quaternion(-0.294079, 0.0169274, 0.0736991, 0.952785) +bones/15/rotation = Quaternion(-0.229091, 0.00192687, 0.0651274, 0.971222) bones/15/scale = Vector3(1, 1, 1) bones/16/name = "Bone.016" bones/16/parent = 15 bones/16/rest = Transform3D(0.985406, 0.151262, 0.0780701, -0.133163, 0.970709, -0.199978, -0.106032, 0.186663, 0.976685, -8.9407e-08, 0.160424, -8.34465e-07) bones/16/enabled = true bones/16/position = Vector3(-8.9407e-08, 0.160424, -8.34465e-07) -bones/16/rotation = Quaternion(0.0631766, 0.0530837, -0.0676139, 0.994293) +bones/16/rotation = Quaternion(0.0925093, 0.0473888, -0.0711217, 0.992037) bones/16/scale = Vector3(1, 1, 1) bones/17/name = "Bone.017" bones/17/parent = 1 bones/17/rest = Transform3D(0.731154, -0.681923, -0.0198735, 0.682037, 0.729994, 0.0439834, -0.0154858, -0.0457131, 0.998835, 2.38419e-07, 0.416929, 0) bones/17/enabled = true bones/17/position = Vector3(2.38419e-07, 0.416929, 0) -bones/17/rotation = Quaternion(-0.073774, 0.0305677, 0.385021, 0.919446) +bones/17/rotation = Quaternion(-0.0313522, 0.00344569, 0.369404, 0.928734) bones/17/scale = Vector3(1, 1, 1) bones/18/name = "Bone.018" bones/18/parent = 17 bones/18/rest = Transform3D(0.857942, 0.502854, 0.105233, -0.513705, 0.842316, 0.163129, -0.00660948, -0.194014, 0.980976, -5.96046e-07, 0.400228, -7.15256e-07) bones/18/enabled = true bones/18/position = Vector3(-5.96046e-07, 0.400228, -7.15256e-07) -bones/18/rotation = Quaternion(-0.138927, 0.0518502, -0.265351, 0.95268) +bones/18/rotation = Quaternion(-0.0997422, 0.0324462, -0.265022, 0.958521) bones/18/scale = Vector3(1, 1, 1) bones/19/name = "Bone.019" bones/19/parent = 18 bones/19/rest = Transform3D(0.998612, 0.039929, -0.0343581, -0.0385066, 0.998412, 0.0411099, 0.035945, -0.0397298, 0.998564, 2.08616e-07, 0.196712, -2.38419e-07) bones/19/enabled = true bones/19/position = Vector3(2.08616e-07, 0.196712, -2.38419e-07) -bones/19/rotation = Quaternion(-0.0847608, -0.0249695, -0.0322435, 0.995566) +bones/19/rotation = Quaternion(-0.0296294, -0.018666, -0.0214643, 0.999156) bones/19/scale = Vector3(1, 1, 1) bones/20/name = "Bone.020" bones/20/parent = 19 @@ -1721,8 +1740,8 @@ bones/21/name = "Bone.021" bones/21/parent = -1 bones/21/rest = Transform3D(0.638395, -0.466665, -0.612108, -0.416251, 0.459614, -0.784532, 0.647446, 0.755632, 0.0991659, 2.29161, -2.09633, -3.23813) bones/21/enabled = true -bones/21/position = Vector3(2.41523, -1.42245, -3.23285) -bones/21/rotation = Quaternion(0.521108, 0.136802, 0.374792, 0.754495) +bones/21/position = Vector3(2.50636, -1.41067, -3.19061) +bones/21/rotation = Quaternion(0.499285, 0.111246, 0.411151, 0.754516) bones/21/scale = Vector3(1, 1, 1) [node name="CHEST" type="MeshInstance3D" parent="ARM9/9_ L MAGIC 3 ARM/Skeleton3D"] @@ -1730,7 +1749,7 @@ mesh = SubResource("ArrayMesh_auq5d") skin = SubResource("Skin_h0kek") [node name="BoneAttachment3D" type="BoneAttachment3D" parent="ARM9/9_ L MAGIC 3 ARM/Skeleton3D"] -transform = Transform3D(-0.838117, -0.543326, -0.0485321, 0.495856, -0.795916, 0.347339, -0.227346, 0.267046, 0.936483, 0.347194, -0.592469, 1.02901) +transform = Transform3D(-0.713541, -0.682904, 0.156528, 0.670043, -0.599883, 0.437245, -0.204698, 0.416873, 0.885616, -0.0117199, -0.963087, 0.98719) bone_name = "Bone.015" bone_idx = 15 diff --git a/Zennysoft.Game.Ma/src/enemy/enemy_types/16. demon wall/DemonWallLoreInfo.tres b/Zennysoft.Game.Ma/src/enemy/enemy_types/16. demon wall/DemonWallLoreInfo.tres index 6cdfad77..1e0fb283 100644 --- a/Zennysoft.Game.Ma/src/enemy/enemy_types/16. demon wall/DemonWallLoreInfo.tres +++ b/Zennysoft.Game.Ma/src/enemy/enemy_types/16. demon wall/DemonWallLoreInfo.tres @@ -13,6 +13,10 @@ ATK = "" DEF = "" Affinity = "Sankta" Weakness = "" -Drop1 = "" -Drop2 = "" +PrimaryAttackName = "" +PrimaryAttackType = 0 +SecondaryAttackName = "" +SecondaryAttackType = 0 +TertiaryAttackName = "" +TertiaryAttackType = 0 metadata/_custom_type_script = "uid://dlsgyx4i1jmp3" diff --git a/Zennysoft.Game.Ma/src/enemy/enemy_types/9b. Aqueos Demon/AqueosDemonLoreInfo.tres b/Zennysoft.Game.Ma/src/enemy/enemy_types/9b. Aqueos Demon/AqueosDemonLoreInfo.tres index 88973445..b4175daa 100644 --- a/Zennysoft.Game.Ma/src/enemy/enemy_types/9b. Aqueos Demon/AqueosDemonLoreInfo.tres +++ b/Zennysoft.Game.Ma/src/enemy/enemy_types/9b. Aqueos Demon/AqueosDemonLoreInfo.tres @@ -13,6 +13,10 @@ ATK = "" DEF = "" Affinity = "Hydric" Weakness = "" -Drop1 = "" -Drop2 = "" +PrimaryAttackName = "Aqua-Crash" +PrimaryAttackType = 3 +SecondaryAttackName = "Jetstream Slash" +SecondaryAttackType = 3 +TertiaryAttackName = "" +TertiaryAttackType = 0 metadata/_custom_type_script = "uid://dlsgyx4i1jmp3" diff --git a/Zennysoft.Game.Ma/src/enemy_viewer/EnemyViewer.cs b/Zennysoft.Game.Ma/src/enemy_viewer/EnemyViewer.cs index 2f441964..30481947 100644 --- a/Zennysoft.Game.Ma/src/enemy_viewer/EnemyViewer.cs +++ b/Zennysoft.Game.Ma/src/enemy_viewer/EnemyViewer.cs @@ -152,8 +152,6 @@ public partial class EnemyViewer : Control, IEnemyViewer HPValue.Text = _currentModel.EnemyLoreInfo != null ? _currentModel.EnemyLoreInfo.MaximumHP : "Placeholder Text"; ATKValue.Text = _currentModel.EnemyLoreInfo != null ? _currentModel.EnemyLoreInfo.ATK : "Placeholder Text"; DEFValue.Text = _currentModel.EnemyLoreInfo != null ? _currentModel.EnemyLoreInfo.DEF : "Placeholder Text"; - Drop1Value.Text = _currentModel.EnemyLoreInfo != null ? _currentModel.EnemyLoreInfo.Drop1 : "Placeholder Text"; - Drop2Value.Text = _currentModel.EnemyLoreInfo != null ? _currentModel.EnemyLoreInfo.Drop2 : "Placeholder Text"; AffinityValue.Text = _currentModel.EnemyLoreInfo != null ? _currentModel.EnemyLoreInfo.Affinity : "Placeholder Text"; WeaknessValue.Text = _currentModel.EnemyLoreInfo != null ? _currentModel.EnemyLoreInfo.Weakness : "Placeholder Text";