Sprint 4

.gitignore

@@ -11,4 +11,5 @@
 .idea/.idea.Funk Engine/.idea/
 
 *.DotSettings.user
-export_presets.cfg
+export_presets.cfg
+*.translation

Audio/Song1.ogg.import

@@ -2,7 +2,7 @@
 
 importer="oggvorbisstr"
 type="AudioStreamOggVorbis"
-uid="uid://iq0xxe5cggs8"
+uid="uid://be5ial13ynf3o"
 path="res://.godot/imported/Song1.ogg-1d785b9ae3fbaa8393048e39af66ed86.oggvorbisstr"
 
 [deps]

Audio/Song2.ogg.import

@@ -2,7 +2,7 @@
 
 importer="oggvorbisstr"
 type="AudioStreamOggVorbis"
-uid="uid://ckis6k6vuums"
+uid="uid://dxp7blovqh1ba"
 path="res://.godot/imported/Song2.ogg-b95c04f3512de6fa42e0f9c35aba831f.oggvorbisstr"
 
 [deps]

Audio/Song3.ogg.import

@@ -2,7 +2,7 @@
 
 importer="oggvorbisstr"
 type="AudioStreamOggVorbis"
-uid="uid://ceyw5mjkem2pi"
+uid="uid://d4nmixdl8xoic"
 path="res://.godot/imported/Song3.ogg-d4e6a5f1a550561df18989fb495ba591.oggvorbisstr"
 
 [deps]

Classes/MidiMaestro/MidiMaestro.cs

@@ -10,6 +10,9 @@ public partial class MidiMaestro : Resource
 {
     private MidiFile _midiFile;
 
+    public static TempoMap TempoMap;
+    public static TimeSignature TimeSignature;
+
     //The four note rows that we care about
     private midiNoteInfo[] _upNotes;
     private midiNoteInfo[] _downNotes;
@@ -18,8 +21,6 @@ public partial class MidiMaestro : Resource
 
     //private MidiFile strippedSong;
 
-    private SongData songData;
-
     //The path relative to the Audio folder. Will change later
     public MidiMaestro(string filePath)
     {
@@ -30,18 +31,20 @@ public MidiMaestro(string filePath)
 
         if (!FileAccess.FileExists(filePath))
         {
-            GD.PrintErr("ERROR: Unable to load level Midi file: " + filePath);
+            GD.PushError("ERROR: Unable to load level Midi file: " + filePath);
         }
 
         _midiFile = MidiFile.Read(filePath);
+        TempoMap = _midiFile.GetTempoMap();
+        TimeSignature = TempoMap.GetTimeSignatureAtTime(new MidiTimeSpan());
 
         //Strip out the notes from the midi file
         foreach (var track in _midiFile.GetTrackChunks())
         {
             string trackName = track.Events.OfType<SequenceTrackNameEvent>().FirstOrDefault()?.Text;
             midiNoteInfo[] noteEvents = track
                 .GetNotes()
-                .Select(note => new midiNoteInfo(note, _midiFile.GetTempoMap()))
+                .Select(note => new midiNoteInfo(note))
                 .ToArray();
 
             switch (trackName)
@@ -60,19 +63,6 @@ public MidiMaestro(string filePath)
                     break;
             }
         }
-
-        //Populate the song data
-        songData = new SongData
-        {
-            //TODO: Allow for changes in this data
-            Bpm = 120,
-            //Fudge the numbers a bit if we have a really short song
-            SongLength =
-                _midiFile.GetDuration<MetricTimeSpan>().Seconds < 20
-                    ? 20
-                    : _midiFile.GetDuration<MetricTimeSpan>().Seconds,
-            NumLoops = 1,
-        };
     }
 
     public midiNoteInfo[] GetNotes(ArrowType arrowType)
