From 611826122ca4a8146cb0fb51b5f0b250940de08f Mon Sep 17 00:00:00 2001 From: frutescens Date: Fri, 1 Nov 2024 13:14:29 -0700 Subject: [PATCH] lah --- .../mystery-encounters/utils/encounter-pokemon-utils.ts | 4 +++- src/overrides.ts | 9 ++++----- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/data/mystery-encounters/utils/encounter-pokemon-utils.ts b/src/data/mystery-encounters/utils/encounter-pokemon-utils.ts index b1adc478ab0..8683831d126 100644 --- a/src/data/mystery-encounters/utils/encounter-pokemon-utils.ts +++ b/src/data/mystery-encounters/utils/encounter-pokemon-utils.ts @@ -288,7 +288,9 @@ export function applyDamageToPokemon(scene: BattleScene, pokemon: PlayerPokemon, if (damage <= 0) { console.warn("Healing pokemon with `applyDamageToPokemon` is not recommended! Please use `applyHealToPokemon` instead."); } - + if (pokemon.hp - damage <= 0) { + damage = pokemon.hp - 1; + } applyHpChangeToPokemon(scene, pokemon, -damage); } diff --git a/src/overrides.ts b/src/overrides.ts index f1ea8dbb01e..b45da274d52 100644 --- a/src/overrides.ts +++ b/src/overrides.ts @@ -48,8 +48,8 @@ class DefaultOverrides { readonly SEED_OVERRIDE: string = ""; readonly WEATHER_OVERRIDE: WeatherType = WeatherType.NONE; readonly BATTLE_TYPE_OVERRIDE: "double" | "single" | null = null; - readonly STARTING_WAVE_OVERRIDE: number = 0; - readonly STARTING_BIOME_OVERRIDE: Biome = Biome.TOWN; + readonly STARTING_WAVE_OVERRIDE: number = 15; + readonly STARTING_BIOME_OVERRIDE: Biome = Biome.VOLCANO; readonly ARENA_TINT_OVERRIDE: TimeOfDay | null = null; /** Multiplies XP gained by this value including 0. Set to null to ignore the override */ readonly XP_MULTIPLIER_OVERRIDE: number | null = null; @@ -165,10 +165,9 @@ class DefaultOverrides { // ------------------------- /** 1 to 256, set to null to ignore */ - /** Requirement: STARTING_WAVE_OVERRIDE > 10 && STARTING_BIOME_OVERRIDE !== Biome.TOWN && MYSTERY_ENCOUNTER_RATE_OVERRIDE === 256 */ - readonly MYSTERY_ENCOUNTER_RATE_OVERRIDE: number | null = null; + readonly MYSTERY_ENCOUNTER_RATE_OVERRIDE: number | null = 256; readonly MYSTERY_ENCOUNTER_TIER_OVERRIDE: MysteryEncounterTier | null = null; - readonly MYSTERY_ENCOUNTER_OVERRIDE: MysteryEncounterType | null = null; + readonly MYSTERY_ENCOUNTER_OVERRIDE: MysteryEncounterType | null = MysteryEncounterType.FIERY_FALLOUT; // ------------------------- // MODIFIER / ITEM OVERRIDES