Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Improve multihit move support #590

Merged
merged 8 commits into from
Feb 26, 2024
Merged

Improve multihit move support #590

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
ee09372
Combine timesUsed and multihit to properly encode all effects between…
ShivaD173 Dec 11, 2023
50ca0f6
Use CalcBaseDmg and Fix between hit boosts
ShivaD173 Dec 16, 2023
05df464
Fix multihit interactions with tera stellar and tera shell
ShivaD173 Dec 31, 2023
e26c72a
Modularize gen3-6 to allow for multihit support
ShivaD173 Jan 30, 2024
e889352
Speed up multihit calculation
ShivaD173 Jan 30, 2024
133d4ae
Add Tests for multihit moves
ShivaD173 Jan 30, 2024
5746233
Fix Multiscale and add test, fix stellar on multihit
ShivaD173 Feb 25, 2024
cfa0e61
Merge branch 'master' into calc_effects_in_multihit
thejetou Feb 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
205 changes: 146 additions & 59 deletions calc/src/mechanics/gen3.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ import {
checkAirLock,
checkForecast,
checkIntimidate,
checkMultihitBoost,
handleFixedDamageMoves,
} from './util';

Expand Down Expand Up @@ -132,6 +133,73 @@ export function calculateADV(
desc.hits = move.hits;
}

let bp = calculateBasePowerADV(attacker, defender, move, desc);

if (bp === 0) {
return result;
}
bp = calculateBPModsADV(attacker, move, desc, bp);

const isCritical = move.isCrit && !defender.hasAbility('Battle Armor', 'Shell Armor');
const at = calculateAttackADV(gen, attacker, defender, move, desc, isCritical);
const df = calculateDefenseADV(gen, defender, move, desc, isCritical);

const lv = attacker.level;
let baseDamage = Math.floor(Math.floor((Math.floor((2 * lv) / 5 + 2) * at * bp) / df) / 50);

baseDamage = calculateFinalModsADV(baseDamage, attacker, move, field, desc, isCritical);

baseDamage = Math.floor(baseDamage * typeEffectiveness);
result.damage = [];
for (let i = 85; i <= 100; i++) {
result.damage[i - 85] = Math.max(1, Math.floor((baseDamage * i) / 100));
}

if ((move.dropsStats && move.timesUsed! > 1) || move.hits > 1) {
// store boosts so intermediate boosts don't show.
const origDefBoost = desc.defenseBoost;
const origAtkBoost = desc.attackBoost;
let numAttacks = 1;
if (move.dropsStats && move.timesUsed! > 1) {
desc.moveTurns = `over ${move.timesUsed} turns`;
numAttacks = move.timesUsed!;
} else {
numAttacks = move.hits;
}
let usedItems = [false, false];
for (let times = 1; times < numAttacks; times++) {
usedItems = checkMultihitBoost(gen, attacker, defender, move,
field, desc, usedItems[0], usedItems[1]);
const newAt = calculateAttackADV(gen, attacker, defender, move, desc, isCritical);
let newBp = calculateBasePowerADV(attacker, defender, move, desc);
newBp = calculateBPModsADV(attacker, move, desc, newBp);
let newBaseDmg = Math.floor(
Math.floor((Math.floor((2 * lv) / 5 + 2) * newAt * newBp) / df) / 50
);
newBaseDmg = calculateFinalModsADV(newBaseDmg, attacker, move, field, desc, isCritical);
newBaseDmg = Math.floor(newBaseDmg * typeEffectiveness);

let damageMultiplier = 85;
result.damage = result.damage.map(affectedAmount => {
const newFinalDamage = Math.max(1, Math.floor((newBaseDmg * damageMultiplier) / 100));
damageMultiplier++;
return affectedAmount + newFinalDamage;
});
}
desc.defenseBoost = origDefBoost;
desc.attackBoost = origAtkBoost;
}

return result;
}

