Merge branch 'Sprint-2' into note-effects

Author: LifeHckr

Globals/Scribe.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Linq;
 using FunkEngine;
 using Godot;
 
@@ -42,6 +43,20 @@ public partial class Scribe : Node
 
     public static readonly RelicTemplate[] RelicDictionary = new[]
     {
+        new RelicTemplate(
+            "Breakfast", //Reference ha ha, Item to give when relic pool is empty.
+            new RelicEffect[]
+            {
+                new RelicEffect(
+                    BattleEffectTrigger.NotePlaced,
+                    1,
+                    (director, val) =>
+                    {
+                        director.Player.Heal(val);
+                    }
+                ),
+            }
+        ),
         new RelicTemplate(
             "Good Vibes",
             new RelicEffect[]
@@ -56,5 +71,40 @@ public partial class Scribe : Node
                 ),
             }
         ),
+        new RelicTemplate(
+            "Dummy Item",
+            new RelicEffect[]
+            {
+                new RelicEffect(
+                    BattleEffectTrigger.NotePlaced,
+                    100,
+                    (director, val) =>
+                    {
+                        director.Player.Heal(val);
+                    }
+                ),
+            }
+        ),
     };
+
+    //TODO: Item pool(s)
+
+    public static RelicTemplate[] GetRandomRelics(RelicTemplate[] ownedRelics, int count)
+    {
+        var availableRelics = Scribe
+            .RelicDictionary.Where(r => !ownedRelics.Any(o => o.Name == r.Name))
+            .ToArray();
+
+        availableRelics = availableRelics
+            .OrderBy(_ => StageProducer.GlobalRng.Randi())
+            .Take(count)
+            .Select(r => r.Clone())
+            .ToArray();
+
+        for (int i = availableRelics.Length; i < count; i++)
+        {
+            availableRelics = availableRelics.Append(RelicDictionary[0].Clone()).ToArray();
+        }
+        return availableRelics;
+    }
 }

Globals/StageProducer.cs

@@ -16,6 +16,10 @@ public partial class StageProducer : Node
 
     private MapGrid _map = new MapGrid();
 
+    //Hold here to persist between changes
+    //TODO: Allow for permanent changes and battle temporary stat changes.
+    public static PlayerStats PlayerStats;
+
     public class MapGrid
     {
         private int[,] _map;
@@ -108,6 +112,7 @@ public void StartGame()
         _map.InitMapGrid(2, 2, 1);
         _seed = GlobalRng.Seed;
         _lastRngState = GlobalRng.State;
+        PlayerStats = new PlayerStats();
     }
 
     public void TransitionStage(Stages nextStage)
@@ -119,8 +124,16 @@ public void TransitionStage(Stages nextStage)
                 GetTree().ChangeSceneToFile("res://scenes/SceneTransitions/TitleScreen.tscn");
                 break;
             case Stages.Battle:
+                StartGame();
                 GetTree().ChangeSceneToFile("res://scenes/BattleDirector/test_battle_scene.tscn");
                 break;
+            case Stages.Quit:
+                GD.Print("Exiting game");
+                GetTree().Quit();
+                return;
+            default:
+                GD.Print($"Error Scene Transition is {nextStage}");
+                break;
         }
 
         _curStage = nextStage;

project.godot

@@ -58,6 +58,11 @@ arrowRight={
 , Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":68,"key_label":0,"unicode":100,"location":0,"echo":false,"script":null)
 ]
 }
+Pause={
+"deadzone": 0.5,
+"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":4194305,"key_label":0,"unicode":0,"location":0,"echo":false,"script":null)
+]
+}
 
 [rendering]
 

scenes/BattleDirector/scripts/BattleDirector.cs

@@ -84,6 +84,7 @@ public override void _Ready()
 
         Player = new PlayerPuppet();
         AddChild(Player);
+        Player.Defeated += CheckBattleStatus;
         EventizeRelics();
         //TODO: Refine
         foreach (var note in Player.Stats.CurNotes)
@@ -97,6 +98,7 @@ public override void _Ready()
         Enemy = new PuppetTemplate();
         Enemy.SetPosition(new Vector2(400, 0));
         AddChild(Enemy);
