fix(web client): free mode reset checkers only after "retry" button
This commit is contained in:
parent
576f9706c2
commit
0afd3e0e41
1 changed files with 12 additions and 5 deletions
|
|
@ -94,19 +94,22 @@ pub fn GameScreen(state: GameUiState) -> impl IntoView {
|
||||||
cmd_tx_effect
|
cmd_tx_effect
|
||||||
.unbounded_send(NetCommand::Action(PlayerAction::Move(m1, m2)))
|
.unbounded_send(NetCommand::Action(PlayerAction::Move(m1, m2)))
|
||||||
.ok();
|
.ok();
|
||||||
|
staged_moves.set(vec![]);
|
||||||
|
selected_origin.set(None);
|
||||||
|
prev_staged_len.set(0);
|
||||||
} else {
|
} else {
|
||||||
let specific_err = rules.moves_allowed(&(vm1, vm2)).err();
|
let specific_err = rules.moves_allowed(&(vm1, vm2)).err();
|
||||||
move_error.set(Some(specific_err));
|
move_error.set(Some(specific_err));
|
||||||
|
// Keep staged_moves intact so pieces stay in place until Retry is clicked.
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
cmd_tx_effect
|
cmd_tx_effect
|
||||||
.unbounded_send(NetCommand::Action(PlayerAction::Move(m1, m2)))
|
.unbounded_send(NetCommand::Action(PlayerAction::Move(m1, m2)))
|
||||||
.ok();
|
.ok();
|
||||||
|
staged_moves.set(vec![]);
|
||||||
|
selected_origin.set(None);
|
||||||
|
prev_staged_len.set(0);
|
||||||
}
|
}
|
||||||
|
|
||||||
staged_moves.set(vec![]);
|
|
||||||
selected_origin.set(None);
|
|
||||||
prev_staged_len.set(0);
|
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
@ -457,7 +460,11 @@ pub fn GameScreen(state: GameUiState) -> impl IntoView {
|
||||||
<span class="free-mode-error-msg">{msg}</span>
|
<span class="free-mode-error-msg">{msg}</span>
|
||||||
<button
|
<button
|
||||||
class="btn btn-secondary"
|
class="btn btn-secondary"
|
||||||
on:click=move |_| { move_error.set(None); }
|
on:click=move |_| {
|
||||||
|
staged_moves.set(vec![]);
|
||||||
|
selected_origin.set(None);
|
||||||
|
move_error.set(None);
|
||||||
|
}
|
||||||
>{t!(i18n, reset_move)}</button>
|
>{t!(i18n, reset_move)}</button>
|
||||||
</div>
|
</div>
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue