Leahnaya/pokemon-showdown
1
0
Fork 0
mirror of https://github.com/smogon/pokemon-showdown.git synced 2026-06-02 22:08:36 -05:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Fortemons: Fix base power and type modifiers (#9343)

Browse Source 
* Fortemons: Fix base power modifiers

* Extract ModifyType and remove redundant checks
This commit is contained in:
Alexander B 2023-01-22 13:39:22 -06:00 committed by GitHub
parent 2f410ddb18
commit 24c254666b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
config/formats.ts
View File

@ -985,7 +985,6 @@ export const Formats: FormatList = [
}
}
forte.onModifyMove?.call(this, move, pokemon, target);
if (target) forte.onModifyType?.call(this, move, pokemon, target);
}
},
onModifyPriority(priority, source, target, move) {
@ -997,18 +996,25 @@ export const Formats: FormatList = [
return priority + forte.priority;
}
},
onModifyTypePriority: 1,
onModifyType(move, pokemon, target) {
const forte = pokemon.m.forte;
if (move.category !== 'Status' && forte) {
this.singleEvent('ModifyType', forte, null, pokemon, target, move, move);
}
},
onHitPriority: 1,
onHit(target, source, move) {
const forte = source.m.forte;
if (move?.category !== 'Status' && forte) {
if (forte.onHit) this.singleEvent('Hit', forte, {}, target, source, move);
if (forte.self?.onHit) this.singleEvent('Hit', forte.self, {}, source, source, move);
if (forte.onAfterHit) this.singleEvent('AfterHit', forte, {}, target, source, move);
this.singleEvent('Hit', forte, {}, target, source, move);
if (forte.self) this.singleEvent('Hit', forte.self, {}, source, source, move);
this.singleEvent('AfterHit', forte, {}, target, source, move);
}
},
onAfterSubDamage(damage, target, source, move) {
const forte = source.m.forte;
if (move?.category !== 'Status' && forte?.onAfterSubDamage) {
if (move?.category !== 'Status' && forte) {
this.singleEvent('AfterSubDamage', forte, null, target, source, move);
}
},
@ -1018,7 +1024,7 @@ export const Formats: FormatList = [
onAfterMoveSecondaryPriority: 1,
onAfterMoveSecondarySelf(source, target, move) {
const forte = source.m.forte;
if (move?.category !== 'Status' && forte?.onAfterMoveSecondarySelf) {
if (move?.category !== 'Status' && forte) {
this.singleEvent('AfterMoveSecondarySelf', forte, null, source, target, move);
}
},
@ -1026,7 +1032,7 @@ export const Formats: FormatList = [
onBasePower(basePower, source, target, move) {
const forte = source.m.forte;
if (move.category !== 'Status' && forte?.onBasePower) {
this.singleEvent('BasePower', forte, null, source, target, move, basePower);
forte.onBasePower.call(this, basePower, source, target, move);
}
},
pokemon: {