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

skip faceoff serverside

Browse Source
This commit is contained in:
ntr 2019-11-29 16:08:09 +10:00
parent 6c1c411092
commit 9fe9020ac9
3 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
WORKLOG.md
View File

@ -3,7 +3,6 @@
_ntr_ _ntr_
* can't reset password without knowing password =\ * can't reset password without knowing password =\
* skip faceoff on server side
* change cooldowns to delay & recharge * change cooldowns to delay & recharge
- delay is cooldown before skill can first be used - delay is cooldown before skill can first be used
- recharge is cooldown after using skill - recharge is cooldown after using skill

5
client/src/events.jsx
View File

@ -220,11 +220,6 @@ function registerEvents(store) {
const player = v.players.find(p => p.id === account.id); const player = v.players.find(p => p.id === account.id);
store.dispatch(actions.setPlayer(player)); store.dispatch(actions.setPlayer(player));
const skip = v.time_control === 'Practice' && v.phase === 'Lobby';
if (skip) {
ws.sendInstanceReady(v.id);
}
if (v.phase === 'Finished') { if (v.phase === 'Finished') {
ws.sendAccountInstances(); ws.sendAccountInstances();
} }

3
server/src/instance.rs
View File

@ -706,7 +706,10 @@ pub fn instance_practice(tx: &mut Transaction, account: &Account) -> Result<Inst
instance.add_player(player.clone())?; instance.add_player(player.clone())?;
instance.add_player(bot)?; instance.add_player(bot)?;
instance.player_ready(bot_id)?; instance.player_ready(bot_id)?;
// skip faceoff
instance.player_ready(player.id)?;
instance = instance_create(tx, instance)?; instance = instance_create(tx, instance)?;
player_create(tx, player, instance.id, account)?; player_create(tx, player, instance.id, account)?;