summary-ui-handler stat text centered + summary_stats.png change (#1041)

* Fix Entry Hazard Miss

Made Entry Hazards bypass the accuracy check as they cannot miss a target. There's still one more bug to fix with this but it requires way more code changes. This change needed to be done as well, so I'm getting it out early.

* Update move.ts

src/data/move.ts

@@ -55,6 +55,7 @@ export enum MoveTarget {
   /** {@link https://bulbapedia.bulbagarden.net/wiki/Category:Moves_that_target_all_Pok%C3%A9mon Moves that target all Pokemon} */
   ALL,
   USER_SIDE,
+  /** {@link https://bulbapedia.bulbagarden.net/wiki/Category:Entry_hazard-creating_moves Entry hazard-creating moves} */
   ENEMY_SIDE,
   BOTH_SIDES,
   PARTY

src/data/trainer-config.ts

@@ -831,7 +831,7 @@ export const trainerConfigs: TrainerConfigs = {
   [TrainerType.BRASSIUS]: new TrainerConfig(++t).initForGymLeader([ Species.SMOLIV, Species.SHROOMISH, Species.ODDISH ], Type.GRASS),
   [TrainerType.IONO]: new TrainerConfig(++t).initForGymLeader([ Species.TADBULB, Species.WATTREL, Species.VOLTORB ], Type.ELECTRIC),
   [TrainerType.KOFU]: new TrainerConfig(++t).initForGymLeader([ Species.VELUZA, Species.WIGLETT, Species.WINGULL ], Type.WATER),
-  [TrainerType.LARRY]: new TrainerConfig(++t).initForGymLeader([ Species.STARLY, Species.DUNSPARCE, Species.KOMALA ], Type.NORMAL),
+  [TrainerType.LARRY]: new TrainerConfig(++t).setName("Larry").initForGymLeader([ Species.STARLY, Species.DUNSPARCE, Species.KOMALA ], Type.NORMAL),
   [TrainerType.RYME]: new TrainerConfig(++t).initForGymLeader([ Species.GREAVARD, Species.SHUPPET, Species.MIMIKYU ], Type.GHOST),
   [TrainerType.TULIP]: new TrainerConfig(++t).initForGymLeader([ Species.GIRAFARIG, Species.FLITTLE, Species.RALTS ], Type.PSYCHIC),
   [TrainerType.GRUSHA]: new TrainerConfig(++t).initForGymLeader([ Species.CETODDLE, Species.ALOLA_VULPIX, Species.CUBCHOO ], Type.ICE),
@@ -839,7 +839,7 @@ export const trainerConfigs: TrainerConfigs = {
   [TrainerType.LORELEI]: new TrainerConfig((t = TrainerType.LORELEI)).initForEliteFour([ Species.SLOWBRO, Species.LAPRAS, Species.DEWGONG, Species.ALOLA_SANDSLASH ], Type.ICE),
   [TrainerType.BRUNO]: new TrainerConfig(++t).initForEliteFour([ Species.ONIX, Species.HITMONCHAN, Species.HITMONLEE, Species.ALOLA_GOLEM ], Type.FIGHTING),
   [TrainerType.AGATHA]: new TrainerConfig(++t).initForEliteFour([ Species.GENGAR, Species.ARBOK, Species.CROBAT, Species.ALOLA_MAROWAK ], Type.GHOST),
-  [TrainerType.LANCE]: new TrainerConfig(++t).initForEliteFour([ Species.DRAGONITE, Species.GYARADOS, Species.AERODACTYL, Species.ALOLA_EXEGGUTOR ], Type.DRAGON),
+  [TrainerType.LANCE]: new TrainerConfig(++t).setName("Lance").initForEliteFour([ Species.DRAGONITE, Species.GYARADOS, Species.AERODACTYL, Species.ALOLA_EXEGGUTOR ], Type.DRAGON),
   [TrainerType.WILL]: new TrainerConfig(++t).initForEliteFour([ Species.XATU, Species.JYNX, Species.SLOWBRO, Species.EXEGGUTOR ], Type.PSYCHIC),
   [TrainerType.KOGA]: new TrainerConfig(++t).initForEliteFour([ Species.WEEZING, Species.VENOMOTH, Species.CROBAT, Species.TENTACRUEL ], Type.POISON),
   [TrainerType.KAREN]: new TrainerConfig(++t).initForEliteFour([ Species.UMBREON, Species.HONCHKROW, Species.HOUNDOOM, Species.WEAVILE ], Type.DARK),
@@ -866,7 +866,7 @@ export const trainerConfigs: TrainerConfigs = {
   [TrainerType.KAHILI]: new TrainerConfig(++t).initForEliteFour([ Species.BRAVIARY, Species.HAWLUCHA, Species.ORICORIO, Species.TOUCANNON ], Type.FLYING),
   [TrainerType.RIKA]: new TrainerConfig(++t).initForEliteFour([ Species. WHISCASH, Species.DONPHAN, Species.CAMERUPT, Species.CLODSIRE ], Type.GROUND),
   [TrainerType.POPPY]: new TrainerConfig(++t).initForEliteFour([ Species.COPPERAJAH, Species.BRONZONG, Species.CORVIKNIGHT, Species.TINKATON ], Type.STEEL),
-  [TrainerType.LARRY_ELITE]: new TrainerConfig(++t).initForEliteFour([ Species.STARAPTOR, Species.FLAMIGO, Species.ALTARIA, Species.TROPIUS ], Type.NORMAL, Type.FLYING),
+  [TrainerType.LARRY_ELITE]: new TrainerConfig(++t).setName("Larry").initForEliteFour([ Species.STARAPTOR, Species.FLAMIGO, Species.ALTARIA, Species.TROPIUS ], Type.NORMAL, Type.FLYING),
   [TrainerType.HASSEL]: new TrainerConfig(++t).initForEliteFour([ Species.NOIVERN, Species.HAXORUS, Species.DRAGALGE, Species.BAXCALIBUR ], Type.DRAGON),
   [TrainerType.CRISPIN]: new TrainerConfig(++t).initForEliteFour([ Species.TALONFLAME, Species.CAMERUPT, Species.MAGMORTAR, Species.BLAZIKEN ], Type.FIRE),
   [TrainerType.AMARYS]: new TrainerConfig(++t).initForEliteFour([ Species.SKARMORY, Species.EMPOLEON, Species.SCIZOR, Species.METAGROSS ], Type.STEEL),
@@ -875,7 +875,7 @@ export const trainerConfigs: TrainerConfigs = {
 
   [TrainerType.BLUE]: new TrainerConfig((t = TrainerType.BLUE)).initForChampion([ Species.GYARADOS, Species.MEWTWO, Species.ARCANINE, Species.ALAKAZAM, Species.PIDGEOT ]).setBattleBgm('battle_kanto_champion'),
   [TrainerType.RED]: new TrainerConfig(++t).initForChampion([ Species.CHARIZARD, [ Species.LUGIA, Species.HO_OH ], Species.SNORLAX, Species.RAICHU, Species.ESPEON ]).setBattleBgm('battle_johto_champion'),
-  [TrainerType.LANCE_CHAMPION]: new TrainerConfig(++t).initForChampion([ Species.DRAGONITE, Species.ZYGARDE, Species.AERODACTYL, Species.KINGDRA, Species.ALOLA_EXEGGUTOR ]).setBattleBgm('battle_johto_champion'),
+  [TrainerType.LANCE_CHAMPION]: new TrainerConfig(++t).setName("Lance").initForChampion([ Species.DRAGONITE, Species.ZYGARDE, Species.AERODACTYL, Species.KINGDRA, Species.ALOLA_EXEGGUTOR ]).setBattleBgm('battle_johto_champion'),
   [TrainerType.STEVEN]: new TrainerConfig(++t).initForChampion([ Species.METAGROSS, [ Species.DIALGA, Species.PALKIA ], Species.SKARMORY, Species.AGGRON, Species.CARBINK ]).setBattleBgm('battle_hoenn_champion'),
   [TrainerType.WALLACE]: new TrainerConfig(++t).initForChampion([ Species.MILOTIC, Species.KYOGRE, Species.WHISCASH, Species.WALREIN, Species.LUDICOLO ]).setBattleBgm('battle_hoenn_champion'),
   [TrainerType.CYNTHIA]: new TrainerConfig(++t).initForChampion([ Species.SPIRITOMB, Species.GIRATINA, Species.GARCHOMP, Species.MILOTIC, Species.LUCARIO, Species.TOGEKISS ]).setBattleBgm('battle_sinnoh_champion'),

src/field/pokemon.ts

@@ -1096,8 +1096,11 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
 
     let shinyThreshold = new Utils.IntegerHolder(32);
     if (thresholdOverride === undefined) {
-      if (!this.hasTrainer())
+      if (!this.hasTrainer()) {
+        if (new Date() < new Date('2024-05-21'))
+          shinyThreshold.value *= 3;
         this.scene.applyModifiers(ShinyRateBoosterModifier, true, shinyThreshold);
+      }
     } else
       shinyThreshold.value = thresholdOverride;
 

src/locales/de/modifier-type.ts

@@ -55,7 +55,7 @@ export const modifierType: ModifierTypeTranslationEntries = {
       description: "Erhöht die {{tempBattleStatName}} aller Teammitglieder für 5 Kämpfe um eine Stufe",
     },
     "AttackTypeBoosterModifierType": {
-      description: "Erhöht die Stärke aller {{moveType}}attacken eines Pokémon um 20%",
+      description: "Erhöht die Stärke aller {{moveType}}-Attacken eines Pokémon um 20%",
     },
     "PokemonLevelIncrementModifierType": {
       description: "Erhöht das Level eines Pokémon um 1",

src/locales/de/trainers.ts

@@ -219,7 +219,6 @@ export const trainerNames: SimpleTranslationEntries = {
     "kahili": "Kahili",
     "rika": "Cay",
     "poppy": "Poppy",
-    "larry_elite": "Aoki", // Does this really need to be an extra entry? (it is in trainer-type.ts so I added it here)
     "hassel": "Sinius",
     "crispin": "Matt",
     "amarys": "Erin",
@@ -227,7 +226,6 @@ export const trainerNames: SimpleTranslationEntries = {
     "drayton": "Levy",
     "blue": "Blau",
     "red": "Rot",
-    "lance_champion": "Siegfried", // Does this really need to be an extra entry? (it is in trainer-type.ts so I added it here)
     "steven": "Troy",
     "wallace": "Wassili",
     "cynthia": "Cynthia",

src/locales/en/trainers.ts

@@ -219,7 +219,6 @@ export const trainerNames: SimpleTranslationEntries = {
     "kahili": "Kahili",
     "rika": "Rika",
     "poppy": "Poppy",
-    "larry_elite": "Larry", // Does this really need to be an extra entry? (it is in trainer-type.ts so I added it here)
     "hassel": "Hassel",
     "crispin": "Crispin",
     "amarys": "Amarys",
@@ -227,7 +226,6 @@ export const trainerNames: SimpleTranslationEntries = {
     "drayton": "Drayton",
     "blue": "Blue",
     "red": "Red",
-    "lance_champion": "Lance", // Does this really need to be an extra entry? (it is in trainer-type.ts so I added it here)
     "steven": "Steven",
     "wallace": "Wallace",
     "cynthia": "Cynthia",

src/locales/es/trainers.ts

@@ -219,7 +219,6 @@ export const trainerNames: SimpleTranslationEntries = {
     "kahili": "Kahili",
     "rika": "Rika",
     "poppy": "Poppy",
-    "larry_elite": "Larry", // Does this really need to be an extra entry? (it is in trainer-type.ts so I added it here)
     "hassel": "Hassel",
     "crispin": "Crispin",
     "amarys": "Amarys",
@@ -227,7 +226,6 @@ export const trainerNames: SimpleTranslationEntries = {
     "drayton": "Drayton",
     "blue": "Blue",
     "red": "Red",
-    "lance_champion": "Lance", // Does this really need to be an extra entry? (it is in trainer-type.ts so I added it here)
     "steven": "Steven",
     "wallace": "Wallace",
     "cynthia": "Cynthia",

src/locales/fr/trainers.ts

@@ -219,7 +219,6 @@ export const trainerNames: SimpleTranslationEntries = {
     "kahili": "Kahili",
     "rika": "Cayenn",
     "poppy": "Popi",
-    "larry_elite": "Okuba", // Does this really need to be an extra entry? (it is in trainer-type.ts so I added it here)
     "hassel": "Hassa",
     "crispin": "Rubépin",
     "amarys": "Nérine",
@@ -227,7 +226,6 @@ export const trainerNames: SimpleTranslationEntries = {
     "drayton": "Irido",
     "blue": "Blue",
     "red": "Red",
-    "lance_champion": "Peter", // Does this really need to be an extra entry? (it is in trainer-type.ts so I added it here)
     "steven": "Pierre Rochard",
     "wallace": "Marc",
     "cynthia": "Cynthia",

src/locales/it/trainers.ts

@@ -219,7 +219,6 @@ export const trainerNames: SimpleTranslationEntries = {
     "kahili": "Kahili",
     "rika": "Rika",
     "poppy": "Poppy",
-    "larry_elite": "Larry", // Does this really need to be an extra entry? (it is in trainer-type.ts so I added it here)
     "hassel": "Hassel",
     "crispin": "Crispin",
     "amarys": "Amarys",
@@ -227,7 +226,6 @@ export const trainerNames: SimpleTranslationEntries = {
     "drayton": "Drayton",
     "blue": "Blue",
     "red": "Red",
-    "lance_champion": "Lance", // Does this really need to be an extra entry? (it is in trainer-type.ts so I added it here)
     "steven": "Steven",
     "wallace": "Wallace",
     "cynthia": "Cynthia",

src/locales/pt_BR/trainers.ts

@@ -219,7 +219,6 @@ export const trainerNames: SimpleTranslationEntries = {
     "kahili": "Kahili",
     "rika": "Rika",
     "poppy": "Poppy",
-    "larry_elite": "Larry", // Does this really need to be an extra entry? (it is in trainer-type.ts so I added it here)
     "hassel": "Hassel",
     "crispin": "Crispin",
     "amarys": "Amarys",
@@ -227,7 +226,6 @@ export const trainerNames: SimpleTranslationEntries = {
     "drayton": "Drayton",
     "blue": "Blue",
     "red": "Red",
-    "lance_champion": "Lance", // Does this really need to be an extra entry? (it is in trainer-type.ts so I added it here)
     "steven": "Steven",
     "wallace": "Wallace",
     "cynthia": "Cynthia",

src/locales/zh_CN/battle-message-ui-handler.ts

@@ -1,10 +1,10 @@
 import { SimpleTranslationEntries } from "#app/plugins/i18n";
 
 export const battleMessageUiHandler: SimpleTranslationEntries = {
-  "ivBest": "Best",
+  "ivBest": "最棒",
-  "ivFantastic": "Fantastic",
+  "ivFantastic": "了不起",
-  "ivVeryGood": "Very Good",
+  "ivVeryGood": "非常好",
-  "ivPrettyGood": "Pretty Good",
+  "ivPrettyGood": "相当好",
-  "ivDecent": "Decent",
+  "ivDecent": "一般般",
-  "ivNoGood": "No Good",
+  "ivNoGood": "也许不行",
 } as const;

src/locales/zh_CN/fight-ui-handler.ts

@@ -1,7 +1,7 @@
-import { SimpleTranslationEntries } from "#app/plugins/i18n";
+import { SimpleTranslationEntries } from "#app/plugins/i18n";
-
+
-export const fightUiHandler: SimpleTranslationEntries = {
+export const fightUiHandler: SimpleTranslationEntries = {
-    "pp": "PP",
+    "pp": "PP",
-    "power": "威力",
+    "power": "威力",
-    "accuracy": "命中率",
+    "accuracy": "命中",
 } as const;

src/locales/zh_CN/growth.ts

@@ -1,10 +1,10 @@
-import { SimpleTranslationEntries } from "#app/plugins/i18n";
+import { SimpleTranslationEntries } from "#app/plugins/i18n";
-
+
-export const growth: SimpleTranslationEntries = {
+export const growth: SimpleTranslationEntries = {
-    "Erratic": "最快",
+    "Erratic": "最快",
-    "Fast": "快",
+    "Fast": "较快",
-    "Medium_Fast": "较快",
+    "Medium_Fast": "快",
-    "Medium_Slow": "较慢",
+    "Medium_Slow": "慢",
-    "Slow": "慢",
+    "Slow": "较慢",
-    "Fluctuating": "最慢"
+    "Fluctuating": "最慢"
 } as const;

src/locales/zh_CN/modifier-type.ts

@@ -20,7 +20,7 @@ export const modifierType: ModifierTypeTranslationEntries = {
       description: "为一只宝可梦回复 {{restorePoints}} HP 或 {{restorePercent}}% HP，取最大值",
       extra: {
         "fully": "为一只宝可梦回复全部HP",
-        "fullyWithStatus": "为一只宝可梦回复全部HP并消除所有负面状态",
+        "fullyWithStatus": "为一只宝可梦回复全部HP并消除所有负面\n状态",
       }
     },
     "PokemonReviveModifierType": {
@@ -42,11 +42,11 @@ export const modifierType: ModifierTypeTranslationEntries = {
       }
     },
     "PokemonPpUpModifierType": {
-      description: "为一只宝可梦的一个招式永久增加{{upPoints}}点PP每5点当前最大PP (最多3点)",
+      description: "为一只宝可梦的一个招式永久增加{{upPoints}}点\nPP每5点当前最大PP (最多3点)",
     },
     "PokemonNatureChangeModifierType": {
       name: "{{natureName}}薄荷",
-      description: "将一只宝可梦的性格改为{{natureName}}并为该宝可梦永久解锁该性格.",
+      description: "将一只宝可梦的性格改为{{natureName}}并为该宝可\n梦永久解锁该性格.",
     },
     "DoubleBattleChanceBoosterModifierType": {
       description: "接下来的{{battleCount}}场战斗是双打的概率翻倍",
@@ -64,7 +64,7 @@ export const modifierType: ModifierTypeTranslationEntries = {
       description: "所有成员宝可梦等级提升1级",
     },
     "PokemonBaseStatBoosterModifierType": {
-      description: "增加持有者的{{statName}}10%. 个体值越高堆叠上限越高.",
+      description: "增加持有者的{{statName}}10%，个体值越高堆叠\n上限越高.",
     },
     "AllPokemonFullHpRestoreModifierType": {
       description: "所有宝可梦完全回复HP",
@@ -81,10 +81,10 @@ export const modifierType: ModifierTypeTranslationEntries = {
       },
     },
     "ExpBoosterModifierType": {
-      description: "EXP.获取量增加{{boostPercent}}%",
+      description: "经验值获取量增加{{boostPercent}}%",
     },
     "PokemonExpBoosterModifierType": {
-      description: "持有者EXP.获取量增加{{boostPercent}}%",
+      description: "持有者经验值获取量增加{{boostPercent}}%",
     },
     "PokemonFriendshipBoosterModifierType": {
       description: "每场战斗获得的好感度提升50%",
@@ -93,7 +93,7 @@ export const modifierType: ModifierTypeTranslationEntries = {
       description: "招式命中率增加{{accuracyAmount}} (最大100)",
     },
     "PokemonMultiHitModifierType": {
-      description: "攻击造成一次额外伤害，每次堆叠额外伤害分别衰减60/75/82.5%",
+      description: "攻击造成一次额外伤害，每次堆叠额外伤害\n分别衰减60/75/82.5%",
     },
     "TmModifierType": {
       name: "招式学习器 {{moveId}} - {{moveName}}",
@@ -106,7 +106,7 @@ export const modifierType: ModifierTypeTranslationEntries = {
       description: "使某些宝可梦更改形态",
     },
     "FusePokemonModifierType": {
-      description: "融合两只宝可梦 (改变特性, 平分基础点数和属性, 共享招式池)",
+      description: "融合两只宝可梦 (改变特性, 平分基础点数\n和属性, 共享招式池)",
     },
     "TerastallizeModifierType": {
       name: "{{teraType}}太晶碎块",
@@ -128,9 +128,9 @@ export const modifierType: ModifierTypeTranslationEntries = {
     "RARE_CANDY": { name: "神奇糖果" },
     "RARER_CANDY": { name: "超神奇糖果" },
 
-    "MEGA_BRACELET": { name: "超级手镯", description: "能让携带着超级石战斗的宝可梦进行超级进化" },
+    "MEGA_BRACELET": { name: "超级手镯", description: "能让携带着超级石战斗的宝可梦进行\n超级进化" },
-    "DYNAMAX_BAND": { name: "极巨腕带", description: "能让携带着极巨菇菇战斗的宝可梦进行极巨化" },
+    "DYNAMAX_BAND": { name: "极巨腕带", description: "能让携带着极巨菇菇战斗的宝可梦进行\n极巨化" },
-    "TERA_ORB": { name: "太晶珠", description: "能让携带着太晶碎块战斗的宝可梦进行太晶化" },
+    "TERA_ORB": { name: "太晶珠", description: "能让携带着太晶碎块战斗的宝可梦进行\n太晶化" },
 
     "MAP": { name: "地图", description: "允许你在切换宝可梦群落时选择目的地"},
 
@@ -165,9 +165,9 @@ export const modifierType: ModifierTypeTranslationEntries = {
     "MEMORY_MUSHROOM": { name: "回忆蘑菇", description: "回忆一个宝可梦已经遗忘的招式" },
 
     "EXP_SHARE": { name: "学习装置", description: "未参加对战的宝可梦获得20%的经验值" },
-    "EXP_BALANCE": { name: "均衡型学习装置", description: "增加战斗中获得的EXP.分配给低级成员宝可梦的权重" },
+    "EXP_BALANCE": { name: "均衡型学习装置", description: "队伍中的低级宝可梦获得更多经验值" },
 
-    "OVAL_CHARM": { name: "圆形护符", description: "当多只宝可梦参与战斗, 分别获得总EXP.10%的额外EXP." },
+    "OVAL_CHARM": { name: "圆形护符", description: "当多只宝可梦参与战斗，分别获得总经验值\n10%的额外经验值" },
 
     "EXP_CHARM": { name: "经验护符" },
     "SUPER_EXP_CHARM": { name: "超级经验护符" },
@@ -200,21 +200,21 @@ export const modifierType: ModifierTypeTranslationEntries = {
 
     "BERRY_POUCH": { name: "树果袋", description: "使用树果时有25%的几率不会消耗树果" },
 
-    "FOCUS_BAND": { name: "气势头带", description: "携带该道具的宝可梦有10%几率在受到攻击而将陷入濒死状态时，保留1点HP不陷入濒死状态。" },
+    "FOCUS_BAND": { name: "气势头带", description: "携带该道具的宝可梦有10%几率在受到\n攻击而将陷入濒死状态时，保留1点HP不陷入濒死状态" },
 
-    "QUICK_CLAW": { name: "先制之爪", description: "有10%的几率无视速度优先使出招式 (先制技能优先)" },
+    "QUICK_CLAW": { name: "先制之爪", description: "有10%的几率无视速度优先使出招式\n(先制技能优先)" },
 
-    "KINGS_ROCK": { name: "王者之证", description: "携带该道具的宝可梦使用任意原本不会造成畏缩状态的攻击招式并造成伤害时，有10%几率使目标陷入畏缩状态。" },
+    "KINGS_ROCK": { name: "王者之证", description: "携带该道具的宝可梦使用任意原本不会造成\n畏缩状态的攻击招式并造成伤害时，有\n10%几率使目标陷入畏缩状态" },
 
-    "LEFTOVERS": { name: "吃剩的东西", description: "携带该道具的宝可梦在每个回合结束时恢复最大HP的1/16" },
+    "LEFTOVERS": { name: "吃剩的东西", description: "携带该道具的宝可梦在每个回合结束时恢复\n最大HP的1/16" },
-    "SHELL_BELL": { name: "贝壳之铃", description: "携带该道具的宝可梦在攻击对方成功造成伤害时，携带者的HP会恢复其所造成伤害的1/8" },
+    "SHELL_BELL": { name: "贝壳之铃", description: "携带该道具的宝可梦在攻击对方成功造成伤\n害时，携带者的HP会恢复其所造成伤害\n的1/8" },
 
-    "BATON": { name: "接力棒", description: "允许在切换宝可梦时保留能力变化, 对陷阱同样生效" },
+    "BATON": { name: "接力棒", description: "允许在切换宝可梦时保留能力变化, 对陷阱\n同样生效" },
 
     "SHINY_CHARM": { name: "闪耀护符", description: "显著增加野生宝可梦的闪光概率" },
     "ABILITY_CHARM": { name: "特性护符", description: "显著增加野生宝可梦有隐藏特性的概率" },
 
-    "IV_SCANNER": { name: "个体值探测器", description: "允许扫描野生宝可梦的个体值。 每个次显示2个个体值. 最好的个体值优先显示" },
+    "IV_SCANNER": { name: "个体值探测器", description: "允许扫描野生宝可梦的个体值。 每个次显示\n2个个体值. 最好的个体值优先显示" },
 
     "DNA_SPLICERS": { name: "基因之楔" },
 

src/locales/zh_CN/pokemon-info.ts

@@ -1,41 +1,41 @@
-import { PokemonInfoTranslationEntries } from "#app/plugins/i18n";
+import { PokemonInfoTranslationEntries } from "#app/plugins/i18n";
-
+
-export const pokemonInfo: PokemonInfoTranslationEntries = {
+export const pokemonInfo: PokemonInfoTranslationEntries = {
-    Stat: {
+    Stat: {
-        "HP": "最大HP",
+        "HP": "最大HP",
-        "HPshortened": "最大HP",
+        "HPshortened": "最大HP",
-        "ATK": "攻击",
+        "ATK": "攻击",
-        "ATKshortened": "攻击",
+        "ATKshortened": "攻击",
-        "DEF": "防御",
+        "DEF": "防御",
-        "DEFshortened": "防御",
+        "DEFshortened": "防御",
-        "SPATK": "特攻",
+        "SPATK": "特攻",
-        "SPATKshortened": "特攻",
+        "SPATKshortened": "特攻",
-        "SPDEF": "特防",
+        "SPDEF": "特防",
-        "SPDEFshortened": "特防",
+        "SPDEFshortened": "特防",
-        "SPD": "速度",
+        "SPD": "速度",
-        "SPDshortened": "速度"
+        "SPDshortened": "速度"
-    },
+    },
-
+
-    Type: {
+    Type: {
-        "UNKNOWN": "Unknown",
+        "UNKNOWN": "未知",
-        "NORMAL": "一般",
+        "NORMAL": "一般",
-        "FIGHTING": "格斗",
+        "FIGHTING": "格斗",
-        "FLYING": "飞行",
+        "FLYING": "飞行",
-        "POISON": "毒",
+        "POISON": "毒",
-        "GROUND": "地面",
+        "GROUND": "地面",
-        "ROCK": "岩石",
+        "ROCK": "岩石",
-        "BUG": "虫",
+        "BUG": "虫",
-        "GHOST": "幽灵",
+        "GHOST": "幽灵",
-        "STEEL": "钢",
+        "STEEL": "钢",
-        "FIRE": "火",
+        "FIRE": "火",
-        "WATER": "水",
+        "WATER": "水",
-        "GRASS": "草",
+        "GRASS": "草",
-        "ELECTRIC": "电",
+        "ELECTRIC": "电",
-        "PSYCHIC": "超能力",
+        "PSYCHIC": "超能力",
-        "ICE": "冰",
+        "ICE": "冰",
-        "DRAGON": "龙",
+        "DRAGON": "龙",
-        "DARK": "恶",
+        "DARK": "恶",
-        "FAIRY": "妖精",
+        "FAIRY": "妖精",
-        "STELLAR": "星晶",
+        "STELLAR": "星晶",
-      },
+      },
 } as const;

src/locales/zh_CN/trainers.ts

@@ -252,7 +252,6 @@ export const trainerNames: SimpleTranslationEntries = {
     // 帕底亚地区 Paldea Region
     "rika": "辛俐",
     "poppy": "波琵",
-    "larry_elite": "青木", // Does this really need to be an extra entry? (it is in trainer-type.ts so I added it here)
     "hassel": "八朔",
 
     // 蓝莓学院 Blueberry Academy
@@ -266,9 +265,6 @@ export const trainerNames: SimpleTranslationEntries = {
     "blue": "青绿",
     "red": "赤红",
 
-    // 城都地区 Johto Region
-    "lance_champion": "阿渡", // Does this really need to be an extra entry? (it is in trainer-type.ts so I added it here)
-
     // 丰缘地区 Hoenn Region
     "steven": "大吾",
     "wallace": "米可利",

src/locales/zh_CN/weather.ts

@@ -8,14 +8,14 @@ export const weather: SimpleTranslationEntries = {
     "sunnyLapseMessage": "日照很强。",
     "sunnyClearMessage": "日照复原了。",
 
-    "rainStartMessage": "下大雨了！",
+    "rainStartMessage": "开始下雨了！",
     "rainLapseMessage": "雨继续下。",
     "rainClearMessage": "雨停了。",
 
-    "sandstormStartMessage": "开始刮沙尘暴了！",
+    "sandstormStartMessage": "开始刮沙暴了！",
-    "sandstormLapseMessage": "沙尘暴肆虐。",
+    "sandstormLapseMessage": "沙暴肆虐。",
-    "sandstormClearMessage": "沙尘暴停止了。",
+    "sandstormClearMessage": "沙暴停止了！",
-    "sandstormDamageMessage": "沙尘暴袭击了{{pokemonPrefix}}{{pokemonName}}!",
+    "sandstormDamageMessage": "沙暴袭击了{{pokemonPrefix}}{{pokemonName}}!",
 
     "hailStartMessage": "开始下冰雹了!",
     "hailLapseMessage": "冰雹继续肆虐。",

src/phases.ts

@@ -2597,7 +2597,8 @@ export class MoveEffectPhase extends PokemonPhase {
   }
 
   hitCheck(target: Pokemon): boolean {
-    if (this.move.getMove().moveTarget === MoveTarget.USER)
+    // Moves targeting the user and entry hazards can't miss
+    if ([MoveTarget.USER, MoveTarget.ENEMY_SIDE].includes(this.move.getMove().moveTarget))
       return true;
 
     const user = this.getUserPokemon();

src/ui/summary-ui-handler.ts

@@ -806,7 +806,7 @@ export default class SummaryUiHandler extends UiHandler {
 
           const natureStatMultiplier = getNatureStatMultiplier(this.pokemon.getNature(), s);
 
-          const statLabel = addTextObject(this.scene, 27 + 115 * colIndex, 56 + 16 * rowIndex, statName, natureStatMultiplier === 1 ? TextStyle.SUMMARY : natureStatMultiplier > 1 ? TextStyle.SUMMARY_PINK : TextStyle.SUMMARY_BLUE);
+          const statLabel = addTextObject(this.scene, 27 + 115 * colIndex + (colIndex == 1 ?  5 : 0), 56 + 16 * rowIndex, statName, natureStatMultiplier === 1 ? TextStyle.SUMMARY : natureStatMultiplier > 1 ? TextStyle.SUMMARY_PINK : TextStyle.SUMMARY_BLUE);
           statLabel.setOrigin(0.5, 0);
           statsContainer.add(statLabel);