+Golf type. 1 deck. 2 redeals. + +
+Move all cards to the foundation stack. + +
+Deal cards one at a time from the stock. Cards from the waste +pile can be moved to the foundation, building up or down by rank. +You are allowed to redeal twice, meaning you can go through the +deck a total of three times. +
+The sequence wraps around, so aces can be played on kings, and +vice versa. +
+The game is won when all of the cards have been moved to the +foundation. diff --git a/html-src/rules/uintah.html b/html-src/rules/uintah.html new file mode 100644 index 00000000..1ea5f478 --- /dev/null +++ b/html-src/rules/uintah.html @@ -0,0 +1,25 @@ +
+Golf type. 1 deck. Unlimited redeals. + +
+Move all cards to the foundations. + +
+Uintah is a variation of Robert +and Wasatch with four foundations. +
+At the start of the game, one random card of each suit is +placed on each of the foundations. +
+Cards are dealt from the stock in threes. Cards from the waste +pile can be moved to the foundation, building up or down by rank, +of the same colors. +
+The sequence wraps around, so aces can be played on kings, and +vice versa. +
+The game is won when all of the cards have been moved to the +foundations. diff --git a/html-src/rules/wasatch.html b/html-src/rules/wasatch.html new file mode 100644 index 00000000..cb5d728f --- /dev/null +++ b/html-src/rules/wasatch.html @@ -0,0 +1,13 @@ +
+Golf type. 1 deck. Unlimited redeals. + +
+Move all cards to the foundation stack. + +
+Like Robert, +but cards are dealt from the stock in threes, and +unlimited redeals are allowed. diff --git a/pysollib/gamedb.py b/pysollib/gamedb.py index 73606a43..4be8b2d1 100644 --- a/pysollib/gamedb.py +++ b/pysollib/gamedb.py @@ -308,7 +308,7 @@ class GI: ("Paul Alfille", (8,)), ("C.L. Baker", (45,)), ("David Bernazzani", (314,)), - ("Gordon Bower", (763,)), + ("Gordon Bower", (763, 783,)), ("Art Cabral", (9,)), ("Robert Harbin", (381,)), ("Robert Hogue", (22216,)), diff --git a/pysollib/games/golf.py b/pysollib/games/golf.py index 21e8c419..f9120f80 100644 --- a/pysollib/games/golf.py +++ b/pysollib/games/golf.py @@ -550,8 +550,69 @@ class Wasatch(Robert): def createGame(self): Robert.createGame(self, max_rounds=UNLIMITED_REDEALS, num_deal=3) + def startGame(self): + Robert.startGame(self) + +# ************************************************************************ +# * Uintah +# ************************************************************************ + + +class Uintah_Foundation(AbstractFoundationStack): + def acceptsCards(self, from_stack, cards): + if not AbstractFoundationStack.acceptsCards(self, from_stack, cards): + return False + if (self.cards[-1].color != cards[0].color): + return False + # check the rank + if self.cards: + r1, r2 = self.cards[-1].rank, cards[0].rank + return (r1 + 1) % self.cap.mod == r2 or \ + (r2 + 1) % self.cap.mod == r1 + return True + + def getHelp(self): + return _('Foundation. Build up or down by same color.') + + +class Uintah(Game): + + def createGame(self): + layout, s = Layout(self), self.s + self.setSize(layout.XM + 4 * layout.XS, layout.YM + 2 * layout.YS) + x, y = layout.XM, layout.YM + for i in range(4): + s.foundations.append(Uintah_Foundation(x, y, self, + suit=ANY_SUIT, dir=0, mod=13, + max_cards=52, max_move=0)) + x += layout.XS + x, y = layout.XM + layout.XS, layout.YM + layout.YS + s.talon = WasteTalonStack(x, y, self, + max_rounds=UNLIMITED_REDEALS, num_deal=3) + layout.createText(s.talon, 'nw') + x += layout.XS + s.waste = WasteStack(x, y, self) + layout.createText(s.waste, 'ne') + + # define stack-groups + layout.defaultStackGroups() + + def _shuffleHook(self, cards): + suits = [] + top_cards = [] + for c in cards[:]: + if c.suit not in suits: + suits.append(c.suit) + top_cards.append(c) + cards.remove(c) + if len(suits) == 4: + break + top_cards.sort(key=lambda x: -x.suit) # sort by suit + return cards + top_cards + def startGame(self): self.startDealSample() + self.s.talon.dealRow(rows=self.s.foundations) self.s.talon.dealCards() @@ -1199,7 +1260,7 @@ registerGame(GameInfo(750, Flake2Decks, "Flake (2 decks)", GI.GT_GOLF | GI.GT_OPEN | GI.GT_ORIGINAL, 2, 0, GI.SL_MOSTLY_SKILL)) registerGame(GameInfo(763, Wasatch, "Wasatch", - GI.GT_1DECK_TYPE, 1, UNLIMITED_REDEALS, + GI.GT_GOLF, 1, UNLIMITED_REDEALS, GI.SL_MOSTLY_LUCK)) registerGame(GameInfo(764, Beacon, "Beacon", GI.GT_1DECK_TYPE | GI.GT_ORIGINAL, 1, 0, @@ -1208,3 +1269,6 @@ registerGame(GameInfo(768, RelaxedThreeFirTrees, "Relaxed Three Fir-trees", GI.GT_GOLF, 2, 0, GI.SL_BALANCED)) registerGame(GameInfo(777, DoubleGolf, "Double Golf", GI.GT_GOLF, 2, 0, GI.SL_BALANCED)) +registerGame(GameInfo(783, Uintah, "Uintah", + GI.GT_GOLF, 1, UNLIMITED_REDEALS, + GI.SL_MOSTLY_LUCK))