Setting Up second area level

Also tweaking cartographer camera scroll

Author: LifeHckr

Classes/MapAreas/MapLevels.cs

@@ -107,18 +107,35 @@ private MapLevels(
     public int[] EventIds { get; private set; }
 
     #region Preset Levels
-    private static readonly MapConfig FirstMapConfig = new MapConfig(7, 7, 3, [10, 1, 5, 5, 5])
+    private static readonly MapConfig FirstMapConfig = new MapConfig(7, 7, 3, [10, 2, 5, 6, 5])
         .AddSetRoom(3, Stages.Chest)
         .AddMinHeight(Stages.Chest, 2)
         .AddMinHeight(Stages.Shop, 3)
         .AddMinHeight(Stages.Elite, 3);
 
+    private static readonly MapConfig CityMapConfig = new MapConfig(9, 10, 5, [12, 1, 5, 5, 4])
+        .AddSetRoom(2, Stages.Chest)
+        .AddSetRoom(4, Stages.Shop)
+        .AddMinHeight(Stages.Chest, 1)
+        .AddMinHeight(Stages.Shop, 3)
+        .AddMinHeight(Stages.Elite, 2);
+
     private static readonly MapConfig TutorialMapConfig = new MapConfig(1, 2, 1, [10, 0, 0, 0, 0]);
 
     private static readonly MapLevels[] PresetLevels = new[]
     {
         new MapLevels(0, TutorialMapConfig, [4], [0], [5], [], 1),
-        new MapLevels(1, FirstMapConfig, [1, 3], [2], [0], [], -1),
+        new MapLevels(1, FirstMapConfig, [1, 2], [3], [0], [], 2),
+        new MapLevels(
+            2,
+            CityMapConfig,
+            [1, 2],
+            [3],
+            [0],
+            [],
+            -1,
+            "res://SharedAssets/BackGround_City.png"
+        ),
     };
     #endregion
 

Globals/FunkEngineNameSpace.cs

@@ -291,6 +291,7 @@ public class MapGrid
     private int[,] _map;
     private Room[] _rooms;
     private int _curIdx;
+    public int Width { get; private set; }
 
     public Room[] GetRooms()
     {
@@ -330,6 +331,7 @@ public void AddChild(int newIdx)
     */
     public void InitMapGrid(MapLevels.MapConfig curConfig)
     {
+        Width = curConfig.Width;
         _curIdx = 0;
         _rooms = [];
         _map = new int[curConfig.Width, curConfig.Height]; //x,y

Globals/StageProducer.cs

@@ -228,7 +228,7 @@ private BattleConfig MakeBattleConfig(Stages nextRoom, int nextRoomIdx)
                 int elitIdx = stageRng.RandiRange(0, CurLevel.EliteBattles.Length - 1);
                 result.CurSong = Scribe.SongDictionary[CurLevel.EliteBattles[elitIdx]];
                 result.EnemyScenePath = Scribe
-                    .SongDictionary[CurLevel.BossBattles[elitIdx]]
+                    .SongDictionary[CurLevel.EliteBattles[elitIdx]]
                     .EnemyScenePath;
                 break;
             case Stages.Boss:
@@ -275,6 +275,7 @@ public static bool IsMoreLevels()
 
     public void ProgressLevels()
     {
+        GD.Print(CurLevel.Id);
         CurLevel = CurLevel.GetNextLevel();
 
         Map = new();

Scenes/Maps/Assets/FirstIcon.png

@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://dxiceak20m0l7"
+path="res://.godot/imported/FirstIcon.png-51362bbefd81dee000fc3aedbade09ac.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://Scenes/Maps/Assets/FirstIcon.png"
+dest_files=["res://.godot/imported/FirstIcon.png-51362bbefd81dee000fc3aedbade09ac.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

Scenes/Maps/Assets/FirstIcon.png.import

@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://cyip3p5s5pav5"
+path="res://.godot/imported/StartIcon.png-7b0cc3340e736d4b2b89804cd6171f26.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://Scenes/Maps/Assets/StartIcon.png"
+dest_files=["res://.godot/imported/StartIcon.png-7b0cc3340e736d4b2b89804cd6171f26.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

Scenes/Maps/Assets/StartIcon.png

@@ -18,17 +18,23 @@ Camera = NodePath("TheView")
 top_level = true
 anchor_mode = 0
 limit_top = -10
+limit_bottom = 530
 
 [node name="UI" type="CanvasLayer" parent="." node_paths=PackedStringArray("CurSceneNode")]
 script = ExtResource("2_cl7v0")
 CurSceneNode = NodePath("..")
 
 [node name="BG" type="TextureRect" parent="."]
 modulate = Color(0.462, 0.462, 0.66, 1)
-offset_left = -557.0
-offset_top = -84.0
-offset_right = 83.0
-offset_bottom = 96.0
+anchors_preset = 15
+anchor_right = 1.0
+anchor_bottom = 1.0
+offset_left = -320.0
+offset_top = -10.0
+offset_right = 320.0
+offset_bottom = 170.0
+grow_horizontal = 2
+grow_vertical = 2
 scale = Vector2(3, 3)
 texture = ExtResource("2_5g6at")
 script = ExtResource("5_taedj")

Scenes/Maps/Assets/StartIcon.png.import

@@ -20,5 +20,5 @@ offset_bottom = 284.0
 theme = ExtResource("2_dapxv")
 text = "INBETWEEN_CONTINUE"
 script = ExtResource("3_35xdc")
-ScenePath = 9
+ScenePath = 7
 _startFocused = true

Scenes/Maps/Cartographer.tscn

@@ -27,11 +27,12 @@ public partial class Cartographer : Node2D
     private static readonly Dictionary<Stages, Texture2D> StageIcons = new()
     {
         { Stages.Battle, GD.Load<Texture2D>("res://Scenes/Maps/Assets/BattleIcon.png") },
-        { Stages.Elite, GD.Load<Texture2D>("res://Scenes/Maps/Assets/BossIcon.png") },
-        { Stages.Boss, GD.Load<Texture2D>("res://Scenes/Maps/Assets/EliteIcon.png") },
+        { Stages.Elite, GD.Load<Texture2D>("res://Scenes/Maps/Assets/EliteIcon.png") },
+        { Stages.Boss, GD.Load<Texture2D>("res://Scenes/Maps/Assets/BossIcon.png") },
         { Stages.Chest, GD.Load<Texture2D>("res://Scenes/Maps/Assets/ChestIcon.png") },
         { Stages.Shop, GD.Load<Texture2D>("res://Scenes/Maps/Assets/ShopIcon.png") },
         { Stages.Event, GD.Load<Texture2D>("res://Scenes/Maps/Assets/EventIcon.png") },
+        { Stages.Map, GD.Load<Texture2D>("res://Scenes/Maps/Assets/FirstIcon.png") },
     };
 
     public override void _Ready()
@@ -54,7 +55,7 @@ public override void _EnterTree()
 
     private Vector2 GetPosition(int x, int y)
     {
-        return new Vector2((float)x * 640 / 8 + 32, y * 48 + 16);
+        return new Vector2((float)(x + 1) * 640 / (StageProducer.Map.Width + 1), y * 48 + 16);
     }
 
     private void DrawMap()
@@ -80,7 +81,6 @@ private void DrawMap()
 
     private void DrawMapSprite(MapGrid.Room room)
     {
-        GD.Print(room.Type);
         var newButton = new Button();
         newButton.Theme = ButtonTheme;
         newButton.CustomMinimumSize = MapIconSize;
@@ -118,16 +118,20 @@ private void DrawMapSprite(MapGrid.Room room)
         }
 
         newButton.Icon = StageIcons[room.Type];
+        if (room.Y == 0)
+            newButton.Icon = StageIcons[Stages.Map];
 
         newButton.ZIndex = 1;
         newButton.Position = GetPosition(room.X, room.Y) - newButton.Size / 2;
         if (room == StageProducer.GetCurRoom())
         {
             PlayerSprite.Position = newButton.Position + newButton.Size * .5f;
-            Camera.Position -= //TODO: Better camera matching for areas.
+            Camera.Position -=
                 (
                     (GetViewportRect().Size / 2) - (newButton.Position + newButton.Size * .5f)
-                ).Normalized() * 20;
+                ).Normalized()
+                * room.X
+                * 48;
         }
     }