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 multihit moves continuing after a KO (#5360)

Browse Source
This commit is contained in:
MacChaeger 2019-03-28 06:02:37 -05:00 committed by Guangcong Luo
parent c18f244071
commit 905ed1e95c
2 changed files with 49 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
data/scripts.js
View File

@ -584,20 +584,20 @@ let BattleScripts = {
for (let i = 0; i < targets.length; i++) damage[i] = 0;
move.totalDamage = 0;
pokemon.lastDamage = 0;
let hits = move.multihit || 1;
if (Array.isArray(hits)) {
let targetHits = move.multihit || 1;
if (Array.isArray(targetHits)) {
// yes, it's hardcoded... meh
if (hits[0] === 2 && hits[1] === 5) {
if (targetHits[0] === 2 && targetHits[1] === 5) {
if (this.gen >= 5) {
hits = this.sample([2, 2, 3, 3, 4, 5]);
targetHits = this.sample([2, 2, 3, 3, 4, 5]);
} else {
hits = this.sample([2, 2, 2, 3, 3, 3, 4, 5]);
targetHits = this.sample([2, 2, 2, 3, 3, 3, 4, 5]);
}
} else {
hits = this.random(hits[0], hits[1] + 1);
targetHits = this.random(targetHits[0], targetHits[1] + 1);
}
}
hits = Math.floor(hits);
targetHits = Math.floor(targetHits);
let nullDamage = true;
/** @type {(number | boolean | undefined)[]} */
let moveDamage;
@ -606,15 +606,17 @@ let BattleScripts = {
/** @type {(Pokemon | false | null)[]} */
let targetsCopy = targets.slice(0);
let i;
for (i = 0; i < hits && !damage.includes(false); i++) {
let hit;
for (hit = 1; hit <= targetHits; hit++) {
if (damage.includes(false)) break;
if (pokemon.status === 'slp' && !isSleepUsable) break;
move.hit = i + 1;
if (targets.some(target => target && !target.hp)) break;
move.hit = hit;
targetsCopy = targets.slice(0);
let target = targetsCopy[0]; // some relevant-to-single-target-moves-only things are hardcoded
// like this (Triple Kick)
if (target && move.multiaccuracy && i > 0) {
if (target && move.multiaccuracy && hit > 1) {
let accuracy = move.accuracy;
const boostTable = [1, 4 / 3, 5 / 3, 2, 7 / 3, 8 / 3, 3];
if (accuracy !== true) {
@ -650,29 +652,31 @@ let BattleScripts = {
// Modifies targetsCopy (which is why it's a copy)
[moveDamage, targetsCopy] = this.spreadMoveHit(targetsCopy, pokemon, move, moveData);
if (!moveDamage.some(val => val !== false)) {
break;
}
if (!moveDamage.some(val => val !== false)) break;
nullDamage = false;
for (let j = 0; j < damage.length; j++) {
for (const [i, md] of moveDamage.entries()) {
// Damage from each hit is individually counted for the
// purposes of Counter, Metal Burst, and Mirror Coat.
damage[j] = moveDamage[j] === true || !moveDamage[j] ? 0 : moveDamage[j];
damage[i] = md === true || !md ? 0 : md;
// Total damage dealt is accumulated for the purposes of recoil (Parental Bond).
// @ts-ignore
move.totalDamage += damage[j];
move.totalDamage += damage[i];
}
if (move.mindBlownRecoil) {
this.damage(Math.round(pokemon.maxhp / 2), pokemon, pokemon, this.getEffect('Mind Blown'), true);
move.mindBlownRecoil = false;
}
this.eachEvent('Update');
if (!pokemon.hp) break;
if (!pokemon.hp) {
hit++; // report the correct number of hits for multihit moves
break;
}
}
if (i === 0) return damage.fill(false);
// hit is 1 higher than the actual hit count
if (hit === 1) return damage.fill(false);
if (nullDamage) damage.fill(false);
if (move.multihit) this.add('-hitcount', targets[0], i);
if (move.multihit) this.add('-hitcount', targets[0], hit - 1);
if (move.recoil && move.totalDamage) {
this.damage(this.calcRecoilDamage(move.totalDamage, move), pokemon, pokemon, 'recoil');

25
test/simulator/abilities/aftermath.js Normal file
View File

@ -0,0 +1,25 @@
'use strict';
const assert = require('./../../assert');
const common = require('./../../common');
let battle;
describe('Atermath', function () {
afterEach(function () {
battle.destroy();
});
it("should hurt attackers by 1/4 their max HP when this Pokemon is KOed by a contact move", function () {
battle = common.createBattle();
battle.setPlayer('p1', {team: [
{species: 'Voltorb', level: 1, item: 'rockyhelmet', ability: 'aftermath', moves: ['sleeptalk']},
]});
battle.setPlayer('p2', {team: [
{species: 'Nidoqueen', ability: 'sheerforce', moves: ['doublekick']},
]});
battle.makeChoices('auto', 'move doublekick');
const queen = battle.p2.active[0];
assert.strictEqual(queen.hp, queen.maxhp - Math.floor(queen.maxhp / 4) - Math.floor(queen.maxhp / 6));
});
});