+        Enemy.Defeated += CheckBattleStatus;
         Enemy.Init(GD.Load<Texture2D>("res://scenes/BattleDirector/assets/Enemy1.png"), "Enemy");
         Enemy.Sprite.Scale *= 2;
 
@@ -134,6 +136,26 @@ public override void _Process(double delta)
     #endregion
 
     #region Input&Timing
+
+    public override void _UnhandledInput(InputEvent @event)
+    {
+        //this one is for calling a debug key to insta-kill the enemy
+        if (@event is InputEventKey eventKey && eventKey.Pressed && !eventKey.Echo)
+        {
+            if (eventKey.Keycode == Key.Key0)
+            {
+                DebugKillEnemy();
+            }
+        }
+
+        if (@event.IsActionPressed("Pause"))
+        {
+            var pauseMenu = GD.Load<PackedScene>("res://scenes/UI/Pause.tscn");
+            GetNode<CanvasLayer>("UILayer").AddChild(pauseMenu.Instantiate());
+            GetTree().Paused = true;
+        }
+    }
+
     private void OnNotePressed(ArrowType type)
     {
         CD.CheckNoteTiming(type);
@@ -186,6 +208,31 @@ private Timing CheckTiming(double beatDif)
         return Timing.Miss;
     }
 
+    private void CheckBattleStatus(PuppetTemplate puppet)
+    {
+        if (puppet == Player)
+        {
+            GD.Print("Player is Dead");
+            return;
+        }
+
+        //will have to adjust this to account for when we have multiple enemies at once
+        if (puppet == Enemy)
+        {
+            GD.Print("Enemy is dead");
+            ShowRewardSelection(3);
+        }
+    }
+
+    private void ShowRewardSelection(int amount)
+    {
+        var rewardUI = GD.Load<PackedScene>("res://scenes/UI/RewardSelectionUI.tscn")
+            .Instantiate<RewardSelect>();
+        AddChild(rewardUI);
+        rewardUI.Initialize(Player.Stats, amount);
+        GetTree().Paused = true;
+    }
+
     #endregion
 
     #region BattleEffect Handling
@@ -210,4 +257,9 @@ private void EventizeRelics()
         }
     }
     #endregion
+
+    private void DebugKillEnemy()
+    {
+        Enemy.TakeDamage(1000);
+    }
 }

scenes/BattleDirector/test_battle_scene.tscn

@@ -7,16 +7,18 @@
 [ext_resource type="PackedScene" uid="uid://duhiilcv4tat3" path="res://scenes/BattleDirector/NotePlacementBar.tscn" id="7_3ko4g"]
 [ext_resource type="PackedScene" uid="uid://bvhpon5liybd1" path="res://scenes/CustomNotes/NoteQueue.tscn" id="8_7wwxo"]
 [ext_resource type="AudioStream" uid="uid://cv6lqjj6lu36h" path="res://Audio/335571__magntron__gamemusic_120bpm.mp3" id="8_caqms"]
-[ext_resource type="Script" path="res://scenes/SceneTransitions/scripts/SceneChange.cs" id="9_bxa6e"]
 
 [node name="ProtoBattleDirector" type="Node2D" node_paths=PackedStringArray("CM", "NotePlacementBar", "CD", "Audio", "NQ")]
+process_mode = 1
 script = ExtResource("1_cwqqr")
 CM = NodePath("SubViewport")
 NotePlacementBar = NodePath("NotePlacementBar")
 CD = NodePath("Conductor")
 Audio = NodePath("AudioStreamPlayer")
 NQ = NodePath("NoteQueue")
 
+[node name="UILayer" type="CanvasLayer" parent="."]
+
 [node name="Conductor" type="Node" parent="." node_paths=PackedStringArray("CM")]
 script = ExtResource("2_pcp76")
 CM = NodePath("../SubViewport")
@@ -51,12 +53,6 @@ offset_top = 164.0
 offset_right = 16.0
 offset_bottom = 164.0
 
