From b115b8476ed19979e6e0ca60a270e86670e674fe Mon Sep 17 00:00:00 2001
From: Victor Turgeon <masfervic@hotmail.com>
Date: Wed, 11 Oct 2023 08:18:06 -0400
Subject: [PATCH] =?UTF-8?q?Necromancer=20fonctionnel=20(=C3=A0=20rebalance?=
 =?UTF-8?q?r)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Scenes/Player/UI/bat_button.tscn         |   4 +-
 Scenes/Player/UI/necromancer_button.tscn | 111 ++++++++++++++++++++---
 Scenes/Player/UI/player_ui.tscn          |   8 +-
 Themes/base_theme.tres                   |  16 +---
 4 files changed, 105 insertions(+), 34 deletions(-)

diff --git a/Scenes/Player/UI/bat_button.tscn b/Scenes/Player/UI/bat_button.tscn
index 463eba1..f8ee2e7 100644
--- a/Scenes/Player/UI/bat_button.tscn
+++ b/Scenes/Player/UI/bat_button.tscn
@@ -1,7 +1,8 @@
-[gd_scene load_steps=6 format=3 uid="uid://dl0d1m1gfcd4o"]
+[gd_scene load_steps=7 format=3 uid="uid://dl0d1m1gfcd4o"]
 
 [ext_resource type="PackedScene" uid="uid://f7n8gd1wlv4v" path="res://Scenes/Player/UI/spawnable_button.tscn" id="1_tvnet"]
 [ext_resource type="PackedScene" uid="uid://brnx3xyyd0e71" path="res://Scenes/Spawnables/bat_spawnable.tscn" id="2_borla"]
+[ext_resource type="ButtonGroup" uid="uid://gjbbywsr8n8b" path="res://Scenes/Player/UI/spawnables_button_group.tres" id="2_j7x6h"]
 [ext_resource type="Texture2D" uid="uid://ddvr5ltbo8ome" path="res://Assets/Bat/noBKG_BatFlight_strip.png" id="3_5io10"]
 [ext_resource type="Theme" uid="uid://dr1h7to56a2pv" path="res://Themes/base_theme.tres" id="4_nd7nb"]
 
@@ -11,6 +12,7 @@ atlas = ExtResource("3_5io10")
 region = Rect2(64, 0, 64, 64)
 
 [node name="BatButton" instance=ExtResource("1_tvnet")]
+button_group = ExtResource("2_j7x6h")
 spawnableScene = ExtResource("2_borla")
 
 [node name="AnimatedTextureRect" parent="." index="0"]
diff --git a/Scenes/Player/UI/necromancer_button.tscn b/Scenes/Player/UI/necromancer_button.tscn
index 79e28ff..6c0feb8 100644
--- a/Scenes/Player/UI/necromancer_button.tscn
+++ b/Scenes/Player/UI/necromancer_button.tscn
@@ -1,25 +1,108 @@
-[gd_scene load_steps=6 format=3 uid="uid://0il8tqtdekpl"]
+[gd_scene load_steps=10 format=3 uid="uid://d370efcvbuchm"]
 
-[ext_resource type="PackedScene" uid="uid://f7n8gd1wlv4v" path="res://Scenes/Player/UI/spawnable_button.tscn" id="1_4ck8k"]
+[ext_resource type="ButtonGroup" uid="uid://gjbbywsr8n8b" path="res://Scenes/Player/UI/spawnables_button_group.tres" id="2_ma8s0"]
 [ext_resource type="PackedScene" uid="uid://bap3ds6o3m4i1" path="res://Scenes/Spawnables/necromancer_spawnable.tscn" id="2_tfd72"]
-[ext_resource type="Texture2D" uid="uid://ddvr5ltbo8ome" path="res://Assets/Bat/noBKG_BatFlight_strip.png" id="3_h4xf7"]
+[ext_resource type="Script" path="res://Scenes/Player/UI/spawnable_button.gd" id="3_8gmw0"]
 [ext_resource type="Theme" uid="uid://dr1h7to56a2pv" path="res://Themes/base_theme.tres" id="4_oe55x"]
+[ext_resource type="Texture2D" uid="uid://ckeayob6k71b1" path="res://Assets/Witch/noBKG_WitchIdle_strip.png" id="5_g2gp2"]
 
-[sub_resource type="AtlasTexture" id="AtlasTexture_if561"]
-resource_local_to_scene = true
-atlas = ExtResource("3_h4xf7")
-region = Rect2(64, 0, 64, 64)
+[sub_resource type="AtlasTexture" id="AtlasTexture_ons44"]
+atlas = ExtResource("5_g2gp2")
+region = Rect2(0, 0, 64, 64)
 
