From 69cb63ad89c11e6249d39f0740123cba4ef42869 Mon Sep 17 00:00:00 2001 From: cblech Date: Fri, 11 Jul 2025 00:15:28 +0200 Subject: [PATCH] merge auto fixes --- prefabs/fight/fighters/enemy_blob_fighter.tscn | 6 +++--- prefabs/fight/fighters/enemy_mavkha_fighter.tscn | 6 +++--- prefabs/fight/fighters/vesna_fighter.tscn | 4 ++-- project.godot | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/prefabs/fight/fighters/enemy_blob_fighter.tscn b/prefabs/fight/fighters/enemy_blob_fighter.tscn index 7b29ec9..087a7f6 100644 --- a/prefabs/fight/fighters/enemy_blob_fighter.tscn +++ b/prefabs/fight/fighters/enemy_blob_fighter.tscn @@ -3,10 +3,10 @@ [ext_resource type="Texture2D" uid="uid://ccrnmx6bd842k" path="res://art/characters/farm fäulnis blobs.png" id="1_vem8k"] [ext_resource type="Script" uid="uid://by88f32fou7lh" path="res://scripts/CSharp/Common/Fight/Fighter.cs" id="2_4w1ab"] [ext_resource type="Texture2D" uid="uid://qlfwuakhe57t" path="res://art/ui/UI/attack_select_wheel.png" id="3_v4f83"] -[ext_resource type="AudioStream" uid="uid://ya7ue6m52l6n" path="res://audio/sfx/Battle/Enemies/SFX_Slime_Hit_V2_03.wav" id="5_v4f83"] +[ext_resource type="AudioStream" uid="uid://x7cc5woop5ec" path="res://audio/sfx/Battle/Enemies/SFX_Slime_Hit_V2_03.wav" id="5_v4f83"] [ext_resource type="Texture2D" uid="uid://bn56p0ytuo060" path="res://art/ui/UI/AttackButton.png" id="5_vbkts"] -[ext_resource type="AudioStream" uid="uid://4i6lp6ot3xf5" path="res://audio/sfx/Battle/Enemies/SFX_Water_Attack_Slimes.wav" id="6_oykh8"] -[ext_resource type="AudioStream" uid="uid://bypmpi5gyo1sv" path="res://audio/sfx/Battle/Enemies/SFX_Slime_Hit_V2_06.wav" id="6_vbkts"] +[ext_resource type="AudioStream" uid="uid://d1v012odga8pu" path="res://audio/sfx/Battle/Enemies/SFX_Water_Attack_Slimes.wav" id="6_oykh8"] +[ext_resource type="AudioStream" uid="uid://xxa3rvsal5m6" path="res://audio/sfx/Battle/Enemies/SFX_Slime_Hit_V2_06.wav" id="6_vbkts"] [sub_resource type="CircleShape2D" id="CircleShape2D_284vk"] radius = 291.58 diff --git a/prefabs/fight/fighters/enemy_mavkha_fighter.tscn b/prefabs/fight/fighters/enemy_mavkha_fighter.tscn index 98e524f..2580ffe 100644 --- a/prefabs/fight/fighters/enemy_mavkha_fighter.tscn +++ b/prefabs/fight/fighters/enemy_mavkha_fighter.tscn @@ -4,9 +4,9 @@ [ext_resource type="Texture2D" uid="uid://bexymddkb6l0o" path="res://art/characters/Mavka/mavkha.png" id="2_shg7p"] [ext_resource type="Texture2D" uid="uid://qlfwuakhe57t" path="res://art/ui/UI/attack_select_wheel.png" id="3_nkuei"] [ext_resource type="Texture2D" uid="uid://bn56p0ytuo060" path="res://art/ui/UI/AttackButton.png" id="4_u3hw3"] -[ext_resource type="AudioStream" uid="uid://ya7ue6m52l6n" path="res://audio/sfx/Battle/Enemies/SFX_Slime_Hit_V2_03.wav" id="5_so2ks"] -[ext_resource type="AudioStream" uid="uid://bypmpi5gyo1sv" path="res://audio/sfx/Battle/Enemies/SFX_Slime_Hit_V2_06.wav" id="6_v175g"] -[ext_resource type="AudioStream" uid="uid://4i6lp6ot3xf5" path="res://audio/sfx/Battle/Enemies/SFX_Water_Attack_Slimes.wav" id="7_g7k7o"] +[ext_resource type="AudioStream" uid="uid://x7cc5woop5ec" path="res://audio/sfx/Battle/Enemies/SFX_Slime_Hit_V2_03.wav" id="5_so2ks"] +[ext_resource type="AudioStream" uid="uid://xxa3rvsal5m6" path="res://audio/sfx/Battle/Enemies/SFX_Slime_Hit_V2_06.wav" id="6_v175g"] +[ext_resource type="AudioStream" uid="uid://d1v012odga8pu" path="res://audio/sfx/Battle/Enemies/SFX_Water_Attack_Slimes.wav" id="7_g7k7o"] [sub_resource type="CircleShape2D" id="CircleShape2D_284vk"] radius = 388.063 diff --git a/prefabs/fight/fighters/vesna_fighter.tscn b/prefabs/fight/fighters/vesna_fighter.tscn index b0db2bd..7e9f745 100644 --- a/prefabs/fight/fighters/vesna_fighter.tscn +++ b/prefabs/fight/fighters/vesna_fighter.tscn @@ -3,11 +3,11 @@ [ext_resource type="Script" uid="uid://by88f32fou7lh" path="res://scripts/CSharp/Common/Fight/Fighter.cs" id="1_f3j2x"] [ext_resource type="Texture2D" uid="uid://om2axn1vfa5o" path="res://art/animation/Vesna2D/Vesna Anims Sequences/S01-Idle/0001.png" id="2_2ud32"] [ext_resource type="Texture2D" uid="uid://qlfwuakhe57t" path="res://art/ui/UI/attack_select_wheel.png" id="3_80knd"] -[ext_resource type="AudioStream" uid="uid://pvqav5xbin5r" path="res://audio/sfx/Battle/Vesna/SFX_Battle_Vesna_Defense_08.wav" id="5_4r2vf"] +[ext_resource type="AudioStream" uid="uid://ch4c1wh4ghxyo" path="res://audio/sfx/Battle/Vesna/SFX_Battle_Vesna_Defense_08.wav" id="5_4r2vf"] [ext_resource type="Texture2D" uid="uid://6h85o7fj7gmu" path="res://art/animation/Vesna3D/vesna-more-tools.png" id="5_l04qi"] [ext_resource type="Texture2D" uid="uid://crak7ton4lab0" path="res://art/ui/UI/EmptyFightButton.png" id="5_rjjub"] [ext_resource type="Texture2D" uid="uid://c3wht0nakaki1" path="res://art/ui/UI/icons/icon-fruit-tomatoe.png" id="6_l04qi"] -[ext_resource type="AudioStream" uid="uid://bjmyose6dedsb" path="res://audio/sfx/Battle/Vesna/SFX_Battle_Vesna_Attack_04.wav" id="6_u1ayv"] +[ext_resource type="AudioStream" uid="uid://ccionrfr6e3lb" path="res://audio/sfx/Battle/Vesna/SFX_Battle_Vesna_Attack_04.wav" id="6_u1ayv"] [sub_resource type="CircleShape2D" id="CircleShape2D_0tqnl"] radius = 291.58 diff --git a/project.godot b/project.godot index 194b08b..7773a6e 100644 --- a/project.godot +++ b/project.godot @@ -24,12 +24,12 @@ buses/default_bus_layout="uid://b6dwkmkyb0axk" [autoload] -SceneTransition="*res://scenes/SceneTransition.tscn" Dialogic="*res://addons/dialogic/Core/DialogicGameHandler.gd" InventoryManager="*res://scripts/CSharp/Common/Inventory/InventoryManager.cs" QuestManager="*res://scripts/CSharp/Common/Quest/QuestManager.cs" FightManagerAutoload="*res://prefabs/fight/fight_manager_autoload.tscn" Signal_Debugger="*res://addons/SignalVisualizer/Debugger/SignalDebugger.gd" +SceneTransition="*res://scenes/SceneTransition.tscn" [dialogic]