From 692cf282da4ec469cdebeb59dba7dfef77aca6ed Mon Sep 17 00:00:00 2001
From: LifeHckr <jarodthereal@gmail.com>
Date: Tue, 11 Feb 2025 12:05:38 -0800
Subject: [PATCH 1/6] Simple Inventory menu implemented

---
 Classes/Notes/Note.cs                         |  9 +-
 Classes/Relics/RelicTemplate.cs               | 16 +++-
 Globals/Scribe.cs                             | 31 +++---
 project.godot                                 |  5 +
 .../BattleDirector/scripts/BattleDirector.cs  |  9 +-
 scenes/BattleDirector/test_battle_scene.tscn  |  8 --
 scenes/UI/display_button.tscn                 | 11 +++
 scenes/UI/inventory.tscn                      | 95 +++++++++++++++++++
 scenes/UI/scripts/DisplayButton.cs            | 22 +++++
 scenes/UI/scripts/Inventory.cs                | 75 +++++++++++++++
 10 files changed, 245 insertions(+), 36 deletions(-)
 create mode 100644 scenes/UI/display_button.tscn
 create mode 100644 scenes/UI/inventory.tscn
 create mode 100644 scenes/UI/scripts/DisplayButton.cs
 create mode 100644 scenes/UI/scripts/Inventory.cs

diff --git a/Classes/Notes/Note.cs b/Classes/Notes/Note.cs
index 9c16e50f..1533856f 100644
--- a/Classes/Notes/Note.cs
+++ b/Classes/Notes/Note.cs
@@ -13,21 +13,20 @@ public partial class Note : Resource
     private int _baseVal;
     private Action<BattleDirector, Note, Timing> NoteEffect; //TODO: Where/How to deal with timing.
 
+    public string Tooltip;
     public Texture2D Texture;
 
-    //public string Tooltip;
-
     public Note(
         string name,
-        PuppetTemplate owner = null,
+        string tooltip,
         Texture2D texture = null,
+        PuppetTemplate owner = null,
         int baseVal = 1,
         Action<BattleDirector, Note, Timing> noteEffect = null
     )
     {
         Name = name;
         Owner = owner;
-        Texture = texture;
         NoteEffect =
             noteEffect
             ?? (
@@ -37,6 +36,8 @@ public Note(
                 }
             );
         _baseVal = baseVal;
+        Texture = texture;
+        Tooltip = tooltip;
     }
 
     public void OnHit(BattleDirector BD, Timing timing)
diff --git a/Classes/Relics/RelicTemplate.cs b/Classes/Relics/RelicTemplate.cs
index 892e1bdf..ad317192 100644
--- a/Classes/Relics/RelicTemplate.cs
+++ b/Classes/Relics/RelicTemplate.cs
@@ -7,12 +7,20 @@ public partial class RelicTemplate : Resource
     public RelicEffect[] Effects;
     public string Name;
 
-    //public Texture2D Texture
-    //public string Tooltip
-    public RelicTemplate(string Name = "", RelicEffect[] EffectTags = null)
+    public Texture2D Texture;
+    public string Tooltip;
+
+    public RelicTemplate(
+        string name = "",
+        string tooltip = "",
+        Texture2D texture = null,
+        RelicEffect[] EffectTags = null
+    )
     {
         Effects = EffectTags;
-        this.Name = Name;
+        Name = name;
+        Tooltip = tooltip;
+        Texture = texture;
     }
 
     public RelicTemplate Clone()
