Merge pull request #332 from Teicsoft/battle-scene

Final code polish

Author: emmettirl

scenes/sub/transition.tscn

@@ -1,11 +1,11 @@
-[gd_scene load_steps=7 format=3 uid="uid://bkec4arelvorf"]
+[gd_scene load_steps=7 format=3 uid="uid://dqv8reex3t0hg"]
 
-[ext_resource type="Script" path="res://scripts/battle/transition.cs" id="1_4yu2e"]
-[ext_resource type="Texture2D" uid="uid://r72uy6270ak6" path="res://assets/sprites/Dave/Trim.png" id="1_b6e3l"]
-[ext_resource type="Theme" uid="uid://bi7ohn58wto5o" path="res://scripts/customresource/roman_font.tres" id="2_4hrw0"]
-[ext_resource type="Theme" uid="uid://b4367d11n6l8i" path="res://styles/Nimbus.tres" id="3_p447v"]
-[ext_resource type="Texture2D" uid="uid://bd2ts5rilcdyv" path="res://assets/ui/large_button.png" id="4_hv6j5"]
-[ext_resource type="FontFile" uid="uid://cb6jcjbshfiq" path="res://assets/fonts/new_jersey/Jersey10-Regular.ttf" id="5_d7tnt"]
+[ext_resource type="Script" path="res://scripts/battle/Transition.cs" id="1_lcc5y"]
+[ext_resource type="Texture2D" uid="uid://r72uy6270ak6" path="res://assets/sprites/Dave/Trim.png" id="2_j2qka"]
+[ext_resource type="Theme" uid="uid://bi7ohn58wto5o" path="res://scripts/customresource/roman_font.tres" id="3_iiwk1"]
+[ext_resource type="Theme" uid="uid://b4367d11n6l8i" path="res://styles/Nimbus.tres" id="4_0rr4i"]
+[ext_resource type="Texture2D" uid="uid://bd2ts5rilcdyv" path="res://assets/ui/large_button.png" id="5_x35tu"]
+[ext_resource type="FontFile" uid="uid://cb6jcjbshfiq" path="res://assets/fonts/new_jersey/Jersey10-Regular.ttf" id="6_l5ira"]
 
 [node name="Transition" type="ColorRect"]
 anchors_preset = 15
@@ -14,7 +14,7 @@ anchor_bottom = 1.0
 grow_horizontal = 2
 grow_vertical = 2
 color = Color(0.701961, 0.219608, 0.192157, 1)
-script = ExtResource("1_4yu2e")
+script = ExtResource("1_lcc5y")
 
 [node name="Trims" type="Control" parent="."]
 layout_mode = 1
@@ -34,7 +34,7 @@ anchor_bottom = 1.0
 offset_left = -52.0
 grow_horizontal = 0
 grow_vertical = 2
-texture = ExtResource("1_b6e3l")
+texture = ExtResource("2_j2qka")
 flip_v = true
 
 [node name="TrimLeft" type="TextureRect" parent="Trims"]
@@ -43,7 +43,7 @@ anchors_preset = 9
 anchor_bottom = 1.0
 offset_right = 52.0
 grow_vertical = 2
-texture = ExtResource("1_b6e3l")
+texture = ExtResource("2_j2qka")
 
 [node name="VBoxContainer" type="VBoxContainer" parent="."]
 layout_mode = 1
@@ -65,7 +65,7 @@ theme_override_constants/margin_bottom = 20
 
 [node name="Title" type="Label" parent="VBoxContainer/MarginContainer"]
 layout_mode = 2
-theme = ExtResource("2_4hrw0")
+theme = ExtResource("3_iiwk1")
 theme_override_font_sizes/font_size = 85
 text = "FOE VANQUISHED!"
 horizontal_alignment = 1
@@ -78,7 +78,7 @@ theme_override_constants/margin_bottom = 20
 
 [node name="Title2" type="Label" parent="VBoxContainer/MarginContainer3"]
 layout_mode = 2
-theme = ExtResource("3_p447v")
+theme = ExtResource("4_0rr4i")
 theme_override_font_sizes/font_size = 37
 text = "This round is yours, but CYBIGULA'S BLOODLUST has not yet been SATED!
 Will you continue for greater GLORY, or retreat as a COWARD?"
@@ -96,7 +96,7 @@ layout_mode = 2
 custom_minimum_size = Vector2(0, 80)
 layout_mode = 2
 size_flags_horizontal = 3
