2308

Co-authored-by: Avior <git@avior.me>
2025-08-15 01:41:59 +00:00 · 2024-11-21 00:40:24 +01:00
1096 changed files with 1895 additions and 15765 deletions
--- a/.bruno/cards/multiple.bru
+++ b/.bruno/cards/multiple.bru
@@ -19,5 +19,5 @@ params:query {
 assert {
  res.status: eq 200
-  res.body.length: gt 85
+  res.body: length 85
 }
--- a/.bruno/fixes/567-invalid-data-returned-when-filtering-using-set.bru
+++ b/.bruno/fixes/567-invalid-data-returned-when-filtering-using-set.bru
@@ -17,5 +17,5 @@ params:query {
 assert {
  res.status: eq 200
-  res.body.length: gte 6
+  res.body.length: lt 0
 }
--- a/CODE_OF_CONDUCT.md
+++ b/CODE_OF_CONDUCT.md
@@ -6,8 +6,8 @@ We as members, contributors, and leaders pledge to make participation in our
 community a harassment-free experience for everyone, regardless of age, body
 size, visible or invisible disability, ethnicity, sex characteristics, gender
 identity and expression, level of experience, education, socio-economic status,
-nationality, personal appearance, race, caste, color, religion, or sexual
+nationality, personal appearance, race, religion, or sexual identity
-identity and orientation.
+and orientation.
 We pledge to act and interact in ways that contribute to an open, welcoming,
 diverse, inclusive, and healthy community.
@@ -22,17 +22,17 @@ community include:
 * Giving and gracefully accepting constructive feedback
 * Accepting responsibility and apologizing to those affected by our mistakes,
  and learning from the experience
-* Focusing on what is best not just for us as individuals, but for the overall
+* Focusing on what is best not just for us as individuals, but for the
-  community
+  overall community
 Examples of unacceptable behavior include:
-* The use of sexualized language or imagery, and sexual attention or advances of
+* The use of sexualized language or imagery, and sexual attention or
-  any kind
+  advances of any kind
 * Trolling, insulting or derogatory comments, and personal or political attacks
 * Public or private harassment
-* Publishing others' private information, such as a physical or email address,
+* Publishing others' private information, such as a physical or email
-  without their explicit permission
+  address, without their explicit permission
 * Other conduct which could reasonably be considered inappropriate in a
  professional setting
@@ -52,15 +52,15 @@ decisions when appropriate.
 This Code of Conduct applies within all community spaces, and also applies when
 an individual is officially representing the community in public spaces.
-Examples of representing our community include using an official email address,
+Examples of representing our community include using an official e-mail address,
 posting via an official social media account, or acting as an appointed
 representative at an online or offline event.
 ## Enforcement
 Instances of abusive, harassing, or otherwise unacceptable behavior may be
-reported to the community leaders responsible for enforcement at contact@tcgdex.net or
+reported to the community leaders responsible for enforcement at
-on Discord to Avior through the official server https://discord.gg/63mQvd3GVE.
+the `contact@tcgdex.net` email or on Discord to `Avior#3872`.
 All complaints will be reviewed and investigated promptly and fairly.
 All community leaders are obligated to respect the privacy and security of the
@@ -82,15 +82,15 @@ behavior was inappropriate. A public apology may be requested.
 ### 2. Warning
-**Community Impact**: A violation through a single incident or series of
+**Community Impact**: A violation through a single incident or series
-actions.
+of actions.
 **Consequence**: A warning with consequences for continued behavior. No
 interaction with the people involved, including unsolicited interaction with
 those enforcing the Code of Conduct, for a specified period of time. This
 includes avoiding interactions in community spaces as well as external channels
-like social media. Violating these terms may lead to a temporary or permanent
+like social media. Violating these terms may lead to a temporary or
-ban.
+permanent ban.
 ### 3. Temporary Ban
@@ -106,27 +106,23 @@ Violating these terms may lead to a permanent ban.
 ### 4. Permanent Ban
 **Community Impact**: Demonstrating a pattern of violation of community
-standards, including sustained inappropriate behavior, harassment of an
+standards, including sustained inappropriate behavior,  harassment of an
 individual, or aggression toward or disparagement of classes of individuals.
-**Consequence**: A permanent ban from any sort of public interaction within the
+**Consequence**: A permanent ban from any sort of public interaction within
-community.
+the community.
 ## Attribution
 This Code of Conduct is adapted from the [Contributor Covenant][homepage],
-version 2.1, available at
+version 2.0, available at
-[https://www.contributor-covenant.org/version/2/1/code_of_conduct.html][v2.1].
+https://www.contributor-covenant.org/version/2/0/code_of_conduct.html.
-Community Impact Guidelines were inspired by
+Community Impact Guidelines were inspired by [Mozilla's code of conduct
-[Mozilla's code of conduct enforcement ladder][Mozilla CoC].
+enforcement ladder](https://github.com/mozilla/diversity).
 For answers to common questions about this code of conduct, see the FAQ at
 [https://www.contributor-covenant.org/faq][FAQ]. Translations are available at
 [https://www.contributor-covenant.org/translations][translations].
 [homepage]: https://www.contributor-covenant.org
-[v2.1]: https://www.contributor-covenant.org/version/2/1/code_of_conduct.html
+
-[Mozilla CoC]: https://github.com/mozilla/diversity
+For answers to common questions about this code of conduct, see the FAQ at
-[FAQ]: https://www.contributor-covenant.org/faq
+https://www.contributor-covenant.org/faq. Translations are available at
-[translations]: https://www.contributor-covenant.org/translations
+https://www.contributor-covenant.org/translations.
--- a/Pocket/Genetic
+++ b/Pocket/Genetic
@@ -8,7 +8,6 @@ const card: Card = {
 		en: "Bulbasaur"
 	},
 	illustrator: "Narumi Sato",
 	category: "Pokemon",
 	hp: 70,
 	types: ["Grass"],
--- a/Pocket/Genetic
+++ b/Pocket/Genetic
@@ -8,7 +8,6 @@ const card: Card = {
 		en: "Ivysaur"
 	},
 	illustrator: "Kurata So",
 	category: "Pokemon",
 	hp: 90,
 	types: ["Grass"],
--- a/Pocket/Genetic
+++ b/Pocket/Genetic
@@ -8,7 +8,6 @@ const card: Card = {
 		en: "Venusaur"
 	},
 	illustrator: "Ryota Murayama",
 	category: "Pokemon",
 	hp: 160,
 	types: ["Grass"],
--- a/Pocket/Genetic
+++ b/Pocket/Genetic
@@ -8,7 +8,6 @@ const card: Card = {
 		en: "Venusaur ex"
 	},
 	illustrator: "PLANETA CG Works",
 	category: "Pokemon",
 	hp: 190,
 	types: ["Grass"],
--- a/Pocket/Genetic
+++ b/Pocket/Genetic
@@ -8,7 +8,6 @@ const card: Card = {
 		en: "Caterpie"
 	},
 	illustrator: "Miki Tanaka",
 	category: "Pokemon",
 	hp: 50,
 	types: ["Grass"],
@@ -27,7 +26,7 @@ const card: Card = {
 	}],
 	retreat: 1,
-	rarity: "One Diamond"
+	rarity: "None"
 }
-export default card
+export default card
--- a/Pocket/Genetic
+++ b/Pocket/Genetic
@@ -8,7 +8,6 @@ const card: Card = {
 		en: "Metapod"
 	},
 	illustrator: "Yuka Morii",
 	category: "Pokemon",
 	hp: 80,
 	types: ["Grass"],
@@ -25,7 +24,7 @@ const card: Card = {
 	}],
 	retreat: 2,
-	rarity: "One Diamond"
+	rarity: "None"
 }
-export default card
+export default card
--- a/Pocket/Genetic
+++ b/Pocket/Genetic
@@ -8,7 +8,6 @@ const card: Card = {
 		en: "Butterfree"
 	},
 	illustrator: "Shin Nagasawa",
 	category: "Pokemon",
 	hp: 120,
 	types: ["Grass"],
@@ -37,7 +36,7 @@ const card: Card = {
 	}],
 	retreat: 1,
-	rarity: "Three Diamond"
+	rarity: "None"
 }
-export default card
+export default card
--- a/Pocket/Genetic
+++ b/Pocket/Genetic
@@ -8,7 +8,6 @@ const card: Card = {
 		en: "Weedle"
 	},
 	illustrator: "Hajime Kusajima",
 	category: "Pokemon",
 	hp: 50,
 	types: ["Grass"],
@@ -25,7 +24,7 @@ const card: Card = {
 	}],
 	retreat: 1,
