From ad00059f7420056f4e2f0abc1e2ebfc8583c3f13 Mon Sep 17 00:00:00 2001
From: ntr <ntr@smokestack.io>
Date: Tue, 28 May 2019 22:46:31 +1000
Subject: [PATCH] disabled log

---
 WORKLOG.md         | 4 ----
 server/src/game.rs | 6 +++++-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/WORKLOG.md b/WORKLOG.md
index d059c49a..634e90af 100644
--- a/WORKLOG.md
+++ b/WORKLOG.md
@@ -46,12 +46,8 @@
 * eth adapter
   * pay for rerolls
 
-* disabled skills set before skill phase
-  so client can display
-
 * remove test variants of skills
 
-
 ## SOON
 
 * push events
diff --git a/server/src/game.rs b/server/src/game.rs
index fb18c641..b3ce419c 100644
--- a/server/src/game.rs
+++ b/server/src/game.rs
@@ -38,6 +38,7 @@ pub struct Game {
     pub log: Vec<String>,
     pub instance: Option<Uuid>,
     phase_end: DateTime<Utc>,
+    phase_start: DateTime<Utc>,
 }
 
 impl Game {
@@ -53,6 +54,7 @@ impl Game {
             log: vec![],
             instance: None,
             phase_end: Utc::now(),
+            phase_start: Utc::now(),
         };
     }
 
@@ -92,6 +94,7 @@ impl Game {
         let player_description = player.constructs.iter().map(|c| c.name.clone()).collect::<Vec<String>>().join(", ");
         self.log.push(format!("{:} has joined the game. [{:}]", player.name, player_description));
 
+        player.constructs.sort_unstable_by_key(|c| c.id);
         self.players.push(player);
 
         Ok(self)
@@ -163,6 +166,7 @@ impl Game {
     }
 
     fn skill_phase_start(mut self) -> Game {
+        self.phase_start = Utc::now();
         self.phase_end = Utc::now()
             .checked_add_signed(Duration::seconds(60))
             .expect("could not set phase end");
@@ -177,7 +181,7 @@ impl Game {
             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);
+                        // info!("{:?} disabled {:?}", construct.skills[i].skill, d);
                         construct.skills[i].disabled = true;
                     } else {
                         construct.skills[i].disabled = false;