Skip to content

Commit

Permalink
Revert "updated desc.ts"
Browse files Browse the repository at this point in the history 
This reverts commit 9055601.
  • Loading branch information
@noobscrub27
noobscrub27 committed Jul 30, 2024
1 parent 9055601 commit 40ae00e
Showing 1 changed file with 77 additions and 84 deletions.
161 changes: 77 additions & 84 deletions calc/src/desc.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -128,11 +128,6 @@ export function getRecovery(
recovery[0] = recovery[1] = Math.round(attacker.maxHP() / 6);
}

if (move.named('Pain Split')) {
const average = Math.floor((attacker.curHP() + defender.curHP()) / 2);
recovery[0] = recovery[1] = average - attacker.curHP();
}

if (move.drain) {
const percentHealed = move.drain[0] / move.drain[1];
const max = Math.round(defender.maxHP() * percentHealed);
Expand All @@ -151,8 +146,7 @@ export function getRecovery(
const minHealthRecovered = toDisplay(notation, recovery[0], attacker.maxHP());
const maxHealthRecovered = toDisplay(notation, recovery[1], attacker.maxHP());

const change = recovery[0] > 0 ? 'recovered' : 'lost';
text = `${minHealthRecovered} - ${maxHealthRecovered}${notation} ${change}`;
text = `${minHealthRecovered} - ${maxHealthRecovered}${notation} recovered`;
return {recovery, text};
}

Expand Down Expand Up @@ -299,63 +293,6 @@ export function getKOChance(
: '';
const afterTextNoHazards = eot.texts.length > 0 ? ' after ' + serializeText(eot.texts) : '';

function roundChance(chance: number) {
// prevent displaying misleading 100% or 0% chances
return Math.max(Math.min(Math.round(chance * 1000), 999), 1) / 10;
}

function KOChance(
chance: number | undefined,
chanceWithEot: number | undefined,
n: number,
multipleTurns = false,
) {
// chance and chanceWithEot are calculated separately for OHKOs
// because the difference between KOing at start of turn is very important in some cases
// for 2HKOs and onward, only chanceWithEot is calculated, so chance will be set to 0 for the purposes of this function
// all this really does is skip straight to that last else if block
// using the number of hits we can determine the type of KO we are checking for
let KOTurnText = n === 1 ? 'OHKO'
: (multipleTurns ? `KO in ${n} turns` : `${n}HKO`)
let text = qualifier;
let returnChance = undefined;
if (chance === undefined || chanceWithEot === undefined) {
text += `possible ${KOTurnText}`
// not a KO
} else if (chance + chanceWithEot === 0) {
returnChance = 0;
text += 'not a KO';
// if the move OHKOing is guaranteed even without end of turn damage
} else if (chance === 1) {
returnChance = chance;
text += `guaranteed OHKO${hazardsText}`;
} else if (chance > 0) {
returnChance = chanceWithEot;
// if the move OHKOing is possible, but eot damage guarantees the OHKO
// I have it so that the text specifies the chance of the OHKO without eot damage, because it might matter in some scenarios
// eg. if your opponent has a move that can OHKO you but you're faster, it might be important to get the OKKO before they can move
if (chanceWithEot === 1) {
text += `${roundChance(chance)}% chance to ${KOTurnText}${hazardsText} (guaranteed ${KOTurnText}${afterTextNoHazards})`
// if the move OHKOing is possible, and eot damage increases the odds of the KO
} else if (chanceWithEot > chance) {
text += `${roundChance(chance)}% chance to ${KOTurnText}${hazardsText} (${qualifier}${roundChance(chanceWithEot)}% to ${KOTurnText}${afterTextNoHazards})`
// if the move KOing is possible, and eot damage does not increase the odds of the KO
} else if (chance > 0) {
text += `${roundChance(chance)} to ${KOTurnText}${afterText}`
}
} else if (chance == 0) {
returnChance = chanceWithEot;
// if the move KOing is not possible, but eot damage guarantees the OHKO
if (chanceWithEot === 1) {
text += `guaranteed ${KOTurnText}${afterText}`;
// if the move KOing is not possible, but eot damage might KO
} else if (chanceWithEot > 0) {
text += `${roundChance(chanceWithEot)}% chance to ${KOTurnText}${afterText}`;
}
}
return { returnChance, n, text };
}

if ((move.timesUsed === 1 && move.timesUsedWithMetronome === 1) || move.isZ) {
// for calculating OHKOs, chance only considers the move itself and hazards
// chanceWithEot considers end of turn effects as well, and the text that is displayed depends on both results
Expand All @@ -365,9 +302,45 @@ export function getKOChance(
const chanceWithEot = computeKOChance(
damage, defender.curHP() - hazards.damage, eot.damage, 1, 1, defender.maxHP(), toxicCounter
);

// checks if either chance is greater than 0
if (chance + chanceWithEot > 0) return KOChance(chance, chanceWithEot, 1);
if (chance === 1) { // if the move OHKOing is guaranteed even without end of turn damage
return { chance, n: 1, text: `guaranteed OHKO${hazardsText}` };
} else if (chance > 0) {
if (chanceWithEot === 1) { // if the move OHKOing is possible, but eot damage guarantees the KO
return {
chanceWithEot,
n: 1,
// I have it so that the text specifies the chance of the OHKO without eot damage, because it might matter in some scenarios
// ie. if your opponent has a move that can OHKO you but you're faster, it might be important to get the KO before they can move
text: qualifier + Math.round(chance * 1000) / 10 + `% chance to OHKO${hazardsText} (guaranteed OHKO${afterTextNoHazards})`,
};
} else if (chanceWithEot > chance) { // if the move OHKOing is possible, and eot damage increases the odds of the KO
return {
chanceWithEot,
n: 1,
text: qualifier + Math.round(chance * 1000) / 10 + `% chance to OHKO${hazardsText} (` + qualifier + Math.round(chanceWithEot * 1000) / 10 + `% to OHKO${afterTextNoHazards})`,
};
} else if (chance > 0) { // if the move OHKOing is possible, and eot damage does not increase the odds of the KO
return {
chance,
n: 1,
text: qualifier + Math.round(chance * 1000) / 10 + `% chance to OHKO${afterText}`,
};
}
} else if (chance == 0) {
if (chanceWithEot === 1) { // if the move OHKOing is not possible, but eot damage guarantees the OHKO
return {
chanceWithEot,
n: 1,
text: `guaranteed OHKO${afterText}`,
};
} else if (chanceWithEot > 0) { // if the move OHKOing is not possible, but eot damage might KO
return {
chanceWithEot,
n: 1,
text: qualifier + Math.round(chanceWithEot * 1000) / 10 + `% chance to OHKO${afterText}`,
};
}
}

// Parental Bond's combined first + second hit only is accurate for chance to OHKO, for
// multihit KOs its only approximated. We should be doing squashMultihit here instead of
Expand All @@ -382,21 +355,28 @@ export function getKOChance(
const chance = computeKOChance(
damage, defender.curHP() - hazards.damage, eot.damage, i, 1, defender.maxHP(), toxicCounter
);
if (chance > 0) return KOChance(0, chance, i);
if (chance === 1) {
return {chance, n: i, text: `${qualifier || 'guaranteed '}${i}HKO${afterText}`};
} else if (chance > 0) {
return {
chance,
n: i,
text: qualifier + Math.round(chance * 1000) / 10 + `% chance to ${i}HKO${afterText}`,
};
}
}

for (let i = 5; i <= 9; i++) {
if (
predictTotal(damage[0], eot.damage, i, 1, toxicCounter, defender.maxHP()) >=
defender.curHP() - hazards.damage
) {
return KOChance(0, 1, i);
return {chance: 1, n: i, text: `${qualifier || 'guaranteed '}${i}HKO${afterText}`};
} else if (
predictTotal(damage[damage.length - 1], eot.damage, i, 1, toxicCounter, defender.maxHP()) >=
defender.curHP() - hazards.damage
) {
// possible but no concrete chance
return KOChance(undefined, undefined, i);
return {n: i, text: qualifier + `possible ${i}HKO${afterText}`};
}
}
} else {
Expand All @@ -408,7 +388,22 @@ export function getKOChance(
defender.maxHP(),
toxicCounter
);
if (chance > 0) return KOChance(0, chance, move.timesUsed, chance === 1);
if (chance === 1) {
return {
chance,
n: move.timesUsed,
text: `${qualifier || 'guaranteed '}KO in ${move.timesUsed} turns${afterText}`,
};
} else if (chance > 0) {
return {
chance,
n: move.timesUsed,
text:
qualifier +
Math.round(chance * 1000) / 10 +
`% chance to ${move.timesUsed}HKO${afterText}`,
};
}

if (predictTotal(
damage[0],
Expand All @@ -420,7 +415,11 @@ export function getKOChance(
) >=
defender.curHP() - hazards.damage
) {
return KOChance(0, 1, move.timesUsed, true);
return {
chance: 1,
n: move.timesUsed,
text: `${qualifier || 'guaranteed '}KO in ${move.timesUsed} turns${afterText}`,
};
} else if (
predictTotal(
damage[damage.length - 1],
Expand All @@ -432,10 +431,12 @@ export function getKOChance(
) >=
defender.curHP() - hazards.damage
) {
// possible but no real idea
return KOChance(undefined, undefined, move.timesUsed, true);
return {
n: move.timesUsed,
text: qualifier + `possible KO in ${move.timesUsed} turns${afterText}`,
};
}
return KOChance(0, 0, move.timesUsed);
return {n: move.timesUsed, text: qualifier + 'not a KO'};
}

return {chance: 0, n: 0, text: ''};
Expand Down Expand Up @@ -759,25 +760,17 @@ function predictTotal(
maxHP: number
) {
let toxicDamage = 0;
// hits - 1 is used in this for loop, as well as in the total = ... calcs later
// the last turn of eot damage is calculated separately, since if the damage is less than 0 (healing)
// we want to exclude that from the calculations, since on the last turn the pokemon has been ko'd by the attack
// and should not be able to heal after fainting
let lastTurnEot = eot;
if (toxicCounter > 0) {
for (let i = 0; i < hits - 1; i++) {
toxicDamage += Math.floor(((toxicCounter + i) * maxHP) / 16);
}
lastTurnEot -= Math.floor(((toxicCounter + (hits - 1)) * maxHP) / 16);
}
let total = 0;
if (hits > 1 && timesUsed === 1) {
total = damage * hits - eot * (hits - 1) + toxicDamage;
} else {
total = damage - eot * (hits - 1) + toxicDamage;
}
// if the net eot health gain is negative for the last turn, include it in the total
if (lastTurnEot < 0) total -= lastTurnEot;
return total;
}

Expand Down

0 comments on commit 40ae00e

Please sign in to comment.