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

add all cryps fn

Browse Source
This commit is contained in:
ntr 2018-11-13 17:16:25 +11:00
parent 4453f567ea
commit c175e80817
1 changed files with 11 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
server/src/game.rs
View File

@ -130,6 +130,15 @@ impl Game {
}; };
} }
fn all_cryps(&self) -> Vec<Cryp> {
self.teams.clone()
.into_iter()
.flat_map(
|t| t.cryps
.into_iter())
.collect::<Vec<Cryp>>()
}
fn update_cryp(&mut self, cryp: &mut Cryp) -> &mut Game { fn update_cryp(&mut self, cryp: &mut Cryp) -> &mut Game {
match self.teams.iter_mut().find(|t| t.cryps.iter().any(|c| c.id == cryp.id)) { match self.teams.iter_mut().find(|t| t.cryps.iter().any(|c| c.id == cryp.id)) {
Some(team) => { Some(team) => {
@ -340,16 +349,8 @@ impl Game {
panic!("game not in Resolve phase"); panic!("game not in Resolve phase");
} }
// get all the cryps
let mut all_cryps = self.teams.clone()
.into_iter()
.flat_map(
|t| t.cryps
.into_iter())
.collect::<Vec<Cryp>>();
// find their statuses with ticks // find their statuses with ticks
let mut ticks = all_cryps let mut ticks = self.all_cryps()
.iter_mut() .iter_mut()
.flat_map( .flat_map(
|c| c.effects |c| c.effects
@ -391,15 +392,7 @@ impl Game {
} }
fn progress_durations(&mut self) -> &mut Game { fn progress_durations(&mut self) -> &mut Game {
// get all the cryps for mut cryp in self.all_cryps() {
let all_cryps = self.teams.clone()
.into_iter()
.flat_map(
|t| t.cryps
.into_iter())
.collect::<Vec<Cryp>>();
for mut cryp in all_cryps {
println!("progressing durations for {:?}", cryp.name); println!("progressing durations for {:?}", cryp.name);
// only reduce cooldowns if no cd was used // only reduce cooldowns if no cd was used