-	rarity: "One Diamond"
+	rarity: "None"
 }
-export default card
+export default card
--- a/Pocket/Genetic
+++ b/Pocket/Genetic
@@ -8,7 +8,6 @@ const card: Card = {
 		en: "Kakuna"
 	},
 	illustrator: "miki kudo",
 	category: "Pokemon",
 	hp: 80,
 	types: ["Grass"],
@@ -25,7 +24,7 @@ const card: Card = {
 	}],
 	retreat: 2,
-	rarity: "One Diamond"
+	rarity: "None"
 }
-export default card
+export default card
--- a/Pocket/Genetic
+++ b/Pocket/Genetic
@@ -8,7 +8,6 @@ const card: Card = {
 		en: "Beedrill"
 	},
 	illustrator: "You Iribi",
 	category: "Pokemon",
 	hp: 120,
 	types: ["Grass"],
@@ -25,7 +24,7 @@ const card: Card = {
 	}],
 	retreat: 1,
-	rarity: "Three Diamond"
+	rarity: "None"
 }
-export default card
+export default card
--- a/Pocket/Genetic
+++ b/Pocket/Genetic
@@ -8,7 +8,6 @@ const card: Card = {
 		en: "Oddish"
 	},
 	illustrator: "HYOGONOSUKE",
 	category: "Pokemon",
 	hp: 60,
 	types: ["Grass"],
@@ -25,7 +24,7 @@ const card: Card = {
 	}],
 	retreat: 1,
-	rarity: "One Diamond"
+	rarity: "None"
 }
-export default card
+export default card
--- a/Pocket/Genetic
+++ b/Pocket/Genetic
@@ -8,7 +8,6 @@ const card: Card = {
 		en: "Gloom"
 	},
 	illustrator: "Anesaki Dynamic",
 	category: "Pokemon",
 	hp: 80,
 	types: ["Grass"],
@@ -25,7 +24,7 @@ const card: Card = {
 	}],
 	retreat: 2,
-	rarity: "Two Diamond"
+	rarity: "None"
 }
-export default card
+export default card
--- a/Pocket/Genetic
+++ b/Pocket/Genetic
@@ -8,7 +8,6 @@ const card: Card = {
 		en: "Vileplume"
 	},
 	illustrator: "Kyoko Umemoto",
 	category: "Pokemon",
 	hp: 140,
 	types: ["Grass"],
@@ -29,7 +28,7 @@ const card: Card = {
 	}],
 	retreat: 3,
-	rarity: "Three Diamond"
+	rarity: "None"
 }
-export default card
+export default card
--- a/Pocket/Genetic
+++ b/Pocket/Genetic
@@ -8,7 +8,6 @@ const card: Card = {
 		en: "Paras"
 	},
 	illustrator: "Naoyo Kimura",
 	category: "Pokemon",
 	hp: 70,
 	types: ["Fire"],
@@ -25,7 +24,7 @@ const card: Card = {
 	}],
 	retreat: 1,
-	rarity: "One Diamond"
+	rarity: "None"
 }
-export default card
+export default card
--- a/Pocket/Genetic
+++ b/Pocket/Genetic
@@ -5,27 +5,26 @@ const card: Card = {
 	set: Set,
 	name: {
-		en: "Parasect"
+		en: "Venonat"
 	},
 	illustrator: "Eri Yamaki",
 	category: "Pokemon",
-	hp: 120,
+	hp: 50,
 	types: ["Grass"],
-	stage: "Stage1",
+	stage: "Basic",
 	attacks: [{
-		cost: ["Grass", "Grass", "Colorless"],
+		cost: ["Grass"],
 		name: {
-			en: "Slash"
+			en: "Tackle"
 		},
-		damage: "80"
+		damage: "20"
 	}],
-	retreat: 2,
+	retreat: 1,
-	rarity: "Two Diamond"
+	rarity: "None"
 }
-export default card
+export default card
--- a/Pocket/Genetic
+++ b/Pocket/Genetic
@@ -1,31 +0,0 @@
 import { Card } from "../../../interfaces"
 import Set from "../Genetic Apex"
 const card: Card = {
 	set: Set,
 	name: {
 		en: "Venonat"
 	},
 	illustrator: "HYOGONOSUKE",
 	category: "Pokemon",
 	hp: 50,
 	types: ["Grass"],
 	stage: "Basic",
 	attacks: [{
 		cost: ["Grass"],
 		name: {
 			en: "Tackle"
 		},
 		damage: "20"
 	}],
 	retreat: 1,
 	rarity: "One Diamond"
 }
 export default card
--- a/Pocket/Genetic
+++ b/Pocket/Genetic
@@ -8,7 +8,6 @@ const card: Card = {
 		en: "Venomoth"
 	},
 	illustrator: "Mina Nakai",
 	category: "Pokemon",
 	hp: 80,
 	types: ["Grass"],
@@ -29,7 +28,7 @@ const card: Card = {
 	}],
 	retreat: 1,
-	rarity: "Two Diamond"
+	rarity: "None"
 }
