Project-Funk-Engine · collectioncard · Feb 17, 2025 · Feb 5, 2025 · Feb 5, 2025 · Feb 7, 2025
diff --git a/Classes/Note.cs b/Classes/Note.cs
diff --git a/Classes/Notes/Note.cs b/Classes/Notes/Note.cs
@@ -0,0 +1,55 @@
+using System;
+using FunkEngine;
+using Godot;
+
+/**
+ * @class Note
+ * @brief Data structure class for holding data and methods for a battle time note. WIP
+ */
+public partial class Note : Resource
+{
+    public PuppetTemplate Owner;
+    public string Name;
+    private int _baseVal;
+    private Action<BattleDirector, Note, Timing> NoteEffect; //TODO: Where/How to deal with timing.
+
+    public string Tooltip;
+    public Texture2D Texture;
+
+    public Note(
+        string name,
+        string tooltip,
+        Texture2D texture = null,
+        PuppetTemplate owner = null,
+        int baseVal = 1,
+        Action<BattleDirector, Note, Timing> noteEffect = null
+    )
+    {
+        Name = name;
+        Owner = owner;
+        NoteEffect =
+            noteEffect
+            ?? (
+                (BD, source, Timing) =>
+                {
+                    BD.GetTarget(this).TakeDamage(source._baseVal);
+                }
+            );
+        _baseVal = baseVal;
+        Texture = texture;
+        Tooltip = tooltip;
+    }
+
+    public void OnHit(BattleDirector BD, Timing timing)
+    {
+        NoteEffect(BD, this, timing);
+    }
+
+    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
+        Note newNote = new Note(Name, Tooltip, Texture, Owner, _baseVal, NoteEffect);
+        return newNote;
+    }
+}
diff --git a/Classes/Notes/assets/double_note.png b/Classes/Notes/assets/double_note.png
diff --git a/...NoteManager/assets/right-arrow.png.import → Classes/Notes/assets/double_note.png.import b/...NoteManager/assets/right-arrow.png.import → Classes/Notes/assets/double_note.png.import
@@ -2,16 +2,16 @@
 
 importer="texture"
 type="CompressedTexture2D"
-uid="uid://bucvj4fquqpkr"
-path="res://.godot/imported/right-arrow.png-b3005485b42777a77a9d39fbba48875d.ctex"
+uid="uid://caw70lr5e1yiq"
+path="res://.godot/imported/double_note.png-1b788aee0b7f76d502303d178d821d3b.ctex"
 metadata={
 "vram_texture": false
 }
 
 [deps]
 
-source_file="res://scenes/NoteManager/assets/right-arrow.png"
-dest_files=["res://.godot/imported/right-arrow.png-b3005485b42777a77a9d39fbba48875d.ctex"]
+source_file="res://Classes/Notes/assets/double_note.png"
+dest_files=["res://.godot/imported/double_note.png-1b788aee0b7f76d502303d178d821d3b.ctex"]
 
 [params]
 

