Merge branch 'pvpoke:master' into master

src/data/gamemaster/cups/archive/color.json → src/data/gamemaster/cups/color.json

@@ -8,5 +8,7 @@
     "exclude": [{
         "filterType": "tag",
         "values": ["mega"]
-    }]
+    }],
+	"partySize": 3,
+	"presetOnly": true
 }

src/data/gamemaster/formats.json

@@ -29,29 +29,30 @@
 		"hideRankings": true
 	},
 	{
-		"title": "Fantasy Cup",
-		"cup": "fantasy",
-		"cp": 1500,
-		"meta": "fantasy",
+		"title": "Little Holiday Cup",
+		"cup": "holiday",
+		"cp": 500,
+		"meta": "holidaylittle",
 		"showCup": true,
 		"showFormat": true,
 		"showMeta": true,
 		"rules": [
-			"Pokémon must be at or below 1,500 CP to enter.",
-			"Only Dragon-, Steel-, and Fairy-type Pokémon are eligible."
+			"Pokémon must be at or below 500 CP to enter.",
+			"Only Normal-, Grass-, Electric-, Ice-, Flying-, and Ghost-type Pokémon are eligible.",
+			"Smeargle is not allowed."
 		]
 	},
 	{
-		"title": "Little Holiday Cup",
-		"cup": "holiday",
-		"cp": 500,
-		"meta": "holidaylittle",
+		"title": "Color Cup",
+		"cup": "color",
+		"cp": 1500,
+		"meta": "color",
 		"showCup": true,
 		"showFormat": true,
 		"showMeta": true,
 		"rules": [
-			"Pokémon must be at or below 500 CP to enter.",
-			"Only Normal-, Grass-, Electric-, Ice-, Flying-, and Ghost-type Pokémon are eligible."
+			"Pokémon must be at or below 1,500 CP to enter.",
+			"Only Fire-, Water-, Grass-, and Electric-type Pokémon are eligible."
 		]
 	},
 	{

src/data/gamemaster/moves.json

@@ -869,6 +869,19 @@
     "energyGain": 0,
     "cooldown": 500,
     "archetype": "Nuke"
+}, {
+    "moveId": "FLOWER_TRICK",
+    "name": "Flower Trick",
+	"abbreviation": "FlT",
+    "type": "grass",
+    "power": 30,
+    "energy": 35,
+    "energyGain": 0,
+    "cooldown": 500,
+    "buffs": [1, 0],
+    "buffTarget": "self",
+    "buffApplyChance": "1",
+    "archetype": "Boost"
 }, {
     "moveId": "FLY",
     "name": "Fly",

src/data/gamemaster/pokemon.json

@@ -23046,6 +23046,29 @@
         "id": "FAMILY_RALTS",
         "parent": "kirlia_shadow"
     }
+}, {
+    "dex": 475,
+    "speciesName": "Gallade (Mega)",
+    "speciesId": "gallade_mega",
+    "baseStats": {
+        "atk": 326,
+        "def": 230,
+        "hp": 169
+    },
+    "types": ["psychic", "fighting"],
+	"fastMoves": ["CONFUSION", "LOW_KICK", "CHARM", "PSYCHO_CUT"],
+    "chargedMoves": ["CLOSE_COMBAT", "LEAF_BLADE", "PSYCHIC", "SYNCHRONOISE"],
+    "defaultIVs": {
+		"cp500": [4.5, 1, 6, 7],
+        "cp1500": [12, 6, 8, 15],
+        "cp2500": [20, 6, 10, 15]
+    },
+    "level25CP": 2867,
+    "tags": ["shadoweligible", "mega"],
+    "eliteMoves": ["SYNCHRONOISE"],
+	"buddyDistance": 5,
+    "thirdMoveCost": 75000,
+    "released": true
 }, {
     "dex": 476,
     "speciesName": "Probopass",
@@ -34927,7 +34950,7 @@
     },
     "types": ["flying", "steel"],
     "fastMoves": ["STEEL_WING", "AIR_SLASH"],
