Added some relic art

Tweaked wip relics and map for better functionality to get a feel for

Author: LifeHckr

Classes/Relics/assets/relic_Breakfast.png

@@ -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

Classes/Relics/assets/relic_Breakfast.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

Classes/Relics/assets/relic_GoodVibes.png

@@ -15,6 +15,7 @@ public enum BattleEffectTrigger
     NotePlaced,
     NoteHit,
     SelfNoteHit,
+    OnPickup,
 }
 
 public enum Timing

Classes/Relics/assets/relic_GoodVibes.png.import

@@ -51,24 +51,25 @@ 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;
                     }
                 ),
             }
         ),
         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(

Globals/FunkEngineNameSpace.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();

Globals/Scribe.cs

@@ -138,7 +138,7 @@ public override void _UnhandledInput(InputEvent @event)
         {
             if (eventKey.Keycode == Key.Key0)
             {
-                DebugKillEnemy();
+                //DebugKillEnemy();
             }
         }
 

Globals/StageProducer.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()

scenes/BattleDirector/scripts/BattleDirector.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);