Merge branch 'Sprint-4' into loop-fix-attempts

Author: LifeHckr

Classes/Notes/Note.cs

@@ -9,6 +9,7 @@
 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; }
@@ -18,6 +19,7 @@ public partial class Note : Resource, IDisplayable
     public Texture2D Texture { get; set; }
 
     public Note(
+        int id,
         string name,
         string tooltip,
         Texture2D texture = null,
@@ -27,6 +29,7 @@ public Note(
         float costModifier = 1.0f
     )
     {
+        Id = id;
         Name = name;
         Owner = owner;
         NoteEffect =
@@ -52,7 +55,16 @@ 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;
     }
 }

Classes/Relics/RelicTemplate.cs

@@ -5,18 +5,21 @@
 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
     )
     {
+        Id = id;
         Effects = EffectTags;
         Name = name;
         Tooltip = tooltip;
@@ -25,7 +28,7 @@ public RelicTemplate(
 
     public RelicTemplate Clone()
     {
-        RelicTemplate newRelic = new RelicTemplate(Name, Tooltip, Texture, Effects);
+        RelicTemplate newRelic = new RelicTemplate(Id, Name, Tooltip, Texture, Effects);
         return newRelic;
     }
 }

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,8 +62,7 @@ public enum Stages
     Boss,
     Quit,
     Map,
-    Controls,
-    Options,
+    Load,
 }
 
 public class MapGrid
@@ -79,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;
@@ -97,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)

Globals/Scribe.cs

