From c036d97fbca4e53f73728b1854dd9b9dac19dfe9 Mon Sep 17 00:00:00 2001
From: ntr <ntr@smokestack.io>
Date: Mon, 4 Nov 2019 17:29:21 +1100
Subject: [PATCH 1/2] v1.7.1

---
 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 9dbb0c00..081af9a1 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.7.0
\ No newline at end of file
+1.7.1
\ No newline at end of file
diff --git a/acp/package.json b/acp/package.json
index c90324b5..48ed247e 100644
--- a/acp/package.json
+++ b/acp/package.json
@@ -1,6 +1,6 @@
 {
   "name": "mnml-client",
-  "version": "1.7.0",
+  "version": "1.7.1",
   "description": "",
   "main": "index.js",
   "scripts": {
diff --git a/client/package.json b/client/package.json
index 40922a43..f446e92c 100644
--- a/client/package.json
+++ b/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "mnml-client",
-  "version": "1.7.0",
+  "version": "1.7.1",
   "description": "",
   "main": "index.js",
   "scripts": {
diff --git a/ops/package.json b/ops/package.json
index 808951f4..876bd4cf 100755
--- a/ops/package.json
+++ b/ops/package.json
@@ -1,6 +1,6 @@
 {
   "name": "mnml-ops",
-  "version": "1.7.0",
+  "version": "1.7.1",
   "description": "",
   "main": "index.js",
   "scripts": {
diff --git a/server/Cargo.toml b/server/Cargo.toml
index 52007285..40e26480 100644
--- a/server/Cargo.toml
+++ b/server/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "mnml"
-version = "1.7.0"
+version = "1.7.1"
 authors = ["ntr <ntr@smokestack.io>"]
 
 [dependencies]

From c3f28a3f1f0b8bf99d513d1ff31a8ff8f1475dac Mon Sep 17 00:00:00 2001
From: ntr <ntr@smokestack.io>
Date: Mon, 4 Nov 2019 17:50:50 +1100
Subject: [PATCH 2/2] don't panic when recharge event isn't found

---
 server/src/skill.rs | 26 +++++++++++++++++++-------
 1 file changed, 19 insertions(+), 7 deletions(-)

diff --git a/server/src/skill.rs b/server/src/skill.rs
index 1f655e6d..5884198a 100644
--- a/server/src/skill.rs
+++ b/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 }
         }
-        _ => panic!("not recharge")
+        _ => {
+            warn!("no recharge event found {:?}", e);
+            return results;
+        }
     };
 
     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 }
         }
-        _ => panic!("not recharge")
+        _ => {
+            warn!("no recharge event found {:?}", e);
+            return results;
+        }
     };
     results.push(Resolution::new(source, target).event(e).stages(stages));
 
@@ -1713,7 +1719,10 @@ fn reflect(source: &mut Construct, target: &mut Construct, mut results: Resoluti
             if red > 0 || blue > 0 { EventStages::PostOnly }
             else { EventStages::NoStages }
         }
-        _ => panic!("not recharge")
+        _ => {
+            warn!("no recharge event found {:?}", e);
+            return results;
+        }
     };
     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 }
         }
-        _ => panic!("not recharge")
+        _ => {
+            warn!("no recharge event found {:?}", e);
+            return results;
+        }
     };
     results.push(Resolution::new(source, target).event(e).stages(stages));
     return results;