mika/pokerogue
1
0
Fork 0
mirror of https://github.com/pagefaultgames/pokerogue.git synced 2025-07-17 13:52:18 +02:00
Code Issues Packages Projects Releases Wiki Activity

don't show hints if no opponents, use type effectiveness instead of move effectiveness

Browse Source
This commit is contained in:
Yentis 2024-05-18 10:16:23 +02:00
parent 93a6202d17
commit 76954a29e1
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/field/pokemon.ts
View File

@ -1392,10 +1392,11 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
const typeHints = this.scene.typeHints; const typeHints = this.scene.typeHints;
if (typeHints === 0) return undefined; if (typeHints === 0) return undefined;
const opponents = this.getOpponents(); const opponents = this.getOpponents();
if (opponents.length < 1) return undefined;
const opponentMoveEffectivenessList = opponents.map((opponent) => { const opponentTypeEffectivenessList = opponents.map((opponent) => {
return opponent.getMoveset().map((move) => { return opponent.getTypes().map((type) => {
return this.getMoveEffectiveness(opponent, move); return this.getAttackTypeEffectiveness(type, opponent);
}); });
}).flat().filter((effectiveness) => effectiveness !== undefined); }).flat().filter((effectiveness) => effectiveness !== undefined);
@ -1407,11 +1408,11 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
const fullHints = typeHints === 2; const fullHints = typeHints === 2;
if (fullHints && opponentMoveEffectivenessList.some((effectiveness) => effectiveness === 8)) { if (fullHints && opponentTypeEffectivenessList.some((effectiveness) => effectiveness === 8)) {
return 'darkred'; return 'darkred';
} else if (fullHints && opponentMoveEffectivenessList.some((effectiveness) => effectiveness === 4)) { } else if (fullHints && opponentTypeEffectivenessList.some((effectiveness) => effectiveness === 4)) {
return 'red'; return 'red';
} else if (fullHints && opponentMoveEffectivenessList.some((effectiveness) => effectiveness === 2)) { } else if (fullHints && opponentTypeEffectivenessList.some((effectiveness) => effectiveness === 2)) {
return 'crimson'; return 'crimson';
} else if (moveEffectivenessList.some((effectiveness) => effectiveness === 8)) { } else if (moveEffectivenessList.some((effectiveness) => effectiveness === 8)) {
return 'darkgreen'; return 'darkgreen';
@ -1419,13 +1420,13 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
return 'green'; return 'green';
} else if (moveEffectivenessList.some((effectiveness) => effectiveness === 2)) { } else if (moveEffectivenessList.some((effectiveness) => effectiveness === 2)) {
return 'lightgreen'; return 'lightgreen';
} else if (fullHints && opponentMoveEffectivenessList.every((effectiveness) => effectiveness === 0)) { } else if (fullHints && opponentTypeEffectivenessList.every((effectiveness) => effectiveness === 0)) {
return 'yellow'; return 'yellow';
} else if (fullHints && opponentMoveEffectivenessList.every((effectiveness) => effectiveness === 0.125)) { } else if (fullHints && opponentTypeEffectivenessList.every((effectiveness) => effectiveness === 0.125)) {
return 'darkblue'; return 'darkblue';
} else if (fullHints && opponentMoveEffectivenessList.every((effectiveness) => effectiveness === 0.25)) { } else if (fullHints && opponentTypeEffectivenessList.every((effectiveness) => effectiveness === 0.25)) {
return 'blue'; return 'blue';
} else if (fullHints && opponentMoveEffectivenessList.every((effectiveness) => effectiveness === 0.5)) { } else if (fullHints && opponentTypeEffectivenessList.every((effectiveness) => effectiveness === 0.5)) {
return 'lightblue'; return 'lightblue';
} }