From ce72522314fc4604228731e408550d0757f06cfc Mon Sep 17 00:00:00 2001
From: Mashy <himesh.kapadia@gmail.com>
Date: Wed, 4 Sep 2019 14:54:49 +1000
Subject: [PATCH 01/10] show components for skills

---
 client/src/components/info.component.jsx | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/client/src/components/info.component.jsx b/client/src/components/info.component.jsx
index 547581aa..2696cadf 100644
--- a/client/src/components/info.component.jsx
+++ b/client/src/components/info.component.jsx
@@ -28,9 +28,16 @@ function InfoComponent(args) {
             const regEx = /(RedPower|BluePower|GreenPower|RedLife|BlueLife|GreenLife|SpeedStat)/;
             const infoDescription = reactStringReplace(fullInfo.description, regEx, match => shapes[match]());
 
+            const itemSource = itemInfo.combos.filter(c => c.item === info);
+            const itemSourceInfo = itemSource.length
+                ? `${itemSource[0].components[0]} ${itemSource[0].components[1]} ${itemSource[0].components[2]}`
+                : false;
+            const itemRegEx = /(Red|Blue|Green)/;
+            const itemSourceDescription = reactStringReplace(itemSourceInfo, itemRegEx, match => shapes[match]());
             return (
                 <div class="info-skill">
                     <h2>{fullInfo.item}</h2>
+                    <h3>{itemSourceDescription}</h3>
                     <div> {infoDescription} </div>
                 </div>
             );

From a16369085cf2e07a258cddc7617b736375376d2d Mon Sep 17 00:00:00 2001
From: ntr <ntr@smokestack.io>
Date: Wed, 4 Sep 2019 15:23:35 +1000
Subject: [PATCH 02/10] do not kill listener threads on error

---
 server/src/events.rs | 2 +-
 server/src/warden.rs | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/server/src/events.rs b/server/src/events.rs
index c6cf57a5..782f0088 100644
--- a/server/src/events.rs
+++ b/server/src/events.rs
@@ -88,7 +88,7 @@ impl Events {
                 },
 
                 Err(e) => {
-                    return Err(format_err!("events error err={:?}", e));
+                    warn!("events error err={:?}", e);
                 },
             };
         }
diff --git a/server/src/warden.rs b/server/src/warden.rs
index f1ebd731..5cef7008 100644
--- a/server/src/warden.rs
+++ b/server/src/warden.rs
@@ -57,7 +57,7 @@ impl Warden {
                 },
 
                 Err(e) => {
-                    return Err(format_err!("err={:?}", e));
+                    warn!("err={:?}", e);
                 },
             };
         }

From 285d57493408bfa674ba6ea8af08306aae120896 Mon Sep 17 00:00:00 2001
From: Mashy <himesh.kapadia@gmail.com>
Date: Wed, 4 Sep 2019 15:34:43 +1000
Subject: [PATCH 03/10] serde rename items

---
 server/src/item.rs | 148 +++++++++++++++++++++++++++++++++++++++++----
 1 file changed, 137 insertions(+), 11 deletions(-)

