Merge branch 'main' into main

src/battle-scene.ts

@@ -59,7 +59,7 @@ import { SceneBase } from './scene-base';
 import CandyBar from './ui/candy-bar';
 import { Variant, variantData } from './data/variant';
 import { Localizable } from './plugins/i18n';
-import { STARTING_WAVE_OVERRIDE, OPP_SPECIES_OVERRIDE, SEED_OVERRIDE, STARTING_BIOME_OVERRIDE } from './overrides';
+import { STARTING_WAVE_OVERRIDE, OPP_SPECIES_OVERRIDE, SEED_OVERRIDE, STARTING_BIOME_OVERRIDE, DOUBLE_BATTLE_OVERRIDE } from './overrides';
 import {InputsController} from "./inputs-controller";
 import {UiInputs} from "./ui-inputs";
 
@@ -842,6 +842,9 @@ export default class BattleScene extends SceneBase {
 		} else if (!battleConfig)
 			newDouble = !!double;
 
+		if (DOUBLE_BATTLE_OVERRIDE)
+			newDouble = true;
+
 		const lastBattle = this.currentBattle;
 
 		if (lastBattle?.double && !newDouble)

src/data/ability.ts

@@ -1862,6 +1862,19 @@ function getAnticipationCondition(): AbAttrCondition {
   };
 }
 
