From 7ab5e32c74f018c360008b0edf94b0871687570e Mon Sep 17 00:00:00 2001 From: Zenny Date: Wed, 30 Apr 2025 21:46:08 -0700 Subject: [PATCH] Minor fixes --- .../src/enemy/BasicEnemyAnimationTree.tscn | 60 +--- Zennysoft.Game.Ma/src/enemy/Enemy.cs | 1 + .../src/enemy/EnemyModelView2D.cs | 1 - .../enemy_types/01. sproingy/Sproingy.cs | 6 +- .../01. sproingy/SproingyModelView.tscn | 324 +++++++++++++++++- Zennysoft.Game.Ma/src/player/Player.cs | 1 + Zennysoft.Game.Ma/src/player/Player.tscn | 4 +- .../src/ui/in_game_ui/UseTeleportPrompt.cs | 8 + .../src/ui/pause_menu/PauseDebugMenu.cs | 2 + 9 files changed, 344 insertions(+), 63 deletions(-) diff --git a/Zennysoft.Game.Ma/src/enemy/BasicEnemyAnimationTree.tscn b/Zennysoft.Game.Ma/src/enemy/BasicEnemyAnimationTree.tscn index 7bb49410..bcdc16a5 100644 --- a/Zennysoft.Game.Ma/src/enemy/BasicEnemyAnimationTree.tscn +++ b/Zennysoft.Game.Ma/src/enemy/BasicEnemyAnimationTree.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=119 format=3 uid="uid://dpoonda2dwwic"] +[gd_scene load_steps=95 format=3 uid="uid://dpoonda2dwwic"] [sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_53wuj"] animation = &"idle_back" @@ -56,10 +56,6 @@ switch_mode = 1 [sub_resource type="AnimationNodeStateMachineTransition" id="AnimationNodeStateMachineTransition_4t05h"] -[sub_resource type="AnimationNodeStateMachineTransition" id="AnimationNodeStateMachineTransition_bmy1k"] - -[sub_resource type="AnimationNodeStateMachineTransition" id="AnimationNodeStateMachineTransition_mxl7w"] - [sub_resource type="AnimationNodeStateMachineTransition" id="AnimationNodeStateMachineTransition_qq0ru"] advance_mode = 2 @@ -134,16 +130,12 @@ switch_mode = 1 [sub_resource type="AnimationNodeStateMachineTransition" id="AnimationNodeStateMachineTransition_mjxlk"] switch_mode = 1 -[sub_resource type="AnimationNodeStateMachineTransition" id="AnimationNodeStateMachineTransition_al2xs"] - [sub_resource type="AnimationNodeStateMachineTransition" id="AnimationNodeStateMachineTransition_irq32"] [sub_resource type="AnimationNodeStateMachineTransition" id="AnimationNodeStateMachineTransition_2khaq"] switch_mode = 2 advance_mode = 2 -[sub_resource type="AnimationNodeStateMachineTransition" id="AnimationNodeStateMachineTransition_k7x0x"] - [sub_resource type="AnimationNodeStateMachineTransition" id="AnimationNodeStateMachineTransition_ivy74"] switch_mode = 1 @@ -180,8 +172,6 @@ switch_mode = 1 [sub_resource type="AnimationNodeStateMachineTransition" id="AnimationNodeStateMachineTransition_dfvqa"] switch_mode = 1 -[sub_resource type="AnimationNodeStateMachineTransition" id="AnimationNodeStateMachineTransition_dnvt3"] - [sub_resource type="AnimationNodeStateMachineTransition" id="AnimationNodeStateMachineTransition_at0w8"] switch_mode = 1 @@ -224,8 +214,6 @@ switch_mode = 1 [sub_resource type="AnimationNodeStateMachineTransition" id="AnimationNodeStateMachineTransition_1cx5a"] switch_mode = 1 -[sub_resource type="AnimationNodeStateMachineTransition" id="AnimationNodeStateMachineTransition_fn67p"] - [sub_resource type="AnimationNodeStateMachineTransition" id="AnimationNodeStateMachineTransition_yu2km"] reset = false switch_mode = 1 @@ -286,52 +274,16 @@ advance_mode = 2 switch_mode = 2 advance_mode = 2 -[sub_resource type="AnimationNodeStateMachineTransition" id="AnimationNodeStateMachineTransition_ach2p"] - -[sub_resource type="AnimationNodeStateMachineTransition" id="AnimationNodeStateMachineTransition_8cyro"] - -[sub_resource type="AnimationNodeStateMachineTransition" id="AnimationNodeStateMachineTransition_4fl8s"] - [sub_resource type="AnimationNodeStateMachineTransition" id="AnimationNodeStateMachineTransition_ykv10"] -[sub_resource type="AnimationNodeStateMachineTransition" id="AnimationNodeStateMachineTransition_hbwwn"] - -[sub_resource type="AnimationNodeStateMachineTransition" id="AnimationNodeStateMachineTransition_gcl0k"] - [sub_resource type="AnimationNodeStateMachineTransition" id="AnimationNodeStateMachineTransition_o3f25"] -[sub_resource type="AnimationNodeStateMachineTransition" id="AnimationNodeStateMachineTransition_r7yhf"] - [sub_resource type="AnimationNodeStateMachineTransition" id="AnimationNodeStateMachineTransition_516bs"] -[sub_resource type="AnimationNodeStateMachineTransition" id="AnimationNodeStateMachineTransition_wiojf"] - -[sub_resource type="AnimationNodeStateMachineTransition" id="AnimationNodeStateMachineTransition_fgvwe"] - -[sub_resource type="AnimationNodeStateMachineTransition" id="AnimationNodeStateMachineTransition_1lijp"] - -[sub_resource type="AnimationNodeStateMachineTransition" id="AnimationNodeStateMachineTransition_3pd83"] - [sub_resource type="AnimationNodeStateMachineTransition" id="AnimationNodeStateMachineTransition_wyiwg"] -[sub_resource type="AnimationNodeStateMachineTransition" id="AnimationNodeStateMachineTransition_l1dx6"] - -[sub_resource type="AnimationNodeStateMachineTransition" id="AnimationNodeStateMachineTransition_57oo3"] - -[sub_resource type="AnimationNodeStateMachineTransition" id="AnimationNodeStateMachineTransition_tpmfr"] - -[sub_resource type="AnimationNodeStateMachineTransition" id="AnimationNodeStateMachineTransition_8hjrx"] - [sub_resource type="AnimationNodeStateMachineTransition" id="AnimationNodeStateMachineTransition_ouq20"] -[sub_resource type="AnimationNodeStateMachineTransition" id="AnimationNodeStateMachineTransition_1a3du"] - -[sub_resource type="AnimationNodeStateMachineTransition" id="AnimationNodeStateMachineTransition_ymlkb"] - -[sub_resource type="AnimationNodeStateMachineTransition" id="AnimationNodeStateMachineTransition_7u4wg"] - -[sub_resource type="AnimationNodeStateMachineTransition" id="AnimationNodeStateMachineTransition_oatu2"] - [sub_resource type="AnimationNodeStateMachineTransition" id="AnimationNodeStateMachineTransition_ynkt4"] [sub_resource type="AnimationNodeStateMachine" id="AnimationNodeStateMachine_d5bmw"] @@ -354,15 +306,15 @@ states/idle_right/position = Vector2(190.295, 24) states/idle_right_walk/node = SubResource("AnimationNodeAnimation_ivy74") states/idle_right_walk/position = Vector2(772, 55.9474) states/primary_attack/node = SubResource("AnimationNodeAnimation_erbrx") -states/primary_attack/position = Vector2(382, 334.749) +states/primary_attack/position = Vector2(410, 308.749) states/primary_attack_back/node = SubResource("AnimationNodeAnimation_x7uye") -states/primary_attack_back/position = Vector2(648.525, 453.749) +states/primary_attack_back/position = Vector2(665.525, 479.749) states/primary_attack_left/node = SubResource("AnimationNodeAnimation_djeua") states/primary_attack_left/position = Vector2(648.525, 319) states/primary_attack_right/node = SubResource("AnimationNodeAnimation_8wbs7") -states/primary_attack_right/position = Vector2(362, 470.749) -transitions = ["idle_front_walk", "idle_left_walk", SubResource("AnimationNodeStateMachineTransition_3xv6a"), "idle_left_walk", "idle_front_walk", SubResource("AnimationNodeStateMachineTransition_0h1op"), "idle_front_walk", "idle_back_walk", SubResource("AnimationNodeStateMachineTransition_361b7"), "idle_back_walk", "idle_front_walk", SubResource("AnimationNodeStateMachineTransition_wftla"), "idle_back_walk", "idle_left_walk", SubResource("AnimationNodeStateMachineTransition_gqqkl"), "idle_left_walk", "idle_back_walk", SubResource("AnimationNodeStateMachineTransition_5cj36"), "idle_front_walk", "primary_attack", SubResource("AnimationNodeStateMachineTransition_4t05h"), "idle_back_walk", "primary_attack", SubResource("AnimationNodeStateMachineTransition_bmy1k"), "idle_left_walk", "primary_attack", SubResource("AnimationNodeStateMachineTransition_mxl7w"), "Start", "idle_front", SubResource("AnimationNodeStateMachineTransition_qq0ru"), "idle_front", "idle_back", SubResource("AnimationNodeStateMachineTransition_c54uj"), "idle_back", "idle_left", SubResource("AnimationNodeStateMachineTransition_qmo72"), "idle_left", "idle_front", SubResource("AnimationNodeStateMachineTransition_jyt1n"), "idle_left", "idle_back", SubResource("AnimationNodeStateMachineTransition_5un2v"), "idle_back", "idle_front", SubResource("AnimationNodeStateMachineTransition_2x3nl"), "idle_front", "idle_left", SubResource("AnimationNodeStateMachineTransition_6a5nw"), "idle_back", "idle_front_walk", SubResource("AnimationNodeStateMachineTransition_0jqty"), "idle_front", "idle_back_walk", SubResource("AnimationNodeStateMachineTransition_yjcrh"), "idle_back", "idle_back_walk", SubResource("AnimationNodeStateMachineTransition_2ybyh"), "idle_left", "idle_back_walk", SubResource("AnimationNodeStateMachineTransition_n454k"), "idle_back_walk", "idle_left", SubResource("AnimationNodeStateMachineTransition_vrcjv"), "idle_back_walk", "idle_front", SubResource("AnimationNodeStateMachineTransition_h1yxw"), "idle_back_walk", "idle_back", SubResource("AnimationNodeStateMachineTransition_kg6hd"), "idle_back", "idle_left_walk", SubResource("AnimationNodeStateMachineTransition_25i3y"), "idle_left", "idle_left_walk", SubResource("AnimationNodeStateMachineTransition_5g722"), "idle_front", "idle_left_walk", SubResource("AnimationNodeStateMachineTransition_a6y4x"), "idle_left_walk", "idle_front", SubResource("AnimationNodeStateMachineTransition_7y7m4"), "idle_left_walk", "idle_left", SubResource("AnimationNodeStateMachineTransition_ldcvv"), "idle_left_walk", "idle_back", SubResource("AnimationNodeStateMachineTransition_aalmk"), "idle_front_walk", "idle_back", SubResource("AnimationNodeStateMachineTransition_2le5t"), "idle_front_walk", "idle_front", SubResource("AnimationNodeStateMachineTransition_4nmgu"), "idle_front_walk", "idle_left", SubResource("AnimationNodeStateMachineTransition_mw5r6"), "idle_front", "idle_front_walk", SubResource("AnimationNodeStateMachineTransition_jbtxi"), "idle_left", "idle_front_walk", SubResource("AnimationNodeStateMachineTransition_mjxlk"), "idle_back", "primary_attack", SubResource("AnimationNodeStateMachineTransition_al2xs"), "idle_front", "primary_attack", SubResource("AnimationNodeStateMachineTransition_irq32"), "primary_attack", "idle_front", SubResource("AnimationNodeStateMachineTransition_2khaq"), "idle_left", "primary_attack", SubResource("AnimationNodeStateMachineTransition_k7x0x"), "idle_right", "idle_front", SubResource("AnimationNodeStateMachineTransition_ivy74"), "idle_front", "idle_right", SubResource("AnimationNodeStateMachineTransition_x7uye"), "idle_right", "idle_left", SubResource("AnimationNodeStateMachineTransition_djeua"), "idle_left", "idle_right", SubResource("AnimationNodeStateMachineTransition_8wbs7"), "idle_right", "idle_back", SubResource("AnimationNodeStateMachineTransition_mnr4r"), "idle_back", "idle_right", SubResource("AnimationNodeStateMachineTransition_l2wq1"), "idle_right", "idle_left_walk", SubResource("AnimationNodeStateMachineTransition_7hf3j"), "idle_right", "idle_front_walk", SubResource("AnimationNodeStateMachineTransition_jwlar"), "idle_right", "idle_back_walk", SubResource("AnimationNodeStateMachineTransition_fdoul"), "idle_front_walk", "idle_right", SubResource("AnimationNodeStateMachineTransition_kpotx"), "idle_back_walk", "idle_right", SubResource("AnimationNodeStateMachineTransition_lfuuf"), "idle_left_walk", "idle_right", SubResource("AnimationNodeStateMachineTransition_dfvqa"), "idle_right", "primary_attack", SubResource("AnimationNodeStateMachineTransition_dnvt3"), "idle_front_walk", "idle_right_walk", SubResource("AnimationNodeStateMachineTransition_at0w8"), "idle_right_walk", "idle_front_walk", SubResource("AnimationNodeStateMachineTransition_afod7"), "idle_right_walk", "idle_left_walk", SubResource("AnimationNodeStateMachineTransition_dwhw7"), "idle_left_walk", "idle_right_walk", SubResource("AnimationNodeStateMachineTransition_qjloj"), "idle_right_walk", "idle_back_walk", SubResource("AnimationNodeStateMachineTransition_7uqwg"), "idle_back_walk", "idle_right_walk", SubResource("AnimationNodeStateMachineTransition_k4jom"), "idle_right_walk", "idle_left", SubResource("AnimationNodeStateMachineTransition_ku0f8"), "idle_left", "idle_right_walk", SubResource("AnimationNodeStateMachineTransition_fwynu"), "idle_right_walk", "idle_back", SubResource("AnimationNodeStateMachineTransition_t7vd7"), "idle_back", "idle_right_walk", SubResource("AnimationNodeStateMachineTransition_tv4ou"), "idle_right_walk", "idle_front", SubResource("AnimationNodeStateMachineTransition_0b3yx"), "idle_front", "idle_right_walk", SubResource("AnimationNodeStateMachineTransition_ysi80"), "idle_right_walk", "idle_right", SubResource("AnimationNodeStateMachineTransition_ktp1h"), "idle_right", "idle_right_walk", SubResource("AnimationNodeStateMachineTransition_1cx5a"), "idle_right_walk", "primary_attack", SubResource("AnimationNodeStateMachineTransition_fn67p"), "primary_attack", "primary_attack_left", SubResource("AnimationNodeStateMachineTransition_yu2km"), "primary_attack_left", "primary_attack", SubResource("AnimationNodeStateMachineTransition_6qb08"), "primary_attack", "primary_attack_back", SubResource("AnimationNodeStateMachineTransition_5ap7h"), "primary_attack_back", "primary_attack", SubResource("AnimationNodeStateMachineTransition_dde6r"), "primary_attack_right", "primary_attack_back", SubResource("AnimationNodeStateMachineTransition_5a80x"), "primary_attack_back", "primary_attack_right", SubResource("AnimationNodeStateMachineTransition_cwnal"), "primary_attack_right", "primary_attack", SubResource("AnimationNodeStateMachineTransition_ik0ko"), "primary_attack", "primary_attack_right", SubResource("AnimationNodeStateMachineTransition_7h3pp"), "primary_attack_right", "primary_attack_left", SubResource("AnimationNodeStateMachineTransition_te4ac"), "primary_attack_left", "primary_attack_right", SubResource("AnimationNodeStateMachineTransition_skhgh"), "primary_attack_left", "primary_attack_back", SubResource("AnimationNodeStateMachineTransition_j8po0"), "primary_attack_back", "primary_attack_left", SubResource("AnimationNodeStateMachineTransition_cvb6o"), "primary_attack_left", "idle_left", SubResource("AnimationNodeStateMachineTransition_qrpvt"), "primary_attack_right", "idle_right", SubResource("AnimationNodeStateMachineTransition_obci0"), "primary_attack_back", "idle_back", SubResource("AnimationNodeStateMachineTransition_cuv27"), "idle_front", "primary_attack_left", SubResource("AnimationNodeStateMachineTransition_ach2p"), "idle_right", "primary_attack_left", SubResource("AnimationNodeStateMachineTransition_8cyro"), "idle_back", "primary_attack_left", SubResource("AnimationNodeStateMachineTransition_4fl8s"), "idle_left", "primary_attack_left", SubResource("AnimationNodeStateMachineTransition_ykv10"), "idle_front_walk", "primary_attack_left", SubResource("AnimationNodeStateMachineTransition_hbwwn"), "idle_right_walk", "primary_attack_left", SubResource("AnimationNodeStateMachineTransition_gcl0k"), "idle_left_walk", "primary_attack_left", SubResource("AnimationNodeStateMachineTransition_o3f25"), "idle_back_walk", "primary_attack_left", SubResource("AnimationNodeStateMachineTransition_r7yhf"), "idle_right", "primary_attack_right", SubResource("AnimationNodeStateMachineTransition_516bs"), "idle_front", "primary_attack_right", SubResource("AnimationNodeStateMachineTransition_wiojf"), "idle_left", "primary_attack_right", SubResource("AnimationNodeStateMachineTransition_fgvwe"), "idle_back", "primary_attack_right", SubResource("AnimationNodeStateMachineTransition_1lijp"), "idle_front_walk", "primary_attack_right", SubResource("AnimationNodeStateMachineTransition_3pd83"), "idle_right_walk", "primary_attack_right", SubResource("AnimationNodeStateMachineTransition_wyiwg"), "idle_back_walk", "primary_attack_right", SubResource("AnimationNodeStateMachineTransition_l1dx6"), "idle_left_walk", "primary_attack_right", SubResource("AnimationNodeStateMachineTransition_57oo3"), "idle_right", "primary_attack_back", SubResource("AnimationNodeStateMachineTransition_tpmfr"), "idle_front", "primary_attack_back", SubResource("AnimationNodeStateMachineTransition_8hjrx"), "idle_back", "primary_attack_back", SubResource("AnimationNodeStateMachineTransition_ouq20"), "idle_left", "primary_attack_back", SubResource("AnimationNodeStateMachineTransition_1a3du"), "idle_front_walk", "primary_attack_back", SubResource("AnimationNodeStateMachineTransition_ymlkb"), "idle_right_walk", "primary_attack_back", SubResource("AnimationNodeStateMachineTransition_7u4wg"), "idle_left_walk", "primary_attack_back", SubResource("AnimationNodeStateMachineTransition_oatu2"), "idle_back_walk", "primary_attack_back", SubResource("AnimationNodeStateMachineTransition_ynkt4")] -graph_offset = Vector2(-591.636, -345.167) +states/primary_attack_right/position = Vector2(382, 479.749) +transitions = ["idle_front_walk", "idle_left_walk", SubResource("AnimationNodeStateMachineTransition_3xv6a"), "idle_left_walk", "idle_front_walk", SubResource("AnimationNodeStateMachineTransition_0h1op"), "idle_front_walk", "idle_back_walk", SubResource("AnimationNodeStateMachineTransition_361b7"), "idle_back_walk", "idle_front_walk", SubResource("AnimationNodeStateMachineTransition_wftla"), "idle_back_walk", "idle_left_walk", SubResource("AnimationNodeStateMachineTransition_gqqkl"), "idle_left_walk", "idle_back_walk", SubResource("AnimationNodeStateMachineTransition_5cj36"), "idle_front_walk", "primary_attack", SubResource("AnimationNodeStateMachineTransition_4t05h"), "Start", "idle_front", SubResource("AnimationNodeStateMachineTransition_qq0ru"), "idle_front", "idle_back", SubResource("AnimationNodeStateMachineTransition_c54uj"), "idle_back", "idle_left", SubResource("AnimationNodeStateMachineTransition_qmo72"), "idle_left", "idle_front", SubResource("AnimationNodeStateMachineTransition_jyt1n"), "idle_left", "idle_back", SubResource("AnimationNodeStateMachineTransition_5un2v"), "idle_back", "idle_front", SubResource("AnimationNodeStateMachineTransition_2x3nl"), "idle_front", "idle_left", SubResource("AnimationNodeStateMachineTransition_6a5nw"), "idle_back", "idle_front_walk", SubResource("AnimationNodeStateMachineTransition_0jqty"), "idle_front", "idle_back_walk", SubResource("AnimationNodeStateMachineTransition_yjcrh"), "idle_back", "idle_back_walk", SubResource("AnimationNodeStateMachineTransition_2ybyh"), "idle_left", "idle_back_walk", SubResource("AnimationNodeStateMachineTransition_n454k"), "idle_back_walk", "idle_left", SubResource("AnimationNodeStateMachineTransition_vrcjv"), "idle_back_walk", "idle_front", SubResource("AnimationNodeStateMachineTransition_h1yxw"), "idle_back_walk", "idle_back", SubResource("AnimationNodeStateMachineTransition_kg6hd"), "idle_back", "idle_left_walk", SubResource("AnimationNodeStateMachineTransition_25i3y"), "idle_left", "idle_left_walk", SubResource("AnimationNodeStateMachineTransition_5g722"), "idle_front", "idle_left_walk", SubResource("AnimationNodeStateMachineTransition_a6y4x"), "idle_left_walk", "idle_front", SubResource("AnimationNodeStateMachineTransition_7y7m4"), "idle_left_walk", "idle_left", SubResource("AnimationNodeStateMachineTransition_ldcvv"), "idle_left_walk", "idle_back", SubResource("AnimationNodeStateMachineTransition_aalmk"), "idle_front_walk", "idle_back", SubResource("AnimationNodeStateMachineTransition_2le5t"), "idle_front_walk", "idle_front", SubResource("AnimationNodeStateMachineTransition_4nmgu"), "idle_front_walk", "idle_left", SubResource("AnimationNodeStateMachineTransition_mw5r6"), "idle_front", "idle_front_walk", SubResource("AnimationNodeStateMachineTransition_jbtxi"), "idle_left", "idle_front_walk", SubResource("AnimationNodeStateMachineTransition_mjxlk"), "idle_front", "primary_attack", SubResource("AnimationNodeStateMachineTransition_irq32"), "primary_attack", "idle_front", SubResource("AnimationNodeStateMachineTransition_2khaq"), "idle_right", "idle_front", SubResource("AnimationNodeStateMachineTransition_ivy74"), "idle_front", "idle_right", SubResource("AnimationNodeStateMachineTransition_x7uye"), "idle_right", "idle_left", SubResource("AnimationNodeStateMachineTransition_djeua"), "idle_left", "idle_right", SubResource("AnimationNodeStateMachineTransition_8wbs7"), "idle_right", "idle_back", SubResource("AnimationNodeStateMachineTransition_mnr4r"), "idle_back", "idle_right", SubResource("AnimationNodeStateMachineTransition_l2wq1"), "idle_right", "idle_left_walk", SubResource("AnimationNodeStateMachineTransition_7hf3j"), "idle_right", "idle_front_walk", SubResource("AnimationNodeStateMachineTransition_jwlar"), "idle_right", "idle_back_walk", SubResource("AnimationNodeStateMachineTransition_fdoul"), "idle_front_walk", "idle_right", SubResource("AnimationNodeStateMachineTransition_kpotx"), "idle_back_walk", "idle_right", SubResource("AnimationNodeStateMachineTransition_lfuuf"), "idle_left_walk", "idle_right", SubResource("AnimationNodeStateMachineTransition_dfvqa"), "idle_front_walk", "idle_right_walk", SubResource("AnimationNodeStateMachineTransition_at0w8"), "idle_right_walk", "idle_front_walk", SubResource("AnimationNodeStateMachineTransition_afod7"), "idle_right_walk", "idle_left_walk", SubResource("AnimationNodeStateMachineTransition_dwhw7"), "idle_left_walk", "idle_right_walk", SubResource("AnimationNodeStateMachineTransition_qjloj"), "idle_right_walk", "idle_back_walk", SubResource("AnimationNodeStateMachineTransition_7uqwg"), "idle_back_walk", "idle_right_walk", SubResource("AnimationNodeStateMachineTransition_k4jom"), "idle_right_walk", "idle_left", SubResource("AnimationNodeStateMachineTransition_ku0f8"), "idle_left", "idle_right_walk", SubResource("AnimationNodeStateMachineTransition_fwynu"), "idle_right_walk", "idle_back", SubResource("AnimationNodeStateMachineTransition_t7vd7"), "idle_back", "idle_right_walk", SubResource("AnimationNodeStateMachineTransition_tv4ou"), "idle_right_walk", "idle_front", SubResource("AnimationNodeStateMachineTransition_0b3yx"), "idle_front", "idle_right_walk", SubResource("AnimationNodeStateMachineTransition_ysi80"), "idle_right_walk", "idle_right", SubResource("AnimationNodeStateMachineTransition_ktp1h"), "idle_right", "idle_right_walk", SubResource("AnimationNodeStateMachineTransition_1cx5a"), "primary_attack", "primary_attack_left", SubResource("AnimationNodeStateMachineTransition_yu2km"), "primary_attack_left", "primary_attack", SubResource("AnimationNodeStateMachineTransition_6qb08"), "primary_attack", "primary_attack_back", SubResource("AnimationNodeStateMachineTransition_5ap7h"), "primary_attack_back", "primary_attack", SubResource("AnimationNodeStateMachineTransition_dde6r"), "primary_attack_right", "primary_attack_back", SubResource("AnimationNodeStateMachineTransition_5a80x"), "primary_attack_back", "primary_attack_right", SubResource("AnimationNodeStateMachineTransition_cwnal"), "primary_attack_right", "primary_attack", SubResource("AnimationNodeStateMachineTransition_ik0ko"), "primary_attack", "primary_attack_right", SubResource("AnimationNodeStateMachineTransition_7h3pp"), "primary_attack_right", "primary_attack_left", SubResource("AnimationNodeStateMachineTransition_te4ac"), "primary_attack_left", "primary_attack_right", SubResource("AnimationNodeStateMachineTransition_skhgh"), "primary_attack_left", "primary_attack_back", SubResource("AnimationNodeStateMachineTransition_j8po0"), "primary_attack_back", "primary_attack_left", SubResource("AnimationNodeStateMachineTransition_cvb6o"), "primary_attack_left", "idle_left", SubResource("AnimationNodeStateMachineTransition_qrpvt"), "primary_attack_right", "idle_right", SubResource("AnimationNodeStateMachineTransition_obci0"), "primary_attack_back", "idle_back", SubResource("AnimationNodeStateMachineTransition_cuv27"), "idle_left", "primary_attack_left", SubResource("AnimationNodeStateMachineTransition_ykv10"), "idle_left_walk", "primary_attack_left", SubResource("AnimationNodeStateMachineTransition_o3f25"), "idle_right", "primary_attack_right", SubResource("AnimationNodeStateMachineTransition_516bs"), "idle_right_walk", "primary_attack_right", SubResource("AnimationNodeStateMachineTransition_wyiwg"), "idle_back", "primary_attack_back", SubResource("AnimationNodeStateMachineTransition_ouq20"), "idle_back_walk", "primary_attack_back", SubResource("AnimationNodeStateMachineTransition_ynkt4")] +graph_offset = Vector2(-591.636, -191.708) [node name="AnimationTree" type="AnimationTree"] root_node = NodePath("%AnimationTree/..") diff --git a/Zennysoft.Game.Ma/src/enemy/Enemy.cs b/Zennysoft.Game.Ma/src/enemy/Enemy.cs index 9af4ffd7..7b936768 100644 --- a/Zennysoft.Game.Ma/src/enemy/Enemy.cs +++ b/Zennysoft.Game.Ma/src/enemy/Enemy.cs @@ -112,6 +112,7 @@ public partial class Enemy : CharacterBody3D, IEnemy, IProvide public virtual void TakeAction() { + _enemyModelView.PlayPrimaryAttackAnimation(); } public virtual void SetTarget(Vector3 target) diff --git a/Zennysoft.Game.Ma/src/enemy/EnemyModelView2D.cs b/Zennysoft.Game.Ma/src/enemy/EnemyModelView2D.cs index 1be4b5ae..d5fa3041 100644 --- a/Zennysoft.Game.Ma/src/enemy/EnemyModelView2D.cs +++ b/Zennysoft.Game.Ma/src/enemy/EnemyModelView2D.cs @@ -1,5 +1,4 @@ using Chickensoft.AutoInject; -using Chickensoft.GodotNodeInterfaces; using Chickensoft.Introspection; using Godot; using System.Linq; diff --git a/Zennysoft.Game.Ma/src/enemy/enemy_types/01. sproingy/Sproingy.cs b/Zennysoft.Game.Ma/src/enemy/enemy_types/01. sproingy/Sproingy.cs index ba3c43b3..8ad17fca 100644 --- a/Zennysoft.Game.Ma/src/enemy/enemy_types/01. sproingy/Sproingy.cs +++ b/Zennysoft.Game.Ma/src/enemy/enemy_types/01. sproingy/Sproingy.cs @@ -31,11 +31,11 @@ public partial class Sproingy : Enemy, IHasPrimaryAttack, ICanPatrol if (_enemyLogic.Value is not EnemyLogic.State.Activated) return; - if (_enemyLogic.Value is EnemyLogic.State.FollowPlayer && GlobalPosition.DistanceTo(_player.CurrentPosition) < 1.5f) + if (_enemyLogic.Value is EnemyLogic.State.FollowPlayer && GlobalPosition.DistanceTo(_player.CurrentPosition) < 3f) _enemyLogic.Input(new EnemyLogic.Input.StartAttacking()); - if (_enemyLogic.Value is EnemyLogic.State.FollowPlayer && GlobalPosition.DistanceTo(_player.CurrentPosition) > 30f) + else if (_enemyLogic.Value is EnemyLogic.State.FollowPlayer && GlobalPosition.DistanceTo(_player.CurrentPosition) > 30f) _enemyLogic.Input(new EnemyLogic.Input.LostPlayer()); - if (_enemyLogic.Value is EnemyLogic.State.Attacking && GlobalPosition.DistanceTo(_player.CurrentPosition) > 3f) + else if (_enemyLogic.Value is EnemyLogic.State.Attacking && GlobalPosition.DistanceTo(_player.CurrentPosition) > 5f) _enemyLogic.Input(new EnemyLogic.Input.Alerted()); _navigationAgentClient.CalculateVelocity(GlobalPosition, true); diff --git a/Zennysoft.Game.Ma/src/enemy/enemy_types/01. sproingy/SproingyModelView.tscn b/Zennysoft.Game.Ma/src/enemy/enemy_types/01. sproingy/SproingyModelView.tscn index 04dfcf26..c8276afa 100644 --- a/Zennysoft.Game.Ma/src/enemy/enemy_types/01. sproingy/SproingyModelView.tscn +++ b/Zennysoft.Game.Ma/src/enemy/enemy_types/01. sproingy/SproingyModelView.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=78 format=3 uid="uid://bimjnsu52y3xi"] +[gd_scene load_steps=171 format=3 uid="uid://bimjnsu52y3xi"] [ext_resource type="Script" uid="uid://cvr1qimxpignl" path="res://src/enemy/EnemyModelView2D.cs" id="1_oh25a"] [ext_resource type="Texture2D" uid="uid://dd0ia6isdqg61" path="res://src/enemy/enemy_types/01. sproingy/animations/ATTACK/Layer 1.png" id="1_pbx41"] @@ -58,7 +58,6 @@ [ext_resource type="Texture2D" uid="uid://b1cmx8l4ia3fv" path="res://src/enemy/enemy_types/01. sproingy/animations/IDLE_WALK_SIDE/Layer 14.png" id="54_jdvn0"] [ext_resource type="Texture2D" uid="uid://c7t4626rox02s" path="res://src/enemy/enemy_types/01. sproingy/animations/IDLE_WALK_SIDE/Layer 15.png" id="55_2eqor"] [ext_resource type="Script" uid="uid://6edayafleq8y" path="res://src/hitbox/Hitbox.cs" id="57_lae8t"] -[ext_resource type="PackedScene" uid="uid://dpoonda2dwwic" path="res://src/enemy/BasicEnemyAnimationTree.tscn" id="59_ivy74"] [sub_resource type="Resource" id="Resource_ivy74"] script = ExtResource("2_7hf3j") @@ -769,6 +768,322 @@ _data = { &"primary_attack_right": SubResource("Animation_x7uye") } +[sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_53wuj"] +animation = &"idle_back" + +[sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_o0tmb"] +animation = &"idle_back_walk" + +[sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_d5bmw"] +animation = &"idle_front" + +[sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_a6s5c"] +animation = &"idle_front_walk" + +[sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_fpvxl"] +animation = &"idle_left" + +[sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_dvj10"] +animation = &"idle_left_walk" + +[sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_7hf3j"] +animation = &"idle_right" + +[sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_ivy74"] +animation = &"idle_right_walk" + +[sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_erbrx"] +animation = &"primary_attack" + +[sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_x7uye"] +animation = &"primary_attack_back" + +[sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_djeua"] +animation = &"primary_attack_left" + +[sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_8wbs7"] +animation = &"primary_attack_right" + +[sub_resource type="AnimationNodeStateMachineTransition" id="AnimationNodeStateMachineTransition_3xv6a"] +switch_mode = 1 + +[sub_resource type="AnimationNodeStateMachineTransition" id="AnimationNodeStateMachineTransition_0h1op"] +switch_mode = 1 + +[sub_resource type="AnimationNodeStateMachineTransition" id="AnimationNodeStateMachineTransition_361b7"] +switch_mode = 1 + +[sub_resource type="AnimationNodeStateMachineTransition" id="AnimationNodeStateMachineTransition_wftla"] +switch_mode = 1 + +[sub_resource type="AnimationNodeStateMachineTransition" id="AnimationNodeStateMachineTransition_gqqkl"] +switch_mode = 1 + +[sub_resource type="AnimationNodeStateMachineTransition" id="AnimationNodeStateMachineTransition_5cj36"] +switch_mode = 1 + +[sub_resource type="AnimationNodeStateMachineTransition" id="AnimationNodeStateMachineTransition_4t05h"] + +[sub_resource type="AnimationNodeStateMachineTransition" id="AnimationNodeStateMachineTransition_qq0ru"] +advance_mode = 2 + +[sub_resource type="AnimationNodeStateMachineTransition" id="AnimationNodeStateMachineTransition_c54uj"] +switch_mode = 1 + +[sub_resource type="AnimationNodeStateMachineTransition" id="AnimationNodeStateMachineTransition_qmo72"] +switch_mode = 1 + +[sub_resource type="AnimationNodeStateMachineTransition" id="AnimationNodeStateMachineTransition_jyt1n"] +switch_mode = 1 + +[sub_resource type="AnimationNodeStateMachineTransition" id="AnimationNodeStateMachineTransition_5un2v"] +switch_mode = 1 + +[sub_resource type="AnimationNodeStateMachineTransition" id="AnimationNodeStateMachineTransition_2x3nl"] +switch_mode = 1 + +[sub_resource type="AnimationNodeStateMachineTransition" id="AnimationNodeStateMachineTransition_6a5nw"] +switch_mode = 1 + +[sub_resource type="AnimationNodeStateMachineTransition" id="AnimationNodeStateMachineTransition_0jqty"] +switch_mode = 1 + +[sub_resource type="AnimationNodeStateMachineTransition" id="AnimationNodeStateMachineTransition_yjcrh"] +switch_mode = 1 + +[sub_resource type="AnimationNodeStateMachineTransition" id="AnimationNodeStateMachineTransition_2ybyh"] +switch_mode = 1 + +[sub_resource type="AnimationNodeStateMachineTransition" id="AnimationNodeStateMachineTransition_n454k"] +switch_mode = 1 + +[sub_resource type="AnimationNodeStateMachineTransition" id="AnimationNodeStateMachineTransition_vrcjv"] +switch_mode = 1 + +[sub_resource type="AnimationNodeStateMachineTransition" id="AnimationNodeStateMachineTransition_h1yxw"] +switch_mode = 1 + +[sub_resource type="AnimationNodeStateMachineTransition" id="AnimationNodeStateMachineTransition_kg6hd"] +switch_mode = 1 + +[sub_resource type="AnimationNodeStateMachineTransition" id="AnimationNodeStateMachineTransition_25i3y"] +switch_mode = 1 + +[sub_resource type="AnimationNodeStateMachineTransition" id="AnimationNodeStateMachineTransition_5g722"] +switch_mode = 1 + +[sub_resource type="AnimationNodeStateMachineTransition" id="AnimationNodeStateMachineTransition_a6y4x"] +switch_mode = 1 + +[sub_resource type="AnimationNodeStateMachineTransition" id="AnimationNodeStateMachineTransition_7y7m4"] +switch_mode = 1 + +[sub_resource type="AnimationNodeStateMachineTransition" id="AnimationNodeStateMachineTransition_ldcvv"] +switch_mode = 1 + +[sub_resource type="AnimationNodeStateMachineTransition" id="AnimationNodeStateMachineTransition_aalmk"] +switch_mode = 1 + +[sub_resource type="AnimationNodeStateMachineTransition" id="AnimationNodeStateMachineTransition_2le5t"] +switch_mode = 1 + +[sub_resource type="AnimationNodeStateMachineTransition" id="AnimationNodeStateMachineTransition_4nmgu"] +switch_mode = 1 + +[sub_resource type="AnimationNodeStateMachineTransition" id="AnimationNodeStateMachineTransition_mw5r6"] + +[sub_resource type="AnimationNodeStateMachineTransition" id="AnimationNodeStateMachineTransition_jbtxi"] +switch_mode = 1 + +[sub_resource type="AnimationNodeStateMachineTransition" id="AnimationNodeStateMachineTransition_mjxlk"] +switch_mode = 1 + +[sub_resource type="AnimationNodeStateMachineTransition" id="AnimationNodeStateMachineTransition_irq32"] + +[sub_resource type="AnimationNodeStateMachineTransition" id="AnimationNodeStateMachineTransition_2khaq"] +switch_mode = 2 +advance_mode = 2 + +[sub_resource type="AnimationNodeStateMachineTransition" id="AnimationNodeStateMachineTransition_ivy74"] +switch_mode = 1 + +[sub_resource type="AnimationNodeStateMachineTransition" id="AnimationNodeStateMachineTransition_x7uye"] +switch_mode = 1 + +[sub_resource type="AnimationNodeStateMachineTransition" id="AnimationNodeStateMachineTransition_djeua"] +switch_mode = 1 + +[sub_resource type="AnimationNodeStateMachineTransition" id="AnimationNodeStateMachineTransition_8wbs7"] +switch_mode = 1 + +[sub_resource type="AnimationNodeStateMachineTransition" id="AnimationNodeStateMachineTransition_mnr4r"] +switch_mode = 1 + +[sub_resource type="AnimationNodeStateMachineTransition" id="AnimationNodeStateMachineTransition_l2wq1"] +switch_mode = 1 + +[sub_resource type="AnimationNodeStateMachineTransition" id="AnimationNodeStateMachineTransition_7hf3j"] +switch_mode = 1 + +[sub_resource type="AnimationNodeStateMachineTransition" id="AnimationNodeStateMachineTransition_jwlar"] +switch_mode = 1 + +[sub_resource type="AnimationNodeStateMachineTransition" id="AnimationNodeStateMachineTransition_fdoul"] +switch_mode = 1 + +[sub_resource type="AnimationNodeStateMachineTransition" id="AnimationNodeStateMachineTransition_kpotx"] +switch_mode = 1 + +[sub_resource type="AnimationNodeStateMachineTransition" id="AnimationNodeStateMachineTransition_lfuuf"] +switch_mode = 1 + +[sub_resource type="AnimationNodeStateMachineTransition" id="AnimationNodeStateMachineTransition_dfvqa"] +switch_mode = 1 + +[sub_resource type="AnimationNodeStateMachineTransition" id="AnimationNodeStateMachineTransition_at0w8"] +switch_mode = 1 + +[sub_resource type="AnimationNodeStateMachineTransition" id="AnimationNodeStateMachineTransition_afod7"] +switch_mode = 1 + +[sub_resource type="AnimationNodeStateMachineTransition" id="AnimationNodeStateMachineTransition_dwhw7"] +switch_mode = 1 + +[sub_resource type="AnimationNodeStateMachineTransition" id="AnimationNodeStateMachineTransition_qjloj"] +switch_mode = 1 + +[sub_resource type="AnimationNodeStateMachineTransition" id="AnimationNodeStateMachineTransition_7uqwg"] +switch_mode = 1 + +[sub_resource type="AnimationNodeStateMachineTransition" id="AnimationNodeStateMachineTransition_k4jom"] +switch_mode = 1 + +[sub_resource type="AnimationNodeStateMachineTransition" id="AnimationNodeStateMachineTransition_ku0f8"] +switch_mode = 1 + +[sub_resource type="AnimationNodeStateMachineTransition" id="AnimationNodeStateMachineTransition_fwynu"] +switch_mode = 1 + +[sub_resource type="AnimationNodeStateMachineTransition" id="AnimationNodeStateMachineTransition_t7vd7"] +switch_mode = 1 + +[sub_resource type="AnimationNodeStateMachineTransition" id="AnimationNodeStateMachineTransition_tv4ou"] +switch_mode = 1 + +[sub_resource type="AnimationNodeStateMachineTransition" id="AnimationNodeStateMachineTransition_0b3yx"] +switch_mode = 1 + +[sub_resource type="AnimationNodeStateMachineTransition" id="AnimationNodeStateMachineTransition_ysi80"] +switch_mode = 1 + +[sub_resource type="AnimationNodeStateMachineTransition" id="AnimationNodeStateMachineTransition_ktp1h"] +switch_mode = 1 + +[sub_resource type="AnimationNodeStateMachineTransition" id="AnimationNodeStateMachineTransition_1cx5a"] +switch_mode = 1 + +[sub_resource type="AnimationNodeStateMachineTransition" id="AnimationNodeStateMachineTransition_yu2km"] +reset = false +switch_mode = 1 + +[sub_resource type="AnimationNodeStateMachineTransition" id="AnimationNodeStateMachineTransition_6qb08"] +reset = false +switch_mode = 1 + +[sub_resource type="AnimationNodeStateMachineTransition" id="AnimationNodeStateMachineTransition_5ap7h"] +reset = false +switch_mode = 1 + +[sub_resource type="AnimationNodeStateMachineTransition" id="AnimationNodeStateMachineTransition_dde6r"] +reset = false +switch_mode = 1 + +[sub_resource type="AnimationNodeStateMachineTransition" id="AnimationNodeStateMachineTransition_5a80x"] +reset = false +switch_mode = 1 + +[sub_resource type="AnimationNodeStateMachineTransition" id="AnimationNodeStateMachineTransition_cwnal"] +reset = false +switch_mode = 1 + +[sub_resource type="AnimationNodeStateMachineTransition" id="AnimationNodeStateMachineTransition_ik0ko"] +reset = false +switch_mode = 1 + +[sub_resource type="AnimationNodeStateMachineTransition" id="AnimationNodeStateMachineTransition_7h3pp"] +reset = false +switch_mode = 1 + +[sub_resource type="AnimationNodeStateMachineTransition" id="AnimationNodeStateMachineTransition_te4ac"] +reset = false +switch_mode = 1 + +[sub_resource type="AnimationNodeStateMachineTransition" id="AnimationNodeStateMachineTransition_skhgh"] +reset = false +switch_mode = 1 + +[sub_resource type="AnimationNodeStateMachineTransition" id="AnimationNodeStateMachineTransition_j8po0"] +reset = false +switch_mode = 1 + +[sub_resource type="AnimationNodeStateMachineTransition" id="AnimationNodeStateMachineTransition_cvb6o"] +reset = false +switch_mode = 1 + +[sub_resource type="AnimationNodeStateMachineTransition" id="AnimationNodeStateMachineTransition_qrpvt"] +switch_mode = 2 +advance_mode = 2 + +[sub_resource type="AnimationNodeStateMachineTransition" id="AnimationNodeStateMachineTransition_obci0"] +switch_mode = 2 +advance_mode = 2 + +[sub_resource type="AnimationNodeStateMachineTransition" id="AnimationNodeStateMachineTransition_cuv27"] +switch_mode = 2 +advance_mode = 2 + +[sub_resource type="AnimationNodeStateMachineTransition" id="AnimationNodeStateMachineTransition_ykv10"] + +[sub_resource type="AnimationNodeStateMachineTransition" id="AnimationNodeStateMachineTransition_o3f25"] + +[sub_resource type="AnimationNodeStateMachineTransition" id="AnimationNodeStateMachineTransition_516bs"] + +[sub_resource type="AnimationNodeStateMachineTransition" id="AnimationNodeStateMachineTransition_wyiwg"] + +[sub_resource type="AnimationNodeStateMachineTransition" id="AnimationNodeStateMachineTransition_ouq20"] + +[sub_resource type="AnimationNodeStateMachineTransition" id="AnimationNodeStateMachineTransition_ynkt4"] + +[sub_resource type="AnimationNodeStateMachine" id="AnimationNodeStateMachine_d5bmw"] +states/End/position = Vector2(1882, 19) +states/Start/position = Vector2(29, 290) +states/idle_back/node = SubResource("AnimationNodeAnimation_53wuj") +states/idle_back/position = Vector2(459.116, 24) +states/idle_back_walk/node = SubResource("AnimationNodeAnimation_o0tmb") +states/idle_back_walk/position = Vector2(1052, 55.9474) +states/idle_front/node = SubResource("AnimationNodeAnimation_d5bmw") +states/idle_front/position = Vector2(190.295, -177) +states/idle_front_walk/node = SubResource("AnimationNodeAnimation_a6s5c") +states/idle_front_walk/position = Vector2(772, -177) +states/idle_left/node = SubResource("AnimationNodeAnimation_fpvxl") +states/idle_left/position = Vector2(459.116, -177) +states/idle_left_walk/node = SubResource("AnimationNodeAnimation_dvj10") +states/idle_left_walk/position = Vector2(1052, -177) +states/idle_right/node = SubResource("AnimationNodeAnimation_7hf3j") +states/idle_right/position = Vector2(179.295, 41) +states/idle_right_walk/node = SubResource("AnimationNodeAnimation_ivy74") +states/idle_right_walk/position = Vector2(772, 55.9474) +states/primary_attack/node = SubResource("AnimationNodeAnimation_erbrx") +states/primary_attack/position = Vector2(410, 308.749) +states/primary_attack_back/node = SubResource("AnimationNodeAnimation_x7uye") +states/primary_attack_back/position = Vector2(665.525, 479.749) +states/primary_attack_left/node = SubResource("AnimationNodeAnimation_djeua") +states/primary_attack_left/position = Vector2(648.525, 319) +states/primary_attack_right/node = SubResource("AnimationNodeAnimation_8wbs7") +states/primary_attack_right/position = Vector2(382, 479.749) +transitions = ["idle_front_walk", "idle_left_walk", SubResource("AnimationNodeStateMachineTransition_3xv6a"), "idle_left_walk", "idle_front_walk", SubResource("AnimationNodeStateMachineTransition_0h1op"), "idle_front_walk", "idle_back_walk", SubResource("AnimationNodeStateMachineTransition_361b7"), "idle_back_walk", "idle_front_walk", SubResource("AnimationNodeStateMachineTransition_wftla"), "idle_back_walk", "idle_left_walk", SubResource("AnimationNodeStateMachineTransition_gqqkl"), "idle_left_walk", "idle_back_walk", SubResource("AnimationNodeStateMachineTransition_5cj36"), "idle_front_walk", "primary_attack", SubResource("AnimationNodeStateMachineTransition_4t05h"), "Start", "idle_front", SubResource("AnimationNodeStateMachineTransition_qq0ru"), "idle_front", "idle_back", SubResource("AnimationNodeStateMachineTransition_c54uj"), "idle_back", "idle_left", SubResource("AnimationNodeStateMachineTransition_qmo72"), "idle_left", "idle_front", SubResource("AnimationNodeStateMachineTransition_jyt1n"), "idle_left", "idle_back", SubResource("AnimationNodeStateMachineTransition_5un2v"), "idle_back", "idle_front", SubResource("AnimationNodeStateMachineTransition_2x3nl"), "idle_front", "idle_left", SubResource("AnimationNodeStateMachineTransition_6a5nw"), "idle_back", "idle_front_walk", SubResource("AnimationNodeStateMachineTransition_0jqty"), "idle_front", "idle_back_walk", SubResource("AnimationNodeStateMachineTransition_yjcrh"), "idle_back", "idle_back_walk", SubResource("AnimationNodeStateMachineTransition_2ybyh"), "idle_left", "idle_back_walk", SubResource("AnimationNodeStateMachineTransition_n454k"), "idle_back_walk", "idle_left", SubResource("AnimationNodeStateMachineTransition_vrcjv"), "idle_back_walk", "idle_front", SubResource("AnimationNodeStateMachineTransition_h1yxw"), "idle_back_walk", "idle_back", SubResource("AnimationNodeStateMachineTransition_kg6hd"), "idle_back", "idle_left_walk", SubResource("AnimationNodeStateMachineTransition_25i3y"), "idle_left", "idle_left_walk", SubResource("AnimationNodeStateMachineTransition_5g722"), "idle_front", "idle_left_walk", SubResource("AnimationNodeStateMachineTransition_a6y4x"), "idle_left_walk", "idle_front", SubResource("AnimationNodeStateMachineTransition_7y7m4"), "idle_left_walk", "idle_left", SubResource("AnimationNodeStateMachineTransition_ldcvv"), "idle_left_walk", "idle_back", SubResource("AnimationNodeStateMachineTransition_aalmk"), "idle_front_walk", "idle_back", SubResource("AnimationNodeStateMachineTransition_2le5t"), "idle_front_walk", "idle_front", SubResource("AnimationNodeStateMachineTransition_4nmgu"), "idle_front_walk", "idle_left", SubResource("AnimationNodeStateMachineTransition_mw5r6"), "idle_front", "idle_front_walk", SubResource("AnimationNodeStateMachineTransition_jbtxi"), "idle_left", "idle_front_walk", SubResource("AnimationNodeStateMachineTransition_mjxlk"), "idle_front", "primary_attack", SubResource("AnimationNodeStateMachineTransition_irq32"), "primary_attack", "idle_front", SubResource("AnimationNodeStateMachineTransition_2khaq"), "idle_right", "idle_front", SubResource("AnimationNodeStateMachineTransition_ivy74"), "idle_front", "idle_right", SubResource("AnimationNodeStateMachineTransition_x7uye"), "idle_right", "idle_left", SubResource("AnimationNodeStateMachineTransition_djeua"), "idle_left", "idle_right", SubResource("AnimationNodeStateMachineTransition_8wbs7"), "idle_right", "idle_back", SubResource("AnimationNodeStateMachineTransition_mnr4r"), "idle_back", "idle_right", SubResource("AnimationNodeStateMachineTransition_l2wq1"), "idle_right", "idle_left_walk", SubResource("AnimationNodeStateMachineTransition_7hf3j"), "idle_right", "idle_front_walk", SubResource("AnimationNodeStateMachineTransition_jwlar"), "idle_right", "idle_back_walk", SubResource("AnimationNodeStateMachineTransition_fdoul"), "idle_front_walk", "idle_right", SubResource("AnimationNodeStateMachineTransition_kpotx"), "idle_back_walk", "idle_right", SubResource("AnimationNodeStateMachineTransition_lfuuf"), "idle_left_walk", "idle_right", SubResource("AnimationNodeStateMachineTransition_dfvqa"), "idle_front_walk", "idle_right_walk", SubResource("AnimationNodeStateMachineTransition_at0w8"), "idle_right_walk", "idle_front_walk", SubResource("AnimationNodeStateMachineTransition_afod7"), "idle_right_walk", "idle_left_walk", SubResource("AnimationNodeStateMachineTransition_dwhw7"), "idle_left_walk", "idle_right_walk", SubResource("AnimationNodeStateMachineTransition_qjloj"), "idle_right_walk", "idle_back_walk", SubResource("AnimationNodeStateMachineTransition_7uqwg"), "idle_back_walk", "idle_right_walk", SubResource("AnimationNodeStateMachineTransition_k4jom"), "idle_right_walk", "idle_left", SubResource("AnimationNodeStateMachineTransition_ku0f8"), "idle_left", "idle_right_walk", SubResource("AnimationNodeStateMachineTransition_fwynu"), "idle_right_walk", "idle_back", SubResource("AnimationNodeStateMachineTransition_t7vd7"), "idle_back", "idle_right_walk", SubResource("AnimationNodeStateMachineTransition_tv4ou"), "idle_right_walk", "idle_front", SubResource("AnimationNodeStateMachineTransition_0b3yx"), "idle_front", "idle_right_walk", SubResource("AnimationNodeStateMachineTransition_ysi80"), "idle_right_walk", "idle_right", SubResource("AnimationNodeStateMachineTransition_ktp1h"), "idle_right", "idle_right_walk", SubResource("AnimationNodeStateMachineTransition_1cx5a"), "primary_attack", "primary_attack_left", SubResource("AnimationNodeStateMachineTransition_yu2km"), "primary_attack_left", "primary_attack", SubResource("AnimationNodeStateMachineTransition_6qb08"), "primary_attack", "primary_attack_back", SubResource("AnimationNodeStateMachineTransition_5ap7h"), "primary_attack_back", "primary_attack", SubResource("AnimationNodeStateMachineTransition_dde6r"), "primary_attack_right", "primary_attack_back", SubResource("AnimationNodeStateMachineTransition_5a80x"), "primary_attack_back", "primary_attack_right", SubResource("AnimationNodeStateMachineTransition_cwnal"), "primary_attack_right", "primary_attack", SubResource("AnimationNodeStateMachineTransition_ik0ko"), "primary_attack", "primary_attack_right", SubResource("AnimationNodeStateMachineTransition_7h3pp"), "primary_attack_right", "primary_attack_left", SubResource("AnimationNodeStateMachineTransition_te4ac"), "primary_attack_left", "primary_attack_right", SubResource("AnimationNodeStateMachineTransition_skhgh"), "primary_attack_left", "primary_attack_back", SubResource("AnimationNodeStateMachineTransition_j8po0"), "primary_attack_back", "primary_attack_left", SubResource("AnimationNodeStateMachineTransition_cvb6o"), "primary_attack_left", "idle_left", SubResource("AnimationNodeStateMachineTransition_qrpvt"), "primary_attack_right", "idle_right", SubResource("AnimationNodeStateMachineTransition_obci0"), "primary_attack_back", "idle_back", SubResource("AnimationNodeStateMachineTransition_cuv27"), "idle_left", "primary_attack_left", SubResource("AnimationNodeStateMachineTransition_ykv10"), "idle_left_walk", "primary_attack_left", SubResource("AnimationNodeStateMachineTransition_o3f25"), "idle_right", "primary_attack_right", SubResource("AnimationNodeStateMachineTransition_516bs"), "idle_right_walk", "primary_attack_right", SubResource("AnimationNodeStateMachineTransition_wyiwg"), "idle_back", "primary_attack_back", SubResource("AnimationNodeStateMachineTransition_ouq20"), "idle_back_walk", "primary_attack_back", SubResource("AnimationNodeStateMachineTransition_ynkt4")] +graph_offset = Vector2(-591.636, 135.031) + [node name="EnemyModelView" type="Node3D"] script = ExtResource("1_oh25a") EnemyLoreInfo = SubResource("Resource_ivy74") @@ -819,5 +1134,8 @@ libraries = { &"": SubResource("AnimationLibrary_6tj5r") } -[node name="AnimationTree" parent="." instance=ExtResource("59_ivy74")] +[node name="AnimationTree" type="AnimationTree" parent="."] unique_name_in_owner = true +root_node = NodePath("%AnimationTree/..") +tree_root = SubResource("AnimationNodeStateMachine_d5bmw") +anim_player = NodePath("../AnimationPlayer") diff --git a/Zennysoft.Game.Ma/src/player/Player.cs b/Zennysoft.Game.Ma/src/player/Player.cs index 2cb65460..c2e31f0c 100644 --- a/Zennysoft.Game.Ma/src/player/Player.cs +++ b/Zennysoft.Game.Ma/src/player/Player.cs @@ -341,6 +341,7 @@ public partial class Player : CharacterBody3D, IPlayer, IProvide(); SpawnEnemyDropDown.AddItem(tempEnemy.Name); } + SpawnItemDropDown.AllowReselect = true; + SpawnEnemyDropDown.AllowReselect = true; SpawnItemDropDown.ItemSelected += SpawnItemDropDown_ItemSelected; SpawnEnemyDropDown.ItemSelected += SpawnEnemyDropDown_ItemSelected;