diff --git a/po/de_pysol.po b/po/de_pysol.po index 8daa7c4d..5b8c3d3a 100644 --- a/po/de_pysol.po +++ b/po/de_pysol.po @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: PySol 0.0.1\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-12-10 10:19-0500\n" -"PO-Revision-Date: 2022-01-01 23:20-0500\n" +"PO-Revision-Date: 2022-01-08 10:29-0500\n" "Last-Translator: H. Schaekel \n" "Language-Team: German\n" "Language: de\n" @@ -3007,6 +3007,9 @@ msgstr "Spiele für Kinder (sehr einfach)" msgid "Games with Scoring" msgstr "Spiele mit Punkten" +msgid "Games with Stripped Decks" +msgstr "" + #: pysollib/kivy/selectgame.py:269 pysollib/pysolgtk/selectgame.py:304 #: pysollib/tile/selectgame.py:247 pysollib/tk/selectgame.py:247 msgid "Games with Separate Decks" diff --git a/po/fr_pysol.po b/po/fr_pysol.po index cefaacba..2a7df6b5 100644 --- a/po/fr_pysol.po +++ b/po/fr_pysol.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: 1.02\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-12-10 10:19-0500\n" -"PO-Revision-Date: 2022-01-01 23:20-0500\n" +"PO-Revision-Date: 2022-01-08 10:28-0500\n" "Last-Translator: Eric Rausch \n" "Language-Team: French\n" "Language: fr\n" @@ -3048,6 +3048,9 @@ msgstr "Jeux pour enfants (très facile)" msgid "Games with Scoring" msgstr "Jeux avec score" +msgid "Games with Stripped Decks" +msgstr "" + #: pysollib/kivy/selectgame.py:269 pysollib/pysolgtk/selectgame.py:304 #: pysollib/tile/selectgame.py:247 pysollib/tk/selectgame.py:247 msgid "Games with Separate Decks" diff --git a/po/it_pysol.po b/po/it_pysol.po index c8853306..2874f339 100644 --- a/po/it_pysol.po +++ b/po/it_pysol.po @@ -12,7 +12,7 @@ msgstr "" "Project-Id-Version: it_pysol\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-12-10 10:19-0500\n" -"PO-Revision-Date: 2022-01-01 23:21-0500\n" +"PO-Revision-Date: 2022-01-08 10:28-0500\n" "Last-Translator: Giuliano Colla \n" "Language-Team: Italiano \n" "Language: it\n" @@ -3113,6 +3113,9 @@ msgstr "Giochi per bambini (molto facili)" msgid "Games with Scoring" msgstr "Giochi con punteggio" +msgid "Games with Stripped Decks" +msgstr "" + #: pysollib/kivy/selectgame.py:269 pysollib/pysolgtk/selectgame.py:304 #: pysollib/tile/selectgame.py:247 pysollib/tk/selectgame.py:247 msgid "Games with Separate Decks" diff --git a/po/pl_pysol.po b/po/pl_pysol.po index 504cc06c..4b358319 100644 --- a/po/pl_pysol.po +++ b/po/pl_pysol.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-12-10 10:19-0500\n" -"PO-Revision-Date: 2022-01-01 23:21-0500\n" +"PO-Revision-Date: 2022-01-08 10:27-0500\n" "Last-Translator: Jerzy Trzeciak \n" "Language-Team: Polish \n" "Language: pl\n" @@ -3148,6 +3148,9 @@ msgstr "Gry dla dzieci (bardzo łatwe)" msgid "Games with Scoring" msgstr "Gry z punktacją" +msgid "Games with Stripped Decks" +msgstr "" + #: pysollib/kivy/selectgame.py:269 pysollib/pysolgtk/selectgame.py:304 #: pysollib/tile/selectgame.py:247 pysollib/tk/selectgame.py:247 msgid "Games with Separate Decks" diff --git a/po/pysol.pot b/po/pysol.pot index 321bfc50..8c399ebf 100644 --- a/po/pysol.pot +++ b/po/pysol.pot @@ -2881,6 +2881,9 @@ msgstr "" msgid "Games with Scoring" msgstr "" +msgid "Games with Stripped Decks" +msgstr "" + #: pysollib/kivy/selectgame.py:269 pysollib/pysolgtk/selectgame.py:304 #: pysollib/tile/selectgame.py:247 pysollib/tk/selectgame.py:247 msgid "Games with Separate Decks" diff --git a/po/ru_pysol.po b/po/ru_pysol.po index 58ec41a8..355a2615 100644 --- a/po/ru_pysol.po +++ b/po/ru_pysol.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-12-10 10:19-0500\n" -"PO-Revision-Date: 2022-01-01 23:21-0500\n" +"PO-Revision-Date: 2022-01-08 10:24-0500\n" "Last-Translator: Skomoroh \n" "Language-Team: Russian \n" "Language: ru\n" @@ -3122,6 +3122,9 @@ msgstr "Игры для детей (очень лёгкие)" msgid "Games with Scoring" msgstr "Игры со счётом" +msgid "Games with Stripped Decks" +msgstr "" + #: pysollib/kivy/selectgame.py:269 pysollib/pysolgtk/selectgame.py:304 #: pysollib/tile/selectgame.py:247 pysollib/tk/selectgame.py:247 msgid "Games with Separate Decks" diff --git a/pysollib/gamedb.py b/pysollib/gamedb.py index afb8cd96..23ee1640 100644 --- a/pysollib/gamedb.py +++ b/pysollib/gamedb.py @@ -104,6 +104,7 @@ class GI: GT_SCORE = 1 << 20 # game has some type of scoring GT_SEPARATE_DECKS = 1 << 21 GT_XORIGINAL = 1 << 22 # original games by other people, not playable + GT_STRIPPED = 1 << 23 # skill level SL_LUCK = 1 SL_MOSTLY_LUCK = 2 diff --git a/pysollib/games/auldlangsyne.py b/pysollib/games/auldlangsyne.py index 02e9b568..3e125abf 100644 --- a/pysollib/games/auldlangsyne.py +++ b/pysollib/games/auldlangsyne.py @@ -616,7 +616,7 @@ registerGame(GameInfo(123, Interregnum, "Interregnum", registerGame(GameInfo(296, Colorado, "Colorado", GI.GT_NUMERICA, 2, 0, GI.SL_BALANCED)) registerGame(GameInfo(406, Amazons, "Amazons", - GI.GT_NUMERICA, 1, -1, GI.SL_LUCK, + GI.GT_NUMERICA | GI.GT_STRIPPED, 1, -1, GI.SL_LUCK, ranks=(0, 6, 7, 8, 9, 10, 11), )) registerGame(GameInfo(490, Acquaintance, "Acquaintance", diff --git a/pysollib/games/capricieuse.py b/pysollib/games/capricieuse.py index f45a325b..257d657a 100644 --- a/pysollib/games/capricieuse.py +++ b/pysollib/games/capricieuse.py @@ -244,7 +244,7 @@ registerGame(GameInfo(293, Nationale, "Nationale", GI.SL_MOSTLY_SKILL, altnames=('Zigzag Course',))) registerGame(GameInfo(606, Strata, "Strata", - GI.GT_BAKERS_DOZEN | GI.GT_OPEN, 2, 2, + GI.GT_BAKERS_DOZEN | GI.GT_OPEN | GI.GT_STRIPPED, 2, 2, GI.SL_MOSTLY_SKILL, ranks=(0, 6, 7, 8, 9, 10, 11, 12), altnames=('Persian Patience',))) @@ -252,6 +252,6 @@ registerGame(GameInfo(673, Fifteen, "Fifteen", GI.GT_BAKERS_DOZEN | GI.GT_OPEN, 2, 0, GI.SL_MOSTLY_SKILL)) registerGame(GameInfo(755, Choice, "Choice", - GI.GT_3DECK_TYPE | GI.GT_OPEN | GI.GT_ORIGINAL, 3, 0, - GI.SL_MOSTLY_SKILL, + GI.GT_3DECK_TYPE | GI.GT_OPEN | GI.GT_ORIGINAL | + GI.GT_STRIPPED, 3, 0, GI.SL_MOSTLY_SKILL, ranks=(5, 6, 7, 8, 9, 10, 11, 12))) diff --git a/pysollib/games/dieboesesieben.py b/pysollib/games/dieboesesieben.py index fed860f0..1a5f89cb 100644 --- a/pysollib/games/dieboesesieben.py +++ b/pysollib/games/dieboesesieben.py @@ -110,6 +110,6 @@ class DieBoeseSieben(Game): # register the game registerGame(GameInfo(120, DieBoeseSieben, "Bad Seven", - GI.GT_2DECK_TYPE, 2, 1, GI.SL_MOSTLY_LUCK, - ranks=(0, 6, 7, 8, 9, 10, 11, 12), + GI.GT_2DECK_TYPE | GI.GT_STRIPPED, 2, 1, + GI.SL_MOSTLY_LUCK, ranks=(0, 6, 7, 8, 9, 10, 11, 12), altnames=("Die boese Sieben",))) diff --git a/pysollib/games/fortythieves.py b/pysollib/games/fortythieves.py index 663dd1e8..839a454e 100644 --- a/pysollib/games/fortythieves.py +++ b/pysollib/games/fortythieves.py @@ -1424,8 +1424,8 @@ registerGame(GameInfo(529, SanJuanHill, "San Juan Hill", registerGame(GameInfo(540, Waterloo, "Waterloo", GI.GT_FORTY_THIEVES, 2, 0, GI.SL_BALANCED)) registerGame(GameInfo(556, Junction, "Junction", - GI.GT_FORTY_THIEVES, 4, 0, GI.SL_MOSTLY_SKILL, - ranks=(0, 6, 7, 8, 9, 10, 11, 12))) + GI.GT_FORTY_THIEVES | GI.GT_STRIPPED, 4, 0, + GI.SL_MOSTLY_SKILL, ranks=(0, 6, 7, 8, 9, 10, 11, 12))) registerGame(GameInfo(564, Kilowatt, "Kilowatt", GI.GT_FORTY_THIEVES, 2, 0, GI.SL_MOSTLY_LUCK)) registerGame(GameInfo(573, DoubleGoldMine, "Double Gold Mine", diff --git a/pysollib/games/golf.py b/pysollib/games/golf.py index 31e61fab..75e43def 100644 --- a/pysollib/games/golf.py +++ b/pysollib/games/golf.py @@ -1328,5 +1328,5 @@ registerGame(GameInfo(783, Uintah, "Uintah", GI.GT_GOLF, 1, UNLIMITED_REDEALS, GI.SL_MOSTLY_LUCK)) registerGame(GameInfo(812, Sticko, "Sticko", - GI.GT_1DECK_TYPE, 1, 0, GI.SL_BALANCED, + GI.GT_1DECK_TYPE | GI.GT_STRIPPED, 1, 0, GI.SL_BALANCED, ranks=(0, 6, 7, 8, 9, 10, 11, 12))) diff --git a/pysollib/games/gypsy.py b/pysollib/games/gypsy.py index f74dd572..9886850a 100644 --- a/pysollib/games/gypsy.py +++ b/pysollib/games/gypsy.py @@ -995,7 +995,8 @@ registerGame(GameInfo(3, Irmgard, "Irmgard", registerGame(GameInfo(119, DieKoenigsbergerin, "Die Koenigsbergerin", GI.GT_GYPSY, 2, 0, GI.SL_MOSTLY_SKILL)) registerGame(GameInfo(174, DieRussische, "Russian Patience", - GI.GT_2DECK_TYPE | GI.GT_OPEN, 2, 0, GI.SL_MOSTLY_SKILL, + GI.GT_2DECK_TYPE | GI.GT_OPEN | GI.GT_STRIPPED, + 2, 0, GI.SL_MOSTLY_SKILL, ranks=(0, 6, 7, 8, 9, 10, 11, 12), altnames=("Die Russische",))) registerGame(GameInfo(62, MissMilligan, "Miss Milligan", @@ -1055,8 +1056,8 @@ registerGame(GameInfo(712, Leprechaun, "Leprechaun", registerGame(GameInfo(718, LockedCards, "Locked Cards", GI.GT_2DECK_TYPE, 2, 2, GI.SL_BALANCED)) registerGame(GameInfo(721, Thirty, "Thirty", - GI.GT_1DECK_TYPE | GI.GT_OPEN, 1, 0, GI.SL_MOSTLY_SKILL, - ranks=(0, 6, 7, 8, 9, 10, 11, 12))) + GI.GT_1DECK_TYPE | GI.GT_OPEN | GI.GT_STRIPPED, 1, 0, + GI.SL_MOSTLY_SKILL, ranks=(0, 6, 7, 8, 9, 10, 11, 12))) registerGame(GameInfo(725, TopsyTurvyQueens, "Topsy-Turvy Queens", GI.GT_2DECK_TYPE, 2, 2, GI.SL_BALANCED)) registerGame(GameInfo(792, KingsSecrets, "King's Secrets", diff --git a/pysollib/games/harp.py b/pysollib/games/harp.py index 86cffe9c..a0f48107 100644 --- a/pysollib/games/harp.py +++ b/pysollib/games/harp.py @@ -429,7 +429,7 @@ registerGame(GameInfo(562, Delivery, "Delivery", GI.GT_FORTY_THIEVES | GI.GT_ORIGINAL, 4, 0, GI.SL_BALANCED)) registerGame(GameInfo(590, ChineseKlondike, "Chinese Klondike", - GI.GT_KLONDIKE, 3, -1, GI.SL_BALANCED, + GI.GT_KLONDIKE | GI.GT_STRIPPED, 3, -1, GI.SL_BALANCED, suits=(0, 1, 2))) registerGame(GameInfo(591, Pantagruel, "Pantagruel", GI.GT_KLONDIKE, 2, 0, GI.SL_BALANCED)) diff --git a/pysollib/games/montana.py b/pysollib/games/montana.py index 5357036a..cc313e83 100644 --- a/pysollib/games/montana.py +++ b/pysollib/games/montana.py @@ -667,11 +667,11 @@ registerGame(GameInfo(380, Jungle, "Jungle", registerGame(GameInfo(381, SpacesAndAces, "Spaces and Aces", GI.GT_MONTANA | GI.GT_OPEN, 1, 0, GI.SL_MOSTLY_SKILL)) registerGame(GameInfo(706, Paganini, "Paganini", - GI.GT_MONTANA | GI.GT_OPEN, 1, 1, GI.SL_MOSTLY_SKILL, - ranks=(0, 5, 6, 7, 8, 9, 10, 11, 12), + GI.GT_MONTANA | GI.GT_OPEN | GI.GT_STRIPPED, 1, 1, + GI.SL_MOSTLY_SKILL, ranks=(0, 5, 6, 7, 8, 9, 10, 11, 12), altnames=('Long Trip',))) registerGame(GameInfo(736, Spoilt, "Spoilt", - GI.GT_MONTANA, 1, 0, GI.SL_MOSTLY_LUCK, + GI.GT_MONTANA | GI.GT_STRIPPED, 1, 0, GI.SL_MOSTLY_LUCK, ranks=(0, 6, 7, 8, 9, 10, 11, 12))) registerGame(GameInfo(759, DoubleMontana, "Double Montana", GI.GT_MONTANA | GI.GT_OPEN, 2, 0, GI.SL_MOSTLY_SKILL)) @@ -680,8 +680,10 @@ registerGame(GameInfo(770, DoubleBlueMoon, "Double Blue Moon", registerGame(GameInfo(771, DoubleRedMoon, "Double Red Moon", GI.GT_MONTANA | GI.GT_OPEN, 2, 2, GI.SL_MOSTLY_SKILL)) registerGame(GameInfo(794, HouseOfCommons, "House of Commons", - GI.GT_MONTANA | GI.GT_OPEN, 1, 1, GI.SL_MOSTLY_SKILL, - ranks=(0, 1, 2, 3, 4, 5, 6, 7, 8, 9), si={"ncards": 36})) + GI.GT_MONTANA | GI.GT_OPEN | GI.GT_STRIPPED, 1, 1, + GI.SL_MOSTLY_SKILL, ranks=(0, 1, 2, 3, 4, 5, 6, 7, 8, 9), + si={"ncards": 36})) registerGame(GameInfo(795, Pretzel, "Pretzel", - GI.GT_MONTANA | GI.GT_OPEN, 1, 0, GI.SL_MOSTLY_SKILL, - ranks=(0, 1, 2, 3, 4), si={"ncards": 16})) + GI.GT_MONTANA | GI.GT_OPEN | GI.GT_STRIPPED, 1, 0, + GI.SL_MOSTLY_SKILL, ranks=(0, 1, 2, 3, 4), + si={"ncards": 16})) diff --git a/pysollib/games/montecarlo.py b/pysollib/games/montecarlo.py index 66ca2063..8aff25f2 100644 --- a/pysollib/games/montecarlo.py +++ b/pysollib/games/montecarlo.py @@ -984,11 +984,12 @@ registerGame(GameInfo(152, DerLetzteMonarch, "The Last Monarch", GI.GT_1DECK_TYPE | GI.GT_OPEN, 1, 0, GI.SL_MOSTLY_SKILL, altnames=("Der letzte Monarch",))) registerGame(GameInfo(328, TheWish, "The Wish", - GI.GT_PAIRING_TYPE, 1, 0, GI.SL_MOSTLY_LUCK, - ranks=(0, 6, 7, 8, 9, 10, 11, 12))) + GI.GT_PAIRING_TYPE | GI.GT_STRIPPED, 1, 0, + GI.SL_MOSTLY_LUCK, ranks=(0, 6, 7, 8, 9, 10, 11, 12))) registerGame(GameInfo(329, TheWishOpen, "The Wish (open)", - GI.GT_PAIRING_TYPE | GI.GT_OPEN | GI.GT_ORIGINAL, 1, 0, - GI.SL_MOSTLY_SKILL, ranks=(0, 6, 7, 8, 9, 10, 11, 12), + GI.GT_PAIRING_TYPE | GI.GT_OPEN | GI.GT_ORIGINAL | + GI.GT_STRIPPED, 1, 0, GI.SL_MOSTLY_SKILL, + ranks=(0, 6, 7, 8, 9, 10, 11, 12), rules_filename="thewish.html")) registerGame(GameInfo(368, Vertical, "Vertical", GI.GT_PAIRING_TYPE | GI.GT_OPEN, 1, 0, diff --git a/pysollib/games/picturegallery.py b/pysollib/games/picturegallery.py index 5bb7aec6..e6fce828 100644 --- a/pysollib/games/picturegallery.py +++ b/pysollib/games/picturegallery.py @@ -590,7 +590,7 @@ registerGame(GameInfo(7, PictureGallery, "Picture Gallery", GI.GT_2DECK_TYPE, 2, 0, GI.SL_BALANCED, altnames=("Die Bildgallerie", "Mod-3"))) registerGame(GameInfo(397, GreatWheel, "Great Wheel", - GI.GT_2DECK_TYPE, 2, 0, GI.SL_BALANCED, + GI.GT_2DECK_TYPE | GI.GT_STRIPPED, 2, 0, GI.SL_BALANCED, ranks=list(range(12)) # without Kings )) registerGame(GameInfo(398, MountOlympus, "Mount Olympus", @@ -602,7 +602,7 @@ registerGame(GameInfo(546, RoyalParade, "Royal Parade", registerGame(GameInfo(547, VirginiaReel, "Virginia Reel", GI.GT_2DECK_TYPE, 2, 0, GI.SL_MOSTLY_SKILL)) registerGame(GameInfo(782, GreaterWheel, "Greater Wheel", - GI.GT_4DECK_TYPE, 4, 0, GI.SL_BALANCED, + GI.GT_4DECK_TYPE | GI.GT_STRIPPED, 4, 0, GI.SL_BALANCED, ranks=list(range(12)) # without Kings )) registerGame(GameInfo(803, BigParade, "Big Parade", diff --git a/pysollib/games/pileon.py b/pysollib/games/pileon.py index 0d35f156..8cb73e38 100644 --- a/pysollib/games/pileon.py +++ b/pysollib/games/pileon.py @@ -397,7 +397,8 @@ registerGame(GameInfo(41, PileOn, "PileOn", GI.GT_1DECK_TYPE | GI.GT_OPEN, 1, 0, GI.SL_MOSTLY_SKILL, altnames=("Fifteen Puzzle", "Fan Fifteen", ))) registerGame(GameInfo(289, SmallPileOn, "Small PileOn", - GI.GT_1DECK_TYPE | GI.GT_OPEN | GI.GT_ORIGINAL, 1, 0, + GI.GT_1DECK_TYPE | GI.GT_OPEN | GI.GT_ORIGINAL | + GI.GT_STRIPPED, 1, 0, GI.SL_MOSTLY_SKILL, ranks=(0, 5, 6, 7, 8, 9, 10, 11, 12), rules_filename="pileon.html")) diff --git a/pysollib/games/royalcotillion.py b/pysollib/games/royalcotillion.py index 822d0b64..f633c059 100644 --- a/pysollib/games/royalcotillion.py +++ b/pysollib/games/royalcotillion.py @@ -1368,11 +1368,12 @@ registerGame(GameInfo(234, Alhambra, "Alhambra", registerGame(GameInfo(97, Carpet, "Carpet", GI.GT_1DECK_TYPE, 1, 0, GI.SL_MOSTLY_LUCK)) registerGame(GameInfo(391, BritishConstitution, "British Constitution", - GI.GT_2DECK_TYPE, 2, 0, GI.SL_BALANCED, + GI.GT_2DECK_TYPE | GI.GT_STRIPPED, 2, 0, GI.SL_BALANCED, ranks=list(range(11)), # without Queens and Kings altnames=("Constitution",))) registerGame(GameInfo(392, NewBritishConstitution, "New British Constitution", - GI.GT_2DECK_TYPE | GI.GT_ORIGINAL, 2, 0, GI.SL_BALANCED, + GI.GT_2DECK_TYPE | GI.GT_STRIPPED | GI.GT_ORIGINAL, 2, 0, + GI.SL_BALANCED, ranks=list(range(11)) # without Queens and Kings )) registerGame(GameInfo(443, Twenty, "Twenty", diff --git a/pysollib/games/siebenbisas.py b/pysollib/games/siebenbisas.py index df9cdc69..486d3b02 100644 --- a/pysollib/games/siebenbisas.py +++ b/pysollib/games/siebenbisas.py @@ -290,8 +290,8 @@ class Maze(Game): # register the game registerGame(GameInfo(118, SiebenBisAs, "Sieben bis As", - GI.GT_MONTANA | GI.GT_OPEN, 1, 0, GI.SL_MOSTLY_SKILL, - ranks=(0, 6, 7, 8, 9, 10, 11, 12))) + GI.GT_MONTANA | GI.GT_OPEN | GI.GT_STRIPPED, 1, 0, + GI.SL_MOSTLY_SKILL, ranks=(0, 6, 7, 8, 9, 10, 11, 12))) registerGame(GameInfo(144, Maze, "Maze", GI.GT_MONTANA | GI.GT_OPEN, 1, 0, GI.SL_MOSTLY_SKILL, si={"ncards": 48})) diff --git a/pysollib/games/spider.py b/pysollib/games/spider.py index 77f3c54f..d784fd6c 100644 --- a/pysollib/games/spider.py +++ b/pysollib/games/spider.py @@ -1554,8 +1554,8 @@ registerGame(GameInfo(446, BigSpider2Suits, "Big Spider (2 suits)", suits=(0, 0, 2, 2), rules_filename="bigspider.html")) registerGame(GameInfo(449, Spider3x3, "Spider 3x3", - GI.GT_SPIDER | GI.GT_ORIGINAL, 3, 0, GI.SL_MOSTLY_SKILL, - suits=(0, 1, 2), + GI.GT_SPIDER | GI.GT_ORIGINAL | GI.GT_STRIPPED, + 3, 0, GI.SL_MOSTLY_SKILL, suits=(0, 1, 2), rules_filename="bigspider.html")) registerGame(GameInfo(454, Spider4Decks, "Spider (4 decks)", GI.GT_SPIDER, 4, 0, GI.SL_MOSTLY_SKILL)) @@ -1587,7 +1587,7 @@ registerGame(GameInfo(570, LongTail, "Long Tail", registerGame(GameInfo(571, ShortTail, "Short Tail", GI.GT_SPIDER | GI.GT_ORIGINAL, 2, 0, GI.SL_MOSTLY_SKILL)) registerGame(GameInfo(670, ChineseSpider, "Chinese Spider", - GI.GT_SPIDER, 4, 0, GI.SL_MOSTLY_SKILL, + GI.GT_SPIDER | GI.GT_STRIPPED, 4, 0, GI.SL_MOSTLY_SKILL, suits=(0, 1, 2),)) registerGame(GameInfo(671, Incompatibility, "Incompatibility", GI.GT_SPIDER, 2, 0, GI.SL_MOSTLY_SKILL)) diff --git a/pysollib/games/unionsquare.py b/pysollib/games/unionsquare.py index 07dbceff..b1f367cc 100644 --- a/pysollib/games/unionsquare.py +++ b/pysollib/games/unionsquare.py @@ -214,6 +214,6 @@ registerGame(GameInfo(35, UnionSquare, "Union Square", registerGame(GameInfo(439, SolidSquare, "Solid Square", GI.GT_2DECK_TYPE, 2, 0, GI.SL_BALANCED)) registerGame(GameInfo(738, Boomerang, "Boomerang", - GI.GT_2DECK_TYPE, 2, 0, GI.SL_BALANCED, - ranks=(0, 6, 7, 8, 9, 10, 11, 12), + GI.GT_2DECK_TYPE | GI.GT_STRIPPED, 2, 0, + GI.SL_BALANCED, ranks=(0, 6, 7, 8, 9, 10, 11, 12), )) diff --git a/pysollib/kivy/selectgame.py b/pysollib/kivy/selectgame.py index e8bdcc9c..743d52b1 100644 --- a/pysollib/kivy/selectgame.py +++ b/pysollib/kivy/selectgame.py @@ -266,6 +266,8 @@ class SelectGameData(SelectDialogTreeData): lambda gi: gi.si.game_flags & GI.GT_CHILDREN), SelectGameNode(None, _("Games with Scoring"), lambda gi: gi.si.game_flags & GI.GT_SCORE), + SelectGameNode(None, _("Games with Stripped Decks"), + lambda gi: gi.si.game_flags & GI.GT_STRIPPED), SelectGameNode(None, _("Games with Separate Decks"), lambda gi: gi.si.game_flags & GI.GT_SEPARATE_DECKS), SelectGameNode(None, _("Open Games (all cards visible)"), diff --git a/pysollib/pysolgtk/selectgame.py b/pysollib/pysolgtk/selectgame.py index 178f9d5e..a2b3159e 100644 --- a/pysollib/pysolgtk/selectgame.py +++ b/pysollib/pysolgtk/selectgame.py @@ -301,6 +301,8 @@ class SelectGameDialogWithPreview(MfxDialog): lambda gi: gi.si.game_flags & GI.GT_CHILDREN), (_("Games with Scoring"), lambda gi: gi.si.game_flags & GI.GT_SCORE), + (_("Games with Stripped Decks"), + lambda gi: gi.si.game_flags & GI.GT_STRIPPED), (_("Games with Separate Decks"), lambda gi: gi.si.game_flags & GI.GT_SEPARATE_DECKS), (_("Open Games (all cards visible)"), diff --git a/pysollib/tile/selectgame.py b/pysollib/tile/selectgame.py index 74e0b3a1..a3f6aad3 100644 --- a/pysollib/tile/selectgame.py +++ b/pysollib/tile/selectgame.py @@ -244,6 +244,8 @@ class SelectGameData(SelectDialogTreeData): lambda gi: gi.si.game_flags & GI.GT_CHILDREN), SelectGameNode(None, _("Games with Scoring"), lambda gi: gi.si.game_flags & GI.GT_SCORE), + SelectGameNode(None, _("Games with Stripped Decks"), + lambda gi: gi.si.game_flags & GI.GT_STRIPPED), SelectGameNode(None, _("Games with Separate Decks"), lambda gi: gi.si.game_flags & GI.GT_SEPARATE_DECKS), diff --git a/pysollib/tk/selectgame.py b/pysollib/tk/selectgame.py index 5f209178..0b11fe3b 100644 --- a/pysollib/tk/selectgame.py +++ b/pysollib/tk/selectgame.py @@ -243,6 +243,8 @@ class SelectGameData(SelectDialogTreeData): lambda gi: gi.si.game_flags & GI.GT_CHILDREN), SelectGameNode(None, _("Games with Scoring"), lambda gi: gi.si.game_flags & GI.GT_SCORE), + SelectGameNode(None, _("Games with Stripped Decks"), + lambda gi: gi.si.game_flags & GI.GT_STRIPPED), SelectGameNode( None, _("Games with Separate Decks"), lambda gi: gi.si.game_flags & GI.GT_SEPARATE_DECKS),