-[node name="LeaveButton" type="Button" parent="."]
-offset_right = 119.0
-offset_bottom = 31.0
-text = "Return to Title"
-script = ExtResource("9_bxa6e")
-
 [node name="TempRelicList" type="Label" parent="."]
 offset_left = 564.0
 offset_top = 165.0

scenes/Puppets/scripts/PlayerPuppet.cs

@@ -3,13 +3,30 @@
 
 public partial class PlayerPuppet : PuppetTemplate
 {
-    public PlayerStats Stats = new PlayerStats();
+    public PlayerStats Stats;
 
     public override void _Ready()
     {
-        base._Ready();
+        Stats = StageProducer.PlayerStats;
+
+        _currentHealth = Stats.CurrentHealth;
+        _maxHealth = Stats.MaxHealth;
+
         Init(GD.Load<Texture2D>("res://scenes/BattleDirector/assets/Character1.png"), "Player");
         SetPosition(new Vector2(80, 0));
         Sprite.Position += Vector2.Down * 30; //TEMP
+        base._Ready();
+    }
+
+    public override void TakeDamage(int amount)
+    {
+        base.TakeDamage(amount);
+        Stats.CurrentHealth = _currentHealth;
+    }
+
+    public override void Heal(int amount)
+    {
+        base.Heal(amount);
+        Stats.CurrentHealth = _currentHealth;
     }
 }

scenes/Puppets/scripts/PlayerStats.cs

@@ -1,11 +1,24 @@
 using System;
+using System.Linq;
 using Godot;
 
 public partial class PlayerStats : Resource
 {
-    public int MaxHealth = 300;
-    public Note[] CurNotes = new Note[] { Scribe.NoteDictionary[1].Clone() };
+    public int MaxHealth = 100;
+    public int CurrentHealth = 100;
+    public Note[] CurNotes = new Note[] { Scribe.NoteDictionary[1].Clone() }; //TODO: Get a better method than .Clone
 
-    public RelicTemplate[] CurRelics = new[] { Scribe.RelicDictionary[0].Clone() };
+    public RelicTemplate[] CurRelics = Array.Empty<RelicTemplate>();
     public int Attack = 1;
+
+    public void AddRelic(RelicTemplate relic)
+    {
+        if (CurRelics.Any(r => r.Name == relic.Name))
+        {
+            GD.PrintErr("Relic already in inventory: " + relic.Name);
+            return;
+        }
+        CurRelics = CurRelics.Append(relic).ToArray();
+        GD.Print("Adding relic: " + relic.Name);
+    }
 }

scenes/Puppets/scripts/PuppetTemplate.cs

@@ -6,6 +6,9 @@
  */
 public partial class PuppetTemplate : Node2D
 {
+    public delegate void DefeatedHandler(PuppetTemplate self);
+    public event DefeatedHandler Defeated;
+
     protected HealthBar _healthBar;
     public Sprite2D Sprite = new Sprite2D();
 
@@ -34,13 +37,22 @@ public void Init(Texture2D texture, string name)
         UniqName = name;
     }
 
-    public void TakeDamage(int amount)
+    public virtual void TakeDamage(int amount)
+    {
+        _currentHealth = _healthBar.ChangeHP(-amount);
+        if (_currentHealth <= 0)
+        {
+            Defeated?.Invoke(this);
+        }
+    }
+
+    public virtual void Heal(int amount)
     {
-        _healthBar.ChangeHP(-amount);
+        _currentHealth = _healthBar.ChangeHP(amount);
     }
 
-    public void Heal(int amount)
+    public int GetCurrentHealth()
     {
-        _healthBar.ChangeHP(amount);
+        return _currentHealth;
     }
 }

scenes/SceneTransitions/scripts/SceneChange.cs

@@ -15,13 +15,6 @@ public override void _Ready()
 
     private void OnButtonPressed()
     {
-        if (ScenePath == Stages.Quit)
-        {
-            GD.Print("Exiting game");
-            GetTree().Quit();
-            return;
-        }
-
         GD.Print($"✅ Loading scene: {ScenePath}");
         GetNode<StageProducer>("/root/StageProducer").TransitionStage(ScenePath);
     }