summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTor Andersson <tor@ccxvii.net>2023-12-11 15:56:06 +0100
committerTor Andersson <tor@ccxvii.net>2023-12-11 20:26:34 +0100
commitc11c5d79fb029614210b905569f9602d20ae3c86 (patch)
treee75528818fbf5f3f5b0c74c45e32f259fec2ad32
parent66e6dec72f237dcc9fc9b22a2b052f1f80924225 (diff)
downloadvotes-for-women-c11c5d79fb029614210b905569f9602d20ae3c86.tar.gz
Re-roll / Accept instead of Re-roll / Next.
-rw-r--r--play.js1
-rw-r--r--rules.js16
2 files changed, 9 insertions, 8 deletions
diff --git a/play.js b/play.js
index e2ef808..a1ca954 100644
--- a/play.js
+++ b/play.js
@@ -881,6 +881,7 @@ function on_update() { // eslint-disable-line no-unused-vars
action_button("roll", "Roll")
action_button("reroll", "Re-roll")
action_button("commit", "Commit")
+ action_button("accept", "Accept")
action_button("next", "Next")
action_button("end_event", "End Event")
action_button("next_turn", "Next Turn")
diff --git a/rules.js b/rules.js
index 26a5e55..bfca47e 100644
--- a/rules.js
+++ b/rules.js
@@ -1439,7 +1439,7 @@ states.final_voting_roll = {
gen_action("reroll")
if (game.active === game.voting_winner)
- gen_action("next")
+ gen_action("accept")
else
gen_action("pass")
}
@@ -1465,7 +1465,7 @@ states.final_voting_roll = {
update_final_voting_result()
},
- next() {
+ accept() {
// allow opponent to re-roll if they can
next_player()
// if (!can_reroll())
@@ -1559,7 +1559,7 @@ states.campaigning = {
view.prompt = `Campaigning: You rolled ${game.roll.join(", ")}.`
if (player_buttons() > 0)
gen_action("reroll")
- gen_action("next")
+ gen_action("accept")
}
},
roll() {
@@ -1569,7 +1569,7 @@ states.campaigning = {
decrease_player_buttons(1)
game.roll = roll_ndx_list(game.count, game.dice, "Re-rolled")
},
- next() {
+ accept() {
goto_campaigning_assign()
}
}
@@ -1849,7 +1849,7 @@ states.lobbying = {
if (player_buttons() > 0 && game.roll < game.count)
gen_action("reroll")
- gen_action("next")
+ gen_action("accept")
}
},
roll() {
@@ -1859,7 +1859,7 @@ states.lobbying = {
decrease_player_buttons(1)
game.roll = roll_ndx_count_success(game.count, game.dice, "Re-rolled")
},
- next() {
+ accept() {
if (game.roll > 0) {
game.count = game.roll
if (game.active === SUF) {
@@ -2945,7 +2945,7 @@ states.vm_roll = {
} else {
if (player_buttons() > 0 && (!game.vm.for_success || game.vm.roll < 3))
gen_action("reroll")
- gen_action("next")
+ gen_action("accept")
}
},
roll() {
@@ -2961,7 +2961,7 @@ states.vm_roll = {
else
game.vm.roll = roll_ndx(game.vm.count, game.vm.d, "Re-rolled")
},
- next() {
+ accept() {
push_undo()
vm_next()
}