oops, cards were getting saved too late stripping out base cards from the expansions

2015-11-05 14:52:44 -08:00 · 2015-11-05 14:52:44 -08:00 · c8f057afc5
commit c8f057afc5
parent 0c1860266c
2 changed files with 221 additions and 11 deletions
--- a/card_db/en_us/cards.json
+++ b/card_db/en_us/cards.json
@ -280,6 +280,94 @@
   "Action"
  ]
 },
+ {
+  "cardset": "dominion", 
+  "cost": "0", 
+  "description": "Worth 1 Coin.", 
+  "extra": " 60 cards per game.", 
+  "name": "Copper", 
+  "potcost": 0, 
+  "types": [
+   "Treasure"
+  ]
+ }, 
+ {
+  "cardset": "dominion", 
+  "cost": "3", 
+  "description": "Worth 2 Coins.", 
+  "extra": " 40 cards per game.", 
+  "name": "Silver", 
+  "potcost": 0, 
+  "types": [
+   "Treasure"
+  ]
+ }, 
+ {
+  "cardset": "dominion", 
+  "cost": "6", 
+  "description": "Worth 3 Coins.", 
+  "extra": " 30 cards per game.", 
+  "name": "Gold", 
+  "potcost": 0, 
+  "types": [
+   "Treasure"
+  ]
+ }, 
+ {
+  "cardset": "dominion", 
+  "cost": "0", 
+  "description": "-1 <VP>", 
+  "extra": " Curses are an available pile in the Supply regardless of what other cards are in the Supply.  With 2 players, place 10 Curses in the Supply.  With 3 players, place 20 Curses in the Supply.  With 4 players, place 30 Curses in the Supply.  With 5 players, place 40 Curses in the Supply.  With 6 players, place 50 Curses in the Supply.", 
+  "name": "Curse", 
+  "potcost": 0, 
+  "types": [
+   "Curse"
+  ]
+ }, 
+ {
+  "cardset": "dominion", 
+  "cost": "2", 
+  "description": "1 <VP>", 
+  "extra": " Put 8 in the Supply in a game with two players.  Put 12 in the Supply in a game with three or more players.", 
+  "name": "Estate", 
+  "potcost": 0, 
+  "types": [
+   "Victory"
+  ]
+ }, 
+ {
+  "cardset": "dominion", 
+  "cost": "5", 
+  "description": "3 <VP>", 
+  "extra": " Put 8 in the Supply in a game with two players.  Put 12 in the Supply in a game with three or more players.", 
+  "name": "Duchy", 
+  "potcost": 0, 
+  "types": [
+   "Victory"
+  ]
+ }, 
+ {
+  "cardset": "dominion", 
+  "cost": "8", 
+  "description": "6 <VP>", 
+  "extra": " Put 8 in the Supply in a game with two players.  Put 12 in the Supply in a game with three or four players. Put 15 in the Supply in a game with five players.  Put 18 in the Supply in a game with six players.", 
+  "name": "Province", 
+  "potcost": 0, 
+  "types": [
+   "Victory"
+  ]
+ }, 
+ {
+  "cardset": "dominion", 
+  "cost": "0", 
+  "description": "Pile of trash.", 
+  "extra": "", 
+  "name": "Trash", 
+  "potcost": 0, 
+  "types": [
+   "Action"
+  ]
+ }, 
 {
  "cardset": "intrigue", 
  "cost": "2", 
@ -563,6 +651,94 @@
   "Victory"
  ]
 }, 