@@ -86,30 +76,29 @@ public midiNoteInfo[] GetNotes(ArrowType arrowType)
             _ => throw new ArgumentOutOfRangeException(nameof(arrowType), arrowType, null),
         };
     }
-
-    public SongData GetSongData()
-    {
-        return songData;
-    }
 }
 
 //A facade to wrap the midi notes. This is a simple class that wraps a Note object from the DryWetMidi library.
 public class midiNoteInfo
 {
     private readonly Melanchall.DryWetMidi.Interaction.Note _note;
-    private readonly TempoMap _tempoMap;
 
-    public midiNoteInfo(Melanchall.DryWetMidi.Interaction.Note note, TempoMap tempoMap)
+    public midiNoteInfo(Melanchall.DryWetMidi.Interaction.Note note)
     {
         _note = note;
-        _tempoMap = tempoMap;
+    }
+
+    public long GetStartTimeBeat()
+    {
+        var beatsBar = _note.TimeAs<BarBeatTicksTimeSpan>(MidiMaestro.TempoMap);
+        return beatsBar.Bars * MidiMaestro.TimeSignature.Numerator + beatsBar.Beats;
     }
 
     public long GetStartTimeTicks() => _note.Time;
 
     public float GetStartTimeSeconds() =>
-        _note.TimeAs<MetricTimeSpan>(_tempoMap).Milliseconds / 1000f
-        + _note.TimeAs<MetricTimeSpan>(_tempoMap).Seconds;
+        _note.TimeAs<MetricTimeSpan>(MidiMaestro.TempoMap).Milliseconds / 1000f
+        + _note.TimeAs<MetricTimeSpan>(MidiMaestro.TempoMap).Seconds;
 
     public long GetEndTime() => _note.EndTime;
 

Classes/Notes/Note.cs

@@ -9,15 +9,17 @@
 public partial class Note : Resource, IDisplayable
 {
     public PuppetTemplate Owner;
+    public int Id;
     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.
+    private Action<BattleDirector, Note, Timing> NoteEffect;
 
     public string Tooltip { get; set; }
     public Texture2D Texture { get; set; }
 
     public Note(
+        int id,
         string name,
         string tooltip,
         Texture2D texture = null,
@@ -27,14 +29,15 @@ public Note(
         float costModifier = 1.0f
     )
     {
+        Id = id;
         Name = name;
         Owner = owner;
         NoteEffect =
             noteEffect
             ?? (
                 (BD, source, Timing) =>
                 {
-                    BD.GetTarget(this).TakeDamage(source._baseVal);
+                    BD.GetTarget(this).TakeDamage((int)Timing * source._baseVal);
                 }
             );
         _baseVal = baseVal;
@@ -52,7 +55,21 @@ 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, CostModifier);
+        Note newNote = new Note(
+            Id,
+            Name,
+            Tooltip,
+            Texture,
+            Owner,
+            _baseVal,
+            NoteEffect,
+            CostModifier
+        );
         return newNote;
     }
+
+    public int GetBaseVal()
+    {
+        return _baseVal;
+    }
 }

Classes/Relics/RelicTemplate.cs

@@ -5,27 +5,30 @@
 public partial class RelicTemplate : Resource, IDisplayable
 {
     public RelicEffect[] Effects;
+    public int Id;
     public string Name { get; set; }
 
     public Texture2D Texture { get; set; }
     public string Tooltip { get; set; }
 
     public RelicTemplate(
+        int id,
         string name = "",
         string tooltip = "",
         Texture2D texture = null,
-        RelicEffect[] EffectTags = null
+        RelicEffect[] effectTags = null
     )
     {
-        Effects = EffectTags;
+        Id = id;
+        Effects = effectTags;
         Name = name;
         Tooltip = tooltip;
         Texture = texture;
     }
 
     public RelicTemplate Clone()
     {
-        RelicTemplate newRelic = new RelicTemplate(Name, Tooltip, Texture, Effects);
+        RelicTemplate newRelic = new RelicTemplate(Id, Name, Tooltip, Texture, Effects);
         return newRelic;
     }
 }

Funk Engine.csproj

@@ -7,7 +7,7 @@
     <RootNamespace>FunkEngine</RootNamespace>
   </PropertyGroup>
   <ItemGroup>
-    <Content Include="SaveData\SaveData.json" />
+    <Content Include="Globals\translations.csv" />
     <PackageReference Include="Melanchall.DryWetMidi" Version="7.2.0" />
   </ItemGroup>
   <Target Name="Husky" BeforeTargets="Restore;CollectPackageReferences" Condition="'$(HUSKY)' != 0">

Globals/BGAudioPlayer.tscn → Globals/BgAudioPlayer/BGAudioPlayer.tscn

@@ -1,6 +1,6 @@
 [gd_scene load_steps=2 format=3 uid="uid://csx04jwaoo20u"]
 
-[ext_resource type="Script" path="res://Globals/BgAudioPlayer.cs" id="1_w7def"]
+[ext_resource type="Script" path="res://Globals/BgAudioPlayer/BgAudioPlayer.cs" id="1_w7def"]
 
 [node name="BgAudioPlayer" type="AudioStreamPlayer"]
 script = ExtResource("1_w7def")

Globals/BgAudioPlayer.cs → Globals/BgAudioPlayer/BgAudioPlayer.cs

@@ -7,6 +7,7 @@ public partial class BgAudioPlayer : AudioStreamPlayer
 
     private void PlayMusic(AudioStream music, float volume)
     {
+        ProcessMode = ProcessModeEnum.Always;
         if (Playing && music.Equals(Stream))
         {
             return;

Globals/ContrastFilter/ContrastFilter.gdshader

@@ -0,0 +1,10 @@
+shader_type canvas_item;
+
+uniform sampler2D SCREEN_TEXTURE : hint_screen_texture, filter_linear_mipmap;
+
+void fragment() {
+	vec4 screen = texture(SCREEN_TEXTURE, SCREEN_UV);
+
+	COLOR.rgb =vec3(0.6 * screen.r + 0.6 * screen.g + 0.2 * screen.b);
+}
+

Globals/ContrastFilter/ContrastFilter.tscn

@@ -0,0 +1,19 @@
+[gd_scene load_steps=3 format=3 uid="uid://b6bblgxtfs020"]
+
+[ext_resource type="Shader" path="res://Globals/ContrastFilter/ContrastFilter.gdshader" id="1_4bhca"]
+
+[sub_resource type="ShaderMaterial" id="ShaderMaterial_i6hl4"]
+shader = ExtResource("1_4bhca")
+
+[node name="CanvasLayer" type="CanvasLayer"]
+layer = 128
+
+[node name="Filter" type="ColorRect" parent="."]
+z_index = 4096
+material = SubResource("ShaderMaterial_i6hl4")
+anchors_preset = 15
+anchor_right = 1.0
+anchor_bottom = 1.0
+grow_horizontal = 2
+grow_vertical = 2
+mouse_filter = 2

Globals/FunkEngineNameSpace.cs

@@ -62,7 +62,7 @@ public enum Stages
     Boss,
     Quit,
     Map,
-    Controls,
+    Load,
 }
 
 public class MapGrid
@@ -78,6 +78,12 @@ public Room[] GetRooms()
 
     public class Room
     {
+        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; }
+        public Stages Type { get; private set; }
+
         public Room(int idx, int x, int y)
         {
             Idx = idx;
@@ -96,12 +102,6 @@ public void AddChild(int newIdx)
                 return;
             Children = Children.Append(newIdx).ToArray();
         }
-
-        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; }
-        public Stages Type { get; private set; }
     }
 
     public void InitMapGrid(int width, int height, int paths)
@@ -166,7 +166,6 @@ private void CreateCommonChildren(int width, int 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]);
         }
     }