Leahnaya/pokemon-showdown
1
0
Fork 0
mirror of https://github.com/smogon/pokemon-showdown.git synced 2026-04-24 23:09:10 -05:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Fix Dynamax move base power

Browse Source 
Dynamax moves now have the correct base power, and now correctly only
deal 25% usual damage against Protect.
This commit is contained in:
Guangcong Luo 2019-11-17 06:05:36 +13:00
parent 41d957919b
commit 0bb2e58efd
8 changed files with 95 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
data/mods/gen7/moves.js
View File

@ -304,7 +304,7 @@ let BattleMovedex = {
onTryHitPriority: 3,
onTryHit(target, source, move) {
if (!move.flags['protect'] || move.category === 'Status') {
if (move.isZ) target.getMoveHitData(move).zBrokeProtect = true;
if (move.isZ || move.isMax) target.getMoveHitData(move).zBrokeProtect = true;
return;
}
this.add('-activate', target, 'move: Protect');

4
data/mods/ssb/moves.js
View File

@ -337,7 +337,7 @@ let BattleMovedex = {
onTryHitPriority: 3,
onTryHit(target, source, move) {
if (!move.flags['protect']) {
if (move.isZ) target.getMoveHitData(move).zBrokeProtect = true;
if (move.isZ || move.isMax) target.getMoveHitData(move).zBrokeProtect = true;
return;
}
this.add('-activate', target, 'move: Protect');
@ -3547,7 +3547,7 @@ let BattleMovedex = {
onTryHitPriority: 3,
onTryHit(target, source, move) {
if (!move.flags['protect']) {
if (move.isZ) target.getMoveHitData(move).zBrokeProtect = true;
if (move.isZ || move.isMax) target.getMoveHitData(move).zBrokeProtect = true;
return;
}
this.add('-activate', target, 'move: Protect');

2
data/mods/ssb/scripts.js
View File

@ -347,7 +347,7 @@ let BattleScripts = {
// Final modifier. Modifiers that modify damage after min damage check, such as Life Orb.
baseDamage = this.runEvent('ModifyDamage', pokemon, target, move, baseDamage);
if (move.isZPowered && target.getMoveHitData(move).zBrokeProtect) {
if ((move.isZPowered || move.isMax) && target.getMoveHitData(move).zBrokeProtect) {
baseDamage = this.modify(baseDamage, 0.25);
this.add('-zbroken', target);
}

56
data/moves.js
View File

@ -1075,7 +1075,7 @@ let BattleMovedex = {
onTryHitPriority: 3,
onTryHit(target, source, move) {
if (!move.flags['protect']) {
if (move.isZ) target.getMoveHitData(move).zBrokeProtect = true;
if (move.isZ || move.isMax) target.getMoveHitData(move).zBrokeProtect = true;
return;
}
this.add('-activate', target, 'move: Protect');
@ -1743,6 +1743,7 @@ let BattleMovedex = {
target: "normal",
type: "Ground",
zMovePower: 100,
gmaxPower: 130,
contestType: "Tough",
},
"bonerush": {
@ -1762,6 +1763,7 @@ let BattleMovedex = {
target: "normal",
type: "Ground",
zMovePower: 140,
gmaxPower: 130,
contestType: "Tough",
},
"boomburst": {
@ -2177,6 +2179,7 @@ let BattleMovedex = {
target: "normal",
type: "Grass",
zMovePower: 140,
gmaxPower: 130,
contestType: "Cool",
},
"burnup": {
@ -2685,6 +2688,7 @@ let BattleMovedex = {
target: "normal",
type: "Normal",
zMovePower: 100,
gmaxPower: 100,
contestType: "Tough",
},
"confide": {
@ -3037,6 +3041,7 @@ let BattleMovedex = {
target: "scripted",
type: "Fighting",
zMovePower: 100,
gmaxPower: 75,
contestType: "Tough",
},
"courtchange": {
@ -3268,6 +3273,7 @@ let BattleMovedex = {
target: "normal",
type: "Normal",
zMovePower: 190,
gmaxPower: 140,
contestType: "Tough",
},
"curse": {
@ -3956,6 +3962,7 @@ let BattleMovedex = {
target: "normal",
type: "Normal",
zMovePower: 140,
gmaxPower: 120,
contestType: "Cool",
},
"doubleironbash": {
@ -3980,6 +3987,7 @@ let BattleMovedex = {
target: "normal",
type: "Steel",
zMovePower: 180,
gmaxPower: 140,
contestType: "Clever",
},
"doublekick": {
@ -3999,6 +4007,7 @@ let BattleMovedex = {
target: "normal",
type: "Fighting",
zMovePower: 100,
gmaxPower: 80,
contestType: "Cool",
},
"doubleslap": {
@ -4174,6 +4183,7 @@ let BattleMovedex = {
},
target: "normal",
type: "Dragon",
gmaxPower: 130,
},
"dragonhammer": {
num: 692,
@ -4407,6 +4417,7 @@ let BattleMovedex = {
target: "normal",
type: "Dragon",
zMovePower: 100,
gmaxPower: 130,
contestType: "Tough",
},
"dynamaxcannon": {
@ -4705,6 +4716,7 @@ let BattleMovedex = {
target: "normal",
type: "Electric",
zMovePower: 160,
gmaxPower: 130,
contestType: "Cool",
},
"electroweb": {
@ -4867,6 +4879,7 @@ let BattleMovedex = {
target: "normal",
type: "Normal",
zMovePower: 160,
gmaxPower: 130,
contestType: "Tough",
},
"endure": {
@ -5636,6 +5649,7 @@ let BattleMovedex = {
target: "normal",
type: "Ground",
zMovePower: 180,
gmaxPower: 130,
contestType: "Tough",
},
"flail": {
@ -5673,6 +5687,7 @@ let BattleMovedex = {
target: "normal",
type: "Normal",
zMovePower: 160,
gmaxPower: 130,
contestType: "Cute",
},
"flameburst": {
@ -6475,6 +6490,7 @@ let BattleMovedex = {
target: "normal",
type: "Normal",
zMovePower: 160,
gmaxPower: 130,
contestType: "Cute",
},
"furyattack": {
@ -6549,6 +6565,7 @@ let BattleMovedex = {
target: "normal",
type: "Normal",
zMovePower: 100,
gmaxPower: 100,
contestType: "Tough",
},
"fusionbolt": {
@ -6694,6 +6711,7 @@ let BattleMovedex = {
target: "normal",
type: "Steel",
zMovePower: 180,
gmaxPower: 130,
contestType: "Clever",
},
"gearup": {
@ -7352,6 +7370,7 @@ let BattleMovedex = {
target: "normal",
type: "Grass",
zMovePower: 160,
gmaxPower: 130,
contestType: "Cute",
},
"grasspledge": {
@ -7795,6 +7814,7 @@ let BattleMovedex = {
target: "normal",
type: "Normal",
zMovePower: 180,
gmaxPower: 130,
contestType: "Cool",
},
"gunkshot": {
@ -7860,6 +7880,7 @@ let BattleMovedex = {
target: "normal",
type: "Steel",
zMovePower: 160,
gmaxPower: 130,
contestType: "Cool",
},
"hail": {
@ -8299,6 +8320,7 @@ let BattleMovedex = {
target: "normal",
type: "Fire",
zMovePower: 160,
gmaxPower: 130,
contestType: "Tough",
},
"heatwave": {
@ -8363,6 +8385,7 @@ let BattleMovedex = {
target: "normal",
type: "Steel",
zMovePower: 160,
gmaxPower: 130,
contestType: "Tough",
},
"helpinghand": {
@ -8875,6 +8898,7 @@ let BattleMovedex = {
target: "normal",
type: "Normal",
zMovePower: 180,
gmaxPower: 130,
contestType: "Cool",
},
"hornleech": {
@ -9376,6 +9400,7 @@ let BattleMovedex = {
target: "normal",
type: "Ice",
zMovePower: 140,
gmaxPower: 130,
contestType: "Beautiful",
},
"icywind": {
@ -9833,7 +9858,7 @@ let BattleMovedex = {
onTryHitPriority: 3,
onTryHit(target, source, move) {
if (!move.flags['protect'] || move.category === 'Status') {
if (move.isZ) target.getMoveHitData(move).zBrokeProtect = true;
if (move.isZ || move.isMax) target.getMoveHitData(move).zBrokeProtect = true;
return;
}
this.add('-activate', target, 'move: Protect');
@ -10950,6 +10975,7 @@ let BattleMovedex = {
target: "allAdjacent",
type: "Ground",
zMovePower: 140,
gmaxPower: 140,
contestType: "Tough",
},
"maliciousmoonsault": {
@ -10999,7 +11025,7 @@ let BattleMovedex = {
onTryHitPriority: 3,
onTryHit(target, source, move) {
if (!move.flags['protect']) {
if (move.isZ) target.getMoveHitData(move).zBrokeProtect = true;
if (move.isZ || move.isMax) target.getMoveHitData(move).zBrokeProtect = true;
return;
}
if (move && (move.target === 'self' || move.category === 'Status')) return;
@ -12594,6 +12620,7 @@ let BattleMovedex = {
target: "normal",
type: "Normal",
zMovePower: 160,
gmaxPower: 130,
contestType: "Clever",
},
"naturepower": {
@ -13500,6 +13527,7 @@ let BattleMovedex = {
target: "normal",
type: "Bug",
zMovePower: 140,
gmaxPower: 130,
contestType: "Cool",
},
"plasmafists": {
@ -13957,6 +13985,7 @@ let BattleMovedex = {
target: "normal",
type: "Dark",
zMovePower: 160,
gmaxPower: 130,
contestType: "Clever",
},
"poweruppunch": {
@ -14101,7 +14130,7 @@ let BattleMovedex = {
onTryHitPriority: 3,
onTryHit(target, source, move) {
if (!move.flags['protect']) {
if (move.isZ) target.getMoveHitData(move).zBrokeProtect = true;
if (move.isZ || move.isMax) target.getMoveHitData(move).zBrokeProtect = true;
return;
}
this.add('-activate', target, 'move: Protect');
@ -14454,6 +14483,7 @@ let BattleMovedex = {
target: "normal",
type: "Dark",
zMovePower: 160,
gmaxPower: 130,
contestType: "Cool",
},
"purify": {
@ -14652,7 +14682,7 @@ let BattleMovedex = {
// (e.g. it blocks 0 priority moves boosted by Prankster or Gale Wings; Quick Claw/Custap Berry do not count)
if (move.priority <= 0.1) return;
if (!move.flags['protect']) {
if (move.isZ) target.getMoveHitData(move).zBrokeProtect = true;
if (move.isZ || move.isMax) target.getMoveHitData(move).zBrokeProtect = true;
return;
}
this.add('-activate', target, 'move: Quick Guard');
@ -15162,6 +15192,7 @@ let BattleMovedex = {
target: "normal",
type: "Normal",
zMovePower: 160,
gmaxPower: 130,
contestType: "Cute",
},
"revelationdance": {
@ -15312,6 +15343,7 @@ let BattleMovedex = {
target: "normal",
type: "Rock",
zMovePower: 140,
gmaxPower: 130,
contestType: "Tough",
},
"rockclimb": {
@ -16132,6 +16164,7 @@ let BattleMovedex = {
target: "normal",
type: "Fighting",
zMovePower: 100,
gmaxPower: 75,
contestType: "Tough",
},
"selfdestruct": {
@ -16376,6 +16409,7 @@ let BattleMovedex = {
target: "normal",
type: "Ice",
zMovePower: 180,
gmaxPower: 130,
contestType: "Beautiful",
},
"shellsmash": {
@ -17707,6 +17741,7 @@ let BattleMovedex = {
target: "normal",
type: "Normal",
zMovePower: 100,
gmaxPower: 120,
contestType: "Cool",
},
"spikes": {
@ -17776,7 +17811,7 @@ let BattleMovedex = {
onTryHitPriority: 3,
onTryHit(target, source, move) {
if (!move.flags['protect']) {
if (move.isZ) target.getMoveHitData(move).zBrokeProtect = true;
if (move.isZ || move.isMax) target.getMoveHitData(move).zBrokeProtect = true;
return;
}
this.add('-activate', target, 'move: Protect');
@ -18344,6 +18379,7 @@ let BattleMovedex = {
target: "normal",
type: "Psychic",
zMovePower: 160,
gmaxPower: 130,
contestType: "Clever",
},
"stormthrow": {
@ -19104,6 +19140,7 @@ let BattleMovedex = {
target: "normal",
type: "Normal",
zMovePower: 140,
gmaxPower: 130,
contestType: "Cute",
},
"tailwhip": {
@ -20117,6 +20154,7 @@ let BattleMovedex = {
target: "normal",
type: "Fighting",
zMovePower: 120,
gmaxPower: 80,
contestType: "Cool",
},
"tropkick": {
@ -20177,6 +20215,7 @@ let BattleMovedex = {
target: "normal",
type: "Normal",
zMovePower: 160,
gmaxPower: 130,
contestType: "Cool",
},
"twineedle": {
@ -20200,6 +20239,7 @@ let BattleMovedex = {
target: "normal",
type: "Bug",
zMovePower: 100,
gmaxPower: 100,
contestType: "Cool",
},
"twinkletackle": {
@ -20808,6 +20848,7 @@ let BattleMovedex = {
target: "normal",
type: "Normal",
zMovePower: 160,
gmaxPower: 130,
contestType: "Beautiful",
},
"whirlpool": {
@ -20879,7 +20920,7 @@ let BattleMovedex = {
if (move && move.target !== 'allAdjacent' && move.target !== 'allAdjacentFoes') {
return;
}
if (move.isZ) {
if (move.isZ || move.isMax) {
target.getMoveHitData(move).zBrokeProtect = true;
return;
}
@ -21167,6 +21208,7 @@ let BattleMovedex = {
target: "normal",
type: "Normal",
zMovePower: 190,
gmaxPower: 140,
contestType: "Tough",
},
"xscissor": {

13
data/scripts.js
View File

@ -1197,13 +1197,6 @@ let BattleScripts = {
if (gMaxMove.exists && gMaxMove.type === move.type) return gMaxMove;
}
let maxMove = this.dex.getMove(this.maxMoveTable[move.category === 'Status' ? move.category : move.type]);
// TODO defined a Max Move Power in all moves and use that
if (move.category !== 'Status') {
// @ts-ignore
maxMove.basePower = move.zMovePower || 120;
// @ts-ignore
maxMove.category = move.category;
}
if (maxMove.exists) return maxMove;
},
@ -1215,11 +1208,9 @@ let BattleScripts = {
let gMaxMove = this.dex.getActiveMove(gMaxTemplate.isGigantamax ? gMaxTemplate.isGigantamax : '');
if (gMaxMove.exists && gMaxMove.type === move.type) maxMove = gMaxMove;
}
// TODO defined a Max Move Power in all moves and use that
if (move.category !== 'Status') {
// @ts-ignore
maxMove.basePower = move.zMovePower || 120;
// @ts-ignore
if (!move.gmaxPower) throw new Error(`${move.name} doesn't have a gmaxPower`);
maxMove.basePower = move.gmaxPower;
maxMove.category = move.category;
}
maxMove.maxPowered = true;

2
sim/battle.ts
View File

@ -2104,7 +2104,7 @@ export class Battle {
// Final modifier. Modifiers that modify damage after min damage check, such as Life Orb.
baseDamage = this.runEvent('ModifyDamage', pokemon, target, move, baseDamage);
if (move.isZPowered && target.getMoveHitData(move).zBrokeProtect) {
if ((move.isZPowered || move.maxPowered) && target.getMoveHitData(move).zBrokeProtect) {
baseDamage = this.modify(baseDamage, 0.25);
this.add('-zbroken', target);
}

38
sim/dex-data.ts
View File

@ -799,6 +799,8 @@ export class Move extends BasicEffect implements Readonly<BasicEffect & MoveData
readonly noPPBoosts: boolean;
/** Is this move a Z-Move? */
readonly isZ: boolean | string;
/** Max/G-Max move power */
readonly gmaxPower?: number;
readonly flags: MoveFlags;
/** Whether or not the user must switch after using this move. */
readonly selfSwitch?: ID | boolean;
@ -869,6 +871,42 @@ export class Move extends BasicEffect implements Readonly<BasicEffect & MoveData
this.stab = data.stab || undefined;
this.volatileStatus = typeof data.volatileStatus === 'string' ? (data.volatileStatus as ID) : undefined;
if (this.category !== 'Status' && !this.gmaxPower) {
if (!this.basePower) {
this.gmaxPower = 100;
} else if (['Fighting', 'Poison'].includes(this.type)) {
if (this.basePower >= 150) {
this.gmaxPower = 100;
} else if (this.basePower >= 110) {
this.gmaxPower = 95;
} else if (this.basePower >= 75) {
this.gmaxPower = 95;
} else if (this.basePower >= 65) {
this.gmaxPower = 85;
} else if (this.basePower >= 45) {
this.gmaxPower = 75;
} else {
this.gmaxPower = 10;
}
} else {
if (this.basePower >= 150) {
this.gmaxPower = 150;
} else if (this.basePower >= 110) {
this.gmaxPower = 140;
} else if (this.basePower >= 75) {
this.gmaxPower = 130;
} else if (this.basePower >= 65) {
this.gmaxPower = 120;
} else if (this.basePower >= 55) {
this.gmaxPower = 110;
} else if (this.basePower >= 45) {
this.gmaxPower = 100;
} else {
this.gmaxPower = 90;
}
}
}
if (!this.gen) {
if (this.num >= 622) {
this.gen = 7;

1
sim/global-types.ts
View File

@ -823,6 +823,7 @@ interface MoveData extends EffectData, MoveEventMethods {
zMovePower?: number
zMoveEffect?: string
zMoveBoost?: SparseBoostsTable
gmaxPower?: number
basePowerCallback?: (this: Battle, pokemon: Pokemon, target: Pokemon, move: ActiveMove) => number | false | null
}