[Misc] Removed last vestiges of / 4096 from codebase (#6316)

This commit is contained in:
Bertie690 2025-08-20 21:51:33 -04:00 committed by GitHub
parent 14bd80f639
commit 0f94e97a2a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 7 additions and 6 deletions

View File

@ -295,7 +295,8 @@ export abstract class WeakenMoveScreenTag extends SerializableArenaTag {
if (bypassed.value) {
return false;
}
damageMultiplier.value = globalScene.currentBattle.double ? 2732 / 4096 : 0.5;
// Screens are less effective in Double Battles
damageMultiplier.value = globalScene.currentBattle.double ? 2 / 3 : 1 / 2;
return true;
}
return false;

View File

@ -11450,9 +11450,9 @@ export function initMoves() {
new AttackMove(MoveId.RUINATION, PokemonType.DARK, MoveCategory.SPECIAL, -1, 90, 10, -1, 0, 9)
.attr(TargetHalfHpDamageAttr),
new AttackMove(MoveId.COLLISION_COURSE, PokemonType.FIGHTING, MoveCategory.PHYSICAL, 100, 100, 5, -1, 0, 9)
.attr(MovePowerMultiplierAttr, (user, target, move) => target.getAttackTypeEffectiveness(move.type, user) >= 2 ? 5461 / 4096 : 1),
.attr(MovePowerMultiplierAttr, (user, target, move) => target.getAttackTypeEffectiveness(move.type, user) >= 2 ? 4 / 3 : 1),
new AttackMove(MoveId.ELECTRO_DRIFT, PokemonType.ELECTRIC, MoveCategory.SPECIAL, 100, 100, 5, -1, 0, 9)
.attr(MovePowerMultiplierAttr, (user, target, move) => target.getAttackTypeEffectiveness(move.type, user) >= 2 ? 5461 / 4096 : 1)
.attr(MovePowerMultiplierAttr, (user, target, move) => target.getAttackTypeEffectiveness(move.type, user) >= 2 ? 4 / 3 : 1)
.makesContact(),
new SelfStatusMove(MoveId.SHED_TAIL, PokemonType.NORMAL, -1, 10, -1, 0, 9)
.attr(AddSubstituteAttr, 0.5, true)

View File

@ -19,7 +19,7 @@ describe("Moves - Aurora Veil", () => {
let phaserGame: Phaser.Game;
let game: GameManager;
const singleBattleMultiplier = 0.5;
const doubleBattleMultiplier = 2732 / 4096;
const doubleBattleMultiplier = 2 / 3;
beforeAll(() => {
phaserGame = new Phaser.Game({

View File

@ -19,7 +19,7 @@ describe("Moves - Light Screen", () => {
let phaserGame: Phaser.Game;
let game: GameManager;
const singleBattleMultiplier = 0.5;
const doubleBattleMultiplier = 2732 / 4096;
const doubleBattleMultiplier = 2 / 3;
beforeAll(() => {
phaserGame = new Phaser.Game({

View File

@ -19,7 +19,7 @@ describe("Moves - Reflect", () => {
let phaserGame: Phaser.Game;
let game: GameManager;
const singleBattleMultiplier = 0.5;
const doubleBattleMultiplier = 2732 / 4096;
const doubleBattleMultiplier = 2 / 3;
beforeAll(() => {
phaserGame = new Phaser.Game({