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

auto ready for learn mode and remove upkeep warnings

Browse Source
This commit is contained in:
ntr 2019-11-13 20:51:30 +11:00
parent 8aee7dc084
commit 44f008740e
4 changed files with 18 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
client/src/components/instance.ctrl.btns.jsx
View File

@ -49,6 +49,11 @@ function InstanceCtrlBtns(args) {
const finished = instance && instance.phase === 'Finished';
const skip = instance.time_control === 'Practice' && instance.phase === 'Lobby';
if (skip) {
sendReady();
}
return (
<div class="instance-ctrl-btns">
<button disabled={!account.subscribed} onClick={() => setChatShow(!chatShow)}>Chat</button>

16
client/src/events.jsx
View File

@ -209,7 +209,6 @@ function registerEvents(store) {
return store.dispatch(actions.setInvite(code));
}
let autoReady = null;
function setInstance(v) {
const { account, instance, ws, tutorial } = store.getState();
if (v) {
@ -218,25 +217,10 @@ function registerEvents(store) {
const player = v.players.find(p => p.id === account.id);
store.dispatch(actions.setPlayer(player));
if (!instance || v.id !== instance.id) {
clearTimeout(autoReady);
}
if (v.phase === 'Finished') {
ws.sendAccountInstances();
}
if (v.phase_end && v.phase === 'Lobby' && !autoReady) {
const skip = v.time_control === 'Practice' ? 10000 : 2000;
const autoReadyDelay = Date.parse(v.phase_end) - Date.now() - skip;
autoReady = setTimeout(() => {
ws.sendInstanceReady(v.id);
autoReady = null;
}, autoReadyDelay);
}
if (v.phase !== 'Lobby') clearTimeout(autoReady);
// instance.mobile.less hides info at @media 1000
if (localStorage.getItem('tutorial-complete') || window.innerWidth <= 1100) {
store.dispatch(actions.setTutorial(null));

20
server/src/game.rs
View File

@ -635,15 +635,15 @@ impl Game {
for player in self.players.iter_mut() {
if !player.ready {
player.set_ready(true);
player.add_warning();
info!("upkeep: {:} warned", player.name);
if player.warnings >= 3 {
player.forfeit();
info!("upkeep: {:} forfeited", player.name);
//todo
// self.resolved.push(forfeit)
// self.log.push(format!("{:} forfeited.", player.name));
}
// player.add_warning();
// info!("upkeep: {:} warned", player.name);
// if player.warnings >= 3 {
// player.forfeit();
// info!("upkeep: {:} forfeited", player.name);
// //todo
// // self.resolved.push(forfeit)
// // self.log.push(format!("{:} forfeited.", player.name));
// }
}
}
@ -1622,6 +1622,6 @@ mod tests {
game.players[0].set_ready(true);
game.phase_end = Some(Utc::now().checked_sub_signed(Duration::seconds(500)).unwrap());
game = game.upkeep();
assert!(game.players[1].warnings == 1);
// assert!(game.players[1].warnings == 1);
}
}

8
server/src/player.rs
View File

@ -63,7 +63,6 @@ pub struct Player {
pub constructs: Vec<Construct>,
pub bot: bool,
pub ready: bool,
pub warnings: u8,
pub draw_offered: bool,
pub score: Score,
}
@ -85,7 +84,6 @@ impl Player {
constructs,
bot: false,
ready: false,
warnings: 0,
draw_offered: false,
score: Score::Zero,
})
@ -100,7 +98,6 @@ impl Player {
constructs,
bot: false,
ready: false,
warnings: 0,
draw_offered: false,
score: Score::Zero,
}
@ -134,11 +131,6 @@ impl Player {
self
}
pub fn add_warning(&mut self) -> &mut Player {
self.warnings += 1;
self
}
pub fn forfeit(&mut self) -> &mut Player {
for construct in self.constructs.iter_mut() {
construct.force_ko();