Add Heal Block back to level up learnsets
The move itself is still not functional yet, but will be valuable for Endless when it is. Also made Curse's flavor text accurate to the canon games.pull/382/head
parent
c8583d6c69
commit
68f3326607
|
@ -2615,7 +2615,7 @@ export class CurseAttr extends MoveEffectAttr {
|
||||||
}
|
}
|
||||||
let curseRecoilDamage = Math.floor(user.getMaxHp() / 2);
|
let curseRecoilDamage = Math.floor(user.getMaxHp() / 2);
|
||||||
user.damageAndUpdate(curseRecoilDamage, HitResult.OTHER, false, true, true);
|
user.damageAndUpdate(curseRecoilDamage, HitResult.OTHER, false, true, true);
|
||||||
user.scene.queueMessage(getPokemonMessage(user, ' cut its own HP!'));
|
user.scene.queueMessage(getPokemonMessage(user, ` cut its own HP\nand laid a curse on the ${target.name}!`));
|
||||||
target.addTag(BattlerTagType.CURSED, 0, move.id, user.id);
|
target.addTag(BattlerTagType.CURSED, 0, move.id, user.id);
|
||||||
return true;
|
return true;
|
||||||
} else {
|
} else {
|
||||||
|
|
|
@ -4278,6 +4278,7 @@ export const pokemonSpeciesLevelMoves: PokemonSpeciesLevelMoves = {
|
||||||
[ 30, Moves.ANCIENT_POWER ],
|
[ 30, Moves.ANCIENT_POWER ],
|
||||||
[ 40, Moves.LIFE_DEW ],
|
[ 40, Moves.LIFE_DEW ],
|
||||||
[ 50, Moves.LEECH_SEED ],
|
[ 50, Moves.LEECH_SEED ],
|
||||||
|
[ 55, Moves.HEAL_BLOCK ],
|
||||||
[ 60, Moves.RECOVER ],
|
[ 60, Moves.RECOVER ],
|
||||||
[ 70, Moves.FUTURE_SIGHT ],
|
[ 70, Moves.FUTURE_SIGHT ],
|
||||||
[ 80, Moves.HEALING_WISH ],
|
[ 80, Moves.HEALING_WISH ],
|
||||||
|
@ -4976,6 +4977,7 @@ export const pokemonSpeciesLevelMoves: PokemonSpeciesLevelMoves = {
|
||||||
[ 23, Moves.ABSORB ],
|
[ 23, Moves.ABSORB ],
|
||||||
[ 29, Moves.SHADOW_SNEAK ],
|
[ 29, Moves.SHADOW_SNEAK ],
|
||||||
[ 36, Moves.FURY_SWIPES ],
|
[ 36, Moves.FURY_SWIPES ],
|
||||||
|
[ 41, Moves.HEAL_BLOCK ],
|
||||||
[ 43, Moves.MIND_READER ],
|
[ 43, Moves.MIND_READER ],
|
||||||
[ 50, Moves.SHADOW_BALL ],
|
[ 50, Moves.SHADOW_BALL ],
|
||||||
[ 57, Moves.SPITE ],
|
[ 57, Moves.SPITE ],
|
||||||
|
@ -5796,6 +5798,7 @@ export const pokemonSpeciesLevelMoves: PokemonSpeciesLevelMoves = {
|
||||||
[ 20, Moves.PSYSHOCK ],
|
[ 20, Moves.PSYSHOCK ],
|
||||||
[ 25, Moves.COSMIC_POWER ],
|
[ 25, Moves.COSMIC_POWER ],
|
||||||
[ 30, Moves.PSYCHIC ],
|
[ 30, Moves.PSYCHIC ],
|
||||||
|
[ 33, Moves.HEAL_BLOCK ],
|
||||||
[ 35, Moves.STONE_EDGE ],
|
[ 35, Moves.STONE_EDGE ],
|
||||||
[ 40, Moves.FUTURE_SIGHT ],
|
[ 40, Moves.FUTURE_SIGHT ],
|
||||||
[ 45, Moves.MAGIC_ROOM ],
|
[ 45, Moves.MAGIC_ROOM ],
|
||||||
|
@ -5814,6 +5817,7 @@ export const pokemonSpeciesLevelMoves: PokemonSpeciesLevelMoves = {
|
||||||
[ 20, Moves.ZEN_HEADBUTT ],
|
[ 20, Moves.ZEN_HEADBUTT ],
|
||||||
[ 25, Moves.COSMIC_POWER ],
|
[ 25, Moves.COSMIC_POWER ],
|
||||||
[ 30, Moves.PSYCHIC ],
|
[ 30, Moves.PSYCHIC ],
|
||||||
|
[ 33, Moves.HEAL_BLOCK ],
|
||||||
[ 35, Moves.STONE_EDGE ],
|
[ 35, Moves.STONE_EDGE ],
|
||||||
[ 40, Moves.SOLAR_BEAM ],
|
[ 40, Moves.SOLAR_BEAM ],
|
||||||
[ 45, Moves.WONDER_ROOM ],
|
[ 45, Moves.WONDER_ROOM ],
|
||||||
|
@ -5890,6 +5894,7 @@ export const pokemonSpeciesLevelMoves: PokemonSpeciesLevelMoves = {
|
||||||
[ 3, Moves.RAPID_SPIN ],
|
[ 3, Moves.RAPID_SPIN ],
|
||||||
[ 6, Moves.CONFUSION ],
|
[ 6, Moves.CONFUSION ],
|
||||||
[ 9, Moves.ROCK_TOMB ],
|
[ 9, Moves.ROCK_TOMB ],
|
||||||
|
[ 10, Moves.HEAL_BLOCK ],
|
||||||
[ 12, Moves.POWER_TRICK ],
|
[ 12, Moves.POWER_TRICK ],
|
||||||
[ 15, Moves.PSYBEAM ],
|
[ 15, Moves.PSYBEAM ],
|
||||||
[ 18, Moves.ANCIENT_POWER ],
|
[ 18, Moves.ANCIENT_POWER ],
|
||||||
|
@ -5911,6 +5916,7 @@ export const pokemonSpeciesLevelMoves: PokemonSpeciesLevelMoves = {
|
||||||
[ 1, Moves.MUD_SLAP ],
|
[ 1, Moves.MUD_SLAP ],
|
||||||
[ 1, Moves.RAPID_SPIN ],
|
[ 1, Moves.RAPID_SPIN ],
|
||||||
[ 9, Moves.ROCK_TOMB ],
|
[ 9, Moves.ROCK_TOMB ],
|
||||||
|
[ 10, Moves.HEAL_BLOCK ],
|
||||||
[ 12, Moves.POWER_TRICK ],
|
[ 12, Moves.POWER_TRICK ],
|
||||||
[ 15, Moves.PSYBEAM ],
|
[ 15, Moves.PSYBEAM ],
|
||||||
[ 18, Moves.ANCIENT_POWER ],
|
[ 18, Moves.ANCIENT_POWER ],
|
||||||
|
@ -6506,6 +6512,7 @@ export const pokemonSpeciesLevelMoves: PokemonSpeciesLevelMoves = {
|
||||||
[Species.LATIOS]: [
|
[Species.LATIOS]: [
|
||||||
[ 1, Moves.DRAGON_DANCE ],
|
[ 1, Moves.DRAGON_DANCE ],
|
||||||
[ 1, Moves.STORED_POWER ],
|
[ 1, Moves.STORED_POWER ],
|
||||||
|
[ 1, Moves.HEAL_BLOCK ],
|
||||||
[ 5, Moves.HELPING_HAND ],
|
[ 5, Moves.HELPING_HAND ],
|
||||||
[ 10, Moves.RECOVER ],
|
[ 10, Moves.RECOVER ],
|
||||||
[ 15, Moves.CONFUSION ],
|
[ 15, Moves.CONFUSION ],
|
||||||
|
@ -7364,6 +7371,7 @@ export const pokemonSpeciesLevelMoves: PokemonSpeciesLevelMoves = {
|
||||||
[ 36, Moves.IRON_DEFENSE ],
|
[ 36, Moves.IRON_DEFENSE ],
|
||||||
[ 40, Moves.METAL_SOUND ],
|
[ 40, Moves.METAL_SOUND ],
|
||||||
[ 44, Moves.FUTURE_SIGHT ],
|
[ 44, Moves.FUTURE_SIGHT ],
|
||||||
|
[ 45, Moves.HEAL_BLOCK ],
|
||||||
],
|
],
|
||||||
[Species.BRONZONG]: [
|
[Species.BRONZONG]: [
|
||||||
[ 0, Moves.BLOCK ],
|
[ 0, Moves.BLOCK ],
|
||||||
|
@ -7382,6 +7390,7 @@ export const pokemonSpeciesLevelMoves: PokemonSpeciesLevelMoves = {
|
||||||
[ 38, Moves.IRON_DEFENSE ],
|
[ 38, Moves.IRON_DEFENSE ],
|
||||||
[ 44, Moves.METAL_SOUND ],
|
[ 44, Moves.METAL_SOUND ],
|
||||||
[ 50, Moves.FUTURE_SIGHT ],
|
[ 50, Moves.FUTURE_SIGHT ],
|
||||||
|
[ 52, Moves.HEAL_BLOCK ],
|
||||||
[ 56, Moves.RAIN_DANCE ],
|
[ 56, Moves.RAIN_DANCE ],
|
||||||
],
|
],
|
||||||
[Species.BONSLY]: [
|
[Species.BONSLY]: [
|
||||||
|
@ -9491,6 +9500,7 @@ export const pokemonSpeciesLevelMoves: PokemonSpeciesLevelMoves = {
|
||||||
[Species.YAMASK]: [
|
[Species.YAMASK]: [
|
||||||
[ 1, Moves.PROTECT ],
|
[ 1, Moves.PROTECT ],
|
||||||
[ 1, Moves.ASTONISH ],
|
[ 1, Moves.ASTONISH ],
|
||||||
|
[ 1, Moves.HEAL_BLOCK ],
|
||||||
[ 4, Moves.HAZE ],
|
[ 4, Moves.HAZE ],
|
||||||
[ 8, Moves.NIGHT_SHADE ],
|
[ 8, Moves.NIGHT_SHADE ],
|
||||||
[ 12, Moves.DISABLE ],
|
[ 12, Moves.DISABLE ],
|
||||||
|
@ -9513,6 +9523,7 @@ export const pokemonSpeciesLevelMoves: PokemonSpeciesLevelMoves = {
|
||||||
[ 1, Moves.PROTECT ],
|
[ 1, Moves.PROTECT ],
|
||||||
[ 1, Moves.SCARY_FACE ],
|
[ 1, Moves.SCARY_FACE ],
|
||||||
[ 1, Moves.ASTONISH ],
|
[ 1, Moves.ASTONISH ],
|
||||||
|
[ 1, Moves.HEAL_BLOCK ],
|
||||||
[ 12, Moves.DISABLE ],
|
[ 12, Moves.DISABLE ],
|
||||||
[ 16, Moves.WILL_O_WISP ],
|
[ 16, Moves.WILL_O_WISP ],
|
||||||
[ 20, Moves.CRAFTY_SHIELD ],
|
[ 20, Moves.CRAFTY_SHIELD ],
|
||||||
|
@ -9720,6 +9731,7 @@ export const pokemonSpeciesLevelMoves: PokemonSpeciesLevelMoves = {
|
||||||
[ 24, Moves.HYPNOSIS ],
|
[ 24, Moves.HYPNOSIS ],
|
||||||
[ 28, Moves.FAKE_TEARS ],
|
[ 28, Moves.FAKE_TEARS ],
|
||||||
[ 33, Moves.PSYCH_UP ],
|
[ 33, Moves.PSYCH_UP ],
|
||||||
|
[ 34, Moves.HEAL_BLOCK ],
|
||||||
[ 36, Moves.PSYCHIC ],
|
[ 36, Moves.PSYCHIC ],
|
||||||
[ 40, Moves.FLATTER ],
|
[ 40, Moves.FLATTER ],
|
||||||
[ 44, Moves.FUTURE_SIGHT ],
|
[ 44, Moves.FUTURE_SIGHT ],
|
||||||
|
@ -9735,6 +9747,7 @@ export const pokemonSpeciesLevelMoves: PokemonSpeciesLevelMoves = {
|
||||||
[ 20, Moves.PSYSHOCK ],
|
[ 20, Moves.PSYSHOCK ],
|
||||||
[ 24, Moves.HYPNOSIS ],
|
[ 24, Moves.HYPNOSIS ],
|
||||||
[ 28, Moves.FAKE_TEARS ],
|
[ 28, Moves.FAKE_TEARS ],
|
||||||
|
[ 34, Moves.HEAL_BLOCK ],
|
||||||
[ 35, Moves.PSYCH_UP ],
|
[ 35, Moves.PSYCH_UP ],
|
||||||
[ 46, Moves.FLATTER ],
|
[ 46, Moves.FLATTER ],
|
||||||
[ 52, Moves.FUTURE_SIGHT ],
|
[ 52, Moves.FUTURE_SIGHT ],
|
||||||
|
@ -9750,6 +9763,7 @@ export const pokemonSpeciesLevelMoves: PokemonSpeciesLevelMoves = {
|
||||||
[ 20, Moves.PSYSHOCK ],
|
[ 20, Moves.PSYSHOCK ],
|
||||||
[ 24, Moves.HYPNOSIS ],
|
[ 24, Moves.HYPNOSIS ],
|
||||||
[ 28, Moves.FAKE_TEARS ],
|
[ 28, Moves.FAKE_TEARS ],
|
||||||
|
[ 34, Moves.HEAL_BLOCK ],
|
||||||
[ 35, Moves.PSYCH_UP ],
|
[ 35, Moves.PSYCH_UP ],
|
||||||
[ 40, Moves.PSYCHIC ],
|
[ 40, Moves.PSYCHIC ],
|
||||||
[ 48, Moves.FLATTER ],
|
[ 48, Moves.FLATTER ],
|
||||||
|
@ -9771,6 +9785,7 @@ export const pokemonSpeciesLevelMoves: PokemonSpeciesLevelMoves = {
|
||||||
[ 36, Moves.PSYCHIC ],
|
[ 36, Moves.PSYCHIC ],
|
||||||
[ 40, Moves.SKILL_SWAP ],
|
[ 40, Moves.SKILL_SWAP ],
|
||||||
[ 44, Moves.FUTURE_SIGHT ],
|
[ 44, Moves.FUTURE_SIGHT ],
|
||||||
|
[ 46, Moves.HEAL_BLOCK ],
|
||||||
[ 48, Moves.WONDER_ROOM ],
|
[ 48, Moves.WONDER_ROOM ],
|
||||||
],
|
],
|
||||||
[Species.DUOSION]: [
|
[Species.DUOSION]: [
|
||||||
|
@ -9787,6 +9802,7 @@ export const pokemonSpeciesLevelMoves: PokemonSpeciesLevelMoves = {
|
||||||
[ 35, Moves.PAIN_SPLIT ],
|
[ 35, Moves.PAIN_SPLIT ],
|
||||||
[ 40, Moves.PSYCHIC ],
|
[ 40, Moves.PSYCHIC ],
|
||||||
[ 46, Moves.SKILL_SWAP ],
|
[ 46, Moves.SKILL_SWAP ],
|
||||||
|
[ 50, Moves.HEAL_BLOCK ],
|
||||||
[ 52, Moves.FUTURE_SIGHT ],
|
[ 52, Moves.FUTURE_SIGHT ],
|
||||||
[ 58, Moves.WONDER_ROOM ],
|
[ 58, Moves.WONDER_ROOM ],
|
||||||
],
|
],
|
||||||
|
@ -9805,6 +9821,7 @@ export const pokemonSpeciesLevelMoves: PokemonSpeciesLevelMoves = {
|
||||||
[ 35, Moves.PAIN_SPLIT ],
|
[ 35, Moves.PAIN_SPLIT ],
|
||||||
[ 40, Moves.PSYCHIC ],
|
[ 40, Moves.PSYCHIC ],
|
||||||
[ 48, Moves.SKILL_SWAP ],
|
[ 48, Moves.SKILL_SWAP ],
|
||||||
|
[ 54, Moves.HEAL_BLOCK ],
|
||||||
[ 56, Moves.FUTURE_SIGHT ],
|
[ 56, Moves.FUTURE_SIGHT ],
|
||||||
[ 64, Moves.WONDER_ROOM ],
|
[ 64, Moves.WONDER_ROOM ],
|
||||||
],
|
],
|
||||||
|
@ -10209,6 +10226,7 @@ export const pokemonSpeciesLevelMoves: PokemonSpeciesLevelMoves = {
|
||||||
[ 1, Moves.GROWL ],
|
[ 1, Moves.GROWL ],
|
||||||
[ 1, Moves.CONFUSION ],
|
[ 1, Moves.CONFUSION ],
|
||||||
[ 6, Moves.IMPRISON ],
|
[ 6, Moves.IMPRISON ],
|
||||||
|
[ 8, Moves.HEAL_BLOCK ],
|
||||||
[ 12, Moves.TELEPORT ],
|
[ 12, Moves.TELEPORT ],
|
||||||
[ 18, Moves.PSYBEAM ],
|
[ 18, Moves.PSYBEAM ],
|
||||||
[ 24, Moves.GUARD_SPLIT ],
|
[ 24, Moves.GUARD_SPLIT ],
|
||||||
|
@ -10226,6 +10244,7 @@ export const pokemonSpeciesLevelMoves: PokemonSpeciesLevelMoves = {
|
||||||
[ 1, Moves.TELEPORT ],
|
[ 1, Moves.TELEPORT ],
|
||||||
[ 1, Moves.IMPRISON ],
|
[ 1, Moves.IMPRISON ],
|
||||||
[ 1, Moves.PSYCHIC_TERRAIN ],
|
[ 1, Moves.PSYCHIC_TERRAIN ],
|
||||||
|
[ 8, Moves.HEAL_BLOCK ],
|
||||||
[ 18, Moves.PSYBEAM ],
|
[ 18, Moves.PSYBEAM ],
|
||||||
[ 24, Moves.GUARD_SPLIT ],
|
[ 24, Moves.GUARD_SPLIT ],
|
||||||
[ 24, Moves.POWER_SPLIT ],
|
[ 24, Moves.POWER_SPLIT ],
|
||||||
|
@ -10884,6 +10903,7 @@ export const pokemonSpeciesLevelMoves: PokemonSpeciesLevelMoves = {
|
||||||
[ 20, Moves.SHOCK_WAVE ],
|
[ 20, Moves.SHOCK_WAVE ],
|
||||||
[ 25, Moves.AGILITY ],
|
[ 25, Moves.AGILITY ],
|
||||||
[ 30, Moves.CHARGE ],
|
[ 30, Moves.CHARGE ],
|
||||||
|
[ 31, Moves.HEAL_BLOCK ],
|
||||||
[ 35, Moves.VOLT_SWITCH ],
|
[ 35, Moves.VOLT_SWITCH ],
|
||||||
[ 40, Moves.CRUNCH ],
|
[ 40, Moves.CRUNCH ],
|
||||||
[ 45, Moves.DISCHARGE ],
|
[ 45, Moves.DISCHARGE ],
|
||||||
|
@ -11972,6 +11992,7 @@ export const pokemonSpeciesLevelMoves: PokemonSpeciesLevelMoves = {
|
||||||
[ 40, Moves.PLAY_ROUGH ],
|
[ 40, Moves.PLAY_ROUGH ],
|
||||||
[ 44, Moves.MAGIC_ROOM ],
|
[ 44, Moves.MAGIC_ROOM ],
|
||||||
[ 48, Moves.FOUL_PLAY ],
|
[ 48, Moves.FOUL_PLAY ],
|
||||||
|
[ 50, Moves.HEAL_BLOCK ],
|
||||||
[ 52, Moves.LAST_RESORT ],
|
[ 52, Moves.LAST_RESORT ],
|
||||||
],
|
],
|
||||||
[Species.PHANTUMP]: [
|
[Species.PHANTUMP]: [
|
||||||
|
@ -13045,6 +13066,7 @@ export const pokemonSpeciesLevelMoves: PokemonSpeciesLevelMoves = {
|
||||||
[ 45, Moves.IRON_HEAD ],
|
[ 45, Moves.IRON_HEAD ],
|
||||||
[ 50, Moves.TAKE_DOWN ],
|
[ 50, Moves.TAKE_DOWN ],
|
||||||
[ 55, Moves.DOUBLE_EDGE ],
|
[ 55, Moves.DOUBLE_EDGE ],
|
||||||
|
[ 60, Moves.HEAL_BLOCK ],
|
||||||
],
|
],
|
||||||
[Species.SILVALLY]: [
|
[Species.SILVALLY]: [
|
||||||
[ 0, Moves.MULTI_ATTACK ],
|
[ 0, Moves.MULTI_ATTACK ],
|
||||||
|
@ -13059,6 +13081,7 @@ export const pokemonSpeciesLevelMoves: PokemonSpeciesLevelMoves = {
|
||||||
[ 1, Moves.ICE_FANG ],
|
[ 1, Moves.ICE_FANG ],
|
||||||
[ 1, Moves.FIRE_FANG ],
|
[ 1, Moves.FIRE_FANG ],
|
||||||
[ 1, Moves.IRON_HEAD ],
|
[ 1, Moves.IRON_HEAD ],
|
||||||
|
[ 1, Moves.HEAL_BLOCK ],
|
||||||
[ 15, Moves.DOUBLE_HIT ],
|
[ 15, Moves.DOUBLE_HIT ],
|
||||||
[ 20, Moves.METAL_SOUND ],
|
[ 20, Moves.METAL_SOUND ],
|
||||||
[ 25, Moves.CRUSH_CLAW ],
|
[ 25, Moves.CRUSH_CLAW ],
|
||||||
|
|
Loading…
Reference in New Issue