-export default card
+export default card
--- a/Pocket/Genetic
+++ b/Pocket/Genetic
@@ -8,7 +8,6 @@ const card: Card = {
 		en: "Bellsprout"
 	},
 	illustrator: "HYOGONOSUKE",
 	category: "Pokemon",
 	hp: 60,
 	types: ["Grass"],
@@ -25,7 +24,7 @@ const card: Card = {
 	}],
 	retreat: 1,
-	rarity: "One Diamond"
+	rarity: "None"
 }
-export default card
+export default card
--- a/Pocket/Genetic
+++ b/Pocket/Genetic
@@ -8,7 +8,6 @@ const card: Card = {
 		en: "Weepinbell"
 	},
 	illustrator: "Miki Tanaka",
 	category: "Pokemon",
 	hp: 90,
 	types: ["Grass"],
@@ -25,7 +24,7 @@ const card: Card = {
 	}],
 	retreat: 2,
-	rarity: "Two Diamond"
+	rarity: "None"
 }
-export default card
+export default card
--- a/Pocket/Genetic
+++ b/Pocket/Genetic
@@ -8,7 +8,6 @@ const card: Card = {
 		en: "Victreebel"
 	},
 	illustrator: "Sumiyoshi Kizuki",
 	category: "Pokemon",
 	hp: 140,
 	types: ["Grass"],
@@ -37,7 +36,7 @@ const card: Card = {
 	}],
 	retreat: 2,
-	rarity: "Three Diamond"
+	rarity: "None"
 }
-export default card
+export default card
--- a/Pocket/Genetic
+++ b/Pocket/Genetic
@@ -8,7 +8,6 @@ const card: Card = {
 		en: "Exeggcute"
 	},
 	illustrator: "kawayoo",
 	category: "Pokemon",
 	hp: 50,
 	types: ["Grass"],
@@ -25,7 +24,7 @@ const card: Card = {
 	}],
 	retreat: 1,
-	rarity: "One Diamond"
+	rarity: "None"
 }
-export default card
+export default card
--- a/Pocket/Genetic
+++ b/Pocket/Genetic
@@ -8,7 +8,6 @@ const card: Card = {
 		en: "Exeggutor"
 	},
 	illustrator: "Yukiko Baba",
 	category: "Pokemon",
 	hp: 160,
 	types: ["Grass"],
@@ -22,14 +21,14 @@ const card: Card = {
 		},
 		effect: {
-			en: "Flip a coin. If heads, this attack does 30 more damage."
+			en: "Flip a coin. If heads, this attack does 20 more damage."
 		},
 		damage: "30+"
 	}],
 	retreat: 3,
-	rarity: "Three Diamond"
+	rarity: "None"
 }
-export default card
+export default card
--- a/Pocket/Genetic
+++ b/Pocket/Genetic
@@ -8,27 +8,13 @@ const card: Card = {
 		en: "Exeggutor ex"
 	},
 	illustrator: "PLANETA CG Works",
 	category: "Pokemon",
 	hp: 160,
 	types: ["Grass"],
 	stage: "Stage1",
 	attacks: [{
 		cost: ["Grass"],
 		name: {
 			en: "Stomp"
 		},
 		effect: {
 			en: "Flip a coin. If heads, this attack does 40 more damage."
 		},
 		damage: "40+"
 	}],
 	suffix: "EX",
 	retreat: 3,
-	rarity: "Four Diamond"
+	rarity: "None"
 }
-export default card
+export default card
--- a/Pocket/Genetic
+++ b/Pocket/Genetic
@@ -8,7 +8,6 @@ const card: Card = {
 		en: "Tangela"
 	},
 	illustrator: "Midori Harada",
 	category: "Pokemon",
 	hp: 80,
 	types: ["Grass"],
@@ -29,7 +28,7 @@ const card: Card = {
 	}],
 	retreat: 2,
-	rarity: "One Diamond"
+	rarity: "None"
 }
-export default card
+export default card
--- a/Pocket/Genetic
+++ b/Pocket/Genetic
@@ -8,7 +8,6 @@ const card: Card = {
 		en: "Scyther"
 	},
 	illustrator: "Hasuno",
 	category: "Pokemon",
 	hp: 70,
 	types: ["Grass"],
@@ -25,7 +24,7 @@ const card: Card = {
 	}],
 	retreat: 1,
-	rarity: "One Diamond"
+	rarity: "None"
 }
-export default card
+export default card
--- a/Pocket/Genetic
+++ b/Pocket/Genetic
@@ -8,7 +8,6 @@ const card: Card = {
 		en: "Pinsir"
 	},
 	illustrator: "Eri Yamaki",
 	category: "Pokemon",
 	hp: 90,
 	types: ["Grass"],
@@ -29,7 +28,7 @@ const card: Card = {
 	}],
 	retreat: 2,
-	rarity: "Two Diamond"
+	rarity: "None"
 }
-export default card
+export default card
--- a/Pocket/Genetic
+++ b/Pocket/Genetic
@@ -8,7 +8,6 @@ const card: Card = {
 		en: "Cottonee"
 	},
 	illustrator: "Kanako Eo",
 	category: "Pokemon",
 	hp: 50,
 	types: ["Grass"],
@@ -25,7 +24,7 @@ const card: Card = {
 	}],
 	retreat: 1,
-	rarity: "One Diamond"
+	rarity: "None"
 }
-export default card
+export default card
--- a/Pocket/Genetic
+++ b/Pocket/Genetic
@@ -8,7 +8,6 @@ const card: Card = {
 		en: "Whimsicott"
 	},
 	illustrator: "Atsuko Nishida",
 	category: "Pokemon",
 	hp: 80,
 	types: ["Grass"],
@@ -25,7 +24,7 @@ const card: Card = {
 	}],
 	retreat: 1,
-	rarity: "Two Diamond"
+	rarity: "None"
 }
-export default card
+export default card
--- a/Pocket/Genetic
+++ b/Pocket/Genetic
@@ -8,7 +8,6 @@ const card: Card = {
 		en: "Petilil"
 	},
 	illustrator: "Naoyo Kimura",
 	category: "Pokemon",
 	hp: 60,
 	types: ["Grass"],
@@ -29,7 +28,7 @@ const card: Card = {
 	}],
 	retreat: 1,
-	rarity: "One Diamond"
+	rarity: "None"
 }
-export default card
+export default card
--- a/Pocket/Genetic
+++ b/Pocket/Genetic
@@ -8,7 +8,6 @@ const card: Card = {
 		en: "Lilligant"
 	},
 	illustrator: "You Iribi",
 	category: "Pokemon",
 	hp: 100,
 	types: ["Grass"],
@@ -29,7 +28,7 @@ const card: Card = {
 	}],
 	retreat: 1,
-	rarity: "Two Diamond"
+	rarity: "None"
 }
-export default card
+export default card
--- a/Pocket/Genetic
+++ b/Pocket/Genetic
@@ -8,7 +8,6 @@ const card: Card = {
 		en: "Skiddo"
 	},
 	illustrator: "Naoki Saito",
 	category: "Pokemon",
 	hp: 70,
 	types: ["Grass"],