-    "chargedMoves": ["DRILL_PECK", "BRAVE_BIRD", "IRON_HEAD"],
+    "chargedMoves": ["DRILL_PECK", "BRAVE_BIRD"],
     "defaultIVs": {
         "cp500": [8, 4, 6, 7],
         "cp1500": [23, 5, 8, 15],

src/data/groups/color.json

@@ -0,0 +1,112 @@
+[{
+    "speciesId": "toxapex",
+    "fastMove": "POISON_JAB",
+    "chargedMoves": ["BRINE", "SLUDGE_WAVE"]
+}, {
+    "speciesId": "marowak_alolan_shadow",
+    "fastMove": "FIRE_SPIN",
+    "chargedMoves": ["SHADOW_BONE", "BONE_CLUB"],
+    "shadowType": "shadow"
+}, {
+    "speciesId": "qwilfish",
+    "fastMove": "POISON_STING",
+    "chargedMoves": ["AQUA_TAIL", "ICE_BEAM"]
+}, {
+    "speciesId": "abomasnow",
+    "fastMove": "POWDER_SNOW",
+    "chargedMoves": ["ICY_WIND", "ENERGY_BALL"]
+}, {
+    "speciesId": "abomasnow_shadow",
+    "fastMove": "POWDER_SNOW",
+    "chargedMoves": ["WEATHER_BALL_ICE", "ENERGY_BALL"],
+    "shadowType": "shadow"
+}, {
+    "speciesId": "jumpluff",
+    "fastMove": "FAIRY_WIND",
+    "chargedMoves": ["AERIAL_ACE", "ENERGY_BALL"]
+}, {
+    "speciesId": "jumpluff_shadow",
+    "fastMove": "FAIRY_WIND",
+    "chargedMoves": ["AERIAL_ACE", "ENERGY_BALL"],
+    "shadowType": "shadow"
+}, {
+    "speciesId": "gastrodon",
+    "fastMove": "MUD_SLAP",
+    "chargedMoves": ["BODY_SLAM", "EARTH_POWER"]
+}, {
+    "speciesId": "quagsire_shadow",
+    "fastMove": "MUD_SHOT",
+    "chargedMoves": ["AQUA_TAIL", "STONE_EDGE"],
+    "shadowType": "shadow"
+}, {
+    "speciesId": "emolga",
+    "fastMove": "THUNDER_SHOCK",
+    "chargedMoves": ["ACROBATICS", "DISCHARGE"]
+}, {
+    "speciesId": "turtonator",
+    "fastMove": "INCINERATE",
+    "chargedMoves": ["DRAGON_PULSE", "OVERHEAT"]
+}, {
+    "speciesId": "stunfisk",
+    "fastMove": "THUNDER_SHOCK",
+    "chargedMoves": ["MUD_BOMB", "DISCHARGE"]
+}, {
+    "speciesId": "cradily",
+    "fastMove": "BULLET_SEED",
+    "chargedMoves": ["ROCK_SLIDE", "GRASS_KNOT"]
+}, {
+    "speciesId": "morpeko_full_belly",
+    "fastMove": "THUNDER_SHOCK",
+    "chargedMoves": ["AURA_WHEEL_ELECTRIC", "PSYCHIC_FANGS"]
+}, {
+    "speciesId": "amoonguss",
+    "fastMove": "ASTONISH",
+    "chargedMoves": ["GRASS_KNOT", "SLUDGE_BOMB"]
+}, {
+    "speciesId": "serperior",
+    "fastMove": "VINE_WHIP",
+    "chargedMoves": ["FRENZY_PLANT", "AERIAL_ACE"]
+}, {
+    "speciesId": "golisopod",
+    "fastMove": "SHADOW_CLAW",
+    "chargedMoves": ["X_SCISSOR", "LIQUIDATION"]
+}, {
+    "speciesId": "electrode_hisuian",
+    "fastMove": "THUNDER_SHOCK",
+    "chargedMoves": ["WILD_CHARGE", "SWIFT"]
+}, {
+    "speciesId": "whiscash_shadow",
+    "fastMove": "MUD_SHOT",
+    "chargedMoves": ["MUD_BOMB", "SCALD"],
+    "shadowType": "shadow"
+}, {
+    "speciesId": "venusaur",
+    "fastMove": "VINE_WHIP",
+    "chargedMoves": ["FRENZY_PLANT", "SLUDGE_BOMB"]
+}, {
+    "speciesId": "feraligatr_shadow",
+    "fastMove": "SHADOW_CLAW",
+    "chargedMoves": ["HYDRO_CANNON", "ICE_BEAM"],
+    "shadowType": "shadow"
+}, {
+    "speciesId": "typhlosion_shadow",
+    "fastMove": "INCINERATE",
+    "chargedMoves": ["BLAST_BURN", "THUNDER_PUNCH"],
+    "shadowType": "shadow"
+}, {
+    "speciesId": "skeledirge",
+    "fastMove": "INCINERATE",
+    "chargedMoves": ["SHADOW_BALL", "DISARMING_VOICE"]
+}, {
+    "speciesId": "dewgong",
+    "fastMove": "ICE_SHARD",
+    "chargedMoves": ["ICY_WIND", "DRILL_RUN"]
+}, {
+    "speciesId": "talonflame",
+    "fastMove": "INCINERATE",
+    "chargedMoves": ["FLY", "BRAVE_BIRD"]
+}, {
+    "speciesId": "zapdos",
+    "fastMove": "THUNDER_SHOCK",
+    "chargedMoves": ["DRILL_PECK", "THUNDERBOLT"]
+}]

src/data/groups/mastermega.json

@@ -50,6 +50,10 @@
     "speciesId": "excadrill",
     "fastMove": "MUD_SLAP",
     "chargedMoves": ["ROCK_SLIDE", "DRILL_RUN"]
+}, {
+    "speciesId": "gallade_mega",
+    "fastMove": "PSYCHO_CUT",
+    "chargedMoves": ["LEAF_BLADE", "CLOSE_COMBAT"]
 }, {
     "speciesId": "garchomp_mega",
     "fastMove": "DRAGON_TAIL",

src/data/megas.json

@@ -106,23 +106,4 @@
     "level25CP": 3136,
     "tags": ["shadoweligible", "mega"],
     "eliteMoves": ["METEOR_MASH"]
-}, {
-    "dex": 475,
-    "speciesName": "Gallade (Mega)",
-    "speciesId": "gallade_mega",
-    "baseStats": {
-        "atk": 326,
-        "def": 230,
-        "hp": 169
-    },
-    "types": ["psychic", "fighting"],
-    "fastMoves": ["CONFUSION", "LOW_KICK", "CHARM"],
-    "chargedMoves": ["CLOSE_COMBAT", "LEAF_BLADE", "PSYCHIC", "SYNCHRONOISE"],
-    "defaultIVs": {
-        "cp1500": [12, 6, 8, 15],
-        "cp2500": [20, 6, 10, 15]
-    },
-    "level25CP": 2867,
-    "tags": ["shadoweligible", "mega"],
-    "eliteMoves": ["SYNCHRONOISE"]
 }]

