Add friction to mindless clicking by disabling default action preselection in Monopoly menus

This commit is contained in:
Adolfo Reyna
2026-02-06 22:45:16 -05:00
parent e2817262b0
commit 75e17fb26b
2 changed files with 21 additions and 9 deletions

View File

@@ -26,11 +26,13 @@ class PropertyModalGame : public Game {
public:
PropertyModalGame(uint16_t width, uint16_t height, LowLevelRenderer* renderer, LowLevelGUI* gui, InputManager* input_manager, const BoardTile* prop, bool owned, const char* owner, int o_id, bool affordable, Player* p_list = nullptr, int p_count = 0, int obs_idx = -1)
: Game(width, height, renderer, gui, input_manager), property(prop), dismissed(false), is_owned(owned), owner_name(owner), owner_id(o_id), can_afford(affordable), selected_choice(0), buy_requested(false), rent_requested(false), players(p_list), players_count(p_count), observer_idx(obs_idx) {
if (is_owned || !can_afford) selected_choice = 1;
: Game(width, height, renderer, gui, input_manager), property(prop), dismissed(false), is_owned(owned), owner_name(owner), owner_id(o_id), can_afford(affordable), selected_choice(-1), buy_requested(false), rent_requested(false), players(p_list), players_count(p_count), observer_idx(obs_idx) {
if (is_owned || !can_afford) selected_choice = 0;
}
void init() override {
dismissed = false; buy_requested = false; rent_requested = false; selected_choice = 0;
dismissed = false; buy_requested = false; rent_requested = false;
selected_choice = -1;
if (is_owned || !can_afford) selected_choice = 0;
ModalButtonHelper::set_monopoly_regions(input_manager, width, height);
}
Type get_type() const override { return Type::MONOPOLY_PROPERTY; }
@@ -48,12 +50,14 @@ public:
// Otherwise (Buy/Pass), use A to cycle and B to select
if (event.type == INPUT_BUTTON_0) { // BUTTON A -> Change selection
if (!is_owned && can_afford) {
selected_choice = (selected_choice + 1) % 2;
if (selected_choice == -1) selected_choice = 0;
else selected_choice = (selected_choice + 1) % 2;
return true;
}
}
if (event.type == INPUT_BUTTON_1) { // BUTTON B -> Select action
if (!is_owned && can_afford) {
if (selected_choice == -1) return false; // Ignore if nothing selected
if (selected_choice == 0) buy_requested = true;
dismissed = true;
return true;
@@ -181,6 +185,7 @@ public:
btn_y += 40;
// Pass Button
if (selected_choice == 1) renderer->draw_filled_rectangle(win_x + 20, btn_y, btn_w, btn_h, true, 1);
else renderer->draw_rectangle(win_x + 20, btn_y, btn_w, btn_h, true, 1);
if (selected_choice == 1) renderer->set_text_color(false);
snprintf(buf, sizeof(buf), "%sPASS", (selected_choice == 1 ? "> " : " "));