diff --git a/src/logger.ts b/src/logger.ts index 9d2b85855d0..da647dedcb3 100644 --- a/src/logger.ts +++ b/src/logger.ts @@ -1852,8 +1852,7 @@ export function logShop(scene: BattleScene, floor: integer = scene.currentBattle * @param floor The wave index to write to. Defaults to the current floor. */ export function logTrainer(scene: BattleScene, floor: integer = scene.currentBattle.waveIndex) { - var drpd: DRPD = JSON.parse(localStorage.getItem(getLogID(scene))!) as DRPD; - drpd = updateLog(drpd); + var drpd: DRPD = getDRPD(scene) console.log(`Logging trainer: ${scene.currentBattle.trainer!.getTitleOnly()} ${scene.currentBattle.trainer!.getNameOnly()}`) var wv: Wave = getWave(drpd, floor, scene) var t: LogTrainerData = exportTrainer(scene.currentBattle.trainer!) diff --git a/src/phases/move-effect-phase.ts b/src/phases/move-effect-phase.ts index a3ebfb7b4fc..44cbdd37d89 100644 --- a/src/phases/move-effect-phase.ts +++ b/src/phases/move-effect-phase.ts @@ -385,7 +385,7 @@ export class MoveEffectPhase extends PokemonPhase { } const accuracyMultiplier = user.getAccuracyMultiplier(target, this.move.getMove()); - const rand = user.randSeedInt(100, 1, "Accuracy roll"); + const rand = user.randSeedInt(100, undefined, "Accuracy roll"); return rand < (moveAccuracy * accuracyMultiplier); } diff --git a/src/ui/fight-ui-handler.ts b/src/ui/fight-ui-handler.ts index 50b35657c5c..b0f3dcf2a12 100644 --- a/src/ui/fight-ui-handler.ts +++ b/src/ui/fight-ui-handler.ts @@ -330,6 +330,7 @@ export default class FightUiHandler extends UiHandler { var dmgHigh = 0; var dmgLow = 0; var out = target.apply(user, move.getMove(), true) as AttackData + //console.log(out) dmgHigh = out.damageHigh; dmgLow = out.damageLow; var minHits = 1 @@ -369,8 +370,8 @@ export default class FightUiHandler extends UiHandler { maxHits += h[i].getStackCount() } } - dmgLow = out[0] * minHits - dmgHigh = out[1] * maxHits + dmgLow = dmgLow * minHits + dmgHigh = dmgHigh * maxHits var qSuffix = "" if (target.isBoss()) { var bossSegs = (target as EnemyPokemon).bossSegments @@ -378,8 +379,8 @@ export default class FightUiHandler extends UiHandler { //dmgHigh /= bossSegs //qSuffix = "?" } - var dmgLowP = Math.round((dmgLow)/target.getMaxHp()) - var dmgHighP = Math.round((dmgHigh)/target.getMaxHp()) + var dmgLowP = Math.round((dmgLow)/target.getMaxHp() * 100) + var dmgHighP = Math.round((dmgHigh)/target.getMaxHp() * 100) /* if (user.hasAbility(Abilities.PARENTAL_BOND)) { // Second hit deals 0.25x damage @@ -394,6 +395,7 @@ export default class FightUiHandler extends UiHandler { var percentChance = Utils.rangemap(target.hp, dmgLow, dmgHigh, 0, 1) koText = " (" + Math.round(percentChance * 100) + "% KO)" } + //console.log(target.getMoveEffectiveness(user, move.getMove(), false, true) + "x - " + ((dmgLowP == dmgHighP) ? (dmgLowP + "%" + qSuffix) : (dmgLowP + "%-" + dmgHighP + "%" + qSuffix)) + koText) if (target.getMoveEffectiveness(user, move.getMove(), false, true) == undefined) { return "---" }