diff --git a/server/src/item.rs b/server/src/item.rs
index d7ed1039..ae4177fc 100644
--- a/server/src/item.rs
+++ b/server/src/item.rs
@@ -30,153 +30,279 @@ pub enum Item {
     LifeRG,
     LifeGB,
     LifeRB,
+    #[serde(rename = "LifeGG+")]
     LifeGGPlus,
+    #[serde(rename = "LifeRR+")]
     LifeRRPlus,
+    #[serde(rename = "LifeBB+")]
     LifeBBPlus,
+    #[serde(rename = "LifeRG+")]
     LifeRGPlus,
+    #[serde(rename = "LifeGB+")]
     LifeGBPlus,
+    #[serde(rename = "LifeRB+")]
     LifeRBPlus,
+    #[serde(rename = "LifeGG++")]
     LifeGGPlusPlus,
+    #[serde(rename = "LifeRR++")]
     LifeRRPlusPlus,
+    #[serde(rename = "LifeBB++")]
     LifeBBPlusPlus,
+    #[serde(rename = "LifeRG++")]
     LifeRGPlusPlus,
+    #[serde(rename = "LifeGB++")]
     LifeGBPlusPlus,
+    #[serde(rename = "LifeRB++")]
     LifeRBPlusPlus,
 
     // Power Upgrades
+    PowerGG,
     PowerRR,
     PowerBB,
-    PowerGG,
     PowerRG,
     PowerGB,
     PowerRB,
-    PowerRRPlus,
+    #[serde(rename = "PowerGG+")]
     PowerGGPlus,
+    #[serde(rename = "PowerRR+")]
+    PowerRRPlus,
+    #[serde(rename = "PowerBB+")]
     PowerBBPlus,
+    #[serde(rename = "PowerRG+")]
     PowerRGPlus,
+    #[serde(rename = "PowerGB+")]
     PowerGBPlus,
+    #[serde(rename = "PowerRB+")]
     PowerRBPlus,
-    PowerRRPlusPlus,
-    PowerBBPlusPlus,
+    #[serde(rename = "PowerGG++")]
     PowerGGPlusPlus,
+    #[serde(rename = "PowerRR++")]
+    PowerRRPlusPlus,
+    #[serde(rename = "PowerBB++")]
+    PowerBBPlusPlus,
+    #[serde(rename = "PowerRG++")]
     PowerRGPlusPlus,
+    #[serde(rename = "PowerGB++")]
     PowerGBPlusPlus,
+    #[serde(rename = "PowerRB++")]
     PowerRBPlusPlus,
 
     // Speed Upgrades
+    SpeedGG,
     SpeedRR,
     SpeedBB,
-    SpeedGG,
     SpeedRG,
     SpeedGB,
     SpeedRB,
-
-    SpeedRRPlus,
-    SpeedBBPlus,
+    #[serde(rename = "SpeedGG+")]
     SpeedGGPlus,
+    #[serde(rename = "SpeedRR+")]
+    SpeedRRPlus,
+    #[serde(rename = "SpeedBB+")]
+    SpeedBBPlus,
+    #[serde(rename = "SpeedRG+")]
     SpeedRGPlus,
+    #[serde(rename = "SpeedGB+")]
     SpeedGBPlus,
+    #[serde(rename = "SpeedRB+")]
     SpeedRBPlus,
-
-    SpeedRRPlusPlus,
-    SpeedBBPlusPlus,
+    #[serde(rename = "SpeedGG++")]
     SpeedGGPlusPlus,
+    #[serde(rename = "SpeedRR++")]
+    SpeedRRPlusPlus,
+    #[serde(rename = "SpeedBB++")]
+    SpeedBBPlusPlus,
+    #[serde(rename = "SpeedRG++")]
     SpeedRGPlusPlus,
+    #[serde(rename = "SpeedGB++")]
     SpeedGBPlusPlus,
+    #[serde(rename = "SpeedRB++")]
     SpeedRBPlusPlus,
 
     Amplify,
+    #[serde(rename = "Amplify+")]
     AmplifyPlus,
+    #[serde(rename = "Amplify++")]
     AmplifyPlusPlus,
+    
     Absorb,
+    #[serde(rename = "Absorb+")]
     AbsorbPlus,
+    #[serde(rename = "Absorb++")]
     AbsorbPlusPlus,
+    
     Banish,
+    #[serde(rename = "Banish+")]
     BanishPlus,
+    #[serde(rename = "Banish++")]
     BanishPlusPlus,
+    
     Bash,
+    #[serde(rename = "Bash+")]
     BashPlus,
+    #[serde(rename = "Bash++")]
     BashPlusPlus,
+    
     Blast,
+    #[serde(rename = "Blast+")]
     BlastPlus,
+    #[serde(rename = "Blast++")]
     BlastPlusPlus,
+    
     Chaos,
+    #[serde(rename = "Chaos+")]
     ChaosPlus,
+    #[serde(rename = "Chaos++")]
     ChaosPlusPlus,
+    
     Sustain,
+    #[serde(rename = "Sustain+")]
     SustainPlus,
+    #[serde(rename = "Sustain++")]
     SustainPlusPlus,
+    
     Electrify,
+    #[serde(rename = "Electrify+")]
     ElectrifyPlus,
+    #[serde(rename = "Electrify++")]
     ElectrifyPlusPlus,
+    
     Curse,
+    #[serde(rename = "Curse+")]
     CursePlus,
+    #[serde(rename = "Curse++")]
     CursePlusPlus,
+    
     Decay,
+    #[serde(rename = "Decay+")]
     DecayPlus,
+    #[serde(rename = "Decay++")]
     DecayPlusPlus,
+    
     Hex,
+    #[serde(rename = "Hex+")]
     HexPlus,
+    #[serde(rename = "Hex++")]
     HexPlusPlus,
+    
     Haste,
+    #[serde(rename = "Haste+")]
     HastePlus,
+    #[serde(rename = "Haste++")]
     HastePlusPlus,
+    
     Heal,
+    #[serde(rename = "Heal+")]
     HealPlus,
+    #[serde(rename = "Heal++")]
     HealPlusPlus,
+    
     Hybrid,
+    #[serde(rename = "Hybrid+")]
     HybridPlus,
+    #[serde(rename = "Hybrid++")]
     HybridPlusPlus,
+    
     Invert,
+    #[serde(rename = "Invert+")]
     InvertPlus,
+    #[serde(rename = "Invert++")]
     InvertPlusPlus,
+    
     Counter,
+    #[serde(rename = "Counter+")]
     CounterPlus,
+    #[serde(rename = "Counter++")]
     CounterPlusPlus,
+    
     Purge,
+    #[serde(rename = "Purge+")]
     PurgePlus,
+    #[serde(rename = "Purge++")]
     PurgePlusPlus,
+    
     Purify,
+    #[serde(rename = "Purify+")]
     PurifyPlus,
+    #[serde(rename = "Purify++")]
     PurifyPlusPlus,
+    
     Reflect,
+    #[serde(rename = "Reflect+")]
     ReflectPlus,
+    #[serde(rename = "Reflect++")]
     ReflectPlusPlus,
+    
     Recharge,
+    #[serde(rename = "Recharge+")]
     RechargePlus,
+    #[serde(rename = "Recharge++")]
     RechargePlusPlus,
+    
     Ruin,
+    #[serde(rename = "Ruin+")]
     RuinPlus,
+    #[serde(rename = "Ruin++")]
     RuinPlusPlus,
+    
     Link,
+    #[serde(rename = "Link+")]
     LinkPlus,
+    #[serde(rename = "Link++")]
     LinkPlusPlus,
+    
     Silence,
+    #[serde(rename = "Silence+")]
     SilencePlus,
+    #[serde(rename = "Silence++")]
     SilencePlusPlus,
+    
     Slay,
+    #[serde(rename = "Slay+")]
     SlayPlus,
+    #[serde(rename = "Slay++")]
     SlayPlusPlus,
+    
     Sleep,
+    #[serde(rename = "Sleep+")]
     SleepPlus,
+    #[serde(rename = "Sleep++")]
     SleepPlusPlus,
+    
     Restrict,
+    #[serde(rename = "Restrict+")]
     RestrictPlus,
+    #[serde(rename = "Restrict++")]
     RestrictPlusPlus,
+    
     Strike,
+    #[serde(rename = "Strike+")]
     StrikePlus,
+    #[serde(rename = "Strike++")]
     StrikePlusPlus,
+    
     Siphon,
+    #[serde(rename = "Siphon+")]
     SiphonPlus,
+    #[serde(rename = "Siphon++")]
     SiphonPlusPlus,
+    
     Intercept,
+    #[serde(rename = "Intercept+")]
     InterceptPlus,
+    #[serde(rename = "Intercept++")]
     InterceptPlusPlus,
+    
     Break,
+    #[serde(rename = "Break+")]
     BreakPlus,
+    #[serde(rename = "Break++")]
     BreakPlusPlus,
+    
     Triage,
+    #[serde(rename = "Triage+")]
     TriagePlus,
+    #[serde(rename = "Triage++")]
     TriagePlusPlus,
 }
 

