Merge branch 'develop' of ssh://git.mnml.gg:40022/~/mnml into develop

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>,
 };

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

server/src/item.rs

@@ -44,139 +44,229 @@ pub enum Item {
     LifeRBPlusPlus,
 
     // Power Upgrades
+    PowerGG,
     PowerRR,
     PowerBB,
-    PowerGG,
     PowerRG,
     PowerGB,
     PowerRB,
-    PowerRRPlus,
     PowerGGPlus,
+    PowerRRPlus,
     PowerBBPlus,
     PowerRGPlus,
     PowerGBPlus,
     PowerRBPlus,
+    PowerGGPlusPlus,
     PowerRRPlusPlus,
     PowerBBPlusPlus,
-    PowerGGPlusPlus,
     PowerRGPlusPlus,
     PowerGBPlusPlus,
     PowerRBPlusPlus,
 
     // Speed Upgrades
+    SpeedGG,
     SpeedRR,
     SpeedBB,
-    SpeedGG,
     SpeedRG,
     SpeedGB,
     SpeedRB,
-
+    SpeedGGPlus,
     SpeedRRPlus,
     SpeedBBPlus,
-    SpeedGGPlus,
     SpeedRGPlus,
     SpeedGBPlus,
     SpeedRBPlus,
-
+    SpeedGGPlusPlus,
     SpeedRRPlusPlus,
     SpeedBBPlusPlus,
-    SpeedGGPlusPlus,
     SpeedRGPlusPlus,
     SpeedGBPlusPlus,
     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,
 }