apply noClaimWin rule

Aphexus · Sep 22, 2022 · 8cd9839 · 8cd9839
1 parent 994ef03
commit 8cd9839
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/modules/game/src/main/Game.scala b/modules/game/src/main/Game.scala
@@ -383,10 +383,11 @@ case class Game(
         )
     }
 
-  def resignable      = playable && !abortable
-  def forceResignable = resignable && nonAi && !fromFriend && hasClock && !isSwiss
-  def drawable        = playable && !abortable && !swissPreventsDraw
-  def forceDrawable   = playable && !abortable
+  def resignable = playable && !abortable
+  def forceResignable =
+    resignable && nonAi && !fromFriend && hasClock && !isSwiss && !metadata.hasRule(_.NoClaimWin)
+  def drawable      = playable && !abortable && !swissPreventsDraw
+  def forceDrawable = playable && !abortable && !metadata.hasRule(_.NoClaimWin)
 
   def finish(status: Status, winner: Option[Color]): Game =
     copy(

diff --git a/ui/round/src/view/button.ts b/ui/round/src/view/button.ts
@@ -115,6 +115,7 @@ export function standard(
 
 export function opponentGone(ctrl: RoundController) {
   const gone = ctrl.opponentGone();
+  if (ctrl.data.game.rules?.includes('noClaimWin')) return null;
   return gone === true
     ? h('div.suggestion', [
         h('p', { hook: onSuggestionHook }, ctrl.noarg('opponentLeftChoices')),