From 48a173237e121347a59b556736e65cc2d2a97d18 Mon Sep 17 00:00:00 2001 From: Temps Ray Date: Tue, 21 May 2024 14:34:00 -0400 Subject: [PATCH] Update locales --- public/images/trainer/aqua_grunt.json | 41 ++++++++++++++++++ public/images/trainer/aqua_grunt.png | Bin 0 -> 787 bytes public/images/trainer/aqua_grunt_female.json | 41 ++++++++++++++++++ public/images/trainer/aqua_grunt_female.png | Bin 0 -> 767 bytes public/images/trainer/galactic_grunt.json | 41 ++++++++++++++++++ public/images/trainer/galactic_grunt.png | Bin 0 -> 762 bytes .../images/trainer/galactic_grunt_female.json | 41 ++++++++++++++++++ .../images/trainer/galactic_grunt_female.png | Bin 0 -> 805 bytes public/images/trainer/magma_grunt.json | 41 ++++++++++++++++++ public/images/trainer/magma_grunt.png | Bin 0 -> 762 bytes public/images/trainer/magma_grunt_female.json | 41 ++++++++++++++++++ public/images/trainer/magma_grunt_female.png | Bin 0 -> 758 bytes public/images/trainer/plasma_grunt.json | 41 ++++++++++++++++++ public/images/trainer/plasma_grunt.png | Bin 0 -> 914 bytes .../images/trainer/plasma_grunt_female.json | 41 ++++++++++++++++++ public/images/trainer/plasma_grunt_female.png | Bin 0 -> 764 bytes public/images/trainer/rocket_grunt.json | 41 ++++++++++++++++++ public/images/trainer/rocket_grunt.png | Bin 0 -> 677 bytes .../images/trainer/rocket_grunt_female.json | 41 ++++++++++++++++++ public/images/trainer/rocket_grunt_female.png | Bin 0 -> 718 bytes src/battle.ts | 4 ++ src/data/trainer-config.ts | 12 ++--- src/field/trainer.ts | 8 ++++ src/locales/de/trainers.ts | 31 ++++++++++++- src/locales/en/trainers.ts | 24 +++++----- 25 files changed, 470 insertions(+), 19 deletions(-) create mode 100644 public/images/trainer/aqua_grunt.json create mode 100644 public/images/trainer/aqua_grunt.png create mode 100644 public/images/trainer/aqua_grunt_female.json create mode 100644 public/images/trainer/aqua_grunt_female.png create mode 100644 public/images/trainer/galactic_grunt.json create mode 100644 public/images/trainer/galactic_grunt.png create mode 100644 public/images/trainer/galactic_grunt_female.json create mode 100644 public/images/trainer/galactic_grunt_female.png create mode 100644 public/images/trainer/magma_grunt.json create mode 100644 public/images/trainer/magma_grunt.png create mode 100644 public/images/trainer/magma_grunt_female.json create mode 100644 public/images/trainer/magma_grunt_female.png create mode 100644 public/images/trainer/plasma_grunt.json create mode 100644 public/images/trainer/plasma_grunt.png create mode 100644 public/images/trainer/plasma_grunt_female.json create mode 100644 public/images/trainer/plasma_grunt_female.png create mode 100644 public/images/trainer/rocket_grunt.json create mode 100644 public/images/trainer/rocket_grunt.png create mode 100644 public/images/trainer/rocket_grunt_female.json create mode 100644 public/images/trainer/rocket_grunt_female.png diff --git a/public/images/trainer/aqua_grunt.json b/public/images/trainer/aqua_grunt.json new file mode 100644 index 00000000000..dc5f58a99a0 --- /dev/null +++ b/public/images/trainer/aqua_grunt.json @@ -0,0 +1,41 @@ +{ + "textures": [ + { + "image": "aqua_grunt.png", + "format": "RGBA8888", + "size": { + "w": 73, + "h": 73 + }, + "scale": 1, + "frames": [ + { + "filename": "0001.png", + "rotated": false, + "trimmed": false, + "sourceSize": { + "w": 80, + "h": 80 + }, + "spriteSourceSize": { + "x": 17, + "y": 6, + "w": 46, + "h": 73 + }, + "frame": { + "x": 0, + "y": 0, + "w": 46, + "h": 73 + } + } + ] + } + ], + "meta": { + "app": "https://www.codeandweb.com/texturepacker", + "version": "3.0", + "smartupdate": "$TexturePacker:SmartUpdate:efd07ff3ed1e610150a4b8ca18974343:d9b85b9eb11182e9e4669e2bd8b08694:72b7b50231708a9486d5f315824e4df1$" + } +} diff --git a/public/images/trainer/aqua_grunt.png b/public/images/trainer/aqua_grunt.png new file mode 100644 index 0000000000000000000000000000000000000000..87dbfd566a1c16647fecd1b72fa4f5693ea294d2 GIT binary patch literal 787 zcmV+u1MK{XP)nq0000sP)t-sOlfgi zc*owPdn+d^|Ns9YJzY^zQ2+n{JXfoEn&Ygqy#Lj`drDeONlh{`GQE3ZW@cu}%E}MO z#54c^00DGTPE!Ct=GbNc000SaNLh0L01m_e01m_fl`9S#0007ZNkl|`lCU~t+Vt`Ja&>UDOy~5u|hIOQVOBGD?Lx4 z#8Xn5;rW)5Q#Y28KQ5Z-{TD?2GH1a@NaoK|f}PZf z@^V}9w~*pDk{>1=lQ{OEWXeTz3+YX!lgn=-^(5uxS;}1`^M!=2TQG#=!=J}j0_p4t zcts)o`S-e&T-TnqpzS_CY$aET%cyq#iVxerS8INWB&V+*73ovFp00he^B=4~Cm93I RR|o(A002ovPDHLkV1gc9T!{bx literal 0 HcmV?d00001 diff --git a/public/images/trainer/aqua_grunt_female.json b/public/images/trainer/aqua_grunt_female.json new file mode 100644 index 00000000000..a8fec682076 --- /dev/null +++ b/public/images/trainer/aqua_grunt_female.json @@ -0,0 +1,41 @@ +{ + "textures": [ + { + "image": "aqua_grunt_female.png", + "format": "RGBA8888", + "size": { + "w": 71, + "h": 71 + }, + "scale": 1, + "frames": [ + { + "filename": "0001.png", + "rotated": false, + "trimmed": false, + "sourceSize": { + "w": 80, + "h": 80 + }, + "spriteSourceSize": { + "x": 22, + "y": 8, + "w": 36, + "h": 71 + }, + "frame": { + "x": 0, + "y": 0, + "w": 36, + "h": 71 + } + } + ] + } + ], + "meta": { + "app": "https://www.codeandweb.com/texturepacker", + "version": "3.0", + "smartupdate": "$TexturePacker:SmartUpdate:6db25cb5753163d19bca8e2db45849ae:7d8f51509862bfdf8a78bf42dd0005cd:af0aa9494be37941522487032b556989$" + } +} diff --git a/public/images/trainer/aqua_grunt_female.png b/public/images/trainer/aqua_grunt_female.png new file mode 100644 index 0000000000000000000000000000000000000000..132d239c0b821e2854f419ca4a899d24ceafe0db GIT binary patch literal 767 zcmVt<8d79%qSF3wUT2WC^Xh=w`v%JVqNZzD-_-J6gdt%;F zTGX0wGBPqLDM8B0%BaBDct}`EYI{pPMVa{+J!VH~e- zEYPKnt0fQ3xHuC%8U_szTq)W@kkxqt6k~RzUmuW;F`hDb4L#t z_0D+BT`9O+l!3-&SwIksGhVb1ITx6_Zp8^<9F#^CGcK6n=?RsLBPU4jfB`~y`OG*f z`x=pfbzN^lY3Gbf4a0D|-G;$?HAG#&1fFX04G=PeFo^hJ&_fvpOfpSqz+k(qjkDr- zq;TN4A9Ya1m4cnYmk6yI1~)Rsn5gi1?R0^%Tn3Z1bO-4zzEm(Y4(tYI+hfrejbiBM z^H4w#-G;UnueHS!Mz!9Q0m=^IEHgARU1#}THfu)QZ@WVW1-T_=1>?63Ug+CIf8G;U zP&lw{e>e}Y!$*avf?nSlK69uXv#;`79D?*`J7z-o87De<(mT>n#M4Xhn&Lz-VgE+Q zxc%xfq5tkA8jdNBQ##0`awrV4@XZcSyve!S*GlI;j_iO22TZ$@4o=cS?7TxsyQ6={ zDUhPGlfx5o&^G7-c~{@sCxJqvgRcW^>go}Ra|on@9vul(zxW?G0#yc*U(~Zx+ZniU z8jwuL{ghKRqLagr#u4b~)Cby~4;u4zf#A`>lKWXr96BWO0sQ_=exoW(&xO+AG<mrpEx-}bMvVt;=;{{W_jB3ohXQELDI002ovPDHLkV1m!0Q1Ac% literal 0 HcmV?d00001 diff --git a/public/images/trainer/galactic_grunt.json b/public/images/trainer/galactic_grunt.json new file mode 100644 index 00000000000..22fb7308cab --- /dev/null +++ b/public/images/trainer/galactic_grunt.json @@ -0,0 +1,41 @@ +{ + "textures": [ + { + "image": "galactic_grunt.png", + "format": "RGBA8888", + "size": { + "w": 73, + "h": 73 + }, + "scale": 1, + "frames": [ + { + "filename": "0001.png", + "rotated": false, + "trimmed": false, + "sourceSize": { + "w": 80, + "h": 80 + }, + "spriteSourceSize": { + "x": 20, + "y": 6, + "w": 37, + "h": 73 + }, + "frame": { + "x": 0, + "y": 0, + "w": 37, + "h": 73 + } + } + ] + } + ], + "meta": { + "app": "https://www.codeandweb.com/texturepacker", + "version": "3.0", + "smartupdate": "$TexturePacker:SmartUpdate:856b85bb5d7a1ea2e7a76708ebf82d21:1687dff972369c6248e4aa5b0795fe62:259dd316440c335df5dc6008166d69ca$" + } +} diff --git a/public/images/trainer/galactic_grunt.png b/public/images/trainer/galactic_grunt.png new file mode 100644 index 0000000000000000000000000000000000000000..1fff818266cacfbaf568d1ec6ca070718477e4b1 GIT binary patch literal 762 zcmVnq0000mP)t-sOlffd z002r#TD`r+F)=a!|Nn!7i%O)d|JA)pYI}Q1T58qJy?bKbq^ds zq0s*Se|tixPS12#Lz-**P&e-;$V*(7EuzNa4(3}AX0J6Ijrc9dN8xdMJbG9DEiE;+NUQDhnGo}8lC^1(G*+XTaLK5lal_aS^UE&vKpOljfluT#lke!qa zc<2nW)O)c6bSZ58fqA(MDRgOxI=9r)ecUDK8jMlTgI1;`X@BzAp=yzh zuNtXU$`PZLl6^|HP}!hrnUg4D>&u$##j_)xM|oS5XLnYq4^;H*Dtn2(CdtExUjjmJ zf1Q#<6zmI9c!!%hNG@uV;FaPYa#8UBd8kzyR0wbmliZIXO;bOTQemFjNh<}E5$7fWZlZABsqb1Qa_Tlx0^c54>v-OyqTns`w53XE_~hFVF5 s56bzX^wU!%()Gx~^i~Y`UZU6d2gN`Y!PVs2t^fc407*qoM6N<$g3Q)h+yDRo literal 0 HcmV?d00001 diff --git a/public/images/trainer/galactic_grunt_female.json b/public/images/trainer/galactic_grunt_female.json new file mode 100644 index 00000000000..11205b09b31 --- /dev/null +++ b/public/images/trainer/galactic_grunt_female.json @@ -0,0 +1,41 @@ +{ + "textures": [ + { + "image": "galactic_grunt_female.png", + "format": "RGBA8888", + "size": { + "w": 68, + "h": 68 + }, + "scale": 1, + "frames": [ + { + "filename": "0001.png", + "rotated": false, + "trimmed": false, + "sourceSize": { + "w": 80, + "h": 80 + }, + "spriteSourceSize": { + "x": 10, + "y": 11, + "w": 57, + "h": 68 + }, + "frame": { + "x": 0, + "y": 0, + "w": 57, + "h": 68 + } + } + ] + } + ], + "meta": { + "app": "https://www.codeandweb.com/texturepacker", + "version": "3.0", + "smartupdate": "$TexturePacker:SmartUpdate:3012867f03f02c4ee67a8ab3ad5a000e:77a5f60f1adc158664b3b2ee17bf30fe:7e8259b5177c0a76e5d02d6bdc66affe$" + } +} diff --git a/public/images/trainer/galactic_grunt_female.png b/public/images/trainer/galactic_grunt_female.png new file mode 100644 index 0000000000000000000000000000000000000000..209d8ae09baa3ffd0103622fdddc521566f64991 GIT binary patch literal 805 zcmV+=1KRwFP)00001 zbW%=J06^y0W&i*H32;bRa{vGi!~g&e!~vBn4jTXf0**;UK~z}7t(J?jgCGn9&BXF7%BCTs%3Fkm=8u>1oBWht*1(UDTCl;v5B$mjztm{Q8JvAutA+Zc-*?jE(ySg+xx1OzShbs8$L` z<}}_Rqm1nk4T{;e*A~~0e5C-pWTf#o1lQ|zmy#siAyt&TQ*b4bf_;ccRNG`h*n(UI zv=0%<0rMWMj51!CUND&$Xcen;E;N7Z0rb-6L@t4iapHW`BlN4)oPKhTWN>Rg{ z$cni|DVmmeLJO*G?HlJ9Rzez3cS4>Zy;5os(kaMV$mby17;9Vc#KtbenOg(%EhT+Y zyd&xMrqmBXWpEsl^|U@AdNgP(LG6($tt%R?I?h1WXbi$Gse5n2T?ltY1Ac+@3eg~p z@juaU@792P>2M|*Xu)UKU2 zzg&13HA3*x6CBb)!5hPK+b9L$o$+W;sRe>BceqM9gze$C literal 0 HcmV?d00001 diff --git a/public/images/trainer/magma_grunt.json b/public/images/trainer/magma_grunt.json new file mode 100644 index 00000000000..820f5b23f17 --- /dev/null +++ b/public/images/trainer/magma_grunt.json @@ -0,0 +1,41 @@ +{ + "textures": [ + { + "image": "magma_grunt.png", + "format": "RGBA8888", + "size": { + "w": 67, + "h": 67 + }, + "scale": 1, + "frames": [ + { + "filename": "0001.png", + "rotated": false, + "trimmed": false, + "sourceSize": { + "w": 80, + "h": 80 + }, + "spriteSourceSize": { + "x": 18, + "y": 12, + "w": 44, + "h": 67 + }, + "frame": { + "x": 0, + "y": 0, + "w": 44, + "h": 67 + } + } + ] + } + ], + "meta": { + "app": "https://www.codeandweb.com/texturepacker", + "version": "3.0", + "smartupdate": "$TexturePacker:SmartUpdate:96aa833d987a01bcdcb6f0e7809f5daf:791cce8d026f92b2e52f0b66df8b8e11:35532fd5d9aea30957d50d06f2d2f9a6$" + } +} diff --git a/public/images/trainer/magma_grunt.png b/public/images/trainer/magma_grunt.png new file mode 100644 index 0000000000000000000000000000000000000000..09824213026058bb33a8fe96820d937839bda000 GIT binary patch literal 762 zcmV0{{R3@DxZv0000mP)t-sOlfgi zT3P@A05mi-)J$BeA~I?!EP8r+_|Ukxa9G}?d$_o;ct}|I`1t?-|JbO2xkWkl00001 zbW%=J06^y0W&i*H32;bRa{vGi!~g&e!~vBn4jTXf0%J);K~z}7t(S{-tRM_U%>ja< z?fw71y-7qz+fgA?*0i0vV3Ws5z+redn0feYfMbmCQ$hfujRY@&s3O!9gwXE<9TCFI z1P?@FktkFKdHm5}=vspyxI$u{gb->}T?~$|kz~M$07POd!pQ(89n8rIK?2Pc0#qVJ3JPnEp-USPH(Wz{e2CSjVIcpFp^b#TbhhVTMRV$B{ok$Vzc%vcG;rN(>~g z9TtLB7hZ)el2WJ_!9GcJ-`NmZ5T#5~{Xqwb>^mV+Wn9z_=|fWbR{qe^Lx(JM&!P)p z-9sTfm5wt)tmarlh_KqBhKST!?XdHJH^!l{FRJ-Q1Z5G#o=IqarIE=03R&8kIh3(m z4NJ`0ke4=hG!e2hP7gN5ur!^$;z>Ro1A0`^2H_@+taco0hFPE3GYxQRfruUFM1Re5 zTyw3_ZD9%gi|BWGL zQRcRW}90w=PLU%+f3DjL%TJKddMTF`JN#95XvRJjY23LvH)}vI2e7DxE4$%U69t$s|k`0=O z(gw+fL>aA`q)Fc%P;afujvFOU4Hjs1bp4yYi_96ags?%=sJE<+KvE|m*drPnh?agb zOY$0y%3U#q2&P3FJCJ0W)e1Eq z#c11W5h z2ZhN8mEAea%@@#+Zi9*kdPd<1soVq=>H40}YIkdeCT$>b2*@Z+Yae=qk`>ZI3&$Lp zplP(lH$YTQkm=eE?fi~igPgghTLj)OdoW(L?t|obetm9hPuw}OCJCo|>^ir_ouVCr zJ4MDMol~?W>0(I8=d1o$|GOZ**dWPye}4V+3b1w+*V+)J@ZJfIfh*41JD%_Fc*wW_ o>97C(m-oi>&;L5O_Q3DsAJNGiMkmeX{r~^~07*qoM6N<$g2~NShyVZp literal 0 HcmV?d00001 diff --git a/public/images/trainer/plasma_grunt.json b/public/images/trainer/plasma_grunt.json new file mode 100644 index 00000000000..c33e96ed763 --- /dev/null +++ b/public/images/trainer/plasma_grunt.json @@ -0,0 +1,41 @@ +{ + "textures": [ + { + "image": "plasma_grunt.png", + "format": "RGBA8888", + "size": { + "w": 72, + "h": 72 + }, + "scale": 1, + "frames": [ + { + "filename": "0001.png", + "rotated": false, + "trimmed": false, + "sourceSize": { + "w": 80, + "h": 80 + }, + "spriteSourceSize": { + "x": 16, + "y": 7, + "w": 47, + "h": 72 + }, + "frame": { + "x": 0, + "y": 0, + "w": 47, + "h": 72 + } + } + ] + } + ], + "meta": { + "app": "https://www.codeandweb.com/texturepacker", + "version": "3.0", + "smartupdate": "$TexturePacker:SmartUpdate:61f195ebbcde93ab7442408edad7fe7a:28ae203b3cb42a94c4ba4420fdebdccc:9ae0ee174d431d48052a2f6b74e9d40c$" + } +} diff --git a/public/images/trainer/plasma_grunt.png b/public/images/trainer/plasma_grunt.png new file mode 100644 index 0000000000000000000000000000000000000000..e3ec6dd8c3534bbabba12c200cd8388195ee4998 GIT binary patch literal 914 zcmV;D18w|?P)=f4e00001 zbW%=J06^y0W&i*H32;bRa{vGi!~g&e!~vBn4jTXf0{clsK~z}7t(c8+>>vn*;}Mi3 zyW97F+Y6WucFiZ6Lf}%Yy6U zO!GXitFojAwB)QHQity@XIkfNNCzn9C~=FwG6yn09rIZ2|E)eUuiEprb~-7g1j%^J z^CI~nky=3>Ee=XaC)tXF9&Q^HMARHdfJ7)qQxqUG5wt#vY09CV98rJ@GLk9djI~Ib zdqIkFkp8rc&$}e!^i~ozE)_uv%2*!DvJME^%sWA}tgj`RpwM4OfCHo?7@0YQ!02aL z*lZvT2FC;sh+dR?Tc_vD8kb?`3=~ROL`kRy$1#$5N+mJNl@n>8cq@qV^YqXikUXEy zH_*U-Vy3AgH;!rN41g#H+69r5tXB1dG>**M#n&3`L@Lb3!j zj0Whyo{dy6NJti0iWvg2R+N1@CDMJ^L8+IM0$aJX%Bw@jHU;I-0EmJqAWC8&C)u}d z2W4^>*|tK3q@UC+2wIPvl!_!uJ_ZWq4l0slv}beBMpBf8z!-;X8eiFD?c7n>1b(7K|h;ETo&^M6Vrb5xjIV`(^`bfq(T>TByK}t0!gkh2is-p3f z)M=b^Oi*|SP3T%VST)1Jsn&l2x;O8GayvoYYoN3g;I^UMSnT2;BzB zoqbN1$~0;%aNAMu0^-^Zk53z@A2{Je5#YsQ(+3y)u~ o5A0p>=2cpqXSatp)VDeR0BKemLNInO0RR9107*qoM6N<$f`fsXvj6}9 literal 0 HcmV?d00001 diff --git a/public/images/trainer/plasma_grunt_female.json b/public/images/trainer/plasma_grunt_female.json new file mode 100644 index 00000000000..e9ff6b915b2 --- /dev/null +++ b/public/images/trainer/plasma_grunt_female.json @@ -0,0 +1,41 @@ +{ + "textures": [ + { + "image": "plasma_grunt_female.png", + "format": "RGBA8888", + "size": { + "w": 75, + "h": 75 + }, + "scale": 1, + "frames": [ + { + "filename": "0001.png", + "rotated": false, + "trimmed": false, + "sourceSize": { + "w": 80, + "h": 80 + }, + "spriteSourceSize": { + "x": 21, + "y": 4, + "w": 37, + "h": 75 + }, + "frame": { + "x": 0, + "y": 0, + "w": 37, + "h": 75 + } + } + ] + } + ], + "meta": { + "app": "https://www.codeandweb.com/texturepacker", + "version": "3.0", + "smartupdate": "$TexturePacker:SmartUpdate:c3001e18f1878c01a4825697200e823e:2003e0d4db249f7020c3471872198ac8:b01645b9e941158814978f2126e7e995$" + } +} diff --git a/public/images/trainer/plasma_grunt_female.png b/public/images/trainer/plasma_grunt_female.png new file mode 100644 index 0000000000000000000000000000000000000000..95b065f4360a81cdfe3b96c0527e9f07a8c1c402 GIT binary patch literal 764 zcmV002t}0{{R350Hx30000mP)t-sOlfiW z`1k+-07yt!sKD5Wn5bxQcrY+9$k5RE(75n`K)7&N*r!r$4ibO54M1YHiX}Jl?6#}UlCSxmYqy_xm)7 zS~kC!^uUiUo6PeijWjqi8}5sm>Qwti<`g zOiPcIDAGG@p65klf!UT+C>SZTx zy)0>wDz_5bhxH0}3fp3RSvZgFCKvB44p?vM)7pZy7LE14bw=_-Hh87>6Q9xKoU|Sk zT=Dx@xAZpIBy#2>-XDGZp{XA`0*}%5?%?aR0uhPisy~jfeIR1zSHD=T{0@zaJhDvJS4$XF57-9bIrX*k5meuC%Q4=^Se2tAeCHBRsVlzUiVoJ}AVwNmI|NsB&N)7BnVp394HgK0%00001 zbW%=J06^y0W&i*H32;bRa{vGi!~g&e!~vBn4jTXf0uD(;K~z}7rI*>3f-nq*8jZ#6?$hSsJD zmzE?H6!)8${bc|J9iTSU+;rEei30gG$jvtlg5YIo4IzclZh$&X;-4efUKzX}lXKw> zy?0eyh0g_UtJW!b!Z>0AVMC>aQ4C9*0OA%d?p);utkP!MMR)`VUVweP6GPz3+?nU&oZRM zQNVEk#$^!|DuMcgz&}Z+Wzjn5P=Pf?4}ty&-ue)zdoFyDy&OG*1hJp@gnq#53`PmB zIfvfufG2=%!YRO>^hg-a0KF2V`7Q|1Mc|WF2;3z?#~9vA&;d6Y(D9{%3&IB-29SmJ zt`h6Ijs_S%5zaEHN5Rn!WS6B}nXW!;c47K(rCQa-+!g=nEqTB%IJyqIP{uOo00000 LNkvXXu0mjf0{{R3@DxZv0000jP)t-sOlff$ z87wn1J3>NA0001de2w_TGCjbi`*|B$Ea5C8xG0d!JM zQvg8b*k%9#010qNS#tmY4#WTe4#WYKD-Ig~00KHmL_t(o!>yN#Zo)7OMeF#cO`5|0 zf9`B2rRxM+;>?H&A#!^CF3a-6sM_K;qEL-6L8vnPlv9L~oRABllz(8TQy4hf@^III z0S4v3#No>8DWac|j+~h(T#2>gdg+#doHH?t5W4w6=#PdlqB3X!P+c(qjywQ~!mxu2 zQp9FnP(F@hAh!@1<_&Us;<2s?PaI>6#p+u)!q^_dSkp5fd5m%Pt1t|)t^yE>tK$@s z^TQB0oSh470uUXN6SxNm#GQ=@%Zx!S1Yiacv|bS=<{=ay#cGqxM*)@6MvxnVT}&}_ z4x;fADSMIkuKf=ug?6)2=b&OVG&IPNc& zQOW!)a;3=kGdgkm8GEt#QMe1~-degO_QG}T!rA-O23eS4XkJ4|N!AQaAmnXpCb=29 zySE7jQrb3QtbT?7#L|L)U?f9qGYI)0WwNA zb!fqXkR8zaJNOu)BAkfE7+WjV5uwmE`B+|I0 new Trainer(scene, TrainerType.RIVAL_3, scene.gameData.gender === PlayerGender.MALE ? TrainerVariant.FEMALE : TrainerVariant.DEFAULT)), [95]: new FixedBattleConfig().setBattleType(BattleType.TRAINER) .setGetTrainerFunc(scene => new Trainer(scene, TrainerType.RIVAL_4, scene.gameData.gender === PlayerGender.MALE ? TrainerVariant.FEMALE : TrainerVariant.DEFAULT)), + [111]: new FixedBattleConfig().setBattleType(BattleType.TRAINER) + .setGetTrainerFunc(scene => new Trainer(scene, getEvilTeamBattle(scene.evilTeamThisRun, "admin"), TrainerVariant.DEFAULT)), + [113]: new FixedBattleConfig().setBattleType(BattleType.TRAINER) + .setGetTrainerFunc(scene => new Trainer(scene, getEvilTeamBattle(scene.evilTeamThisRun, "admin"), TrainerVariant.DEFAULT)), [115]: new FixedBattleConfig().setBattleType(BattleType.TRAINER) .setGetTrainerFunc(scene => new Trainer(scene, getEvilTeamBattle(scene.evilTeamThisRun, "boss1"), TrainerVariant.DEFAULT)), [145]: new FixedBattleConfig().setBattleType(BattleType.TRAINER) diff --git a/src/data/trainer-config.ts b/src/data/trainer-config.ts index 7a7c3b5d138..291b5eae461 100644 --- a/src/data/trainer-config.ts +++ b/src/data/trainer-config.ts @@ -899,7 +899,7 @@ export const trainerConfigs: TrainerConfigs = { [ Species.CATERPIE, Species.WEEDLE, Species.RATTATA, Species.SENTRET, Species.POOCHYENA, Species.ZIGZAGOON, Species.WURMPLE, Species.BIDOOF, Species.PATRAT, Species.LILLIPUP ] ), // TODO: sprite, encounter bgm, party template, team pools - [TrainerType.ROCKET_GRUNT]: new TrainerConfig(++t).setHasGenders().setHasDouble('Rocket Grunts').setMoneyMultiplier(1.0).setEncounterBgm(TrainerType.PLASMA_GRUNT).setBattleBgm('battle_plasma_grunt').setPartyTemplates(trainerPartyTemplates.FOUR_WEAK_BALANCED) + [TrainerType.ROCKET_GRUNT]: new TrainerConfig(++t).setHasGenders("Rocket Grunt Female").setHasDouble('Rocket Grunts').setMoneyMultiplier(1.0).setEncounterBgm(TrainerType.PLASMA_GRUNT).setBattleBgm('battle_plasma_grunt').setPartyTemplates(trainerPartyTemplates.FOUR_WEAK_BALANCED) .setSpeciesPools({ [TrainerPoolTier.COMMON]: [ Species.WEEDLE, Species.RATTATA, Species.EKANS, Species.SANDSHREW, Species.ZUBAT, Species.GEODUDE, Species.KOFFING], [TrainerPoolTier.UNCOMMON]: [Species.GRIMER, Species.CUBONE, Species.ODDISH, Species.GROWLITHE, Species.MURKROW, Species.GASTLY, Species.EXEGGCUTE, Species.VOLTORB], @@ -907,7 +907,7 @@ export const trainerConfigs: TrainerConfigs = { [TrainerPoolTier.SUPER_RARE]: [Species.PORYGON, Species.ALOLA_RATTATA, Species.ALOLA_SANDSHREW, Species.ALOLA_MEOWTH, Species.ALOLA_GRIMER, Species.ALOLA_GEODUDE], [TrainerPoolTier.ULTRA_RARE]: [Species.DRATINI, Species.LARVITAR] }), - [TrainerType.MAGMA_GRUNT]: new TrainerConfig(++t).setHasGenders().setHasDouble('Magma Grunts').setMoneyMultiplier(1.0).setEncounterBgm(TrainerType.PLASMA_GRUNT).setBattleBgm('battle_plasma_grunt').setPartyTemplates(trainerPartyTemplates.FOUR_WEAK_BALANCED) + [TrainerType.MAGMA_GRUNT]: new TrainerConfig(++t).setHasGenders("Magma Grunt Female").setHasDouble('Magma Grunts').setMoneyMultiplier(1.0).setEncounterBgm(TrainerType.PLASMA_GRUNT).setBattleBgm('battle_plasma_grunt').setPartyTemplates(trainerPartyTemplates.FOUR_WEAK_BALANCED) .setSpeciesPools({ [TrainerPoolTier.COMMON]: [Species.SLUGMA, Species.POOCHYENA, Species.NUMEL, Species.ZIGZAGOON, Species.DIGLETT, Species.MAGBY], [TrainerPoolTier.UNCOMMON]: [Species.PHANPY, Species.SWINUB, Species.GLIGAR, Species.TORKOAL, Species.BALTOY, Species.BARBOACH], @@ -915,7 +915,7 @@ export const trainerConfigs: TrainerConfigs = { [TrainerPoolTier.SUPER_RARE]: [Species.TRAPINCH, Species.HEATMOR], [TrainerPoolTier.ULTRA_RARE]: [Species.TURTONATOR, Species.CHARCADET] }), - [TrainerType.AQUA_GRUNT]: new TrainerConfig(++t).setHasGenders().setHasDouble('Aqua Grunts').setMoneyMultiplier(1.0).setEncounterBgm(TrainerType.PLASMA_GRUNT).setBattleBgm('battle_plasma_grunt').setPartyTemplates(trainerPartyTemplates.FOUR_WEAK_BALANCED) + [TrainerType.AQUA_GRUNT]: new TrainerConfig(++t).setHasGenders("Aqua Grunt Female").setHasDouble('Aqua Grunts').setMoneyMultiplier(1.0).setEncounterBgm(TrainerType.PLASMA_GRUNT).setBattleBgm('battle_plasma_grunt').setPartyTemplates(trainerPartyTemplates.FOUR_WEAK_BALANCED) .setSpeciesPools({ [TrainerPoolTier.COMMON]: [ Species.CARVANHA, Species.WAILMER, Species.ZIGZAGOON, Species.LOTAD, Species.CORPHISH], [TrainerPoolTier.UNCOMMON]: [Species.SPHEAL, Species.CHINCHOU, Species.WOOPER, Species.WINGULL, Species.TENTACOOL ], @@ -923,7 +923,7 @@ export const trainerConfigs: TrainerConfigs = { [TrainerPoolTier.SUPER_RARE]: [Species.MANTINE, Species.BASCULEGION], [TrainerPoolTier.ULTRA_RARE]: [Species.DONDOZO] }), - [TrainerType.GALACTIC_GRUNT]: new TrainerConfig(++t).setHasGenders().setHasDouble('Galactic Grunts').setMoneyMultiplier(1.0).setEncounterBgm(TrainerType.PLASMA_GRUNT).setBattleBgm('battle_plasma_grunt').setPartyTemplates(trainerPartyTemplates.FOUR_WEAK_BALANCED) + [TrainerType.GALACTIC_GRUNT]: new TrainerConfig(++t).setHasGenders("Galactic Grunt Female").setHasDouble('Galactic Grunts').setMoneyMultiplier(1.0).setEncounterBgm(TrainerType.PLASMA_GRUNT).setBattleBgm('battle_plasma_grunt').setPartyTemplates(trainerPartyTemplates.FOUR_WEAK_BALANCED) .setSpeciesPools({ [TrainerPoolTier.COMMON]: [ Species.GLAMEOW, Species.STUNKY, Species.CROAGUNK, Species.SHINX, Species.WURMPLE], [TrainerPoolTier.UNCOMMON]: [Species.BRONZOR, Species.DRIFLOON, Species.BURMY], @@ -931,7 +931,7 @@ export const trainerConfigs: TrainerConfigs = { [TrainerPoolTier.SUPER_RARE]: [Species.HISUI_GROWLITHE, Species.HISUI_QWILFISH, Species.HISUI_SNEASEL], [TrainerPoolTier.ULTRA_RARE]: [Species.HISUI_ZORUA, Species.HISUI_SLIGGOO] }), - [TrainerType.PLASMA_GRUNT]: new TrainerConfig(++t).setHasGenders().setHasDouble('Plasma Grunts').setMoneyMultiplier(1.0).setEncounterBgm(TrainerType.PLASMA_GRUNT).setBattleBgm('battle_plasma_grunt').setPartyTemplates(trainerPartyTemplates.FOUR_WEAK_BALANCED) + [TrainerType.PLASMA_GRUNT]: new TrainerConfig(++t).setHasGenders("Plasma Grunt Female").setHasDouble('Plasma Grunts').setMoneyMultiplier(1.0).setEncounterBgm(TrainerType.PLASMA_GRUNT).setBattleBgm('battle_plasma_grunt').setPartyTemplates(trainerPartyTemplates.FOUR_WEAK_BALANCED) .setSpeciesPools({ [TrainerPoolTier.COMMON]: [ Species.PATRAT, Species.LILLIPUP, Species.PURRLOIN, Species.SCRAFTY, Species.WOOBAT, Species.VANILLITE], [TrainerPoolTier.UNCOMMON]: [ Species.FRILLISH, Species.VENIPEDE, Species.SANDILE, Species.TRUBBISH, Species.GOLETT], @@ -939,7 +939,7 @@ export const trainerConfigs: TrainerConfigs = { [TrainerPoolTier.SUPER_RARE]: [Species.PAWNIARD, Species.VULLABY, Species.DRUDDIGON, Species.BOUFFALANT, Species.ZORUA], [TrainerPoolTier.ULTRA_RARE]: [Species.AXEW, Species.DEINO, Species.DURANT] }), - [TrainerType.FLARE_GRUNT]: new TrainerConfig(++t).setHasGenders().setHasDouble('Flare Grunts').setMoneyMultiplier(1.0).setEncounterBgm(TrainerType.PLASMA_GRUNT).setBattleBgm('battle_plasma_grunt').setPartyTemplates(trainerPartyTemplates.FOUR_WEAK_BALANCED) + [TrainerType.FLARE_GRUNT]: new TrainerConfig(++t).setHasGenders("Flare Grunt Female").setHasDouble('Flare Grunts').setMoneyMultiplier(1.0).setEncounterBgm(TrainerType.PLASMA_GRUNT).setBattleBgm('battle_plasma_grunt').setPartyTemplates(trainerPartyTemplates.FOUR_WEAK_BALANCED) .setSpeciesPools({ [TrainerPoolTier.COMMON]: [ Species.FLETCHLING, Species.LITLEO, Species.PONYTA, Species.INKAY, Species.HOUNDOUR, Species.SKORUPI], [TrainerPoolTier.UNCOMMON]: [Species.HELIOPTILE, Species.ELECTRIKE, Species.SKRELP, Species.GULPIN], diff --git a/src/field/trainer.ts b/src/field/trainer.ts index 8cd06cac12f..533397168a8 100644 --- a/src/field/trainer.ts +++ b/src/field/trainer.ts @@ -109,6 +109,14 @@ export default class Trainer extends Phaser.GameObjects.Container { // Determine the title to include based on the configuration and includeTitle flag. let title = includeTitle && this.config.title ? this.config.title : null; + if (this.name == '' && name.toLowerCase().includes('grunt')) { + // This is a evil team grunt so we localize it by only using the "name" as the title + title = i18next.t(`trainerClasses:${name.toLowerCase().replace(/\s/g, '_')}`); + console.log("Localized grunt name: " + title) + // Since grunts are not named we can just return the title + return title + } + // If the trainer has a name (not null or undefined). if (this.name) { // If the title should be included. diff --git a/src/locales/de/trainers.ts b/src/locales/de/trainers.ts index 93eb04cca67..daa4bab8540 100644 --- a/src/locales/de/trainers.ts +++ b/src/locales/de/trainers.ts @@ -9,6 +9,12 @@ export const titles: SimpleTranslationEntries = { "rival": "Rivale", "professor": "Professor", "frontier_brain": "Kampfkoryphäen", + "rocket_boss": "Rocket-Boss", + "magma_boss": "Magma-Boss", + "aqua_boss": "Aqua-Boss", + "galactic_boss": "Galaktik-Boss", + "plasma_boss": "Weiser von Team Plasma", // This is on purpose, since "Ghetsis" is never mentioned as the boss of team plasma in the game but as "Weiser" + "flare_boss": "Flare-Boss", // Maybe if we add the evil teams we can add "Team Rocket" and "Team Aqua" etc. here as well as "Team Rocket Boss" and "Team Aqua Admin" etc. } as const; @@ -112,7 +118,25 @@ export const trainerClasses: SimpleTranslationEntries = { "worker": "Arbeiter", "worker_female": "Arbeiterin", "workers": "Arbeiter", - "youngster": "Knirps" + "youngster": "Knirps", + "rocket_grunt": "Rüpel von Team Rocket", + "rocket_grunt_female": "Rüpel von Team Rocket", + "rocket_grunts": "Rüpel von Team Rocket", + "magma_grunt": "Rüpel von Team Magma", + "magma_grunt_female": "Rüpel von Team Magma", + "magma_grunts": "Rüpel von Team Magma", + "aqua_grunt": "Rüpel von Team Aqua", + "aqua_grunt_female": "Rüpel von Team Aqua", + "aqua_grunts": "Rüpel von Team Aqua", + "galactic_grunt": "Rüpel von Team Galaktik", + "galactic_grunt_female": "Rüpel von Team Galaktik", + "galactic_grunts": "Rüpel von Team Galaktik", + "plasma_grunt": "Rüpel von Team Plasma", + "plasma_grunt_female": "Rüpel von Team Plasma", + "plasma_grunts": "Rüpel von Team Plasma", + "flare_grunt": "Rüpel von Team Flare", + "flare_grunt_female": "Rüpel von Team Flare", + "flare_grunts": "Rüpel von Team Flare", } as const; // Names of special trainers like gym leaders, elite four, and the champion @@ -241,4 +265,9 @@ export const trainerNames: SimpleTranslationEntries = { "leon": "Delion", "rival": "Finn", "rival_female": "Ivy", + "maxie": "Marc", + "archie": "Adrian", + "cyrus": "Zyrus", + "ghetsis": "G-Cis", + "lysandre": "Flordelis", } as const; \ No newline at end of file diff --git a/src/locales/en/trainers.ts b/src/locales/en/trainers.ts index 136da7e7011..893e3efcac3 100644 --- a/src/locales/en/trainers.ts +++ b/src/locales/en/trainers.ts @@ -119,18 +119,18 @@ export const trainerClasses: SimpleTranslationEntries = { "worker_female": "Worker", "workers": "Workers", "youngster": "Youngster", - "rocket_grunt_m": "Rocket Grunt", - "rocket_grunt_f": "Rocket Grunt", - "magma_grunt_m": "Magma Grunt", - "magma_grunt_f": "Magma Grunt", - "aqua_grunt_m": "Aqua Grunt", - "aqua_grunt_f": "Aqua Grunt", - "galactic_grunt_m": "Galactic Grunt", - "galactic_grunt_f": "Galactic Grunt", - "plasma_grunt_m": "Plasma Grunt", - "plasma_grunt_f": "Plasma Grunt", - "flare_grunt_m": "Flare Grunt", - "flare_grunt_f": "Flare Grunt", + "rocket_grunt": "Rocket Grunt", + "rocket_grunt_female": "Rocket Grunt", + "magma_grunt": "Magma Grunt", + "magma_grunt_female": "Magma Grunt", + "aqua_grunt": "Aqua Grunt", + "aqua_grunt_female": "Aqua Grunt", + "galactic_grunt": "Galactic Grunt", + "galactic_grunt_female": "Galactic Grunt", + "plasma_grunt": "Plasma Grunt", + "plasma_grunt_female": "Plasma Grunt", + "flare_grunt": "Flare Grunt", + "flare_grunt_female": "Flare Grunt", } as const; // Names of special trainers like gym leaders, elite four, and the champion