+ {
+  "cardset": "intrigue", 
+  "cost": "0", 
+  "description": "Worth 1 Coin.", 
+  "extra": " 60 cards per game.", 
+  "name": "Copper", 
+  "potcost": 0, 
+  "types": [
+   "Treasure"
+  ]
+ }, 
+ {
+  "cardset": "intrigue", 
+  "cost": "3", 
+  "description": "Worth 2 Coins.", 
+  "extra": " 40 cards per game.", 
+  "name": "Silver", 
+  "potcost": 0, 
+  "types": [
+   "Treasure"
+  ]
+ }, 
+ {
+  "cardset": "intrigue", 
+  "cost": "6", 
+  "description": "Worth 3 Coins.", 
+  "extra": " 30 cards per game.", 
+  "name": "Gold", 
+  "potcost": 0, 
+  "types": [
+   "Treasure"
+  ]
+ }, 
+ {
+  "cardset": "intrigue", 
+  "cost": "0", 
+  "description": "-1 <VP>", 
+  "extra": " Curses are an available pile in the Supply regardless of what other cards are in the Supply.  With 2 players, place 10 Curses in the Supply.  With 3 players, place 20 Curses in the Supply.  With 4 players, place 30 Curses in the Supply.  With 5 players, place 40 Curses in the Supply.  With 6 players, place 50 Curses in the Supply.", 
+  "name": "Curse", 
+  "potcost": 0, 
+  "types": [
+   "Curse"
+  ]
+ }, 
+ {
+  "cardset": "intrigue", 
+  "cost": "2", 
+  "description": "1 <VP>", 
+  "extra": " Put 8 in the Supply in a game with two players.  Put 12 in the Supply in a game with three or more players.", 
+  "name": "Estate", 
+  "potcost": 0, 
+  "types": [
+   "Victory"
+  ]
+ }, 
+ {
+  "cardset": "intrigue", 
+  "cost": "5", 
+  "description": "3 <VP>", 
+  "extra": " Put 8 in the Supply in a game with two players.  Put 12 in the Supply in a game with three or more players.", 
+  "name": "Duchy", 
+  "potcost": 0, 
+  "types": [
+   "Victory"
+  ]
+ }, 
+ {
+  "cardset": "intrigue", 
+  "cost": "8", 
+  "description": "6 <VP>", 
+  "extra": " Put 8 in the Supply in a game with two players.  Put 12 in the Supply in a game with three or four players. Put 15 in the Supply in a game with five players.  Put 18 in the Supply in a game with six players.", 
+  "name": "Province", 
+  "potcost": 0, 
+  "types": [
+   "Victory"
+  ]
+ }, 
+ {
+  "cardset": "intrigue", 
+  "cost": "0", 
+  "description": "Pile of trash.", 
+  "extra": "", 
+  "name": "Trash", 
+  "potcost": 0, 
+  "types": [
+   "Action"
+  ]
+ }, 
 {
  "cardset": "seaside", 
  "cost": "2", 
@ -1008,6 +1184,17 @@
   "Action"
  ]
 },
+ {
+  "cardset": "alchemy", 
+  "cost": "4", 
+  "description": "Worth 1 Potion.", 
+  "extra": " This is a basic Treasure card. It costs 4 Coins and produces Potion. It is not a Kingdom card.  After you choose 10 Kingdom cards for the Supply, if any of them have Potion in the cost, add the Potion pile to the Supply. Also add the Potion pile if you are using the promotional card Black Market, and the Black Market deck includes at least one card with Potion in the cost. If you don't have any cards with Potion in the cost in the Supply or the Black Market deck, do not use the Potion pile in this game. When you have a Potion pile, put all 16 Potions in it, no matter how many players there are. In games using this pile, if the pile becomes empty, that will count towards the game ending condition.", 
+  "name": "Potion", 
+  "potcost": 0, 
+  "types": [
+   "Treasure"
+  ]
+ },    
 {
  "cardset": "prosperity", 
  "cost": "3", 
@ -1286,6 +1473,28 @@
   "Action"
  ]
 },