diff --git a/Globals/Scribe.cs b/Globals/Scribe.cs
index 7a7d4775..75ee36a4 100644
--- a/Globals/Scribe.cs
+++ b/Globals/Scribe.cs
@@ -12,7 +12,8 @@ public partial class Scribe : Node
     {
         new Note(
             "EnemyBase",
-            null,
+            "Basic enemy note, deals damage to player.",
+            GD.Load<Texture2D>("res://scenes/BattleDirector/assets/Character1.png"),
             null,
             1,
             (director, note, timing) =>
@@ -22,8 +23,9 @@ public partial class Scribe : Node
         ),
         new Note(
             "PlayerBase",
-            null,
+            "Basic player note, deals damage to enemy",
             GD.Load<Texture2D>("res://Classes/Notes/assets/single_note.png"),
+            null,
             1,
             (director, note, timing) =>
             {
@@ -32,8 +34,9 @@ public partial class Scribe : Node
         ),
         new Note(
             "PlayerDouble",
+            "Basic player note, deals damage to enemy",
+            GD.Load<Texture2D>("res://Classes/Notes/assets/single_note.png"),
             null,
-            GD.Load<Texture2D>("res://Classes/Notes/assets/double_note.png"),
             1,
             (director, note, timing) =>
             {
@@ -48,11 +51,13 @@ public partial class Scribe : Node
     {
         new RelicTemplate(
             "Breakfast", //Reference ha ha, Item to give when relic pool is empty.
+            "Breakfast, currently does nothing :).", //TODO: Description can include the relics values?
+            GD.Load<Texture2D>("res://scenes/BattleDirector/assets/Character1.png"),
             new RelicEffect[]
             {
                 new RelicEffect(
                     BattleEffectTrigger.NotePlaced,
-                    1,
+                    0,
                     (director, val) =>
                     {
                         director.Player.Heal(val);
@@ -62,25 +67,13 @@ public partial class Scribe : Node
         ),
         new RelicTemplate(
             "Good Vibes",
+            "Good vibes, heals the player whenever they place a note.", //TODO: Description can include the relics values?
+            GD.Load<Texture2D>("res://scenes/BattleDirector/assets/Character1.png"),
             new RelicEffect[]
             {
                 new RelicEffect(
                     BattleEffectTrigger.NotePlaced,
-                    5,
-                    (director, val) =>
-                    {
-                        director.Player.Heal(val);
-                    }
-                ),
-            }
-        ),
-        new RelicTemplate(
-            "Dummy Item",
-            new RelicEffect[]
-            {
-                new RelicEffect(
-                    BattleEffectTrigger.NotePlaced,
-                    100,
+                    1,
                     (director, val) =>
                     {
                         director.Player.Heal(val);
diff --git a/project.godot b/project.godot
index 7258ddc5..94e0cab0 100644
--- a/project.godot
+++ b/project.godot
@@ -63,6 +63,11 @@ Pause={
 "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)
 ]
 }
+Inventory={
+"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":73,"key_label":0,"unicode":105,"location":0,"echo":false,"script":null)
+]
+}
 
 [rendering]
 
diff --git a/scenes/BattleDirector/scripts/BattleDirector.cs b/scenes/BattleDirector/scripts/BattleDirector.cs
index 524b712d..39643e62 100644
--- a/scenes/BattleDirector/scripts/BattleDirector.cs
+++ b/scenes/BattleDirector/scripts/BattleDirector.cs
@@ -134,6 +134,14 @@ public override void _UnhandledInput(InputEvent @event)
             GetNode<CanvasLayer>("UILayer").AddChild(pauseMenu.Instantiate());
             GetTree().Paused = true;
         }
+        if (@event.IsActionPressed("Inventory"))
+        {
+            var invenMenu = GD.Load<PackedScene>("res://scenes/UI/inventory.tscn")
+                .Instantiate<Inventory>();
+            GetNode<CanvasLayer>("UILayer").AddChild(invenMenu);
+            invenMenu.Display(Player.Stats);
+            GetTree().Paused = true;
+        }
     }
 
     private void OnNotePressed(ArrowType type)
@@ -224,7 +232,6 @@ private void EventizeRelics()
     {
         foreach (var relic in Player.Stats.CurRelics)
         {
-            GetNode<Label>("TempRelicList").Text += "\n" + relic.Name;
             foreach (var effect in relic.Effects)
             {
                 switch (effect.GetTrigger()) //TODO: Look into a way to get eventhandler from string
diff --git a/scenes/BattleDirector/test_battle_scene.tscn b/scenes/BattleDirector/test_battle_scene.tscn
index 90bbb51e..a6435a65 100644
--- a/scenes/BattleDirector/test_battle_scene.tscn
+++ b/scenes/BattleDirector/test_battle_scene.tscn
@@ -51,11 +51,3 @@ offset_left = 16.0
 offset_top = 164.0
 offset_right = 16.0
 offset_bottom = 164.0
-
-[node name="TempRelicList" type="Label" parent="."]
-offset_left = 564.0
-offset_top = 165.0
-offset_right = 613.0
-offset_bottom = 188.0
-theme_override_font_sizes/font_size = 10
-text = "Relics:"
diff --git a/scenes/UI/display_button.tscn b/scenes/UI/display_button.tscn
new file mode 100644
index 00000000..3dc408b8
--- /dev/null
+++ b/scenes/UI/display_button.tscn
@@ -0,0 +1,11 @@
+[gd_scene load_steps=2 format=3 uid="uid://cymo26khpw4m1"]
+
+[ext_resource type="Script" path="res://scenes/UI/scripts/DisplayButton.cs" id="1_7lpm6"]
+
+[node name="DisplayButton" type="Button"]
+anchors_preset = 15
+anchor_right = 1.0
+anchor_bottom = 1.0
+grow_horizontal = 2
+grow_vertical = 2
+script = ExtResource("1_7lpm6")
diff --git a/scenes/UI/inventory.tscn b/scenes/UI/inventory.tscn
new file mode 100644
index 00000000..694486ae
--- /dev/null
+++ b/scenes/UI/inventory.tscn
@@ -0,0 +1,95 @@
+[gd_scene load_steps=2 format=3 uid="uid://be6fb2sr5i515"]
+
+[ext_resource type="Script" path="res://scenes/UI/scripts/Inventory.cs" id="1_8rcwd"]
+
+[node name="Inventory" type="Control" node_paths=PackedStringArray("Relics", "Notes", "Description", "Tabs")]
+process_mode = 2
+layout_mode = 3
+anchors_preset = 15
+anchor_right = 1.0
+anchor_bottom = 1.0
+grow_horizontal = 2
+grow_vertical = 2
+script = ExtResource("1_8rcwd")
+Relics = NodePath("InvenVBox/Tabs/Relics/RelicBox/RelicGrid")
+Notes = NodePath("InvenVBox/Tabs/Notes/NotesBox/NotesGrid")
+Description = NodePath("InvenVBox/DescBox/Description")
+Tabs = NodePath("InvenVBox/Tabs")
+
+[node name="BG" type="ColorRect" parent="."]
+layout_mode = 1
+anchors_preset = 15
+anchor_right = 1.0
+anchor_bottom = 1.0
+grow_horizontal = 2
+grow_vertical = 2
+color = Color(0, 0, 0.2, 0.533333)
+
+[node name="InvenVBox" type="VBoxContainer" parent="."]
+layout_mode = 1
+anchors_preset = 15
+anchor_right = 1.0
+anchor_bottom = 1.0
+grow_horizontal = 2
+grow_vertical = 2
+
+[node name="Tabs" type="TabContainer" parent="InvenVBox"]
+layout_mode = 2
+size_flags_vertical = 3
+current_tab = 0
+clip_tabs = false
+
+[node name="Notes" type="MarginContainer" parent="InvenVBox/Tabs"]
+layout_mode = 2
+theme_override_constants/margin_left = 30
+theme_override_constants/margin_top = 30
+theme_override_constants/margin_right = 30
+theme_override_constants/margin_bottom = 30
+metadata/_tab_index = 0
+
+[node name="NotesBox" type="ScrollContainer" parent="InvenVBox/Tabs/Notes"]
+layout_mode = 2
+follow_focus = true
+
+[node name="NotesGrid" type="GridContainer" parent="InvenVBox/Tabs/Notes/NotesBox"]
+layout_mode = 2
+size_flags_vertical = 4
+columns = 5
+
+[node name="Relics" type="MarginContainer" parent="InvenVBox/Tabs"]
+visible = false
+layout_mode = 2
+theme_override_constants/margin_left = 30
+theme_override_constants/margin_top = 30
+theme_override_constants/margin_right = 30
+theme_override_constants/margin_bottom = 30
+metadata/_tab_index = 1
+
+[node name="RelicBox" type="ScrollContainer" parent="InvenVBox/Tabs/Relics"]
+layout_mode = 2
+follow_focus = true
+
+[node name="RelicGrid" type="GridContainer" parent="InvenVBox/Tabs/Relics/RelicBox"]
+layout_mode = 2
+size_flags_vertical = 4
+columns = 5
+
+[node name="DescBox" type="MarginContainer" parent="InvenVBox"]
+layout_mode = 2
+size_flags_vertical = 3
+size_flags_stretch_ratio = 0.4
+theme_override_constants/margin_left = 10
+theme_override_constants/margin_top = 10
+theme_override_constants/margin_right = 10
+theme_override_constants/margin_bottom = 10
+
+[node name="ColorRect" type="ColorRect" parent="InvenVBox/DescBox"]
+layout_mode = 2
+color = Color(0, 0, 0, 0.552941)
+
+[node name="Description" type="Label" parent="InvenVBox/DescBox"]
+layout_mode = 2
+size_flags_vertical = 1
+autowrap_mode = 2
+clip_text = true
+text_overrun_behavior = 1
diff --git a/scenes/UI/scripts/DisplayButton.cs b/scenes/UI/scripts/DisplayButton.cs
new file mode 100644
index 00000000..ef2130d2
--- /dev/null
+++ b/scenes/UI/scripts/DisplayButton.cs
@@ -0,0 +1,22 @@
+using System;
+using Godot;
+
+public partial class DisplayButton : Button
+{
+    [Export]
+    public Texture2D Texture;
+
+    [Export]
+    public string Description;
+
+    [Export]
+    public string DisplayName;
+
+    public void Display(Texture2D texture, string description, string name)
+    {
+        Texture = texture;
+        Description = description;
+        DisplayName = name;
+        Icon = Texture;
+    }
+}
diff --git a/scenes/UI/scripts/Inventory.cs b/scenes/UI/scripts/Inventory.cs
new file mode 100644
index 00000000..e146f5e0
--- /dev/null
+++ b/scenes/UI/scripts/Inventory.cs
@@ -0,0 +1,75 @@
+using System;
+using Godot;
+
+public partial class Inventory : Control
+{
+    [Export]
+    private GridContainer Relics;
+
+    [Export]
+    private GridContainer Notes;
+
+    [Export]
+    private Label Description;
+
+    [Export]
+    private TabContainer Tabs;
+
+    public void Display(PlayerStats playerStats)
+    {
+        foreach (RelicTemplate relic in playerStats.CurRelics)
+        {
+            var newButton = GD.Load<PackedScene>("res://scenes/UI/display_button.tscn")
+                .Instantiate<DisplayButton>();
+            newButton.Display(relic.Texture, relic.Tooltip, relic.Name);
+            newButton.Pressed += () =>
+            {
+                DoDescription(newButton);
+            };
+            Relics.AddChild(newButton);
+        }
+        foreach (Note note in playerStats.CurNotes)
+        {
+            var newButton = GD.Load<PackedScene>("res://scenes/UI/display_button.tscn")
+                .Instantiate<DisplayButton>();
+            newButton.Display(note.Texture, note.Tooltip, note.Name);
+            newButton.Pressed += () =>
+            {
+                DoDescription(newButton);
+            };
+            Notes.AddChild(newButton);
+        }
+
+        Tabs.TabChanged += ClearDescription;
+    }
+
+    public override void _Ready()
+    {
+        Tabs.GetTabBar().GrabFocus();
+    }
+
+    public override void _Input(InputEvent @event)
+    {
+        if (@event.IsActionPressed("Pause") || @event.IsActionPressed("Inventory"))
+        {
+            Resume();
+            GetViewport().SetInputAsHandled();
+        }
+    }
+
+    private void Resume()
+    {
+        GetTree().Paused = false;
+        QueueFree(); //Hacky and shortsighted (probably?)
+    }
+
+    private void DoDescription(DisplayButton dispButton)
+    {
+        Description.Text = $"{dispButton.DisplayName}: {dispButton.Description}";
+    }
+
+    private void ClearDescription(long newTab)
+    {
+        Description.Text = "";
+    }
+}

From 175a64ba4e4d21a79e0cc23753a1fe7c71829279 Mon Sep 17 00:00:00 2001
From: LifeHckr <jarodthereal@gmail.com>
Date: Tue, 11 Feb 2025 16:11:20 -0800
Subject: [PATCH 2/6] Map Scene and Damage number particle

---
 Globals/StageProducer.cs                      | 59 +++++++++++++++---
 scenes/BattleDirector/NotePlacementBar.tscn   |  8 +--
 scenes/BattleDirector/test_battle_scene.tscn  |  4 ++
 scenes/Maps/cartographer.tscn                 |  5 +-
 scenes/Maps/scripts/Cartographer.cs           | 62 +++++++++++++++++++
 scenes/Puppets/scripts/PuppetTemplate.cs      | 14 +++++
 scenes/SceneTransitions/TitleScreen.tscn      |  5 +-
 .../SceneTransitions/scripts/SceneChange.cs   |  7 +++
 scenes/UI/scripts/PauseMenu.cs                |  1 +
 9 files changed, 148 insertions(+), 17 deletions(-)
 create mode 100644 scenes/Maps/scripts/Cartographer.cs

diff --git a/Globals/StageProducer.cs b/Globals/StageProducer.cs
index b72c7656..b2e25749 100644
--- a/Globals/StageProducer.cs
+++ b/Globals/StageProducer.cs
@@ -10,11 +10,14 @@ public partial class StageProducer : Node
     public static RandomNumberGenerator GlobalRng = new RandomNumberGenerator();
     private ulong _seed;
     private ulong _lastRngState;
+    private bool _isInitialized = false;
 
     private Stages _curStage = Stages.Title;
     private Node _curScene;
+    public static MapGrid.Room CurRoom { get; private set; }
+    public static Vector2I MapSize { get; private set; } = new Vector2I(3, 2); //For now, make width an odd number
 
-    private MapGrid _map = new MapGrid();
+    public static MapGrid Map { get; } = new MapGrid();
 
     //Hold here to persist between changes
     //TODO: Allow for permanent changes and battle temporary stat changes.
@@ -27,6 +30,11 @@ public class MapGrid
         private int _curIdx = 0;
         private int _curRoom = 0;
 
+        public Room[] GetRooms()
+        {
+            return _rooms;
+        }
+
         public class Room
         {
             public Room(int idx, int x, int y)
@@ -48,10 +56,10 @@ public void AddChild(int newIdx)
                 Children = Children.Append(newIdx).ToArray();
             }
 
-            private int Idx;
-            private int[] Children = Array.Empty<int>();
-            private int X;
-            private int Y;
+            public int Idx { get; private set; }
+            public int[] Children { get; private set; } = Array.Empty<int>();
+            public int X { get; private set; }
+            public int Y { get; private set; }
             private string Type;
         }
 
@@ -61,7 +69,7 @@ public void InitMapGrid(int width, int height, int paths)
             _rooms = Array.Empty<Room>();
             _map = new int[width, height]; //x,y
 
-            int startX = GlobalRng.RandiRange(0, width - 1); //TODO: Replace with seeding
+            int startX = (width / 2);
             _rooms = _rooms.Append(new Room(_curIdx, startX, 0)).ToArray();
             _map[startX, 0] = _curIdx++;
 
@@ -69,7 +77,7 @@ public void InitMapGrid(int width, int height, int paths)
             {
                 GeneratePath_r(startX, 0, width, height);
             }
-
+            CreateCommonChildren(width, height);
             AddBossRoom(width, height);
         }
 
@@ -93,9 +101,25 @@ private void GeneratePath_r(int x, int y, int width, int height)
             }
         }
 
+        //Asserts that if there is a room at the same x, but y+1 they are connected
+        private void CreateCommonChildren(int width, int height)
+        {
+            foreach (Room room in _rooms)
+            {
+                Vector2I curPos = new Vector2I(room.X, room.Y);
+                if (room.Y + 1 >= height)
+                    continue;
+                if (_map[curPos.X, curPos.Y + 1] == 0)
+                    continue;
+                GD.Print("Added child on same X.");
+                room.AddChild(_map[curPos.X, curPos.Y + 1]);
+            }
+        }
+
+        //Adds a boss room at the end of rooms, all max height rooms connect to it.
         private void AddBossRoom(int width, int height)
         {
-            _rooms = _rooms.Append(new Room(_curIdx, 0, height)).ToArray();
+            _rooms = _rooms.Append(new Room(_curIdx, width / 2, height)).ToArray();
             _rooms[_curIdx].SetType("Boss");
             for (int i = 0; i < width; i++) //Attach all last rooms to a boss room
             {
@@ -109,10 +133,19 @@ private void AddBossRoom(int width, int height)
 
     public void StartGame()
     {
-        _map.InitMapGrid(2, 2, 1);
+        Map.InitMapGrid(MapSize.X, MapSize.Y, 1);
         _seed = GlobalRng.Seed;
         _lastRngState = GlobalRng.State;
         PlayerStats = new PlayerStats();
+
+        CurRoom = Map.GetRooms()[0];
+        _isInitialized = true;
+    }
+
+    public void TransitionFromRoom(int nextRoomIdx)
+    {
+        //CurRoom = Map.GetRooms()[nextRoomIdx];
+        TransitionStage(Stages.Battle);
     }
 
     public void TransitionStage(Stages nextStage)
@@ -124,9 +157,15 @@ 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.Map:
+                GetTree().ChangeSceneToFile("res://scenes/Maps/cartographer.tscn");
+                if (!_isInitialized)
+                {
+                    StartGame();
+                }
+                break;
             case Stages.Quit:
                 GD.Print("Exiting game");
                 GetTree().Quit();
diff --git a/scenes/BattleDirector/NotePlacementBar.tscn b/scenes/BattleDirector/NotePlacementBar.tscn
index cd1003de..7f1133c2 100644
--- a/scenes/BattleDirector/NotePlacementBar.tscn
+++ b/scenes/BattleDirector/NotePlacementBar.tscn
@@ -13,12 +13,12 @@ gradient = SubResource("Gradient_0u6yv")
 width = 26
 height = 100
 
-[sub_resource type="Gradient" id="Gradient_lyd0l"]
+[sub_resource type="Gradient" id="Gradient_xvck1"]
 offsets = PackedFloat32Array(0, 0.485915, 0.739437, 1)
 colors = PackedColorArray(0, 1, 0, 1, 0.68, 0, 0.272, 1, 0, 0.64, 0.608, 1, 0.4, 0, 0, 1)
 
-[sub_resource type="GradientTexture2D" id="GradientTexture2D_k7kvy"]
-gradient = SubResource("Gradient_lyd0l")
+[sub_resource type="GradientTexture2D" id="GradientTexture2D_0bqho"]
+gradient = SubResource("Gradient_xvck1")
 width = 24
 height = 98
 fill_to = Vector2(0, 1)
@@ -42,7 +42,7 @@ offset_right = 26.0
 offset_bottom = 100.0
 fill_mode = 3
 texture_under = SubResource("GradientTexture2D_hhds4")
-texture_progress = SubResource("GradientTexture2D_k7kvy")
+texture_progress = SubResource("GradientTexture2D_0bqho")
 texture_progress_offset = Vector2(1, 1)
 
 [node name="TextEdit" type="TextEdit" parent="."]
diff --git a/scenes/BattleDirector/test_battle_scene.tscn b/scenes/BattleDirector/test_battle_scene.tscn
index a6435a65..19cfc951 100644
--- a/scenes/BattleDirector/test_battle_scene.tscn
+++ b/scenes/BattleDirector/test_battle_scene.tscn
@@ -19,6 +19,9 @@ metadata/_edit_lock_ = true
 [node name="AudioStreamPlayer" type="AudioStreamPlayer" parent="."]
 stream = ExtResource("8_caqms")
 
+[node name="AudioStreamPlayer" type="AudioStreamPlayer" parent="."]
+stream = ExtResource("8_caqms")
+
 [node name="UILayer" type="CanvasLayer" parent="."]
 
 [node name="Conductor" type="Node" parent="." node_paths=PackedStringArray("CM")]
@@ -47,6 +50,7 @@ offset_bottom = 360.0
 color = Color(0.165656, 0.165656, 0.165656, 1)
 
 [node name="NotePlacementBar" parent="." instance=ExtResource("7_3ko4g")]
+z_index = 1
 offset_left = 16.0
 offset_top = 164.0
 offset_right = 16.0
diff --git a/scenes/Maps/cartographer.tscn b/scenes/Maps/cartographer.tscn
index 79f03ea9..a6497a78 100644
--- a/scenes/Maps/cartographer.tscn
+++ b/scenes/Maps/cartographer.tscn
@@ -1,3 +1,6 @@
-[gd_scene format=3 uid="uid://cydmo2lbnj1de"]
+[gd_scene load_steps=2 format=3 uid="uid://cydmo2lbnj1de"]
+
+[ext_resource type="Script" path="res://scenes/Maps/scripts/Cartographer.cs" id="1_u4q3n"]
 
 [node name="Cartographer" type="Node2D"]
+script = ExtResource("1_u4q3n")
diff --git a/scenes/Maps/scripts/Cartographer.cs b/scenes/Maps/scripts/Cartographer.cs
new file mode 100644
index 00000000..c392f6da
--- /dev/null
+++ b/scenes/Maps/scripts/Cartographer.cs
@@ -0,0 +1,62 @@
+using System;
+using System.Linq;
+using FunkEngine;
+using Godot;
+
+public partial class Cartographer : Node2D
+{
+    public override void _Ready()
+    {
+        DrawMap();
+    }
+
+    private Vector2 GetPosition(int x, int y)
+    {
+        return new Vector2((float)x * 640 / StageProducer.MapSize.X - 1 + 64, y * 64 + 16);
+    }
+
+    private void DrawMap()
+    {
+        var rooms = StageProducer.Map.GetRooms();
+        foreach (StageProducer.MapGrid.Room room in rooms)
+        {
+            DrawMapSprite(room);
+            foreach (int roomIdx in room.Children)
+            {
+                Line2D newLine = new Line2D();
+                newLine.AddPoint(GetPosition(room.X, room.Y));
+                newLine.AddPoint(GetPosition(rooms[roomIdx].X, rooms[roomIdx].Y));
+                AddChild(newLine);
+            }
+        }
+    }
+
+    private void DrawMapSprite(StageProducer.MapGrid.Room room)
+    {
+        var newSprite = new Button();
+        AddChild(newSprite);
+        //button is disabled if it is not a child of current room.
+        if (!StageProducer.CurRoom.Children.Contains(room.Idx))
+        {
+            newSprite.Disabled = true;
+            newSprite.FocusMode = Control.FocusModeEnum.None;
+        }
+        else
+        {
+            newSprite.GrabFocus();
+            newSprite.Pressed += () =>
+            {
+                EnterStage(room.Idx);
+            };
+        }
+        newSprite.Icon = (Texture2D)GD.Load("res://icon.svg"); //TODO: Room types icons
+        newSprite.Scale *= .25f;
+        newSprite.ZIndex = 1;
+        newSprite.Position = GetPosition(room.X, room.Y) - newSprite.Size * 2;
+    }
+
+    private void EnterStage(int roomIdx)
+    {
+        GetNode<StageProducer>("/root/StageProducer").TransitionFromRoom(roomIdx);
+    }
+}
diff --git a/scenes/Puppets/scripts/PuppetTemplate.cs b/scenes/Puppets/scripts/PuppetTemplate.cs
index 79b3f82f..dfe122fe 100644
--- a/scenes/Puppets/scripts/PuppetTemplate.cs
+++ b/scenes/Puppets/scripts/PuppetTemplate.cs
@@ -46,10 +46,24 @@ public virtual void TakeDamage(int amount)
         {
             Defeated?.Invoke(this);
         }
+        if (amount != 0)
+        {
+            TextParticle newText = new TextParticle();
+            newText.Modulate = Colors.Red;
+            Sprite.AddChild(newText);
+            newText.Text = $"-{amount}";
+        }
     }
 
     public virtual void Heal(int amount)
     {
+        if (amount != 0)
+        {
+            TextParticle newText = new TextParticle();
+            newText.Modulate = Colors.Green;
+            Sprite.AddChild(newText);
+            newText.Text = $"+{amount}";
+        }
         _currentHealth = _healthBar.ChangeHP(amount);
     }
 
diff --git a/scenes/SceneTransitions/TitleScreen.tscn b/scenes/SceneTransitions/TitleScreen.tscn
index 9f438122..0305acd0 100644
--- a/scenes/SceneTransitions/TitleScreen.tscn
+++ b/scenes/SceneTransitions/TitleScreen.tscn
@@ -48,7 +48,7 @@ texture = ExtResource("2_cf582")
 
 [node name="Label" type="Label" parent="VBoxContainer/MarginContainer/Control"]
 layout_mode = 2
-text = "Project Funk engine"
+text = "Insert Title Screen Here"
 
 [node name="HBoxContainer" type="HBoxContainer" parent="VBoxContainer"]
 layout_mode = 2
@@ -69,7 +69,8 @@ layout_mode = 2
 size_flags_horizontal = 3
 text = "Start Game"
 script = ExtResource("2_7f3m6")
-ScenePath = 1
+ScenePath = 3
+_startFocused = true
 
 [node name="MarginContainer3" type="MarginContainer" parent="VBoxContainer/HBoxContainer"]
 visible = false
diff --git a/scenes/SceneTransitions/scripts/SceneChange.cs b/scenes/SceneTransitions/scripts/SceneChange.cs
index c29e2d28..81590bbc 100644
--- a/scenes/SceneTransitions/scripts/SceneChange.cs
+++ b/scenes/SceneTransitions/scripts/SceneChange.cs
@@ -7,8 +7,15 @@ public partial class SceneChange : Button
     [Export]
     public Stages ScenePath;
 
+    [Export]
+    private bool _startFocused = false;
+
     public override void _Ready()
     {
+        if (_startFocused)
+        {
+            GrabFocus();
+        }
         Pressed += OnButtonPressed;
         GD.Print($"[DEBUG] Scene Path: '{ScenePath}'");
     }
diff --git a/scenes/UI/scripts/PauseMenu.cs b/scenes/UI/scripts/PauseMenu.cs
index 09430454..38316369 100644
--- a/scenes/UI/scripts/PauseMenu.cs
+++ b/scenes/UI/scripts/PauseMenu.cs
@@ -37,6 +37,7 @@ private void Quit()
 
     private void QuitToMainMenu()
     {
+        GetTree().Paused = false;
         GetNode<StageProducer>("/root/StageProducer").TransitionStage(Stages.Title);
     }
 }

From 55de3eceb23b5d5ee42680eed3dc4ba5724f6978 Mon Sep 17 00:00:00 2001
From: LifeHckr <jarodthereal@gmail.com>
Date: Thu, 13 Feb 2025 19:06:57 -0800
Subject: [PATCH 3/6] Small cleanup

Start battle on start button press
---
 Globals/Scribe.cs                             |  4 ++--
 .../BattleDirector/scripts/BattleDirector.cs  | 21 +++++++++++++------
 2 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/Globals/Scribe.cs b/Globals/Scribe.cs
index 75ee36a4..02446576 100644
--- a/Globals/Scribe.cs
+++ b/Globals/Scribe.cs
@@ -34,8 +34,8 @@ public partial class Scribe : Node
         ),
         new Note(
             "PlayerDouble",
-            "Basic player note, deals damage to enemy",
-            GD.Load<Texture2D>("res://Classes/Notes/assets/single_note.png"),
+            "Basic player note, deals double damage to enemy",
+            GD.Load<Texture2D>("res://Classes/Notes/assets/double_note.png"),
             null,
             1,
             (director, note, timing) =>
diff --git a/scenes/BattleDirector/scripts/BattleDirector.cs b/scenes/BattleDirector/scripts/BattleDirector.cs
index 39643e62..c64b6ef4 100644
--- a/scenes/BattleDirector/scripts/BattleDirector.cs
+++ b/scenes/BattleDirector/scripts/BattleDirector.cs
@@ -60,6 +60,7 @@ public PuppetTemplate GetTarget(Note note)
     #region Initialization
     public override void _Ready()
     {
+        //TODO: Should come from transition into battle
         _curSong = new SongData
         {
             Bpm = 120,
@@ -80,10 +81,18 @@ public override void _Ready()
         AddChild(Enemy);
         Enemy.Defeated += CheckBattleStatus;
         Enemy.Init(GD.Load<Texture2D>("res://scenes/BattleDirector/assets/Enemy1.png"), "Enemy");
-        Enemy.Sprite.Scale *= 2;
 
-        var timer = GetTree().CreateTimer(AudioServer.GetTimeToNextMix());
-        timer.Timeout += Begin;
+        //TODO: This is a temporary measure
+        Button startButton = new Button();
+        startButton.Text = "Start";
+        startButton.Position = GetViewportRect().Size / 2;
+        AddChild(startButton);
+        startButton.Pressed += () =>
+        {
+            var timer = GetTree().CreateTimer(AudioServer.GetTimeToNextMix());
+            timer.Timeout += Begin;
+            startButton.QueueFree();
+        };
     }
 
     //TODO: This will all change
@@ -93,7 +102,8 @@ private void Begin()
         CD.Prep();
         CD.TimedInput += OnTimedInput;
 
-        //TEMP TODO: Make enemies, can put this in an enemy subclass
+        //TODO: Make enemies, can put this in an enemy subclass
+        Enemy.Sprite.Scale *= 2;
         var enemTween = CreateTween();
         enemTween.TweenProperty(Enemy.Sprite, "position", Vector2.Down * 5, 1f).AsRelative();
         enemTween.TweenProperty(Enemy.Sprite, "position", Vector2.Up * 5, 1f).AsRelative();
@@ -159,9 +169,8 @@ private void OnTimedInput(Note note, ArrowType arrowType, int beat, double beatD
             PlayerAddNote(arrowType, beat);
             return;
         }
-        //TODO: Evaluate Timing as a function
+
         Timing timed = CheckTiming(beatDif);
-        GD.Print(timed);
 
         if (timed == Timing.Miss)
         {

From 1cdd4796b22bcde65dd441228f3973cf0297dc87 Mon Sep 17 00:00:00 2001
From: LifeHckr <jarodthereal@gmail.com>
Date: Thu, 13 Feb 2025 20:22:34 -0800
Subject: [PATCH 4/6] Updated reward selection to use display buttons

---
 scenes/BattleDirector/test_battle_scene.tscn |  3 -
 scenes/UI/RewardSelectionUI.tscn             | 61 +++++++++++++++++++-
 scenes/UI/scripts/DisplayButton.cs           |  1 +
 scenes/UI/scripts/RewardSelect.cs            | 39 +++++++++++--
 4 files changed, 94 insertions(+), 10 deletions(-)

diff --git a/scenes/BattleDirector/test_battle_scene.tscn b/scenes/BattleDirector/test_battle_scene.tscn
index 19cfc951..b01d68d6 100644
--- a/scenes/BattleDirector/test_battle_scene.tscn
+++ b/scenes/BattleDirector/test_battle_scene.tscn
@@ -19,9 +19,6 @@ metadata/_edit_lock_ = true
 [node name="AudioStreamPlayer" type="AudioStreamPlayer" parent="."]
 stream = ExtResource("8_caqms")
 
-[node name="AudioStreamPlayer" type="AudioStreamPlayer" parent="."]
-stream = ExtResource("8_caqms")
-
 [node name="UILayer" type="CanvasLayer" parent="."]
 
 [node name="Conductor" type="Node" parent="." node_paths=PackedStringArray("CM")]
diff --git a/scenes/UI/RewardSelectionUI.tscn b/scenes/UI/RewardSelectionUI.tscn
index fee058c4..1a9a0837 100644
--- a/scenes/UI/RewardSelectionUI.tscn
+++ b/scenes/UI/RewardSelectionUI.tscn
@@ -2,10 +2,13 @@
 
 [ext_resource type="Script" path="res://scenes/UI/scripts/RewardSelect.cs" id="1_1m6an"]
 
-[node name="CanvasLayer" type="CanvasLayer" node_paths=PackedStringArray("ButtonContainer")]
+[node name="CanvasLayer" type="CanvasLayer" node_paths=PackedStringArray("ButtonContainer", "_description", "_acceptButton", "_skipButton")]
 process_mode = 2
 script = ExtResource("1_1m6an")
-ButtonContainer = NodePath("MarginContainer/PanelContainer/VBoxContainer")
+ButtonContainer = NodePath("MarginContainer/PanelContainer/VBoxContainer/ScrollContainer/CenterContainer/HBoxContainer")
+_description = NodePath("MarginContainer/PanelContainer/VBoxContainer/DescBox/Description")
+_acceptButton = NodePath("MarginContainer/PanelContainer/VBoxContainer/MarginContainer/HBoxContainer/AcceptButton")
+_skipButton = NodePath("MarginContainer/PanelContainer/VBoxContainer/MarginContainer/HBoxContainer/SkipButton")
 
 [node name="MarginContainer" type="MarginContainer" parent="."]
 anchors_preset = 15
@@ -25,3 +28,57 @@ layout_mode = 2
 
 [node name="VBoxContainer" type="VBoxContainer" parent="MarginContainer/PanelContainer"]
 layout_mode = 2
+
+[node name="ScrollContainer" type="ScrollContainer" parent="MarginContainer/PanelContainer/VBoxContainer"]
+layout_mode = 2
+size_flags_vertical = 3
+
+[node name="CenterContainer" type="CenterContainer" parent="MarginContainer/PanelContainer/VBoxContainer/ScrollContainer"]
+layout_mode = 2
+size_flags_horizontal = 3
+size_flags_vertical = 3
+
+[node name="HBoxContainer" type="HBoxContainer" parent="MarginContainer/PanelContainer/VBoxContainer/ScrollContainer/CenterContainer"]
+layout_mode = 2
+size_flags_vertical = 3
+
+[node name="DescBox" type="MarginContainer" parent="MarginContainer/PanelContainer/VBoxContainer"]
+layout_mode = 2
+size_flags_vertical = 3
+theme_override_constants/margin_left = 5
+theme_override_constants/margin_top = 5
+theme_override_constants/margin_right = 5
+theme_override_constants/margin_bottom = 5
+
+[node name="ColorRect" type="ColorRect" parent="MarginContainer/PanelContainer/VBoxContainer/DescBox"]
+layout_mode = 2
+color = Color(0, 0, 0, 0.552941)
+
+[node name="Description" type="Label" parent="MarginContainer/PanelContainer/VBoxContainer/DescBox"]
+layout_mode = 2
+size_flags_vertical = 1
+autowrap_mode = 2
+clip_text = true
+text_overrun_behavior = 1
+
+[node name="MarginContainer" type="MarginContainer" parent="MarginContainer/PanelContainer/VBoxContainer"]
+layout_mode = 2
+theme_override_constants/margin_left = 5
+theme_override_constants/margin_top = 5
+theme_override_constants/margin_right = 5
+theme_override_constants/margin_bottom = 5
+
+[node name="HBoxContainer" type="HBoxContainer" parent="MarginContainer/PanelContainer/VBoxContainer/MarginContainer"]
+layout_mode = 2
+size_flags_vertical = 3
+
+[node name="AcceptButton" type="Button" parent="MarginContainer/PanelContainer/VBoxContainer/MarginContainer/HBoxContainer"]
+layout_mode = 2
+size_flags_horizontal = 3
+text = "Accept"
+
+[node name="SkipButton" type="Button" parent="MarginContainer/PanelContainer/VBoxContainer/MarginContainer/HBoxContainer"]
+layout_mode = 2
+size_flags_horizontal = 3
+text = "Skip
+"
diff --git a/scenes/UI/scripts/DisplayButton.cs b/scenes/UI/scripts/DisplayButton.cs
index ef2130d2..ec74d8ae 100644
--- a/scenes/UI/scripts/DisplayButton.cs
+++ b/scenes/UI/scripts/DisplayButton.cs
@@ -3,6 +3,7 @@
 
 public partial class DisplayButton : Button
 {
+    //TODO: Make various menus change descriptions when focus changes, instead of on click.
     [Export]
     public Texture2D Texture;
 
diff --git a/scenes/UI/scripts/RewardSelect.cs b/scenes/UI/scripts/RewardSelect.cs
index f321e2d0..8b12b724 100644
--- a/scenes/UI/scripts/RewardSelect.cs
+++ b/scenes/UI/scripts/RewardSelect.cs
@@ -5,15 +5,28 @@
 public partial class RewardSelect : CanvasLayer
 {
     [Export]
-    public VBoxContainer ButtonContainer;
+    public HBoxContainer ButtonContainer;
+
+    [Export]
+    private Label _description;
+
+    [Export]
+    private Button _acceptButton;
+
+    [Export]
+    private Button _skipButton;
 
     private PlayerStats _player;
     private RelicTemplate[] _choices;
+    private RelicTemplate _selection;
 
     public void Initialize(PlayerStats player, int amount)
     {
         _player = player;
         GenerateRelicChoices(amount);
+
+        _acceptButton.Pressed += OnSelect;
+        _skipButton.Pressed += OnSkip;
     }
 
     private void GenerateRelicChoices(int amount = 1)
@@ -24,17 +37,33 @@ private void GenerateRelicChoices(int amount = 1)
 
         foreach (var relic in _choices)
         {
-            var button = new Button();
-            button.Text = relic.Name;
+            var button = new DisplayButton();
+            button.Display(relic.Texture, relic.Tooltip, relic.Name);
             button.Pressed += () => OnRelicSelected(relic);
             ButtonContainer.AddChild(button);
+            button.GrabFocus();
         }
     }
 
     private void OnRelicSelected(RelicTemplate choiceRelic)
     {
-        _player.AddRelic(choiceRelic);
-        GD.Print("Relic selected: " + choiceRelic.Name);
+        _selection = choiceRelic;
+        _description.Text = $"{choiceRelic.Name}: {choiceRelic.Tooltip}";
+    }
+
+    private void OnSelect()
+    {
+        if (_selection == null)
+            return;
+        GD.Print("Relic selected: " + _selection.Name);
+        _player.AddRelic(_selection);
+        GetTree().Paused = false;
+        QueueFree();
+    }
+
+    private void OnSkip()
+    {
+        GD.Print("Relic skipped.");
         GetTree().Paused = false;
         QueueFree();
     }

From 1f69fef1b6f2ee469901217aa1e2bdd407dc23a4 Mon Sep 17 00:00:00 2001
From: LifeHckr <jarodthereal@gmail.com>
Date: Thu, 13 Feb 2025 20:58:57 -0800
Subject: [PATCH 5/6] Firming up gameflow

Winning battle-> relic selection continue
Lose -> Reset and return to title screen
Changed clone functions, to fix crash on GC.
---
 Classes/Notes/Note.cs                           | 3 ++-
 Classes/Relics/RelicTemplate.cs                 | 3 ++-
 Globals/StageProducer.cs                        | 1 +
 scenes/BattleDirector/scripts/BattleDirector.cs | 6 ++++++
 4 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/Classes/Notes/Note.cs b/Classes/Notes/Note.cs
index 1533856f..8795cf42 100644
--- a/Classes/Notes/Note.cs
+++ b/Classes/Notes/Note.cs
@@ -49,6 +49,7 @@ public Note Clone()
     {
         //Eventually could look into something more robust, but for now shallow copy is preferable.
         //We only would want val and name to be copied by value
-        return (Note)MemberwiseClone();
+        Note newNote = new Note(Name, Tooltip, Texture, Owner, _baseVal, NoteEffect);
+        return newNote;
     }
 }
diff --git a/Classes/Relics/RelicTemplate.cs b/Classes/Relics/RelicTemplate.cs
index ad317192..f0a117cc 100644
--- a/Classes/Relics/RelicTemplate.cs
+++ b/Classes/Relics/RelicTemplate.cs
@@ -25,6 +25,7 @@ public RelicTemplate(
 
     public RelicTemplate Clone()
     {
-        return (RelicTemplate)MemberwiseClone();
+        RelicTemplate newRelic = new RelicTemplate(Name, Tooltip, Texture, Effects);
+        return newRelic;
     }
 }
diff --git a/Globals/StageProducer.cs b/Globals/StageProducer.cs
index b2e25749..f62fb790 100644
--- a/Globals/StageProducer.cs
+++ b/Globals/StageProducer.cs
@@ -154,6 +154,7 @@ public void TransitionStage(Stages nextStage)
         switch (nextStage)
         {
             case Stages.Title:
+                _isInitialized = false;
                 GetTree().ChangeSceneToFile("res://scenes/SceneTransitions/TitleScreen.tscn");
                 break;
             case Stages.Battle:
diff --git a/scenes/BattleDirector/scripts/BattleDirector.cs b/scenes/BattleDirector/scripts/BattleDirector.cs
index c64b6ef4..8488e634 100644
--- a/scenes/BattleDirector/scripts/BattleDirector.cs
+++ b/scenes/BattleDirector/scripts/BattleDirector.cs
@@ -32,6 +32,8 @@ public partial class BattleDirector : Node2D
 
     private SongData _curSong;
 
+    private bool _battleEnd;
+
     #endregion
 
     #region Note Handling
@@ -122,6 +124,8 @@ public override void _Process(double delta)
     {
         TimeKeeper.CurrentTime = Audio.GetPlaybackPosition();
         CD.CheckMiss();
+        if (_battleEnd)
+            GetNode<StageProducer>("/root/StageProducer").TransitionStage(Stages.Map);
     }
     #endregion
 
@@ -210,6 +214,7 @@ private void CheckBattleStatus(PuppetTemplate puppet)
         if (puppet == Player)
         {
             GD.Print("Player is Dead");
+            GetNode<StageProducer>("/root/StageProducer").TransitionStage(Stages.Title);
             return;
         }
 
@@ -218,6 +223,7 @@ private void CheckBattleStatus(PuppetTemplate puppet)
         {
             GD.Print("Enemy is dead");
             ShowRewardSelection(3);
+            _battleEnd = true;
         }
     }
 

From 74506eeab05013b475860dfe6c5183b2ce10cda5 Mon Sep 17 00:00:00 2001
From: LifeHckr <jarodthereal@gmail.com>
Date: Sun, 16 Feb 2025 12:54:28 -0800
Subject: [PATCH 6/6] Added some relic art

Tweaked wip relics and map for better functionality to get a feel for
---
 Classes/Relics/assets/relic_Breakfast.png     | Bin 0 -> 703 bytes
 .../Relics/assets/relic_Breakfast.png.import  |  34 ++++++++++++++++++
 Classes/Relics/assets/relic_GoodVibes.png     | Bin 0 -> 447 bytes
 .../Relics/assets/relic_GoodVibes.png.import  |  34 ++++++++++++++++++
 Globals/FunkEngineNameSpace.cs                |   1 +
 Globals/Scribe.cs                             |  13 +++----
 Globals/StageProducer.cs                      |   4 +--
 .../BattleDirector/scripts/BattleDirector.cs  |   2 +-
 scenes/Maps/scripts/Cartographer.cs           |   2 +-
 scenes/Puppets/scripts/PlayerStats.cs         |   9 +++--
 scenes/UI/inventory.tscn                      |   3 +-
 scenes/UI/scripts/RewardSelect.cs             |   5 +++
 12 files changed, 93 insertions(+), 14 deletions(-)
 create mode 100644 Classes/Relics/assets/relic_Breakfast.png
 create mode 100644 Classes/Relics/assets/relic_Breakfast.png.import
 create mode 100644 Classes/Relics/assets/relic_GoodVibes.png
 create mode 100644 Classes/Relics/assets/relic_GoodVibes.png.import

diff --git a/Classes/Relics/assets/relic_Breakfast.png b/Classes/Relics/assets/relic_Breakfast.png
new file mode 100644
index 0000000000000000000000000000000000000000..1c6bbe1d0d4d5511455fb35f2f9fe41be79c6da4
GIT binary patch
literal 703
zcmV;w0zmzVP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px%c}YY;R9J=Wl|N`&K^(_F5v2x{;8N(HK`02BoQf&LE-r;YDFwkUU8F7<N(o&$
zb#f_UTF7E>=@cjgmqM06X#$OOY8D|78Za8L)Cfsw#GoDQJ@4JSdr#A$i{I&S-0wc$
z-=Dh&Q%&`sHS@0rG|LRswHqI=18}m`0^nxW%(=1w0S?A;)>@=k0ic^q0dQ?+o6{GM
zxHu>oO-yV+2Nv-D#*uB!mx)^6Crd4@iHQs}%M4WTTw>KVrni=Lt;ARc)U0KwFEDG2
z>-T;G@Hur0fOtObFyU%IS8f%4d6sa*T^uhGnlD%ez+4HR8$1}xO$7IctN6oJg12`$
zudO($(@my`6e|Q{IV(AB1=L=veKut-OaNS-C2W-t1KCZcY?W|SKsRVI*bS~qu0((1
z$hw}kGfnVFvBF$p)pN>K33H+nvI5Ix06zWb0nliJUw4T1PP<I|xazd(>~C%n&!<P{
zijQWQL8Cp|+*`}qg5`<UWhYCnf|!9$s}5kn5BEyLJt9bkTkbMZTP1`EUtku0xXO8L
z#b~1UbDhZIGXM)d^S$8Mr)>cY-|=oT1yUtM4~0VW1x|O@webQjB;X?R+VS6YvEl2R
z;k~@GFd9M_{aC(iZgGFR0gOKn?Z$x-{`BpTZF>h)69C^{eE{Iz;|Bzm%bsx2rcSHw
zDEZ-D$p#0d1$SREBTNXz^JyZ*3S9{xdg>+_uFG6&z)QYNl=izF$NK)01>4n9!6rCp
zo?=}aU^o+E9)6`?8^JQv3$8WbWkS4Sp@*lsP#aXp1UDLxO<YB88INti%Y>Yvs&V0-
l1_0ha*PECGGSyUW`UA@oHTEiEst^DG002ovPDHLkV1mLnHM;-+

literal 0
HcmV?d00001

diff --git a/Classes/Relics/assets/relic_Breakfast.png.import b/Classes/Relics/assets/relic_Breakfast.png.import
new file mode 100644
index 00000000..6a21aa03
--- /dev/null
+++ b/Classes/Relics/assets/relic_Breakfast.png.import
@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://csjx2hb4tdlw8"
+path="res://.godot/imported/relic_Breakfast.png-c1b968058adbb855fcf957a2aec74dc2.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://Classes/Relics/assets/relic_Breakfast.png"
+dest_files=["res://.godot/imported/relic_Breakfast.png-c1b968058adbb855fcf957a2aec74dc2.ctex"]
+
+[params]
+
+compress/mode=0
+compress/high_quality=false
+compress/lossy_quality=0.7
+compress/hdr_compression=1
+compress/normal_map=0
+compress/channel_pack=0
+mipmaps/generate=false
+mipmaps/limit=-1
+roughness/mode=0
+roughness/src_normal=""
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/normal_map_invert_y=false
+process/hdr_as_srgb=false
+process/hdr_clamp_exposure=false
+process/size_limit=0
+detect_3d/compress_to=1
diff --git a/Classes/Relics/assets/relic_GoodVibes.png b/Classes/Relics/assets/relic_GoodVibes.png
new file mode 100644
index 0000000000000000000000000000000000000000..3ab277278ba75fedfd3c927f9faf839642940f70
GIT binary patch
literal 447
zcmV;w0YLtVP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px$c}YY;R9J=WR>5t<AQXLAS-__xY{0Qnw#dONWDGJvJcc`h58k3uZe@YWZcg67
z^pIi$0Srl6sjA<_SipaeXLuM`@ZUjV2Oe5T{k@{*T)lsrl{js9RPEV8HnB^DYs@w)
z$971}YF45}rVG=FZ~M8_Mfl)URy0gveQoDdI0=-9xjtZW!{tPj11_s=(&J}2_MJAI
zR1`#w?*<N^8$@4)T6s=|b5%vdWd0(8VtpI%&_e1?D8X5OX6RcMEUH5vTTu{OXg6^0
zT)pr8;}zY&k=1)a>Ya!>GWA{%T!8+}42OK}V6B}X6$Obt1%?O*Vu@{J_e^>O_9yyv
z0X7x^t5BN#B&Hl_tsJ;qAE8Sq6|Pz;2b^iA(hzve8JoCo8SKot*#l$Pd^__jCtTz}
z;D4ZK*hsAMKh_N;TK}}Zw4E)OA|!=aVfGm6(HnDVrH}&&|Ac_)2G$cn@y3jO5_`EN
p3-AfKhxjQd8YT@f3l{uEd;tN6ym61xe=z_6002ovPDHLkV1kTszWo3I

literal 0
HcmV?d00001

diff --git a/Classes/Relics/assets/relic_GoodVibes.png.import b/Classes/Relics/assets/relic_GoodVibes.png.import
new file mode 100644
index 00000000..c2ff344d
--- /dev/null
+++ b/Classes/Relics/assets/relic_GoodVibes.png.import
@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://dg4tnp7plxmp7"
+path="res://.godot/imported/relic_GoodVibes.png-cd102b29bb163411bb7ce8cf724ef0c0.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://Classes/Relics/assets/relic_GoodVibes.png"
+dest_files=["res://.godot/imported/relic_GoodVibes.png-cd102b29bb163411bb7ce8cf724ef0c0.ctex"]
+
+[params]
+
+compress/mode=0
+compress/high_quality=false
+compress/lossy_quality=0.7
+compress/hdr_compression=1
+compress/normal_map=0
+compress/channel_pack=0
+mipmaps/generate=false
+mipmaps/limit=-1
+roughness/mode=0
+roughness/src_normal=""
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/normal_map_invert_y=false
+process/hdr_as_srgb=false
+process/hdr_clamp_exposure=false
+process/size_limit=0
+detect_3d/compress_to=1
diff --git a/Globals/FunkEngineNameSpace.cs b/Globals/FunkEngineNameSpace.cs
index 6bf17004..7d422ea6 100644
--- a/Globals/FunkEngineNameSpace.cs
+++ b/Globals/FunkEngineNameSpace.cs
@@ -15,6 +15,7 @@ public enum BattleEffectTrigger
     NotePlaced,
     NoteHit,
     SelfNoteHit,
+    OnPickup,
 }
 
 public enum Timing
diff --git a/Globals/Scribe.cs b/Globals/Scribe.cs
index 02446576..45bc8588 100644
--- a/Globals/Scribe.cs
+++ b/Globals/Scribe.cs
@@ -51,16 +51,17 @@ public partial class Scribe : Node
     {
         new RelicTemplate(
             "Breakfast", //Reference ha ha, Item to give when relic pool is empty.
-            "Breakfast, currently does nothing :).", //TODO: Description can include the relics values?
-            GD.Load<Texture2D>("res://scenes/BattleDirector/assets/Character1.png"),
+            "Increases max hp.", //TODO: Description can include the relics values?
+            GD.Load<Texture2D>("res://Classes/Relics/assets/relic_Breakfast.png"),
             new RelicEffect[]
             {
                 new RelicEffect(
-                    BattleEffectTrigger.NotePlaced,
-                    0,
+                    BattleEffectTrigger.OnPickup,
+                    10,
                     (director, val) =>
                     {
-                        director.Player.Heal(val);
+                        StageProducer.PlayerStats.MaxHealth += val;
+                        StageProducer.PlayerStats.CurrentHealth += val;
                     }
                 ),
             }
@@ -68,7 +69,7 @@ public partial class Scribe : Node
         new RelicTemplate(
             "Good Vibes",
             "Good vibes, heals the player whenever they place a note.", //TODO: Description can include the relics values?
-            GD.Load<Texture2D>("res://scenes/BattleDirector/assets/Character1.png"),
+            GD.Load<Texture2D>("res://Classes/Relics/assets/relic_GoodVibes.png"),
             new RelicEffect[]
             {
                 new RelicEffect(
diff --git a/Globals/StageProducer.cs b/Globals/StageProducer.cs
index f62fb790..d304eaaa 100644
--- a/Globals/StageProducer.cs
+++ b/Globals/StageProducer.cs
@@ -15,7 +15,7 @@ public partial class StageProducer : Node
     private Stages _curStage = Stages.Title;
     private Node _curScene;
     public static MapGrid.Room CurRoom { get; private set; }
-    public static Vector2I MapSize { get; private set; } = new Vector2I(3, 2); //For now, make width an odd number
+    public static Vector2I MapSize { get; private set; } = new Vector2I(7, 6); //For now, make width an odd number
 
     public static MapGrid Map { get; } = new MapGrid();
 
@@ -133,7 +133,7 @@ private void AddBossRoom(int width, int height)
 
     public void StartGame()
     {
-        Map.InitMapGrid(MapSize.X, MapSize.Y, 1);
+        Map.InitMapGrid(MapSize.X, MapSize.Y, 3);
         _seed = GlobalRng.Seed;
         _lastRngState = GlobalRng.State;
         PlayerStats = new PlayerStats();
diff --git a/scenes/BattleDirector/scripts/BattleDirector.cs b/scenes/BattleDirector/scripts/BattleDirector.cs
index 8488e634..9a0822c1 100644
--- a/scenes/BattleDirector/scripts/BattleDirector.cs
+++ b/scenes/BattleDirector/scripts/BattleDirector.cs
@@ -138,7 +138,7 @@ public override void _UnhandledInput(InputEvent @event)
         {
             if (eventKey.Keycode == Key.Key0)
             {
-                DebugKillEnemy();
+                //DebugKillEnemy();
             }
         }
 
diff --git a/scenes/Maps/scripts/Cartographer.cs b/scenes/Maps/scripts/Cartographer.cs
index c392f6da..638dcd75 100644
--- a/scenes/Maps/scripts/Cartographer.cs
+++ b/scenes/Maps/scripts/Cartographer.cs
@@ -12,7 +12,7 @@ public override void _Ready()
 
     private Vector2 GetPosition(int x, int y)
     {
-        return new Vector2((float)x * 640 / StageProducer.MapSize.X - 1 + 64, y * 64 + 16);
+        return new Vector2((float)x * 640 / StageProducer.MapSize.X - 1 + 64, y * 48 + 16);
     }
 
     private void DrawMap()
diff --git a/scenes/Puppets/scripts/PlayerStats.cs b/scenes/Puppets/scripts/PlayerStats.cs
index 1e48e005..a42bd9cf 100644
--- a/scenes/Puppets/scripts/PlayerStats.cs
+++ b/scenes/Puppets/scripts/PlayerStats.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Linq;
+using FunkEngine;
 using Godot;
 
 public partial class PlayerStats : Resource
@@ -18,10 +19,12 @@ public partial class PlayerStats : Resource
 
     public void AddRelic(RelicTemplate relic)
     {
-        if (CurRelics.Any(r => r.Name == relic.Name))
+        foreach (RelicEffect effect in relic.Effects)
         {
-            GD.PrintErr("Relic already in inventory: " + relic.Name);
-            return;
+            if (effect.GetTrigger() == BattleEffectTrigger.OnPickup)
+            {
+                effect.OnTrigger(null);
+            }
         }
         CurRelics = CurRelics.Append(relic).ToArray();
         GD.Print("Adding relic: " + relic.Name);
diff --git a/scenes/UI/inventory.tscn b/scenes/UI/inventory.tscn
index 694486ae..7be623fc 100644
--- a/scenes/UI/inventory.tscn
+++ b/scenes/UI/inventory.tscn
@@ -23,7 +23,7 @@ anchor_right = 1.0
 anchor_bottom = 1.0
 grow_horizontal = 2
 grow_vertical = 2
-color = Color(0, 0, 0.2, 0.533333)
+color = Color(0.152941, 0.145098, 0.2, 0.533333)
 
 [node name="InvenVBox" type="VBoxContainer" parent="."]
 layout_mode = 1
@@ -34,6 +34,7 @@ grow_horizontal = 2
 grow_vertical = 2
 
 [node name="Tabs" type="TabContainer" parent="InvenVBox"]
+self_modulate = Color(10, 10, 10, 0.751)
 layout_mode = 2
 size_flags_vertical = 3
 current_tab = 0
diff --git a/scenes/UI/scripts/RewardSelect.cs b/scenes/UI/scripts/RewardSelect.cs
index 8b12b724..865ddd10 100644
--- a/scenes/UI/scripts/RewardSelect.cs
+++ b/scenes/UI/scripts/RewardSelect.cs
@@ -29,6 +29,11 @@ public void Initialize(PlayerStats player, int amount)
         _skipButton.Pressed += OnSkip;
     }
 
+    public override void _Process(double delta)
+    {
+        _acceptButton.Visible = _selection != null;
+    }
+
     private void GenerateRelicChoices(int amount = 1)
     {
         //should probably change this so that the amount of relics offered can be changed when BD calls it