@@ -29,7 +28,7 @@ const card: Card = {
 	}],
 	retreat: 1,
-	rarity: "One Diamond"
+	rarity: "None"
 }
-export default card
+export default card
--- a/Pocket/Genetic
+++ b/Pocket/Genetic
@@ -8,7 +8,6 @@ const card: Card = {
 		en: "Gogoat"
 	},
 	illustrator: "You Iribi",
 	category: "Pokemon",
 	hp: 120,
 	stage: "Stage1",
@@ -24,7 +23,7 @@ const card: Card = {
 	}],
 	retreat: 2,
-	rarity: "One Diamond"
+	rarity: "None"
 }
-export default card
+export default card
--- a/Pocket/Genetic
+++ b/Pocket/Genetic
@@ -8,7 +8,6 @@ const card: Card = {
 		en: "Charmander"
 	},
 	illustrator: "Teeziro",
 	category: "Pokemon",
 	hp: 60,
 	types: ["Fire"],
@@ -29,7 +28,7 @@ const card: Card = {
 	}],
 	retreat: 1,
-	rarity: "One Diamond"
+	rarity: "None"
 }
-export default card
+export default card
--- a/Pocket/Genetic
+++ b/Pocket/Genetic
@@ -8,7 +8,6 @@ const card: Card = {
 		en: "Charmeleon"
 	},
 	illustrator: "kantaro",
 	category: "Pokemon",
 	hp: 90,
 	types: ["Fire"],
@@ -25,7 +24,7 @@ const card: Card = {
 	}],
 	retreat: 2,
-	rarity: "Two Diamond"
+	rarity: "None"
 }
-export default card
+export default card
--- a/Pocket/Genetic
+++ b/Pocket/Genetic
@@ -8,7 +8,6 @@ const card: Card = {
 		en: "Charizard"
 	},
 	illustrator: "takuyoa",
 	category: "Pokemon",
 	hp: 150,
 	types: ["Fire"],
@@ -29,7 +28,7 @@ const card: Card = {
 	}],
 	retreat: 2,
-	rarity: "Three Diamond"
+	rarity: "None"
 }
-export default card
+export default card
--- a/Pocket/Genetic
+++ b/Pocket/Genetic
@@ -8,7 +8,6 @@ const card: Card = {
 		en: "Charizard ex"
 	},
 	illustrator: "PLANETA Mochizuki",
 	category: "Pokemon",
 	hp: 180,
 	types: ["Fire"],
@@ -38,7 +37,7 @@ const card: Card = {
 	}],
 	retreat: 2,
-	rarity: "Four Diamond"
+	rarity: "None"
 }
-export default card
+export default card
--- a/Pocket/Genetic
+++ b/Pocket/Genetic
@@ -8,7 +8,6 @@ const card: Card = {
 		en: "Vulpix"
 	},
 	illustrator: "Toshinao Aoki",
 	category: "Pokemon",
 	hp: 50,
 	types: ["Fire"],
@@ -27,7 +26,7 @@ const card: Card = {
 	}],
 	retreat: 1,
-	rarity: "One Diamond"
+	rarity: "None"
 }
-export default card
+export default card
--- a/Pocket/Genetic
+++ b/Pocket/Genetic
@@ -8,7 +8,6 @@ const card: Card = {
 		en: "Ninetales"
 	},
 	illustrator: "You Iribi",
 	category: "Pokemon",
 	hp: 90,
 	types: ["Fire"],
@@ -29,7 +28,7 @@ const card: Card = {
 	}],
 	retreat: 1,
-	rarity: "Two Diamond"
+	rarity: "None"
 }
-export default card
+export default card
--- a/Pocket/Genetic
+++ b/Pocket/Genetic
@@ -8,7 +8,6 @@ const card: Card = {
 		en: "Growlithe"
 	},
 	illustrator: "Mizue",
 	category: "Pokemon",
 	hp: 70,
 	types: ["Fire"],
@@ -25,7 +24,7 @@ const card: Card = {
 	}],
 	retreat: 1,
-	rarity: "One Diamond"
+	rarity: "None"
 }
-export default card
+export default card
--- a/Pocket/Genetic
+++ b/Pocket/Genetic
@@ -8,7 +8,6 @@ const card: Card = {
 		en: "Arcanine"
 	},
 	illustrator: "kodama",
 	category: "Pokemon",
 	hp: 150,
 	types: ["Fire"],
@@ -29,7 +28,7 @@ const card: Card = {
 	}],
 	retreat: 2,
-	rarity: "Three Diamond"
+	rarity: "None"
 }
-export default card
+export default card
--- a/Pocket/Genetic
+++ b/Pocket/Genetic
@@ -8,7 +8,6 @@ const card: Card = {
 		en: "Arcanine ex"
 	},
 	illustrator: "PLANETA Saito",
 	category: "Pokemon",
 	hp: 150,
 	types: ["Fire"],
@@ -30,7 +29,7 @@ const card: Card = {
 	}],
 	retreat: 2,
-	rarity: "Four Diamond"
+	rarity: "None"
 }
-export default card
+export default card
--- a/Pocket/Genetic
+++ b/Pocket/Genetic
@@ -8,7 +8,6 @@ const card: Card = {
 		en: "Ponyta"
 	},
 	illustrator: "Uta",
 	category: "Pokemon",
 	hp: 60,
 	types: ["Fire"],
@@ -25,7 +24,7 @@ const card: Card = {
 	}],
 	retreat: 1,
-	rarity: "One Diamond"
+	rarity: "None"
 }
-export default card
+export default card
--- a/Pocket/Genetic
+++ b/Pocket/Genetic
@@ -8,7 +8,6 @@ const card: Card = {
 		en: "Rapidash"
 	},
 	illustrator: "Misa Tsutsui",
 	category: "Pokemon",
 	hp: 100,
 	types: ["Fire"],
@@ -25,7 +24,7 @@ const card: Card = {
 	}],
 	retreat: 1,
-	rarity: "Two Diamond"
+	rarity: "None"
 }
-export default card
+export default card
--- a/Pocket/Genetic
+++ b/Pocket/Genetic
@@ -8,7 +8,6 @@ const card: Card = {
 		en: "Magmar"
 	},
 	illustrator: "Ryuta Fuse",
 	category: "Pokemon",
 	hp: 80,
 	types: ["Fire"],
@@ -25,7 +24,7 @@ const card: Card = {
 	}],
 	retreat: 2,
-	rarity: "One Diamond"
+	rarity: "None"
 }
-export default card
+export default card
--- a/Pocket/Genetic
+++ b/Pocket/Genetic
@@ -8,7 +8,6 @@ const card: Card = {
 		en: "Flareon"
 	},
 	illustrator: "sui",
 	category: "Pokemon",
 	hp: 120,
 	types: ["Fire"],
