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

Merge branch 'automnml' of ssh://git.mnml.gg:40022/~/mnml into automnml

Browse Source
This commit is contained in:
Mashy 2021-03-20 13:04:33 +10:00
commit 6026203066
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/construct.rs
View File

@ -309,6 +309,10 @@ impl Construct {
} }
pub fn spec_add(&mut self, spec: Spec) -> Result<&mut Construct, Error> { pub fn spec_add(&mut self, spec: Spec) -> Result<&mut Construct, Error> {
// if self.specs.len() >= 3 {
// return Err(err_msg("maximum specs equipped"));
// }
self.specs.push(spec); self.specs.push(spec);
return Ok(self.calculate_colours()); return Ok(self.calculate_colours());
} }

8
core/src/player.rs
View File

@ -389,9 +389,11 @@ impl Player {
// } // }
// }); // });
// for construct in self.constructs.iter_mut() { let player_colours = Colours { red: 0, blue: 0, green: 0 };
// construct.apply_modifiers(&player_colours);
// } for construct in self.constructs.iter_mut() {
construct.apply_modifiers(&player_colours);
}
Ok(self) Ok(self)
} }