From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 21 Mar 2021 12:25:21 +0000 (+0000)
Subject: clock: Better handling when one player has flag up
X-Git-Tag: otter-0.5.0~563
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=d480b95a840f40ddf58088636a405913f52a7e3f;p=otter.git

clock: Better handling when one player has flag up

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---

diff --git a/src/clock.rs b/src/clock.rs
index 466ea1a7..5108ed05 100644
--- a/src/clock.rs
+++ b/src/clock.rs
@@ -80,11 +80,15 @@ impl State {
     }
   }
 
+  fn any_expired(&self) -> bool {
+    dbg!(self.users.iter().any(|ust| ust.remaining < TVL::zero()))
+  }
+
   fn implies_running(&self, held: Option<PlayerId>) -> Option<User> {
     if_chain! {
       if let Some(Current { user }) = self.current;
       if held.is_none();
-      if self.users[user].remaining >= TVL::zero();
+      if ! self.any_expired();
       then { Some(user) }
       else { None }
     }
@@ -189,6 +193,7 @@ enum URenderState {
   Running,
   ActiveHeld,
   Inactive,
+  OtherFlag,
   Stopped,
   Reset,
   Flag,
@@ -214,6 +219,8 @@ impl Clock {
             if let Some(current) = &state.current {
               if current.user != user {
                 URS::Inactive
+              } else if state.any_expired() {
+                URS::OtherFlag
               } else if held.is_some() {
                 URS::ActiveHeld
               } else {
@@ -260,6 +267,7 @@ impl State {
       if let Some(was_current) = was_current;
       if let Some(now_current) = state.current;
       if now_current != was_current;
+      if ! state.any_expired();
       then {
         let remaining = &mut state.users[now_current.user].remaining;
         *remaining = *remaining + spec.per_move();
@@ -455,6 +463,7 @@ impl PieceTrait for Clock {
         let (text, background, sigil) = match self {
           Running    => ("black",  "yellow",     "&#x25b6;" /* >  */ ),
           ActiveHeld => ("black",  "yellow",     "&#x2016;" /* || */ ),
+          OtherFlag  => ("black",  "yellow",     ":"                 ),
           Inactive   => ("black",  "white",      ":"                 ),
           Stopped    => ("black",  "lightblue",  "&#x25a1;" /* [] */ ),
           Reset      => ("black",  "lightgreen", "&#x25cb;" /* O  */ ),