@@ -29,7 +28,7 @@ const card: Card = {
 	}],
 	retreat: 2,
-	rarity: "Three Diamond"
+	rarity: "None"
 }
-export default card
+export default card
--- a/Pocket/Genetic
+++ b/Pocket/Genetic
@@ -8,7 +8,6 @@ const card: Card = {
 		en: "Moltres"
 	},
 	illustrator: "Hitoshi Ariga",
 	category: "Pokemon",
 	hp: 100,
 	types: ["Fire"],
@@ -29,7 +28,7 @@ const card: Card = {
 	}],
 	retreat: 1,
-	rarity: "Three Diamond"
+	rarity: "None"
 }
-export default card
+export default card
--- a/Pocket/Genetic
+++ b/Pocket/Genetic
@@ -8,7 +8,6 @@ const card: Card = {
 		en: "Moltres ex"
 	},
 	illustrator: "PLANETA Tsuji",
 	category: "Pokemon",
 	hp: 140,
 	types: ["Fire"],
@@ -36,7 +35,7 @@ const card: Card = {
 	}],
 	retreat: 2,
-	rarity: "Four Diamond"
+	rarity: "None"
 }
-export default card
+export default card
--- a/Pocket/Genetic
+++ b/Pocket/Genetic
@@ -8,7 +8,6 @@ const card: Card = {
 		en: "Heatmor"
 	},
 	illustrator: "Suwama Chiaki",
 	category: "Pokemon",
 	hp: 80,
 	types: ["Fire"],
@@ -25,7 +24,7 @@ const card: Card = {
 	}],
 	retreat: 1,
-	rarity: "One Diamond"
+	rarity: "None"
 }
-export default card
+export default card
--- a/Pocket/Genetic
+++ b/Pocket/Genetic
@@ -8,7 +8,6 @@ const card: Card = {
 		en: "Salandit"
 	},
 	illustrator: "Kyoko Umemoto",
 	category: "Pokemon",
 	hp: 60,
 	types: ["Fire"],
@@ -25,7 +24,7 @@ const card: Card = {
 	}],
 	retreat: 1,
-	rarity: "One Diamond"
+	rarity: "None"
 }
-export default card
+export default card
--- a/Pocket/Genetic
+++ b/Pocket/Genetic
@@ -8,7 +8,6 @@ const card: Card = {
 		en: "Salazzle"
 	},
 	illustrator: "hatachu",
 	category: "Pokemon",
 	hp: 90,
 	types: ["Fire"],
@@ -25,7 +24,7 @@ const card: Card = {
 	}],
 	retreat: 1,
-	rarity: "One Diamond"
+	rarity: "None"
 }
-export default card
+export default card
--- a/Pocket/Genetic
+++ b/Pocket/Genetic
@@ -8,7 +8,6 @@ const card: Card = {
 		en: "Sizzlipede"
 	},
 	illustrator: "Teeziro",
 	category: "Pokemon",
 	hp: 60,
 	types: ["Fire"],
@@ -25,7 +24,7 @@ const card: Card = {
 	}],
 	retreat: 1,
-	rarity: "One Diamond"
+	rarity: "None"
 }
-export default card
+export default card
--- a/Pocket/Genetic
+++ b/Pocket/Genetic
@@ -8,7 +8,6 @@ const card: Card = {
 		en: "Centiskorch"
 	},
 	illustrator: "GOSSAN",
 	category: "Pokemon",
 	hp: 130,
 	types: ["Fire"],
@@ -29,7 +28,7 @@ const card: Card = {
 	}],
 	retreat: 3,
-	rarity: "Two Diamond"
+	rarity: "None"
 }
-export default card
+export default card
--- a/Pocket/Genetic
+++ b/Pocket/Genetic
@@ -1,31 +0,0 @@
 import { Card } from "../../../interfaces"
 import Set from "../Genetic Apex"
 const card: Card = {
 	set: Set,
 	name: {
 		en: "Squirtle"
 	},
 	illustrator: "Mizue",
 	category: "Pokemon",
 	hp: 60,
 	types: ["Water"],
 	stage: "Basic",
 	attacks: [{
 		cost: ["Water"],
 		name: {
 			en: "Water Gun"
 		},
 		damage: "20"
 	}],
 	retreat: 1,
 	rarity: "One Diamond"
 }
 export default card
--- a/Pocket/Genetic
+++ b/Pocket/Genetic
@@ -8,7 +8,6 @@ const card: Card = {
 		en: "Wartortle"
 	},
 	illustrator: "Nelnal",
 	category: "Pokemon",
 	hp: 80,
 	types: ["Water"],
@@ -25,7 +24,7 @@ const card: Card = {
 	}],
 	retreat: 1,
-	rarity: "Two Diamond"
+	rarity: "None"
 }
-export default card
+export default card
--- a/Pocket/Genetic
+++ b/Pocket/Genetic
@@ -8,7 +8,6 @@ const card: Card = {
 		en: "Blastoise"
 	},
 	illustrator: "Nurikabe",
 	category: "Pokemon",
 	hp: 150,
 	types: ["Water"],
@@ -29,7 +28,7 @@ const card: Card = {
 	}],
 	retreat: 3,
-	rarity: "Three Diamond"
+	rarity: "None"
 }
-export default card
+export default card
--- a/Pocket/Genetic
+++ b/Pocket/Genetic
@@ -8,7 +8,6 @@ const card: Card = {
 		en: "Blastoise ex"
 	},
 	illustrator: "PLANETA Tsuji",
 	category: "Pokemon",
 	hp: 180,
 	types: ["Water"],
@@ -38,7 +37,7 @@ const card: Card = {
 	}],
 	retreat: 3,
-	rarity: "Four Diamond"
+	rarity: "None"
 }
-export default card
+export default card
--- a/Pocket/Genetic
+++ b/Pocket/Genetic
@@ -8,7 +8,6 @@ const card: Card = {
 		en: "Psyduck"
 	},
 	illustrator: "Shibuzoh.",
 	category: "Pokemon",
 	hp: 60,
 	types: ["Water"],
@@ -29,7 +28,7 @@ const card: Card = {
 	}],
 	retreat: 1,
-	rarity: "One Diamond"
+	rarity: "None"
 }
-export default card
+export default card
--- a/Pocket/Genetic
+++ b/Pocket/Genetic
@@ -8,7 +8,6 @@ const card: Card = {
 		en: "Golduck"
 	},
 	illustrator: "Naoki Saito",
 	category: "Pokemon",
 	hp: 90,
 	types: ["Water"],
@@ -25,7 +24,7 @@ const card: Card = {
 	}],
 	retreat: 1,
-	rarity: "Two Diamond"
+	rarity: "None"
 }
-export default card
+export default card
--- a/Pocket/Genetic
+++ b/Pocket/Genetic
@@ -8,7 +8,6 @@ const card: Card = {
 		en: "Poliwag"
 	},
 	illustrator: "Shibuzoh.",
 	category: "Pokemon",
 	hp: 60,
 	types: ["Water"],