-[node name="NecromancerButton" instance=ExtResource("1_4ck8k")]
+[sub_resource type="Animation" id="Animation_r6yl2"]
+resource_name = "AnimateTextureRect"
+length = 0.583341
+loop_mode = 1
+step = 0.0833333
+tracks/0/type = "value"
+tracks/0/imported = false
+tracks/0/enabled = true
+tracks/0/path = NodePath("AnimatedTextureRect:texture:region")
+tracks/0/interp = 1
+tracks/0/loop_wrap = true
+tracks/0/keys = {
+"times": PackedFloat32Array(0, 0.0833333, 0.166667, 0.25, 0.333333, 0.416667, 0.5),
+"transitions": PackedFloat32Array(1, 1, 1, 1, 1, 1, 1),
+"update": 1,
+"values": [Rect2(0, 0, 64, 64), Rect2(64, 0, 64, 64), Rect2(128, 0, 64, 64), Rect2(192, 0, 64, 64), Rect2(256, 0, 64, 64), Rect2(320, 0, 64, 64), Rect2(384, 0, 64, 64)]
+}
+
+[sub_resource type="Animation" id="Animation_tak1b"]
+length = 0.001
+tracks/0/type = "value"
+tracks/0/imported = false
+tracks/0/enabled = true
+tracks/0/path = NodePath("AnimatedTextureRect:texture:region")
+tracks/0/interp = 1
+tracks/0/loop_wrap = true
+tracks/0/keys = {
+"times": PackedFloat32Array(0),
+"transitions": PackedFloat32Array(1),
+"update": 0,
+"values": [Rect2(0, 0, 64, 64)]
+}
+
+[sub_resource type="AnimationLibrary" id="AnimationLibrary_0o4ue"]
+_data = {
+"AnimateTextureRect": SubResource("Animation_r6yl2"),
+"RESET": SubResource("Animation_tak1b")
+}
+
+[node name="NecromancerButton" type="Button"]
+anchors_preset = 15
+anchor_right = 1.0
+anchor_bottom = 1.0
+offset_right = -854.0
+offset_bottom = -499.0
+grow_horizontal = 2
+grow_vertical = 2
+size_flags_horizontal = 3
+size_flags_vertical = 3
+focus_mode = 0
+mouse_default_cursor_shape = 2
+theme = ExtResource("4_oe55x")
+toggle_mode = true
+button_group = ExtResource("2_ma8s0")
+script = ExtResource("3_8gmw0")
 spawnableScene = ExtResource("2_tfd72")
 
-[node name="AnimatedTextureRect" parent="." index="0"]
-texture = SubResource("AtlasTexture_if561")
+[node name="AnimatedTextureRect" type="TextureRect" parent="."]
+layout_mode = 1
+anchors_preset = -1
+anchor_left = -1.78302
+anchor_top = -0.414634
+anchor_right = 2.78302
+anchor_bottom = 1.14634
+offset_left = 210.0
+offset_right = -210.0
+grow_horizontal = 2
+grow_vertical = 2
+texture = SubResource("AtlasTexture_ons44")
+stretch_mode = 5
+metadata/_edit_use_anchors_ = true
 
-[node name="Label" parent="." index="2"]
-text = "Bat"
+[node name="AnimationPlayer" type="AnimationPlayer" parent="."]
+speed_scale = 0.6
+libraries = {
+"": SubResource("AnimationLibrary_0o4ue")
+}
 
-[node name="ToolTip" type="PanelContainer" parent="." index="3"]
+[node name="Label" type="Label" parent="."]
+layout_mode = 1
+anchors_preset = 12
+anchor_top = 1.0
+anchor_right = 1.0
+anchor_bottom = 1.0
+offset_top = -18.0
+grow_horizontal = 2
+grow_vertical = 0
+theme = ExtResource("4_oe55x")
+text = "Necromancer"
+horizontal_alignment = 1
+vertical_alignment = 1
+
+[node name="ToolTip" type="PanelContainer" parent="."]
 visible = false
 layout_mode = 1
 anchors_preset = 12
@@ -36,7 +119,7 @@ mouse_filter = 2
 theme = ExtResource("4_oe55x")
 metadata/_edit_use_anchors_ = true
 
-[node name="ToolTipLabel" type="Label" parent="ToolTip" index="0"]
+[node name="ToolTipLabel" type="Label" parent="ToolTip"]
 layout_mode = 2
 size_flags_horizontal = 0
 size_flags_vertical = 1
