Skip to content

Commit 4676356

Browse files
authored
Merge pull request #295 from mcdemarco/develop
Frogger: handle corner cases around pool draining
2 parents 3c4304b + c0f53e3 commit 4676356

File tree

4 files changed

+153
-44
lines changed

4 files changed

+153
-44
lines changed

locales/en/apgames.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4217,6 +4217,8 @@
42174217
"MUST_HOP_FORWARD": "When using a hand card, your frog must hop forward.",
42184218
"MUST_MOVE": "Your frog must move to a different card/column.",
42194219
"MUST_PASS": "You must pass to allow another player to complete their turn.",
4220+
"NO_CARDS_FOR_REFILL": "There are no cards left with which to refill the draw pool.",
4221+
"NO_CARDS_BLOCKED": "If, at the start of your turn, you have no hand cards, none of your frogs can move back, and the draw pool is empty, you must pass.",
42204222
"NO_CHOICE_BLOCKED": "If, at the start of your turn, you have no hand cards and none of your frogs can move back, you must draw a single card from the draw pool and end your turn.",
42214223
"NO_MOVE_BLOCKED": "You cannot move after claiming a card for being blocked.",
42224224
"NO_PASSING": "There is no passing as such in Frogger. If you are blocked, you must draw a single card from the draw pool.",

locales/en/apresults.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@
170170
"biscuit": "The next player was unable to play any cards in their hand, so they drew a card.",
171171
"emu_deck": "{{player}} drew a face-down card from the deck.",
172172
"emu_discard": "{{player}} drew the {{what}} from the top of the discard pile.",
173-
"frogger": "The draw pool was refilled.",
173+
"frogger": "The draw pool was {{what}} refilled.",
174174
"quincunx_one": "{{player}} drew {{count}} card.",
175175
"quincunx_other": "{{player}} drew {{count}} cards."
176176
},
@@ -347,7 +347,7 @@
347347
"deckfish": "{{player}} was unable to move.",
348348
"entropy": "{{player}} chose not to move any pieces this turn.",
349349
"forced": "{{player}} was forced to pass.",
350-
"frogger": "{{player}} passed to permit refilling the draw pool.",
350+
"frogger": "{{player}} passed {{why}}.",
351351
"pie": "{{player}} accepted the komi offer and will continue playing second.",
352352
"pigs": "{{player}} idles.",
353353
"simple": "{{player}} passed.",

0 commit comments

Comments
 (0)