@@ -25,7 +24,7 @@ const card: Card = {
 	}],
 	retreat: 1,
-	rarity: "One Diamond"
+	rarity: "None"
 }
-export default card
+export default card
--- a/Pocket/Genetic
+++ b/Pocket/Genetic
@@ -8,7 +8,6 @@ const card: Card = {
 		en: "Poliwhirl"
 	},
 	illustrator: "Yuka Morii",
 	category: "Pokemon",
 	hp: 90,
 	types: ["Water"],
@@ -25,7 +24,7 @@ const card: Card = {
 	}],
 	retreat: 2,
-	rarity: "Two Diamond"
+	rarity: "None"
 }
-export default card
+export default card
--- a/Pocket/Genetic
+++ b/Pocket/Genetic
@@ -5,39 +5,26 @@ const card: Card = {
 	set: Set,
 	name: {
-		en: "Poliwrath"
+		en: "Tentacool"
 	},
 	illustrator: "Akira Komayama",
 	category: "Pokemon",
-	hp: 150,
+	hp: 60,
 	types: ["Water"],
-	stage: "Stage2",
+	stage: "Basic",
 	abilities: [{
 		type: "Ability",
 		name: {
 			en: "Counterattack"
 		},
 		effect: {
 			en: "If this Pokémon is in the Active Spot and is damaged by an attack from your opponent's Pokémon, do 20 damage to the Attacking Pokémon."
 		}
 	}],
 	attacks: [{
-		cost: ["Water", "Colorless", "Colorless"],
+		cost: ["Water"],
 		name: {
-			en: "Mega Punch"
+			en: "Gentle Slap"
 		},
-		damage: "80"
+		damage: "20"
 	}],
-	retreat: 2,
+	retreat: 1,
-	rarity: "Three Diamond"
+	rarity: "None"
 }
-export default card
+export default card
--- a/Pocket/Genetic
+++ b/Pocket/Genetic
@@ -1,31 +0,0 @@
 import { Card } from "../../../interfaces"
 import Set from "../Genetic Apex"
 const card: Card = {
 	set: Set,
 	name: {
 		en: "Tentacool"
 	},
 	illustrator: "Shinya Komatsu",
 	category: "Pokemon",
 	hp: 60,
 	types: ["Water"],
 	stage: "Basic",
 	attacks: [{
 		cost: ["Water"],
 		name: {
 			en: "Gentle Slap"
 		},
 		damage: "20"
 	}],
 	retreat: 1,
 	rarity: "One Diamond"
 }
 export default card
--- a/Pocket/Genetic
+++ b/Pocket/Genetic
@@ -8,7 +8,6 @@ const card: Card = {
 		en: "Tentacruel"
 	},
 	illustrator: "kodama",
 	category: "Pokemon",
 	hp: 110,
 	types: ["Water"],
@@ -29,7 +28,7 @@ const card: Card = {
 	}],
 	retreat: 2,
-	rarity: "Two Diamond"
+	rarity: "None"
 }
-export default card
+export default card
--- a/Pocket/Genetic
+++ b/Pocket/Genetic
@@ -8,7 +8,6 @@ const card: Card = {
 		en: "Seel"
 	},
 	illustrator: "Masako Yamashita",
 	category: "Pokemon",
 	hp: 80,
 	types: ["Water"],
@@ -25,7 +24,7 @@ const card: Card = {
 	}],
 	retreat: 2,
-	rarity: "One Diamond"
+	rarity: "None"
 }
-export default card
+export default card
--- a/Pocket/Genetic
+++ b/Pocket/Genetic
@@ -8,7 +8,6 @@ const card: Card = {
 		en: "Dewgong"
 	},
 	illustrator: "Kanako Eo",
 	category: "Pokemon",
 	hp: 120,
 	types: ["Water"],
@@ -25,7 +24,7 @@ const card: Card = {
 	}],
 	retreat: 3,
-	rarity: "Two Diamond"
+	rarity: "None"
 }
-export default card
+export default card
--- a/Pocket/Genetic
+++ b/Pocket/Genetic
@@ -8,7 +8,6 @@ const card: Card = {
 		en: "Shellder"
 	},
 	illustrator: "Sumiyoshi Kizuki",
 	category: "Pokemon",
 	hp: 60,
 	types: ["Water"],
@@ -25,7 +24,7 @@ const card: Card = {
 	}],
 	retreat: 1,
-	rarity: "One Diamond"
+	rarity: "None"
 }
-export default card
+export default card
--- a/Pocket/Genetic
+++ b/Pocket/Genetic
@@ -8,7 +8,6 @@ const card: Card = {
 		en: "Cloyster"
 	},
 	illustrator: "Saya Tsuruta",
 	category: "Pokemon",
 	hp: 120,
 	types: ["Water"],
@@ -37,7 +36,7 @@ const card: Card = {
 	}],
 	retreat: 3,
-	rarity: "Two Diamond"
+	rarity: "None"
 }
-export default card
+export default card
--- a/Pocket/Genetic
+++ b/Pocket/Genetic
@@ -8,7 +8,6 @@ const card: Card = {
 		en: "Krabby"
 	},
 	illustrator: "Tomokazu Komiya",
 	category: "Pokemon",
 	hp: 70,
 	types: ["Water"],
@@ -25,7 +24,7 @@ const card: Card = {
 	}],
 	retreat: 2,
-	rarity: "One Diamond"
+	rarity: "None"
 }
-export default card
+export default card
--- a/Pocket/Genetic
+++ b/Pocket/Genetic
@@ -8,7 +8,6 @@ const card: Card = {
 		en: "Kingler"
 	},
 	illustrator: "Shigenori Negishi",
 	category: "Pokemon",
 	hp: 120,
 	types: ["Water"],
@@ -29,7 +28,7 @@ const card: Card = {
 	}],
 	retreat: 3,
-	rarity: "Two Diamond"
+	rarity: "None"
 }
-export default card
+export default card
--- a/Pocket/Genetic
+++ b/Pocket/Genetic
@@ -8,7 +8,6 @@ const card: Card = {
 		en: "Horsea"
 	},
 	illustrator: "Saya Tsuruta",
 	category: "Pokemon",
 	hp: 60,
 	types: ["Water"],
@@ -25,7 +24,7 @@ const card: Card = {
 	}],
 	retreat: 1,
-	rarity: "One Diamond"
+	rarity: "None"
 }
-export default card
+export default card
--- a/Pocket/Genetic
+++ b/Pocket/Genetic
@@ -8,7 +8,6 @@ const card: Card = {
 		en: "Seadra"
 	},
 	illustrator: "Sanosuke Sakuma",
 	category: "Pokemon",
 	hp: 70,
 	types: ["Water"],
@@ -27,7 +26,7 @@ const card: Card = {
 	}],
 	retreat: 1,