@@ -12,6 +12,7 @@ public partial class Scribe : Node
     public static readonly Note[] NoteDictionary = new[]
     {
         new Note(
+            0,
             "EnemyBase",
             "Basic enemy note, deals damage to player.",
             null,
@@ -23,6 +24,7 @@ public partial class Scribe : Node
             }
         ),
         new Note(
+            1,
             "PlayerBase",
             "Basic player note, deals damage to enemy.",
             GD.Load<Texture2D>("res://Classes/Notes/assets/single_note.png"),
@@ -34,6 +36,7 @@ public partial class Scribe : Node
             }
         ),
         new Note(
+            2,
             "PlayerDouble",
             "Basic player note, deals double damage to enemy.",
             GD.Load<Texture2D>("res://Classes/Notes/assets/double_note.png"),
@@ -47,6 +50,7 @@ public partial class Scribe : Node
             }
         ),
         new Note(
+            3,
             "PlayerHeal",
             "Basic player note, heals player.",
             GD.Load<Texture2D>("res://Classes/Notes/assets/heal_note.png"),
@@ -58,6 +62,7 @@ public partial class Scribe : Node
             }
         ),
         new Note(
+            4,
             "PlayerVampire",
             "Steals health from enemy.",
             GD.Load<Texture2D>("res://Classes/Notes/assets/vampire_note.png"),
@@ -70,6 +75,7 @@ public partial class Scribe : Node
             }
         ),
         new Note(
+            5,
             "PlayerQuarter",
             "Basic note at a quarter of the cost.",
             GD.Load<Texture2D>("res://Classes/Notes/assets/quarter_note.png"),
@@ -86,6 +92,7 @@ public partial class Scribe : Node
     public static readonly RelicTemplate[] RelicDictionary = new[]
     {
         new RelicTemplate(
+            0,
             "Breakfast", //Reference ha ha, Item to give when relic pool is empty.
             "Increases max hp.", //TODO: Description can include the relics values?
             GD.Load<Texture2D>("res://Classes/Relics/assets/relic_Breakfast.png"),
@@ -103,6 +110,7 @@ public partial class Scribe : Node
             }
         ),
         new RelicTemplate(
+            1,
             "Good Vibes",
             "Heals the player whenever they place a note.",
             GD.Load<Texture2D>("res://Classes/Relics/assets/relic_GoodVibes.png"),
@@ -119,6 +127,7 @@ public partial class Scribe : Node
             }
         ),
         new RelicTemplate(
+            2,
             "Auroboros",
             "Bigger number, better person. Increases combo multiplier every riff.",
             GD.Load<Texture2D>("res://Classes/Relics/assets/Auroboros.png"),
@@ -136,6 +145,7 @@ public partial class Scribe : Node
             }
         ),
         new RelicTemplate(
+            3,
             "Colorboros",
             "Taste the rainbow. Charges the freestyle bar every riff.",
             GD.Load<Texture2D>("res://Classes/Relics/assets/Colorboros.png"),

Globals/StageProducer.cs

@@ -8,15 +8,13 @@ public partial class StageProducer : Node
     //Generate a map, starting as a width x height grid, pick a starting spot and do (path) paths from that to the last
     //row, connecting the path, then connect all at the end to the boss room.
     public static RandomNumberGenerator GlobalRng = new RandomNumberGenerator();
-    private ulong _seed;
-    private ulong _lastRngState;
     public static bool IsInitialized;
 
     private Stages _curStage = Stages.Title; //TODO: State Machine kinda deal?
     private Node _curScene;
-    public static MapGrid.Room CurRoom { get; private set; }
-    public static Vector2I MapSize { get; private set; } = new Vector2I(7, 6); //For now, make width an odd number
+    public static int CurRoom { get; private set; }
 
+    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();
 
     public static BattleConfig Config;
@@ -25,6 +23,8 @@ public partial class StageProducer : Node
     //TODO: Allow for permanent changes and battle temporary stat changes.
     public static PlayerStats PlayerStats;
 
+    public static CanvasLayer ContrastFilter;
+
     public override void _EnterTree()
     {
         InitFromCfg();
@@ -38,21 +38,66 @@ private void InitFromCfg()
         TranslationServer.SetLocale(
             SaveSystem.GetConfigValue(SaveSystem.ConfigSettings.LanguageKey).As<string>()
         );
+        ContrastFilter = GD.Load<PackedScene>("res://Globals/ContrastFilter/ContrastFilter.tscn")
+            .Instantiate<CanvasLayer>();
+        ContrastFilter.Visible = SaveSystem
+            .GetConfigValue(SaveSystem.ConfigSettings.HighContrast)
+            .AsBool();
+        GetTree().Root.CallDeferred("add_child", ContrastFilter);
     }
 
     public void StartGame()
     {
-        Map.InitMapGrid(MapSize.X, MapSize.Y, 3);
         GlobalRng.Randomize();
-        _seed = GlobalRng.Seed;
-        _lastRngState = GlobalRng.State;
+        GenerateMapConsistent();
         PlayerStats = new PlayerStats();
 
-        CurRoom = Map.GetRooms()[0];
+        CurRoom = Map.GetRooms()[0].Idx;
+        IsInitialized = true;
+    }
+
+    public bool LoadGame()
+    {
+        SaveSystem.SaveFile sv = SaveSystem.LoadGame();
+        if (sv == null)
+        {
+            GD.PushError(
+                "StageProducer.LoadGame(): Can't load game, either file 404 or invalid file."
+            );
+            return false;
+        }
+        GlobalRng.Seed = sv.RngSeed;
+        GenerateMapConsistent();
+        GlobalRng.State = sv.RngState;
+        CurRoom = sv.LastRoomIdx;
+
+        PlayerStats = new PlayerStats();
+        PlayerStats.CurNotes = Array.Empty<Note>();
+        foreach (int noteId in sv.NoteIds)
+        {
+            PlayerStats.AddNote(Scribe.NoteDictionary[noteId]);
+        }
+        foreach (int relicId in sv.RelicIds)
+        {
+            PlayerStats.AddRelic(Scribe.RelicDictionary[relicId]);
+        }
+        PlayerStats.CurrentHealth = sv.PlayerHealth;
         IsInitialized = true;
+        return true;
+    }
+
+    private void GenerateMapConsistent()
+    {
+        GlobalRng.State = GlobalRng.Seed << 5 / 2;
+        Map.InitMapGrid(MapSize.X, MapSize.Y, 3);
     }
 
-    public static void ChangeCurRoom(MapGrid.Room room)
+    public static MapGrid.Room GetCurRoom()
+    {
+        return Map.GetRooms()[CurRoom];
+    }
+
+    public static void ChangeCurRoom(int room)
     {
         CurRoom = room;
     }
@@ -64,6 +109,7 @@ public void TransitionFromRoom(int nextRoomIdx)
 
     public void TransitionStage(Stages nextStage, int nextRoomIdx = -1)
     {
+        GetTree().Root.RemoveChild(ContrastFilter);
         switch (nextStage)
         {
             case Stages.Title:
@@ -89,6 +135,11 @@ public void TransitionStage(Stages nextStage, int nextRoomIdx = -1)
                     StartGame();
                 }
                 break;
+            case Stages.Load:
+                if (!LoadGame())
+                    StartGame();
+                GetTree().ChangeSceneToFile("res://scenes/Maps/cartographer.tscn");
+                break;
             case Stages.Quit:
                 GetTree().Quit();
                 return;
@@ -97,6 +148,8 @@ public void TransitionStage(Stages nextStage, int nextRoomIdx = -1)
                 break;
         }
 
+        //Apply grayscale shader to all scenes
+        GetTree().Root.AddChild(ContrastFilter);
         _curStage = nextStage;
     }
 

Globals/translations.csv

@@ -1,6 +1,7 @@
 keys,en,cn
 TITLE,Midnight Riff,中夜现场
-TITLE_START,Start Game,开始游戏
+TITLE_START,New Game,新游戏
+TITLE_CONTINUE,Load Game,加载游戏
 TITLE_QUIT,Quit Game,退出游戏
 TITLE_OPTIONS,Options,选项
 TITLE_CONTROLS,Change Controls,更改操控
@@ -21,7 +22,7 @@ CHEST_ROOM_ACCEPT,Accept,接受
 BATTLE_ROOM_BEGIN_BUTTON,"Begin Battle [Enter]","开始战斗 [Enter]"
 BATTLE_ROOM_PERFECT,Perfect,精准
 BATTLE_ROOM_GOOD,Good,良好
-BATTLE_ROOM_OK,OK,可以
+BATTLE_ROOM_OKAY,Okay,可以
 BATTLE_ROOM_MISS,Miss,错误
 BATTLE_ROOM_WIN,"You win!","你获胜了!"
 BATTLE_ROOM_LOSE,"Game Over!","游戏结束！"