Merge branch 'master' of https://github.com/PokemonTCG/pokemon-tcg-data

PokemonTCG · Feb 3, 2018 · 76aedfa · 76aedfa
2 parents 1c24b62 + 6743056
commit 76aedfa
Show file tree

Hide file tree

Showing 86 changed files with 2,099 additions and 2,067 deletions.
diff --git a/json/cards/Aquapolis.json b/json/cards/Aquapolis.json
diff --git a/json/cards/Arceus.json b/json/cards/Arceus.json
@@ -298,7 +298,7 @@
         "cost": [
           "Free"
         ],
-        "convertedEnergyCost": 1,
+        "convertedEnergyCost": 0,
         "damage": "",
         "text": "Search your deck for up to 3 in any combination of Burmy and Wormadam, show them to your opponent, and put them into your hand. Shuffle your deck afterward."
       },
@@ -1394,7 +1394,7 @@
         "cost": [
           "Free"
         ],
-        "convertedEnergyCost": 1,
+        "convertedEnergyCost": 0,
         "damage": "",
         "text": "Look at the top 5 cards of your deck, choose 1 of them, and put it into your hand. Shuffle the other cards back into your deck."
       }
@@ -1777,7 +1777,7 @@
         "cost": [
           "Free"
         ],
-        "convertedEnergyCost": 1,
+        "convertedEnergyCost": 0,
         "damage": "",
         "text": "Search your deck for a card that evolves from 1 of your Pokémon and put it onto that Pokémon. (This counts as evolving that Pokémon.) If you do, put 1 damage counter on Spiritomb. Shuffle your deck afterward."
       },
@@ -5373,7 +5373,7 @@
         "cost": [
           "Free"
         ],
-        "convertedEnergyCost": 1,
+        "convertedEnergyCost": 0,
         "damage": "",
         "text": "If you have 6 Arceus in play and each of them is a different type, search your deck for up to 6 basic Energy cards. Attach each of those Energy cards to a different Pokémon you have in play. Shuffle your deck afterward."
       },
@@ -5585,4 +5585,4 @@
     "nationalPokedexNumber": 493,
     "imageUrlHiRes": "https://images.pokemontcg.io/pl4/AR9_hires.png"
   }
-]
+]
diff --git a/json/cards/BREAKthrough.json b/json/cards/BREAKthrough.json
@@ -6911,7 +6911,7 @@
     "set": "BREAKthrough",
     "setCode": "xy8",
     "text": [
-      "Choose which way this card faces before you play it. Any damage done by attacks from this ↓ player’s Grass, Fire, or Water Pokémon is reduced by 20 (before applying Weakness and Resistance).",
+      "Choose which way this card faces before you play it. Any damage done by attacks from this ↓ player's Grass, Fire, or Water Pokémon is reduced by 20 (before applying Weakness and Resistance).",
       "Choose which way this card faces before you play it. This ↓ player can't have more than 3 Benched Pokémon. (When this card comes into play, this ↓ player discards Benched Pokémon until he or she has 3 Pokémon on the Bench.)"
     ],
     "imageUrlHiRes": "https://images.pokemontcg.io/xy8/145_hires.png"
@@ -7591,4 +7591,4 @@
     "imageUrlHiRes": "https://images.pokemontcg.io/xy8/164_hires.png",
     "evolvesTo": "M Mewtwo-EX"
   }
-]
+]
diff --git a/json/cards/BW Black Star Promos.json b/json/cards/BW Black Star Promos.json
@@ -4644,7 +4644,7 @@
         "cost": [
           "Free"
         ],
-        "convertedEnergyCost": 1,
+        "convertedEnergyCost": 0,
         "damage": "",
         "text": "When a Pokémon-EX has been Knocked Out, your opponent takes 2 Prize cards."
       }
@@ -4888,4 +4888,4 @@
     "nationalPokedexNumber": 649,
     "imageUrlHiRes": "https://images.pokemontcg.io/bwp/BW101_hires.png"
   }
-]
+]