-	rarity: "Two Diamond"
+	rarity: "None"
 }
-export default card
+export default card
--- a/Pocket/Genetic
+++ b/Pocket/Genetic
@@ -8,7 +8,6 @@ const card: Card = {
 		en: "Goldeen"
 	},
 	illustrator: "Kyoko Umemoto",
 	category: "Pokemon",
 	hp: 60,
 	types: ["Water"],
@@ -25,7 +24,7 @@ const card: Card = {
 	}],
 	retreat: 1,
-	rarity: "One Diamond"
+	rarity: "None"
 }
-export default card
+export default card
--- a/Pocket/Genetic
+++ b/Pocket/Genetic
@@ -8,11 +8,10 @@ const card: Card = {
 		en: "Seaking"
 	},
 	illustrator: "Kyoko Umemoto",
 	category: "Pokemon",
 	hp: 100,
 	types: ["Water"],
-	stage: "Stage1",
+	stage: "Stage2",
 	attacks: [{
 		cost: ["Water"],
@@ -29,7 +28,7 @@ const card: Card = {
 	}],
 	retreat: 1,
-	rarity: "One Diamond"
+	rarity: "None"
 }
-export default card
+export default card
--- a/Pocket/Genetic
+++ b/Pocket/Genetic
@@ -8,7 +8,6 @@ const card: Card = {
 		en: "Staryu"
 	},
 	illustrator: "Hiroki Asanuma",
 	category: "Pokemon",
 	hp: 50,
 	types: ["Water"],
@@ -25,7 +24,7 @@ const card: Card = {
 	}],
 	retreat: 1,
-	rarity: "One Diamond"
+	rarity: "None"
 }
-export default card
+export default card
--- a/Pocket/Genetic
+++ b/Pocket/Genetic
@@ -8,7 +8,6 @@ const card: Card = {
 		en: "Starmie"
 	},
 	illustrator: "Yukiko Baba",
 	category: "Pokemon",
 	hp: 90,
 	types: ["Water"],
@@ -25,7 +24,7 @@ const card: Card = {
 	}],
 	retreat: 0,
-	rarity: "Two Diamond"
+	rarity: "None"
 }
-export default card
+export default card
--- a/Pocket/Genetic
+++ b/Pocket/Genetic
@@ -8,7 +8,6 @@ const card: Card = {
 		en: "Starmie ex"
 	},
 	illustrator: "PLANETA Igarashi",
 	category: "Pokemon",
 	hp: 130,
 	types: ["Water"],
@@ -26,7 +25,7 @@ const card: Card = {
 	}],
 	retreat: 0,
-	rarity: "Four Diamond"
+	rarity: "None"
 }
-export default card
+export default card
--- a/Pocket/Genetic
+++ b/Pocket/Genetic
@@ -8,7 +8,6 @@ const card: Card = {
 		en: "Magikarp"
 	},
 	illustrator: "Sekio",
 	category: "Pokemon",
 	hp: 30,
 	types: ["Water"],
@@ -25,7 +24,7 @@ const card: Card = {
 	}],
 	retreat: 1,
-	rarity: "One Diamond"
+	rarity: "None"
 }
-export default card
+export default card
--- a/Pocket/Genetic
+++ b/Pocket/Genetic
@@ -8,7 +8,6 @@ const card: Card = {
 		en: "Gyarados"
 	},
 	illustrator: "Mituhiro Arita",
 	category: "Pokemon",
 	hp: 150,
 	types: ["Water"],
@@ -29,7 +28,7 @@ const card: Card = {
 	}],
 	retreat: 4,
-	rarity: "Three Diamond"
+	rarity: "None"
 }
-export default card
+export default card
--- a/Pocket/Genetic
+++ b/Pocket/Genetic
@@ -8,7 +8,6 @@ const card: Card = {
 		en: "Lapras"
 	},
 	illustrator: "Sekio",
 	category: "Pokemon",
 	hp: 100,
 	types: ["Water"],
@@ -29,7 +28,7 @@ const card: Card = {
 	}],
 	retreat: 2,
-	rarity: "Three Diamond"
+	rarity: "None"
 }
-export default card
+export default card
--- a/Pocket/Genetic
+++ b/Pocket/Genetic
@@ -8,7 +8,6 @@ const card: Card = {
 		en: "Vaporeon"
 	},
 	illustrator: "Kagemaru Himeno",
 	category: "Pokemon",
 	hp: 130,
 	types: ["Water"],
@@ -22,14 +21,14 @@ const card: Card = {
 		},
 		effect: {
-			en: "Heal 30 damage from this Pokémon."
+			en: "Heals 30 damage from this Pokémon."
 		},
 		damage: "60"
 	}],
 	retreat: 2,
-	rarity: "Three Diamond"
+	rarity: "None"
 }
-export default card
+export default card
--- a/Pocket/Genetic
+++ b/Pocket/Genetic
@@ -8,7 +8,6 @@ const card: Card = {
 		en: "Omanyte"
 	},
 	illustrator: "Suwama Chiaki",
 	category: "Pokemon",
 	hp: 90,
 	types: ["Water"],
@@ -25,7 +24,7 @@ const card: Card = {
 	}],
 	retreat: 2,
-	rarity: "Two Diamond"
+	rarity: "None"
 }
-export default card
+export default card
--- a/Pocket/Genetic
+++ b/Pocket/Genetic
@@ -8,7 +8,6 @@ const card: Card = {
 		en: "Omastar"
 	},
 	illustrator: "kirisAki",
 	category: "Pokemon",
 	hp: 140,
 	types: ["Water"],
@@ -29,7 +28,7 @@ const card: Card = {
 	}],
 	retreat: 2,
-	rarity: "Three Diamond"
+	rarity: "None"
 }
-export default card
+export default card
--- a/Pocket/Genetic
+++ b/Pocket/Genetic
@@ -8,7 +8,6 @@ const card: Card = {
 		en: "Articuno"
 	},
 	illustrator: "Hitoshi Ariga",
 	category: "Pokemon",
 	hp: 100,
 	types: ["Water"],
@@ -29,7 +28,7 @@ const card: Card = {
 	}],
 	retreat: 1,
-	rarity: "Three Diamond"
+	rarity: "None"
 }
-export default card
+export default card
--- a/Pocket/Genetic
+++ b/Pocket/Genetic
@@ -8,7 +8,6 @@ const card: Card = {
 		en: "Articuno ex"
 	},
 	illustrator: "PLANETA Saito",
 	category: "Pokemon",
 	hp: 140,
 	types: ["Water"],
@@ -38,7 +37,7 @@ const card: Card = {
 	}],
 	retreat: 2,
-	rarity: "Four Diamond"
+	rarity: "None"
 }
-export default card
+export default card
--- a/Pocket/Genetic
+++ b/Pocket/Genetic
@@ -8,7 +8,6 @@ const card: Card = {
 		en: "Ducklett"
 	},
 	illustrator: "Yumi",
 	category: "Pokemon",
 	hp: 50,
 	types: ["Water"],