src/data/overrides/holiday/500.json

@@ -1 +1 @@
-[{"speciesId":"abomasnow","fastMove":"POWDER_SNOW","chargedMoves":["WEATHER_BALL_ICE","ENERGY_BALL"],"weight":1},{"speciesId":"abomasnow_shadow","fastMove":"POWDER_SNOW","chargedMoves":["WEATHER_BALL_ICE","ENERGY_BALL"],"weight":1},{"speciesId":"amaura","fastMove":"POWDER_SNOW","chargedMoves":["WEATHER_BALL_ICE","ANCIENT_POWER"],"weight":6},{"speciesId":"annihilape","fastMove":"COUNTER","chargedMoves":["CLOSE_COMBAT","RAGE_FIST"],"weight":2},{"speciesId":"arctibax","fastMove":"DRAGON_BREATH","chargedMoves":["AVALANCHE","DRAGON_CLAW"],"weight":1},{"speciesId":"baxcalibur","fastMove":"DRAGON_BREATH","chargedMoves":["AVALANCHE","DRAGON_CLAW"],"weight":1},{"speciesId":"cottonee","fastMove":"CHARM","chargedMoves":["GRASS_KNOT","SEED_BOMB"],"weight":4},{"speciesId":"ducklett","fastMove":"WING_ATTACK","chargedMoves":["BRAVE_BIRD","AERIAL_ACE"],"weight":1},{"speciesId":"ducklett_shadow","fastMove":"WING_ATTACK","chargedMoves":["BRAVE_BIRD","AERIAL_ACE"],"weight":1},{"speciesId":"frigibax","fastMove":"DRAGON_BREATH","chargedMoves":["AVALANCHE","DRAGON_CLAW"],"weight":1},{"speciesId":"jumpluff","fastMove":"FAIRY_WIND","chargedMoves":["AERIAL_ACE","ENERGY_BALL"],"weight":1},{"speciesId":"jumpluff_shadow","fastMove":"FAIRY_WIND","chargedMoves":["AERIAL_ACE","ENERGY_BALL"],"weight":1},{"speciesId":"litwick","fastMove":"EMBER","chargedMoves":["MYSTICAL_FIRE","FLAME_CHARGE"],"weight":6},{"speciesId":"marowak_alolan_shadow","fastMove":"FIRE_SPIN","chargedMoves":["SHADOW_BONE","BONE_CLUB"],"weight":2},{"speciesId":"miltank","fastMove":"ROLLOUT","chargedMoves":["BODY_SLAM","ICE_BEAM"],"weight":3},{"speciesId":"ninetales_alolan","fastMove":"CHARM","chargedMoves":["WEATHER_BALL_ICE","PSYSHOCK"],"weight":1},{"speciesId":"ninetales_alolan_shadow","fastMove":"CHARM","chargedMoves":["WEATHER_BALL_ICE","PSYSHOCK"],"weight":4},{"speciesId":"pikachu_libre","fastMove":"THUNDER_SHOCK","chargedMoves":["FLYING_PRESS","THUNDER_PUNCH"],"weight":2},{"speciesId":"sandslash_alolan","fastMove":"POWDER_SNOW","chargedMoves":["ICE_PUNCH","DRILL_RUN"],"weight":5},{"speciesId":"skeledirge","fastMove":"INCINERATE","chargedMoves":["SHADOW_BALL","DISARMING_VOICE"],"weight":3},{"speciesId":"smeargle","fastMove":"INCINERATE","chargedMoves":["FLYING_PRESS"],"weight":14},{"speciesId":"talonflame","fastMove":"INCINERATE","chargedMoves":["FLAME_CHARGE","FLY"],"weight":3},{"speciesId":"togedemaru","fastMove":"THUNDER_SHOCK","chargedMoves":["WILD_CHARGE","FELL_STINGER"],"weight":1},{"speciesId":"vulpix_alolan","fastMove":"POWDER_SNOW","chargedMoves":["WEATHER_BALL_ICE","DARK_PULSE"],"weight":4},{"speciesId":"wigglytuff","fastMove":"CHARM","chargedMoves":["SWIFT","ICY_WIND"],"weight":5}]
+[{"speciesId":"abomasnow","fastMove":"POWDER_SNOW","chargedMoves":["WEATHER_BALL_ICE","ENERGY_BALL"],"weight":1},{"speciesId":"abomasnow_shadow","fastMove":"POWDER_SNOW","chargedMoves":["WEATHER_BALL_ICE","ENERGY_BALL"],"weight":1},{"speciesId":"amaura","fastMove":"POWDER_SNOW","chargedMoves":["WEATHER_BALL_ICE","ANCIENT_POWER"],"weight":6},{"speciesId":"annihilape","fastMove":"COUNTER","chargedMoves":["CLOSE_COMBAT","RAGE_FIST"],"weight":2},{"speciesId":"arctibax","fastMove":"DRAGON_BREATH","chargedMoves":["AVALANCHE","DRAGON_CLAW"],"weight":1},{"speciesId":"baxcalibur","fastMove":"DRAGON_BREATH","chargedMoves":["AVALANCHE","DRAGON_CLAW"],"weight":1},{"speciesId":"cottonee","fastMove":"CHARM","chargedMoves":["GRASS_KNOT","SEED_BOMB"],"weight":4},{"speciesId":"ducklett","fastMove":"WING_ATTACK","chargedMoves":["BRAVE_BIRD","AERIAL_ACE"],"weight":1},{"speciesId":"ducklett_shadow","fastMove":"WING_ATTACK","chargedMoves":["BRAVE_BIRD","AERIAL_ACE"],"weight":1},{"speciesId":"frigibax","fastMove":"DRAGON_BREATH","chargedMoves":["AVALANCHE","DRAGON_CLAW"],"weight":1},{"speciesId":"jumpluff","fastMove":"FAIRY_WIND","chargedMoves":["AERIAL_ACE","ENERGY_BALL"],"weight":1},{"speciesId":"jumpluff_shadow","fastMove":"FAIRY_WIND","chargedMoves":["AERIAL_ACE","ENERGY_BALL"],"weight":1},{"speciesId":"litwick","fastMove":"EMBER","chargedMoves":["MYSTICAL_FIRE","FLAME_CHARGE"],"weight":6},{"speciesId":"marowak_alolan_shadow","fastMove":"FIRE_SPIN","chargedMoves":["SHADOW_BONE","BONE_CLUB"],"weight":2},{"speciesId":"miltank","fastMove":"ROLLOUT","chargedMoves":["BODY_SLAM","ICE_BEAM"],"weight":3},{"speciesId":"ninetales_alolan","fastMove":"CHARM","chargedMoves":["WEATHER_BALL_ICE","PSYSHOCK"],"weight":1},{"speciesId":"ninetales_alolan_shadow","fastMove":"CHARM","chargedMoves":["WEATHER_BALL_ICE","PSYSHOCK"],"weight":4},{"speciesId":"pikachu_libre","fastMove":"THUNDER_SHOCK","chargedMoves":["FLYING_PRESS","THUNDER_PUNCH"],"weight":2},{"speciesId":"sandslash_alolan","fastMove":"POWDER_SNOW","chargedMoves":["ICE_PUNCH","DRILL_RUN"],"weight":5},{"speciesId":"skeledirge","fastMove":"INCINERATE","chargedMoves":["SHADOW_BALL","DISARMING_VOICE"],"weight":3},{"speciesId":"smeargle","fastMove":"INCINERATE","chargedMoves":["FLYING_PRESS"],"weight":14},{"speciesId":"talonflame","fastMove":"INCINERATE","chargedMoves":["FLAME_CHARGE","FLY"],"weight":3},{"speciesId":"togedemaru","fastMove":"THUNDER_SHOCK","chargedMoves":["WILD_CHARGE","FELL_STINGER"],"weight":1},{"speciesId":"vulpix_alolan","fastMove":"POWDER_SNOW","chargedMoves":["WEATHER_BALL_ICE","DARK_PULSE"],"weight":4},{"speciesId":"wigglytuff","fastMove":"CHARM","chargedMoves":["SWIFT","ICY_WIND"],"weight":5},{"speciesId":"zigzagoon_galarian","fastMove":"TACKLE","chargedMoves":["SWIFT","DIG"],"weight":1}]

