Merge pull request #78 from Project-Funk-Engine/RelicNJuice

Relic n juice

Author: LifeHckr

Classes/Notes/Note.cs

@@ -6,16 +6,16 @@
  * @class Note
  * @brief Data structure class for holding data and methods for a battle time note. WIP
  */
-public partial class Note : Resource
+public partial class Note : Resource, IDisplayable
 {
     public PuppetTemplate Owner;
-    public string Name;
+    public string Name { get; set; }
     private int _baseVal;
     public float CostModifier { get; private set; }
     private Action<BattleDirector, Note, Timing> NoteEffect; //TODO: Where/How to deal with timing.
 
-    public string Tooltip;
-    public Texture2D Texture;
+    public string Tooltip { get; set; }
+    public Texture2D Texture { get; set; }
 
     public Note(
         string name,

Classes/Relics/RelicTemplate.cs

@@ -2,13 +2,13 @@
 using FunkEngine;
 using Godot;
 
-public partial class RelicTemplate : Resource
+public partial class RelicTemplate : Resource, IDisplayable
 {
     public RelicEffect[] Effects;
-    public string Name;
+    public string Name { get; set; }
 
-    public Texture2D Texture;
-    public string Tooltip;
+    public Texture2D Texture { get; set; }
+    public string Tooltip { get; set; }
 
     public RelicTemplate(
         string name = "",

Classes/Relics/assets/Auroboros.png

@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://cqlrv1vra4mbn"
+path="res://.godot/imported/Auroboros.png-27bfe2114f3955a0f6ef5ceb4e65adbf.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://Classes/Relics/assets/Auroboros.png"
+dest_files=["res://.godot/imported/Auroboros.png-27bfe2114f3955a0f6ef5ceb4e65adbf.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/Auroboros.png.import

@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://ccd6pskxcwpxg"
+path="res://.godot/imported/Colorboros.png-56197d792c620150c773fb4ecce6289c.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://Classes/Relics/assets/Colorboros.png"
+dest_files=["res://.godot/imported/Colorboros.png-56197d792c620150c773fb4ecce6289c.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/Colorboros.png

@@ -50,6 +50,7 @@ public enum BattleEffectTrigger
     NoteHit,
     SelfNoteHit,
     OnPickup,
+    OnLoop,
 }
 
 public enum Stages
@@ -191,3 +192,10 @@ public interface IBattleEvent
     void OnTrigger(BattleDirector BD);
     BattleEffectTrigger GetTrigger();
 }
+
+public interface IDisplayable
+{
+    string Name { get; set; }
+    string Tooltip { get; set; }
+    Texture2D Texture { get; set; }
+}

Classes/Relics/assets/Colorboros.png.import

@@ -103,7 +103,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?
+            "Heals the player whenever they place a note.",
             GD.Load<Texture2D>("res://Classes/Relics/assets/relic_GoodVibes.png"),
             new RelicEffect[]
             {
@@ -117,14 +117,46 @@ public partial class Scribe : Node
                 ),
             }
         ),
+        new RelicTemplate(
+            "Auroboros",
+            "Bigger number, better person. Increases combo multiplier every riff.",
+            GD.Load<Texture2D>("res://Classes/Relics/assets/Auroboros.png"),
+            new RelicEffect[]
+            {
+                new RelicEffect(
+                    BattleEffectTrigger.OnLoop,
+                    1,
+                    (director, val) =>
+                    {
+                        director.NotePlacementBar.IncreaseBonusMult(val);
+                    }
+                ),
+            }
+        ),
+        new RelicTemplate(
+            "Colorboros",
+            "Taste the rainbow. Charges the freestyle bar every riff.",
+            GD.Load<Texture2D>("res://Classes/Relics/assets/Colorboros.png"),
+            new RelicEffect[]
+            {
+                new RelicEffect(
+                    BattleEffectTrigger.OnLoop,
+                    20,
+                    (director, val) =>
+                    {
+                        director.NotePlacementBar.IncreaseCharge(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))
+            .RelicDictionary.Where(r => ownedRelics.All(o => o.Name != r.Name))
             .ToArray();
 
         availableRelics = availableRelics
@@ -139,4 +171,19 @@ public static RelicTemplate[] GetRandomRelics(RelicTemplate[] ownedRelics, int c
         }
         return availableRelics;
     }
+
+    public static Note[] GetRandomRewardNotes(int count)
+    {
+        var availableNotes = Scribe
+            .NoteDictionary.Where(r => r.Name.Contains("Player")) //TODO: Classifications/pools
+            .ToArray();
+
+        availableNotes = availableNotes
+            .OrderBy(_ => StageProducer.GlobalRng.Randi())
+            .Take(count)
+            .Select(r => r.Clone())
+            .ToArray();
+
+        return availableNotes;
+    }
 }

Globals/FunkEngineNameSpace.cs

@@ -15,4 +15,4 @@ Current team members include:
 
 #### Attributions:
 First Song: <a href="https://freesound.org/people/Magntron/sounds/335571/" title="gameMusic">gameMusic by Magntron - freesound.org</a>
-Input buttons by <a href="https://thoseawesomeguys.com/prompts/" title="inputkeys">Nicolae (Xelu) Berbece</a>
+Input buttons by <a href="https://thoseawesomeguys.com/prompts/" title="inputkeys">Nicolae (Xelu) Berbece</a>

Globals/Scribe.cs

@@ -34,7 +34,7 @@ project/assembly_name="Funk Engine"
 
 [game]
 
-input_scheme="QWERT"
+input_scheme="ARROWS"
 
 [input]