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

rename stuff

Browse Source
This commit is contained in:
ntr 2019-12-09 21:29:03 +10:00
parent 39957c0380
commit 61870b69ac
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
core/src/game.rs
View File

@ -464,14 +464,14 @@ impl Game {
} }
fn resolve(&mut self, cast: Cast) -> &mut Game { fn resolve(&mut self, cast: Cast) -> &mut Game {
let casts = self.finalise_casts(cast); let casts = self.modify_cast(cast);
for cast in casts { for cast in casts {
self.execute(cast); self.execute(cast);
} }
self self
} }
fn finalise_casts(&self, cast: Cast) -> Vec<Cast> { fn modify_cast(&self, cast: Cast) -> Vec<Cast> {
let target_player = self.players.iter() let target_player = self.players.iter()
.find(|t| t.constructs.iter().any(|c| c.id == cast.target)) .find(|t| t.constructs.iter().any(|c| c.id == cast.target))
.unwrap(); .unwrap();
@ -512,12 +512,12 @@ impl Game {
Action::Hit => self.hit(cast), Action::Hit => self.hit(cast),
Action::Damage { construct, values, colour } => { Action::Damage { construct, values, colour } => {
let amount = self.calculate_amount(&values, &event_list); let amount = self.reduce_values(&values, &event_list);
self.damage(construct, amount, colour) self.damage(construct, amount, colour)
}, },
Action::Heal { construct, values, colour } => { Action::Heal { construct, values, colour } => {
let amount = self.calculate_amount(&values, &event_list); let amount = self.reduce_values(&values, &event_list);
self.heal(construct, amount, colour) self.heal(construct, amount, colour)
}, },
@ -601,7 +601,7 @@ impl Game {
self self
} }
fn calculate_amount(&mut self, values: &Vec<Value>, events: &Vec<Event>) -> usize { fn reduce_values(&mut self, values: &Vec<Value>, events: &Vec<Event>) -> usize {
values.iter() values.iter()
.fold(0, |total, value| { .fold(0, |total, value| {
total + match value { total + match value {
@ -616,6 +616,9 @@ impl Game {
self.construct_by_id(*construct).unwrap().effects.len().pct(*mult), self.construct_by_id(*construct).unwrap().effects.len().pct(*mult),
Value::ColourSkills { construct, colour, mult } => unimplemented!(), Value::ColourSkills { construct, colour, mult } => unimplemented!(),
self.construct_by_id(*construct).unwrap().skills.iter()
.filter(|ce| ce.)
.count(),
Value::DamageTaken { construct, colour, mult } => Value::DamageTaken { construct, colour, mult } =>
events.iter().fold(0, |dmg, e| match e { events.iter().fold(0, |dmg, e| match e {