From 233e33bbed5801430050f625b16a6d951bf3e5ac Mon Sep 17 00:00:00 2001 From: Flashfyre Date: Tue, 28 Nov 2023 18:45:14 -0500 Subject: [PATCH] Rename High EXP Charm to Super EXP Charm --- public/images/items.json | 4 ++-- .../{high_exp_charm.png => super_exp_charm.png} | Bin src/battle-phases.ts | 2 +- src/data/trainer-type.ts | 2 +- src/modifier/modifier-type.ts | 4 ++-- 5 files changed, 6 insertions(+), 6 deletions(-) rename public/images/items/{high_exp_charm.png => super_exp_charm.png} (100%) diff --git a/public/images/items.json b/public/images/items.json index 707ad3606..e93ec8946 100644 --- a/public/images/items.json +++ b/public/images/items.json @@ -52,7 +52,7 @@ } }, { - "filename": "high_exp_charm", + "filename": "super_exp_charm", "rotated": false, "trimmed": true, "sourceSize": { @@ -3858,6 +3858,6 @@ "meta": { "app": "https://www.codeandweb.com/texturepacker", "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:8daf36e1a2615b1c92e34954931b867d:beeac19ffd37f26e8458442aa05b2b5a:110e074689c9edd2c54833ce2e4d9270$" + "smartupdate": "$TexturePacker:SmartUpdate:7d150b6bd288db2e8dfa1530000690ee:53987dc1b2426cb0757237d04d6925a3:110e074689c9edd2c54833ce2e4d9270$" } } diff --git a/public/images/items/high_exp_charm.png b/public/images/items/super_exp_charm.png similarity index 100% rename from public/images/items/high_exp_charm.png rename to public/images/items/super_exp_charm.png diff --git a/src/battle-phases.ts b/src/battle-phases.ts index d5d9677c7..2d42c366e 100644 --- a/src/battle-phases.ts +++ b/src/battle-phases.ts @@ -2258,7 +2258,7 @@ export class VictoryPhase extends PokemonPhase { if (this.scene.currentBattle.waveIndex % 10) this.scene.pushPhase(new SelectModifierPhase(this.scene)); else { - this.scene.pushPhase(new ModifierRewardPhase(this.scene, (this.scene.currentBattle.waveIndex + (this.scene.gameMode !== GameMode.CLASSIC ? 20 : 0)) % 30 ? modifierTypes.EXP_CHARM : modifierTypes.GOLDEN_EXP_CHARM)); + this.scene.pushPhase(new ModifierRewardPhase(this.scene, (this.scene.currentBattle.waveIndex + (this.scene.gameMode !== GameMode.CLASSIC ? 20 : 0)) % 30 ? modifierTypes.EXP_CHARM : modifierTypes.SUPER_EXP_CHARM)); if (this.scene.currentBattle.waveIndex <= 150 && !(this.scene.currentBattle.waveIndex % 50)) this.scene.pushPhase(new ModifierRewardPhase(this.scene, modifierTypes.GOLDEN_POKEBALL)); if (this.scene.gameMode !== GameMode.CLASSIC && !(this.scene.currentBattle.waveIndex % 50)) diff --git a/src/data/trainer-type.ts b/src/data/trainer-type.ts index a81ea530c..31a6acde8 100644 --- a/src/data/trainer-type.ts +++ b/src/data/trainer-type.ts @@ -702,7 +702,7 @@ export const trainerConfigs: TrainerConfigs = { $Just kidding! I lost fair and square, and now I know you'll do fine out there. $By the way, the professor wanted me to give you some items. Hopefully they're helpful! $Do your best like always! I believe in you!` - ]).setModifierRewardFuncs(() => modifierTypes.HIGH_EXP_CHARM, () => modifierTypes.EXP_SHARE).setPartyMemberFunc(0, getRandomPartyMemberFunc([ Species.BULBASAUR, Species.CHARMANDER, Species.SQUIRTLE, Species.CHIKORITA, Species.CYNDAQUIL, Species.TOTODILE, Species.TREECKO, Species.TORCHIC, Species.MUDKIP, Species.TURTWIG, Species.CHIMCHAR, Species.PIPLUP, Species.SNIVY, Species.TEPIG, Species.OSHAWOTT ])) + ]).setModifierRewardFuncs(() => modifierTypes.SUPER_EXP_CHARM, () => modifierTypes.EXP_SHARE).setPartyMemberFunc(0, getRandomPartyMemberFunc([ Species.BULBASAUR, Species.CHARMANDER, Species.SQUIRTLE, Species.CHIKORITA, Species.CYNDAQUIL, Species.TOTODILE, Species.TREECKO, Species.TORCHIC, Species.MUDKIP, Species.TURTWIG, Species.CHIMCHAR, Species.PIPLUP, Species.SNIVY, Species.TEPIG, Species.OSHAWOTT ])) .setPartyMemberFunc(1, getRandomPartyMemberFunc([ Species.PIDGEY, Species.HOOTHOOT, Species.TAILLOW, Species.STARLY, Species.PIDOVE ])), [TrainerType.RIVAL_2]: new TrainerConfig(++t).setStaticParty().setMoneyMultiplier(1.25).setEncounterBgm(TrainerType.RIVAL).setBattleBgm('battle_rival').setPartyTemplates(trainerPartyTemplates.RIVAL_2).setEncounterMessages([ `Oh, fancy meeting you here. Looks like you're still undefeated. Right on! diff --git a/src/modifier/modifier-type.ts b/src/modifier/modifier-type.ts index 3b4bb5272..4fcde3260 100644 --- a/src/modifier/modifier-type.ts +++ b/src/modifier/modifier-type.ts @@ -675,7 +675,7 @@ export const modifierTypes = { (type, _args) => new Modifiers.MultipleParticipantExpBonusModifier(type)), EXP_CHARM: () => new ExpBoosterModifierType('EXP. Charm', 25), - HIGH_EXP_CHARM: () => new ExpBoosterModifierType('High EXP. Charm', 60), + SUPER_EXP_CHARM: () => new ExpBoosterModifierType('Super EXP. Charm', 60), GOLDEN_EXP_CHARM: () => new ExpBoosterModifierType('Golden EXP. Charm', 100), LUCKY_EGG: () => new PokemonExpBoosterModifierType('Lucky Egg', 50), @@ -822,7 +822,7 @@ const modifierPool = { new WeightedModifierType(modifierTypes.LEFTOVERS, 2), new WeightedModifierType(modifierTypes.SHELL_BELL, 2), new WeightedModifierType(modifierTypes.BERRY_POUCH, 3), - new WeightedModifierType(modifierTypes.HIGH_EXP_CHARM, 3), + new WeightedModifierType(modifierTypes.SUPER_EXP_CHARM, 3), new WeightedModifierType(modifierTypes.OVAL_CHARM, 2), new WeightedModifierType(modifierTypes.ABILITY_CHARM, 2), new WeightedModifierType(modifierTypes.IV_SCANNER, 2),