+Yukon type. 2 decks. No redeal. + +
+Move all cards to the foundations. + +
+Fifty cards are dealt into ten piles of five cards. The +remaining 54 cards are dealt to a reserve pile. +
+Cards in tableau are built down by alternate color. +Groups of cards can be moved regardless of sequence. +Any card or sequence can be used to fill an empty pile. +
+The top card of the reserve pile can be moved to any +appropriate tableau or foundation. +
+The foundations are built up by suit from ace to king. +The game is won when all cards are moved to the foundations. diff --git a/html-src/rules/yukonicplague.html b/html-src/rules/yukonicplague.html new file mode 100644 index 00000000..f3d3f1a0 --- /dev/null +++ b/html-src/rules/yukonicplague.html @@ -0,0 +1,14 @@ +
+Yukon type. 1 deck. No redeal. + +
+Move all cards to the foundations. + +
+Like Yukon, +but with an additional 13 card reserve. The top +card of this reserve can be moved to any appropriate +tableau or foundation pile. diff --git a/pysollib/gamedb.py b/pysollib/gamedb.py index c7ea45d9..46a15db1 100644 --- a/pysollib/gamedb.py +++ b/pysollib/gamedb.py @@ -479,7 +479,7 @@ class GI: ('fc-2.8', (343001,)), ('fc-2.12', tuple(range(774, 811)) + (16681,) + tuple(range(22217, 22219))), - ('fc-2.14', tuple(range(811, 826))) + ('fc-2.14', tuple(range(811, 827))) ) # deprecated - the correct way is to or a GI.GT_XXX flag diff --git a/pysollib/games/yukon.py b/pysollib/games/yukon.py index 0a8c4882..abbed3cf 100644 --- a/pysollib/games/yukon.py +++ b/pysollib/games/yukon.py @@ -688,6 +688,64 @@ class Wave(Game): shallHighlightMatch = Game._shallHighlightMatch_AC +class YukonicPlague(Yukon): + + def createGame(self): + # create layout + l, s = Layout(self), self.s + + ROWS = 7 + + # set size so that at least 2//3 of a card is visible with 20 cards + h = l.CH * 2 // 27 * l.YOFFSET + h = l.YM + max(h, 5 * l.YS) + + # create rows + x, y = l.XM, l.YM + + w1, w2 = (7 * (l.XS + l.XM)), (2 * l.XS) + if w2 + 13 * l.XOFFSET > w1: + l.XOFFSET = int((w1 - w2) / 13) + + reserve = OpenStack(x * 3, y, self) + reserve.CARD_XOFFSET = l.XOFFSET + l.createText(reserve, "sw") + s.reserves.append(reserve) + + y += l.YS + for i in range(ROWS): + self.s.rows.append(self.RowStack_Class(x, y, self)) + x += l.XS + + # Don't know why this is necessary for the Yukon layout. + # But we should probably figure out how to get this to work + # like other games. + self.setRegion(self.s.rows, (-999, -999, x - l.CW // 2, 999999)) + + # create foundations + y = l.YM + for suit in range(4): + self.s.foundations.append(self.Foundation_Class( + x, y, self, suit=suit, max_move=0)) + y += l.YS + + x, y = l.XM, h - l.YS + self.s.talon = self.Talon_Class(x, y, self) + + # set window + self.setSize(l.XM + 8 * l.XS, h) + l.defaultAll() + + def startGame(self): + for i in range(13): + self.s.talon.dealRow(rows=self.s.reserves, frames=0) + for i in range(2): + self.s.talon.dealRow(rows=self.s.rows[1:7], flip=0, frames=0) + for i in range(5): + self.s.talon.dealRow(rows=self.s.rows[i + 1:7], flip=1, frames=0) + self._startAndDealRow() + + # register the game registerGame(GameInfo(19, Yukon, "Yukon", GI.GT_YUKON, 1, 0, GI.SL_BALANCED)) @@ -746,6 +804,8 @@ registerGame(GameInfo(531, DoubleRussianSpider, "Double Russian Spider", registerGame(GameInfo(603, Brisbane, "Brisbane", GI.GT_SPIDER, 1, 0, GI.SL_BALANCED)) registerGame(GameInfo(707, Hawaiian, "Hawaiian", - GI.GT_2DECK_TYPE | GI.GT_ORIGINAL, 2, 0, GI.SL_BALANCED)) + GI.GT_YUKON | GI.GT_ORIGINAL, 2, 0, GI.SL_BALANCED)) registerGame(GameInfo(732, Wave, "Wave", GI.GT_2DECK_TYPE | GI.GT_ORIGINAL, 2, 0, GI.SL_BALANCED)) +registerGame(GameInfo(826, YukonicPlague, "Yukonic Plague", + GI.GT_YUKON, 1, 0, GI.SL_BALANCED))