Add separate field for custom games

Author: ApmeM

TurnBase.KaNoBu.Godot/Presentation/CustomField.cs

@@ -0,0 +1,46 @@
+using Godot;
+using TurnBase;
+
+[SceneReference("CustomField.tscn")]
+public partial class CustomField
+{
+    public override void _Ready()
+    {
+        base._Ready();
+        this.FillMembers();
+    }
+    public override void GameLogCurrentField(IField field)
+    {
+        base.GameLogCurrentField(field);
+        
+        var mainField = (Field2D)field;
+        var needUpdateBitmask = false;
+        for (var x = 0; x < mainField.Width; x++)
+        {
+            for (var y = 0; y < mainField.Height; y++)
+            {
+                var pos = new Vector2(x, y);
+                if (this.field.GetCellv(pos) == 4 && mainField.walls[x, y])
+                {
+                    this.field.SetCellv(pos, -1);
+                }
+                if (this.field.GetCellv(pos) == -1 && !mainField.walls[x, y])
+                {
+                    this.field.SetCellv(pos, 4);
+                    this.beach.SetCellv(pos, -1);
+                    this.castle.SetCellv(pos, -1);
+                    this.castle.SetCellv(pos + Vector2.Down, -1);
+                    this.castle.SetCellv(pos + Vector2.Up, -1);
+                    this.castle.SetCellv(pos + Vector2.Left, -1);
+                    this.castle.SetCellv(pos + Vector2.Right, -1);
+                    needUpdateBitmask = true;
+                }
+            }
+        }
+        if (needUpdateBitmask)
+        {
+            this.beach.UpdateBitmaskRegion();
+            this.castle.UpdateBitmaskRegion();
+        }
+    }
+}

TurnBase.KaNoBu.Godot/Presentation/CustomField.tscn

@@ -83,33 +83,17 @@ public void PlayersInitialized()
         this.field.RemoveChildren();
     }
 
-    public void GameLogCurrentField(IField field)
+    public virtual void GameLogCurrentField(IField field)
     {
         var mainField = (Field2D)field;
         this.memorizedField.SynchronizeField(mainField);
-        var needCameraLimitUpdate = false;
         if (this.field.GetChildCount() == 0)
         {
             for (var x = 0; x < mainField.Width; x++)
             {
                 for (var y = 0; y < mainField.Height; y++)
                 {
                     var pos = new Vector2(x, y);
-                    if (this.field.GetCellv(pos) == 4 && mainField.walls[x, y])
-                    {
-                        this.field.SetCellv(pos, -1);
-                    }
-                    if (this.field.GetCellv(pos) == -1 && !mainField.walls[x, y])
-                    {
-                        this.field.SetCellv(pos, 4);
-                        this.beach.SetCellv(pos, -1);
-                        this.castle.SetCellv(pos, -1);
-                        this.castle.SetCellv(pos + Vector2.Down, -1);
-                        this.castle.SetCellv(pos + Vector2.Up, -1);
-                        this.castle.SetCellv(pos + Vector2.Left, -1);
-                        this.castle.SetCellv(pos + Vector2.Right, -1);
-                        needCameraLimitUpdate = true;
-                    }
 
                     var originalShip = mainField[x, y] as KaNoBuFigure;
                     if (originalShip == null)
@@ -129,11 +113,6 @@ public void GameLogCurrentField(IField field)
                 }
             }
         }
-        if (needCameraLimitUpdate)
-        {
-            this.beach.UpdateBitmaskRegion();
-            this.castle.UpdateBitmaskRegion();
-        }
 
         this.UpdateKnownShips();
     }

TurnBase.KaNoBu.Godot/Presentation/GameField.cs

@@ -1,9 +1,10 @@
-[gd_scene load_steps=6 format=2]
+[gd_scene load_steps=7 format=2]
 
 [ext_resource path="res://Presentation/Levels/LevelBase.tscn" type="PackedScene" id=1]
 [ext_resource path="res://Presentation/Levels/Level2.cs" type="Script" id=2]
 [ext_resource path="res://Presentation/Unit.tscn" type="PackedScene" id=3]
 [ext_resource path="res://assets/Fonts/Xolonium-Regular.ttf" type="DynamicFontData" id=4]
+[ext_resource path="res://gd-timerLabel/TimerLabel.tscn" type="PackedScene" id=5]
 
 [sub_resource type="DynamicFont" id=2]
 font_data = ExtResource( 4 )
@@ -54,5 +55,15 @@ position = Vector2( 487, 346 )
 UnitType = 2
 PlayerNumber = 1
 
-[node name="TimerLabel" parent="." index="5"]
+[node name="TimerLabel" parent="." index="5" instance=ExtResource( 5 )]
+margin_left = -66.0
+margin_top = -58.0
+margin_right = 62.0
+margin_bottom = -38.0
+rect_scale = Vector2( 5, 5 )
+custom_colors/font_color = Color( 1, 1, 1, 1 )
+custom_colors/font_color_shadow = Color( 0, 0, 0, 1 )
 custom_fonts/font = SubResource( 2 )
+text = "Timer label"
+align = 1
+valign = 1

TurnBase.KaNoBu.Godot/Presentation/GameField.tscn

@@ -2,7 +2,7 @@
 
 [ext_resource path="res://Presentation/Main.cs" type="Script" id=1]
 [ext_resource path="res://gd-draggableCamera/DraggableCamera.tscn" type="PackedScene" id=2]
-[ext_resource path="res://Presentation/GameField.tscn" type="PackedScene" id=3]
+[ext_resource path="res://Presentation/CustomField.tscn" type="PackedScene" id=3]
 [ext_resource path="res://Presentation/UI.tscn" type="PackedScene" id=4]
 
 [node name="Main" type="Node"]