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

VERSION

@@ -1 +1 @@
-1.7.0
+1.7.1

acp/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mnml-client",
-  "version": "1.7.0",
+  "version": "1.7.1",
   "description": "",
   "main": "index.js",
   "scripts": {

client/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mnml-client",
-  "version": "1.7.0",
+  "version": "1.7.1",
   "description": "",
   "main": "index.js",
   "scripts": {

client/src/components/buttons.jsx

@@ -1,4 +1,5 @@
-module.exports = { // This will need to be edited if we change server recipes
+// This will need to be edited if we change server recipes
+module.exports = {
     // Attack
     Strike: () => 'red-border',
     Blast: () => 'blue-border',
@@ -31,9 +32,9 @@ module.exports = { // This will need to be edited if we change server recipes
     Restrict: () => 'red-border',
     Purge: () => 'green-border',
     Silence: () => 'blue-border',
-    Curse: () => 'red-green-border',
+    Invert: () => 'red-green-border',
     Decay: () => 'blue-green-border',
-    Invert: () => 'red-blue-border',
+    Curse: () => 'red-blue-border',
 
     //     // Lifes Upgrades
     // LifeGG: () => 'green-border',

ops/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mnml-ops",
-  "version": "1.7.0",
+  "version": "1.7.1",
   "description": "",
   "main": "index.js",
   "scripts": {

server/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "mnml"
-version = "1.7.0"
+version = "1.7.1"
 authors = ["ntr <ntr@smokestack.io>"]
 
 [dependencies]

server/src/item.rs

@@ -620,70 +620,70 @@ impl Item {
             // Lifes Upgrades
             Item::LifeGG |
             Item::LifeGGPlus |
-            Item::LifeGGPlusPlus => format!("Increases construct GreenLife by {:?}. 
+            Item::LifeGGPlusPlus => format!("Increases construct GreenLife by {:?}.
                 If your team meets total colour thresholds the spec provides additional bonuses.",
                 self.into_spec().unwrap().values().base()),
 
             Item::LifeRR |
             Item::LifeRRPlus |
-            Item::LifeRRPlusPlus => format!("Increases construct RedLife by {:?}. 
+            Item::LifeRRPlusPlus => format!("Increases construct RedLife by {:?}.
                 If your team meets total colour thresholds the spec provides additional bonuses.",
                 self.into_spec().unwrap().values().base()),
 
-            Item::LifeBB | 
+            Item::LifeBB |
-            Item::LifeBBPlus | 
+            Item::LifeBBPlus |
-            Item::LifeBBPlusPlus => format!("Increases construct BlueLife by {:?}. 
+            Item::LifeBBPlusPlus => format!("Increases construct BlueLife by {:?}.
                 If your team meets total colour thresholds the spec provides additional bonuses.",
                 self.into_spec().unwrap().values().base()),
 
             Item::LifeRG |
             Item::LifeRGPlus |
-            Item::LifeRGPlusPlus => format!("Increases construct RedLife and GreenLife by {:?}. 
+            Item::LifeRGPlusPlus => format!("Increases construct RedLife and GreenLife by {:?}.
                 If your team meets total colour thresholds the spec provides additional bonuses.",
                 self.into_spec().unwrap().values().base()),
 
             Item::LifeGB |
             Item::LifeGBPlus |
-            Item::LifeGBPlusPlus => format!("Increases construct GreenLife and BlueLife by {:?}. 
+            Item::LifeGBPlusPlus => format!("Increases construct GreenLife and BlueLife by {:?}.
                 If your team meets total colour thresholds the spec provides additional bonuses.",
                 self.into_spec().unwrap().values().base()),
 
             Item::LifeRB |
             Item::LifeRBPlus |
-            Item::LifeRBPlusPlus => format!("Increases construct RedLife and BlueLife by {:?}. 
+            Item::LifeRBPlusPlus => format!("Increases construct RedLife and BlueLife by {:?}.
                 If your team meets total colour thresholds the spec provides additional bonuses.",
                 self.into_spec().unwrap().values().base()),
 
             // Power Upgrades
-            Item::PowerRR | 
+            Item::PowerRR |
-            Item::PowerRRPlus | 
+            Item::PowerRRPlus |
-            Item::PowerRRPlusPlus => format!("Increases construct RedPower by {:?}%. 
+            Item::PowerRRPlusPlus => format!("Increases construct RedPower by {:?}%.
                 If your team meets total colour thresholds the spec provides additional bonuses.",
                 self.into_spec().unwrap().values().base()),
             Item::PowerBB |
             Item::PowerBBPlus |
-            Item::PowerBBPlusPlus => format!("Increases construct BluePower by {:?}%. 
+            Item::PowerBBPlusPlus => format!("Increases construct BluePower by {:?}%.
                 If your team meets total colour thresholds the spec provides additional bonuses.",
                 self.into_spec().unwrap().values().base()),
 
             Item::PowerGG |
             Item::PowerGGPlus |
-            Item::PowerGGPlusPlus => format!("Increases construct GreenPower by {:?}%. 
+            Item::PowerGGPlusPlus => format!("Increases construct GreenPower by {:?}%.
                 If your team meets total colour thresholds the spec provides additional bonuses.",
                 self.into_spec().unwrap().values().base()),
             Item::PowerRG |
             Item::PowerRGPlus |
-            Item::PowerRGPlusPlus => format!("Increases construct GreenPower and RedPower by {:?}%. 
+            Item::PowerRGPlusPlus => format!("Increases construct GreenPower and RedPower by {:?}%.
                 If your team meets total colour thresholds the spec provides additional bonuses.",
                 self.into_spec().unwrap().values().base()),
             Item::PowerGB |
             Item::PowerGBPlus |
-            Item::PowerGBPlusPlus => format!("Increases construct GreenPower and BluePower by {:?}%. 
+            Item::PowerGBPlusPlus => format!("Increases construct GreenPower and BluePower by {:?}%.
                 If your team meets total colour thresholds the spec provides additional bonuses.",
                 self.into_spec().unwrap().values().base()),
             Item::PowerRB |
             Item::PowerRBPlus |
-            Item::PowerRBPlusPlus => format!("Increases construct RedPower and BluePower by {:?}%. 
+            Item::PowerRBPlusPlus => format!("Increases construct RedPower and BluePower by {:?}%.
                 If your team meets total colour thresholds the spec provides additional bonuses.",
                 self.into_spec().unwrap().values().base()),
 
@@ -705,7 +705,7 @@ impl Item {
             Item::SpeedGGPlusPlus |
             Item::SpeedRGPlusPlus |
             Item::SpeedGBPlusPlus |
-            Item::SpeedRBPlusPlus => format!("Increases construct SpeedStat by {:?}%. 
+            Item::SpeedRBPlusPlus => format!("Increases construct SpeedStat by {:?}%.
                 If your team meets total colour thresholds the spec provides additional bonuses.",
                 self.into_spec().unwrap().values().base()),
 
@@ -796,7 +796,7 @@ impl Item {
             Item::Hybrid|
             Item::HybridPlus |
             Item::HybridPlusPlus => format!(
-                "Hybrid increases GreenPower by {:?}%. 
+                "Hybrid increases GreenPower by {:?}%.
                 Blue based Attack skills will blast again dealing {:?}% GreenPower as blue damage.
                 Lasts {:?}T.",
                 self.into_skill().unwrap().effect()[0].get_multiplier() - 100,
@@ -823,7 +823,7 @@ impl Item {
             Item::Purge|
             Item::PurgePlus |
             Item::PurgePlusPlus => format!(
-                "Remove buffs from target construct. 
+                "Remove buffs from target construct.
                 Applies purge disabling target green skills for {:?}T.",
                 self.into_skill().unwrap().effect()[0].get_duration()),
 
@@ -836,7 +836,7 @@ impl Item {
             Item::Reflect|
             Item::ReflectPlus |
             Item::ReflectPlusPlus => format!(
-                "Reflect incoming blue skills to source. Lasts {:?}T. 
+                "Reflect incoming blue skills to source. Lasts {:?}T.
                 Recharges target BlueLife based on {:?}% BluePower.",
                 self.into_skill().unwrap().effect()[0].get_duration(),
                 self.into_skill().unwrap().multiplier()),
@@ -943,6 +943,11 @@ impl Item {
         }
     }
 
+    // !!!!!!
+    // IF YOU CHANGE A COMBO
+    // BE SURE TO EDIT BUTTONS.JSX TOO
+    // !!!!!!
+
     fn combo(&self) -> Vec<Item> {
         match self {
             Item::Intercept         => vec![Item::Buff, Item::Red, Item::Red],

server/src/skill.rs

@@ -831,13 +831,13 @@ impl Skill {
 
             // Buff base
             Skill::HybridBlast => 50,
-            
+
             Skill::HasteStrike => 60,
-            
+
             Skill::Intercept=> 80,
             Skill::InterceptPlus => 110,
             Skill::InterceptPlusPlus => 150,
-            
+
             Skill::TriageTick=> 75,
             Skill::TriageTickPlus => 110,
             Skill::TriageTickPlusPlus => 140,
@@ -1392,7 +1392,10 @@ fn sustain(source: &mut Construct, target: &mut Construct, mut results: Resoluti
             if red > 0 || blue > 0 { EventStages::PostOnly }
             else { EventStages::NoStages }
         }
-        _ => EventStages::NoStages,
+        _ => {
+            warn!("no recharge event found {:?}", e);
+            EventStages::NoStages
+        }
     };
 
     results.push(Resolution::new(source, target).event(e).stages(stages));
@@ -1411,7 +1414,10 @@ fn intercept(source: &mut Construct, target: &mut Construct, mut results: Resolu
             if red > 0 || blue > 0 { EventStages::PostOnly }
             else { EventStages::NoStages }
         }
-        _ => EventStages::NoStages,
+        _ => {
+            warn!("no recharge event found {:?}", e);
+            EventStages::NoStages
+        }
     };
     results.push(Resolution::new(source, target).event(e).stages(stages));
 
@@ -1712,8 +1718,11 @@ fn reflect(source: &mut Construct, target: &mut Construct, mut results: Resoluti
         Event::Recharge { red, blue, skill: _ } => {
             if red > 0 || blue > 0 { EventStages::PostOnly }
             else { EventStages::NoStages }
-        },
+        }
-        _ => EventStages::NoStages,
+        _ => {
+            warn!("no recharge event found {:?}", e);
+            EventStages::NoStages
+        }
     };
     results.push(Resolution::new(source, target).event(e).stages(stages));
     return results;;
@@ -1728,7 +1737,10 @@ fn recharge(source: &mut Construct, target: &mut Construct, mut results: Resolut
             if red > 0 || blue > 0 { EventStages::AllStages }
             else { EventStages::StartEnd }
         }
-        _ => EventStages::NoStages,
+        _ => {
+            warn!("no recharge event found {:?}", e);
+            EventStages::NoStages
+        }
     };
     results.push(Resolution::new(source, target).event(e).stages(stages));
     return results;