From 1600ca6c828d575621885088339fa981d6b61286 Mon Sep 17 00:00:00 2001
From: Mashy <himesh.kapadia@gmail.com>
Date: Wed, 4 Sep 2019 16:25:28 +1000
Subject: [PATCH 04/10] fix ++ spec display in vbox

---
 client/src/components/shapes.jsx         | 216 ++++++++++++++++++++++-
 client/src/components/vbox.component.jsx |   1 -
 server/src/item.rs                       |  36 ----
 3 files changed, 214 insertions(+), 39 deletions(-)

diff --git a/client/src/components/shapes.jsx b/client/src/components/shapes.jsx
index b0816383..ec8f2106 100644
--- a/client/src/components/shapes.jsx
+++ b/client/src/components/shapes.jsx
@@ -100,9 +100,79 @@ module.exports = {
         {square(['red', 'blue'])}
         <figcaption>Life</figcaption>
     </figure>,
+    LifeGGPlus: () =>
+    <figure>
+        {square(['green'])}
+        <figcaption>Life+</figcaption>
+    </figure>,
 
+    LifeRRPlus: () =>
+    <figure>
+        {square(['red'])}
+        <figcaption>Life+</figcaption>
+    </figure>,
 
-    // Power Upgrades
+    LifeBBPlus:() =>
+    <figure>
+        {square(['blue'])}
+        <figcaption>Life+</figcaption>
+    </figure>,
+
+    LifeRGPlus: () =>
+    <figure>
+        {square(['red', 'green'])}
+        <figcaption>Life+</figcaption>
+    </figure>,
+
+    LifeGBPlus: () =>
+    <figure>
+        {square(['green', 'blue'])}
+        <figcaption>Life+</figcaption>
+    </figure>,
+
+    LifeRBPlus:() =>
+    <figure>
+        {square(['red', 'blue'])}
+        <figcaption>Life+</figcaption>
+    </figure>,
+
+    LifeGGPlusPlus: () =>
+    <figure>
+        {square(['green'])}
+        <figcaption>Life++</figcaption>
+    </figure>,
+
+    LifeRRPlusPlus: () =>
+    <figure>
+        {square(['red'])}
+        <figcaption>Life++</figcaption>
+    </figure>,
+
+    LifeBBPlusPlus:() =>
+    <figure>
+        {square(['blue'])}
+        <figcaption>Life++</figcaption>
+    </figure>,
+
+    LifeRGPlusPlus: () =>
+    <figure>
+        {square(['red', 'green'])}
+        <figcaption>Life++</figcaption>
+    </figure>,
+
+    LifeGBPlusPlus: () =>
+    <figure>
+        {square(['green', 'blue'])}
+        <figcaption>Life++</figcaption>
+    </figure>,
+
+    LifeRBPlusPlus:() =>
+    <figure>
+        {square(['red', 'blue'])}
+        <figcaption>Life++</figcaption>
+    </figure>,
+
+    // Powers Upgrades
     PowerGG: () =>
     <figure>
         {circle(['green'])}
@@ -138,8 +208,79 @@ module.exports = {
         {circle(['red', 'blue'])}
         <figcaption>Power</figcaption>
     </figure>,
+    PowerGGPlus: () =>
+    <figure>
+        {circle(['green'])}
+        <figcaption>Power+</figcaption>
+    </figure>,
 
-    // Speed Upgrades
+    PowerRRPlus: () =>
+    <figure>
+        {circle(['red'])}
+        <figcaption>Power+</figcaption>
+    </figure>,
+
+    PowerBBPlus:() =>
+    <figure>
+        {circle(['blue'])}
+        <figcaption>Power+</figcaption>
+    </figure>,
+
+    PowerRGPlus: () =>
+    <figure>
+        {circle(['red', 'green'])}
+        <figcaption>Power+</figcaption>
+    </figure>,
+
+    PowerGBPlus: () =>
+    <figure>
+        {circle(['green', 'blue'])}
+        <figcaption>Power+</figcaption>
+    </figure>,
+
+    PowerRBPlus:() =>
+    <figure>
+        {circle(['red', 'blue'])}
+        <figcaption>Power+</figcaption>
+    </figure>,
+
+    PowerGGPlusPlus: () =>
+    <figure>
+        {circle(['green'])}
+        <figcaption>Power++</figcaption>
+    </figure>,
+
+    PowerRRPlusPlus: () =>
+    <figure>
+        {circle(['red'])}
+        <figcaption>Power++</figcaption>
+    </figure>,
+
+    PowerBBPlusPlus:() =>
+    <figure>
+        {circle(['blue'])}
+        <figcaption>Power++</figcaption>
+    </figure>,
+
+    PowerRGPlusPlus: () =>
+    <figure>
+        {circle(['red', 'green'])}
+        <figcaption>Power++</figcaption>
+    </figure>,
+
+    PowerGBPlusPlus: () =>
+    <figure>
+        {circle(['green', 'blue'])}
+        <figcaption>Power++</figcaption>
+    </figure>,
+
+    PowerRBPlusPlus:() =>
+    <figure>
+        {circle(['red', 'blue'])}
+        <figcaption>Power++</figcaption>
+    </figure>,
+
+    // Speeds Upgrades
     SpeedGG: () =>
     <figure>
         {triangle(['green'])}
@@ -175,4 +316,75 @@ module.exports = {
         {triangle(['red', 'blue'])}
         <figcaption>Speed</figcaption>
     </figure>,
+    SpeedGGPlus: () =>
+    <figure>
+        {triangle(['green'])}
+        <figcaption>Speed+</figcaption>
+    </figure>,
+
+    SpeedRRPlus: () =>
+    <figure>
+        {triangle(['red'])}
+        <figcaption>Speed+</figcaption>
+    </figure>,
+
+    SpeedBBPlus:() =>
+    <figure>
+        {triangle(['blue'])}
+        <figcaption>Speed+</figcaption>
+    </figure>,
+
+    SpeedRGPlus: () =>
+    <figure>
+        {triangle(['red', 'green'])}
+        <figcaption>Speed+</figcaption>
+    </figure>,
+
+    SpeedGBPlus: () =>
+    <figure>
+        {triangle(['green', 'blue'])}
+        <figcaption>Speed+</figcaption>
+    </figure>,
+
+    SpeedRBPlus:() =>
+    <figure>
+        {triangle(['red', 'blue'])}
+        <figcaption>Speed+</figcaption>
+    </figure>,
+
+    SpeedGGPlusPlus: () =>
+    <figure>
+        {triangle(['green'])}
+        <figcaption>Speed++</figcaption>
+    </figure>,
+
+    SpeedRRPlusPlus: () =>
+    <figure>
+        {triangle(['red'])}
+        <figcaption>Speed++</figcaption>
+    </figure>,
+
+    SpeedBBPlusPlus:() =>
+    <figure>
+        {triangle(['blue'])}
+        <figcaption>Speed++</figcaption>
+    </figure>,
+
+    SpeedRGPlusPlus: () =>
+    <figure>
+        {triangle(['red', 'green'])}
+        <figcaption>Speed++</figcaption>
+    </figure>,
+
+    SpeedGBPlusPlus: () =>
+    <figure>
+        {triangle(['green', 'blue'])}
+        <figcaption>Speed++</figcaption>
+    </figure>,
+
+    SpeedRBPlusPlus:() =>
+    <figure>
+        {triangle(['red', 'blue'])}
+        <figcaption>Speed++</figcaption>
+    </figure>,
 };
diff --git a/client/src/components/vbox.component.jsx b/client/src/components/vbox.component.jsx
index 232ba9c2..9df9112f 100644
--- a/client/src/components/vbox.component.jsx
+++ b/client/src/components/vbox.component.jsx
@@ -305,7 +305,6 @@ function Vbox(args) {
 
         const highlighted = combiner.indexOf(i) > -1;
         const classes = `${highlighted ? 'highlight' : ''}`;
-
         if (shapes[v]) {
             return (
                 <button
diff --git a/server/src/item.rs b/server/src/item.rs
index ae4177fc..67efb76e 100644
--- a/server/src/item.rs
+++ b/server/src/item.rs
@@ -30,29 +30,17 @@ pub enum Item {
     LifeRG,
     LifeGB,
     LifeRB,
-    #[serde(rename = "LifeGG+")]
     LifeGGPlus,
-    #[serde(rename = "LifeRR+")]
     LifeRRPlus,
-    #[serde(rename = "LifeBB+")]
     LifeBBPlus,
-    #[serde(rename = "LifeRG+")]
     LifeRGPlus,
-    #[serde(rename = "LifeGB+")]
     LifeGBPlus,
-    #[serde(rename = "LifeRB+")]
     LifeRBPlus,
-    #[serde(rename = "LifeGG++")]
     LifeGGPlusPlus,
-    #[serde(rename = "LifeRR++")]
     LifeRRPlusPlus,
-    #[serde(rename = "LifeBB++")]
     LifeBBPlusPlus,
-    #[serde(rename = "LifeRG++")]
     LifeRGPlusPlus,
-    #[serde(rename = "LifeGB++")]
     LifeGBPlusPlus,
-    #[serde(rename = "LifeRB++")]
     LifeRBPlusPlus,
 
     // Power Upgrades
@@ -62,29 +50,17 @@ pub enum Item {
     PowerRG,
     PowerGB,
     PowerRB,
-    #[serde(rename = "PowerGG+")]
     PowerGGPlus,
-    #[serde(rename = "PowerRR+")]
     PowerRRPlus,
-    #[serde(rename = "PowerBB+")]
     PowerBBPlus,
-    #[serde(rename = "PowerRG+")]
     PowerRGPlus,
-    #[serde(rename = "PowerGB+")]
     PowerGBPlus,
-    #[serde(rename = "PowerRB+")]
     PowerRBPlus,
-    #[serde(rename = "PowerGG++")]
     PowerGGPlusPlus,
-    #[serde(rename = "PowerRR++")]
     PowerRRPlusPlus,
-    #[serde(rename = "PowerBB++")]
     PowerBBPlusPlus,
-    #[serde(rename = "PowerRG++")]
     PowerRGPlusPlus,
-    #[serde(rename = "PowerGB++")]
     PowerGBPlusPlus,
-    #[serde(rename = "PowerRB++")]
     PowerRBPlusPlus,
 
     // Speed Upgrades
@@ -94,29 +70,17 @@ pub enum Item {
     SpeedRG,
     SpeedGB,
     SpeedRB,
-    #[serde(rename = "SpeedGG+")]
     SpeedGGPlus,
-    #[serde(rename = "SpeedRR+")]
     SpeedRRPlus,
-    #[serde(rename = "SpeedBB+")]
     SpeedBBPlus,
-    #[serde(rename = "SpeedRG+")]
     SpeedRGPlus,
-    #[serde(rename = "SpeedGB+")]
     SpeedGBPlus,
-    #[serde(rename = "SpeedRB+")]
     SpeedRBPlus,
-    #[serde(rename = "SpeedGG++")]
     SpeedGGPlusPlus,
-    #[serde(rename = "SpeedRR++")]
     SpeedRRPlusPlus,
-    #[serde(rename = "SpeedBB++")]
     SpeedBBPlusPlus,
-    #[serde(rename = "SpeedRG++")]
     SpeedRGPlusPlus,
-    #[serde(rename = "SpeedGB++")]
     SpeedGBPlusPlus,
-    #[serde(rename = "SpeedRB++")]
     SpeedRBPlusPlus,
 
     Amplify,

From b910f99f898e8b9cca7679181b7744ae64e4c22b Mon Sep 17 00:00:00 2001
From: ntr <ntr@smokestack.io>
Date: Wed, 4 Sep 2019 16:38:03 +1000
Subject: [PATCH 05/10] improve pvp queue

---
 server/src/events.rs   | 72 ++++++++++++++++++++++++++----------------
 server/src/instance.rs |  3 --
 server/src/rpc.rs      |  5 ++-
 server/src/warden.rs   |  7 +++-
 4 files changed, 53 insertions(+), 34 deletions(-)

diff --git a/server/src/events.rs b/server/src/events.rs
index 782f0088..ca1ce5af 100644
--- a/server/src/events.rs
+++ b/server/src/events.rs
@@ -4,6 +4,7 @@ use std::collections::{HashMap, HashSet};
 use uuid::Uuid;
 
 use failure::Error;
+use failure::{err_msg, format_err};
 
 use crossbeam_channel::{Sender, Receiver};
 
@@ -28,7 +29,7 @@ type Id = usize;
 pub struct PvpRequest {
     pub id: Id,
     pub tx: Sender<RpcMessage>,
-    pub account: Account,
+    pub account: Uuid,
 }
 
 pub struct Events {
@@ -37,8 +38,6 @@ pub struct Events {
 
     mail: Sender<Mail>,
     warden: Sender<GameEvent>,
-    queue: Option<PvpRequest>,
-
     clients: HashMap<Id, WsClient>,
 }
 
@@ -54,13 +53,15 @@ pub enum Event {
     Push(Uuid, RpcMessage),
 
     // client events
-    Queue(PvpRequest),
+    Queue(Id),
 }
 
 struct WsClient {
     id: Id,
+    account: Option<Uuid>,
     tx: Sender<RpcMessage>,
     subs: HashSet<Uuid>,
+    pvp: bool,
 }
 
 impl Events {
@@ -70,7 +71,6 @@ impl Events {
             rx,
             warden,
             mail,
-            queue: None,
             clients: HashMap::new(),
         }
     }
@@ -110,7 +110,12 @@ impl Events {
             Event::Connect(id, account, tx) => {
                 info!("connect id={:?} account={:?}", id, account);
 
-                let client = WsClient { id, tx, subs: HashSet::new() };
+                let account_id = match account {
+                    Some(a) => Some(a.id),
+                    None => None,
+                };
+
+                let client = WsClient { id, tx, account: account_id, subs: HashSet::new(), pvp: false };
                 self.clients.insert(id, client);
 
                 info!("clients={:?}", self.clients.len());
@@ -181,30 +186,43 @@ impl Events {
                 Ok(())
             },
 
-            Event::Queue(req) => {
-                info!("queue id={:?} account={:?}", req.id, req.account);
+            Event::Queue(id) => {
+                // check whether request is valid
+                {
+                    let c = self.clients.get(&id)
+                        .ok_or(format_err!("connection not found id={:?}", id))?;
 
-                self.queue = match self.queue {
-                    Some(ref q_req) => {
-                        info!("game queue pair found a={:?} b={:?}", req.account, q_req.account);
-                        self.warden.send(GameEvent::Match((req, q_req.clone())))?;
-                        None
-                    },
-                    None => {
-                        info!("joined game queue id={:?} account={:?}", req.id, req.account);
-                        match self.clients.get(&req.id) {
-                            Some(ref c) => {
-                                c.tx.send(RpcMessage::QueueJoined(()))?;
-                                Some(req)
-                            },
-                            None => return Err(format_err!("missing client client={:?}", req.id)),
-                        }
-                    },
-                };
+                    if let None = c.account {
+                        return Err(err_msg("cannot join pvp queue anonymously"));
+                    }
 
-                Ok(())
+                    info!("pvp queue request id={:?} account={:?}", c.id, c.account);
+                }
+
+                // create the req for the already queued opponent
+                if let Some(opp_req) = match self.clients.iter_mut().find(|(_c_id, c)| c.pvp) {
+                    Some((q_id, q)) => {
+                        q.pvp = false;
+                        Some(PvpRequest { id: *q_id, account: q.account.unwrap(), tx: q.tx.clone() })
+                    },
+                    None => None,
+                } {
+                    // combine the requests and send to warden
+                    let c = self.clients.get_mut(&id)
+                        .ok_or(format_err!("connection not found id={:?}", id))?;
+
+                    let player_req = PvpRequest { id: c.id, account: c.account.unwrap(), tx: c.tx.clone() };
+                    self.warden.send(GameEvent::Match((opp_req, player_req)))?;
+
+                    return Ok(())
+                }
+
+                // or flag the requester as pvp ready
+                let requester = self.clients.get_mut(&id).unwrap();
+                requester.pvp = true;
+                info!("joined game queue id={:?} account={:?}", requester.id, requester.account);
+                return Ok(());
             },
-
         }
     }
 }
diff --git a/server/src/instance.rs b/server/src/instance.rs
index 5443eac9..34f72bd1 100644
--- a/server/src/instance.rs
+++ b/server/src/instance.rs
@@ -691,9 +691,6 @@ pub fn instance_practice(tx: &mut Transaction, account: &Account) -> Result<Inst
     Ok(instance)
 }
 
-// pub fn instance_queue(tx: &mut Transaction, a: &Account, b: &Account) -> Result<Instance, Error> {
-// }
-
 pub fn pvp(tx: &mut Transaction, a: &Account, b: &Account) -> Result<Instance, Error> {
     let mut instance = Instance::new()
         // TODO generate nice game names
diff --git a/server/src/rpc.rs b/server/src/rpc.rs
index 01579c23..54408bd2 100644
--- a/server/src/rpc.rs
+++ b/server/src/rpc.rs
@@ -19,7 +19,7 @@ use ws::{listen, CloseCode, Message, Handler, Request, Response};
 use account::{Account};
 use account;
 use construct::{Construct};
-use events::{Event, PvpRequest};
+use events::{Event};
 use game::{Game, game_state, game_skill, game_ready};
 use instance::{Instance, instance_state, instance_practice, instance_ready};
 use item::{Item, ItemInfoCtr, item_info};
@@ -132,8 +132,7 @@ impl Connection {
                 // evented but authorization required
                 match v {
                     RpcRequest::InstanceQueue {} => {
-                        let pvp = PvpRequest { id: self.id, account: account.clone(), tx: self.ws.clone() };
-                        self.events.send(Event::Queue(pvp))?;
+                        self.events.send(Event::Queue(self.id))?;
                         return Ok(RpcMessage::QueueRequested(()));
                     },
                     _ => (),
diff --git a/server/src/warden.rs b/server/src/warden.rs
index 5cef7008..8232282a 100644
--- a/server/src/warden.rs
+++ b/server/src/warden.rs
@@ -8,6 +8,7 @@ use crossbeam_channel::{tick, Sender, Receiver};
 use postgres::transaction::Transaction;
 use failure::Error;
 
+use account;
 use game::{games_need_upkeep, game_update, game_write, game_delete};
 use instance;
 use instance::{instances_need_upkeep, instances_idle, instance_update, instance_delete};
@@ -91,7 +92,11 @@ impl Warden {
 
         let db = self.pool.get()?;
         let mut tx = db.transaction()?;
-        let instance = instance::pvp(&mut tx, &pair.0.account, &pair.1.account)?;
+
+        let a = account::select(&db, pair.0.account)?;
+        let b = account::select(&db, pair.1.account)?;
+
+        let instance = instance::pvp(&mut tx, &a, &b)?;
         tx.commit()?;
 
         // subscribe users to instance events

From 0ca193421e917ecb181f03f3ce6245d0001a23fa Mon Sep 17 00:00:00 2001
From: ntr <ntr@smokestack.io>
Date: Wed, 4 Sep 2019 16:39:07 +1000
Subject: [PATCH 06/10] version bump

---
 VERSION             | 2 +-
 acp/package.json    | 2 +-
 client/package.json | 2 +-
 ops/package.json    | 2 +-
 server/Cargo.toml   | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/VERSION b/VERSION
index 1cc5f657..867e5243 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.1.0
\ No newline at end of file
+1.2.0
\ No newline at end of file
diff --git a/acp/package.json b/acp/package.json
index cc7a1379..a13e342e 100644
--- a/acp/package.json
+++ b/acp/package.json
@@ -1,6 +1,6 @@
 {
   "name": "mnml-client",
-  "version": "1.1.0",
+  "version": "1.2.0",
   "description": "",
   "main": "index.js",
   "scripts": {
diff --git a/client/package.json b/client/package.json
index a0ecb408..14bc2149 100644
--- a/client/package.json
+++ b/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "mnml-client",
-  "version": "1.1.0",
+  "version": "1.2.0",
   "description": "",
   "main": "index.js",
   "scripts": {
diff --git a/ops/package.json b/ops/package.json
index ce9cd791..75a489af 100755
--- a/ops/package.json
+++ b/ops/package.json
@@ -1,6 +1,6 @@
 {
   "name": "mnml-ops",
-  "version": "1.1.0",
+  "version": "1.2.0",
   "description": "",
   "main": "index.js",
   "scripts": {
diff --git a/server/Cargo.toml b/server/Cargo.toml
index 2b528b9b..06eb0264 100644
--- a/server/Cargo.toml
+++ b/server/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "mnml"
-version = "1.1.0"
+version = "1.2.0"
 authors = ["ntr <ntr@smokestack.io>"]
 
 [dependencies]

From 5c946c559b83995c692022bbf13622c7d34e8138 Mon Sep 17 00:00:00 2001
From: Mashy <himesh.kapadia@gmail.com>
Date: Wed, 4 Sep 2019 16:40:53 +1000
Subject: [PATCH 07/10] spec combos preview

---
 client/assets/styles/instance.less | 10 ++++++++++
 client/src/utils.jsx               |  1 +
 2 files changed, 11 insertions(+)

diff --git a/client/assets/styles/instance.less b/client/assets/styles/instance.less
index d9c5a195..44da08bf 100644
--- a/client/assets/styles/instance.less
+++ b/client/assets/styles/instance.less
@@ -60,6 +60,16 @@
     height: 1em;
 }
 
+.instance .info figure {
+    display: inline;
+    height: 0.5em;
+}
+
+.instance .info figcaption {
+    font-size: 1em;
+}
+
+
 .instance .constructs {
     grid-area: constructs;
 }
diff --git a/client/src/utils.jsx b/client/src/utils.jsx
index a50ba095..b78a2b44 100644
--- a/client/src/utils.jsx
+++ b/client/src/utils.jsx
@@ -228,6 +228,7 @@ function convertItem(v) {
             shapes.vboxColour(v.toLowerCase())
         );
     }
+    if (shapes[v]) return shapes[v]();
     return v || <span>&nbsp;</span>;
     // uncomment for double borders in vbox;
     // if (v) {

From fc73dadca57cfee5eac4dbf4fcd764e2aa6acdb5 Mon Sep 17 00:00:00 2001
From: Mashy <himesh.kapadia@gmail.com>
Date: Wed, 4 Sep 2019 17:06:36 +1000
Subject: [PATCH 08/10] horizontal align figcaption

---
 client/assets/styles/instance.less | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/client/assets/styles/instance.less b/client/assets/styles/instance.less
index 44da08bf..ca8dfde6 100644
--- a/client/assets/styles/instance.less
+++ b/client/assets/styles/instance.less
@@ -67,6 +67,8 @@
 
 .instance .info figcaption {
     font-size: 1em;
+    display: inline-block;
+    vertical-align: middle;
 }
 
 

From 2e37dc55ac6e6005c9f5a975446741fe2908b493 Mon Sep 17 00:00:00 2001
From: ntr <ntr@smokestack.io>
Date: Wed, 4 Sep 2019 17:37:54 +1000
Subject: [PATCH 09/10] instance lobby timeout fixes

---
 server/src/instance.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/server/src/instance.rs b/server/src/instance.rs
index 34f72bd1..6feeb8f1 100644
--- a/server/src/instance.rs
+++ b/server/src/instance.rs
@@ -76,7 +76,7 @@ impl TimeControl {
 
     pub fn lobby_timeout(&self) -> DateTime<Utc> {
         Utc::now()
-            .checked_add_signed(Duration::minutes(5))
+            .checked_add_signed(Duration::seconds(30))
             .expect("could not set phase end")
     }
 
@@ -366,7 +366,7 @@ impl Instance {
     }
 
     fn current_game_id(&self) -> Option<Uuid> {
-        if self.phase == InstancePhase::Lobby {
+        if self.phase != InstancePhase::InProgress {
             return None;
         }
 

From 968d0a01aabcfc4e4b5aff79a8f1354332c5ea97 Mon Sep 17 00:00:00 2001
From: ntr <ntr@smokestack.io>
Date: Wed, 4 Sep 2019 17:44:15 +1000
Subject: [PATCH 10/10] icon svg info

---
 client/assets/styles/instance.less | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/client/assets/styles/instance.less b/client/assets/styles/instance.less
index ca8dfde6..96dfd4cd 100644
--- a/client/assets/styles/instance.less
+++ b/client/assets/styles/instance.less
@@ -63,6 +63,10 @@
 .instance .info figure {
     display: inline;
     height: 0.5em;
+
+    svg {
+        margin-right: 0.5em;
+    }
 }
 
 .instance .info figcaption {