Merge branch 'pvpoke:master' into master

chrisisth · Dec 16, 2024 · 5ec4401 · 5ec4401
2 parents ca41f31 + dccd3a5
commit 5ec4401
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 15 deletions.
diff --git a/src/data/gamemaster.json b/src/data/gamemaster.json
@@ -346,18 +346,15 @@
         }]
     }, {
         "name": "pillar",
-        "title": "Pillar",
+        "title": "Devon Pillar Cup",
         "include": [{
             "filterType": "id",
             "name": "Species",
             "values": ["bibarel", "bibarel_shadow", "clodsire", "feraligatr", "feraligatr_shadow", "ariados", "azumarill", "malamar", "jumpluff", "jumpluff_shadow", "drapion", "drapion_shadow", "lickilicky", "samurott", "walrein", "walrein_shadow", "arctibax", "goodra", "hippowdon", "hippowdon_shadow", "miltank", "ursaring", "ursaring_shadow", "sableye", "sableye_shadow", "weezing_galarian", "weezing_galarian_shadow", "cresselia", "cresselia_shadow", "regirock", "regirock_shadow", "stunfisk", "gligar", "gligar_shadow", "sealeo", "sealeo_shadow", "castform_rainy", "froslass", "froslass_shadow", "lokix", "greedent", "trevenant", "leavanny", "nidoqueen", "nidoqueen_shadow", "golisopod", "spiritomb", "raticate_alolan", "raticate_alolan_shadow", "cradily", "cradily_shadow", "empoleon", "empoleon_shadow", "altaria", "jellicent", "politoed", "politoed_shadow", "furfrou", "beedrill", "beedrill_shadow", "scizor", "scizor_shadow", "seaking", "pelipper", "dragapult", "typhlosion", "typhlosion_shadow", "tapu_fini", "rapidash", "furret", "pidgeot", "pidgeot_shadow", "gyarados", "gyarados_shadow", "lapras", "lapras_shadow", "noctowl", "zangoose", "forretress", "forretress_shadow", "mienshao", "sneasler", "sneasler_shadow", "sneasel_hisuian", "sneasel_hisuian_shadow", "qwilfish", "qwilfish_hisuian", "lunatone", "solrock", "victini", "poliwhirl", "poliwhirl_shadow", "magmar", "magmar_shadow", "magmortar", "magmortar_shadow", "sceptile", "sceptile_shadow", "marowak_alolan", "marowak_alolan_shadow", "runerigus", "gliscor", "gliscor_shadow", "regice", "regice_shadow", "nidoking", "nidoking_shadow", "flygon", "flygon_shadow", "sandslash", "sandslash_shadow", "rapidash_galarian", "swalot", "aurorus", "bewear", "starmie", "diggersby"]
         }],
         "exclude": [],
         "overrides": [],
-        "league": 1500,
-        "useDefaultMovesets": 1,
         "levelCap": 50,
-        "excludeLowPokemon": 0,
         "includeLowStatProduct": true
     }, {
         "name": "polaris",
@@ -35146,7 +35143,6 @@
         "types": ["psychic", "ghost"],
         "fastMoves": ["METAL_CLAW", "PSYCHO_CUT", "SHADOW_CLAW"],
         "chargedMoves": ["DARK_PULSE", "FUTURE_SIGHT", "IRON_HEAD", "OUTRAGE", "MOONGEIST_BEAM"],
-        "eliteMoves": ["MOONGEIST_BEAM"],
         "defaultIVs": {
             "cp500": [4.5, 15, 13, 15],
             "cp1500": [13.5, 6, 15, 6],
@@ -35170,7 +35166,6 @@
         "types": ["psychic", "steel"],
         "fastMoves": ["METAL_CLAW", "PSYCHO_CUT", "SHADOW_CLAW"],
         "chargedMoves": ["DARK_PULSE", "FUTURE_SIGHT", "IRON_HEAD", "OUTRAGE", "SUNSTEEL_STRIKE"],
-        "eliteMoves": ["SUNSTEEL_STRIKE"],
         "defaultIVs": {
             "cp500": [4.5, 15, 13, 15],
             "cp1500": [13.5, 6, 15, 6],

diff --git a/src/data/gamemaster.min.json b/src/data/gamemaster.min.json
diff --git a/src/data/gamemaster/cups/pillar.json b/src/data/gamemaster/cups/pillar.json
@@ -1,16 +1,13 @@
 {
     "name": "pillar",
-    "title": "Pillar",
+    "title": "Devon Pillar Cup",
     "include": [{
         "filterType": "id",
         "name": "Species",
         "values": ["bibarel", "bibarel_shadow", "clodsire", "feraligatr", "feraligatr_shadow", "ariados", "azumarill", "malamar", "jumpluff", "jumpluff_shadow", "drapion", "drapion_shadow", "lickilicky", "samurott", "walrein", "walrein_shadow", "arctibax", "goodra", "hippowdon", "hippowdon_shadow", "miltank", "ursaring", "ursaring_shadow", "sableye", "sableye_shadow", "weezing_galarian", "weezing_galarian_shadow", "cresselia", "cresselia_shadow", "regirock", "regirock_shadow", "stunfisk", "gligar", "gligar_shadow", "sealeo", "sealeo_shadow", "castform_rainy", "froslass", "froslass_shadow", "lokix", "greedent", "trevenant", "leavanny", "nidoqueen", "nidoqueen_shadow", "golisopod", "spiritomb", "raticate_alolan", "raticate_alolan_shadow", "cradily", "cradily_shadow", "empoleon", "empoleon_shadow", "altaria", "jellicent", "politoed", "politoed_shadow", "furfrou", "beedrill", "beedrill_shadow", "scizor", "scizor_shadow", "seaking", "pelipper", "dragapult", "typhlosion", "typhlosion_shadow", "tapu_fini", "rapidash", "furret", "pidgeot", "pidgeot_shadow", "gyarados", "gyarados_shadow", "lapras", "lapras_shadow", "noctowl", "zangoose", "forretress", "forretress_shadow", "mienshao", "sneasler", "sneasler_shadow", "sneasel_hisuian", "sneasel_hisuian_shadow", "qwilfish", "qwilfish_hisuian", "lunatone", "solrock", "victini", "poliwhirl", "poliwhirl_shadow", "magmar", "magmar_shadow", "magmortar", "magmortar_shadow", "sceptile", "sceptile_shadow", "marowak_alolan", "marowak_alolan_shadow", "runerigus", "gliscor", "gliscor_shadow", "regice", "regice_shadow", "nidoking", "nidoking_shadow", "flygon", "flygon_shadow", "sandslash", "sandslash_shadow", "rapidash_galarian", "swalot", "aurorus", "bewear", "starmie", "diggersby"]
     }],
     "exclude": [],
     "overrides": [],
-    "league": 1500,
-    "useDefaultMovesets": 1,
     "levelCap": 50,
-    "excludeLowPokemon": 0,
     "includeLowStatProduct": true
 }
diff --git a/src/data/gamemaster/pokemon.json b/src/data/gamemaster/pokemon.json
@@ -34326,7 +34326,6 @@
     "types": ["psychic", "ghost"],
     "fastMoves": ["METAL_CLAW", "PSYCHO_CUT", "SHADOW_CLAW"],
     "chargedMoves": ["DARK_PULSE", "FUTURE_SIGHT", "IRON_HEAD", "OUTRAGE", "MOONGEIST_BEAM"],
-    "eliteMoves": ["MOONGEIST_BEAM"],
     "defaultIVs": {
         "cp500": [4.5, 15, 13, 15],
         "cp1500": [13.5, 6, 15, 6],
@@ -34350,7 +34349,6 @@
     "types": ["psychic", "steel"],
     "fastMoves": ["METAL_CLAW", "PSYCHO_CUT", "SHADOW_CLAW"],
     "chargedMoves": ["DARK_PULSE", "FUTURE_SIGHT", "IRON_HEAD", "OUTRAGE", "SUNSTEEL_STRIKE"],
-    "eliteMoves": ["SUNSTEEL_STRIKE"],
     "defaultIVs": {
         "cp500": [4.5, 15, 13, 15],
         "cp1500": [13.5, 6, 15, 6],

diff --git a/src/data/groups/championshipseries.json b/src/data/groups/championshipseries.json
@@ -160,5 +160,5 @@
 }, {
     "speciesId": "mandibuzz",
     "fastMove": "AIR_SLASH",
-    "chargedMoves": ["FOUL_PLAY", "AERIAL_ACE"]
+    "chargedMoves": ["DARK_PULSE", "AERIAL_ACE"]
 }]
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.4';
+$SITE_VERSION = '1.32.6.5';
 
 // This prevents caching on local testing
 if (strpos($WEB_ROOT, 'src') !== false) {