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

remove unrelated code

Browse Source
This commit is contained in:
Yentis 2024-05-18 08:22:32 +02:00
parent ecdca52cd1
commit 8e9e70ca55
2 changed files with 3 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/field/pokemon.ts
View File

@ -943,17 +943,6 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
return !this.isOfType(Type.FLYING, true) && !this.hasAbility(Abilities.LEVITATE); return !this.isOfType(Type.FLYING, true) && !this.hasAbility(Abilities.LEVITATE);
} }
isStabMove(move: Move): boolean {
if (move.category === MoveCategory.STATUS) return false;
const type = move.type;
const types = this.getTypes();
const teraType = this.getTeraType();
const matchesSourceType = types[0] === type || (types.length > 1 && types[1] === type);
return (teraType === Type.UNKNOWN && matchesSourceType) || (teraType !== Type.UNKNOWN && teraType === type);
}
getMoveEffectiveness(source: Pokemon, move: PokemonMove): TypeDamageMultiplier | undefined { getMoveEffectiveness(source: Pokemon, move: PokemonMove): TypeDamageMultiplier | undefined {
if (move.getMove().category === MoveCategory.STATUS) return undefined; if (move.getMove().category === MoveCategory.STATUS) return undefined;
return this.getAttackMoveEffectiveness(source, move); return this.getAttackMoveEffectiveness(source, move);
@ -1593,11 +1582,11 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
const isTypeImmune = (typeMultiplier.value * arenaAttackTypeMultiplier.value) === 0; const isTypeImmune = (typeMultiplier.value * arenaAttackTypeMultiplier.value) === 0;
const sourceTypes = source.getTypes(); const sourceTypes = source.getTypes();
const matchesSourceType = sourceTypes[0] === type || (sourceTypes.length > 1 && sourceTypes[1] === type); const matchesSourceType = sourceTypes[0] === type || (sourceTypes.length > 1 && sourceTypes[1] === type);
let stabMultiplier = new Utils.NumberHolder(1); let stabMultiplier = new Utils.NumberHolder(1);
if (source.isStabMove(move)) { if (sourceTeraType === Type.UNKNOWN && matchesSourceType)
stabMultiplier.value += 0.5;
else if (sourceTeraType !== Type.UNKNOWN && sourceTeraType === type)
stabMultiplier.value += 0.5; stabMultiplier.value += 0.5;
}
applyAbAttrs(StabBoostAbAttr, source, null, stabMultiplier); applyAbAttrs(StabBoostAbAttr, source, null, stabMultiplier);

3
src/ui/fight-ui-handler.ts
View File

@ -230,9 +230,6 @@ export default class FightUiHandler extends UiHandler {
} }
moveText.setText(text); moveText.setText(text);
const stab = pokemon.isStabMove(move);
if (stab) moveText.setFontStyle('bold');
const moveColors = moveEffectivenessList.sort((a, b) => b - a).map((effectiveness) => this.getMoveColor(effectiveness)); const moveColors = moveEffectivenessList.sort((a, b) => b - a).map((effectiveness) => this.getMoveColor(effectiveness));
const color = moveColors[0]; const color = moveColors[0];