-texture_normal = ExtResource("4_hv6j5")
+texture_normal = ExtResource("5_x35tu")
 stretch_mode = 5
 
 [node name="Continue" type="Label" parent="VBoxContainer/MarginContainer2/HBoxContainer/Continue Button"]
@@ -115,15 +115,15 @@ grow_vertical = 2
 theme_override_colors/font_color = Color(0, 0, 0, 1)
 theme_override_colors/font_shadow_color = Color(0.780392, 0.862745, 0.815686, 1)
 theme_override_constants/shadow_offset_x = 0
-theme_override_fonts/font = ExtResource("5_d7tnt")
+theme_override_fonts/font = ExtResource("6_l5ira")
 theme_override_font_sizes/font_size = 38
 text = "Continue"
 horizontal_alignment = 1
 
 [node name="Retreat Button" type="TextureButton" parent="VBoxContainer/MarginContainer2/HBoxContainer"]
 layout_mode = 2
 size_flags_horizontal = 3
-texture_normal = ExtResource("4_hv6j5")
+texture_normal = ExtResource("5_x35tu")
 stretch_mode = 5
 
 [node name="Retreat" type="Label" parent="VBoxContainer/MarginContainer2/HBoxContainer/Retreat Button"]
@@ -142,7 +142,7 @@ grow_vertical = 2
 theme_override_colors/font_color = Color(0, 0, 0, 1)
 theme_override_colors/font_shadow_color = Color(0.780392, 0.862745, 0.815686, 1)
 theme_override_constants/shadow_offset_x = 0
-theme_override_fonts/font = ExtResource("5_d7tnt")
+theme_override_fonts/font = ExtResource("6_l5ira")
 theme_override_font_sizes/font_size = 38
 text = "Retreat"
 horizontal_alignment = 1

scripts/autoloads/SceneLoader.cs

@@ -5,8 +5,7 @@
 
 namespace GLADIATE.scripts.autoloads;
 
