diff --git a/Zennysoft.Game.Ma.Implementation/Quest/NpcData.cs b/Zennysoft.Game.Ma.Implementation/Quest/NpcData.cs new file mode 100644 index 00000000..9d85082f --- /dev/null +++ b/Zennysoft.Game.Ma.Implementation/Quest/NpcData.cs @@ -0,0 +1,11 @@ +using Chickensoft.Introspection; +using Chickensoft.Serialization; + +namespace Zennysoft.Ma.Adapter; + +[Meta, Id("npc_data")] +public partial record NpcData +{ + [Save("stele_list")] + public required List SteleDiscovered { get; set; } +} diff --git a/Zennysoft.Game.Ma.Implementation/Quest/SarcoData.cs b/Zennysoft.Game.Ma.Implementation/Quest/SarcoData.cs index f2f420ac..9d8ec235 100644 --- a/Zennysoft.Game.Ma.Implementation/Quest/SarcoData.cs +++ b/Zennysoft.Game.Ma.Implementation/Quest/SarcoData.cs @@ -26,18 +26,4 @@ public partial record SarcoData [Save("shura_sarco")] public bool ShuraSarcoAcquired { get; set; } = false; -} - -[Meta, Id("npc_data")] -public partial record NpcData -{ - [Save("stele_list")] - public required List SteleDiscovered { get; set; } -} - -[Meta, Id("stat_data")] -public partial record StatData -{ - [Save("sproingy_defeated")] - public int SproingyDefeated { get; set; } = 0; -} +} \ No newline at end of file diff --git a/Zennysoft.Game.Ma.Implementation/Quest/StatData.cs b/Zennysoft.Game.Ma.Implementation/Quest/StatData.cs new file mode 100644 index 00000000..5f0c0fac --- /dev/null +++ b/Zennysoft.Game.Ma.Implementation/Quest/StatData.cs @@ -0,0 +1,13 @@ +using Chickensoft.Introspection; +using Chickensoft.Serialization; + +namespace Zennysoft.Ma.Adapter; + +[Meta, Id("stat_data")] +public partial record StatData +{ + [Save("enemies_defeated")] + public Dictionary EnemiesDefeated { get; set; } = []; + + public int TotalEnemiesDefeated => EnemiesDefeated.Values.Sum(); +} diff --git a/Zennysoft.Game.Ma/src/enemy/Enemy.cs b/Zennysoft.Game.Ma/src/enemy/Enemy.cs index ad532b12..95c6f136 100644 --- a/Zennysoft.Game.Ma/src/enemy/Enemy.cs +++ b/Zennysoft.Game.Ma/src/enemy/Enemy.cs @@ -295,9 +295,12 @@ public abstract partial class Enemy : CharacterBody3D, IEnemy, IProvide EnemyModelView.PlayIdleAnimation(); - public override void IncrementDefeatCount() => _game.StatData.SproingyDefeated += 1; - public override void _ExitTree() { PatrolBehavior.OnVelocityComputed -= OnVelocityComputed; diff --git a/Zennysoft.Game.Ma/src/enemy/enemy_types/03. filth_eater/FilthEaterModelView.tscn b/Zennysoft.Game.Ma/src/enemy/enemy_types/03. filth_eater/FilthEaterModelView.tscn index 1667e744..50a49a02 100644 --- a/Zennysoft.Game.Ma/src/enemy/enemy_types/03. filth_eater/FilthEaterModelView.tscn +++ b/Zennysoft.Game.Ma/src/enemy/enemy_types/03. filth_eater/FilthEaterModelView.tscn @@ -1,7 +1,7 @@ -[gd_scene load_steps=706 format=3 uid="uid://b6sa6ntu4rbrm"] +[gd_scene load_steps=705 format=3 uid="uid://b6sa6ntu4rbrm"] [ext_resource type="Script" uid="uid://cvr1qimxpignl" path="res://src/enemy/EnemyModelView2D.cs" id="1_718m1"] -[ext_resource type="Script" uid="uid://dlsgyx4i1jmp3" path="res://src/enemy/EnemyLoreInfo.cs" id="2_krqul"] +[ext_resource type="Resource" uid="uid://bwo656s0fq3ew" path="res://src/enemy/enemy_types/03. filth_eater/FilthEaterLoreInfo.tres" id="2_p4ilm"] [ext_resource type="Texture2D" uid="uid://bdar3daydbkge" path="res://src/enemy/enemy_types/03. filth_eater/animations/SWIPE/Layer 1.png" id="2_vpn42"] [ext_resource type="Texture2D" uid="uid://o214hr614jit" path="res://src/enemy/enemy_types/03. filth_eater/animations/SWIPE/Layer 2.png" id="3_7tggm"] [ext_resource type="Texture2D" uid="uid://hyipatqsvukp" path="res://src/enemy/enemy_types/03. filth_eater/animations/SWIPE/Layer 3.png" id="4_usgpm"] @@ -215,19 +215,6 @@ [ext_resource type="AudioStream" uid="uid://bajfar6pey7tm" path="res://src/audio/sfx/enemy_filth_1.ogg" id="205_01v4k"] [ext_resource type="AudioStream" uid="uid://bpuwajdvn5bp1" path="res://src/audio/sfx/enemy_filth_blast.ogg" id="206_jltoa"] -[sub_resource type="Resource" id="Resource_pyy2h"] -script = ExtResource("2_krqul") -Name = "Filth Eater" -Description = "yuck" -MaximumHP = "" -ATK = "" -DEF = "" -Affinity = "" -Weakness = "" -Drop1 = "" -Drop2 = "" -metadata/_custom_type_script = "uid://dlsgyx4i1jmp3" - [sub_resource type="ViewportTexture" id="ViewportTexture_7tggm"] viewport_path = NodePath("Sprite3D/SubViewportContainer/SubViewport") @@ -5757,7 +5744,7 @@ _data = { [node name="EnemyModelView" type="Node3D"] script = ExtResource("1_718m1") -EnemyLoreInfo = SubResource("Resource_pyy2h") +EnemyLoreInfo = ExtResource("2_p4ilm") [node name="Sprite3D" type="Sprite3D" parent="."] unique_name_in_owner = true diff --git a/Zennysoft.Game.Ma/src/enemy/enemy_types/05. ballos/BallosModelView.tscn b/Zennysoft.Game.Ma/src/enemy/enemy_types/05. ballos/BallosModelView.tscn index d00cd265..0ba20bcd 100644 --- a/Zennysoft.Game.Ma/src/enemy/enemy_types/05. ballos/BallosModelView.tscn +++ b/Zennysoft.Game.Ma/src/enemy/enemy_types/05. ballos/BallosModelView.tscn @@ -1,6 +1,7 @@ -[gd_scene load_steps=570 format=3 uid="uid://dppmk4nx2le20"] +[gd_scene load_steps=571 format=3 uid="uid://dppmk4nx2le20"] [ext_resource type="Script" uid="uid://cvr1qimxpignl" path="res://src/enemy/EnemyModelView2D.cs" id="1_ueqp5"] +[ext_resource type="Resource" uid="uid://cq6inhr48gc0y" path="res://src/enemy/enemy_types/05. ballos/BallosLoreInfo.tres" id="2_ice28"] [ext_resource type="Texture2D" uid="uid://bgkx485uy065" path="res://src/enemy/enemy_types/05. ballos/animations/WALK BACK/1.png" id="3_b3ny6"] [ext_resource type="Texture2D" uid="uid://bb27nhsj1d30l" path="res://src/enemy/enemy_types/05. ballos/animations/WALK FRONT/1.png" id="3_mlptn"] [ext_resource type="Texture2D" uid="uid://s46wl5rtsp6k" path="res://src/enemy/enemy_types/05. ballos/animations/WALK FRONT/2.png" id="4_qgnoe"] @@ -4695,6 +4696,7 @@ _data = { [node name="EnemyModelView" type="Node3D"] script = ExtResource("1_ueqp5") +EnemyLoreInfo = ExtResource("2_ice28") [node name="Sprite3D" type="Sprite3D" parent="."] unique_name_in_owner = true diff --git a/Zennysoft.Game.Ma/src/enemy/enemy_types/06. Planter/PlanterModelView.tscn b/Zennysoft.Game.Ma/src/enemy/enemy_types/06. Planter/PlanterModelView.tscn index 7677d680..51663b63 100644 --- a/Zennysoft.Game.Ma/src/enemy/enemy_types/06. Planter/PlanterModelView.tscn +++ b/Zennysoft.Game.Ma/src/enemy/enemy_types/06. Planter/PlanterModelView.tscn @@ -1,7 +1,7 @@ -[gd_scene load_steps=851 format=3 uid="uid://dfih3tw51mumf"] +[gd_scene load_steps=850 format=3 uid="uid://dfih3tw51mumf"] [ext_resource type="Script" uid="uid://cvr1qimxpignl" path="res://src/enemy/EnemyModelView2D.cs" id="1_lp3cr"] -[ext_resource type="Script" uid="uid://dlsgyx4i1jmp3" path="res://src/enemy/EnemyLoreInfo.cs" id="2_olcu2"] +[ext_resource type="Resource" uid="uid://y0eanqffc1pf" path="res://src/enemy/enemy_types/06. Planter/PlanterLoreInfo.tres" id="2_xn42l"] [ext_resource type="AnimationNodeStateMachine" uid="uid://clybvwx3itfeo" path="res://src/enemy/animation_state_machines/SecondaryAttackStateMachine.tres" id="3_4l2tb"] [ext_resource type="AudioStream" uid="uid://dpsqle6gghgrq" path="res://src/audio/sfx/planter_moving_layer.ogg" id="3_xn42l"] [ext_resource type="AudioStream" uid="uid://b6xdgfp1ttdg4" path="res://src/audio/sfx/enemy_planter_ranged_attack.ogg" id="4_xf3uf"] @@ -412,19 +412,6 @@ [ext_resource type="Texture2D" uid="uid://dwuu7ik20m5yq" path="res://src/vfx/Enemy/chariot_attack2/chariot_attack2_071.png" id="407_ruvnx"] [ext_resource type="Texture2D" uid="uid://cv83xpm5cd8mv" path="res://src/vfx/Enemy/chariot_blast.png" id="408_6oqs0"] -[sub_resource type="Resource" id="Resource_ivy74"] -script = ExtResource("2_olcu2") -Name = "Sproingy" -Description = "He's smaller than I expected..." -MaximumHP = "" -ATK = "" -DEF = "" -Affinity = "" -Weakness = "" -Drop1 = "" -Drop2 = "" -metadata/_custom_type_script = "uid://dlsgyx4i1jmp3" - [sub_resource type="BoxShape3D" id="BoxShape3D_53wuj"] size = Vector3(1, 1.07938, 3.51416) @@ -5827,7 +5814,7 @@ animations = [{ [node name="EnemyModelView" type="Node3D"] script = ExtResource("1_lp3cr") -EnemyLoreInfo = SubResource("Resource_ivy74") +EnemyLoreInfo = ExtResource("2_xn42l") [node name="Hitbox" type="Area3D" parent="."] unique_name_in_owner = true diff --git a/Zennysoft.Game.Ma/src/enemy/enemy_types/07. chinthe/ChintheModelView.tscn b/Zennysoft.Game.Ma/src/enemy/enemy_types/07. chinthe/ChintheModelView.tscn index a54eff0c..3ccf8109 100644 --- a/Zennysoft.Game.Ma/src/enemy/enemy_types/07. chinthe/ChintheModelView.tscn +++ b/Zennysoft.Game.Ma/src/enemy/enemy_types/07. chinthe/ChintheModelView.tscn @@ -1,7 +1,8 @@ -[gd_scene load_steps=898 format=3 uid="uid://de6e8yv6mv4fe"] +[gd_scene load_steps=899 format=3 uid="uid://de6e8yv6mv4fe"] [ext_resource type="Script" uid="uid://cvr1qimxpignl" path="res://src/enemy/EnemyModelView2D.cs" id="1_6dej3"] [ext_resource type="Texture2D" uid="uid://dnd6d5cx7x7i8" path="res://src/enemy/enemy_types/07. chinthe/animations/CHINTHE - RERENDER/BACK/0400.png" id="2_3sdh3"] +[ext_resource type="Resource" uid="uid://2j714tuwhbdu" path="res://src/enemy/enemy_types/07. chinthe/ChinteLoreInfo.tres" id="2_y2ova"] [ext_resource type="Texture2D" uid="uid://c0unwba144tls" path="res://src/enemy/enemy_types/07. chinthe/animations/CHINTHE - RERENDER/BACK/0402.png" id="3_dbwem"] [ext_resource type="Texture2D" uid="uid://ca1im2so1vkym" path="res://src/enemy/enemy_types/07. chinthe/animations/CHINTHE - RERENDER/BACK/0404.png" id="4_y7pe6"] [ext_resource type="Texture2D" uid="uid://cgnm3v0t63aiw" path="res://src/enemy/enemy_types/07. chinthe/animations/CHINTHE - RERENDER/BACK/0406.png" id="5_xu4hf"] @@ -6652,6 +6653,7 @@ _data = { [node name="EnemyModelView" type="Node3D"] script = ExtResource("1_6dej3") +EnemyLoreInfo = ExtResource("2_y2ova") [node name="Shadow" type="Sprite3D" parent="."] transform = Transform3D(0.75, 0, 0, 0, -3.27836e-08, 0.75, 0, -0.75, -3.27836e-08, 0.00589746, -0.0179769, 0.0116717) diff --git a/Zennysoft.Game.Ma/src/enemy/enemy_types/08a. Ambassador/AmbassadorModelView.tscn b/Zennysoft.Game.Ma/src/enemy/enemy_types/08a. Ambassador/AmbassadorModelView.tscn index 9f4e66bc..bad4bfd5 100644 --- a/Zennysoft.Game.Ma/src/enemy/enemy_types/08a. Ambassador/AmbassadorModelView.tscn +++ b/Zennysoft.Game.Ma/src/enemy/enemy_types/08a. Ambassador/AmbassadorModelView.tscn @@ -1,7 +1,7 @@ -[gd_scene load_steps=695 format=3 uid="uid://7eo16vsbrgi3"] +[gd_scene load_steps=694 format=3 uid="uid://7eo16vsbrgi3"] [ext_resource type="Script" uid="uid://cvr1qimxpignl" path="res://src/enemy/EnemyModelView2D.cs" id="1_h27bt"] -[ext_resource type="Script" uid="uid://dlsgyx4i1jmp3" path="res://src/enemy/EnemyLoreInfo.cs" id="2_yyynn"] +[ext_resource type="Resource" uid="uid://bcg3dsd3jcxpb" path="res://src/enemy/enemy_types/08a. Ambassador/AmbassadorLoreInfo.tres" id="2_vh04b"] [ext_resource type="Texture2D" uid="uid://7ef67gqhcb3d" path="res://src/enemy/enemy_types/08a. Ambassador/animations/B/Layer 173.png" id="3_mhafn"] [ext_resource type="Texture2D" uid="uid://i0pmr2jtdhu5" path="res://src/enemy/enemy_types/08a. Ambassador/animations/B/Layer 174.png" id="4_tuqu4"] [ext_resource type="Texture2D" uid="uid://dxo32giakqy8n" path="res://src/enemy/enemy_types/08a. Ambassador/animations/B/Layer 175.png" id="5_66kkx"] @@ -276,19 +276,6 @@ [ext_resource type="Texture2D" uid="uid://dafpnwkwcukp4" path="res://src/vfx/shadow_test_1.png" id="267_evddb"] [ext_resource type="Texture2D" uid="uid://bp6npqoco5fl3" path="res://src/vfx/Enemy Affected/curse_damage.png" id="267_qpodb"] -[sub_resource type="Resource" id="Resource_f45wt"] -script = ExtResource("2_yyynn") -Name = "Ambassador" -Description = "Running guy" -MaximumHP = "" -ATK = "" -DEF = "" -Affinity = "" -Weakness = "" -Drop1 = "" -Drop2 = "" -metadata/_custom_type_script = "uid://dlsgyx4i1jmp3" - [sub_resource type="ViewportTexture" id="ViewportTexture_h1kaf"] viewport_path = NodePath("Sprite3D/SubViewportContainer/SubViewport") @@ -5258,7 +5245,7 @@ _data = { [node name="EnemyModelView" type="Node3D"] script = ExtResource("1_h27bt") -EnemyLoreInfo = SubResource("Resource_f45wt") +EnemyLoreInfo = ExtResource("2_vh04b") [node name="Sprite3D" type="Sprite3D" parent="."] unique_name_in_owner = true diff --git a/Zennysoft.Game.Ma/src/enemy/enemy_types/09. Agni/AgniDemonModelView.tscn b/Zennysoft.Game.Ma/src/enemy/enemy_types/09. Agni/AgniDemonModelView.tscn index 8fba024b..4725f69b 100644 --- a/Zennysoft.Game.Ma/src/enemy/enemy_types/09. Agni/AgniDemonModelView.tscn +++ b/Zennysoft.Game.Ma/src/enemy/enemy_types/09. Agni/AgniDemonModelView.tscn @@ -1,9 +1,9 @@ -[gd_scene load_steps=765 format=3 uid="uid://uynf2cg7wtqo"] +[gd_scene load_steps=764 format=3 uid="uid://uynf2cg7wtqo"] [ext_resource type="Script" uid="uid://cvr1qimxpignl" path="res://src/enemy/EnemyModelView2D.cs" id="1_wl7dh"] [ext_resource type="Texture2D" uid="uid://dsu48b5hf48xl" path="res://src/enemy/enemy_types/09. Agni/animations/B/frame_000_delay-0.01s.png" id="2_pt8gl"] [ext_resource type="Texture2D" uid="uid://bdhmqyiad52ea" path="res://src/enemy/enemy_types/09. Agni/animations/F/frame_066_delay-0.01s.png" id="2_wfu1u"] -[ext_resource type="Script" uid="uid://dlsgyx4i1jmp3" path="res://src/enemy/EnemyLoreInfo.cs" id="2_y6p5p"] +[ext_resource type="Resource" uid="uid://c5moj0k672x7" path="res://src/enemy/enemy_types/09. Agni/AgniDemonLoreInfo.tres" id="2_ypc6s"] [ext_resource type="Texture2D" uid="uid://dw1841vsuw75d" path="res://src/enemy/enemy_types/09. Agni/animations/B/frame_001_delay-0.01s.png" id="3_8wyws"] [ext_resource type="Texture2D" uid="uid://d11ep3xldfmpw" path="res://src/enemy/enemy_types/09. Agni/animations/F/frame_067_delay-0.01s.png" id="3_mmosy"] [ext_resource type="Texture2D" uid="uid://omx4r41xjik7" path="res://src/enemy/enemy_types/09. Agni/animations/B/frame_002_delay-0.01s.png" id="4_kuord"] @@ -346,19 +346,6 @@ [ext_resource type="AudioStream" uid="uid://cc7g8awtomf45" path="res://src/audio/sfx/ENEMY_AGNI_ATTACK_1.ogg" id="341_ypc6s"] [ext_resource type="AudioStream" uid="uid://c36ewcgnjtr7g" path="res://src/audio/sfx/ENEMY_AGNI_ATTACK_2_SWING.ogg" id="342_q4052"] -[sub_resource type="Resource" id="Resource_f45wt"] -script = ExtResource("2_y6p5p") -Name = "Agi Demon" -Description = "Lava monster" -MaximumHP = "" -ATK = "" -DEF = "" -Affinity = "" -Weakness = "" -Drop1 = "" -Drop2 = "" -metadata/_custom_type_script = "uid://dlsgyx4i1jmp3" - [sub_resource type="ViewportTexture" id="ViewportTexture_h1kaf"] viewport_path = NodePath("Sprite3D/SubViewportContainer/SubViewport") @@ -5301,7 +5288,7 @@ _data = { [node name="EnemyModelView" type="Node3D"] script = ExtResource("1_wl7dh") -EnemyLoreInfo = SubResource("Resource_f45wt") +EnemyLoreInfo = ExtResource("2_ypc6s") [node name="Sprite3D" type="Sprite3D" parent="."] unique_name_in_owner = true diff --git a/Zennysoft.Game.Ma/src/enemy/enemy_types/10. Eden Pillar/EdenPillarModelView.tscn b/Zennysoft.Game.Ma/src/enemy/enemy_types/10. Eden Pillar/EdenPillarModelView.tscn index f3bfd4ff..a8d9f179 100644 --- a/Zennysoft.Game.Ma/src/enemy/enemy_types/10. Eden Pillar/EdenPillarModelView.tscn +++ b/Zennysoft.Game.Ma/src/enemy/enemy_types/10. Eden Pillar/EdenPillarModelView.tscn @@ -1,8 +1,9 @@ -[gd_scene load_steps=408 format=4 uid="uid://dykkkt8mr1012"] +[gd_scene load_steps=409 format=4 uid="uid://dykkkt8mr1012"] [ext_resource type="Texture2D" uid="uid://cvst7yhbw0sxt" path="res://src/enemy/enemy_types/10. Eden Pillar/model/PILLAR EXPORT 1_ENEMY_PILLAR_TEXTURE2.jpg" id="1_1kpl1"] [ext_resource type="Script" uid="uid://2kqcur5c32dr" path="res://src/enemy/enemy_types/10. Eden Pillar/EdenPillarModelView.cs" id="1_qhmtu"] [ext_resource type="Texture2D" uid="uid://bnbveonobhyhc" path="res://src/enemy/enemy_types/10. Eden Pillar/model/PILLAR EXPORT 1_cannon_edge.png" id="2_11eq8"] +[ext_resource type="Resource" uid="uid://bpkwol8b2ddfs" path="res://src/enemy/enemy_types/10. Eden Pillar/EdenPillarLore.tres" id="2_bl4kp"] [ext_resource type="Material" uid="uid://brwu51ylevbmg" path="res://src/enemy/BossHit.tres" id="2_xf2ga"] [ext_resource type="Texture2D" uid="uid://by7k6crx6fmpv" path="res://src/enemy/enemy_types/10. Eden Pillar/model/PILLAR EXPORT 1_floral_single_tile.jpg" id="3_oxjs8"] [ext_resource type="Texture2D" uid="uid://cc1tenm6p3pca" path="res://src/enemy/enemy_types/10. Eden Pillar/model/PILLAR EXPORT 1_ENEMY_PILLAR_TEXTURE.jpg" id="4_xf2ga"] @@ -2970,6 +2971,7 @@ animations = [{ [node name="EdenPillarModelView" type="Node3D"] script = ExtResource("1_qhmtu") +EnemyLoreInfo = ExtResource("2_bl4kp") [node name="EdenPillar" type="Node3D" parent="."] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.21786, 0) diff --git a/Zennysoft.Game.Ma/src/enemy/enemy_types/11. Palan/PalanModelView.tscn b/Zennysoft.Game.Ma/src/enemy/enemy_types/11. Palan/PalanModelView.tscn index a40676c1..8cfa251d 100644 --- a/Zennysoft.Game.Ma/src/enemy/enemy_types/11. Palan/PalanModelView.tscn +++ b/Zennysoft.Game.Ma/src/enemy/enemy_types/11. Palan/PalanModelView.tscn @@ -1,7 +1,8 @@ -[gd_scene load_steps=719 format=3 uid="uid://cuar5bbhxie4r"] +[gd_scene load_steps=720 format=3 uid="uid://cuar5bbhxie4r"] [ext_resource type="Script" uid="uid://cvr1qimxpignl" path="res://src/enemy/EnemyModelView2D.cs" id="1_yke7o"] [ext_resource type="Texture2D" uid="uid://cob5mo4lrbkrp" path="res://src/enemy/enemy_types/11. Palan/animations/B/frame_000_delay-0.01s.png" id="2_lf0wi"] +[ext_resource type="Resource" uid="uid://c42l2h2ripxy0" path="res://src/enemy/enemy_types/11. Palan/PalanLoreInfo.tres" id="2_xmbum"] [ext_resource type="Texture2D" uid="uid://p5tialveauu8" path="res://src/enemy/enemy_types/11. Palan/animations/B/frame_001_delay-0.01s.png" id="3_atdx4"] [ext_resource type="Texture2D" uid="uid://blo7b7jk3o8gd" path="res://src/enemy/enemy_types/11. Palan/animations/F/frame_081_delay-0.01s.png" id="3_p4dda"] [ext_resource type="Texture2D" uid="uid://mt4alhjuv7xd" path="res://src/enemy/enemy_types/11. Palan/animations/L/frame_131_delay-0.01s.png" id="4_3kuim"] @@ -5468,6 +5469,7 @@ _data = { [node name="EnemyModelView" type="Node3D"] script = ExtResource("1_yke7o") +EnemyLoreInfo = ExtResource("2_xmbum") [node name="Sprite3D" type="Sprite3D" parent="."] unique_name_in_owner = true @@ -5612,6 +5614,7 @@ alpha_cut = 3 alpha_antialiasing_mode = 2 texture_filter = 0 sprite_frames = SubResource("SpriteFrames_skutu") +frame = 15 [node name="Primary Attack" type="AnimatedSprite3D" parent="."] transform = Transform3D(0.275, 0, 0, 0, 0.275, 0, 0, 0, 0.275, -0.0490866, 4.80316, -0.317864) diff --git a/Zennysoft.Game.Ma/src/enemy/enemy_types/12. Shield of Heaven/ShieldModelView.tscn b/Zennysoft.Game.Ma/src/enemy/enemy_types/12. Shield of Heaven/ShieldModelView.tscn index 3a8bb557..0867f83b 100644 --- a/Zennysoft.Game.Ma/src/enemy/enemy_types/12. Shield of Heaven/ShieldModelView.tscn +++ b/Zennysoft.Game.Ma/src/enemy/enemy_types/12. Shield of Heaven/ShieldModelView.tscn @@ -1,7 +1,8 @@ -[gd_scene load_steps=979 format=3 uid="uid://bochx2nfql67q"] +[gd_scene load_steps=980 format=3 uid="uid://bochx2nfql67q"] [ext_resource type="Script" uid="uid://cvr1qimxpignl" path="res://src/enemy/EnemyModelView2D.cs" id="1_h8pla"] [ext_resource type="Texture2D" uid="uid://clwj6yknpw74n" path="res://src/enemy/enemy_types/12. Shield of Heaven/animations/New/Idle Back/0001.png" id="2_2eclh"] +[ext_resource type="Resource" uid="uid://budieluyuw1f4" path="res://src/enemy/enemy_types/12. Shield of Heaven/ShieldOfHeavenLoreInfo.tres" id="2_428gt"] [ext_resource type="Texture2D" uid="uid://b03u5wb0a26t6" path="res://src/enemy/enemy_types/12. Shield of Heaven/animations/New/Idle Back/0004.png" id="3_moqrm"] [ext_resource type="Texture2D" uid="uid://dol8sxasgetj0" path="res://src/enemy/enemy_types/12. Shield of Heaven/animations/New/Idle Back/0007.png" id="4_iv5px"] [ext_resource type="Texture2D" uid="uid://c5i3jrceibwb6" path="res://src/enemy/enemy_types/12. Shield of Heaven/animations/New/Idle Back/0010.png" id="5_xpffw"] @@ -6600,6 +6601,7 @@ _data = { [node name="EnemyModelView" type="Node3D"] script = ExtResource("1_h8pla") +EnemyLoreInfo = ExtResource("2_428gt") [node name="Sprite3D" type="Sprite3D" parent="."] unique_name_in_owner = true diff --git a/Zennysoft.Game.Ma/src/enemy/enemy_types/13. gold sproingy/GoldSproingyModelView.tscn b/Zennysoft.Game.Ma/src/enemy/enemy_types/13. gold sproingy/GoldSproingyModelView.tscn index f881eb93..e9a46637 100644 --- a/Zennysoft.Game.Ma/src/enemy/enemy_types/13. gold sproingy/GoldSproingyModelView.tscn +++ b/Zennysoft.Game.Ma/src/enemy/enemy_types/13. gold sproingy/GoldSproingyModelView.tscn @@ -1,7 +1,7 @@ -[gd_scene load_steps=462 format=3 uid="uid://dw7fyurv4vkd5"] +[gd_scene load_steps=461 format=3 uid="uid://dw7fyurv4vkd5"] [ext_resource type="Script" uid="uid://cvr1qimxpignl" path="res://src/enemy/EnemyModelView2D.cs" id="1_7w22e"] -[ext_resource type="Script" uid="uid://dlsgyx4i1jmp3" path="res://src/enemy/EnemyLoreInfo.cs" id="2_ca1o5"] +[ext_resource type="Resource" uid="uid://1xit11jhxrmq" path="res://src/enemy/enemy_types/13. gold sproingy/GoldSproingyLoreInfo.tres" id="2_ofrux"] [ext_resource type="Texture2D" uid="uid://bokmaslnp1a4u" path="res://src/enemy/enemy_types/13. gold sproingy/animations/GOLD_SPROING_FRONT/Layer 1.png" id="3_kfpgw"] [ext_resource type="Texture2D" uid="uid://bi5by5os5u7py" path="res://src/enemy/enemy_types/13. gold sproingy/animations/GOLD_SPROING_BACK/Layer 1.png" id="3_w6gcy"] [ext_resource type="Texture2D" uid="uid://ca5uvl08g0147" path="res://src/enemy/enemy_types/13. gold sproingy/animations/GOLD_SPROING_BACK/Layer 2.png" id="4_2o8qa"] @@ -59,19 +59,6 @@ [ext_resource type="Texture2D" uid="uid://bp6npqoco5fl3" path="res://src/vfx/Enemy Affected/curse_damage.png" id="56_vj77s"] [ext_resource type="AnimationNodeStateMachine" uid="uid://co7lshemjrro8" path="res://src/enemy/animation_state_machines/IdleStateMachine.tres" id="60_uwoec"] -[sub_resource type="Resource" id="Resource_ivy74"] -script = ExtResource("2_ca1o5") -Name = "Sproingy" -Description = "He's smaller than I expected..." -MaximumHP = "" -ATK = "" -DEF = "" -Affinity = "" -Weakness = "" -Drop1 = "" -Drop2 = "" -metadata/_custom_type_script = "uid://dlsgyx4i1jmp3" - [sub_resource type="ViewportTexture" id="ViewportTexture_etb7g"] viewport_path = NodePath("Sprite3D/SubViewportContainer/SubViewport") @@ -3771,7 +3758,7 @@ _data = { [node name="EnemyModelView" type="Node3D"] script = ExtResource("1_7w22e") -EnemyLoreInfo = SubResource("Resource_ivy74") +EnemyLoreInfo = ExtResource("2_ofrux") [node name="Sprite3D" type="Sprite3D" parent="."] unique_name_in_owner = true diff --git a/Zennysoft.Game.Ma/src/enemy/enemy_types/14. horse_head/HorseFaceModelView.tscn b/Zennysoft.Game.Ma/src/enemy/enemy_types/14. horse_head/HorseFaceModelView.tscn index 5c198f9b..c475783c 100644 --- a/Zennysoft.Game.Ma/src/enemy/enemy_types/14. horse_head/HorseFaceModelView.tscn +++ b/Zennysoft.Game.Ma/src/enemy/enemy_types/14. horse_head/HorseFaceModelView.tscn @@ -1,7 +1,8 @@ -[gd_scene load_steps=135 format=4 uid="uid://c00olwjise7iv"] +[gd_scene load_steps=136 format=4 uid="uid://c00olwjise7iv"] [ext_resource type="Script" uid="uid://cycffa0wn7sks" path="res://src/enemy/BossAModelView.cs" id="1_58wyj"] [ext_resource type="Texture2D" uid="uid://csj3kjwyn3s2u" path="res://src/enemy/enemy_types/14. horse_head/animation/HORSE-FACE 1_Metal054C_1K-JPG_Color.jpg" id="2_58wyj"] +[ext_resource type="Resource" uid="uid://b0uti7k0mbe7f" path="res://src/enemy/enemy_types/14. horse_head/HorseFaceLoreInfo.tres" id="2_qhoxi"] [ext_resource type="Animation" uid="uid://bhsp32c05j2o5" path="res://src/enemy/enemy_types/14. horse_head/animation/walking.res" id="2_yvw71"] [ext_resource type="Texture2D" uid="uid://dd7ocxanos2o7" path="res://src/enemy/enemy_types/14. horse_head/animation/HORSE-FACE 1_Metal054C_1K-JPG_Displacement.jpg" id="3_b3lw2"] [ext_resource type="Animation" uid="uid://ccq41qrm1lduk" path="res://src/enemy/enemy_types/14. horse_head/animation/walking2.res" id="3_bkc4x"] @@ -4264,6 +4265,7 @@ _data = { [node name="EnemyModelView" type="Node3D"] transform = Transform3D(0.15, 0, 0, 0, 0.15, 0, 0, 0, 0.15, 0, 0, 0) script = ExtResource("1_58wyj") +EnemyLoreInfo = ExtResource("2_qhoxi") [node name="Armature" type="Node3D" parent="."] unique_name_in_owner = true @@ -4275,7 +4277,7 @@ bones/0/name = "spine1" bones/0/parent = -1 bones/0/rest = Transform3D(1.49012e-06, 0.00846654, -0.999964, 2.93367e-08, 0.999964, 0.00846654, 1, -4.19517e-08, 1.48981e-06, 0.000155807, -0.00105953, -2.01735) bones/0/enabled = true -bones/0/position = Vector3(0.0996386, -0.100203, -1.53144) +bones/0/position = Vector3(0.0996387, -0.374255, -1.53144) bones/0/rotation = Quaternion(0.0256267, -0.805691, 0.0118477, 0.591662) bones/0/scale = Vector3(1, 1, 1) bones/1/name = "spine0" @@ -4304,56 +4306,56 @@ bones/4/parent = 3 bones/4/rest = Transform3D(0.901905, -0.410135, 0.135488, 0.412416, 0.910915, 0.0120912, -0.128377, 0.0449723, 0.990705, 2.5332e-07, 0.990515, -7.07805e-08) bones/4/enabled = true bones/4/position = Vector3(2.5332e-07, 0.990515, -7.07805e-08) -bones/4/rotation = Quaternion(-0.00638545, 0.0590521, 0.183295, 0.981262) +bones/4/rotation = Quaternion(-0.000826614, 0.0622856, 0.193671, 0.979087) bones/4/scale = Vector3(1, 1, 1) bones/5/name = "neck4" bones/5/parent = 4 bones/5/rest = Transform3D(0.999746, -0.0223582, -0.00293604, 0.0225401, 0.994675, 0.10057, 0.000671851, -0.10061, 0.994926, 2.23517e-07, 1.26785, -4.84288e-08) bones/5/enabled = true bones/5/position = Vector3(2.23517e-07, 1.26785, -4.84288e-08) -bones/5/rotation = Quaternion(-0.0503622, -0.000903206, 0.0112395, 0.998667) +bones/5/rotation = Quaternion(-0.0503622, -0.000903181, 0.0112395, 0.998667) bones/5/scale = Vector3(1, 1, 1) bones/6/name = "head1" bones/6/parent = 5 bones/6/rest = Transform3D(0.0598389, 0.98531, 0.15995, -0.975271, 0.0235553, 0.219755, 0.212759, -0.169144, 0.962353, 3.65078e-07, 1.40318, 0) bones/6/enabled = true bones/6/position = Vector3(3.65078e-07, 1.40318, 0) -bones/6/rotation = Quaternion(-0.327135, 0.0505906, -0.45005, 0.829384) +bones/6/rotation = Quaternion(-0.333461, 0.0512011, -0.467663, 0.816991) bones/6/scale = Vector3(1, 1, 1) bones/7/name = "Bone.007" bones/7/parent = 6 bones/7/rest = Transform3D(0.919359, 0.388052, -0.0647639, -0.392726, 0.91499, -0.0925153, 0.0233576, 0.110489, 0.993603, -1.81049e-06, 1.774, 3.31551e-07) bones/7/enabled = true bones/7/position = Vector3(-1.81049e-06, 1.774, 3.31551e-07) -bones/7/rotation = Quaternion(0.0518791, -0.02252, -0.199533, 0.978258) +bones/7/rotation = Quaternion(0.051879, -0.02252, -0.199533, 0.978258) bones/7/scale = Vector3(1, 1, 1) bones/8/name = "TOP OF SKULL" bones/8/parent = 7 bones/8/rest = Transform3D(0.737897, 0.668505, 0.0927902, -0.666136, 0.699281, 0.259362, 0.108498, -0.253193, 0.961312, -1.41654e-06, 1.52173, -1.23307e-06) bones/8/enabled = true bones/8/position = Vector3(-1.41654e-06, 1.52173, -1.23307e-06) -bones/8/rotation = Quaternion(-0.139017, -0.00426043, -0.361986, 0.92175) +bones/8/rotation = Quaternion(-0.139017, -0.00426026, -0.361986, 0.92175) bones/8/scale = Vector3(1, 1, 1) bones/9/name = "Bone.009" bones/9/parent = 6 bones/9/rest = Transform3D(-0.103913, 0.969259, 0.223021, -0.986095, -0.12964, 0.103969, 0.129686, -0.209116, 0.969253, -1.81049e-06, 1.774, 3.31551e-07) bones/9/enabled = true bones/9/position = Vector3(-1.81049e-06, 1.774, 3.31551e-07) -bones/9/rotation = Quaternion(-0.118822, 0.0354225, -0.742093, 0.65873) +bones/9/rotation = Quaternion(-0.118822, 0.0354223, -0.742093, 0.65873) bones/9/scale = Vector3(1, 1, 1) bones/10/name = "Bone.010" bones/10/parent = 9 bones/10/rest = Transform3D(0.73102, -0.682334, -0.00551311, 0.677742, 0.726991, -0.110229, 0.0792208, 0.076843, 0.993891, -2.98023e-07, 2.05216, 2.38419e-07) bones/10/enabled = true bones/10/position = Vector3(-2.98023e-07, 2.05216, 2.38419e-07) -bones/10/rotation = Quaternion(0.0503441, -0.0228033, 0.366019, 0.928965) +bones/10/rotation = Quaternion(0.0503442, -0.0228033, 0.366019, 0.928965) bones/10/scale = Vector3(1, 1, 1) bones/11/name = "arm1_L" bones/11/parent = 1 bones/11/rest = Transform3D(0.981457, 0.0769315, -0.175568, 0.18837, -0.217537, 0.957703, 0.035485, -0.973015, -0.227995, -1.09896e-07, 3.84743, -2.10479e-07) bones/11/enabled = true bones/11/position = Vector3(-1.09896e-07, 3.84743, -2.10479e-07) -bones/11/rotation = Quaternion(-0.814455, -0.0954406, -0.0238501, 0.571826) +bones/11/rotation = Quaternion(-0.811237, -0.0893203, -0.0237107, 0.577368) bones/11/scale = Vector3(1, 1, 1) bones/12/name = "arm2_L" bones/12/parent = 11 @@ -4380,7 +4382,7 @@ bones/15/name = "arm1_R" bones/15/parent = 1 bones/15/rest = Transform3D(-0.98213, 0.0512573, -0.181089, -0.187541, -0.185921, 0.964501, 0.0157695, 0.981227, 0.192212, 0.00107862, 3.8461, -0.0821097) bones/15/enabled = true -bones/15/position = Vector3(-0.168656, 3.38988, 0.124869) +bones/15/position = Vector3(-0.181894, 3.49169, 0.105618) bones/15/rotation = Quaternion(-0.502686, 0.531044, 0.680821, -0.0422068) bones/15/scale = Vector3(1, 1, 1) bones/16/name = "arm2_R" @@ -4395,7 +4397,7 @@ bones/17/parent = 16 bones/17/rest = Transform3D(0.998789, 0.0488077, -0.00615137, -0.0491113, 0.996528, -0.0672226, 0.00284903, 0.0674433, 0.997719, -5.21541e-08, 3.04263, -1.31503e-06) bones/17/enabled = true bones/17/position = Vector3(-5.21541e-08, 3.04263, -1.31503e-06) -bones/17/rotation = Quaternion(-0.0077377, 0.0960272, 0.278179, 0.955686) +bones/17/rotation = Quaternion(-0.0226413, 0.0965646, 0.273058, 0.956871) bones/17/scale = Vector3(1, 1, 1) bones/18/name = "hand_R" bones/18/parent = 17 @@ -4408,7 +4410,7 @@ bones/19/name = "hip_L" bones/19/parent = -1 bones/19/rest = Transform3D(0.138486, 0.897208, 0.419333, -0.129033, -0.403458, 0.905854, 0.981923, -0.179556, 0.0598959, 0.000155807, -0.00105953, -2.01735) bones/19/enabled = true -bones/19/position = Vector3(0.147751, -0.351276, -1.49267) +bones/19/position = Vector3(0.147751, -0.337087, -1.49267) bones/19/rotation = Quaternion(0.427793, 0.34021, 0.687061, -0.478745) bones/19/scale = Vector3(1, 1, 1) bones/20/name = "leg1_L" @@ -4416,21 +4418,21 @@ bones/20/parent = 19 bones/20/rest = Transform3D(0.945603, 0.113405, 0.304916, -0.324072, 0.410457, 0.852351, -0.0284943, -0.9048, 0.424881, 2.08616e-07, 2.00996, -7.1153e-07) bones/20/enabled = true bones/20/position = Vector3(2.08616e-07, 2.00996, -7.1153e-07) -bones/20/rotation = Quaternion(-0.438031, -0.297412, -0.399899, 0.748168) +bones/20/rotation = Quaternion(-0.435019, -0.328721, -0.373626, 0.750403) bones/20/scale = Vector3(1, 1, 1) bones/21/name = "leg2_L" bones/21/parent = 20 bones/21/rest = Transform3D(0.990336, -0.138679, 0.00180777, 0.138628, 0.990193, 0.0173138, -0.00419111, -0.0168959, 0.999848, 5.96046e-08, 5.85994, -5.23403e-07) bones/21/enabled = true bones/21/position = Vector3(5.96046e-08, 5.85994, -5.23403e-07) -bones/21/rotation = Quaternion(-0.0492879, 0.00187756, 0.394257, 0.917676) +bones/21/rotation = Quaternion(-0.0487291, 0.00188154, 0.389787, 0.919613) bones/21/scale = Vector3(1, 1, 1) bones/22/name = "foot1_L" bones/22/parent = 21 bones/22/rest = Transform3D(0.101237, 0.986735, -0.126909, -0.955585, 0.0609562, -0.288344, -0.276783, 0.150463, 0.94908, 4.47035e-08, 7.00093, 2.65427e-08) bones/22/enabled = true bones/22/position = Vector3(4.47035e-08, 7.00093, 2.65427e-08) -bones/22/rotation = Quaternion(0.150998, 0.0515735, -0.668372, 0.726511) +bones/22/rotation = Quaternion(0.150998, 0.0515734, -0.668372, 0.726511) bones/22/scale = Vector3(1, 1, 1) bones/23/name = "foot2_L" bones/23/parent = 22 @@ -4443,21 +4445,21 @@ bones/24/name = "kneeIK_L" bones/24/parent = -1 bones/24/rest = Transform3D(-0.176321, 1.3411e-06, 0.984333, 0.984333, 1.66893e-06, 0.176321, -1.3411e-06, 1, -1.54972e-06, 1.83022, -6.67107, 3.18901) bones/24/enabled = true -bones/24/position = Vector3(1.83022, -6.67107, 3.18901) -bones/24/rotation = Quaternion(0.453784, 0.542292, 0.542291, 0.453784) +bones/24/position = Vector3(2.31525, -7.34861, 2.3999) +bones/24/rotation = Quaternion(0.350356, 0.345508, 0.703917, 0.512226) bones/24/scale = Vector3(1, 1, 1) bones/25/name = "heelIK_L" bones/25/parent = -1 bones/25/rest = Transform3D(-0.16376, -1.60933e-06, 0.9865, -0.9865, 1.19209e-07, -0.16376, 1.78814e-07, -1, -1.54972e-06, 1.91204, -13.5859, -3.56646) bones/25/enabled = true -bones/25/position = Vector3(2.68465, -12.4291, 1.43256) +bones/25/position = Vector3(2.86478, -12.4291, 1.43256) bones/25/rotation = Quaternion(-0.253375, 0.464951, -0.563517, 0.63409) bones/25/scale = Vector3(1, 1, 1) bones/26/name = "hip_R" bones/26/parent = -1 bones/26/rest = Transform3D(0.138486, -0.897208, -0.419333, 0.129033, -0.403458, 0.905854, -0.981923, -0.179556, 0.0598959, -0.000155807, -0.00105953, -2.01735) bones/26/enabled = true -bones/26/position = Vector3(0.0289171, -0.337192, -1.59603) +bones/26/position = Vector3(0.0289172, -0.334682, -1.59603) bones/26/rotation = Quaternion(0.695067, -0.09936, -0.377924, -0.603475) bones/26/scale = Vector3(1, 1, 1) bones/27/name = "leg1_R" @@ -4465,21 +4467,21 @@ bones/27/parent = 26 bones/27/rest = Transform3D(0.945603, -0.113405, -0.304916, 0.324072, 0.410457, 0.852351, 0.0284943, -0.9048, 0.424881, -9.54606e-09, 2.00996, -3.52971e-07) bones/27/enabled = true bones/27/position = Vector3(-9.54606e-09, 2.00996, -3.52971e-07) -bones/27/rotation = Quaternion(-0.306352, 0.192188, 0.173426, 0.916044) +bones/27/rotation = Quaternion(-0.313318, 0.177083, 0.184201, 0.914627) bones/27/scale = Vector3(1, 1, 1) bones/28/name = "leg2_R" bones/28/parent = 27 bones/28/rest = Transform3D(0.990336, 0.138679, -0.00180777, -0.138628, 0.990193, 0.0173138, 0.00419111, -0.0168959, 0.999848, 4.51691e-08, 5.85994, -3.72529e-09) bones/28/enabled = true bones/28/position = Vector3(4.51691e-08, 5.85994, -3.72529e-09) -bones/28/rotation = Quaternion(-0.296585, 0.0199619, -0.193518, 0.934981) +bones/28/rotation = Quaternion(-0.274648, 0.0201647, -0.179204, 0.944483) bones/28/scale = Vector3(1, 1, 1) bones/29/name = "foot1_R" bones/29/parent = 28 bones/29/rest = Transform3D(0.101237, -0.986735, 0.126909, 0.955585, 0.0609562, -0.288344, 0.276783, 0.150463, 0.94908, -1.2666e-07, 7.00093, 4.19095e-09) bones/29/enabled = true bones/29/position = Vector3(-1.2666e-07, 7.00093, 4.19095e-09) -bones/29/rotation = Quaternion(0.150998, -0.0515735, 0.668372, 0.726511) +bones/29/rotation = Quaternion(0.150998, -0.0515734, 0.668372, 0.726511) bones/29/scale = Vector3(1, 1, 1) bones/30/name = "foot2_R" bones/30/parent = 29 @@ -4499,7 +4501,7 @@ bones/32/name = "heelIK_R" bones/32/parent = -1 bones/32/rest = Transform3D(-0.16376, 1.60933e-06, -0.9865, 0.9865, 1.19209e-07, -0.16376, -1.78814e-07, -1, -1.54972e-06, -1.91204, -13.5859, -3.56646) bones/32/enabled = true -bones/32/position = Vector3(-3.64758, -12.3224, -5.7547) +bones/32/position = Vector3(-3.87024, -12.3974, -5.7547) bones/32/rotation = Quaternion(0.514417, 0.701671, -0.342235, -0.354835) bones/32/scale = Vector3(1, 1, 1) @@ -4509,12 +4511,12 @@ mesh = SubResource("ArrayMesh_jpm24") skin = SubResource("Skin_uxw16") [node name="BoneAttachment3D" type="BoneAttachment3D" parent="Armature/Skeleton3D"] -transform = Transform3D(-0.370165, -0.13327, -0.919357, -0.304221, -0.917693, 0.255518, -0.87774, 0.374272, 0.299154, -2.00357, 9.05467, 6.3324) +transform = Transform3D(-0.370164, -0.133271, -0.919357, -0.28651, -0.925033, 0.249452, -0.88368, 0.355743, 0.304231, -2.00357, 8.74627, 6.25917) bone_name = "TOP OF SKULL" bone_idx = 8 [node name="BoneAttachment3D2" type="BoneAttachment3D" parent="Armature/Skeleton3D"] -transform = Transform3D(0.960238, 0.142739, 0.239935, -0.242198, -0.00155824, 0.970226, 0.138862, -0.989759, 0.033075, -2.41575, 1.93321, -9.13936) +transform = Transform3D(0.960238, 0.142738, 0.239935, -0.237687, -0.0328539, 0.970786, 0.146451, -0.989215, 0.0023796, -2.41575, 1.65342, -9.04586) bone_name = "hand_R" bone_idx = 18 diff --git a/Zennysoft.Game.Ma/src/enemy/enemy_types/15. ox_face/OxFaceModelView.tscn b/Zennysoft.Game.Ma/src/enemy/enemy_types/15. ox_face/OxFaceModelView.tscn index 8235289b..5333fda3 100644 --- a/Zennysoft.Game.Ma/src/enemy/enemy_types/15. ox_face/OxFaceModelView.tscn +++ b/Zennysoft.Game.Ma/src/enemy/enemy_types/15. ox_face/OxFaceModelView.tscn @@ -1,8 +1,9 @@ -[gd_scene load_steps=131 format=4 uid="uid://bbvw38l6407s2"] +[gd_scene load_steps=132 format=4 uid="uid://bbvw38l6407s2"] [ext_resource type="Script" uid="uid://cycffa0wn7sks" path="res://src/enemy/BossAModelView.cs" id="1_1ch7e"] [ext_resource type="Script" uid="uid://ckv5dmrw6pvn6" path="res://src/enemy/EnemyModelView3D.cs" id="1_6miqu"] [ext_resource type="Texture2D" uid="uid://dp6hwvuhfkji8" path="res://src/enemy/enemy_types/15. ox_face/models/OX FACE_Metal054C_1K-JPG_Color.jpg" id="1_lsf8e"] +[ext_resource type="Resource" uid="uid://mqchkidi2b76" path="res://src/enemy/enemy_types/15. ox_face/OxHeadLoreInfo.tres" id="2_v4mpe"] [ext_resource type="AnimationLibrary" uid="uid://dn4501qsypsu" path="res://src/enemy/enemy_types/14. horse_head/animation/OxFaceAnimations.tres" id="3_pmgg3"] [ext_resource type="Texture2D" uid="uid://d3nsmrs41cpxs" path="res://src/enemy/enemy_types/14. horse_head/animation/Metal054C_1K-JPG_Metalness.jpg" id="4_q73y1"] [ext_resource type="Texture2D" uid="uid://dhk7u4r608cby" path="res://src/enemy/enemy_types/14. horse_head/animation/Metal054C_1K-JPG_NormalGL.jpg" id="5_desgq"] @@ -2709,6 +2710,7 @@ _data = { [node name="EnemyModelView" type="Node3D"] transform = Transform3D(0.15, 0, 0, 0, 0.15, 0, 0, 0, 0.15, 0, 0, 0) script = ExtResource("1_1ch7e") +EnemyLoreInfo = ExtResource("2_v4mpe") [node name="Armature" type="Node3D" parent="."] unique_name_in_owner = true @@ -2720,7 +2722,7 @@ bones/0/name = "spine1" bones/0/parent = -1 bones/0/rest = Transform3D(1.49012e-06, 0.00846654, -0.999964, 2.93367e-08, 0.999964, 0.00846654, 1, -4.23752e-08, 1.49012e-06, 0.000155807, -0.00105953, -2.01735) bones/0/enabled = true -bones/0/position = Vector3(-0.25956, -0.972131, -1.97321) +bones/0/position = Vector3(-0.259643, -0.981545, -1.97257) bones/0/rotation = Quaternion(0.0915277, -0.692111, -0.0341586, 0.715149) bones/0/scale = Vector3(1, 1, 1) bones/1/name = "spine0" @@ -2763,7 +2765,7 @@ bones/6/parent = 5 bones/6/rest = Transform3D(0.0598389, 0.98531, 0.15995, -0.975271, 0.0235553, 0.219755, 0.212759, -0.169144, 0.962353, 3.65078e-07, 1.40318, 0) bones/6/enabled = true bones/6/position = Vector3(3.65078e-07, 1.40318, 0) -bones/6/rotation = Quaternion(-0.0670708, -0.301368, -0.744668, 0.591733) +bones/6/rotation = Quaternion(-0.0698748, -0.302384, -0.744714, 0.590832) bones/6/scale = Vector3(1, 1, 1) bones/7/name = "Bone.007" bones/7/parent = 6 @@ -2798,7 +2800,7 @@ bones/11/parent = 1 bones/11/rest = Transform3D(0.981457, 0.0769315, -0.175568, 0.18837, -0.217537, 0.957703, 0.035485, -0.973015, -0.227995, -1.09896e-07, 3.84743, -2.10479e-07) bones/11/enabled = true bones/11/position = Vector3(-1.09896e-07, 3.84743, -2.10479e-07) -bones/11/rotation = Quaternion(-0.784228, -0.0612103, 0.0728381, 0.613135) +bones/11/rotation = Quaternion(-0.783695, -0.0607398, 0.0739122, 0.613734) bones/11/scale = Vector3(1, 0.999999, 1) bones/12/name = "arm2_L" bones/12/parent = 11 @@ -2826,7 +2828,7 @@ bones/15/parent = 1 bones/15/rest = Transform3D(-0.98213, 0.0512573, -0.181089, -0.187541, -0.185921, 0.964501, 0.0157694, 0.981227, 0.192212, 0.00107862, 3.8461, -0.0821097) bones/15/enabled = true bones/15/position = Vector3(0.00107886, 3.8461, -0.0821095) -bones/15/rotation = Quaternion(-0.211126, 0.738589, 0.620876, -0.156287) +bones/15/rotation = Quaternion(-0.211641, 0.739395, 0.620014, -0.155199) bones/15/scale = Vector3(1, 1, 1) bones/16/name = "arm2_R" bones/16/parent = 15 @@ -2853,22 +2855,22 @@ bones/19/name = "hip_L" bones/19/parent = -1 bones/19/rest = Transform3D(0.138486, 0.897208, 0.419333, -0.129033, -0.403458, 0.905854, 0.981923, -0.179556, 0.059896, 0.000155807, -0.00105953, -2.01735) bones/19/enabled = true -bones/19/position = Vector3(-0.315718, -1.13813, -1.93315) -bones/19/rotation = Quaternion(0.614186, 0.3092, 0.567121, -0.453371) +bones/19/position = Vector3(-0.3233, -1.1453, -1.90817) +bones/19/rotation = Quaternion(0.615791, 0.307319, 0.564608, -0.455603) bones/19/scale = Vector3(1, 1, 1) bones/20/name = "leg1_L" bones/20/parent = 19 bones/20/rest = Transform3D(0.945603, 0.113405, 0.304916, -0.324072, 0.410457, 0.852351, -0.0284943, -0.9048, 0.424881, 2.08616e-07, 2.00996, -7.1153e-07) bones/20/enabled = true bones/20/position = Vector3(2.08616e-07, 2.00996, -7.1153e-07) -bones/20/rotation = Quaternion(-0.313706, -0.438448, -0.277302, 0.795271) +bones/20/rotation = Quaternion(-0.31537, -0.43664, -0.280042, 0.794647) bones/20/scale = Vector3(1, 0.999999, 1) bones/21/name = "leg2_L" bones/21/parent = 20 bones/21/rest = Transform3D(0.990336, -0.138679, 0.00180777, 0.138628, 0.990193, 0.0173138, -0.00419111, -0.0168959, 0.999848, 5.96046e-08, 5.85994, -5.23403e-07) bones/21/enabled = true bones/21/position = Vector3(5.96046e-08, 5.85994, -5.23403e-07) -bones/21/rotation = Quaternion(-0.0602155, 0.00130028, 0.487448, 0.871073) +bones/21/rotation = Quaternion(-0.0602604, 0.00129998, 0.48781, 0.870867) bones/21/scale = Vector3(1, 1, 1) bones/22/name = "foot1_L" bones/22/parent = 21 @@ -2902,7 +2904,7 @@ bones/26/name = "hip_R" bones/26/parent = -1 bones/26/rest = Transform3D(0.138486, -0.897208, -0.419333, 0.129033, -0.403458, 0.905854, -0.981923, -0.179556, 0.059896, -0.000155807, -0.00105953, -2.01735) bones/26/enabled = true -bones/26/position = Vector3(-0.215361, -1.11395, -2.01786) +bones/26/position = Vector3(-0.193075, -1.11395, -2.01801) bones/26/rotation = Quaternion(0.608697, -0.3155, -0.575514, -0.445793) bones/26/scale = Vector3(1, 1, 1) bones/27/name = "leg1_R" @@ -2910,14 +2912,14 @@ bones/27/parent = 26 bones/27/rest = Transform3D(0.945603, -0.113405, -0.304916, 0.324072, 0.410457, 0.852351, 0.0284943, -0.9048, 0.424881, -9.54606e-09, 2.00996, -3.52971e-07) bones/27/enabled = true bones/27/position = Vector3(-9.54606e-09, 2.00996, -3.52971e-07) -bones/27/rotation = Quaternion(-0.20711, 0.421979, 0.141477, 0.87122) +bones/27/rotation = Quaternion(-0.20647, 0.422332, 0.141035, 0.871272) bones/27/scale = Vector3(1, 0.999999, 1) bones/28/name = "leg2_R" bones/28/parent = 27 bones/28/rest = Transform3D(0.990336, 0.138679, -0.00180777, -0.138628, 0.990193, 0.0173138, 0.00419111, -0.0168959, 0.999848, 4.51691e-08, 5.85994, -3.72529e-09) bones/28/enabled = true bones/28/position = Vector3(4.51691e-08, 5.85994, -3.72529e-09) -bones/28/rotation = Quaternion(-0.0639214, -0.00115716, -0.510343, 0.857591) +bones/28/rotation = Quaternion(-0.0637837, -0.00115799, -0.509244, 0.858255) bones/28/scale = Vector3(1, 1, 1) bones/29/name = "foot1_R" bones/29/parent = 28 @@ -2949,7 +2951,7 @@ bones/32/rotation = Quaternion(0.456756, 0.539878, -0.539587, -0.456893) bones/32/scale = Vector3(1, 1, 1) [node name="BoneAttachment3D" type="BoneAttachment3D" parent="Armature/Skeleton3D"] -transform = Transform3D(-0.288712, -0.0710311, -0.954777, -0.330345, -0.928611, 0.168976, -0.898619, 0.364192, 0.244636, -1.66929, 8.29074, 4.94933) +transform = Transform3D(-0.291917, -0.0760362, -0.953417, -0.32978, -0.927704, 0.174957, -0.897791, 0.365491, 0.245737, -1.66655, 8.28257, 4.94964) bone_name = "TOP OF SKULL" bone_idx = 8 @@ -2972,7 +2974,7 @@ mesh = SubResource("ArrayMesh_5ew54") skin = SubResource("Skin_e330f") [node name="BoneAttachment3D2" type="BoneAttachment3D" parent="Armature/Skeleton3D"] -transform = Transform3D(-0.0452009, 0.0230325, -0.998712, -0.0858095, -0.996127, -0.0190896, -0.995284, 0.084837, 0.0470018, -6.18808, -1.29869, -0.147832) +transform = Transform3D(-0.0455078, 0.0197204, -0.998768, -0.0851141, -0.996245, -0.0157928, -0.99533, 0.0842914, 0.0470149, -6.20411, -1.28929, -0.149691) bone_name = "hand_R" bone_idx = 18 diff --git a/Zennysoft.Game.Ma/src/enemy/enemy_types/16. demon wall/DemonWallModelView.tscn b/Zennysoft.Game.Ma/src/enemy/enemy_types/16. demon wall/DemonWallModelView.tscn index 001d14e2..6358bf89 100644 --- a/Zennysoft.Game.Ma/src/enemy/enemy_types/16. demon wall/DemonWallModelView.tscn +++ b/Zennysoft.Game.Ma/src/enemy/enemy_types/16. demon wall/DemonWallModelView.tscn @@ -1,7 +1,8 @@ -[gd_scene load_steps=52 format=4 uid="uid://b3oupv6tkt4ad"] +[gd_scene load_steps=53 format=4 uid="uid://b3oupv6tkt4ad"] [ext_resource type="PackedScene" uid="uid://b14iooyw6v7e0" path="res://src/enemy/enemy_types/16. demon wall/Arm1.tscn" id="1_ell80"] [ext_resource type="Script" uid="uid://d3cvsxlaohuqy" path="res://src/enemy/enemy_types/16. demon wall/DemonWallModelView.cs" id="1_r5yku"] +[ext_resource type="Resource" uid="uid://dc5bilybvn5nm" path="res://src/enemy/enemy_types/16. demon wall/DemonWallLoreInfo.tres" id="2_eg220"] [ext_resource type="PackedScene" uid="uid://cv4ja1vgoxb11" path="res://src/enemy/enemy_types/16. demon wall/Arm2.tscn" id="2_kblru"] [ext_resource type="Script" uid="uid://ctshiyffvt4y5" path="res://src/system/AttackDataResource.cs" id="3_5lwwe"] [ext_resource type="PackedScene" uid="uid://bphie5voqk8aq" path="res://src/enemy/enemy_types/16. demon wall/Arm3.tscn" id="3_nqxqr"] @@ -387,6 +388,7 @@ size = Vector3(28.2825, 12.6552, 4.15076) [node name="EnemyModelView" type="Node3D"] script = ExtResource("1_r5yku") +EnemyLoreInfo = ExtResource("2_eg220") [node name="LeftArms" type="Node3D" parent="."] unique_name_in_owner = true diff --git a/Zennysoft.Game.Ma/src/game/Game.cs b/Zennysoft.Game.Ma/src/game/Game.cs index e7ab3d08..1891d43e 100644 --- a/Zennysoft.Game.Ma/src/game/Game.cs +++ b/Zennysoft.Game.Ma/src/game/Game.cs @@ -129,12 +129,12 @@ public partial class Game : Node3D, IGame ShuraSarcoAcquired = SarcoData.ShuraSarcoAcquired, }, NpcData = new NpcData() - { + { SteleDiscovered = NpcData.SteleDiscovered }, StatData = new StatData() { - SproingyDefeated = StatData.SproingyDefeated + EnemiesDefeated = StatData.EnemiesDefeated } }; return gameData;