Merge branch 'pvpoke:master' into master

chrisisth · Dec 22, 2024 · 04944b5 · 04944b5
2 parents 5ec4401 + f6af59c
commit 04944b5
Show file tree

Hide file tree

Showing 20 changed files with 47 additions and 44,119 deletions.
diff --git a/src/data/gamemaster.json b/src/data/gamemaster.json
diff --git a/src/data/gamemaster.min.json b/src/data/gamemaster.min.json
diff --git a/src/data/gamemaster/cups/holiday.json b/src/data/gamemaster/cups/holiday.json
@@ -10,7 +10,7 @@
 		"values": ["mega"]
 	}, {
 		"filterType": "id",
-		"values": ["articuno", "celebi", "ho_oh", "hoopa", "lugia", "moltres", "rayquaza", "regice", "regieleki", "regigigas", "shaymin", "shaymin_sky", "zapdos", "morpeko_full_belly"],
+		"values": ["smeargle", "articuno", "celebi", "ho_oh", "hoopa", "lugia", "moltres", "rayquaza", "regice", "regieleki", "regigigas", "shaymin", "shaymin_sky", "zapdos", "morpeko_full_belly"],
 		"leagues": [500]
 	}],
 	"partySize": 3,

diff --git a/src/data/groups/holidaylittle.json b/src/data/groups/holidaylittle.json
@@ -6,26 +6,26 @@
     "speciesId": "amaura",
     "fastMove": "POWDER_SNOW",
     "chargedMoves": ["WEATHER_BALL_ICE", "ANCIENT_POWER"]
+}, {
+    "speciesId": "annihilape",
+    "fastMove": "COUNTER",
+    "chargedMoves": ["CLOSE_COMBAT", "RAGE_FIST"]
 }, {
     "speciesId": "aurorus",
     "fastMove": "POWDER_SNOW",
     "chargedMoves": ["WEATHER_BALL_ICE", "METEOR_BEAM"]
-}, {
-    "speciesId": "joltik",
-    "fastMove": "SUCKER_PUNCH",
-    "chargedMoves": ["DISCHARGE", "CROSS_POISON"]
 }, {
     "speciesId": "chikorita",
     "fastMove": "VINE_WHIP",
     "chargedMoves": ["BODY_SLAM", "GRASS_KNOT"]
 }, {
-    "speciesId": "miltank",
-    "fastMove": "ROLLOUT",
-    "chargedMoves": ["BODY_SLAM", "ICE_BEAM"]
+    "speciesId": "diggersby",
+    "fastMove": "QUICK_ATTACK",
+    "chargedMoves": ["SCORCHING_SANDS", "FIRE_PUNCH"]
 }, {
-    "speciesId": "smeargle",
-    "fastMove": "INCINERATE",
-    "chargedMoves": ["FLYING_PRESS"]
+    "speciesId": "joltik",
+    "fastMove": "SUCKER_PUNCH",
+    "chargedMoves": ["DISCHARGE", "CROSS_POISON"]
 }, {
     "speciesId": "litwick",
     "fastMove": "EMBER",
@@ -44,6 +44,10 @@
     "fastMove": "FIRE_SPIN",
     "chargedMoves": ["SHADOW_BONE", "BONE_CLUB"],
     "shadowType": "shadow"
+}, {
+    "speciesId": "miltank",
+    "fastMove": "ROLLOUT",
+    "chargedMoves": ["BODY_SLAM", "ICE_BEAM"]
 }, {
     "speciesId": "ninetales_alolan",
     "fastMove": "POWDER_SNOW",
@@ -65,6 +69,10 @@
     "speciesId": "skeledirge",
     "fastMove": "INCINERATE",
     "chargedMoves": ["SHADOW_BALL", "DISARMING_VOICE"]
+}, {
+    "speciesId": "stunfisk",
+    "fastMove": "THUNDER_SHOCK",
+    "chargedMoves": ["MUD_BOMB", "DISCHARGE"]
 }, {
     "speciesId": "talonflame",
     "fastMove": "INCINERATE",
@@ -79,15 +87,19 @@
     "chargedMoves": ["WEATHER_BALL_ICE", "DARK_PULSE"],
     "shadowType": "shadow"
 }, {
-    "speciesId": "diggersby",
+    "speciesId": "litleo",
+    "fastMove": "INCINERATE",
+    "chargedMoves": ["FLAME_CHARGE", "CRUNCH"]
+}, {
+    "speciesId": "fletchling",
     "fastMove": "QUICK_ATTACK",
-    "chargedMoves": ["SCORCHING_SANDS", "FIRE_PUNCH"]
+    "chargedMoves": ["SWIFT", "FLY"]
+}, {
+    "speciesId": "walrein",
+    "fastMove": "POWDER_SNOW",
+    "chargedMoves": ["ICICLE_SPEAR", "WATER_PULSE"]
 }, {
     "speciesId": "stunfisk",
     "fastMove": "THUNDER_SHOCK",
     "chargedMoves": ["MUD_BOMB", "DISCHARGE"]
-}, {
-    "speciesId": "annihilape",
-    "fastMove": "COUNTER",
-    "chargedMoves": ["CLOSE_COMBAT", "RAGE_FIST"]
 }]
diff --git a/src/data/overrides/all/1500.json b/src/data/overrides/all/1500.json
diff --git a/src/data/rankings/all/attackers/rankings-1500.json b/src/data/rankings/all/attackers/rankings-1500.json
diff --git a/src/data/rankings/all/chargers/rankings-1500.json b/src/data/rankings/all/chargers/rankings-1500.json
diff --git a/src/data/rankings/all/closers/rankings-1500.json b/src/data/rankings/all/closers/rankings-1500.json
diff --git a/src/data/rankings/all/consistency/rankings-1500.json b/src/data/rankings/all/consistency/rankings-1500.json
diff --git a/src/data/rankings/all/leads/rankings-1500.json b/src/data/rankings/all/leads/rankings-1500.json
diff --git a/src/data/rankings/all/overall/rankings-1500.json b/src/data/rankings/all/overall/rankings-1500.json
diff --git a/src/data/rankings/all/switches/rankings-1500.json b/src/data/rankings/all/switches/rankings-1500.json
diff --git a/src/data/rankings/holiday/attackers/rankings-500.json b/src/data/rankings/holiday/attackers/rankings-500.json
diff --git a/src/data/rankings/holiday/chargers/rankings-500.json b/src/data/rankings/holiday/chargers/rankings-500.json
diff --git a/src/data/rankings/holiday/closers/rankings-500.json b/src/data/rankings/holiday/closers/rankings-500.json
diff --git a/src/data/rankings/holiday/consistency/rankings-500.json b/src/data/rankings/holiday/consistency/rankings-500.json
diff --git a/src/data/rankings/holiday/leads/rankings-500.json b/src/data/rankings/holiday/leads/rankings-500.json
diff --git a/src/data/rankings/holiday/overall/rankings-500.json b/src/data/rankings/holiday/overall/rankings-500.json
diff --git a/src/data/rankings/holiday/switches/rankings-500.json b/src/data/rankings/holiday/switches/rankings-500.json
diff --git a/src/header.php b/src/header.php
@@ -1,5 +1,5 @@
 <?php require_once 'modules/config.php';
-$SITE_VERSION = '1.32.6.5';
+$SITE_VERSION = '1.32.6.7';
 
 // This prevents caching on local testing
 if (strpos($WEB_ROOT, 'src') !== false) {