export function calculateBasePowerADV(
attacker: Pokemon,
defender: Pokemon,
move: Move,
desc: RawDesc,
hit = 1,
) {
let bp = move.bp;
switch (move.name) {
case 'Flail':
Expand Down Expand Up @@ -161,22 +229,47 @@ export function calculateADV(
bp = 60;
desc.moveName = 'Swift';
break;
case 'Triple Kick':
bp = hit * 10;
desc.moveBP = move.hits === 2 ? 30 : move.hits === 3 ? 60 : 10;
break;
default:
bp = move.bp;
}
return bp;
}

if (bp === 0) {
return result;
export function calculateBPModsADV(
attacker: Pokemon,
move: Move,
desc: RawDesc,
basePower: number,
) {
if (attacker.curHP() <= attacker.maxHP() / 3 &&
((attacker.hasAbility('Overgrow') && move.hasType('Grass')) ||
(attacker.hasAbility('Blaze') && move.hasType('Fire')) ||
(attacker.hasAbility('Torrent') && move.hasType('Water')) ||
(attacker.hasAbility('Swarm') && move.hasType('Bug')))
) {
basePower = Math.floor(basePower * 1.5);
desc.attackerAbility = attacker.ability;
}
return basePower;
}

export function calculateAttackADV(
gen: Generation,
attacker: Pokemon,
defender: Pokemon,
move: Move,
desc: RawDesc,
isCritical = false
) {
const isPhysical = move.category === 'Physical';
const attackStat = isPhysical ? 'atk' : 'spa';
desc.attackEVs = getEVDescriptionText(gen, attacker, attackStat, attacker.nature);
const defenseStat = isPhysical ? 'def' : 'spd';
desc.defenseEVs = getEVDescriptionText(gen, defender, defenseStat, defender.nature);

let at = attacker.rawStats[attackStat];
let df = defender.rawStats[defenseStat];

if (isPhysical && attacker.hasAbility('Huge Power', 'Pure Power')) {
at *= 2;
Expand Down Expand Up @@ -204,6 +297,40 @@ export function calculateADV(
desc.attackerItem = attacker.item;
}

if (defender.hasAbility('Thick Fat') && (move.hasType('Fire', 'Ice'))) {
at = Math.floor(at / 2);
desc.defenderAbility = defender.ability;
}

if ((isPhysical &&
(attacker.hasAbility('Hustle') || (attacker.hasAbility('Guts') && attacker.status))) ||
(!isPhysical && attacker.abilityOn && attacker.hasAbility('Plus', 'Minus'))
) {
at = Math.floor(at * 1.5);
desc.attackerAbility = attacker.ability;
}

const attackBoost = attacker.boosts[attackStat];
if (attackBoost > 0 || (!isCritical && attackBoost < 0)) {
at = getModifiedStat(at, attackBoost);
desc.attackBoost = attackBoost;
}
return at;
}

export function calculateDefenseADV(
gen: Generation,
defender: Pokemon,
move: Move,
desc: RawDesc,
isCritical = false
) {
const isPhysical = move.category === 'Physical';
const defenseStat = isPhysical ? 'def' : 'spd';
desc.defenseEVs = getEVDescriptionText(gen, defender, defenseStat, defender.nature);

let df = defender.rawStats[defenseStat];

if (!isPhysical && defender.hasItem('Soul Dew') && defender.named('Latios', 'Latias')) {
df = Math.floor(df * 1.5);
desc.defenderItem = defender.item;
Expand All @@ -215,50 +342,32 @@ export function calculateADV(
desc.defenderItem = defender.item;
}

if (defender.hasAbility('Thick Fat') && (move.hasType('Fire', 'Ice'))) {
at = Math.floor(at / 2);
desc.defenderAbility = defender.ability;
} else if (isPhysical && defender.hasAbility('Marvel Scale') && defender.status) {
if (isPhysical && defender.hasAbility('Marvel Scale') && defender.status) {
df = Math.floor(df * 1.5);
desc.defenderAbility = defender.ability;
}

if ((isPhysical &&
(attacker.hasAbility('Hustle') || (attacker.hasAbility('Guts') && attacker.status))) ||
(!isPhysical && attacker.abilityOn && attacker.hasAbility('Plus', 'Minus'))
) {
at = Math.floor(at * 1.5);
desc.attackerAbility = attacker.ability;
} else if (attacker.curHP() <= attacker.maxHP() / 3 &&
((attacker.hasAbility('Overgrow') && move.hasType('Grass')) ||
(attacker.hasAbility('Blaze') && move.hasType('Fire')) ||
(attacker.hasAbility('Torrent') && move.hasType('Water')) ||
(attacker.hasAbility('Swarm') && move.hasType('Bug')))
) {
bp = Math.floor(bp * 1.5);
desc.attackerAbility = attacker.ability;
}

if (move.named('Explosion', 'Self-Destruct')) {
df = Math.floor(df / 2);
}

const isCritical = move.isCrit && !defender.hasAbility('Battle Armor', 'Shell Armor');

const attackBoost = attacker.boosts[attackStat];
const defenseBoost = defender.boosts[defenseStat];
if (attackBoost > 0 || (!isCritical && attackBoost < 0)) {
at = getModifiedStat(at, attackBoost);
desc.attackBoost = attackBoost;
}
if (defenseBoost < 0 || (!isCritical && defenseBoost > 0)) {
df = getModifiedStat(df, defenseBoost);
desc.defenseBoost = defenseBoost;
}
return df;
}

const lv = attacker.level;
let baseDamage = Math.floor(Math.floor((Math.floor((2 * lv) / 5 + 2) * at * bp) / df) / 50);

function calculateFinalModsADV(
baseDamage: number,
attacker: Pokemon,
move: Move,
field: Field,
desc: RawDesc,
isCritical = false,
) {
const isPhysical = move.category === 'Physical';
if (attacker.hasStatus('brn') && isPhysical && !attacker.hasAbility('Guts')) {
baseDamage = Math.floor(baseDamage / 2);
desc.isBurned = true;
Expand Down Expand Up @@ -303,15 +412,14 @@ export function calculateADV(
}

baseDamage = (move.category === 'Physical' ? Math.max(1, baseDamage) : baseDamage) + 2;

if (isCritical) {
baseDamage *= 2;
desc.isCritical = true;
}

if (move.named('Weather Ball') && field.weather) {
baseDamage *= 2;
desc.moveBP = bp * 2;
desc.moveBP = move.bp * 2;
}

if (field.attackerSide.isHelpingHand) {
Expand All @@ -322,26 +430,5 @@ export function calculateADV(
if (move.hasType(...attacker.types)) {
baseDamage = Math.floor(baseDamage * 1.5);
}

baseDamage = Math.floor(baseDamage * typeEffectiveness);
result.damage = [];
for (let i = 85; i <= 100; i++) {
result.damage[i - 85] = Math.max(1, Math.floor((baseDamage * i) / 100));
}

if (move.hits > 1) {
for (let times = 0; times < move.hits; times++) {
let damageMultiplier = 85;
result.damage = result.damage.map(affectedAmount => {
if (times) {
const newFinalDamage = Math.max(1, Math.floor((baseDamage * damageMultiplier) / 100));
damageMultiplier++;
return affectedAmount + newFinalDamage;
}
return affectedAmount;
});
}
}

return result;
return baseDamage;
}
Loading
Loading