Merge branch 'pvpoke:master' into master

Author: chrisisth

src/data/gamemaster.json

@@ -45,6 +45,15 @@
 		"showFormat": true,
 		"showMeta": true
 	},
+	{
+		"title": "Willpower Cup",
+		"cup": "willpower",
+		"cp": 1500,
+		"meta": "willpower",
+		"showCup": true,
+		"showFormat": true,
+		"showMeta": true
+	},
 	{
 		"title": "Master League (Megas)",
 		"cup": "mega",

src/data/gamemaster.min.json

@@ -0,0 +1,97 @@
+[{
+    "speciesId": "mandibuzz",
+    "fastMove": "SNARL",
+    "chargedMoves": ["DARK_PULSE", "AERIAL_ACE"]
+}, {
+    "speciesId": "drapion_shadow",
+    "fastMove": "POISON_STING",
+    "chargedMoves": ["CRUNCH", "AQUA_TAIL"],
+    "shadowType": "shadow"
+}, {
+    "speciesId": "qwilfish_hisuian",
+    "fastMove": "POISON_STING",
+    "chargedMoves": ["AQUA_TAIL", "ICE_BEAM"]
+}, {
+    "speciesId": "cresselia",
+    "fastMove": "PSYCHO_CUT",
+    "chargedMoves": ["GRASS_KNOT", "MOONBLAST"]
+}, {
+    "speciesId": "claydol",
+    "fastMove": "MUD_SLAP",
+    "chargedMoves": ["ICE_BEAM", "SCORCHING_SANDS"]
+}, {
+    "speciesId": "skuntank",
+    "fastMove": "POISON_JAB",
+    "chargedMoves": ["CRUNCH", "TRAILBLAZE"]
+}, {
+    "speciesId": "annihilape",
+    "fastMove": "COUNTER",
+    "chargedMoves": ["RAGE_FIST", "CLOSE_COMBAT"],
+    "shadowType": "shadow"
+}, {
+    "speciesId": "primeape_shadow",
+    "fastMove": "KARATE_CHOP",
+    "chargedMoves": ["RAGE_FIST", "CLOSE_COMBAT"],
+    "shadowType": "shadow"
+}, {
+    "speciesId": "rapidash_galarian",
+    "fastMove": "FAIRY_WIND",
+    "chargedMoves": ["BODY_SLAM", "WILD_CHARGE"]
+}, {
+    "speciesId": "rapidash_galarian",
+    "fastMove": "FAIRY_WIND",
+    "chargedMoves": ["BODY_SLAM", "MEGAHORN"]
+}, {
+    "speciesId": "hatterene",
+    "fastMove": "CHARM",
+    "chargedMoves": ["PSYSHOCK", "POWER_WHIP"]
+}, {
+    "speciesId": "moltres_galarian",
+    "fastMove": "SUCKER_PUNCH",
+    "chargedMoves": ["ANCIENT_POWER", "BRAVE_BIRD"]
+}, {
+    "speciesId": "guzzlord",
+    "fastMove": "DRAGON_TAIL",
+    "chargedMoves": ["BRUTAL_SWING", "DRAGON_CLAW"]
+}, {
+    "speciesId": "umbreon",
+    "fastMove": "SNARL",
+    "chargedMoves": ["FOUL_PLAY", "LAST_RESORT"]
+}, {
+    "speciesId": "drapion",
+    "fastMove": "POISON_STING",
+    "chargedMoves": ["CRUNCH", "AQUA_TAIL"]
+}, {
+    "speciesId": "greninja",
+    "fastMove": "WATER_SHURIKEN",
+    "chargedMoves": ["HYDRO_CANNON", "NIGHT_SLASH"]
+}, {
+    "speciesId": "machamp_shadow",
+    "fastMove": "KARATE_CHOP",
+    "chargedMoves": ["CROSS_CHOP", "STONE_EDGE"],
+    "shadowType": "shadow"
+}, {
+    "speciesId": "slowbro_galarian",
+    "fastMove": "POISON_JAB",
+    "chargedMoves": ["SCALD", "BRUTAL_SWING"]
+}, {
+    "speciesId": "morpeko_full_belly",
+    "fastMove": "THUNDER_SHOCK",
+    "chargedMoves": ["AURA_WHEEL_ELECTRIC", "PSYCHIC_FANGS"]
+}, {
+    "speciesId": "victini",
+    "fastMove": "QUICK_ATTACK",
+    "chargedMoves": ["V_CREATE", "PSYCHIC"]
+}, {
+    "speciesId": "malamar",
+    "fastMove": "PSYWAVE",
+    "chargedMoves": ["SUPER_POWER", "FOUL_PLAY"]
+}, {
+    "speciesId": "lokix",
+    "fastMove": "SUCKER_PUNCH",
+    "chargedMoves": ["X_SCISSOR", "TRAILBLAZE"]
+}, {
+    "speciesId": "overqwil",
+    "fastMove": "POISON_JAB",
+    "chargedMoves": ["AQUA_TAIL", "ICE_BEAM"]
+}]

src/data/gamemaster/cups/archive/willpower.json renamed to src/data/gamemaster/cups/willpower.json

@@ -1,5 +1,5 @@
 <?php require_once 'modules/config.php';
-$SITE_VERSION = '1.32.3.4';
+$SITE_VERSION = '1.32.3.5';
 
 // This prevents caching on local testing
 if (strpos($WEB_ROOT, 'src') !== false) {

src/data/gamemaster/formats.json

@@ -87,6 +87,10 @@
 		$league = 'Catch Cup';
 		break;
 
+	case "willpower":
+		$league = 'Willpower Cup';
+		break;
+
 	case "little":
 		$league = 'Little Cup';
 		break;

src/data/groups/willpower.json

@@ -1,6 +1,23 @@
-<?xml version="1.0" encoding="utf-8"?><rss version="2.0">
+<?xml version="1.0" encoding="utf-8"?>
+<rss version="2.0">
 
-	<channel><item><title>Morpeko Rankings</title><description><![CDATA[Morpeko will debut as the first Pokemon to change forms mid-battle! This form change occurs whenever it uses a Charged Attack. Depending on its form, its powerful signature move, Aura Wheel, is either an Electric-type or Dark-type attack.<br><br>Morpeko fits the mold of other glassy Electric types like Magnezone, Togedemaru, and Luxray, equipped with a bait move and a powerful nuke. It's likely to remain spice but should be fun to experiment with. We'll see if the form change mechanic comes to other Pokemon in the future!]]></description><link>https://pvpoke.com/rankings/all/1500/overall/morpeko_full_belly/</link><pubDate>Sun, 20 Oct 2024 16:21:18 GMT</pubDate></item>
+	<channel>
+		<item>
+			<title>Willpower Cup Rankings</title>
+			<description>
+				<![CDATA[Willpower Cup returns featuring Dark, Psychic, and Fighting-type Pokemon. Gardevoir is banned, but other Fairies sneak through, including Hatterene and Galarian Rapidash. With few resistances, Charm could be a running theme, but Poison Jab and Poison Sting are strong enough to overcome it. Some niche Pokemon like Claydol should also see play. Have fun!]]>
+			</description>
+			<link>https://pvpoke.com/rankings/willpower/1500/overall/</link>
+			<pubDate>Tue, 29 Oct 2024 03:03:29 GMT</pubDate>
+		</item>
+		<item>
+			<title>Morpeko Rankings</title>
+			<description>
+				<![CDATA[Morpeko will debut as the first Pokemon to change forms mid-battle! This form change occurs whenever it uses a Charged Attack. Depending on its form, its powerful signature move, Aura Wheel, is either an Electric-type or Dark-type attack.<br><br>Morpeko fits the mold of other glassy Electric types like Magnezone, Togedemaru, and Luxray, equipped with a bait move and a powerful nuke. It's likely to remain spice but should be fun to experiment with. We'll see if the form change mechanic comes to other Pokemon in the future!]]>
+			</description>
+			<link>https://pvpoke.com/rankings/all/1500/overall/morpeko_full_belly/</link>
+			<pubDate>Sun, 20 Oct 2024 16:21:18 GMT</pubDate>
+		</item>
 		<item>
 			<title>Expanded Multi-Battle and Matrix Battle Options</title>
 			<description>
@@ -113,15 +130,6 @@
 			<link>https://pvpoke.com/rankings/fossil/1500/overall/</link>
 			<pubDate>Wed, 24 Jul 2024 17:02:36 GMT</pubDate>
 		</item>
-		<item>
-			<title>Great and Ultra League Top Performers</title>
-			<description>
-				<![CDATA[I've updated training analysis for Great and Ultra League with the past few weeks of data. In Great League, things look relatively stable although note that some Remix practice may impact this dataset. Water Gun Lanturn and Quagsire are still proving to be top options, while top teams are trending more toward Fast Attack pressure with the likes of Wigglytuff, Victreebel, Bastiodon, and Dragonair.]]>
-			</description>
-			<link>https://pvpoke.com/train/analysis/</link>
-			<pubDate>Sun, 21 Jul 2024 14:13:53 GMT</pubDate>
-		</item>
-
 
 		<title>PvPoke</title>
 		<link>https://pvpoke.com/</link>