diff --git a/Classes/Notes/assets/single_note.png b/Classes/Notes/assets/single_note.png
diff --git a/Classes/Notes/assets/single_note.png.import b/Classes/Notes/assets/single_note.png.import
@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://c3chrsxrulapd"
+path="res://.godot/imported/single_note.png-edadc3d6779f4cc26ac823d186717719.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://Classes/Notes/assets/single_note.png"
+dest_files=["res://.godot/imported/single_note.png-edadc3d6779f4cc26ac823d186717719.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/RelicEffect.cs b/Classes/Relics/RelicEffect.cs
@@ -0,0 +1,31 @@
+using System;
+using FunkEngine;
+using Godot;
+
+public partial class RelicEffect : IBattleEvent
+{
+    private BattleEffectTrigger Trigger { get; set; }
+    public int BaseValue;
+    private Action<BattleDirector, int> OnRelicEffect;
-public partial class RelicEffect : IBattleEvent
-{
-    private BattleEffectTrigger Trigger { get; set; }
-    public int BaseValue;
-    private Action<BattleDirector, int> OnRelicEffect;
+/// <summary>
+/// Represents an effect that can be triggered during battle.
+/// </summary>
+public partial class RelicEffect : IBattleEvent
+{
+    private BattleEffectTrigger Trigger { get; set; }
+    /// <summary>
+    /// Gets or sets the base value for this effect.
+    /// </summary>
+    public int BaseValue { get; set; }
+    private Action<BattleDirector, int> OnRelicEffect;
+}
-public partial class RelicEffect : IBattleEvent
-{
-    private BattleEffectTrigger Trigger { get; set; }
-    public int BaseValue;
-    private Action<BattleDirector, int> OnRelicEffect;
+/// <summary>
+/// Represents an effect that can be triggered during battle.
+/// </summary>
+public partial class RelicEffect : IBattleEvent
+{
+    private BattleEffectTrigger Trigger { get; set; }
+    /// <summary>
+    /// Gets or sets the base value for this effect.
+    /// </summary>
+    public int BaseValue { get; set; }
+    private Action<BattleDirector, int> OnRelicEffect;
+}
+
+    public RelicEffect(
+        BattleEffectTrigger trigger,
+        int val,
+        Action<BattleDirector, int> onRelicEffect
+    )
+    {
+        BaseValue = val;
+        Trigger = trigger;
+        OnRelicEffect = onRelicEffect;
+    }
+
+    public void OnTrigger(BattleDirector battleDirector)
+    {
+        OnRelicEffect(battleDirector, BaseValue);
+    }
-    public void OnTrigger(BattleDirector battleDirector)
-    {
-        OnRelicEffect(battleDirector, BaseValue);
-    }
+    public void OnTrigger(BattleDirector battleDirector)
+    {
+        if (battleDirector == null)
+            throw new ArgumentNullException(nameof(battleDirector));
+
+        OnRelicEffect(battleDirector, BaseValue);
+    }
-    public void OnTrigger(BattleDirector battleDirector)
-    {
-        OnRelicEffect(battleDirector, BaseValue);
-    }
+    public void OnTrigger(BattleDirector battleDirector)
+    {
+        if (battleDirector == null)
+            throw new ArgumentNullException(nameof(battleDirector));
+
+        OnRelicEffect(battleDirector, BaseValue);
+    }
+
+    public BattleEffectTrigger GetTrigger()
+    {
+        return Trigger;
+    }
+}
diff --git a/Classes/Relics/RelicTemplate.cs b/Classes/Relics/RelicTemplate.cs
@@ -0,0 +1,31 @@
+using System;
+using FunkEngine;
+using Godot;
+
+public partial class RelicTemplate : Resource
+{
+    public RelicEffect[] Effects;
+    public string Name;
+
+    public Texture2D Texture;
+    public string Tooltip;
-public partial class RelicTemplate : Resource
-{
-    public RelicEffect[] Effects;
-    public string Name;
-
-    public Texture2D Texture;
-    public string Tooltip;
+/// <summary>
+/// Represents a template for game relics, defining their properties and effects.
+/// </summary>
+public partial class RelicTemplate : Resource
+{
+    /// <summary>
+    /// Gets or sets the effects associated with this relic.
+    /// </summary>
+    public RelicEffect[] Effects { get; set; }
+
+    /// <summary>
+    /// Gets or sets the name of the relic.
+    /// </summary>
+    public string Name { get; set; }
+
+    /// <summary>
+    /// Gets or sets the texture used to display the relic.
+    /// </summary>
+    public Texture2D Texture { get; set; }
+
+    /// <summary>
+    /// Gets or sets the tooltip description of the relic.
+    /// </summary>
+    public string Tooltip { get; set; }
+}
-public partial class RelicTemplate : Resource
-{
-    public RelicEffect[] Effects;
-    public string Name;
-
-    public Texture2D Texture;
-    public string Tooltip;
+/// <summary>
+/// Represents a template for game relics, defining their properties and effects.
+/// </summary>
+public partial class RelicTemplate : Resource
+{
+    /// <summary>
+    /// Gets or sets the effects associated with this relic.
+    /// </summary>
+    public RelicEffect[] Effects { get; set; }
+
+    /// <summary>
+    /// Gets or sets the name of the relic.
+    /// </summary>
+    public string Name { get; set; }
+
+    /// <summary>
+    /// Gets or sets the texture used to display the relic.
+    /// </summary>
+    public Texture2D Texture { get; set; }
+
+    /// <summary>
+    /// Gets or sets the tooltip description of the relic.
+    /// </summary>
+    public string Tooltip { get; set; }
+}
+
+    public RelicTemplate(
+        string name = "",
+        string tooltip = "",
+        Texture2D texture = null,
+        RelicEffect[] EffectTags = null
+    )
+    {
+        Effects = EffectTags;
+        Name = name;
+        Tooltip = tooltip;
+        Texture = texture;
+    }
+
+    public RelicTemplate Clone()
+    {
+        RelicTemplate newRelic = new RelicTemplate(Name, Tooltip, Texture, Effects);
+        return newRelic;
+    }
-    public RelicTemplate Clone()
-    {
-        RelicTemplate newRelic = new RelicTemplate(Name, Tooltip, Texture, Effects);
-        return newRelic;
-    }
+    public RelicTemplate Clone()
+    {
+        RelicTemplate newRelic = new RelicTemplate(
+            Name,
+            Tooltip,
+            Texture,
+            Effects?.Select(effect => new RelicEffect(
+                effect.GetTrigger(),
+                effect.BaseValue,
+                effect.OnRelicEffect
+            )).ToArray()
+        );
+        return newRelic;
+    }
-    public RelicTemplate Clone()
-    {
-        RelicTemplate newRelic = new RelicTemplate(Name, Tooltip, Texture, Effects);
-        return newRelic;
-    }
+    public RelicTemplate Clone()
+    {
+        RelicTemplate newRelic = new RelicTemplate(
+            Name,
+            Tooltip,
+            Texture,
+            Effects?.Select(effect => new RelicEffect(
+                effect.GetTrigger(),
+                effect.BaseValue,
+                effect.OnRelicEffect
+            )).ToArray()
+        );
+        return newRelic;
+    }
+}
diff --git a/Classes/Relics/assets/relic_Breakfast.png b/Classes/Relics/assets/relic_Breakfast.png
diff --git a/Classes/Relics/assets/relic_Breakfast.png.import 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
diff --git a/Classes/Relics/assets/relic_GoodVibes.png.import 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/Funk Engine.csproj b/Funk Engine.csproj
@@ -6,6 +6,9 @@
     <EnableDynamicLoading>true</EnableDynamicLoading>
     <RootNamespace>FunkEngine</RootNamespace>
   </PropertyGroup>
+  <ItemGroup>
+    <Content Include="SaveData\SaveData.json" />
+  </ItemGroup>
   <Target Name="Husky" BeforeTargets="Restore;CollectPackageReferences" Condition="'$(HUSKY)' != 0">
     <Exec Command="dotnet tool restore" StandardOutputImportance="Low" StandardErrorImportance="High" />
     <Exec Command="dotnet husky install" StandardOutputImportance="Low" StandardErrorImportance="High" WorkingDirectory="." />

diff --git a/Globals/FunkEngineNameSpace.cs b/Globals/FunkEngineNameSpace.cs
@@ -0,0 +1,57 @@
+using Godot;
+
+namespace FunkEngine;
+
+public enum ArrowType
+{
+    Up = 0,
+    Down = 1,
+    Left = 2,
+    Right = 3,
+}
+
+public enum BattleEffectTrigger
+{
+    NotePlaced,
+    NoteHit,
+    SelfNoteHit,
+    OnPickup,
+}
+
+public enum Timing
+{
+    Miss = 0,
+    Bad = 1,
+    Okay = 2,
+    Good = 3,
+    Perfect = 4,
+}
+
+public enum Stages
+{
+    Title,
+    Battle,
+    Quit,
+    Map,
+}
+
+public struct SongData
+{
+    public int Bpm;
+    public double SongLength;
+    public int NumLoops;
+}
+
+public struct ArrowData
+{
+    public Color Color;
+    public string Key;
+    public NoteChecker Node;
+    public ArrowType Type;
+}
+
+public interface IBattleEvent
+{
+    void OnTrigger(BattleDirector BD);
+    BattleEffectTrigger GetTrigger();
+}