From 2d918af744b765ddcb0aef82e06ce8b1f6d5fcfb Mon Sep 17 00:00:00 2001
From: ntr <ntr@smokestack.io>
Date: Mon, 14 Jan 2019 22:26:06 +1100
Subject: [PATCH] fix zone tag join

---
 client/src/scenes/statsheet.js | 12 +++++++++++-
 server/src/item.rs             |  2 +-
 server/src/zone.rs             | 16 ++++++++--------
 3 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/client/src/scenes/statsheet.js b/client/src/scenes/statsheet.js
index 4bf0b9ca..6f348bfd 100644
--- a/client/src/scenes/statsheet.js
+++ b/client/src/scenes/statsheet.js
@@ -62,7 +62,17 @@ class StatSheet extends Phaser.Scene {
             this.stats.add(this.add
                 .text(STAT_X, STAT_Y, `${stat.stat}: ${stat.base}`, TEXT.NORMAL));
         };
-        const CRYP_STATS = [cryp.stamina, cryp.phys_dmg, cryp.spell_dmg, cryp.speed];
+
+        const CRYP_STATS = [
+            cryp.stamina,
+            cryp.armour,
+            cryp.spell_shield,
+            cryp.evasion,
+            cryp.phys_dmg,
+            cryp.spell_dmg,
+            cryp.speed,
+        ];
+
         CRYP_STATS.forEach(crypStat);
     }
 
diff --git a/server/src/item.rs b/server/src/item.rs
index 59fc4e0e..f42021b2 100644
--- a/server/src/item.rs
+++ b/server/src/item.rs
@@ -83,7 +83,7 @@ fn mode_drops(mode: GameMode) -> Vec<(ItemAction, usize)> {
         GameMode::Zone3v2Attack |
         GameMode::Zone2v2Caster |
         GameMode::Zone3v3MeleeMiniboss => vec![
-            (ItemAction::RerollSpeed, 1),
+            (ItemAction::RerollEvasion, 1),
             (ItemAction::RerollArmour, 1),
             (ItemAction::RerollSpellShield, 1),
         ],
diff --git a/server/src/zone.rs b/server/src/zone.rs
index 94048a41..26d3529e 100644
--- a/server/src/zone.rs
+++ b/server/src/zone.rs
@@ -174,9 +174,9 @@ pub fn zone_join(params: ZoneJoinParams, tx: &mut Transaction, account: &Account
             .ok_or(err_msg("invalid encounter id"))?;
 
         let mode = match encounter.tag.as_ref() {
-            "ZONE0" => GameMode::Zone3v2Attack,
-            "ZONE1" => GameMode::Zone2v2Caster,
-            "ZONE2" => GameMode::Zone3v3MeleeMiniboss,
+            "NORMAL" => GameMode::Zone3v2Attack,
+            "CASTER" => GameMode::Zone2v2Caster,
+            "MINIBOSS" => GameMode::Zone3v3MeleeMiniboss,
             "BOSS" => GameMode::Zone3v3HealerBoss,
             _ => return Err(err_msg("unknown zone tag")),
         };
@@ -204,7 +204,7 @@ pub fn zone_close(params: ZoneCloseParams, tx: &mut Transaction, _account: &Acco
 fn add_shape(shape: Shape, gr: &mut ZoneGraph, start: NodeIndex, x: i8, y: i8) -> (NodeIndex, i8, i8) {
     match shape {
         Shape::Line => {
-            let mut next = gr.add_node(Encounter::new("MINIBOSS", x, y));
+            let mut next = gr.add_node(Encounter::new("CASTER", x, y));
             gr.add_edge(start, next, ());
 
             let exit = gr.add_node(Encounter::new("NORMAL", x + 1, y));
@@ -253,7 +253,7 @@ fn add_shape(shape: Shape, gr: &mut ZoneGraph, start: NodeIndex, x: i8, y: i8) -
             let bottom_tip = gr.add_node(Encounter::new("BOSS", x + 1, y - 2));
             gr.add_edge(bottom, bottom_tip, ());
 
-            let side = gr.add_node(Encounter::new("NORMAL", x + 2, y));
+            let side = gr.add_node(Encounter::new("CASTER", x + 2, y));
             gr.add_edge(start, side, ());
             gr.add_edge(top, side, ());
             gr.add_edge(bottom, side, ());
@@ -276,7 +276,7 @@ fn add_shape(shape: Shape, gr: &mut ZoneGraph, start: NodeIndex, x: i8, y: i8) -
             let bottom_tip = gr.add_node(Encounter::new("NORMAL", x + 1, y - 1));
             gr.add_edge(bottom, bottom_tip, ());
 
-            let side = gr.add_node(Encounter::new("NORMAL", x + 2, y));
+            let side = gr.add_node(Encounter::new("CASTER", x + 2, y));
             gr.add_edge(top_tip, side, ());
             gr.add_edge(bottom_tip, side, ());
 
@@ -298,7 +298,7 @@ fn add_shape(shape: Shape, gr: &mut ZoneGraph, start: NodeIndex, x: i8, y: i8) -
             let bottom_tip = gr.add_node(Encounter::new("MINIBOSS", x + 2, y - 1));
             gr.add_edge(bottom, bottom_tip, ());
 
-            let exit = gr.add_node(Encounter::new("NORMAL", x + 3, y));
+            let exit = gr.add_node(Encounter::new("CASTER", x + 3, y));
             gr.add_edge(top_tip, exit, ());
             gr.add_edge(bottom_tip, exit, ());
 
@@ -313,7 +313,7 @@ pub fn create_zone_graph() -> ZoneGraph {
     let mut rng = thread_rng();
 
     let mut last = gr.add_node(Encounter::start());
-    let mut x = 1;
+    let mut x = 0;
     let mut y = 0;
 
     for _i in 0..4 {