Update metal coat evolutions to link cable with steel move
Update metal coat evolutions to link cable with steel move; update Sooth Bell rate to be more commonpull/18/head
parent
c5f52692f6
commit
d98b973a9a
|
@ -1468,7 +1468,7 @@ export const pokemonEvolutions: PokemonEvolutions = {
|
||||||
],
|
],
|
||||||
[Species.ONIX]: [
|
[Species.ONIX]: [
|
||||||
new SpeciesEvolution(Species.STEELIX, 1, EvolutionItem.LINKING_CORD, new SpeciesEvolutionCondition(
|
new SpeciesEvolution(Species.STEELIX, 1, EvolutionItem.LINKING_CORD, new SpeciesEvolutionCondition(
|
||||||
p => !!p.scene.findModifier(m => m instanceof AttackTypeBoosterModifier && (m.type as AttackTypeBoosterModifierType).moveType === Type.STEEL)),
|
p => p.moveset.filter(m => m.getMove().type === Type.STEEL).length > 0),
|
||||||
SpeciesWildEvolutionDelay.VERY_LONG)
|
SpeciesWildEvolutionDelay.VERY_LONG)
|
||||||
],
|
],
|
||||||
[Species.RHYDON]: [
|
[Species.RHYDON]: [
|
||||||
|
@ -1479,7 +1479,7 @@ export const pokemonEvolutions: PokemonEvolutions = {
|
||||||
],
|
],
|
||||||
[Species.SCYTHER]: [
|
[Species.SCYTHER]: [
|
||||||
new SpeciesEvolution(Species.SCIZOR, 1, EvolutionItem.LINKING_CORD, new SpeciesEvolutionCondition(
|
new SpeciesEvolution(Species.SCIZOR, 1, EvolutionItem.LINKING_CORD, new SpeciesEvolutionCondition(
|
||||||
p => !!p.scene.findModifier(m => m instanceof AttackTypeBoosterModifier && (m.type as AttackTypeBoosterModifierType).moveType === Type.STEEL) ),
|
p => p.moveset.filter(m => m.getMove().type === Type.STEEL).length > 0),
|
||||||
SpeciesWildEvolutionDelay.VERY_LONG),
|
SpeciesWildEvolutionDelay.VERY_LONG),
|
||||||
new SpeciesEvolution(Species.KLEAVOR, 1, EvolutionItem.BLACK_AUGURITE, null, SpeciesWildEvolutionDelay.VERY_LONG)
|
new SpeciesEvolution(Species.KLEAVOR, 1, EvolutionItem.BLACK_AUGURITE, null, SpeciesWildEvolutionDelay.VERY_LONG)
|
||||||
],
|
],
|
||||||
|
|
|
@ -1532,6 +1532,7 @@ export const pokemonSpeciesLevelMoves: PokemonSpeciesLevelMoves = {
|
||||||
[ 20, Moves.ROCK_SLIDE ],
|
[ 20, Moves.ROCK_SLIDE ],
|
||||||
[ 24, Moves.SCREECH ],
|
[ 24, Moves.SCREECH ],
|
||||||
[ 28, Moves.SAND_TOMB ],
|
[ 28, Moves.SAND_TOMB ],
|
||||||
|
[ 30, Moves.IRON_DEFENSE ],
|
||||||
[ 32, Moves.STEALTH_ROCK ],
|
[ 32, Moves.STEALTH_ROCK ],
|
||||||
[ 36, Moves.SLAM ],
|
[ 36, Moves.SLAM ],
|
||||||
[ 40, Moves.SANDSTORM ],
|
[ 40, Moves.SANDSTORM ],
|
||||||
|
@ -2025,6 +2026,7 @@ export const pokemonSpeciesLevelMoves: PokemonSpeciesLevelMoves = {
|
||||||
[ 20, Moves.DOUBLE_HIT ],
|
[ 20, Moves.DOUBLE_HIT ],
|
||||||
[ 24, Moves.SLASH ],
|
[ 24, Moves.SLASH ],
|
||||||
[ 28, Moves.FOCUS_ENERGY ],
|
[ 28, Moves.FOCUS_ENERGY ],
|
||||||
|
[ 30, Moves.STEEL_WING ],
|
||||||
[ 32, Moves.AGILITY ],
|
[ 32, Moves.AGILITY ],
|
||||||
[ 36, Moves.AIR_SLASH ],
|
[ 36, Moves.AIR_SLASH ],
|
||||||
[ 40, Moves.X_SCISSOR ],
|
[ 40, Moves.X_SCISSOR ],
|
||||||
|
|
|
@ -983,10 +983,7 @@ const modifierPool: ModifierPool = {
|
||||||
new WeightedModifierType(modifierTypes.ATTACK_TYPE_BOOSTER, 10),
|
new WeightedModifierType(modifierTypes.ATTACK_TYPE_BOOSTER, 10),
|
||||||
new WeightedModifierType(modifierTypes.TM_ULTRA, 8),
|
new WeightedModifierType(modifierTypes.TM_ULTRA, 8),
|
||||||
new WeightedModifierType(modifierTypes.RARER_CANDY, 4),
|
new WeightedModifierType(modifierTypes.RARER_CANDY, 4),
|
||||||
new WeightedModifierType(modifierTypes.SOOTHE_BELL, (party: Pokemon[]) => {
|
new WeightedModifierType(modifierTypes.SOOTHE_BELL, (party: Pokemon[]) => party.find(p => (pokemonEvolutions.hasOwnProperty(p.species.speciesId) && pokemonEvolutions[p.species.speciesId].find(e => e.condition && e.condition instanceof SpeciesFriendshipEvolutionCondition)) || p.moveset.find(m => m.moveId === Moves.RETURN)) ? 16 : 0, 16),
|
||||||
const friendshipBenefitPartyMemberCount = Math.min(party.filter(p => (pokemonEvolutions.hasOwnProperty(p.species.speciesId) && pokemonEvolutions[p.species.speciesId].find(e => e.condition && e.condition instanceof SpeciesFriendshipEvolutionCondition)) || p.moveset.find(m => m.moveId === Moves.RETURN)).length, 3);
|
|
||||||
return friendshipBenefitPartyMemberCount * 3;
|
|
||||||
}, 9),
|
|
||||||
new WeightedModifierType(modifierTypes.SOUL_DEW, 2),
|
new WeightedModifierType(modifierTypes.SOUL_DEW, 2),
|
||||||
new WeightedModifierType(modifierTypes.GOLDEN_PUNCH, 2),
|
new WeightedModifierType(modifierTypes.GOLDEN_PUNCH, 2),
|
||||||
new WeightedModifierType(modifierTypes.IV_SCANNER, 2),
|
new WeightedModifierType(modifierTypes.IV_SCANNER, 2),
|
||||||
|
|
Loading…
Reference in New Issue