diff --git a/Scenes/Player/UI/player_ui.tscn b/Scenes/Player/UI/player_ui.tscn
index 4f1a8ea..526f2b0 100644
--- a/Scenes/Player/UI/player_ui.tscn
+++ b/Scenes/Player/UI/player_ui.tscn
@@ -1,4 +1,4 @@
-[gd_scene load_steps=15 format=3 uid="uid://dmvukn3rl6gbx"]
+[gd_scene load_steps=16 format=3 uid="uid://dmvukn3rl6gbx"]
 
 [ext_resource type="Script" path="res://Scenes/Player/UI/player_ui.gd" id="1_4nwdk"]
 [ext_resource type="PackedScene" uid="uid://dl0d1m1gfcd4o" path="res://Scenes/Player/UI/bat_button.tscn" id="1_tnnk6"]
@@ -10,6 +10,7 @@
 [ext_resource type="Texture2D" uid="uid://iy5flm8rgj60" path="res://Assets/Inverted hourglass1.png" id="5_vr1sw"]
 [ext_resource type="Texture2D" uid="uid://p3scltkq3g87" path="res://Assets/16.png" id="6_id56p"]
 [ext_resource type="PackedScene" uid="uid://5yfkysexanoh" path="res://Scenes/Player/UI/wolf_button.tscn" id="10_igs07"]
+[ext_resource type="PackedScene" uid="uid://d370efcvbuchm" path="res://Scenes/Player/UI/necromancer_button.tscn" id="11_btls2"]
 
 [sub_resource type="StyleBoxFlat" id="StyleBoxFlat_v6oad"]
 bg_color = Color(0.243137, 0.713726, 0.0627451, 0.301961)
@@ -300,15 +301,12 @@ mouse_filter = 2
 
 [node name="BatButton" parent="UIRoot/ControlPanel/ButtonPanel" instance=ExtResource("1_tnnk6")]
 layout_mode = 2
-button_group = ExtResource("3_7a133")
 
 [node name="WolfButton" parent="UIRoot/ControlPanel/ButtonPanel" instance=ExtResource("10_igs07")]
 layout_mode = 2
 
-[node name="SpawnableButton3" parent="UIRoot/ControlPanel/ButtonPanel" instance=ExtResource("1_tnnk6")]
+[node name="NecromancerButton" parent="UIRoot/ControlPanel/ButtonPanel" instance=ExtResource("11_btls2")]
 layout_mode = 2
-button_group = ExtResource("3_7a133")
 
 [node name="SpawnableButton4" parent="UIRoot/ControlPanel/ButtonPanel" instance=ExtResource("1_tnnk6")]
 layout_mode = 2
-button_group = ExtResource("3_7a133")
diff --git a/Themes/base_theme.tres b/Themes/base_theme.tres
index 5fee1e6..f2e435a 100644
--- a/Themes/base_theme.tres
+++ b/Themes/base_theme.tres
@@ -1,19 +1,7 @@
-[gd_resource type="Theme" load_steps=5 format=3 uid="uid://dr1h7to56a2pv"]
+[gd_resource type="Theme" load_steps=4 format=3 uid="uid://dr1h7to56a2pv"]
 
 [ext_resource type="FontFile" uid="uid://01mccw37teq2" path="res://Assets/Fonts/alagard.ttf" id="1_i16b1"]
 
-[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_yxoll"]
-bg_color = Color(0.231373, 0.254902, 0.588235, 0.396078)
-skew = Vector2(-0.25, -0.01)
-border_color = Color(0, 0, 0, 1)
-corner_radius_bottom_left = 25
-corner_detail = 1
-expand_margin_bottom = 10.0
-shadow_color = Color(0.258824, 0.258824, 0.258824, 0.678431)
-shadow_size = 3
-shadow_offset = Vector2(3, 3)
-anti_aliasing_size = 0.776
-
 [sub_resource type="StyleBoxFlat" id="StyleBoxFlat_hf10d"]
 bg_color = Color(0.403922, 0.0117647, 0.0627451, 0.188235)
 
@@ -22,6 +10,6 @@ bg_color = Color(0.803922, 0.152941, 0.188235, 1)
 
 [resource]
 Label/fonts/font = ExtResource("1_i16b1")
-PanelContainer/styles/panel = SubResource("StyleBoxFlat_yxoll")
+PanelContainer/styles/panel = null
 ProgressBar/styles/background = SubResource("StyleBoxFlat_hf10d")
 ProgressBar/styles/fill = SubResource("StyleBoxFlat_jy7e3")