From 7c9dacd5be28c6a0dfc6be58c08f39ac8c10cbdd Mon Sep 17 00:00:00 2001
From: ntr <ntr@smokestack.io>
Date: Tue, 28 May 2019 22:42:51 +1000
Subject: [PATCH] disable flag for client side

---
 WORKLOG.md                          |  5 -----
 client/src/components/skill.btn.jsx |  2 +-
 server/src/construct.rs             |  5 ++++-
 server/src/game.rs                  | 17 +++++++++++++++--
 4 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/WORKLOG.md b/WORKLOG.md
index a190ad2b..d059c49a 100644
--- a/WORKLOG.md
+++ b/WORKLOG.md
@@ -39,9 +39,6 @@
 
 
 *SERVER*
-* var / skill info rpc
-  * thresholds / bonuses
-
 * std game mode
   * time control
   * animation delay phase end
@@ -49,8 +46,6 @@
 * eth adapter
   * pay for rerolls
 
-* strike speed conversion
-
 * disabled skills set before skill phase
   so client can display
 
diff --git a/client/src/components/skill.btn.jsx b/client/src/components/skill.btn.jsx
index 0a1742a1..58fc922a 100644
--- a/client/src/components/skill.btn.jsx
+++ b/client/src/components/skill.btn.jsx
@@ -69,7 +69,7 @@ function Skill(props) {
 
     return (
         <button
-            disabled={!!cdText || ko}
+            disabled={cdText || s.disabled || ko}
             className={`construct-skill-btn ${side} ${(targeting || highlight) ? 'active' : ''}`}
             type="submit"
             onClick={onClick}>
diff --git a/server/src/construct.rs b/server/src/construct.rs
index f0db76e8..eb4ac6d8 100644
--- a/server/src/construct.rs
+++ b/server/src/construct.rs
@@ -48,6 +48,8 @@ pub struct ConstructSkill {
     pub skill: Skill,
     pub self_targeting: bool,
     pub cd: Cooldown,
+    // used for UI on client
+    pub disabled: bool,
 }
 
 impl ConstructSkill {
@@ -56,6 +58,7 @@ impl ConstructSkill {
             skill,
             self_targeting: skill.self_targeting(),
             cd: skill.base_cd(),
+            disabled: false,
         }
     }
 }
@@ -101,7 +104,7 @@ impl ConstructEffect {
             Some(EffectMeta::Multiplier(s)) => s,
             _ => 0
         }
-        
+
     }
 }
 
diff --git a/server/src/game.rs b/server/src/game.rs
index aa871e64..fb18c641 100644
--- a/server/src/game.rs
+++ b/server/src/game.rs
@@ -168,8 +168,21 @@ impl Game {
             .expect("could not set phase end");
 
         for player in self.players.iter_mut() {
-            if player.skills_required() != 0 {
-                player.set_ready(false);
+            if player.skills_required() == 0 {
+                continue;
+            }
+
+            player.set_ready(false);
+
+            for construct in player.constructs.iter_mut() {
+                for i in 0..construct.skills.len() {
+                    if let Some(d) = construct.disabled(construct.skills[i].skill) {
+                        info!("{:?} disabled {:?}", construct.skills[i].skill, d);
+                        construct.skills[i].disabled = true;
+                    } else {
+                        construct.skills[i].disabled = false;
+                    }
+                }
             }
         }