From b8e23ac9c49ec2ddae89ec5319f126d2f26eabbc Mon Sep 17 00:00:00 2001 From: Zenny Date: Mon, 31 Mar 2025 20:07:18 -0700 Subject: [PATCH] Minor fix --- .../dialogue_manager/example_balloon/example_balloon.tscn | 2 +- .../example_balloon/small_example_balloon.tscn | 2 +- Zennysoft.Game.Ma/src/enemy/state/EnemyLogic.g.puml | 4 ++-- Zennysoft.Game.Ma/src/player/Player.tscn | 8 ++++---- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Zennysoft.Game.Ma/addons/dialogue_manager/example_balloon/example_balloon.tscn b/Zennysoft.Game.Ma/addons/dialogue_manager/example_balloon/example_balloon.tscn index 91d8a7df..85e82348 100644 --- a/Zennysoft.Game.Ma/addons/dialogue_manager/example_balloon/example_balloon.tscn +++ b/Zennysoft.Game.Ma/addons/dialogue_manager/example_balloon/example_balloon.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=9 format=3 uid="uid://73jm5qjy52vq"] -[ext_resource type="Script" uid="uid://d1wt4ma6055l8" path="res://addons/dialogue_manager/example_balloon/example_balloon.gd" id="1_36de5"] +[ext_resource type="Script" uid="uid://5b3w40kwakl3" path="res://addons/dialogue_manager/example_balloon/ExampleBalloon.cs" id="1_36de5"] [ext_resource type="PackedScene" uid="uid://ckvgyvclnwggo" path="res://addons/dialogue_manager/dialogue_label.tscn" id="2_a8ve6"] [ext_resource type="Script" uid="uid://bb52rsfwhkxbn" path="res://addons/dialogue_manager/dialogue_responses_menu.gd" id="3_72ixx"] diff --git a/Zennysoft.Game.Ma/addons/dialogue_manager/example_balloon/small_example_balloon.tscn b/Zennysoft.Game.Ma/addons/dialogue_manager/example_balloon/small_example_balloon.tscn index c4d2145f..6e00358e 100644 --- a/Zennysoft.Game.Ma/addons/dialogue_manager/example_balloon/small_example_balloon.tscn +++ b/Zennysoft.Game.Ma/addons/dialogue_manager/example_balloon/small_example_balloon.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=10 format=3 uid="uid://13s5spsk34qu"] -[ext_resource type="Script" uid="uid://d1wt4ma6055l8" path="res://addons/dialogue_manager/example_balloon/example_balloon.gd" id="1_s2gbs"] +[ext_resource type="Script" uid="uid://5b3w40kwakl3" path="res://addons/dialogue_manager/example_balloon/ExampleBalloon.cs" id="1_s2gbs"] [ext_resource type="PackedScene" uid="uid://ckvgyvclnwggo" path="res://addons/dialogue_manager/dialogue_label.tscn" id="2_hfvdi"] [ext_resource type="Script" uid="uid://bb52rsfwhkxbn" path="res://addons/dialogue_manager/dialogue_responses_menu.gd" id="3_1j1j0"] diff --git a/Zennysoft.Game.Ma/src/enemy/state/EnemyLogic.g.puml b/Zennysoft.Game.Ma/src/enemy/state/EnemyLogic.g.puml index 33157ae0..e4b80aee 100644 --- a/Zennysoft.Game.Ma/src/enemy/state/EnemyLogic.g.puml +++ b/Zennysoft.Game.Ma/src/enemy/state/EnemyLogic.g.puml @@ -1,14 +1,14 @@ @startuml EnemyLogic state "EnemyLogic State" as Zennysoft_Game_Ma_EnemyLogic_State { + state "Defeated" as Zennysoft_Game_Ma_EnemyLogic_State_Defeated state "Alive" as Zennysoft_Game_Ma_EnemyLogic_State_Alive { state "Activated" as Zennysoft_Game_Ma_EnemyLogic_State_Activated { - state "Attacking" as Zennysoft_Game_Ma_EnemyLogic_State_Attacking state "FollowPlayer" as Zennysoft_Game_Ma_EnemyLogic_State_FollowPlayer + state "Attacking" as Zennysoft_Game_Ma_EnemyLogic_State_Attacking state "Patrolling" as Zennysoft_Game_Ma_EnemyLogic_State_Patrolling } state "Idle" as Zennysoft_Game_Ma_EnemyLogic_State_Idle } - state "Defeated" as Zennysoft_Game_Ma_EnemyLogic_State_Defeated } Zennysoft_Game_Ma_EnemyLogic_State_Alive --> Zennysoft_Game_Ma_EnemyLogic_State_Attacking : AttackTimer diff --git a/Zennysoft.Game.Ma/src/player/Player.tscn b/Zennysoft.Game.Ma/src/player/Player.tscn index 4ce59bfa..94d27ccd 100644 --- a/Zennysoft.Game.Ma/src/player/Player.tscn +++ b/Zennysoft.Game.Ma/src/player/Player.tscn @@ -63,6 +63,10 @@ tracks/1/keys = { "values": [0] } +[sub_resource type="Animation" id="Animation_g183x"] +resource_name = "atonement_attack" +step = 0.0833333 + [sub_resource type="Animation" id="Animation_0jjwv"] resource_name = "attack" length = 0.916675 @@ -109,10 +113,6 @@ tracks/0/keys = { "values": [10, 1, 11] } -[sub_resource type="Animation" id="Animation_g183x"] -resource_name = "atonement_attack" -step = 0.0833333 - [sub_resource type="AnimationLibrary" id="AnimationLibrary_w8l8m"] _data = { &"RESET": SubResource("Animation_hcjph"),