Map Scene and Damage number particle

Author: LifeHckr

Globals/StageProducer.cs

@@ -10,11 +10,14 @@ public partial class StageProducer : Node
     public static RandomNumberGenerator GlobalRng = new RandomNumberGenerator();
     private ulong _seed;
     private ulong _lastRngState;
+    private bool _isInitialized = false;
 
     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
 
-    private MapGrid _map = new MapGrid();
+    public static MapGrid Map { get; } = new MapGrid();
 
     //Hold here to persist between changes
     //TODO: Allow for permanent changes and battle temporary stat changes.
@@ -27,6 +30,11 @@ public class MapGrid
         private int _curIdx = 0;
         private int _curRoom = 0;
 
+        public Room[] GetRooms()
+        {
+            return _rooms;
+        }
+
         public class Room
         {
             public Room(int idx, int x, int y)
@@ -48,10 +56,10 @@ public void AddChild(int newIdx)
                 Children = Children.Append(newIdx).ToArray();
             }
 
-            private int Idx;
-            private int[] Children = Array.Empty<int>();
-            private int X;
-            private int Y;
+            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; }
             private string Type;
         }
 
@@ -61,15 +69,15 @@ public void InitMapGrid(int width, int height, int paths)
             _rooms = Array.Empty<Room>();
             _map = new int[width, height]; //x,y
 
-            int startX = GlobalRng.RandiRange(0, width - 1); //TODO: Replace with seeding
+            int startX = (width / 2);
             _rooms = _rooms.Append(new Room(_curIdx, startX, 0)).ToArray();
             _map[startX, 0] = _curIdx++;
 
             for (int i = 0; i < paths; i++)
             {
                 GeneratePath_r(startX, 0, width, height);
             }
-
+            CreateCommonChildren(width, height);
             AddBossRoom(width, height);
         }
 
@@ -93,9 +101,25 @@ private void GeneratePath_r(int x, int y, int width, int height)
             }
         }
 
