From f3de114d2bfdef27eba9cc0a1edfdcbfc48ce29b Mon Sep 17 00:00:00 2001 From: MadridPawmot <42167718+Alekemon@users.noreply.github.com> Date: Thu, 6 Jun 2024 18:55:32 +0200 Subject: [PATCH] [enhancement] Added Sailor trainer class (#1411) * Add files via upload * Update trainer-type.ts * Update biomes.ts * Update trainer-config.ts * Update trainer-names.ts * Update trainer-names.ts * Update trainers.ts * Update trainers.ts * Added German translation Thanks to CodeTappert * Update trainers.ts * Update trainers.ts * Update trainers.ts * Update trainers.ts * Update trainers.ts * Update trainers.ts * Update trainers.ts to resolve conflicts * Fixed syntax error * Update biomes.ts * Re-added possible biomes for the Sailor trainer class * Added data for dialogue lines for the sailor class * Added dialogue from FRLG * Added locale * Added locale * Added locale * Update trainers.ts * Added locale * Added locale * Added Korean translation * Added locale * Added Portuguese translation * Added locale * Added locale * Added Mandarin Chinese translation * Added Cantonese Chinese translation * Added images * Recentered sprite * Added Spanish translation for the dialogue * Delete duplicate * Delete duplicate * Updated dialogue with requested changes * Update Spanish translation to reflect the changes * Update dialogue.ts * Update dialogue.ts * Update dialogue.ts * Update dialogue.ts * Update dialogue.ts * Update dialogue.ts * Update dialogue.ts --- public/images/trainer/sailor.json | 41 ++++++++++++++++++++++++++++++ public/images/trainer/sailor.png | Bin 0 -> 2778 bytes src/data/biomes.ts | 9 +++++-- src/data/dialogue.ts | 14 ++++++++++ src/data/enums/trainer-type.ts | 1 + src/data/trainer-config.ts | 1 + src/data/trainer-names.ts | 2 ++ src/locales/de/dialogue.ts | 12 +++++++++ src/locales/de/trainers.ts | 1 + src/locales/en/dialogue.ts | 12 +++++++++ src/locales/en/trainers.ts | 1 + src/locales/es/dialogue.ts | 12 +++++++++ src/locales/es/trainers.ts | 1 + src/locales/fr/dialogue.ts | 12 +++++++++ src/locales/fr/trainers.ts | 1 + src/locales/it/dialogue.ts | 12 +++++++++ src/locales/it/trainers.ts | 1 + src/locales/ko/dialogue.ts | 12 +++++++++ src/locales/ko/trainers.ts | 1 + src/locales/pt_BR/dialogue.ts | 12 +++++++++ src/locales/pt_BR/trainers.ts | 1 + src/locales/zh_CN/dialogue.ts | 12 +++++++++ src/locales/zh_CN/trainers.ts | 1 + src/locales/zh_TW/dialogue.ts | 12 +++++++++ src/locales/zh_TW/trainers.ts | 1 + 25 files changed, 183 insertions(+), 2 deletions(-) create mode 100644 public/images/trainer/sailor.json create mode 100644 public/images/trainer/sailor.png diff --git a/public/images/trainer/sailor.json b/public/images/trainer/sailor.json new file mode 100644 index 00000000000..6a9331dbaf6 --- /dev/null +++ b/public/images/trainer/sailor.json @@ -0,0 +1,41 @@ +{ + "textures": [ + { + "image": "sailor.png", + "format": "RGBA8888", + "size": { + "w": 72, + "h": 72 + }, + "scale": 1, + "frames": [ + { + "filename": "0001.png", + "rotated": false, + "trimmed": false, + "sourceSize": { + "w": 72, + "h": 72 + }, + "spriteSourceSize": { + "x": 0, + "y": 0, + "w": 73, + "h": 73 + }, + "frame": { + "x": 0, + "y": 0, + "w": 39, + "h": 72 + } + } + ] + } + ], + "meta": { + "app": "https://www.codeandweb.com/texturepacker", + "version": "3.0", + "smartupdate": "$TexturePacker:SmartUpdate:f692676a166fc1915532cd94d5799af4:fb833f76fb6797474657726bb59a7eee:aeb55e30992938f494b6cd2420158dda$" + } +} diff --git a/public/images/trainer/sailor.png b/public/images/trainer/sailor.png new file mode 100644 index 0000000000000000000000000000000000000000..ec61152bce3593009032e1d9986ddeeea57b6825 GIT binary patch literal 2778 zcmV<03MKW4P)Px zrtF*f3aqSLR4uCIa(4DJ9F%9yR{s0s5T5_%Y1Z*kGlys>`)=Dh%f%Qjlr73e6(Qo% znpIb)r!VQ86+{KFxjt^Al!!-|XXo}UrJ#h$W0LmkY$w(s5^n%?$hEQAS@C#$iM1Qk z=ZR@zNLq??#I?lA+vFKQ^^f8)xtQzF)m68E-0Sup0QW3qw_1FEHWuTdTE zuWsmdDVMslbWUMr_WWnKI{gYby$g^mk7{dAK{DiWt?>*Nb z4jRSgO3z(b7f?dQMZQsOZ;W97aOQNt}+(FUpiB9PDs^l2tsT1L> zF24bzrHe4y+=VR5;M?LOSl!s92F%V+2;8(hgzDD{W`_lZZUj{Q_$^%7*>lFBP+Um6 zJ`7yA2OX`k0ebPUfYD!8o8<*V+C4ge*};TLLO={M`_t84BiS&M*`T;m94;2l%z#ia z2m+7M@+!F!&cW(}>quQ+Zzn<+urXghK;gEfDa@ZbeyL$82O;SJ+L#TBJPeWCj{*Jp zDst00DQtc?1ml{FX;j!fiQ0B~}6 zP`eriZgq|WHa7$VH@e-lJQ!4Wz%eWvF(DM~byHb^oPHtlP~QoCD%<{}8Ek(zqRTv4 zj97`pTeIMl$@8Eh-^4JC!?(;^;RuERPR@S;9RBeW4^$W*%B?J}wO}g;6dxgTl0p;j za1MjV1IftL%{-h6{5fq3xx z3curdJop-ZM=*F`US6|(G5tV#<-E-8U5Zw2yRrSTAI$g}y1%Be* z4nyKHQ0{s0Io%xG+tmX#253BZ@<($UW$m-mCk+(bj^%?pLn>BxZ|)S#WVlbXVFLk* z>{7zji-&g`RU?@DxSy=tX7Ap0s|qksx3`^vZaK@}oz7FRBq&q4@#gYVy}j@`U`t z49eFdzzure!SMzm;iEEQi2-=8fBv_mhtV4Z2m>~QS-UWU;|M@v?;a2m9?dgF6~Oqt zMc%V_cb#t{(d4ovx=}o-_I9tyn-WcW0`%q#%2%Tr)My);XN9!=d*e|v(Jknr_+S<0 zQ^7pgX|0*V)DaWPgN->oeOcLpE~^JCDPLcP{K5;W58dqE(SdaWBbmwX9LLfD#h5rO zjTaEdA2P}4^U;`(bCiqO z3P4DFFd#Y1yYyo_U+)TJFdox$j={LtX^*e_`>thGCCaJGjYkKvuLIu-9s&VQNVXhp)v@9Qmk%vVkl zZ%*ocXzvK#v!^&)jDm(#k*f40KsGiQKf13X#H)`h$2}F4 zYIS6LC_D$adlh7>r#vblU$?xLX(YC(^7j{mB38~tv0vr+S~T+%6`7F!7=XHxa=tic zRZw{hYx!D_J&QgQ#pr(PoiG%nY4XgkUb-esX6;TD1t!>wQqYj_od`&w5P{jQqV!;m zQ0=dZcWW48aH^F00SeTT5{I~`_r{lSIuX+zQTx15b>}|v#z6?G=3-@em#nmO1f52 z1yCNBkgw%UW9hf?cND0gyBeTyOsWA{9(jo{!j{BbaQ5B1_XBEmtqt{ZGN{EHB`H%u zXn<8kLV|t;El@g+ZG^Cs(S$(dpB+JB$`) zRZ)B?MyGD@HI=|?IUiJ+C)$owzv)?UyoZe)#Cnw9Ji~O`}ysM|i zo`G>bwPDu1A^l}IYu`0+WP1@5LmgzdOD?H0a%d#AZS{X8=yP|!64joPc}D~{^;70Q gsSTY+`u_v(#sQf=B|lIA0000 s.isOfType(Type.DARK)), + [TrainerType.SAILOR]: new TrainerConfig(++t).setMoneyMultiplier(1.4).setEncounterBgm(TrainerType.BACKPACKER).setSpeciesFilter(s => s.isOfType(Type.WATER) || s.isOfType(Type.FIGHTING)), [TrainerType.SCIENTIST]: new TrainerConfig(++t).setHasGenders("Scientist Female").setHasDouble("Scientists").setMoneyMultiplier(1.7).setEncounterBgm(TrainerType.SCIENTIST) .setSpeciesPools({ [TrainerPoolTier.COMMON]: [Species.MAGNEMITE, Species.GRIMER, Species.DROWZEE, Species.VOLTORB, Species.KOFFING], diff --git a/src/data/trainer-names.ts b/src/data/trainer-names.ts index 0aa5bb594d4..2ad2060f233 100644 --- a/src/data/trainer-names.ts +++ b/src/data/trainer-names.ts @@ -60,6 +60,7 @@ const trainerNameConfigs: TrainerNameConfigs = { [TrainerType.RICH]: new TrainerNameConfig(TrainerType.RICH, "Gentleman").hasGenderVariant("Madame"), [TrainerType.RICH_KID]: new TrainerNameConfig(TrainerType.RICH_KID, "Rich_Boy").hasGenderVariant("Lady"), [TrainerType.ROUGHNECK]: new TrainerNameConfig(TrainerType.ROUGHNECK), + [TrainerType.SAILOR]: new TrainerNameConfig(TrainerType.SAILOR), [TrainerType.SCIENTIST]: new TrainerNameConfig(TrainerType.SCIENTIST), [TrainerType.SMASHER]: new TrainerNameConfig(TrainerType.SMASHER), [TrainerType.SNOW_WORKER]: new TrainerNameConfig(TrainerType.SNOW_WORKER, "Worker"), @@ -111,6 +112,7 @@ export const trainerNamePools = { [TrainerType.RICH]: [["Alfred","Edward","Gregory","Preston","Thomas","Tucker","Walter","Clifford","Everett","Micah","Nate","Pierre","Terrance","Arthur","Brooks","Emanuel","Lamar","Jeremy","Leonardo","Milton","Frederic","Renaud","Robert","Yan","Daniel","Sheldon","Stonewall","Gerald","Ronald","Smith","Stanley","Reginald","Orson","Wilco","Caden","Glenn"],["Rebecca","Reina","Cassandra","Emilia","Grace","Marian","Elizabeth","Kathleen","Sayuri","Caroline","Judy"]], [TrainerType.RICH_KID]: [["Garret","Winston","Dawson","Enrique","Jason","Roman","Trey","Liam","Anthony","Brad","Cody","Manuel","Martin","Pierce","Rolan","Keenan","Filbert","Antoin","Cyus","Diek","Dugo","Flitz","Jurek","Lond","Perd","Quint","Basto","Benit","Brot","Denc","Guyit","Marcon","Perc","Puros","Roex","Sainz","Symin","Tark","Venak"],["Anette","Brianna","Cindy","Colleen","Daphne","Elizabeth","Naomi","Sarah","Charlotte","Gillian","Jacki","Lady","Melissa","Celeste","Colette","Elizandra","Isabel","Lynette","Magnolia","Sophie","Lina","Dulcie","Auro","Brin","Caril","Eloos","Gwin","Illa","Kowly","Rima","Ristin","Vesey","Brena","Deasy","Denslon","Kylet","Nemi","Rene","Sanol","Stouner","Sturk","Talmen","Zoila"]], [TrainerType.ROUGHNECK]: ["Camron","Corey","Gabriel","Isaiah","Jamal","Koji","Luke","Paxton","Raul","Zeek","Kirby","Chance","Dave","Fletcher","Johnny","Reese","Joey","Ricky","Silvester","Martin"], + [TrainerType.SAILOR]: ["Alberto","Bost","Brennan","Brenden","Claude","Cory","Damian","Dirk","Duncan","Dwayne","Dylan","Eddie","Edmond","Elijah","Ernest","Eugene","Garrett","Golos","Gratin","Grestly","Harry","Hols","Hudson","Huey","Jebol","Jeff","Leonald","Luther","Kelvin","Kenneth","Kent","Knook","Marc","Mifis","Monar","Morkor","Ordes","Oxlin","Parker","Paul","Philip","Roberto","Samson","Skyler","Stanly","Tebu","Terrell","Trevor","Yasu","Zachariah"], [TrainerType.SCIENTIST]: [["Jed","Marc","Mitch","Rich","Ross","Beau","Braydon","Connor","Ed","Ivan","Jerry","Jose","Joshua","Parker","Rodney","Taylor","Ted","Travis","Zackery","Darrius","Emilio","Fredrick","Shaun","Stefano","Travon","Daniel","Garett","Gregg","Linden","Lowell","Trenton","Dudley","Luke","Markus","Nathan","Orville","Randall","Ron","Ronald","Simon","Steve","William","Franklin","Clarke","Jacques","Terrance","Ernst","Justus","Ikaika","Jayson","Kyle","Reid","Tyrone","Adam","Albert","Alphonse","Cory","Donnie","Elton","Francis","Gordon","Herbert","Humphrey","Jordan","Julian","Keaton","Levi","Melvin","Murray","West","Craig","Coren","Dubik","Kotan","Lethco","Mante","Mort","Myron","Odlow","Ribek","Roeck","Vogi","Vonder","Zogo","Doimo","Doton","Durel","Hildon","Kukla","Messa","Nanot","Platen","Raburn","Reman","Acrod","Coffy","Elrok","Foss","Hardig","Hombol","Hospel","Kaller","Klots","Krilok","Limar","Loket","Mesak","Morbit","Newin","Orill","Tabor","Tekot"],["Blythe","Chan","Kathrine","Marie","Maria","Naoko","Samantha","Satomi","Shannon","Athena","Caroline","Lumi","Lumina","Marissa","Sonia"]], [TrainerType.SMASHER]: ["Aspen","Elena","Mari","Amy","Lizzy"], [TrainerType.SNOW_WORKER]: [["Braden","Brendon","Colin","Conrad","Dillan","Gary","Gerardo","Holden","Jackson","Mason","Quentin","Willy","Noel","Arnold","Brady","Brand","Cairn","Cliff","Don","Eddie","Felix","Filipe","Glenn","Gus","Heath","Matthew","Patton","Rich","Rob","Ryan","Scott","Shelby","Sterling","Tyler","Victor","Zack","Friedrich","Herman","Isaac","Leo","Maynard","Mitchell","Morgann","Nathan","Niel","Pasqual","Paul","Tavarius","Tibor","Dimitri","Narek","Yusif","Frank","Jeff","Vaclav","Ovid","Francis","Keith","Russel","Sangon","Toway","Bomber","Chean","Demit","Hubor","Kebile","Laber","Ordo","Retay","Ronix","Wagel","Dobit","Kaster","Lobel","Releo","Saken","Rustix"],["Georgia","Sandra","Yvonne"]], diff --git a/src/locales/de/dialogue.ts b/src/locales/de/dialogue.ts index c69fb1aacd0..d9ad65ee8d4 100644 --- a/src/locales/de/dialogue.ts +++ b/src/locales/de/dialogue.ts @@ -379,6 +379,18 @@ export const PGMdialogue: DialogueTranslationEntries = { 3: "Ow! I scorched the tip of my nose!" }, }, + "sailor": { + "encounter": { + 1: "Matey, you're walking the plank if you lose!", + 2: "Come on then! My sailor's pride is at stake!", + 3: "Ahoy there! Are you seasick?" + }, + "victory": { + 1: "Argh! Beaten by a kid!", + 2: "Your spirit sank me!", + 3: "I think it's me that's seasick..." + }, + }, "brock": { "encounter": { 1: "Meine Expertise in Bezug auf Gesteins-Pokémon wird dich besiegen! Komm schon!", diff --git a/src/locales/de/trainers.ts b/src/locales/de/trainers.ts index 6ac1abbcabf..b7d7ec01617 100644 --- a/src/locales/de/trainers.ts +++ b/src/locales/de/trainers.ts @@ -95,6 +95,7 @@ export const trainerClasses: SimpleTranslationEntries = { "rich_kid_female": "Rich Kid", "rich_kids": "Schnösel", "roughneck": "Raufbold", + "sailor": "Matrose", "scientist": "Forscher", "scientist_female": "Forscherin", "scientists": "Forscher", diff --git a/src/locales/en/dialogue.ts b/src/locales/en/dialogue.ts index c5b0d72d3d7..601e6363f3a 100644 --- a/src/locales/en/dialogue.ts +++ b/src/locales/en/dialogue.ts @@ -371,6 +371,18 @@ export const PGMdialogue: DialogueTranslationEntries = { 3: "Ow! I scorched the tip of my nose!" }, }, + "sailor": { + "encounter": { + 1: "Matey, you're walking the plank if you lose!", + 2: "Come on then! My sailor's pride is at stake!", + 3: "Ahoy there! Are you seasick?" + }, + "victory": { + 1: "Argh! Beaten by a kid!", + 2: "Your spirit sank me!", + 3: "I think it's me that's seasick..." + }, + }, "brock": { "encounter": { 1: "My expertise on Rock-type Pokémon will take you down! Come on!", diff --git a/src/locales/en/trainers.ts b/src/locales/en/trainers.ts index cd6f78ccc13..701980f8d37 100644 --- a/src/locales/en/trainers.ts +++ b/src/locales/en/trainers.ts @@ -95,6 +95,7 @@ export const trainerClasses: SimpleTranslationEntries = { "rich_kid_female": "Rich Kid", "rich_kids": "Rich Kids", "roughneck": "Roughneck", + "sailor": "Sailor", "scientist": "Scientist", "scientist_female": "Scientist", "scientists": "Scientists", diff --git a/src/locales/es/dialogue.ts b/src/locales/es/dialogue.ts index faabab3077d..938ef331088 100644 --- a/src/locales/es/dialogue.ts +++ b/src/locales/es/dialogue.ts @@ -371,6 +371,18 @@ export const PGMdialogue: DialogueTranslationEntries = { 3: "Ow! I scorched the tip of my nose!" }, }, + "sailor": { + "encounter": { + 1: "¡Amigo, te haré caminar por la borda si pierdes!", + 2: "¡Adelante! ¡Mi orgullo como marinero está en auge!", + 3: "¡Ah del barco! ¿Estás mareado?" + }, + "victory": { + 1: "¡Argh! ¡Derrotado por un niño!", + 2: "¡Tu espíritu me ha hundido!", + 3: "Creo que soy yo quien está mareado..." + }, + }, "brock": { "encounter": { 1: "My expertise on Rock-type Pokémon will take you down! Come on!", diff --git a/src/locales/es/trainers.ts b/src/locales/es/trainers.ts index 3e2b2b1a788..6d776f44c9c 100644 --- a/src/locales/es/trainers.ts +++ b/src/locales/es/trainers.ts @@ -94,6 +94,7 @@ export const trainerClasses: SimpleTranslationEntries = { "rich_kid_female": "Niña Bien", "rich_kids": "Niños Bien", "roughneck": "Calvo", + "sailor": "Marinero", "scientist": "Científico", "scientist_female": "Científica", "scientists": "Científicos", diff --git a/src/locales/fr/dialogue.ts b/src/locales/fr/dialogue.ts index befc9d96caa..950703bfded 100644 --- a/src/locales/fr/dialogue.ts +++ b/src/locales/fr/dialogue.ts @@ -371,6 +371,18 @@ export const PGMdialogue: DialogueTranslationEntries = { 3: "Ow! I scorched the tip of my nose!" }, }, + "sailor": { + "encounter": { + 1: "Matey, you're walking the plank if you lose!", + 2: "Come on then! My sailor's pride is at stake!", + 3: "Ahoy there! Are you seasick?" + }, + "victory": { + 1: "Argh! Beaten by a kid!", + 2: "Your spirit sank me!", + 3: "I think it's me that's seasick..." + }, + }, "brock": { "encounter": { 1: "My expertise on Rock-type Pokémon will take you down! Come on!", diff --git a/src/locales/fr/trainers.ts b/src/locales/fr/trainers.ts index 6ed221a7b86..a44c03e1b68 100644 --- a/src/locales/fr/trainers.ts +++ b/src/locales/fr/trainers.ts @@ -95,6 +95,7 @@ export const trainerClasses: SimpleTranslationEntries = { "rich_kid_female": "Mademoiselle", "rich_kids": "Richards", "roughneck": "Loubard", + "sailor": "Marin", "scientist": "Scientifique", "scientist_female": "Scientifique", "scientists": "Scientifiques", diff --git a/src/locales/it/dialogue.ts b/src/locales/it/dialogue.ts index faabab3077d..26602079f65 100644 --- a/src/locales/it/dialogue.ts +++ b/src/locales/it/dialogue.ts @@ -371,6 +371,18 @@ export const PGMdialogue: DialogueTranslationEntries = { 3: "Ow! I scorched the tip of my nose!" }, }, + "sailor": { + "encounter": { + 1: "Matey, you're walking the plank if you lose!", + 2: "Come on then! My sailor's pride is at stake!", + 3: "Ahoy there! Are you seasick?" + }, + "victory": { + 1: "Argh! Beaten by a kid!", + 2: "Your spirit sank me!", + 3: "I think it's me that's seasick..." + }, + }, "brock": { "encounter": { 1: "My expertise on Rock-type Pokémon will take you down! Come on!", diff --git a/src/locales/it/trainers.ts b/src/locales/it/trainers.ts index 9c3f025541e..9c0a644c1c6 100644 --- a/src/locales/it/trainers.ts +++ b/src/locales/it/trainers.ts @@ -95,6 +95,7 @@ export const trainerClasses: SimpleTranslationEntries = { "rich_kid_female": "Rich Kid", "rich_kids": "Rich Kids", "roughneck": "Roughneck", + "sailor": "Sailor", "scientist": "Scientist", "scientist_female": "Scientist", "scientists": "Scientists", diff --git a/src/locales/ko/dialogue.ts b/src/locales/ko/dialogue.ts index 795bc82ae7c..7867ae7b021 100644 --- a/src/locales/ko/dialogue.ts +++ b/src/locales/ko/dialogue.ts @@ -371,6 +371,18 @@ export const PGMdialogue: DialogueTranslationEntries = { 3: "Ow! I scorched the tip of my nose!" }, }, + "sailor": { + "encounter": { + 1: "Matey, you're walking the plank if you lose!", + 2: "Come on then! My sailor's pride is at stake!", + 3: "Ahoy there! Are you seasick?" + }, + "victory": { + 1: "Argh! Beaten by a kid!", + 2: "Your spirit sank me!", + 3: "I think it's me that's seasick..." + }, + }, "brock": { "encounter": { 1: "내 전문인 바위 타입 포켓몬으로 널 쓰러뜨려줄게! 덤벼!", diff --git a/src/locales/ko/trainers.ts b/src/locales/ko/trainers.ts index 62e8de560d2..0bc99640333 100644 --- a/src/locales/ko/trainers.ts +++ b/src/locales/ko/trainers.ts @@ -101,6 +101,7 @@ export const trainerClasses: SimpleTranslationEntries = { "smasher": "테니스선수", "snow_worker": "작업원", "snow_worker_female": "작업원", + "sailor": "선원", "striker": "축구선수", "school_kid": "학원끝난 아이", "school_kid_female": "학원끝난 아이", diff --git a/src/locales/pt_BR/dialogue.ts b/src/locales/pt_BR/dialogue.ts index cf5ff6ccf4f..1258e41cb54 100644 --- a/src/locales/pt_BR/dialogue.ts +++ b/src/locales/pt_BR/dialogue.ts @@ -371,6 +371,18 @@ export const PGMdialogue: DialogueTranslationEntries = { 3: "Ai! Queimei minha língua!" }, }, + "sailor": { + "encounter": { + 1: "Matey, you're walking the plank if you lose!", + 2: "Come on then! My sailor's pride is at stake!", + 3: "Ahoy there! Are you seasick?" + }, + "victory": { + 1: "Argh! Beaten by a kid!", + 2: "Your spirit sank me!", + 3: "I think it's me that's seasick..." + }, + }, "brock": { "encounter": { 1: "Minha especialidade em Pokémon do tipo Pedra vai te derrubar! Vamos lá!", diff --git a/src/locales/pt_BR/trainers.ts b/src/locales/pt_BR/trainers.ts index 5d624c60ad5..f93875dcbfc 100644 --- a/src/locales/pt_BR/trainers.ts +++ b/src/locales/pt_BR/trainers.ts @@ -95,6 +95,7 @@ export const trainerClasses: SimpleTranslationEntries = { "rich_kid_female": "Garota Rica", "rich_kids": "Garotos Ricos", "roughneck": "Arruaceiro", + "sailor": "Marinheiro", "scientist": "Cientista", "scientist_female": "Cientista", "scientists": "Cientistas", diff --git a/src/locales/zh_CN/dialogue.ts b/src/locales/zh_CN/dialogue.ts index faabab3077d..26602079f65 100644 --- a/src/locales/zh_CN/dialogue.ts +++ b/src/locales/zh_CN/dialogue.ts @@ -371,6 +371,18 @@ export const PGMdialogue: DialogueTranslationEntries = { 3: "Ow! I scorched the tip of my nose!" }, }, + "sailor": { + "encounter": { + 1: "Matey, you're walking the plank if you lose!", + 2: "Come on then! My sailor's pride is at stake!", + 3: "Ahoy there! Are you seasick?" + }, + "victory": { + 1: "Argh! Beaten by a kid!", + 2: "Your spirit sank me!", + 3: "I think it's me that's seasick..." + }, + }, "brock": { "encounter": { 1: "My expertise on Rock-type Pokémon will take you down! Come on!", diff --git a/src/locales/zh_CN/trainers.ts b/src/locales/zh_CN/trainers.ts index ae0680a3c75..28b0760cc9b 100644 --- a/src/locales/zh_CN/trainers.ts +++ b/src/locales/zh_CN/trainers.ts @@ -95,6 +95,7 @@ export const trainerClasses: SimpleTranslationEntries = { "rich_kid_female": "Rich Kid", "rich_kids": "富二代组合", "roughneck": "光头男", + "sailor": "水手", "scientist": "研究员", "scientist_female": "研究员", "scientists": "研究员组合", diff --git a/src/locales/zh_TW/dialogue.ts b/src/locales/zh_TW/dialogue.ts index 7cb29ec8191..5e79471f771 100644 --- a/src/locales/zh_TW/dialogue.ts +++ b/src/locales/zh_TW/dialogue.ts @@ -371,6 +371,18 @@ export const PGMdialogue: DialogueTranslationEntries = { 3: "Ow! I scorched the tip of my nose!" }, }, + "sailor": { + "encounter": { + 1: "Matey, you're walking the plank if you lose!", + 2: "Come on then! My sailor's pride is at stake!", + 3: "Ahoy there! Are you seasick?" + }, + "victory": { + 1: "Argh! Beaten by a kid!", + 2: "Your spirit sank me!", + 3: "I think it's me that's seasick..." + }, + }, "brock": { "encounter": { 1: "My expertise on Rock-type Pokémon will take you down! Come on!", diff --git a/src/locales/zh_TW/trainers.ts b/src/locales/zh_TW/trainers.ts index f20ee156c3a..07b2949bdd8 100644 --- a/src/locales/zh_TW/trainers.ts +++ b/src/locales/zh_TW/trainers.ts @@ -95,6 +95,7 @@ export const trainerClasses: SimpleTranslationEntries = { "rich_kid_female": "富家孩子", "rich_kids": "富二代組合", "roughneck": "光頭男", + "sailor": "水手", "scientist": "研究員", "scientist_female": "研究員", "scientists": "研究員組合",