+/**
+ * Creates an ability condition that causes the ability to fail if that ability
+ * has already been used by that pokemon that battle. It requires an ability to
+ * be specified due to current limitations in how conditions on abilities work.
+ * @param {Abilities} ability The ability to check if it's already been applied
+ * @returns {AbAttrCondition} The condition
+ */
+function getOncePerBattleCondition(ability: Abilities): AbAttrCondition {
+  return (pokemon: Pokemon) => {
+    return !pokemon.battleData?.abilitiesApplied.includes(ability);
+  }
+}
+
 export class ForewarnAbAttr extends PostSummonAbAttr {
   constructor() {
     super(true);
@@ -2558,6 +2571,9 @@ function applyAbAttrsInternal<TAttr extends AbAttr>(attrType: { new(...args: any
         return applyNextAbAttr();
       pokemon.scene.setPhaseQueueSplice();
       const onApplySuccess = () => {
+        if (pokemon.battleData && !pokemon.battleData.abilitiesApplied.includes(ability.id)) {
+          pokemon.battleData.abilitiesApplied.push(ability.id);
+        }
         if (attr.showAbility && !quiet) {
           if (showAbilityInstant)
             pokemon.scene.abilityBar.showAbility(pokemon, passive);
@@ -3416,9 +3432,11 @@ export function initAbilities() {
     new Ability(Abilities.NEUROFORCE, 7)
       .attr(MovePowerBoostAbAttr, (user, target, move) => target.getAttackTypeEffectiveness(move.type, user) >= 2, 1.25),
     new Ability(Abilities.INTREPID_SWORD, 8)
-      .attr(PostSummonStatChangeAbAttr, BattleStat.ATK, 1, true),
+      .attr(PostSummonStatChangeAbAttr, BattleStat.ATK, 1, true)
+      .condition(getOncePerBattleCondition(Abilities.INTREPID_SWORD)),
     new Ability(Abilities.DAUNTLESS_SHIELD, 8)
-      .attr(PostSummonStatChangeAbAttr, BattleStat.DEF, 1, true),
+      .attr(PostSummonStatChangeAbAttr, BattleStat.DEF, 1, true)
+      .condition(getOncePerBattleCondition(Abilities.DAUNTLESS_SHIELD)),
     new Ability(Abilities.LIBERO, 8)
       .unimplemented(),
     new Ability(Abilities.BALL_FETCH, 8)
@@ -3627,7 +3645,8 @@ export function initAbilities() {
       .attr(IgnoreTypeImmunityAbAttr, Type.GHOST, [Type.NORMAL, Type.FIGHTING])
       .ignorable(), // TODO: evasiveness bypass should not be ignored, but accuracy immunity should
     new Ability(Abilities.SUPERSWEET_SYRUP, 9)
-      .unimplemented(),
+      .attr(PostSummonStatChangeAbAttr, BattleStat.EVA, -1)
+      .condition(getOncePerBattleCondition(Abilities.SUPERSWEET_SYRUP)),
     new Ability(Abilities.HOSPITALITY, 9)
       .attr(PostSummonAllyHealAbAttr, 4, true),
     new Ability(Abilities.TOXIC_CHAIN, 9)

src/data/move.ts

@@ -2961,6 +2961,42 @@ export class AddArenaTrapTagAttr extends AddArenaTagAttr {
   }
 }
 
+export class RemoveArenaTrapAttr extends MoveEffectAttr {
+
+  private targetBothSides: boolean;
+
+  constructor(targetBothSides: boolean = false) {
+    super(true, MoveEffectTrigger.PRE_APPLY);
+    this.targetBothSides = targetBothSides;
+  }
+
+  apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean {
+
+    if (!super.apply(user, target, move, args))
+      return false;
+
+    if(this.targetBothSides){
+      user.scene.arena.removeTagOnSide(ArenaTagType.SPIKES, ArenaTagSide.PLAYER);
+      user.scene.arena.removeTagOnSide(ArenaTagType.TOXIC_SPIKES, ArenaTagSide.PLAYER);
+      user.scene.arena.removeTagOnSide(ArenaTagType.STEALTH_ROCK, ArenaTagSide.PLAYER);
+      user.scene.arena.removeTagOnSide(ArenaTagType.STICKY_WEB, ArenaTagSide.PLAYER);
+
+      user.scene.arena.removeTagOnSide(ArenaTagType.SPIKES, ArenaTagSide.ENEMY);
+      user.scene.arena.removeTagOnSide(ArenaTagType.TOXIC_SPIKES, ArenaTagSide.ENEMY);
+      user.scene.arena.removeTagOnSide(ArenaTagType.STEALTH_ROCK, ArenaTagSide.ENEMY);
+      user.scene.arena.removeTagOnSide(ArenaTagType.STICKY_WEB, ArenaTagSide.ENEMY);
+    }
+    else {
+      user.scene.arena.removeTagOnSide(ArenaTagType.SPIKES, target.isPlayer() ? ArenaTagSide.ENEMY : ArenaTagSide.PLAYER);
+      user.scene.arena.removeTagOnSide(ArenaTagType.TOXIC_SPIKES, target.isPlayer() ? ArenaTagSide.ENEMY : ArenaTagSide.PLAYER);
+      user.scene.arena.removeTagOnSide(ArenaTagType.STEALTH_ROCK, target.isPlayer() ? ArenaTagSide.ENEMY : ArenaTagSide.PLAYER);
+      user.scene.arena.removeTagOnSide(ArenaTagType.STICKY_WEB, target.isPlayer() ? ArenaTagSide.ENEMY : ArenaTagSide.PLAYER);
+    }
+
+    return true;
+  }
+}
+
 export class RemoveScreensAttr extends MoveEffectAttr {
 
   private targetBothSides: boolean;
@@ -4602,7 +4638,7 @@ export function initMoves() {
         BattlerTagType.SEEDED,
         BattlerTagType.INFESTATION
       ], true)
-      .partial(),
+      .attr(RemoveArenaTrapAttr),
     new StatusMove(Moves.SWEET_SCENT, Type.NORMAL, 100, 20, -1, 0, 2)
       .attr(StatChangeAttr, BattleStat.EVA, -1)
       .target(MoveTarget.ALL_NEAR_ENEMIES),
@@ -5144,7 +5180,8 @@ export function initMoves() {
       .attr(StatChangeAttr, BattleStat.EVA, -1)
       .attr(ClearWeatherAttr, WeatherType.FOG)
       .attr(ClearTerrainAttr)
-      .attr(RemoveScreensAttr, true),
+      .attr(RemoveScreensAttr, false)
+      .attr(RemoveArenaTrapAttr, true),
     new StatusMove(Moves.TRICK_ROOM, Type.PSYCHIC, -1, 5, -1, -7, 4)
       .attr(AddArenaTagAttr, ArenaTagType.TRICK_ROOM, 5)
       .ignoresProtect()
@@ -6444,6 +6481,7 @@ export function initMoves() {
         BattlerTagType.INFESTATION
       ], true)
       .attr(StatusEffectAttr, StatusEffect.POISON)
+      .attr(RemoveArenaTrapAttr)
       .target(MoveTarget.ALL_NEAR_ENEMIES),
     new StatusMove(Moves.DOODLE, Type.NORMAL, 100, 10, -1, 0, 9)
       .attr(AbilityCopyAttr, true),
@@ -6487,7 +6525,7 @@ export function initMoves() {
       .target(MoveTarget.BOTH_SIDES),
     new SelfStatusMove(Moves.TIDY_UP, Type.NORMAL, -1, 10, 100, 0, 9)
       .attr(StatChangeAttr, [ BattleStat.ATK, BattleStat.SPD ], 1, true)
-      .partial(),
+      .attr(RemoveArenaTrapAttr),
     new StatusMove(Moves.SNOWSCAPE, Type.ICE, -1, 10, -1, 0, 9)
       .attr(WeatherChangeAttr, WeatherType.SNOW)
       .target(MoveTarget.BOTH_SIDES),

src/field/pokemon.ts

@@ -43,7 +43,7 @@ import { Nature, getNatureStatMultiplier } from '../data/nature';
 import { SpeciesFormChange, SpeciesFormChangeActiveTrigger, SpeciesFormChangeMoveLearnedTrigger, SpeciesFormChangePostMoveTrigger, SpeciesFormChangeStatusEffectTrigger } from '../data/pokemon-forms';
 import { TerrainType } from '../data/terrain';
 import { TrainerSlot } from '../data/trainer-config';
-import { ABILITY_OVERRIDE, MOVE_OVERRIDE, MOVE_OVERRIDE_2, OPP_ABILITY_OVERRIDE, OPP_MOVE_OVERRIDE, OPP_MOVE_OVERRIDE_2, OPP_SHINY_OVERRIDE, OPP_VARIANT_OVERRIDE } from '../overrides';
+import { ABILITY_OVERRIDE, MOVE_OVERRIDE, MOVE_OVERRIDE_2, OPP_ABILITY_OVERRIDE, OPP_MOVE_OVERRIDE, OPP_MOVE_OVERRIDE_2, OPP_PASSIVE_ABILITY_OVERRIDE, OPP_SHINY_OVERRIDE, OPP_VARIANT_OVERRIDE, PASSIVE_ABILITY_OVERRIDE } from '../overrides';
 import { BerryType } from '../data/berry';
 import i18next from '../plugins/i18n';
 
@@ -811,6 +811,11 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
   }
 
   getPassiveAbility(): Ability {
+    if (PASSIVE_ABILITY_OVERRIDE && this.isPlayer())
+      return allAbilities[PASSIVE_ABILITY_OVERRIDE];
+    if (OPP_PASSIVE_ABILITY_OVERRIDE && !this.isPlayer())
+      return allAbilities[OPP_PASSIVE_ABILITY_OVERRIDE];
+
     let starterSpeciesId = this.species.speciesId;
     while (pokemonPrevolutions.hasOwnProperty(starterSpeciesId))
       starterSpeciesId = pokemonPrevolutions[starterSpeciesId];
@@ -818,6 +823,8 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
   } 
 
   hasPassive(): boolean {
+    if ((PASSIVE_ABILITY_OVERRIDE !== Abilities.NONE && this.isPlayer()) || (OPP_PASSIVE_ABILITY_OVERRIDE !== Abilities.NONE && !this.isPlayer()))
+      return true;
     return this.passive || this.isBoss();
   }
 
@@ -1705,18 +1712,19 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
     });
   }
 
-  cry(soundConfig?: Phaser.Types.Sound.SoundConfig): AnySound {
+  cry(soundConfig?: Phaser.Types.Sound.SoundConfig, sceneOverride?: BattleScene): AnySound {
-    const cry = this.getSpeciesForm().cry(this.scene, soundConfig);
+    const scene = sceneOverride || this.scene;
+    const cry = this.getSpeciesForm().cry(scene, soundConfig);
     let duration = cry.totalDuration * 1000;
     if (this.fusionSpecies) {
-      let fusionCry = this.getFusionSpeciesForm().cry(this.scene, soundConfig, true);
+      let fusionCry = this.getFusionSpeciesForm().cry(scene, soundConfig, true);
       duration = Math.min(duration, fusionCry.totalDuration * 1000);
       fusionCry.destroy();
-      this.scene.time.delayedCall(Utils.fixedInt(Math.ceil(duration * 0.4)), () => {
+      scene.time.delayedCall(Utils.fixedInt(Math.ceil(duration * 0.4)), () => {
         try {
-          SoundFade.fadeOut(this.scene, cry, Utils.fixedInt(Math.ceil(duration * 0.2)));
+          SoundFade.fadeOut(scene, cry, Utils.fixedInt(Math.ceil(duration * 0.2)));
-          fusionCry = this.getFusionSpeciesForm().cry(this.scene, Object.assign({ seek: Math.max(fusionCry.totalDuration * 0.4, 0) }, soundConfig));
+          fusionCry = this.getFusionSpeciesForm().cry(scene, Object.assign({ seek: Math.max(fusionCry.totalDuration * 0.4, 0) }, soundConfig));
-          SoundFade.fadeIn(this.scene, fusionCry, Utils.fixedInt(Math.ceil(duration * 0.2)), this.scene.masterVolume * this.scene.seVolume, 0);
+          SoundFade.fadeIn(scene, fusionCry, Utils.fixedInt(Math.ceil(duration * 0.2)), scene.masterVolume * scene.seVolume, 0);
         } catch (err) {
           console.error(err);
         }
@@ -3130,7 +3138,7 @@ export class PokemonBattleData {
   public hitCount: integer = 0;
   public endured: boolean = false;
   public berriesEaten: BerryType[] = [];
-  public abilityTriggered: boolean = false;
+  public abilitiesApplied: Abilities[] = [];
 }
 
 export class PokemonBattleSummonData {

src/loading-scene.ts

@@ -77,6 +77,7 @@ export class LoadingScene extends SceneBase {
     this.loadImage('shiny_star_small_1', 'ui', 'shiny_small_1.png');
     this.loadImage('shiny_star_small_2', 'ui', 'shiny_small_2.png');
     this.loadImage('ha_capsule', 'ui', 'ha_capsule.png');
+    this.loadImage('champion_ribbon', 'ui', 'champion_ribbon.png');
     this.loadImage('icon_spliced', 'ui');
     this.loadImage('icon_tera', 'ui');
     this.loadImage('type_tera', 'ui');

src/locales/de/config.ts

@@ -0,0 +1,28 @@
+import { ability } from "./ability";
+import { battle } from "./battle";
+import { commandUiHandler } from "./command-ui-handler";
+import { fightUiHandler } from "./fight-ui-handler";
+import { menu } from "./menu";
+import { menuUiHandler } from "./menu-ui-handler";
+import { move } from "./move";
+import { pokeball } from "./pokeball";
+import { pokemon } from "./pokemon";
+import { pokemonStat } from "./pokemon-stat";
+import { starterSelectUiHandler } from "./starter-select-ui-handler";
+import { tutorial } from "./tutorial";
+
+
+export const deConfig = {
+    ability: ability,
+    battle: battle,
+    commandUiHandler: commandUiHandler,
+    fightUiHandler: fightUiHandler,
+    menuUiHandler: menuUiHandler,
+    menu: menu,
+    move: move,
+    pokeball: pokeball,
+    pokemonStat: pokemonStat,
+    pokemon: pokemon,
+    starterSelectUiHandler: starterSelectUiHandler,
+    tutorial: tutorial
+}

src/locales/en/config.ts

@@ -0,0 +1,28 @@
+import { ability } from "./ability";
+import { battle } from "./battle";
+import { commandUiHandler } from "./command-ui-handler";
+import { fightUiHandler } from "./fight-ui-handler";
+import { menu } from "./menu";
+import { menuUiHandler } from "./menu-ui-handler";
+import { move } from "./move";
+import { pokeball } from "./pokeball";
+import { pokemon } from "./pokemon";
+import { pokemonStat } from "./pokemon-stat";
+import { starterSelectUiHandler } from "./starter-select-ui-handler";
+import { tutorial } from "./tutorial";
+
+
+export const enConfig = {
+    ability: ability,
+    battle: battle,
+    commandUiHandler: commandUiHandler,
+    fightUiHandler: fightUiHandler,
+    menuUiHandler: menuUiHandler,
+    menu: menu,
+    move: move,
+    pokeball: pokeball,
+    pokemonStat: pokemonStat,
+    pokemon: pokemon,
+    starterSelectUiHandler: starterSelectUiHandler,
+    tutorial: tutorial
+}

src/locales/es/config.ts

@@ -0,0 +1,28 @@
+import { ability } from "./ability";
+import { battle } from "./battle";
+import { commandUiHandler } from "./command-ui-handler";
+import { fightUiHandler } from "./fight-ui-handler";
+import { menu } from "./menu";
+import { menuUiHandler } from "./menu-ui-handler";
+import { move } from "./move";
+import { pokeball } from "./pokeball";
+import { pokemon } from "./pokemon";
+import { pokemonStat } from "./pokemon-stat";
+import { starterSelectUiHandler } from "./starter-select-ui-handler";
+import { tutorial } from "./tutorial";
+
+
+export const esConfig = {
+    ability: ability,
+    battle: battle,
+    commandUiHandler: commandUiHandler,
+    fightUiHandler: fightUiHandler,
+    menuUiHandler: menuUiHandler,
+    menu: menu,
+    move: move,
+    pokeball: pokeball,
+    pokemonStat: pokemonStat,
+    pokemon: pokemon,
+    starterSelectUiHandler: starterSelectUiHandler,
+    tutorial: tutorial
+}

src/locales/fr/config.ts

@@ -0,0 +1,28 @@
+import { ability } from "./ability";
+import { battle } from "./battle";
+import { commandUiHandler } from "./command-ui-handler";
+import { fightUiHandler } from "./fight-ui-handler";
+import { menu } from "./menu";
+import { menuUiHandler } from "./menu-ui-handler";
+import { move } from "./move";
+import { pokeball } from "./pokeball";
+import { pokemon } from "./pokemon";
+import { pokemonStat } from "./pokemon-stat";
+import { starterSelectUiHandler } from "./starter-select-ui-handler";
+import { tutorial } from "./tutorial";
+
+
+export const frConfig = {
+    ability: ability,
+    battle: battle,
+    commandUiHandler: commandUiHandler,
+    fightUiHandler: fightUiHandler,
+    menuUiHandler: menuUiHandler,
+    menu: menu,
+    move: move,
+    pokeball: pokeball,
+    pokemonStat: pokemonStat,
+    pokemon: pokemon,
+    starterSelectUiHandler: starterSelectUiHandler,
+    tutorial: tutorial
+}

src/locales/fr/starter-select-ui-handler.ts

@@ -7,26 +7,26 @@ import { SimpleTranslationEntries } from "#app/plugins/i18n";
  */
 export const starterSelectUiHandler: SimpleTranslationEntries = {
     "confirmStartTeam":'Commencer avec ces Pokémon ?',
-    "growthRate": "Growth Rate:",
+    "growthRate": "Croissance :",
-    "ability": "Ability:",
+    "ability": "Talent :",
-    "passive": "Passive:",
+    "passive": "Passif :",
-    "nature": "Nature:",
+    "nature": "Nature :",
-    "eggMoves": 'Egg Moves',
+    "eggMoves": "Capacités Œuf",
-    "start": "Start",
+    "start": "Lancer",
-    "addToParty": "Add to Party", 
+    "addToParty": "Ajouter à l’équipe",
-    "toggleIVs": 'Toggle IVs',
+    "toggleIVs": "Voir IVs",
-    "manageMoves": 'Manage Moves',
+    "manageMoves": "Gérer Capacités",
-    "useCandies": 'Use Candies',
+    "useCandies": "Utiliser Bonbons",
-    "selectMoveSwapOut": "Select a move to swap out.",
+    "selectMoveSwapOut": "Sélectionnez la capacité à échanger.",
-    "selectMoveSwapWith": "Select a move to swap with",
+    "selectMoveSwapWith": "Sélectionnez laquelle échanger avec",
-    "unlockPassive": "Unlock Passive",
+    "unlockPassive": "Débloquer Passif",
-    "reduceCost": "Reduce Cost",
+    "reduceCost": "Diminuer le cout",
-    "cycleShiny": "R: Cycle Shiny",
+    "cycleShiny": "R: » Chromatiques",
-    "cycleForm": 'F: Cycle Form',
+    "cycleForm": "F: » Formes",
-    "cycleGender": 'G: Cycle Gender',
+    "cycleGender": "G: » Sexes",
-    "cycleAbility": 'E: Cycle Ability',
+    "cycleAbility": "E: » Talents",
-    "cycleNature": 'N: Cycle Nature',
+    "cycleNature": "N: » Natures",
-    "cycleVariant": 'V: Cycle Variant',
+    "cycleVariant": "V: » Variants",
-    "enablePassive": "Enable Passive",
+    "enablePassive": "Activer Passif",
-    "disablePassive": "Disable Passive"
+    "disablePassive": "Désactiver Passif"
 }

src/locales/it/battle.ts

@@ -11,18 +11,18 @@ export const battle: SimpleTranslationEntries = {
   "trainerGo": "{{trainerName}} manda in campo {{pokemonName}}!",
   "switchQuestion": "Vuoi cambiare\n{{pokemonName}}?",
   "trainerDefeated": `Hai sconfitto\n{{trainerName}}!`,
-  "pokemonCaught": "{{pokemonName}} è stato catturato!",
+  "pokemonCaught": "Preso! {{pokemonName}} è stato catturato!",
   "pokemon": "Pokémon",
   "sendOutPokemon": "Vai! {{pokemonName}}!",
   "hitResultCriticalHit": "Brutto colpo!",
   "hitResultSuperEffective": "È superefficace!",
   "hitResultNotVeryEffective": "Non è molto efficace…",
   "hitResultNoEffect": "Non ha effetto su {{pokemonName}}!",
-  "hitResultOneHitKO": "È KO con un colpo solo!",
+  "hitResultOneHitKO": "KO con un colpo!",
   "attackFailed": "Ma ha fallito!",
   "attackHitsCount": `Colpito {{count}} volta/e!`,
   "expGain": "{{pokemonName}} ha guadagnato\n{{exp}} Punti Esperienza!",
-  "levelUp": "{{pokemonName}} è salito al \nLivello {{level}}!",
+  "levelUp": "{{pokemonName}} è salito al \nlivello {{level}}!",
   "learnMove": "{{pokemonName}} impara \n{{moveName}}!",
   "learnMovePrompt": "{{pokemonName}} vorrebbe imparare\n{{moveName}}.",
   "learnMoveLimitReached": "Tuttavia, {{pokemonName}} \nconosce già quattro mosse.",
@@ -33,16 +33,16 @@ export const battle: SimpleTranslationEntries = {
   "learnMoveForgetSuccess": "{{pokemonName}} ha dimenticato la mossa\n{{moveName}}.",
   "levelCapUp": "Il livello massimo\nè aumentato a {{levelCap}}!",
   "moveNotImplemented": "{{moveName}} non è ancora implementata e non può essere selezionata.",
-  "moveNoPP": "There's no PP left for\nthis move!",
+  "moveNoPP": "Non ci sono PP rimanenti\nper questa mossa!",
   "moveDisabled": "{{moveName}} è disabilitata!",
   "noPokeballForce": "Una forza misteriosa\nimpedisce l'uso dell Poké Ball.",
   "noPokeballTrainer": "Non puoi catturare\nPokémon di altri allenatori!",
   "noPokeballMulti": "Puoi lanciare una Poké Ball\nquando rimane un solo Pokémon!",
   "noPokeballStrong": "Il Pokémon avversario è troppo forte per essere catturato!\nDevi prima indebolirlo!",
   "noEscapeForce": "Una forza misteriosa\nimpedisce la fuga.",
-  "noEscapeTrainer": "Non puoi fuggire\nda una battaglia contro un'allenatore!",
+  "noEscapeTrainer": "Non puoi sottrarti\nalla lotta con un'allenatore!",
   "noEscapePokemon": "{{moveName}} di {{pokemonName}}\npreviene la {{escapeVerb}}!",
-  "runAwaySuccess": "Sei riuscito a fuggire!",
+  "runAwaySuccess": "Scampato pericolo!",
   "runAwayCannotEscape": 'Non puoi fuggire!',
   "escapeVerbSwitch": "cambiando",
   "escapeVerbFlee": "fuggendo",

src/locales/it/config.ts

@@ -0,0 +1,28 @@
+import { ability } from "./ability";
+import { battle } from "./battle";
+import { commandUiHandler } from "./command-ui-handler";
+import { fightUiHandler } from "./fight-ui-handler";
+import { menu } from "./menu";
+import { menuUiHandler } from "./menu-ui-handler";
+import { move } from "./move";
+import { pokeball } from "./pokeball";
+import { pokemon } from "./pokemon";
+import { pokemonStat } from "./pokemon-stat";
+import { starterSelectUiHandler } from "./starter-select-ui-handler";
+import { tutorial } from "./tutorial";
+
+
+export const itConfig = {
+    ability: ability,
+    battle: battle,
+    commandUiHandler: commandUiHandler,
+    fightUiHandler: fightUiHandler,
+    menuUiHandler: menuUiHandler,
+    menu: menu,
+    move: move,
+    pokeball: pokeball,
+    pokemonStat: pokemonStat,
+    pokemon: pokemon,
+    starterSelectUiHandler: starterSelectUiHandler,
+    tutorial: tutorial
+}

src/locales/it/starter-select-ui-handler.ts

@@ -7,26 +7,26 @@ import { SimpleTranslationEntries } from "#app/plugins/i18n";
  */
 export const starterSelectUiHandler: SimpleTranslationEntries = {
     "confirmStartTeam":'Vuoi iniziare con questi Pokémon?',
-    "growthRate": "Growth Rate:",
+    "growthRate": "Vel. Crescita:",
-    "ability": "Ability:",
+    "ability": "Abilità:",
-    "passive": "Passive:",
+    "passive": "Passiva:",
-    "nature": "Nature:",
+    "nature": "Natura:",
-    "eggMoves": 'Egg Moves',
+    "eggMoves": 'Mosse delle uova',
-    "start": "Start",
+    "start": "Inizia",
-    "addToParty": "Add to Party", 
+    "addToParty": "Aggiungi al Gruppo", 
-    "toggleIVs": 'Toggle IVs',
+    "toggleIVs": 'Vedi/Nascondi IV',
-    "manageMoves": 'Manage Moves',
+    "manageMoves": 'Gestisci Mosse',
-    "useCandies": 'Use Candies',
+    "useCandies": 'Usa Caramelle',
-    "selectMoveSwapOut": "Select a move to swap out.",
+    "selectMoveSwapOut": "Seleziona una mossa da scambiare.",
-    "selectMoveSwapWith": "Select a move to swap with",
+    "selectMoveSwapWith": "Seleziona una mossa da scambiare con",
-    "unlockPassive": "Unlock Passive",
+    "unlockPassive": "Sblocca Passiva",
-    "reduceCost": "Reduce Cost",
+    "reduceCost": "Riduci Costo",
-    "cycleShiny": "R: Cycle Shiny",
+    "cycleShiny": "R: Alterna Shiny",
-    "cycleForm": 'F: Cycle Form',
+    "cycleForm": 'F: Alterna Forma',
-    "cycleGender": 'G: Cycle Gender',
+    "cycleGender": 'G: Alterna Sesso',
-    "cycleAbility": 'E: Cycle Ability',
+    "cycleAbility": 'E: Alterna Abilità',
-    "cycleNature": 'N: Cycle Nature',
+    "cycleNature": 'N: Alterna Natura',
-    "cycleVariant": 'V: Cycle Variant',
+    "cycleVariant": 'V: Alterna Variante',
-    "enablePassive": "Enable Passive",
+    "enablePassive": "Attiva Passiva",
-    "disablePassive": "Disable Passive"
+    "disablePassive": "Disattiva Passiva"
 }

src/modifier/modifier-type.ts

@@ -144,9 +144,16 @@ class AddPokeballModifierType extends ModifierType implements Localizable {
   }
 
   localize(): void {
+    // TODO: Actually use i18n to localize this description.
     this.name = `${this.count}x ${getPokeballName(this.pokeballType)}`;
-    this.description = `Receive ${getPokeballName(this.pokeballType)} x${this.count}\nCatch Rate: ${getPokeballCatchMultiplier(this.pokeballType) > -1 ? `${getPokeballCatchMultiplier(this.pokeballType)}x` : 'Certain'}`;
+    this.description = `Receive ${getPokeballName(this.pokeballType)} x${this.count} (Inventory: {AMOUNT}) \nCatch Rate: ${getPokeballCatchMultiplier(this.pokeballType) > -1 ? `${getPokeballCatchMultiplier(this.pokeballType)}x` : 'Certain'}`;
   }
+  
+  getDescription(scene: BattleScene): string {
+    this.localize();
+    return this.description.replace('{AMOUNT}', scene.pokeballCounts[this.pokeballType].toString());
+  }
+
 }
 
 class AddVoucherModifierType extends ModifierType {
@@ -299,7 +306,7 @@ export class PokemonNatureChangeModifierType extends PokemonModifierType {
   protected nature: Nature;
 
   constructor(nature: Nature) {
-    super(`${getNatureName(nature)} Mint`, `Changes a Pokémon\'s nature to ${getNatureName(nature, true, true, true)}`, ((_type, args) => new Modifiers.PokemonNatureChangeModifier(this, (args[0] as PlayerPokemon).id, this.nature)),
+    super(`${getNatureName(nature)} Mint`, `Changes a Pokémon\'s nature to ${getNatureName(nature, true, true, true)} and permanently unlocks the nature for the starter.`, ((_type, args) => new Modifiers.PokemonNatureChangeModifier(this, (args[0] as PlayerPokemon).id, this.nature)),
       ((pokemon: PlayerPokemon) => {
         if (pokemon.getNature() === this.nature)
           return PartyUiHandler.NoEffectMessage;

src/modifier/modifier.ts

@@ -8,15 +8,14 @@ import { Stat } from "../data/pokemon-stat";
 import { addTextObject, TextStyle } from "../ui/text";
 import { Type } from '../data/type';
 import { EvolutionPhase } from '../evolution-phase';
-import { FusionSpeciesFormEvolution, pokemonEvolutions } from '../data/pokemon-evolutions';
+import { FusionSpeciesFormEvolution, pokemonEvolutions, pokemonPrevolutions } from '../data/pokemon-evolutions';
 import { getPokemonMessage } from '../messages';
 import * as Utils from "../utils";
 import { TempBattleStat } from '../data/temp-battle-stat';
 import { BerryType, getBerryEffectFunc, getBerryPredicate } from '../data/berry';
 import { StatusEffect, getStatusEffectHealText } from '../data/status-effect';
-import { MoneyAchv, achvs } from '../system/achv';
+import { achvs } from '../system/achv';
 import { VoucherType } from '../system/voucher';
-import { PreventBerryUseAbAttr, applyAbAttrs } from '../data/ability';
 import { FormChangeItem, SpeciesFormChangeItemTrigger } from '../data/pokemon-forms';
 import { Nature } from '#app/data/nature';
 import { BattlerTagType } from '#app/data/enums/battler-tag-type';
@@ -1090,6 +1089,13 @@ export class PokemonNatureChangeModifier extends ConsumablePokemonModifier {
   apply(args: any[]): boolean {
     const pokemon = args[0] as Pokemon;
     pokemon.natureOverride = this.nature;
+    let speciesId = pokemon.species.speciesId;
+    pokemon.scene.gameData.dexData[speciesId].natureAttr |= Math.pow(2, this.nature + 1);
+
+    while (pokemonPrevolutions.hasOwnProperty(speciesId)) {
+      speciesId = pokemonPrevolutions[speciesId];
+      pokemon.scene.gameData.dexData[speciesId].natureAttr |= Math.pow(2, this.nature + 1);
+    }
 
     return true;
   }

src/overrides.ts

@@ -12,12 +12,15 @@ export const STARTING_WAVE_OVERRIDE = 0;
 export const STARTING_BIOME_OVERRIDE = Biome.TOWN;
 export const STARTING_MONEY_OVERRIDE = 0;
 export const WEATHER_OVERRIDE = WeatherType.NONE;
+export const DOUBLE_BATTLE_OVERRIDE = false;
 
 export const ABILITY_OVERRIDE = Abilities.NONE;
+export const PASSIVE_ABILITY_OVERRIDE = Abilities.NONE;
 export const MOVE_OVERRIDE = Moves.NONE;
 export const MOVE_OVERRIDE_2 = Moves.NONE;
 export const OPP_SPECIES_OVERRIDE = 0;
 export const OPP_ABILITY_OVERRIDE = Abilities.NONE;
+export const OPP_PASSIVE_ABILITY_OVERRIDE = Abilities.NONE;
 export const OPP_MOVE_OVERRIDE = Moves.NONE;
 export const OPP_MOVE_OVERRIDE_2 = Moves.NONE;
 

src/phases.ts

@@ -1,4 +1,4 @@
-import BattleScene, { bypassLogin, startingWave } from "./battle-scene";
+import BattleScene, { AnySound, bypassLogin, startingWave } from "./battle-scene";
 import { default as Pokemon, PlayerPokemon, EnemyPokemon, PokemonMove, MoveResult, DamageResult, FieldPosition, HitResult, TurnMove } from "./field/pokemon";
 import * as Utils from './utils';
 import { Moves } from "./data/enums/moves";
@@ -55,7 +55,7 @@ import { OptionSelectConfig, OptionSelectItem } from "./ui/abstact-option-select
 import { SaveSlotUiMode } from "./ui/save-slot-select-ui-handler";
 import { fetchDailyRunSeed, getDailyRunStarters } from "./data/daily-run";
 import { GameModes, gameModes } from "./game-mode";
-import { getPokemonSpecies, speciesStarters } from "./data/pokemon-species";
+import PokemonSpecies, { getPokemonSpecies, getPokemonSpeciesForm, speciesStarters } from "./data/pokemon-species";
 import i18next from './plugins/i18n';
 import { Abilities } from "./data/enums/abilities";
 import { STARTER_FORM_OVERRIDE, STARTER_SPECIES_OVERRIDE } from './overrides';
@@ -3472,8 +3472,40 @@ export class GameOverModifierRewardPhase extends ModifierRewardPhase {
   }
 }
 
+export class RibbonModifierRewardPhase extends ModifierRewardPhase {
+  private species: PokemonSpecies;
+
+  constructor(scene: BattleScene, modifierTypeFunc: ModifierTypeFunc, species: PokemonSpecies) {
+    super(scene, modifierTypeFunc);
+
+    this.species = species;
+  }
+
+  doReward(): Promise<void> {
+    return new Promise<void>(resolve => {
+      const newModifier = this.modifierType.newModifier();
+      this.scene.addModifier(newModifier).then(() => {
+        this.scene.gameData.saveSystem().then(success => {
+          if (success) {
+            this.scene.playSound('level_up_fanfare');
+            this.scene.ui.setMode(Mode.MESSAGE);
+            this.scene.arenaBg.setVisible(false);
+            this.scene.ui.fadeIn(250).then(() => {
+              this.scene.ui.showText(`${this.species.name} beat ${this.scene.gameMode.getName()} Mode for the first time!\nYou received ${newModifier.type.name}!`, null, () => {
+                resolve();
+              }, null, true, 1500);
+            });
+          } else
+            this.scene.reset(true);
+        });
+      });
+    })
+  }
+}
+
 export class GameOverPhase extends BattlePhase {
   private victory: boolean;
+  private firstRibbons: PokemonSpecies[] = [];
 
   constructor(scene: BattleScene, victory?: boolean) {
     super(scene);
@@ -3525,6 +3557,13 @@ export class GameOverPhase extends BattlePhase {
           if (this.scene.gameMode.isClassic) {
             firstClear = this.scene.validateAchv(achvs.CLASSIC_VICTORY);
             this.scene.gameData.gameStats.sessionsWon++;
+            for (let pokemon of this.scene.getParty()) {
+              this.awardRibbon(pokemon);
+
+              if (pokemon.species.getRootSpeciesId() != pokemon.species.getRootSpeciesId(true)) {
+                this.awardRibbon(pokemon, true);
+              }
+            }
           } else if (this.scene.gameMode.isDaily && success[1])
             this.scene.gameData.gameStats.dailyRunSessionsWon++;
         }
@@ -3536,8 +3575,11 @@ export class GameOverPhase extends BattlePhase {
           this.scene.clearPhaseQueue();
           this.scene.ui.clearText();
           this.handleUnlocks();
-          if (this.victory && !firstClear && success[1])
+          if (this.victory && !firstClear && success[1]) {
+            for (let species of this.firstRibbons)
+              this.scene.unshiftPhase(new RibbonModifierRewardPhase(this.scene, modifierTypes.VOUCHER_PLUS, species));
             this.scene.unshiftPhase(new GameOverModifierRewardPhase(this.scene, modifierTypes.VOUCHER_PREMIUM));
+          }
           this.scene.reset();
           this.scene.unshiftPhase(new TitlePhase(this.scene));
           this.end();
@@ -3556,6 +3598,15 @@ export class GameOverPhase extends BattlePhase {
         this.scene.unshiftPhase(new UnlockPhase(this.scene, Unlockables.MINI_BLACK_HOLE));
     }
   }
+
+  awardRibbon(pokemon: Pokemon, forStarter: boolean = false): void {
+    const speciesId = getPokemonSpecies(pokemon.species.speciesId)
+    const speciesRibbonCount = this.scene.gameData.incrementRibbonCount(speciesId, forStarter);
+    // first time classic win, award voucher
+    if (speciesRibbonCount === 1) {
+      this.firstRibbons.push(getPokemonSpecies(pokemon.species.getRootSpeciesId(forStarter)));
+    }
+  }
 }
 
 export class UnlockPhase extends Phase {

src/plugins/i18n.ts

@@ -1,77 +1,11 @@
 import i18next from 'i18next';
 import LanguageDetector from 'i18next-browser-languagedetector';
 
-import { menu as enMenu } from '../locales/en/menu';
+import { deConfig } from '#app/locales/de/config.js';
-import { menu as esMenu } from '../locales/es/menu';
+import { enConfig } from '#app/locales/en/config.js';
-import { menu as itMenu } from '../locales/it/menu';
+import { esConfig } from '#app/locales/es/config.js';
-import { menu as frMenu } from '../locales/fr/menu';
+import { frConfig } from '#app/locales/fr/config.js';
-import { menu as deMenu } from '../locales/de/menu';
+import { itConfig } from '#app/locales/it/config.js';
-
-import { menuUiHandler as enMenuUiHandler } from '../locales/en/menu-ui-handler.js';
-import { menuUiHandler as esMenuUiHandler } from '../locales/es/menu-ui-handler.js';
-import { menuUiHandler as frMenuUiHandler } from '../locales/fr/menu-ui-handler.js';
-import { menuUiHandler as itMenuUiHandler } from '../locales/it/menu-ui-handler.js';
-import { menuUiHandler as deMenuUiHandler } from '../locales/de/menu-ui-handler.js';
-
-import { battle as enBattle } from '../locales/en/battle';
-import { battle as esBattle } from '../locales/es/battle';
-import { battle as itBattle } from '../locales/it/battle';
-import { battle as frBattle } from '../locales/fr/battle';
-import { battle as deBattle } from '../locales/de/battle';
-
-import { move as enMove } from '../locales/en/move';
-import { move as esMove } from '../locales/es/move';
-import { move as itMove } from '../locales/it/move';
-import { move as frMove } from '../locales/fr/move';
-import { move as deMove } from '../locales/de/move';
-
-import { ability as enAbility } from '../locales/en/ability';
-import { ability as esAbility } from '../locales/es/ability';
-import { ability as itAbility } from '../locales/it/ability';
-import { ability as frAbility } from '../locales/fr/ability';
-import { ability as deAbility } from '../locales/de/ability';
-
-import { pokeball as enPokeball } from '../locales/en/pokeball';
-import { pokeball as esPokeball } from '../locales/es/pokeball';
-import { pokeball as itPokeball } from '../locales/it/pokeball';
-import { pokeball as frPokeball } from '../locales/fr/pokeball';
-import { pokeball as dePokeball } from '../locales/de/pokeball';
-
-import { pokemon as enPokemon } from '../locales/en/pokemon';
-import { pokemon as esPokemon } from '../locales/es/pokemon';
-import { pokemon as itPokemon } from '../locales/it/pokemon';
-import { pokemon as frPokemon } from '../locales/fr/pokemon';
-import { pokemon as dePokemon } from '../locales/de/pokemon';
-
-import { pokemonStat as enPokemonStat } from '../locales/en/pokemon-stat';
-import { pokemonStat as esPokemonStat } from '../locales/es/pokemon-stat';
-import { pokemonStat as frPokemonStat } from '../locales/fr/pokemon-stat';
-import { pokemonStat as itPokemonStat } from '../locales/it/pokemon-stat';
-import { pokemonStat as dePokemonStat } from '../locales/de/pokemon-stat';
-
-import { commandUiHandler as enCommandUiHandler } from '../locales/en/command-ui-handler';
-import { commandUiHandler as esCommandUiHandler } from '../locales/es/command-ui-handler';
-import { commandUiHandler as itCommandUiHandler } from '../locales/it/command-ui-handler';
-import { commandUiHandler as frCommandUiHandler } from '../locales/fr/command-ui-handler';
-import { commandUiHandler as deCommandUiHandler } from '../locales/de/command-ui-handler';
-
-import { fightUiHandler as enFightUiHandler } from '../locales/en/fight-ui-handler';
-import { fightUiHandler as esFightUiHandler } from '../locales/es/fight-ui-handler';
-import { fightUiHandler as frFightUiHandler } from '../locales/fr/fight-ui-handler';
-import { fightUiHandler as itFightUiHandler } from '../locales/it/fight-ui-handler';
-import { fightUiHandler as deFightUiHandler } from '../locales/de/fight-ui-handler';
-
-import { tutorial as enTutorial } from '../locales/en/tutorial';
-import { tutorial as esTutorial } from '../locales/es/tutorial';
-import { tutorial as frTutorial } from '../locales/fr/tutorial';
-import { tutorial as itTutorial} from '../locales/it/tutorial';
-import { tutorial as deTutorial } from '../locales/de/tutorial';
-
-import { starterSelectUiHandler as enStarterSelectUiHandler } from '../locales/en/starter-select-ui-handler';
-import { starterSelectUiHandler as esStarterSelectUiHandler } from '../locales/es/starter-select-ui-handler';
-import { starterSelectUiHandler as frStarterSelectUiHandler } from '../locales/fr/starter-select-ui-handler';
-import { starterSelectUiHandler as itStarterSelectUiHandler} from '../locales/it/starter-select-ui-handler';
-import { starterSelectUiHandler as deStarterSelectUiHandler } from '../locales/de/starter-select-ui-handler';
 
 export interface SimpleTranslationEntries {
   [key: string]: string
@@ -131,74 +65,19 @@ export function initI18n(): void {
     },
     resources: {
       en: {
-        menu: enMenu,
+        ...enConfig
-        menuUiHandler: enMenuUiHandler,
-        battle: enBattle,
-        move: enMove,
-        ability: enAbility,
-        pokeball: enPokeball,
-        pokemon: enPokemon,
-        pokemonStat: enPokemonStat,
-        commandUiHandler: enCommandUiHandler,
-        fightUiHandler: enFightUiHandler,
-        tutorial: enTutorial,
-        starterSelectUiHandler: enStarterSelectUiHandler
       },
       es: {
-        menu: esMenu,
+        ...esConfig
-        menuUiHandler: esMenuUiHandler,
-        battle: esBattle,
-        move: esMove,
-        ability: esAbility,
-        pokeball: esPokeball,
-        pokemon: esPokemon,
-        pokemonStat: esPokemonStat,
-        commandUiHandler: esCommandUiHandler,
-        fightUiHandler: esFightUiHandler,
-        tutorial: esTutorial,
-        starterSelectUiHandler: esStarterSelectUiHandler
       },
       fr: {
-        menu: frMenu,
+        ...frConfig
-        menuUiHandler: frMenuUiHandler,
-        battle: frBattle,
-        move: frMove,
-        ability: frAbility,
-        pokeball: frPokeball,
-        pokemon: frPokemon,
-        pokemonStat: frPokemonStat,
-        commandUiHandler: frCommandUiHandler,
-        fightUiHandler: frFightUiHandler,
-        tutorial: frTutorial,
-        starterSelectUiHandler: frStarterSelectUiHandler
       },
       it: {
-        menu: itMenu,
+        ...itConfig
-        menuUiHandler: itMenuUiHandler,
-        battle: itBattle,
-        move: itMove,
-        ability: itAbility,
-        pokeball: itPokeball,
-        pokemon: itPokemon,
-        pokemonStat: itPokemonStat,
-        commandUiHandler: itCommandUiHandler,
-        fightUiHandler: itFightUiHandler,
-        tutorial: itTutorial,
-        starterSelectUiHandler: itStarterSelectUiHandler
       },
       de: {
-        menu: deMenu,
+        ...deConfig
-        menuUiHandler: deMenuUiHandler,
-        battle: deBattle,
-        move: deMove,
-        ability: deAbility,
-        pokeball: dePokeball,
-        pokemon: dePokemon,
-        pokemonStat: dePokemonStat,
-        commandUiHandler: deCommandUiHandler,
-        fightUiHandler: deFightUiHandler,
-        tutorial: deTutorial,
-        starterSelectUiHandler: deStarterSelectUiHandler
       }
     },
   });
@@ -208,18 +87,18 @@ export function initI18n(): void {
 declare module 'i18next' {
   interface CustomTypeOptions {
     resources: {
-      menu: typeof enMenu;
+      menu: SimpleTranslationEntries;
-      menuUiHandler: typeof enMenuUiHandler;
+      menuUiHandler: SimpleTranslationEntries;
-      move: typeof enMove;
+      move: MoveTranslationEntries;
-      battle: typeof enBattle,
+      battle: SimpleTranslationEntries,
-      ability: typeof enAbility;
+      ability: AbilityTranslationEntries;
-      pokeball: typeof enPokeball;
+      pokeball: SimpleTranslationEntries;
-      pokemon: typeof enPokemon;
+      pokemon: SimpleTranslationEntries;
-      pokemonStat: typeof enPokemonStat;
+      pokemonStat: SimpleTranslationEntries;
-      commandUiHandler: typeof enCommandUiHandler;
+      commandUiHandler: SimpleTranslationEntries;
-      fightUiHandler: typeof enFightUiHandler;
+      fightUiHandler: SimpleTranslationEntries;
-      tutorial: typeof enTutorial;
+      tutorial: SimpleTranslationEntries;
-      starterSelectUiHandler: typeof enStarterSelectUiHandler;
+      starterSelectUiHandler: SimpleTranslationEntries;
     };
   }
 }

src/system/achv.ts

@@ -51,9 +51,9 @@ export class Achv {
   }
 
   getTier(): AchvTier {
-    if (this.score >= 150)
-      return AchvTier.MASTER;
     if (this.score >= 100)
+      return AchvTier.MASTER;
+    if (this.score >= 75)
       return AchvTier.ROGUE;
     if (this.score >= 50)
       return AchvTier.ULTRA;
@@ -73,6 +73,16 @@ export class MoneyAchv extends Achv {
   }
 }
 
+export class RibbonAchv extends Achv {
+  private ribbonAmount: integer;
+
+  constructor(name: string, ribbonAmount: integer, iconImage: string, score: integer) {
+    super(name, `Accumulate a total of ${ribbonAmount.toLocaleString('en-US')} Ribbons`, iconImage, score, (scene: BattleScene, _args: any[]) => scene.gameData.gameStats.ribbonsOwned >= this.ribbonAmount);
+
+    this.ribbonAmount = ribbonAmount;
+  }
+}
+
 export class DamageAchv extends Achv {
   private damageAmount: integer;
 
@@ -125,6 +135,11 @@ export const achvs = {
   LV_100: new LevelAchv('But Wait, There\'s More!', 100, 'rare_candy', 25).setSecret(),
   LV_250: new LevelAchv('Elite', 250, 'rarer_candy', 50).setSecret(true),
   LV_1000: new LevelAchv('To Go Even Further Beyond', 1000, 'candy_jar', 100).setSecret(true),
+  _10_RIBBONS: new RibbonAchv('Pokémon League Champion', 10, 'bronze_ribbon', 10),
+  _25_RIBBONS: new RibbonAchv('Great League Champion', 25, 'great_ribbon', 25).setSecret(true),
+  _50_RIBBONS: new RibbonAchv('Ultra League Champion', 50, 'ultra_ribbon', 50).setSecret(true),
+  _75_RIBBONS: new RibbonAchv('Rogue League Champion', 75, 'rogue_ribbon', 75).setSecret(true),
+  _100_RIBBONS: new RibbonAchv('Master League Champion', 100, 'master_ribbon', 100).setSecret(true),
   TRANSFER_MAX_BATTLE_STAT: new Achv('Teamwork', 'Baton pass to another party member with at least one stat maxed out', 'stick', 20),
   MAX_FRIENDSHIP: new Achv('Friendmaxxing', 'Reach max friendship on a Pokémon', 'soothe_bell', 25),
   MEGA_EVOLVE: new Achv('Megamorph', 'Mega evolve a Pokémon', 'mega_bracelet', 50),

src/system/game-data.ts

@@ -173,6 +173,7 @@ export interface StarterDataEntry {
   abilityAttr: integer;
   passiveAttr: integer;
   valueReduction: integer;
+  classicWinCount: integer;
 }
 
 export interface StarterData {
@@ -194,7 +195,8 @@ const systemShortKeys = {
   eggMoves: '$em',
   candyCount: '$x',
   passive: '$p',
-  valueReduction: '$vr'
+  valueReduction: '$vr',
+  classicWinCount: '$wc'
 };
 
 export class GameData {
@@ -995,7 +997,8 @@ export class GameData {
         friendship: 0,
         abilityAttr: defaultStarterSpecies.includes(speciesId) ? AbilityAttr.ABILITY_1 : 0,
         passiveAttr: 0,
-        valueReduction: 0
+        valueReduction: 0,
+        classicWinCount: 0
       };
     }
 
@@ -1089,6 +1092,32 @@ export class GameData {
     });
   }
 
+  incrementRibbonCount(species: PokemonSpecies, forStarter: boolean = false): integer {
+    const speciesIdToIncrement: Species = species.getRootSpeciesId(forStarter);
+
+    if (!this.starterData[speciesIdToIncrement].classicWinCount) {
+      this.starterData[speciesIdToIncrement].classicWinCount = 0;
+    }
+    
+    if (!this.starterData[speciesIdToIncrement].classicWinCount)
+      this.scene.gameData.gameStats.ribbonsOwned++;
+
+    const ribbonsInStats: integer = this.scene.gameData.gameStats.ribbonsOwned;
+
+    if (ribbonsInStats >= 100)
+      this.scene.validateAchv(achvs._100_RIBBONS);
+    if (ribbonsInStats >= 75)
+      this.scene.validateAchv(achvs._75_RIBBONS);
+    if (ribbonsInStats >= 50)
+      this.scene.validateAchv(achvs._50_RIBBONS);
+    if (ribbonsInStats >= 25)
+      this.scene.validateAchv(achvs._25_RIBBONS);
+    if (ribbonsInStats >= 10)
+      this.scene.validateAchv(achvs._10_RIBBONS);
+
+    return ++this.starterData[speciesIdToIncrement].classicWinCount;
+  }
+
   addStarterCandy(species: PokemonSpecies, count: integer): void {
     this.scene.candyBar.showStarterSpeciesCandy(species.speciesId, count);
     this.starterData[species.speciesId].candyCount += count;

src/system/game-stats.ts

@@ -6,6 +6,7 @@ export class GameStats {
   public battles: integer;
   public classicSessionsPlayed: integer;
   public sessionsWon: integer;
+  public ribbonsOwned: integer;
   public dailyRunSessionsPlayed: integer;
   public dailyRunSessionsWon: integer;
   public endlessSessionsPlayed: integer;
@@ -43,6 +44,7 @@ export class GameStats {
     this.battles = source?.battles || 0;
     this.classicSessionsPlayed = source?.classicSessionsPlayed || 0;
     this.sessionsWon = source?.sessionsWon || 0;
+    this.ribbonsOwned = source?.ribbonsOwned || 0;
     this.dailyRunSessionsPlayed = source?.dailyRunSessionsPlayed || 0;
     this.dailyRunSessionsWon = source?.dailyRunSessionsWon || 0;
     this.endlessSessionsPlayed = source?.endlessSessionsPlayed || 0;

src/ui/game-stats-ui-handler.ts

@@ -51,6 +51,7 @@ const displayStats: DisplayStats = {
       return `${caughtCount} (${Math.floor((caughtCount / Object.keys(gameData.dexData).length) * 1000) / 10}%)`;
     }
   },
+  ribbonsOwned: 'Ribbons Owned',
   classicSessionsPlayed: 'Classic Runs',
   sessionsWon: 'Classic Wins',
   dailyRunSessionsPlayed: 'Daily Run Attempts',

src/ui/starter-select-ui-handler.ts

@@ -174,6 +174,7 @@ export default class StarterSelectUiHandler extends MessageUiHandler {
   private starterValueLabels: Phaser.GameObjects.Text[];
   private shinyIcons: Phaser.GameObjects.Image[][];
   private hiddenAbilityIcons: Phaser.GameObjects.Image[];
+  private classicWinIcons: Phaser.GameObjects.Image[];
 
   private iconAnimHandler: PokemonIconAnimHandler;
 
@@ -410,6 +411,17 @@ export default class StarterSelectUiHandler extends MessageUiHandler {
       return ret;
     });
 
+    this.classicWinIcons = new Array(81).fill(null).map((_, i) => {
+      const x = (i % 9) * 18;
+      const y = Math.floor(i / 9) * 18;
+      const ret = this.scene.add.image(x + 152, y + 16, 'champion_ribbon');
+      ret.setOrigin(0, 0);
+      ret.setScale(0.5);
+      ret.setVisible(false);
+      this.starterSelectContainer.add(ret);
+      return ret;
+    });
+
     this.pokemonSprite = this.scene.add.sprite(53, 63, `pkmn__sub`);
     this.pokemonSprite.setPipeline(this.scene.spritePipeline, { tone: [ 0.0, 0.0, 0.0, 0.0 ], ignoreTimeTint: true });
     this.starterSelectContainer.add(this.pokemonSprite);
@@ -1192,6 +1204,7 @@ export default class StarterSelectUiHandler extends MessageUiHandler {
             this.shinyIcons[s][v].setTint(getVariantTint(speciesVariants[v] === DexAttr.DEFAULT_VARIANT ? 0 : speciesVariants[v] === DexAttr.VARIANT_2 ? 1 : 2));
         }
         this.hiddenAbilityIcons[s].setVisible(slotVisible && !!this.scene.gameData.dexData[speciesId].caughtAttr && !!(this.scene.gameData.starterData[speciesId].abilityAttr & 4));
+        this.classicWinIcons[s].setVisible(slotVisible && this.scene.gameData.starterData[speciesId].classicWinCount > 0);
       }
     } else {
       changed = super.setCursor(cursor);