-public partial class SceneLoader : Godot.Node
-{
+public partial class SceneLoader : Godot.Node {
     private AudioEngine _audioEngine;
     public Node CurrentScene { get; set; }
     public List<Dictionary<string, dynamic>> Battles;
@@ -17,9 +16,7 @@ public partial class SceneLoader : Godot.Node
     public const string PreBossBattleId = "battle_6";
     public const string BossBattleId = "battle_7";
 
-
-    public override void _Ready()
-    {
+    public override void _Ready() {
         _audioEngine = GetNode<AudioEngine>("/root/audio_engine");
 
         i = 0;
@@ -31,38 +28,26 @@ public override void _Ready()
         SpectaclePoints = 0;
     }
 
-    public void GoToScene(string path)
-    {
-        CallDeferred(MethodName.DeferredGotoScene, path);
-    }
+    public void GoToScene(string path) { CallDeferred(MethodName.DeferredGotoScene, path); }
 
-    public void DeferredGotoScene(string path)
-    {
+    public void DeferredGotoScene(string path) {
         CurrentScene.Free();
         var nextScene = GD.Load<PackedScene>(path);
         CurrentScene = nextScene.Instantiate();
         GetTree().Root.AddChild(CurrentScene);
         GetTree().CurrentScene = CurrentScene;
     }
 
-    public void GoToNextBattle()
-    {
-        if (i < Battles.Count)
-        {
+    public void GoToNextBattle() {
+        if (i < Battles.Count) {
             GD.Print("GotoNextBattle");
             CallDeferred("DeferredGotoScene", "res://scenes/battle/Battle.tscn");
-        }
-        else
-        {
+        } else {
             GD.Print("GotoVictory");
             CallDeferred("DeferredGotoScene", "res://scenes/sub/Victory.tscn");
             _audioEngine.PlayMusic("fuck_around_and_find_out_2_electric_boogaloo.mp3");
         }
     }
 
-
-    public Dictionary<string, dynamic> GetCurrentBattleData()
-    {
-        return Battles[i];
-    }
+    public Dictionary<string, dynamic> GetCurrentBattleData() { return Battles[i]; }
 }

scripts/battle/Battle.cs

@@ -8,8 +8,6 @@
 using GLADIATE.scripts.battle.target;
 using GLADIATE.scripts.XmlParsing;
 using Godot;
-using Godot.Collections;
-using Array = Godot.Collections.Array;
 
 namespace GLADIATE.scripts.battle;
 
@@ -24,36 +22,34 @@ public partial class Battle : Control {
     private List<TextureRect> _comboArts = new();
 
     private List<Enemy> _allEnemies;
-    private System.Collections.Generic.Dictionary<string, List<string>> _allDecks;
+    private Dictionary<string, List<string>> _allDecks;
 
     public string Id { get; set; }
     public string BattleName { get; set; }
     public string Music { get; set; }
 
-    AudioEngine _audioEngine;
-    autoloads.SceneLoader _sceneLoader;
+    private AudioEngine _audioEngine;
+    private SceneLoader _sceneLoader;
 
-    Control cardGlossary;
-    ComboGlossary comboGlossary;
+    private Control _cardGlossary;
+    private ComboGlossary _comboGlossary;
 
-    AnimationPlayer animation;
+    private AnimationPlayer _animation;
 
     public override void _Ready() {
         _audioEngine = GetNode<AudioEngine>("/root/audio_engine");
-        _sceneLoader = GetNode<autoloads.SceneLoader>("/root/SceneLoader");
+        _sceneLoader = GetNode<SceneLoader>("/root/SceneLoader");
 
         _allEnemies = EnemyXmlParser.ParseAllEnemies();
         _allDecks = DeckXmlParser.ParseAllDecks();
         _allDecks.TryGetValue(_sceneLoader.DeckSelected, out List<string> playerCardIds);
 
-
-        //UIScaling();
         UIScaling();
 
-        animation = GetNode<AnimationPlayer>("AnimationPlayer");
-        animation.Play("RESET");
+        _animation = GetNode<AnimationPlayer>("AnimationPlayer");
+        _animation.Play("RESET");
 
-        System.Collections.Generic.Dictionary<string, dynamic> battleData = _sceneLoader.GetCurrentBattleData();
+        Dictionary<string, dynamic> battleData = _sceneLoader.GetCurrentBattleData();
         Id = battleData["battle_id"];
         BattleName = battleData["battle_name"];
         Music = battleData["music"];
@@ -62,11 +58,10 @@ public override void _Ready() {
         InitialiseGameState(playerCardIds, enemies);
         InitialiseHud();
 
-        comboGlossary = GetNode<ComboGlossary>("HUD/ComboGlossary");
-        comboGlossary.Initialize(_gameState.Hand.Deck, _gameState.AllCombos);
-
-        cardGlossary = GetNode<Control>("HUD/CardGlossary");
+        _comboGlossary = GetNode<ComboGlossary>("HUD/ComboGlossary");
+        _comboGlossary.Initialize(_gameState.Hand.Deck, _gameState.AllCombos);
 
+        _cardGlossary = GetNode<Control>("HUD/CardGlossary");
 
         GetNode<Label>("HUD/VsLabel").Text = BattleName;
 
@@ -84,7 +79,7 @@ public override void _Process(double delta) {
 
         //this line is needed to prevent a lock situation where bote glossaries and escape menu are opended.
         // when the pause menu is closed, the pause state is removed, so glossary stop processing and it is impossible to exit.
-        if (cardGlossary.Visible || comboGlossary.Visible) { GetTree().Paused = true; }
+        if (_cardGlossary.Visible || _comboGlossary.Visible) { GetTree().Paused = true; }
 
         if (SceneLoader.BossBattleId == Id) {
             foreach (Enemy enemy in _gameState.Enemies) {
@@ -129,7 +124,7 @@ private void InitialiseGameState(List<string> playerCardIds, List<Enemy> enemies
         _gameState.AllEnemiesDefeatedCustomEvent += WinBattle;
         _gameState.ComboPlayedCustomEvent += DisplayPlayedCombo;
         _gameState.Hand.Deck.DeckShuffledCustomEvent += OnDeckShuffled;
-        _gameState.Player.PlayerModifierChangedCustomEvent += OnPlayerMofifierChanged;
+        _gameState.Player.PlayerModifierChangedCustomEvent += OnPlayerModifierChanged;
         _gameState.Player.Statuses.PlayerStatusesChangedCustomEvent += UpdateStatusesToolTip;
 
 
@@ -142,18 +137,17 @@ private void InitialiseGameState(List<string> playerCardIds, List<Enemy> enemies
     public void UpdateStatusesToolTip(object sender, EventArgs e) {
         TextureRect statusIndicator = GetNode<TextureRect>("HUD/StatusIndicator");
         string statusString = "";
-
         foreach (Utils.StatusEnum status in _gameState.Player.Statuses) { statusString += status + "\n"; }
         statusIndicator.TooltipText = statusString;
         if (statusString.Length > 0) { statusIndicator.Show(); } else { statusIndicator.Hide(); }
     }
 
-    private void OnPlayerMofifierChanged(object sender, EventArgs e) {
-        TextureRect PlayerModifierIcon = GetNode<TextureRect>("HUD/PlayerModifierIcon");
-        if (_gameState.Player.Modifier == Utils.ModifierEnum.None) { PlayerModifierIcon.Visible = false; } else {
-            PlayerModifierIcon.Texture =
+    private void OnPlayerModifierChanged(object sender, EventArgs e) {
+        TextureRect playerModifierIcon = GetNode<TextureRect>("HUD/PlayerModifierIcon");
+        if (_gameState.Player.Modifier == Utils.ModifierEnum.None) { playerModifierIcon.Visible = false; } else {
+            playerModifierIcon.Texture =
                 (Texture2D)GD.Load($"res://assets/images/ModifierIcons/{_gameState.Player.Modifier}.png");
-            PlayerModifierIcon.Visible = true;
+            playerModifierIcon.Visible = true;
         }
     }
 
@@ -260,7 +254,7 @@ private void OnPlayButtonPressed() {
     private void EndTurn() { _gameState.EndTurn(); }
 
     private void WinBattle(object sender, EventArgs eventArgs) {
-        EmitSignal(Battle.SignalName.BattleWon, _gameState.Player);
+        EmitSignal(SignalName.BattleWon, _gameState.Player);
 
         if (Id != SceneLoader.PreBossBattleId) { _audioEngine.PlaySoundFx("victory-jingle.wav"); } else {
             _audioEngine.PlaySoundFx("male-hurt-1.ogg");
@@ -295,9 +289,9 @@ private void MoveSelectedIndicator(object sender, EventArgs e) {
     private void OnPlayerHealthChanged() {
         Player playerObject = _gameState.Player;
         if (playerObject.Health <= 0) {
-            EmitSignal(Battle.SignalName.BattleLost);
+            EmitSignal(SignalName.BattleLost);
 
-            _sceneLoader = GetNode<autoloads.SceneLoader>("/root/SceneLoader");
+            _sceneLoader = GetNode<SceneLoader>("/root/SceneLoader");
             _audioEngine.PlayMusic("Lil_tune.wav");
             _sceneLoader.GoToScene("res://scenes/sub/GameOver.tscn");
         }
@@ -444,6 +438,7 @@ private void UIScaling() {
 
         Path2D hand = GetNode<Path2D>("Hand");
         hand.Scale = scaleFactor;
+
         Path2D enemies = GetNode<Path2D>("Enemies");
         enemies.Scale = scaleFactor;
 

scripts/battle/Deck.cs

@@ -10,11 +10,10 @@ public class Deck<T> {
     public string Name { get; set; }
 
     public Discard<T> Discard { get; set; }
-    public List<T> Cards;
+    public List<T> Cards = new();
 
     public Deck(Discard<T> discard) {
         Discard = discard;
-        Cards = new();
     }
 
     public static List<CardSleeve> SleeveCards(List<Card> cards) {
@@ -74,7 +73,6 @@ public List<T> DrawCards(int amount) {
 
     private List<T> OnDeckEmptied(int amount) {
         if (Discard.IsEmpty()) { return new(); }
-
         AddCards(Discard.GetCards());
         Shuffle();
         return DrawCards(amount);

scripts/battle/Discard.cs

@@ -9,7 +9,6 @@ public class Discard<T> {
     public List<T> GetCards(bool clear = true) {
         List<T> output = new(Cards);
         if (clear) { Cards.Clear(); }
-
         return output;
     }
 }

scripts/battle/Hand.cs

@@ -61,8 +61,7 @@ private void UpdateCardPositions() {
             handCardLocation.ProgressRatio = (i + 1f) / (Cards.Count + 1f);
             Vector2 cardPosition = handCardLocation.Position;
             cardSleeve.ZIndex = i;
-            if (i == _selectedCardIndex)
-            {
+            if (i == _selectedCardIndex) {
                 cardPosition.Y -= 100;
                 cardSleeve.ZIndex = i + 100;
             }