stephenseo/EN605.607.81.SP22_ASDM_Project
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Reorder code to print winning move

Browse source 
Previously, the winning move was not printed at the bottom info_text.
This commit is contained in:
Stephen Seo 2022-03-10 18:16:30 +09:00
parent b6a86bc631
commit 414740b7ce
1 changed files with 35 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

72
front_end/src/yew_components.rs
View file

@ -337,6 +337,40 @@ impl Component for Wrapper {
placed = true; placed = true;
} }
// info text below the grid
{
let output_str = match placed {
true => format!("{} placed into slot {}", current_player, bottom_idx),
false => "Invalid place to insert".into(),
};
let text_append_result = append_to_info_text(
&document,
"info_text0",
&output_str,
INFO_TEXT_MAX_ITEMS,
);
if let Err(e) = text_append_result {
log::warn!("ERROR: text append to info_text0 failed: {}", e);
}
}
// info text right of the grid
{
let turn = shared.turn.get();
let output_str = format!(
"<b class=\"{}\">It is {}'s turn</b>",
turn.get_color(),
turn
);
let text_append_result =
append_to_info_text(&document, "info_text1", &output_str, 1);
if let Err(e) = text_append_result {
log::warn!("ERROR: text append to info_text1 failed: {}", e);
}
}
// check for win // check for win
let check_win_draw_opt = check_win_draw(&shared.board); let check_win_draw_opt = check_win_draw(&shared.board);
if let Some((endgame_state, win_type)) = check_win_draw_opt { if let Some((endgame_state, win_type)) = check_win_draw_opt {
@ -683,43 +717,7 @@ impl Component for Wrapper {
shared shared
.game_state .game_state
.replace(GameState::PostGameResults(endgame_state)); .replace(GameState::PostGameResults(endgame_state));
} else { } // if: check for win or draw
// game is still ongoing
// info text below the grid
{
let output_str = match placed {
true => format!("{} placed into slot {}", current_player, bottom_idx),
false => "Invalid place to insert".into(),
};
let text_append_result = append_to_info_text(
&document,
"info_text0",
&output_str,
INFO_TEXT_MAX_ITEMS,
);
if let Err(e) = text_append_result {
log::warn!("ERROR: text append to info_text0 failed: {}", e);
}
}
// info text right of the grid
{
let turn = shared.turn.get();
let output_str = format!(
"<b class=\"{}\">It is {}'s turn</b>",
turn.get_color(),
turn
);
let text_append_result =
append_to_info_text(&document, "info_text1", &output_str, 1);
if let Err(e) = text_append_result {
log::warn!("ERROR: text append to info_text1 failed: {}", e);
}
}
} // else: game is still ongoing after logic check
// check if it is AI's turn // check if it is AI's turn
if let GameState::SinglePlayer(player_type, ai_difficulty) = shared.game_state.get() if let GameState::SinglePlayer(player_type, ai_difficulty) = shared.game_state.get()