Add "Mine" ship type

ApmeM · ApmeM · commit 5d479eebd315 · 2026-02-06T07:44:24.000+01:00
diff --git a/TurnBase.KaNoBu.Godot/Presentation/GameField.cs b/TurnBase.KaNoBu.Godot/Presentation/GameField.cs
@@ -195,9 +195,19 @@ public void GamePlayerTurn(int playerNumber, KaNoBuMoveNotificationModel notific
                     break;
                 case KaNoBuMoveNotificationModel.BattleResult.DefenderWon:
                     // Defender won
-                    defenderUnit.RotateUnitTo(movedUnit.Position);
-                    defenderUnit.Attack();
-                    movedUnit.UnitHit();
+                    if (notification.battle.Value.isMine)
+                    {
+                        movedUnit.RotateUnitTo(toWorldPos);
+                        movedUnit.Attack();
+                        movedUnit.UnitHit();
+                        defenderUnit.UnitHit();
+                    }
+                    else
+                    {
+                        defenderUnit.RotateUnitTo(movedUnit.Position);
+                        defenderUnit.Attack();
+                        movedUnit.UnitHit();
+                    }
                     break;
             }
         }
diff --git a/TurnBase.KaNoBu.Godot/Presentation/Levels/Level1.tscn b/TurnBase.KaNoBu.Godot/Presentation/Levels/Level1.tscn
@@ -12,7 +12,7 @@ tile_data = PoolIntArray( 65533, 2, 0, 65534, 2, 1, 65535, 2, 1, 0, 2, 1, 1, 2,
 
 [node name="Unit1" parent="Field" index="0" instance=ExtResource( 3 )]
 position = Vector2( 159, 185 )
-UnitType = 2
+UnitType = 6
 
 [node name="Unit2" parent="Field" index="1" instance=ExtResource( 3 )]
 position = Vector2( 325, 185 )
diff --git a/TurnBase.KaNoBu.Godot/Presentation/UI.cs b/TurnBase.KaNoBu.Godot/Presentation/UI.cs
@@ -86,7 +86,7 @@ public IGame BuildGame()
                     this.GetParent().AddChild(field);
 
                     var rules = new KaNoBuRules(8);
-                    rules.AllFiguresVisible = true;
+                    rules.AllFiguresVisible = false;
                     kanobu = new Game<KaNoBuInitModel, KaNoBuInitResponseModel, KaNoBuMoveModel, KaNoBuMoveResponseModel, KaNoBuMoveNotificationModel>(rules, "test");
 
                     var playerTypes = new[]{
diff --git a/TurnBase.KaNoBu.Godot/Presentation/Unit.cs b/TurnBase.KaNoBu.Godot/Presentation/Unit.cs
@@ -46,18 +46,22 @@ public KaNoBuFigure.FigureTypes UnitType
                     case KaNoBuFigure.FigureTypes.ShipStone:
                         shipTypeTexture.Region = new Rect2(300, 170, 20, 20);
                         break;
+                    case KaNoBuFigure.FigureTypes.ShipFlag:
+                        shipTypeTexture.Region = new Rect2(320, 170, 20, 20);
+                        break;
+
                     case KaNoBuFigure.FigureTypes.ShipScissors:
                         shipTypeTexture.Region = new Rect2(280, 190, 20, 20);
                         break;
                     case KaNoBuFigure.FigureTypes.ShipPaper:
                         shipTypeTexture.Region = new Rect2(300, 190, 20, 20);
                         break;
-                    case KaNoBuFigure.FigureTypes.ShipFlag:
-                        shipTypeTexture.Region = new Rect2(320, 170, 20, 20);
-                        break;
                     case KaNoBuFigure.FigureTypes.ShipUniversal:
                         shipTypeTexture.Region = new Rect2(320, 190, 20, 20);
                         break;
+                    case KaNoBuFigure.FigureTypes.ShipMine:
+                        shipTypeTexture.Region = new Rect2(340, 190, 20, 20);
+                        break;
                 }
             }
         }
