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

@@ -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

@@ -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;