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

remove construct var

Browse Source
This commit is contained in:
ntr 2019-12-10 16:19:36 +10:00
parent 9a5ecd4bd4
commit 194373d0a6
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
core/src/construct.rs
View File

@ -713,7 +713,6 @@ impl Construct {
fn red_healing(&mut self, amount: usize) -> Vec<Event> { fn red_healing(&mut self, amount: usize) -> Vec<Event> {
let mut events = vec![]; let mut events = vec![];
if self.is_ko() { return events; } if self.is_ko() { return events; }
let construct = self.id;
let mods = self.effects.iter() let mods = self.effects.iter()
.filter(|e| e.effect.modifications().contains(&Stat::RedHealingReceived)) .filter(|e| e.effect.modifications().contains(&Stat::RedHealingReceived))
@ -764,7 +763,6 @@ impl Construct {
fn green_healing(&mut self, amount: usize) -> Vec<Event> { fn green_healing(&mut self, amount: usize) -> Vec<Event> {
let mut events = vec![]; let mut events = vec![];
if self.is_ko() { return events; } if self.is_ko() { return events; }
let construct = self.id;
let mods = self.effects.iter() let mods = self.effects.iter()
.filter(|e| e.effect.modifications().contains(&Stat::GreenHealingReceived)) .filter(|e| e.effect.modifications().contains(&Stat::GreenHealingReceived))
@ -784,7 +782,7 @@ impl Construct {
let overhealing = modified_power - healing; let overhealing = modified_power - healing;
events.push(Event::Healing { events.push(Event::Healing {
construct, construct: self.id,
amount: healing, amount: healing,
overhealing, overhealing,
colour: Colour::Green, colour: Colour::Green,
@ -797,7 +795,7 @@ impl Construct {
let delta = current_green_life - self.stat(Stat::GreenLife); let delta = current_green_life - self.stat(Stat::GreenLife);
events.push(Event::Damage { events.push(Event::Damage {
construct, construct: self.id,
amount: delta, amount: delta,
mitigation: 0, mitigation: 0,
colour: Colour::Green, colour: Colour::Green,
@ -805,7 +803,7 @@ impl Construct {
}); });
if self.is_ko() { if self.is_ko() {
events.push(Event::Ko { construct }); events.push(Event::Ko { construct: self.id });
} }
} }
} }
@ -816,7 +814,6 @@ impl Construct {
fn blue_healing(&mut self, amount: usize) -> Vec<Event> { fn blue_healing(&mut self, amount: usize) -> Vec<Event> {
let mut events = vec![]; let mut events = vec![];
if self.is_ko() { return events; } if self.is_ko() { return events; }
let construct = self.id;
let mods = self.effects.iter() let mods = self.effects.iter()
.filter(|e| e.effect.modifications().contains(&Stat::BlueHealingReceived)) .filter(|e| e.effect.modifications().contains(&Stat::BlueHealingReceived))