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

descriptions, recharge invert fix

Browse Source
This commit is contained in:
Mashy
2019-11-07 13:06:19 +10:00
parent 558e3be124
commit 4173fb2385
4 changed files with 16 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server/src/construct.rs
+6 -6
View File
@@ -591,16 +591,16 @@ impl Construct {
let red_mitigation = red_modified_power.saturating_sub(red_remainder);
// reduce red_life by mitigation amount
self.red_life.reduce(red_remainder);
self.red_life.reduce(red_mitigation);
// deal remainder to green_life
let red_current_green_life = self.green_life();
self.reduce_green_life(red_remainder);
let red_amount = red_current_green_life - self.green_life();
let red_damage_amount = red_current_green_life - self.green_life();
events.push(Event::Damage {
skill,
amount: red_amount,
amount: red_damage_amount,
mitigation: red_mitigation,
colour: Colour::Red
});
@@ -620,16 +620,16 @@ impl Construct {
let blue_mitigation = blue_modified_power.saturating_sub(blue_remainder);
// reduce blue_life by mitigation amount
self.blue_life.reduce(blue_remainder);
self.blue_life.reduce(blue_mitigation);
// deal remainder to green_life
let blue_current_green_life = self.green_life();
self.reduce_green_life(blue_remainder);
let blue_amount = blue_current_green_life - self.green_life();
let blue_damage_amount = blue_current_green_life - self.green_life();
events.push(Event::Damage {
skill,
amount: blue_amount,
amount: blue_damage_amount,
mitigation: blue_mitigation,
colour: Colour::Blue
});
server/src/item.rs
+2 -2
View File
@@ -807,8 +807,8 @@ impl Item {
Item::Invert|
Item::InvertPlus |
Item::InvertPlusPlus => format!(
"Reverse healing into damage and damage into healing.
Any excess red or blue damage is converted into shield recharge.
"Reverse healing/recharge into damage and damage into healing/recharge.
Any excess red or blue damage is converted into shield recharge after healing.
Lasts {:?}T.",
self.into_skill().unwrap().effect()[0].get_duration()),