diff --git a/TurnBase.KaNoBu.Godot/assets/shipsMiscellaneous_sheet.png b/TurnBase.KaNoBu.Godot/assets/shipsMiscellaneous_sheet.png
diff --git a/TurnBase.KaNoBu/KaNoBuFieldMemorization.cs b/TurnBase.KaNoBu/KaNoBuFieldMemorization.cs
@@ -88,15 +88,22 @@ public void UpdateKnownShips(KaNoBuMoveNotificationModel notification)
                         break;
                     case KaNoBuMoveNotificationModel.BattleResult.DefenderWon:
                         // Defender won
-                        if (defenderUnit.FigureType == KaNoBuFigure.FigureTypes.ShipUniversal)
+                        if (notification.battle.Value.isMine)
                         {
-                            defenderUnit.FigureType = KaNoBuFigure.FigureTypes.Unknown;
+                            defenderUnit.FigureType = KaNoBuFigure.FigureTypes.ShipMine;
                         }
+                        else
+                        {
+                            if (defenderUnit.FigureType == KaNoBuFigure.FigureTypes.ShipUniversal)
+                            {
+                                defenderUnit.FigureType = KaNoBuFigure.FigureTypes.Unknown;
+                            }
 
-                        if (movedUnit.FigureType != KaNoBuFigure.FigureTypes.Unknown) defenderUnit.FigureType = KaNoBuRules.Winner[movedUnit.FigureType];
-                        if (defenderUnit.FigureType != KaNoBuFigure.FigureTypes.Unknown) movedUnit.FigureType = KaNoBuRules.Looser[defenderUnit.FigureType];
+                            if (movedUnit.FigureType != KaNoBuFigure.FigureTypes.Unknown) defenderUnit.FigureType = KaNoBuRules.Winner[movedUnit.FigureType];
+                            if (defenderUnit.FigureType != KaNoBuFigure.FigureTypes.Unknown) movedUnit.FigureType = KaNoBuRules.Looser[defenderUnit.FigureType];
 
-                        this.Field[toMapPos] = defenderUnit;
+                            this.Field[toMapPos] = defenderUnit;
+                        }
                         break;
                 }
             }
diff --git a/TurnBase.KaNoBu/KaNoBuFigure.cs b/TurnBase.KaNoBu/KaNoBuFigure.cs
@@ -33,12 +33,13 @@ public class KaNoBuFigure : IFigure
 
         public enum FigureTypes
         {
-            Unknown = 0,
-            ShipFlag = 1,
-            ShipStone = 2,
-            ShipPaper = 3,
-            ShipScissors = 4,
-            ShipUniversal = 5
+            Unknown,
+            ShipFlag,
+            ShipStone,
+            ShipPaper,
+            ShipScissors,
+            ShipUniversal,
+            ShipMine,
         }
 
         public int PlayerId { get; set; }
@@ -55,7 +56,7 @@ public KaNoBuFigure(int playerId, FigureTypes figureType, bool visibleForAllPlay
 
         public bool IsMoveValid(KaNoBuMoveResponseModel playerMove)
         {
-            if (this.FigureType == FigureTypes.ShipFlag || this.FigureType == FigureTypes.Unknown)
+            if (this.FigureType == FigureTypes.ShipFlag || this.FigureType == FigureTypes.Unknown || this.FigureType == FigureTypes.ShipMine)
             {
                 return false;
             }
diff --git a/TurnBase.KaNoBu/KaNoBuModels.cs b/TurnBase.KaNoBu/KaNoBuModels.cs
@@ -62,6 +62,7 @@ public struct Battle
         {
             public BattleResult battleResult;
             public bool isDefenderFlag;
+            public bool isMine;
         }
 
         public enum BattleResult
diff --git a/TurnBase.KaNoBu/KaNoBuPlayerEasy.cs b/TurnBase.KaNoBu/KaNoBuPlayerEasy.cs
@@ -105,7 +105,7 @@ private List<KaNoBuMoveResponseModel> findAllMovement(IField mainField)
                         continue;
                     }
 
-                    if (shipFrom.FigureType == KaNoBuFigure.FigureTypes.ShipFlag)
+                    if (shipFrom.FigureType == KaNoBuFigure.FigureTypes.ShipFlag || shipFrom.FigureType == KaNoBuFigure.FigureTypes.ShipMine)
                     {
                         continue;
                     }
diff --git a/TurnBase.KaNoBu/KaNoBuPlayerMedium.cs b/TurnBase.KaNoBu/KaNoBuPlayerMedium.cs
@@ -141,7 +141,7 @@ private IEnumerable<KaNoBuMoveResponseModel> findAllMovement(IField mainField)
                         continue;
                     }
 
