diff --git a/src/battle-scene.ts b/src/battle-scene.ts index a214e3c8ed7..968b4c1bd7d 100644 --- a/src/battle-scene.ts +++ b/src/battle-scene.ts @@ -869,15 +869,11 @@ export default class BattleScene extends SceneBase { if (double === undefined && newWaveIndex > 1) { if (newBattleType === BattleType.WILD && !this.gameMode.isWaveFinal(newWaveIndex)) { - // Check if Repel and prevent double battle - if (this.getModifiers(DoubleBattlePreventionModifierType, true).length > 0) { - newDouble = false; - } else { - const doubleChance = new Utils.IntegerHolder(newWaveIndex % 10 === 0 ? 32 : 8); - this.applyModifiers(DoubleBattleChanceBoosterModifier, true, doubleChance); - playerField.forEach(p => applyAbAttrs(DoubleBattleChanceAbAttr, p, null, doubleChance)); - newDouble = !Utils.randSeedInt(doubleChance.value); - } + const doubleChance = new Utils.IntegerHolder(newWaveIndex % 10 === 0 ? 32 : 8); + this.applyModifiers(DoubleBattleChanceBoosterModifier, true, doubleChance); + playerField.forEach(p => applyAbAttrs(DoubleBattleChanceAbAttr, p, null, doubleChance)); + newDouble = !Utils.randSeedInt(doubleChance.value); + this.applyModifiers(DoubleBattlePreventionModifierType, true, newDouble); } else if (newBattleType === BattleType.TRAINER) newDouble = newTrainer.variant === TrainerVariant.DOUBLE; } else if (!battleConfig) diff --git a/src/locales/fr/modifier-type.ts b/src/locales/fr/modifier-type.ts index 0bc948188a7..60b9ff58ecc 100644 --- a/src/locales/fr/modifier-type.ts +++ b/src/locales/fr/modifier-type.ts @@ -52,7 +52,7 @@ export const modifierType: ModifierTypeTranslationEntries = { description: "Double les chances de tomber sur un combat double pendant {{battleCount}} combats", }, "DoubleBattlePreventionModifierType": { - description: "Empêcher l'apparition de doubles batailles pour {{battleCount}} batailles", + description: "Empêche les combats doubles pendant {{battleCount}}", }, "TempBattleStatBoosterModifierType": { description: "Augmente d’1 cran {{tempBattleStatName}} pour toute l’équipe pendant 5 combats", diff --git a/src/modifier/modifier.ts b/src/modifier/modifier.ts index f3a806c9c9a..0a529c969ac 100644 --- a/src/modifier/modifier.ts +++ b/src/modifier/modifier.ts @@ -330,8 +330,8 @@ export class DoubleBattlePreventionModifierType extends LapsingPersistentModifie } apply(args: any[]): boolean { - const doubleBattleChance = args[0] as Utils.NumberHolder; - doubleBattleChance.value = Math.ceil(doubleBattleChance.value / 2); + const newDouble = args[0] as Utils.BooleanHolder; + newDouble.value = false; return true; }