+{
+  "cardset": "prosperity", 
+  "cost": "9", 
+  "description": "Worth 5 Coins.", 
+  "extra": " This is not a Kingdom card. You do not use it every game. It is a Treasure worth 5 coins.  If only Kingdom cards from Prosperity are being used this game, then the Platinum and Colony piles are added to the Basic cards in the Supply for the game. If a mix of Kingdom cards from Prosperity and other sets are being used, then the inclusion of Platinum and Colony in the Supply should be determined randomly, based on the proportion of Prosperity and non-Prosperity cards in use. For example, choose a random Kingdom card being used - such as the first card dealt out from the Randomizer deck [this is equivalent to rolling a d10 or choosing a card at random after all 10 have been selected] - and if it is from Prosperity, add Platinum and Colony to the Supply. Platinum and Colony are not Kingdom cards; when those are included, there are 10 Kingdom cards, plus Copper, Silver, Gold, Platinum, Estate, Duchy, Province, Colony, and Curse, in the Supply. Use 8 Colonies for a 2-player game, or 12 Colonies for a game with 3 or more players. [Use all 12 Platinum regardless of the number of players. Platinum and Colony are meant to be used together and both or neither should be used, not one or the other.]", 
+  "name": "Platinum", 
+  "potcost": 0, 
+  "types": [
+   "Treasure"
+  ]
+},
+ {
+  "cardset": "prosperity", 
+  "cost": "11", 
+  "description": "10 <VP>", 
+  "extra": " This is not a Kingdom card. You do not use it every game. It is a Victory card worth 10 VP.  If only Kingdom cards from Prosperity are being used this game, then the Platinum and Colony piles are added to the Basic cards in the Supply for the game. If a mix of Kingdom cards from Prosperity and other sets are being used, then the inclusion of Platinum and Colony in the Supply should be determined randomly, based on the proportion of Prosperity and non-Prosperity cards in use. For example, choose a random Kingdom card being used - such as the first card dealt out from the Randomizer deck [this is equivalent to rolling a d10 or choosing a card at random after all 10 have been selected] - and if it is from Prosperity, add Platinum and Colony to the Supply. Platinum and Colony are not Kingdom cards; when those are included, there are 10 Kingdom cards, plus Copper, Silver, Gold, Platinum, Estate, Duchy, Province, Colony, and Curse, in the Supply. Use 8 Colonies for a 2-player game, or 12 Colonies for a game with 3 or more players. [Use all 12 Platinum regardless of the number of players. Platinum and Colony are meant to be used together and both or neither should be used, not one or the other.]", 
+  "name": "Colony", 
+  "potcost": 0, 
+  "types": [
+   "Victory"
+  ]
+ }, 
 {
  "cardset": "promo", 
  "cost": "3", 
--- a/dominion_tabs.py
+++ b/dominion_tabs.py
@ -988,6 +988,17 @@ class DominionTabs:
        with codecs.open(language_mapping_filepath, 'r', 'utf-8') as mapping_file:
            DominionTabs.language_mapping = json.load(mapping_file)

+
+        if options.write_json:
+            fpath = os.path.join(self.filedir, "card_db", options.language, "cards.json")
+            with codecs.open(fpath, 'w', encoding='utf-8') as ofile:
+                json.dump(cards,
+                          ofile,
+                          cls=Card.CardJSONEncoder,
+                          ensure_ascii=False,
+                          indent=True,
+                          sort_keys=True)
+
        baseCards = [
            card.name for card in cards if card.cardset.lower() == 'base']

@ -1058,16 +1069,6 @@ class DominionTabs:
                    exp, exp, ("Expansion",), None, ' | '.join(sorted(names)))
                cards.append(c)

-        if options.write_json:
-            fpath = os.path.join(self.filedir, "card_db", options.language, "cards.json")
-            with codecs.open(fpath, 'w', encoding='utf-8') as ofile:
-                json.dump(cards,
-                          ofile,
-                          cls=Card.CardJSONEncoder,
-                          ensure_ascii=False,
-                          indent=True,
-                          sort_keys=True)
-
        # When sorting cards, want to always put "base" cards after all
        # kingdom cards, and order the base cards in a set order - the
        # order they are listed in the database (ie, all normal treasures