-                    if (shipFrom.FigureType == KaNoBuFigure.FigureTypes.ShipFlag)
+                    if (shipFrom.FigureType == KaNoBuFigure.FigureTypes.ShipFlag || shipFrom.FigureType == KaNoBuFigure.FigureTypes.ShipMine)
                     {
                         continue;
                     }
diff --git a/TurnBase.KaNoBu/KaNoBuRules.cs b/TurnBase.KaNoBu/KaNoBuRules.cs
@@ -67,7 +67,8 @@ public KaNoBuInitModel GetInitModel(int playerNumber)
             var availableShips = new List<KaNoBuFigure.FigureTypes>();
             var fieldSize = initFieldWidth * initFieldHeight;
             availableShips.Add(KaNoBuFigure.FigureTypes.ShipFlag);
-            for (int i = 1; i < fieldSize; i++)
+            availableShips.Add(KaNoBuFigure.FigureTypes.ShipMine);
+            for (int i = 2; i < fieldSize; i++)
             {
                 var shipN = i % 3;
                 if (shipN == 0) availableShips.Add(KaNoBuFigure.FigureTypes.ShipStone);
@@ -200,6 +201,11 @@ public KaNoBuMoveResponseModel AutoMove(IField field, int playerNumber)
                         continue;
                     }
 