+        //Asserts that if there is a room at the same x, but y+1 they are connected
+        private void CreateCommonChildren(int width, int height)
+        {
+            foreach (Room room in _rooms)
+            {
+                Vector2I curPos = new Vector2I(room.X, room.Y);
+                if (room.Y + 1 >= 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]);
+            }
+        }
+
+        //Adds a boss room at the end of rooms, all max height rooms connect to it.
         private void AddBossRoom(int width, int height)
         {
-            _rooms = _rooms.Append(new Room(_curIdx, 0, height)).ToArray();
+            _rooms = _rooms.Append(new Room(_curIdx, width / 2, height)).ToArray();
             _rooms[_curIdx].SetType("Boss");
             for (int i = 0; i < width; i++) //Attach all last rooms to a boss room
             {
@@ -109,10 +133,19 @@ private void AddBossRoom(int width, int height)
 
     public void StartGame()
     {
-        _map.InitMapGrid(2, 2, 1);
+        Map.InitMapGrid(MapSize.X, MapSize.Y, 1);
         _seed = GlobalRng.Seed;
         _lastRngState = GlobalRng.State;
         PlayerStats = new PlayerStats();
+
+        CurRoom = Map.GetRooms()[0];
+        _isInitialized = true;
+    }
+
+    public void TransitionFromRoom(int nextRoomIdx)
+    {
+        //CurRoom = Map.GetRooms()[nextRoomIdx];
+        TransitionStage(Stages.Battle);
     }
 
     public void TransitionStage(Stages nextStage)
@@ -124,9 +157,15 @@ public void TransitionStage(Stages nextStage)
                 GetTree().ChangeSceneToFile("res://scenes/SceneTransitions/TitleScreen.tscn");
                 break;
             case Stages.Battle:
-                StartGame();
                 GetTree().ChangeSceneToFile("res://scenes/BattleDirector/test_battle_scene.tscn");
                 break;
+            case Stages.Map:
+                GetTree().ChangeSceneToFile("res://scenes/Maps/cartographer.tscn");
+                if (!_isInitialized)
+                {
+                    StartGame();
+                }
+                break;
             case Stages.Quit:
                 GD.Print("Exiting game");
                 GetTree().Quit();

scenes/BattleDirector/NotePlacementBar.tscn

@@ -13,12 +13,12 @@ gradient = SubResource("Gradient_0u6yv")
 width = 26
 height = 100
 
-[sub_resource type="Gradient" id="Gradient_lyd0l"]
+[sub_resource type="Gradient" id="Gradient_xvck1"]
 offsets = PackedFloat32Array(0, 0.485915, 0.739437, 1)
 colors = PackedColorArray(0, 1, 0, 1, 0.68, 0, 0.272, 1, 0, 0.64, 0.608, 1, 0.4, 0, 0, 1)
 
-[sub_resource type="GradientTexture2D" id="GradientTexture2D_k7kvy"]
-gradient = SubResource("Gradient_lyd0l")
+[sub_resource type="GradientTexture2D" id="GradientTexture2D_0bqho"]
+gradient = SubResource("Gradient_xvck1")
 width = 24
 height = 98
 fill_to = Vector2(0, 1)
@@ -42,7 +42,7 @@ offset_right = 26.0
 offset_bottom = 100.0
 fill_mode = 3
 texture_under = SubResource("GradientTexture2D_hhds4")
-texture_progress = SubResource("GradientTexture2D_k7kvy")
+texture_progress = SubResource("GradientTexture2D_0bqho")
 texture_progress_offset = Vector2(1, 1)
 
 [node name="TextEdit" type="TextEdit" parent="."]

scenes/BattleDirector/test_battle_scene.tscn

@@ -19,6 +19,9 @@ metadata/_edit_lock_ = true
 [node name="AudioStreamPlayer" type="AudioStreamPlayer" parent="."]
 stream = ExtResource("8_caqms")
 
+[node name="AudioStreamPlayer" type="AudioStreamPlayer" parent="."]
+stream = ExtResource("8_caqms")
+
 [node name="UILayer" type="CanvasLayer" parent="."]
 
 [node name="Conductor" type="Node" parent="." node_paths=PackedStringArray("CM")]
@@ -47,6 +50,7 @@ offset_bottom = 360.0
 color = Color(0.165656, 0.165656, 0.165656, 1)
 
 [node name="NotePlacementBar" parent="." instance=ExtResource("7_3ko4g")]
+z_index = 1
 offset_left = 16.0
 offset_top = 164.0
 offset_right = 16.0

scenes/Maps/cartographer.tscn

@@ -1,3 +1,6 @@
-[gd_scene format=3 uid="uid://cydmo2lbnj1de"]
+[gd_scene load_steps=2 format=3 uid="uid://cydmo2lbnj1de"]
+
+[ext_resource type="Script" path="res://scenes/Maps/scripts/Cartographer.cs" id="1_u4q3n"]
 
 [node name="Cartographer" type="Node2D"]
+script = ExtResource("1_u4q3n")

scenes/Maps/scripts/Cartographer.cs

@@ -0,0 +1,62 @@
+using System;
+using System.Linq;
+using FunkEngine;
+using Godot;
+
+public partial class Cartographer : Node2D
+{
+    public override void _Ready()
+    {
+        DrawMap();
+    }
+
+    private Vector2 GetPosition(int x, int y)
+    {
+        return new Vector2((float)x * 640 / StageProducer.MapSize.X - 1 + 64, y * 64 + 16);
+    }
+
+    private void DrawMap()
+    {
+        var rooms = StageProducer.Map.GetRooms();
+        foreach (StageProducer.MapGrid.Room room in rooms)
+        {
+            DrawMapSprite(room);
+            foreach (int roomIdx in room.Children)
+            {
+                Line2D newLine = new Line2D();
+                newLine.AddPoint(GetPosition(room.X, room.Y));
+                newLine.AddPoint(GetPosition(rooms[roomIdx].X, rooms[roomIdx].Y));
+                AddChild(newLine);
+            }
+        }
+    }
+
+    private void DrawMapSprite(StageProducer.MapGrid.Room room)
+    {
+        var newSprite = new Button();
+        AddChild(newSprite);
+        //button is disabled if it is not a child of current room.
+        if (!StageProducer.CurRoom.Children.Contains(room.Idx))
+        {
+            newSprite.Disabled = true;
+            newSprite.FocusMode = Control.FocusModeEnum.None;
+        }
+        else
+        {
+            newSprite.GrabFocus();
+            newSprite.Pressed += () =>
+            {
+                EnterStage(room.Idx);
+            };
+        }
+        newSprite.Icon = (Texture2D)GD.Load("res://icon.svg"); //TODO: Room types icons
+        newSprite.Scale *= .25f;
+        newSprite.ZIndex = 1;
+        newSprite.Position = GetPosition(room.X, room.Y) - newSprite.Size * 2;
+    }
+
+    private void EnterStage(int roomIdx)
+    {
+        GetNode<StageProducer>("/root/StageProducer").TransitionFromRoom(roomIdx);
+    }
+}

scenes/Puppets/scripts/PuppetTemplate.cs

@@ -46,10 +46,24 @@ public virtual void TakeDamage(int amount)
         {
             Defeated?.Invoke(this);
         }
+        if (amount != 0)
+        {
+            TextParticle newText = new TextParticle();
+            newText.Modulate = Colors.Red;
+            Sprite.AddChild(newText);
+            newText.Text = $"-{amount}";
+        }
     }
 
     public virtual void Heal(int amount)
     {
+        if (amount != 0)
+        {
+            TextParticle newText = new TextParticle();
+            newText.Modulate = Colors.Green;
+            Sprite.AddChild(newText);
+            newText.Text = $"+{amount}";
+        }
         _currentHealth = _healthBar.ChangeHP(amount);
     }
 

scenes/SceneTransitions/TitleScreen.tscn

@@ -48,7 +48,7 @@ texture = ExtResource("2_cf582")
 
 [node name="Label" type="Label" parent="VBoxContainer/MarginContainer/Control"]
 layout_mode = 2
-text = "Project Funk engine"
+text = "Insert Title Screen Here"
 
 [node name="HBoxContainer" type="HBoxContainer" parent="VBoxContainer"]
 layout_mode = 2
@@ -69,7 +69,8 @@ layout_mode = 2
 size_flags_horizontal = 3
 text = "Start Game"
 script = ExtResource("2_7f3m6")
-ScenePath = 1
+ScenePath = 3
+_startFocused = true
 
 [node name="MarginContainer3" type="MarginContainer" parent="VBoxContainer/HBoxContainer"]
 visible = false

scenes/SceneTransitions/scripts/SceneChange.cs

@@ -7,8 +7,15 @@ public partial class SceneChange : Button
     [Export]
     public Stages ScenePath;
 
+    [Export]
+    private bool _startFocused = false;
+
     public override void _Ready()
     {
+        if (_startFocused)
+        {
+            GrabFocus();
+        }
         Pressed += OnButtonPressed;
         GD.Print($"[DEBUG] Scene Path: '{ScenePath}'");
     }

scenes/UI/scripts/PauseMenu.cs

@@ -37,6 +37,7 @@ private void Quit()
 
     private void QuitToMainMenu()
     {
+        GetTree().Paused = false;
         GetNode<StageProducer>("/root/StageProducer").TransitionStage(Stages.Title);
     }
 }