src/header.php

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

src/rankings.php

@@ -83,8 +83,8 @@
 		$league = 'Catch Cup';
 		break;
 
-	case "willpower":
-		$league = 'Willpower Cup';
+	case "color":
+		$league = 'Color Cup';
 		break;
 
 	case "little":

src/rss/feed.xml

@@ -2,6 +2,14 @@
 <rss version="2.0">
 
 	<channel>
+		<item>
+			<title>Color Cup Rankings</title>
+			<description>
+				<![CDATA[Color Cup returns to Great League this January, featuring Water, Fire, Grass, and Electric types. Seasoned battlers might notice this is just Element Cup plus Electric, another type that resists itself. The best Pokemon in this cup will be the ones that beat their own type and provide corebreaking opportunities against the rest.<br><br>These Pokemon include current Great League favorites like Toxapex, Jumpluff, and the rising Unova Stunfisk. Qwilfish, Alolan Marowak, and Abomasnow also look like promising picks. Ground should play a major role in this meta with the presence of Gastrodon, super effective against many top picks. While it dodges Grass types, Ice will be dodging Fire to corner them both. It isn't high up in the rankings, but Dewgong stands out as a mold breaker with play against much of the field.<br><br>Despite the small meta, there should be interesting core and corebreaker dynamics. The biggest question is if prevalent double weaknesses and hard counter relationships will hamper team building. Happy holidarys and good luck!]]>
+			</description>
+			<link>https://pvpoke.com/rankings/color/1500/overall/</link>
+			<pubDate>Mon, 23 Dec 2024 00:13:37 GMT</pubDate>
+		</item>
 		<item>
 			<title>Updated Great League Top Performers</title>
 			<description>
@@ -122,14 +130,6 @@
 			<link>https://pvpoke.com/rankings/all/1500/overall/primeape_shadow/</link>
 			<pubDate>Mon, 07 Oct 2024 17:02:09 GMT</pubDate>
 		</item>
-		<item>
-			<title>Leavanny Rankings</title>
-			<description>
-				<![CDATA[Sewaddle Community Day this Saturday brings Shadow Claw to Leavanny! It'll be a spicy pick that may even see some themed cup play thanks to Leaf Blade and X-Scissor, both powerful 35-energy attacks. It won't stick around the battlefield for a long time, but it'll be a fun one!]]>
-			</description>
-			<link>https://pvpoke.com/rankings/all/1500/overall/leavanny/</link>
-			<pubDate>Thu, 03 Oct 2024 22:56:55 GMT</pubDate>
-		</item>
 
 		<title>PvPoke</title>
 		<link>https://pvpoke.com/</link>