+                    if (playerShip.FigureType == KaNoBuFigure.FigureTypes.ShipMine)
+                    {
+                        continue;
+                    }
+
                     if (playerShip.FigureType == KaNoBuFigure.FigureTypes.ShipFlag)
                     {
                         flagFound = true;
@@ -289,7 +295,7 @@ public KaNoBuMoveNotificationModel MakeMove(IField field, int playerNumber, KaNo
             {
                 mainField[playerMove.From]= null;
                 mainField[playerMove.To] = null;
-                mainField[playerMove.To] = winner;
+                mainField[playerMove.To] = winner.FigureType == KaNoBuFigure.FigureTypes.ShipMine ? null : winner;
                 winner.WinNumber++;
                 if (winner.WinNumber % 3 == 0)
                 {
@@ -325,7 +331,8 @@ public KaNoBuMoveNotificationModel MakeMove(IField field, int playerNumber, KaNo
                     winner == from ? KaNoBuMoveNotificationModel.BattleResult.AttackerWon :
                     winner == to ? KaNoBuMoveNotificationModel.BattleResult.DefenderWon :
                     throw new Exception("Invalid battle calculation."),
-                isDefenderFlag = to.FigureType == KaNoBuFigure.FigureTypes.ShipFlag
+                isDefenderFlag = to.FigureType == KaNoBuFigure.FigureTypes.ShipFlag,
+                isMine = to.FigureType == KaNoBuFigure.FigureTypes.ShipMine
             }
             );
         }
@@ -365,6 +372,10 @@ private KaNoBuFigure battle(KaNoBuFigure attacker, KaNoBuFigure defender)
             {
                 return attacker;
             }
+            else if (defender.FigureType == KaNoBuFigure.FigureTypes.ShipMine)
+            {
+                return defender;
+            }
             else if (defender.FigureType == KaNoBuFigure.FigureTypes.ShipUniversal)
             {
                 defender.FigureType = Winner[attacker.FigureType];
@@ -385,7 +396,7 @@ private KaNoBuFigure battle(KaNoBuFigure attacker, KaNoBuFigure defender)
             }
             else
             {
-                return null;
+                throw new InvalidOperationException($"Battle between attacker {attacker.FigureType} and defender {defender.FigureType} should not happen.");
             }
         }
 

Original file line number	Diff line number	Diff line change
`@@ -33,12 +33,13 @@ public class KaNoBuFigure : IFigure`
`33`	`33`
`34`	`34`	`public enum FigureTypes`
`35`	`35`	`{`
`36`		`- Unknown = 0,`
`37`		`- ShipFlag = 1,`
`38`		`- ShipStone = 2,`
`39`		`- ShipPaper = 3,`
`40`		`- ShipScissors = 4,`
`41`		`- ShipUniversal = 5`
	`36`	`+ Unknown,`
	`37`	`+ ShipFlag,`
	`38`	`+ ShipStone,`
	`39`	`+ ShipPaper,`
	`40`	`+ ShipScissors,`
	`41`	`+ ShipUniversal,`
	`42`	`+ ShipMine,`
`42`	`43`	`}`
`43`	`44`
`44`	`45`	`public int PlayerId { get; set; }`
`@@ -55,7 +56,7 @@ public KaNoBuFigure(int playerId, FigureTypes figureType, bool visibleForAllPlay`
`55`	`56`
`56`	`57`	`public bool IsMoveValid(KaNoBuMoveResponseModel playerMove)`
`57`	`58`	`{`
`58`		`- if (this.FigureType == FigureTypes.ShipFlag \|\| this.FigureType == FigureTypes.Unknown)`
	`59`	`+ if (this.FigureType == FigureTypes.ShipFlag \|\| this.FigureType == FigureTypes.Unknown \|\| this.FigureType == FigureTypes.ShipMine)`
`59`	`60`	`{`
`60`	`61`	`return false;`
`61`	`62`	`}`
Original file line number	Diff line number	Diff line change
`@@ -62,6 +62,7 @@ public struct Battle`
`62`	`62`	`{`
`63`	`63`	`public BattleResult battleResult;`
`64`	`64`	`public bool isDefenderFlag;`
	`65`	`+ public bool isMine;`
`65`	`66`	`}`
`66`	`67`
`67`	`68`	`public enum BattleResult`
Original file line number	Diff line number	Diff line change
`@@ -105,7 +105,7 @@ private List<KaNoBuMoveResponseModel> findAllMovement(IField mainField)`
`105`	`105`	`continue;`
`106`	`106`	`}`
`107`	`107`
`108`		`- if (shipFrom.FigureType == KaNoBuFigure.FigureTypes.ShipFlag)`
	`108`	`+ if (shipFrom.FigureType == KaNoBuFigure.FigureTypes.ShipFlag \|\| shipFrom.FigureType == KaNoBuFigure.FigureTypes.ShipMine)`
`109`	`109`	`{`
`110`	`110`	`continue;`
`111`	`111`	`}`
Original file line number	Diff line number	Diff line change
`@@ -141,7 +141,7 @@ private IEnumerable<KaNoBuMoveResponseModel> findAllMovement(IField mainField)`
`141`	`141`	`continue;`
`142`	`142`	`}`
`143`	`143`
`144`		`- if (shipFrom.FigureType == KaNoBuFigure.FigureTypes.ShipFlag)`
	`144`	`+ if (shipFrom.FigureType == KaNoBuFigure.FigureTypes.ShipFlag \|\| shipFrom.FigureType == KaNoBuFigure.FigureTypes.ShipMine)`
`145`	`145`	`{`
`146`	`146`	`continue;`
`147`	`147`	`}`