Skip to content

Commit dccd3a5

Browse files
pvpokepvpoke
committed
Fixed Pillar Cup Pokemon, Necrozma fix
Removed Moongeist Beam and Sunsteel Strike from Elite TM pool.
1 parent 4b6eaee commit dccd3a5

File tree

6 files changed

+5
-15
lines changed

6 files changed

+5
-15
lines changed

‎src/data/gamemaster.json

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -346,18 +346,15 @@
346346
}]
347347
}, {
348348
"name": "pillar",
349-
"title": "Pillar",
349+
"title": "Devon Pillar Cup",
350350
"include": [{
351351
"filterType": "id",
352352
"name": "Species",
353353
"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"]
354354
}],
355355
"exclude": [],
356356
"overrides": [],
357-
"league": 1500,
358-
"useDefaultMovesets": 1,
359357
"levelCap": 50,
360-
"excludeLowPokemon": 0,
361358
"includeLowStatProduct": true
362359
}, {
363360
"name": "polaris",
@@ -35146,7 +35143,6 @@
3514635143
"types": ["psychic", "ghost"],
3514735144
"fastMoves": ["METAL_CLAW", "PSYCHO_CUT", "SHADOW_CLAW"],
3514835145
"chargedMoves": ["DARK_PULSE", "FUTURE_SIGHT", "IRON_HEAD", "OUTRAGE", "MOONGEIST_BEAM"],
35149-
"eliteMoves": ["MOONGEIST_BEAM"],
3515035146
"defaultIVs": {
3515135147
"cp500": [4.5, 15, 13, 15],
3515235148
"cp1500": [13.5, 6, 15, 6],
@@ -35170,7 +35166,6 @@
3517035166
"types": ["psychic", "steel"],
3517135167
"fastMoves": ["METAL_CLAW", "PSYCHO_CUT", "SHADOW_CLAW"],
3517235168
"chargedMoves": ["DARK_PULSE", "FUTURE_SIGHT", "IRON_HEAD", "OUTRAGE", "SUNSTEEL_STRIKE"],
35173-
"eliteMoves": ["SUNSTEEL_STRIKE"],
3517435169
"defaultIVs": {
3517535170
"cp500": [4.5, 15, 13, 15],
3517635171
"cp1500": [13.5, 6, 15, 6],

‎src/data/gamemaster.min.json

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

‎src/data/gamemaster/cups/pillar.json

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,13 @@
11
{
22
"name": "pillar",
3-
"title": "Pillar",
3+
"title": "Devon Pillar Cup",
44
"include": [{
55
"filterType": "id",
66
"name": "Species",
77
"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"]
88
}],
99
"exclude": [],
1010
"overrides": [],
11-
"league": 1500,
12-
"useDefaultMovesets": 1,
1311
"levelCap": 50,
14-
"excludeLowPokemon": 0,
1512
"includeLowStatProduct": true
1613
}

‎src/data/gamemaster/pokemon.json

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34326,7 +34326,6 @@
3432634326
"types": ["psychic", "ghost"],
3432734327
"fastMoves": ["METAL_CLAW", "PSYCHO_CUT", "SHADOW_CLAW"],
3432834328
"chargedMoves": ["DARK_PULSE", "FUTURE_SIGHT", "IRON_HEAD", "OUTRAGE", "MOONGEIST_BEAM"],
34329-
"eliteMoves": ["MOONGEIST_BEAM"],
3433034329
"defaultIVs": {
3433134330
"cp500": [4.5, 15, 13, 15],
3433234331
"cp1500": [13.5, 6, 15, 6],
@@ -34350,7 +34349,6 @@
3435034349
"types": ["psychic", "steel"],
3435134350
"fastMoves": ["METAL_CLAW", "PSYCHO_CUT", "SHADOW_CLAW"],
3435234351
"chargedMoves": ["DARK_PULSE", "FUTURE_SIGHT", "IRON_HEAD", "OUTRAGE", "SUNSTEEL_STRIKE"],
34353-
"eliteMoves": ["SUNSTEEL_STRIKE"],
3435434352
"defaultIVs": {
3435534353
"cp500": [4.5, 15, 13, 15],
3435634354
"cp1500": [13.5, 6, 15, 6],

‎src/data/groups/championshipseries.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,5 +160,5 @@
160160
}, {
161161
"speciesId": "mandibuzz",
162162
"fastMove": "AIR_SLASH",
163-
"chargedMoves": ["FOUL_PLAY", "AERIAL_ACE"]
163+
"chargedMoves": ["DARK_PULSE", "AERIAL_ACE"]
164164
}]

‎src/header.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?php require_once 'modules/config.php';
2-
$SITE_VERSION = '1.32.6.4';
2+
$SITE_VERSION = '1.32.6.5';
33

44
// This prevents caching on local testing
55
if (strpos($WEB_ROOT, 'src') !== false) {

0 commit comments

Comments
 (0)