ntr/mnml
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'hotfix/1.7.1'

Browse Source
This commit is contained in:
ntr 2019-11-04 17:50:59 +11:00
commit 1e24ab8cf2
6 changed files with 24 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
VERSION
View File

@ -1 +1 @@
1.7.0
1.7.1

2
acp/package.json
View File

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

2
client/package.json
View File

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

2
ops/package.json
View File

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

2
server/Cargo.toml
View File

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

26
server/src/skill.rs
View File

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