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

little fixes

Browse Source
This commit is contained in:
ntr 2019-05-01 01:09:48 +10:00
parent f9dad4cfb5
commit 3ac4fd6d1b
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
client/src/components/info.component.jsx
View File

@ -167,6 +167,7 @@ function Info(args) {
} }
if (round.finished) return 'finished'; if (round.finished) return 'finished';
if (round.game_id) return 'in game';
return player.ready return player.ready
? 'ready' ? 'ready'

10
server/src/game.rs
View File

@ -90,7 +90,7 @@ impl Game {
} }
let player_description = player.cryps.iter().map(|c| c.name.clone()).collect::<Vec<String>>().join(", "); let player_description = player.cryps.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));
self.players.push(player); self.players.push(player);
@ -570,7 +570,7 @@ impl Game {
return self; return self;
} }
println!("upkeep beginning: {:?} vs {:?}", self.players[0].name, self.players[1].name); println!("upkeep beginning: {:} vs {:}", self.players[0].name, self.players[1].name);
if !self.phase_timed_out() { if !self.phase_timed_out() {
return self; return self;
@ -580,11 +580,11 @@ impl Game {
if !player.ready { if !player.ready {
player.set_ready(true); player.set_ready(true);
player.add_warning(); player.add_warning();
println!("upkeep: {:?} warned", player.name); println!("upkeep: {:} warned", player.name);
if player.warnings >= 3 { if player.warnings >= 3 {
player.forfeit(); player.forfeit();
println!("upkeep: {:?} forfeited", player.name); println!("upkeep: {:} forfeited", player.name);
self.log.push(format!("{:?} forfeited.", player.name)); self.log.push(format!("{:} forfeited.", player.name));
} }
} }
} }