-[To be written] diff --git a/html-src/rules/napoleonleavesmoscow.html b/html-src/rules/napoleonleavesmoscow.html new file mode 100644 index 00000000..446d2ca7 --- /dev/null +++ b/html-src/rules/napoleonleavesmoscow.html @@ -0,0 +1,13 @@ +
+Napoleon type. 2 decks. 2 redeals. + +
+Move all cards to the foundations. + +
+Like Napoleon Takes Moscow, +but sequences of cards of the same suit can be moved between +tableau piles. diff --git a/html-src/rules/napoleontakesmoscow.html b/html-src/rules/napoleontakesmoscow.html new file mode 100644 index 00000000..68faddc7 --- /dev/null +++ b/html-src/rules/napoleontakesmoscow.html @@ -0,0 +1,27 @@ +
+Napoleon type. 2 decks. 2 redeals. + +
+Move all cards to the foundations. + +
+Cards are dealt to eight piles of four cards each. An +additional sixteen cards are dealt in an additional pile, +containing alternating rows of one and two cards, located in +the center, between the fourth and fifth piles. +
+No building is allowed in this center pile, and cards can only +be moved from it if all of their covering cards are removed. +The remaining tableau piles are built down by same suit, with +only individual cards allowed to be moved between tableau piles, +and only kings can fill empty spots. +
+Cards can be dealt from the talon one at a time, and moved to the +tableau or foundations. Two redeals are allowed, so you can go +through the talon three times at most. +
+The foundations are built up by same suit from ace to king, and the +game is won if all cards are moved to the foundations. diff --git a/html-src/rules/threefirtrees.html b/html-src/rules/threefirtrees.html index d30c52c8..172f3fae 100644 --- a/html-src/rules/threefirtrees.html +++ b/html-src/rules/threefirtrees.html @@ -9,6 +9,7 @@ Move all cards to the waste stack.
Like Golf, -but with a different layout. Cards from the fir-trees -can only be moved to the waste if all their covered cards -are gone. +but with a different layout, consisting of three "fir-trees" of +sixteen cards each, dealt in alternating rows of one and two cards. +Cards from the fir-trees can only be moved to the waste if all their +covered cards are gone. diff --git a/pysollib/games/golf.py b/pysollib/games/golf.py index 618f8bb7..38ffe898 100644 --- a/pysollib/games/golf.py +++ b/pysollib/games/golf.py @@ -1115,8 +1115,9 @@ class NapoleonTakesMoscow(Game, FirTree_GameMethods): def createGame(self): layout, s = Layout(self), self.s - self.setSize( - layout.XM+10*layout.XS, layout.YM+3*layout.YS+15*layout.YOFFSET) + self.setSize(layout.XM + 10 * layout.XS, + layout.YM + 3 * layout.YS + 15 * layout.YOFFSET + + layout.TEXT_HEIGHT) x, y = layout.XM+layout.XS, layout.YM for i in range(8): @@ -1133,13 +1134,13 @@ class NapoleonTakesMoscow(Game, FirTree_GameMethods): x, y = layout.XM+4*layout.XS, layout.YM+layout.YS s.reserves += self._createFirTree(layout, x, y) - x, y = layout.XM, self.height-layout.YS + x, y = layout.XM, self.height - layout.YS - layout.TEXT_HEIGHT s.talon = WasteTalonStack(x, y, self, max_rounds=3) - layout.createText(s.talon, 'n') - layout.createRoundText(s.talon, 'nnn') + layout.createText(s.talon, 's') + layout.createRoundText(s.talon, 'n') x += layout.XS s.waste = WasteStack(x, y, self) - layout.createText(s.waste, 'n') + layout.createText(s.waste, 's') # define stack-groups layout.defaultStackGroups()