From 62cfe4ee1cbf1139fdbf3ff0cdad43e2bdf3410f Mon Sep 17 00:00:00 2001
From: ntr <ntr@smokestack.io>
Date: Fri, 21 Dec 2018 23:29:00 +1100
Subject: [PATCH] tutorial

---
 client/src/events.js | 12 +++++++++---
 client/src/main.js   |  5 ++++-
 server/WORKLOG.md    | 17 ++---------------
 server/src/rpc.rs    |  5 +----
 4 files changed, 16 insertions(+), 23 deletions(-)

diff --git a/client/src/events.js b/client/src/events.js
index 4842c574..61f1cf3e 100644
--- a/client/src/events.js
+++ b/client/src/events.js
@@ -1,9 +1,9 @@
 const toast = require('izitoast');
 
-function registerEvents(registry, events) {
+function registerEvents(registry, events, tutorial) {
     function setCryps(cryps) {
-        console.log('setting cryps');
         registry.set('cryps', cryps);
+        tutorial('homepage');
     }
 
     function setWs(ws) {
@@ -11,7 +11,11 @@ function registerEvents(registry, events) {
     }
 
     function setGame(game) {
-        registry.set('game', game);
+        if (game.phase === 'Skill') tutorial('skillPhase');
+        if (game.phase === 'Target') tutorial('targetPhase');
+        if (game.resolved.length) tutorial('resolutionPhase');
+        if (game.phase === 'Finish') tutorial('finishPhase');
+        return registry.set('game', game);
     }
 
     function setAccount(account) {
@@ -146,6 +150,8 @@ function registerEvents(registry, events) {
         });
     });
 
+    tutorial('welcome');
+
     return {
         loginPrompt,
         setAccount,
diff --git a/client/src/main.js b/client/src/main.js
index 6203789b..01aa1980 100644
--- a/client/src/main.js
+++ b/client/src/main.js
@@ -2,10 +2,13 @@ const renderCryps = require('./scenes/cryps');
 
 const createSocket = require('./socket');
 const registerEvents = require('./events');
+const createTutorial = require('./tutorial');
 
 const game = renderCryps();
-const events = registerEvents(game.registry, game.events);
+const tutorial = createTutorial();
+const events = registerEvents(game.registry, game.events, tutorial);
 const ws = createSocket(events);
+
 events.setWs(ws);
 events.setGameList([]);
 
diff --git a/server/WORKLOG.md b/server/WORKLOG.md
index 084e91b5..20508485 100644
--- a/server/WORKLOG.md
+++ b/server/WORKLOG.md
@@ -10,7 +10,7 @@ strangle
 
 
 ## NOW
-* pve granted stat reroll items
+
 
 ## SOON
 * tutorial
@@ -31,11 +31,7 @@ strangle
 * redis for game events
 * chat
 * notifications
-* rejoin in progress games
-  * lock account to 1 open game at a time
-
-
-
+* elo + leaderboards
 
 
 * Items
@@ -53,11 +49,6 @@ strangle
 teams
 1v1 2v2 3v3
 
-
-skill order defined by cryp/skill speed
-
-counter -> dmg <-> heal
-
 gem td style attr combinations
   stoney + spikey = jagged
 
@@ -68,12 +59,8 @@ gem td style attr combinations
   artificial
   elementals
 
-
-  first strike
-
   techno artists for the soundtrack
 
-
   slimey
   ghostly
 
diff --git a/server/src/rpc.rs b/server/src/rpc.rs
index 69633696..a031bd69 100644
--- a/server/src/rpc.rs
+++ b/server/src/rpc.rs
@@ -251,10 +251,7 @@ impl Rpc {
     fn account_demo(_data: Vec<u8>, tx: &mut Transaction, _client: &mut WebSocket<TcpStream>) -> Result<RpcResponse, Error> {
         let mut rng = thread_rng();
 
-        let acc_name: String = iter::repeat(())
-            .map(|()| rng.sample(Alphanumeric))
-            .take(8)
-            .collect();
+        let acc_name: String = iter::repeat(()).map(|()| rng.sample(Alphanumeric)).take(8).collect();
 
         let account = account_create(AccountCreateParams { name: acc_name, password: "grepgrepgrep".to_string() }, tx)?;