@@ -25,7 +24,7 @@ const card: Card = {
 	}],
 	retreat: 1,
-	rarity: "One Diamond"
+	rarity: "None"
 }
-export default card
+export default card
--- a/Pocket/Genetic
+++ b/Pocket/Genetic
@@ -8,7 +8,6 @@ const card: Card = {
 		en: "Swanna"
 	},
 	illustrator: "sui",
 	category: "Pokemon",
 	hp: 90,
 	types: ["Water"],
@@ -25,7 +24,7 @@ const card: Card = {
 	}],
 	retreat: 1,
-	rarity: "Two Diamond"
+	rarity: "None"
 }
-export default card
+export default card
--- a/Pocket/Genetic
+++ b/Pocket/Genetic
@@ -8,7 +8,6 @@ const card: Card = {
 		en: "Froakie"
 	},
 	illustrator: "Aya Kusube",
 	category: "Pokemon",
 	hp: 60,
 	types: ["Water"],
@@ -25,7 +24,7 @@ const card: Card = {
 	}],
 	retreat: 1,
-	rarity: "One Diamond"
+	rarity: "None"
 }
-export default card
+export default card
--- a/Pocket/Genetic
+++ b/Pocket/Genetic
@@ -8,7 +8,6 @@ const card: Card = {
 		en: "Frogadier"
 	},
 	illustrator: "Akira Komayama",
 	category: "Pokemon",
 	hp: 80,
 	types: ["Water"],
@@ -25,7 +24,7 @@ const card: Card = {
 	}],
 	retreat: 1,
-	rarity: "Two Diamond"
+	rarity: "None"
 }
-export default card
+export default card
--- a/Pocket/Genetic
+++ b/Pocket/Genetic
@@ -8,7 +8,6 @@ const card: Card = {
 		en: "Greninja"
 	},
 	illustrator: "5ban Graphics",
 	category: "Pokemon",
 	hp: 120,
 	types: ["Water"],
@@ -37,7 +36,7 @@ const card: Card = {
 	}],
 	retreat: 1,
-	rarity: "Three Diamond"
+	rarity: "None"
 }
-export default card
+export default card
--- a/Pocket/Genetic
+++ b/Pocket/Genetic
@@ -8,7 +8,6 @@ const card: Card = {
 		en: "Pyukumuku"
 	},
 	illustrator: "OOYAMA",
 	category: "Pokemon",
 	hp: 70,
 	types: ["Water"],
@@ -25,7 +24,7 @@ const card: Card = {
 	}],
 	retreat: 1,
-	rarity: "One Diamond"
+	rarity: "None"
 }
-export default card
+export default card
--- a/Pocket/Genetic
+++ b/Pocket/Genetic
@@ -8,7 +8,6 @@ const card: Card = {
 		en: "Bruxish"
 	},
 	illustrator: "Mizue",
 	category: "Pokemon",
 	hp: 90,
 	types: ["Water"],
@@ -29,7 +28,7 @@ const card: Card = {
 	}],
 	retreat: 1,
-	rarity: "Two Diamond"
+	rarity: "None"
 }
-export default card
+export default card
--- a/Pocket/Genetic
+++ b/Pocket/Genetic
@@ -5,27 +5,30 @@ const card: Card = {
 	set: Set,
 	name: {
-		en: "Snom"
+		en: "Frosmoth"
 	},
 	illustrator: "ryoma uratsuka",
 	category: "Pokemon",
-	hp: 50,
+	hp: 90,
 	types: ["Water"],
-	stage: "Basic",
+	stage: "Stage1",
 	attacks: [{
-		cost: ["Colorless"],
+		cost: ["Water", "Colorless"],
 		name: {
-			en: "Ram"
+			en: "Powder Snow"
 		},
-		damage: "10"
+		effect: {
 			en: "Your opponent's Active Pokémon is now Asleep."
 		},
 		damage: "40"
 	}],
 	retreat: 1,
-	rarity: "One Diamond"
+	rarity: "None"
 }
-export default card
+export default card
--- a/Pocket/Genetic
+++ b/Pocket/Genetic
@@ -1,35 +0,0 @@
 import { Card } from "../../../interfaces"
 import Set from "../Genetic Apex"
 const card: Card = {
 	set: Set,
 	name: {
 		en: "Frosmoth"
 	},
 	illustrator: "aoki",
 	category: "Pokemon",
 	hp: 90,
 	types: ["Water"],
 	stage: "Stage1",
 	attacks: [{
 		cost: ["Water", "Colorless"],
 		name: {
 			en: "Powder Snow"
 		},
 		effect: {
 			en: "Your opponent's Active Pokémon is now Asleep."
 		},
 		damage: "40"
 	}],
 	retreat: 1,
 	rarity: "Two Diamond"
 }
 export default card
--- a/Pocket/Genetic
+++ b/Pocket/Genetic
@@ -8,7 +8,6 @@ const card: Card = {
 		en: "Pikachu"
 	},
 	illustrator: "Mitsuhiro Arita",
 	category: "Pokemon",
 	hp: 60,
 	types: ["Lightning"],
@@ -25,7 +24,7 @@ const card: Card = {
 	}],
 	retreat: 1,
-	rarity: "One Diamond"
+	rarity: "None"
 }
-export default card
+export default card
--- a/Pocket/Genetic
+++ b/Pocket/Genetic
@@ -8,7 +8,6 @@ const card: Card = {
 		en: "Raichu"
 	},
 	illustrator: "AKIRA EGAWA",
 	category: "Pokemon",
 	hp: 100,
 	types: ["Lightning"],
@@ -29,7 +28,7 @@ const card: Card = {
 	}],
 	retreat: 1,
-	rarity: "Three Diamond"
+	rarity: "None"
 }
-export default card
+export default card
--- a/Pocket/Genetic
+++ b/Pocket/Genetic
@@ -8,7 +8,6 @@ const card: Card = {
 		en: "Pikachu ex"
 	},
 	illustrator: "PLANETA CG Works",
 	category: "Pokemon",
 	hp: 120,
 	types: ["Lightning"],
@@ -30,7 +29,7 @@ const card: Card = {
 	}],
 	retreat: 1,
-	rarity: "Four Diamond"
+	rarity: "None"
 }
-export default card
+export default card
--- a/Pocket/Genetic
+++ b/Pocket/Genetic
@@ -8,7 +8,6 @@ const card: Card = {
 		en: "Magnemite"
 	},
 	illustrator: "sowsow",
 	category: "Pokemon",
 	hp: 60,
 	types: ["Lightning"],
@@ -25,7 +24,7 @@ const card: Card = {
 	}],
 	retreat: 1,
-	rarity: "One Diamond"
+	rarity: "None"
 }
-export default card
+export default card
--- a/Show More
+++ b/Show More