setup-pos: Do not show page if removeOpponentsPieceFromHand is on (WAR)

calcitem · Apr 21, 2024 · c642064 · c642064
1 parent b15df77
commit c642064
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 9 deletions.
diff --git a/src/ui/flutter_app/lib/game_page/widgets/toolbars/src/setup_position_toolbar.dart b/src/ui/flutter_app/lib/game_page/widgets/toolbars/src/setup_position_toolbar.dart
@@ -521,8 +521,18 @@ class SetupPositionToolbarState extends State<SetupPositionToolbar> {
         assert(false);
       }
     } else if (newPhase == Phase.moving) {
-      GameController().position.pieceInHandCount[PieceColor.white] =
-          GameController().position.pieceInHandCount[PieceColor.black] = 0;
+      if (DB().ruleSettings.millFormationActionInPlacingPhase ==
+              MillFormationActionInPlacingPhase
+                  .removeOpponentsPieceFromHandThenYourTurn ||
+          DB().ruleSettings.millFormationActionInPlacingPhase ==
+              MillFormationActionInPlacingPhase
+                  .removeOpponentsPieceFromHandThenOpponentsTurn) {
+        // TODO: Right?
+        GameController().position.pieceInHandCount[newPieceColor] = 0;
+      } else {
+        GameController().position.pieceInHandCount[PieceColor.white] =
+            GameController().position.pieceInHandCount[PieceColor.black] = 0;
+      }
     } else {
       assert(false);
     }

diff --git a/src/ui/flutter_app/lib/home/home.dart b/src/ui/flutter_app/lib/home/home.dart
@@ -318,13 +318,20 @@ class HomeState extends State<Home> with TickerProviderStateMixin {
           currentSelectedValue: _drawerIndex,
           onSelectionChanged: _changeIndex,
         ),
-      CustomDrawerItem<_DrawerIndex>(
-        itemValue: _DrawerIndex.setupPosition,
-        itemTitle: S.of(context).setupPosition,
-        itemIcon: const Icon(FluentIcons.drafts_24_regular),
-        currentSelectedValue: _drawerIndex,
-        onSelectionChanged: _changeIndex,
-      ),
+      // TODO: Support removeOpponentsPieceFromHand
+      if (DB().ruleSettings.millFormationActionInPlacingPhase !=
+              MillFormationActionInPlacingPhase
+                  .removeOpponentsPieceFromHandThenYourTurn &&
+          DB().ruleSettings.millFormationActionInPlacingPhase !=
+              MillFormationActionInPlacingPhase
+                  .removeOpponentsPieceFromHandThenOpponentsTurn)
+        CustomDrawerItem<_DrawerIndex>(
+          itemValue: _DrawerIndex.setupPosition,
+          itemTitle: S.of(context).setupPosition,
+          itemIcon: const Icon(FluentIcons.drafts_24_regular),
+          currentSelectedValue: _drawerIndex,
+          onSelectionChanged: _changeIndex,
+        ),
       CustomDrawerItem<_DrawerIndex>(
         itemValue: _DrawerIndex.generalSettings,
         itemTitle: S.of(context).generalSettings,