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

fix tutorial construct order bug

Browse Source
This commit is contained in:
ntr 2020-01-10 12:21:37 +10:00
parent 15bc05b3d4
commit 5871f3129b
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
core/src/game.rs
View File

@ -104,7 +104,6 @@ impl Game {
// let player_description = player.constructs.iter().map(|c| c.name.clone()).collect::<Vec<String>>().join(", "); // let player_description = player.constructs.iter().map(|c| c.name.clone()).collect::<Vec<String>>().join(", ");
// self.log.push(format!("{:} has joined the game. [{:}]", player.name, player_description)); // self.log.push(format!("{:} has joined the game. [{:}]", player.name, player_description));
player.constructs.sort_unstable_by_key(|c| c.id);
self.players.push(player); self.players.push(player);
Ok(self) Ok(self)
@ -1201,7 +1200,7 @@ mod tests {
.player_add(y_player).unwrap(); .player_add(y_player).unwrap();
game = game.start(); game = game.start();
assert!(game.players[0].constructs[0].skill_on_cd(Skill::Ruin).is_some()); assert!(game.players[0].constructs[0].skill_on_cd(Skill::Ruin).is_some());
assert!(game.players[1].constructs[0].skill_on_cd(Skill::Ruin).is_none()); assert!(game.players[1].constructs[0].skill_on_cd(Skill::Ruin).is_none());
} }

4
core/src/player.rs
View File

@ -65,7 +65,9 @@ pub struct Player {
} }
impl Player { impl Player {
pub fn new(account: Uuid, img: Option<Uuid>, name: &String, constructs: Vec<Construct>) -> Player { pub fn new(account: Uuid, img: Option<Uuid>, name: &String, mut constructs: Vec<Construct>) -> Player {
constructs.sort_unstable_by_key(|c| c.id);
Player { Player {
id: account, id: account,
img, img,