Merge branch 'beta' into daily-standardization

src/data/dialogue.ts

@@ -353,6 +353,25 @@ export const trainerTypeDialogue: TrainerTypeDialogue = {
       ]
     },
   ],
+  // Defeat dialogue in the language .JSONS exist as translated or placeholders; (en, fr, it, es, de, ja, ko, zh_cn, zh_tw, pt_br)
+  [TrainerType.SNOW_WORKER]: [
+    {
+      encounter: [
+        "dialogue:snow_worker.encounter.1",
+      ],
+      victory: [
+        "dialogue:snow_worker.victory.1",
+      ]
+    },
+    {
+      encounter: [
+        "dialogue:snow_worker_double.encounter.1",
+      ],
+      victory: [
+        "dialogue:snow_worker_double.victory.1",
+      ]
+    },
+  ],
   [TrainerType.HEX_MANIAC]: [
     {
       encounter: [

src/data/mystery-encounters/encounters/berries-abound-encounter.ts

@@ -128,10 +128,10 @@ export const BerriesAboundEncounter: MysteryEncounter =
         const numBerries = encounter.misc.numBerries;
 
         const doBerryRewards = () => {
-          const berryText = numBerries + " " + i18next.t(`${namespace}.berries`);
+          const berryText = i18next.t(`${namespace}.berries`);
 
           scene.playSound("item_fanfare");
-          queueEncounterMessage(scene, i18next.t("battle:rewardGain", { modifierName: berryText }));
+          queueEncounterMessage(scene, i18next.t("battle:rewardGainCount", { modifierName: berryText, count: numBerries }));
 
           // Generate a random berry and give it to the first Pokemon with room for it
           for (let i = 0; i < numBerries; i++) {
@@ -179,10 +179,10 @@ export const BerriesAboundEncounter: MysteryEncounter =
           if (speedDiff < 1) {
             // Caught and attacked by boss, gets +1 to all stats at start of fight
             const doBerryRewards = () => {
-              const berryText = numBerries + " " + i18next.t(`${namespace}.berries`);
+              const berryText = i18next.t(`${namespace}.berries`);
 
               scene.playSound("item_fanfare");
-              queueEncounterMessage(scene, i18next.t("battle:rewardGain", { modifierName: berryText }));
+              queueEncounterMessage(scene, i18next.t("battle:rewardGainCount", { modifierName: berryText, count: numBerries }));
 
               // Generate a random berry and give it to the first Pokemon with room for it
               for (let i = 0; i < numBerries; i++) {
@@ -210,10 +210,10 @@ export const BerriesAboundEncounter: MysteryEncounter =
             const numBerriesGrabbed = Math.max(Math.min(Math.round((speedDiff - 1)/0.08), numBerries), 2);
             encounter.setDialogueToken("numBerries", String(numBerriesGrabbed));
             const doFasterBerryRewards = () => {
-              const berryText = numBerriesGrabbed + " " + i18next.t(`${namespace}.berries`);
+              const berryText = i18next.t(`${namespace}.berries`);
 
               scene.playSound("item_fanfare");
-              queueEncounterMessage(scene, i18next.t("battle:rewardGain", { modifierName: berryText }));
+              queueEncounterMessage(scene, i18next.t("battle:rewardGainCount", { modifierName: berryText, count: numBerriesGrabbed }));
 
               // Generate a random berry and give it to the first Pokemon with room for it (trying to give to fastest first)
               for (let i = 0; i < numBerriesGrabbed; i++) {

src/data/mystery-encounters/encounters/trash-to-treasure-encounter.ts

@@ -190,7 +190,7 @@ async function tryApplyDigRewardItems(scene: BattleScene) {
   }
 
   scene.playSound("item_fanfare");
-  await showEncounterText(scene, i18next.t("battle:rewardGain", { modifierName: "2x " + leftovers.name }), null, undefined, true);
+  await showEncounterText(scene, i18next.t("battle:rewardGainCount", { modifierName: leftovers.name, count: 2 }), null, undefined, true);
 
   // First Shell bell
   for (const pokemon of party) {
@@ -217,7 +217,7 @@ async function tryApplyDigRewardItems(scene: BattleScene) {
   }
 
   scene.playSound("item_fanfare");
-  await showEncounterText(scene, i18next.t("battle:rewardGain", { modifierName: "2x " + shellBell.name }), null, undefined, true);
+  await showEncounterText(scene, i18next.t("battle:rewardGainCount", { modifierName: shellBell.name, count: 2 }), null, undefined, true);
 }
 
 async function doGarbageDig(scene: BattleScene) {

src/data/trainer-config.ts

@@ -1458,7 +1458,7 @@ export const trainerConfigs: TrainerConfigs = {
       [TrainerPoolTier.ULTRA_RARE]: [Species.ROTOM, Species.MELTAN]
     }),
   [TrainerType.SMASHER]: new TrainerConfig(++t).setMoneyMultiplier(1.2).setEncounterBgm(TrainerType.CYCLIST),
-  [TrainerType.SNOW_WORKER]: new TrainerConfig(++t).setName("Worker").setHasGenders("Worker Female").setHasDouble("Workers").setMoneyMultiplier(1.7).setEncounterBgm(TrainerType.CLERK).setSpeciesFilter(s => s.isOfType(Type.ICE) || s.isOfType(Type.STEEL)),
+  [TrainerType.SNOW_WORKER]: new TrainerConfig(++t).setName("Worker").setHasDouble("Workers").setMoneyMultiplier(1.7).setEncounterBgm(TrainerType.CLERK).setSpeciesFilter(s => s.isOfType(Type.ICE) || s.isOfType(Type.STEEL)),
   [TrainerType.STRIKER]: new TrainerConfig(++t).setMoneyMultiplier(1.2).setEncounterBgm(TrainerType.CYCLIST),
   [TrainerType.SCHOOL_KID]: new TrainerConfig(++t).setMoneyMultiplier(0.75).setEncounterBgm(TrainerType.YOUNGSTER).setHasGenders("School Kid Female", "lass").setHasDouble("School Kids")
     .setSpeciesPools({

src/locales/de/battle.json

@@ -32,6 +32,7 @@
   "attackMissed": "Die Attacke hat {{pokemonNameWithAffix}} verfehlt!",
   "attackHitsCount": "{{count}}-mal getroffen!",
   "rewardGain": "Du erhältst {{modifierName}}!",
+  "rewardGainCount": "Du erhältst {{count}} {{modifierName}}!",
   "expGain": "{{pokemonName}} erhält {{exp}} Erfahrungspunkte!",
   "levelUp": "{{pokemonName}} erreicht Lv. {{level}}!",
   "learnMove": "{{pokemonName}} erlernt {{moveName}}!",

src/locales/de/dialogue.json

@@ -299,6 +299,28 @@
       "1": "Wie seltsam… Wie konnte das passieren… Ich hätte nicht ausgemuskelt werden sollen."
     }
   },
+  "snow_worker": {
+    "encounter": {
+      "1": "Wenn es kalt wird, zieh dich warm an!\n$Das sagt uns der gesunde Menschenverstand."
+    },
+    "victory": {
+      "1": "Sich bis zum Gehtnichtmehr abzurackern, ist wohl auch eine Eigenart, die uns der gesunde Menschenverstand diktiert."
+    },
+    "defeat": {
+      "1": "Lass mich dir einen Ratschlag geben. Ist ein Pokémon gefroren, kannst du es wieder auftauen,\n$indem du eine Attacke vom Typ Feuer auf es anwendest!"
+    } 
+  }, 
+ "snow_worker_double": {   
+    "encounter": {
+      "1": "L-l-lass uns kämpfen!"
+    },
+    "victory": {
+      "1": "M-m-mir sch-sch-schlottern die K-k-knie vor lauter K-k-kälte!"
+    },
+    "defeat": {
+      "1": "...\n$Sch-sch-schon gemerkt?\nH-h-hier ist es k-k-kalt!"
+    } 
+  },
   "hex_maniac": {
     "encounter": {
       "1": "Ich höre normalerweise nur klassische Musik, aber wenn ich verliere,\n$werde ich ein bisschen New Age ausprobieren!",

src/locales/en/battle.json

@@ -32,6 +32,7 @@
   "attackMissed": "{{pokemonNameWithAffix}} avoided the attack!",
   "attackHitsCount": "Hit {{count}} time(s)!",
   "rewardGain": "You received\n{{modifierName}}!",
+  "rewardGainCount": "You received\n{{count}} {{modifierName}}!",
   "expGain": "{{pokemonName}} gained\n{{exp}} EXP. Points!",
   "levelUp": "{{pokemonName}} grew to\nLv. {{level}}!",
   "learnMove": "{{pokemonName}} learned\n{{moveName}}!",

src/locales/en/dialogue.json

@@ -316,6 +316,28 @@
       "1": "How strange… How could this be… I shouldn't have been outmuscled."
     }
   },
+  "snow_worker": {
+    "encounter": {
+      "1": "When it's cold, wear a lot of clothes!\n$Only humans could come up with something so clever!"
+    },
+    "victory": {
+      "1": "How we struggle in vain at the end also shows how clever humans are!"
+    },
+    "defeat": {
+      "1": "I'll tell you something clever. If you use a Fire-type move on a Pokémon that is frozen solid, the ice will melt!"
+    } 
+  }, 
+  "snow_worker_double": {   
+    "encounter": {
+      "1": "...\n$...R-ready to b-battle?"
+    },
+    "victory": {
+      "1": "...\n$...I'm sh-shivering!"
+    },
+    "defeat": {
+      "1": "...\n$...Kn-know what?\n...Th-this place is cold."
+    }
+  },
   "hex_maniac": {
     "encounter": {
       "1": "I normally only ever listen to classical music, but if I lose, I think I shall try a bit of new age!",

src/locales/es/battle.json

@@ -32,6 +32,7 @@
   "attackMissed": "¡{{pokemonNameWithAffix}}\nha evitado el ataque!",
   "attackHitsCount": "N.º de golpes: {{count}}.",
   "rewardGain": "¡Has conseguido\n{{modifierName}}!",
+  "rewardGainCount": "¡Has conseguido\n{{count}} {{modifierName}}!",
   "expGain": "{{pokemonName}} ha ganado\n{{exp}} puntos de experiencia.",
   "levelUp": "¡{{pokemonName}} ha subido a\nNv. {{level}}!",
   "learnMove": "¡{{pokemonName}} ha aprendido {{moveName}}!",

src/locales/es/dialogue.json

@@ -1,4 +1,26 @@
 {
+  "snow_worker": {
+    "encounter": {
+      "1": "¡Cuando hace frío, hay que abrigarse!\n$¡Sabiduría popular!"
+    },
+    "victory": {
+      "1": "De donde no hay, no se puede sacar.\nEso también es sabiduría popular, creo."
+    },
+    "defeat": {
+      "1": "¡Voy a compartir mi sabiduría! Si congelan a un Pokémon de tu equipo,\n$usa con él un movimiento de tipo Fuego ¡y podrás derretir el hielo!"
+    } 
+  }, 
+"snow_worker_double": {   
+    "encounter": {
+      "1": "...\n$¡Co-combate!"
+    },
+    "victory": {
+      "1": "...\n$¡Qué-qué frío!"
+    },
+    "defeat": {
+      "1": "¿Sabes?\nAquí hace mucho frío."
+    } 
+  },
   "aether_grunt": {
     "encounter": {
       "1": "¡Lucharé con toda mi fuerza para detenerte!",

src/locales/fr/battle.json

@@ -32,6 +32,7 @@
   "attackMissed": "{{pokemonNameWithAffix}}\névite l’attaque !",
   "attackHitsCount": "Touché {{count}} fois !",
   "rewardGain": "Vous recevez\n{{modifierName}} !",
+  "rewardGainCount": "Vous recevez\n{{count}} {{modifierName}} !",
   "expGain": "{{pokemonName}} gagne\n{{exp}} Points d’Exp !",
   "levelUp": "{{pokemonName}} monte au\nN. {{level}} !",
   "learnMove": "{{pokemonName}} apprend\n{{moveName}} !",

src/locales/fr/dialogue.json

@@ -175,6 +175,28 @@
       "1": "Mon élégance demeure inébranlable !"
     }
   },
+  "snow_worker": {
+    "encounter": {
+      "1": "Quand il fait froid, on se couvre !\nTout le monde sait ça !"
+    },
+    "victory": {
+      "1": "Il faut se rebeller jusqu’au bout !\nTout le monde sait ça aussi…"
+    },
+    "defeat": {
+      "1": "Je vais t’apprendre une bonne chose. Si un Pokémon est gelé, utilise une capacité Feu pour faire fondre la glace !"
+    } 
+  }, 
+  "snow_worker_double": {   
+    "encounter": {
+      "1": "…\n… En-en-en garde !"
+    },
+    "victory": {
+      "1": "…\n… Je-je-je tremble…"
+    },
+    "defeat": {
+      "1": "…\n… Tu-tu-tu sais quoi ?\n… Il fait su-super froid i-ici."
+    } 
+  },
   "rocket_grunt": {
     "encounter": {
       "1": "Nous sommes de retour !",

src/locales/it/battle.json

@@ -32,6 +32,7 @@
   "attackMissed": "{{pokemonNameWithAffix}}\nevita l’attacco!",
   "attackHitsCount": "Colpito {{count}} volta/e!",
   "rewardGain": "Ricevi\n{{modifierName}}!",
+  "rewardGainCount": "Ricevi\n{{count}} {{modifierName}}!",
   "expGain": "{{pokemonName}} ha guadagnato\n{{exp}} Punti Esperienza!",
   "levelUp": "{{pokemonName}} è salito al\nlivello {{level}}!",
   "learnMove": "{{pokemonName}} impara\n{{moveName}}!",

src/locales/it/dialogue.json

@@ -1,4 +1,26 @@
 {
+  "snow_worker": {
+   "encounter": {
+     "1": "Col freddo ci vogliono vestiti pesanti!\n$Questa è saggezza! Viva l'intelletto!"
+    },
+    "victory": {
+      "1": "Agitarsi quando è troppo tardi è inutile.\nAnche questa è saggezza."
+    },
+    "defeat": {
+      "1": "Ascolta questa perla di saggezza! Se usi delle mosse di tipo Fuoco su un Pokémon congelato, questo si riprenderà."
+    } 
+  }, 
+  "snow_worker_double": {   
+    "encounter": {
+      "1": "...\n$Lo-Lo-Lotta..."
+    },
+    "victory": {
+      "1": "...\n$Tre-Tremo..."
+    },
+    "defeat": {
+      "1": "...\n$Sai che-che...\nQui fa-fa freddo?"
+    }
+  },
   "stat_trainer_buck": {
     "encounter": {
       "1": "...I'm telling you right now. I'm seriously tough. Act surprised!",

src/locales/ja/battle.json

@@ -28,6 +28,7 @@
   "attackMissed": "{{pokemonNameWithAffix}}には　当たらなかった！",
   "attackHitsCount": "{{count}}かい 当たった！",
   "rewardGain": "{{modifierName}}を　手に入れた!",
+  "rewardGainCount": "{{modifierName}}を　{{count}}個　手に入れた!",
   "expGain": "{{pokemonName}}は\n{{exp}}経験値を　もらった！",
   "levelUp": "{{pokemonName}}は\nレベル{{level}}に　上がった！",
   "learnMove": "{{pokemonName}}は　新しく\n{{moveName}}を　覚えた！",

src/locales/ko/battle.json

@@ -32,6 +32,7 @@
   "attackMissed": "{{pokemonNameWithAffix}}에게는\n맞지 않았다!",
   "attackHitsCount": "{{count}}번 맞았다!",
   "rewardGain": "{{modifierName}}[[를]] 받았다!",
+  "rewardGainCount": "{{modifierName}}[[를]]\n{{count}}개 손에 넣었다!",
   "expGain": "{{pokemonName}}[[는]]\n{{exp}} 경험치를 얻었다!",
   "levelUp": "{{pokemonName}}[[는]]\n레벨 {{level}}[[로]] 올랐다!",
   "learnMove": "{{pokemonName}}[[는]] 새로\n{{moveName}}[[를]] 배웠다!",
@@ -68,7 +69,7 @@
   "turnEndHpRestore": "{{pokemonName}}의\n체력이 회복되었다!",
   "hpIsFull": "그러나 {{pokemonName}}의\n체력이 가득 찬 상태다!",
   "skipItemQuestion": "아이템을 받지 않고 넘어가시겠습니까?",
-  "itemStackFull": "{{fullItemName}}의 소지 한도에 도달했습니다.\n{{itemname}}[[를]] 대신 받습니다.",
+  "itemStackFull": "{{fullItemName}}의 소지 한도에 도달했습니다.\n{{itemName}}[[를]] 대신 받습니다.",
   "eggHatching": "어라…?",
   "eggSkipPrompt": "알 부화 요약 화면으로 바로 넘어가시겠습니까?",
   "ivScannerUseQuestion": "{{pokemonName}}에게 개체값탐지기를 사용하시겠습니까?",

src/locales/ko/dialogue.json

@@ -299,6 +299,28 @@
       "1": "이상하네… 어떻게 이럴 수 있지… 힘으로 압도할 수 없다니."
     }
   },
+  "snow_worker": {
+    "encounter": {
+      "1": "추울 때엔 두껍게 입는다!\n$ 이것이 인간의 지혜다!"
+    },
+    "victory": {
+      "1": "하다 하다 안 되면 마지막에는 발버둥 이것도 인간의 지혜일지도..."
+    },
+    "defeat": {
+      "1": "너에게 지혜를 나누어주지. 얼음 상태가 된 포켓몬에게 불꽃 타입 기술을 쓰면 얼음이 녹는다고!"
+    } 
+  }, 
+  "snow_worker_double": {   
+    "encounter": {
+      "1": "… … …\n$… …스 승부"
+    },
+    "victory": {
+      "1": "… … …\n$… …떠 떨려"
+    },
+    "defeat": {
+      "1": "…\n$… …알고 있니?\n… …여기 춥다고"
+    } 
+  },
   "hex_maniac": {
     "encounter": {
       "1": "평소에는 클래식 음악만 들었는데, 지면 뉴에이지도 좀 들어볼까!",

src/locales/ko/modifier-type.json

@@ -50,9 +50,9 @@
       "description": "{{battleCount}}번의 배틀 동안 더블 배틀이 등장할 확률이 4배가 된다."
     },
     "TempStatStageBoosterModifierType": {
-      "description": "자신의 모든 포켓몬이 5번의 배틀 동안 {{stat}}[[가]] {{amount}}단계 증가한다.",
+      "description": "자신의 모든 포켓몬이 5번의 배틀 동안 {{stat}}[[가]] {{amount}} 증가한다.",
       "extra": {
-        "stage": "1 스테이지",
+        "stage": "1단계",
         "percentage": "30%"
       }
     },

src/locales/pt_BR/battle.json

@@ -32,6 +32,7 @@
   "attackMissed": "{{pokemonNameWithAffix}} desviou do ataque!",
   "attackHitsCount": "Acertou {{count}} vezes.",
   "rewardGain": "Você recebeu\n{{modifierName}}!",
+  "rewardGainCount": "Você recebeu\n{{count}} {{modifierName}}!",
   "expGain": "{{pokemonName}} ganhou\n{{exp}} pontos de experiência.",
   "levelUp": "{{pokemonName}} subiu para \nNv. {{level}}!",
   "learnMove": "{{pokemonName}} aprendeu {{moveName}}!",

src/locales/zh_CN/battle.json

@@ -32,6 +32,7 @@
   "attackMissed": "没有命中{{pokemonNameWithAffix}}！",
   "attackHitsCount": "击中{{count}}次！",
   "rewardGain": "你获得了\n{{modifierName}}！",
+  "rewardGainCount": "你获得了\n{{count}}个{{modifierName}}!",
   "expGain": "{{pokemonName}}获得了{{exp}} 点经验值！",
   "levelUp": "{{pokemonName}}升级到Lv.{{level}}！",
   "learnMove": "{{pokemonName}}学会了{{moveName}}！",

src/locales/zh_TW/battle.json

@@ -39,6 +39,7 @@
   "attackMissed": "沒有命中{{pokemonNameWithAffix}}！",
   "attackHitsCount": "擊中{{count}}次！",
   "rewardGain": "你獲得了\n{{modifierName}}！",
+  "rewardGainCount": "你獲得了\n{{count}}個{{modifierName}}!",
   "expGain": "{{pokemonName}}獲得了{{exp}} 點經驗值！",
   "levelUp": "{{pokemonName}}升級到Lv.{{level}}！",
   "learnMove": "{{pokemonName}}學會了{{moveName}}！",