From c9aab45b947e830597d4b5a86441d050be28a19e Mon Sep 17 00:00:00 2001 From: ImperialSympathizer Date: Mon, 29 Jul 2024 19:03:53 -0400 Subject: [PATCH] update visuals loading for safari and stat trainer visuals --- .../mystery-encounters/safari_zone.json | 41 ++ .../images/mystery-encounters/safari_zone.png | Bin 0 -> 1443 bytes public/images/trainer/buck.json | 272 ++++++++++ public/images/trainer/buck.png | Bin 0 -> 1398 bytes public/images/trainer/cheryl.json | 398 +++++++++++++++ public/images/trainer/cheryl.png | Bin 0 -> 1971 bytes public/images/trainer/marley.json | 104 ++++ public/images/trainer/marley.png | Bin 0 -> 1206 bytes public/images/trainer/mira.json | 482 ++++++++++++++++++ public/images/trainer/mira.png | Bin 0 -> 1739 bytes public/images/trainer/riley.json | 461 +++++++++++++++++ public/images/trainer/riley.png | Bin 0 -> 1337 bytes src/data/dialogue.ts | 70 +++ .../encounters/a-trainers-test-encounter.ts | 168 ++++++ .../encounters/absolute-avarice-encounter.ts | 28 +- .../encounters/delibirdy-encounter.ts | 15 +- .../department-store-sale-encounter.ts | 5 +- .../encounters/fiery-fallout-encounter.ts | 14 +- .../encounters/fight-or-flight-encounter.ts | 19 +- .../encounters/lost-at-sea-encounter.ts | 2 +- .../encounters/pokemon-salesman-encounter.ts | 11 +- .../encounters/safari-zone-encounter.ts | 12 +- .../slumbering-snorlax-encounter.ts | 4 +- .../encounters/the-strong-stuff-encounter.ts | 4 +- .../mystery-encounters/mystery-encounter.ts | 18 +- .../mystery-encounters/mystery-encounters.ts | 3 + .../utils/encounter-phase-utils.ts | 2 +- .../utils/encounter-pokemon-utils.ts | 16 +- src/data/trainer-config.ts | 195 ++++++- src/enums/mystery-encounter-type.ts | 3 +- src/enums/trainer-type.ts | 5 + src/field/mystery-encounter-intro.ts | 25 +- src/locales/en/dialogue.ts | 61 +++ src/locales/en/trainers.ts | 5 + src/overrides.ts | 4 +- src/phases.ts | 31 +- 36 files changed, 2401 insertions(+), 77 deletions(-) create mode 100644 public/images/mystery-encounters/safari_zone.json create mode 100644 public/images/mystery-encounters/safari_zone.png create mode 100644 public/images/trainer/buck.json create mode 100644 public/images/trainer/buck.png create mode 100644 public/images/trainer/cheryl.json create mode 100644 public/images/trainer/cheryl.png create mode 100644 public/images/trainer/marley.json create mode 100644 public/images/trainer/marley.png create mode 100644 public/images/trainer/mira.json create mode 100644 public/images/trainer/mira.png create mode 100644 public/images/trainer/riley.json create mode 100644 public/images/trainer/riley.png create mode 100644 src/data/mystery-encounters/encounters/a-trainers-test-encounter.ts diff --git a/public/images/mystery-encounters/safari_zone.json b/public/images/mystery-encounters/safari_zone.json new file mode 100644 index 00000000000..f0c23d43f5a --- /dev/null +++ b/public/images/mystery-encounters/safari_zone.json @@ -0,0 +1,41 @@ +{ + "textures": [ + { + "image": "safarizone.png", + "format": "RGBA8888", + "size": { + "w": 105, + "h": 83 + }, + "scale": 1, + "frames": [ + { + "filename": "safarizone.png", + "rotated": false, + "trimmed": false, + "sourceSize": { + "w": 103, + "h": 81 + }, + "spriteSourceSize": { + "x": 0, + "y": 0, + "w": 103, + "h": 81 + }, + "frame": { + "x": 1, + "y": 1, + "w": 103, + "h": 81 + } + } + ] + } + ], + "meta": { + "app": "https://www.codeandweb.com/texturepacker", + "version": "3.0", + "smartupdate": "$TexturePacker:SmartUpdate:f07e2d44900011048b658765e193a86c:3d91036b9c3943256dd1e4712042ec59:d467a15bea042bd0d310f1cce7d9791f$" + } +} diff --git a/public/images/mystery-encounters/safari_zone.png b/public/images/mystery-encounters/safari_zone.png new file mode 100644 index 0000000000000000000000000000000000000000..03c32d1b955df0ce5a33433072e9b08880c61357 GIT binary patch literal 1443 zcmV;U1zh@xP)q#JlHxAnBYt7FbfEd$HX1PvtO$A z1z4Y=hx51u+N_h7U|EqWNvt!ZTob(X+)UyUhfboCB!K1dSh(6HdHS8RBt)#K$K(Eh zdUVkDlFVjWo)sSVrIwcac~W(fN^k9jPBzmS+(GNFT^ zyXJO1mS;(sYM=$`+yaAVNqO3PiD&5-IPI>JB%W>&W*IM}CrUf}Jvh`)pZwEr#wFquIfIDfv|e&DCX|N|_o+{Ee8yl+zRc%YpAnT0Hs5T0(hyZHKo=nd&4I zN&d=Ni6o@7E0L`O5)zYAv8WPCP)Ig&lvlo$NVGkPR~)|h%MTnxu#f_olqn>eb0ndJ z6yB3CiG*B0s3e&rK~)l0SQU-@Ktei0lA;(%x>tz;#rGsqiCn@;;)zVct%O<*A>yZ! z2iHm*R4-AHI3zqQ@xq`%H4?hykk_8K$QKetJ5op%ODl2iD#^B)=wjHBNF`E9gNj=z zdPuQ}i2>i*qJJYaQhF|>5Iu@U(sGDv=UP5|{u%9#g-PkPBtcaYS}pkMfW0*9ba~M+ z689urCF!X;CXuY}qO4wxggh6weO~SI(<%vPGAW28%brM7dJ22VT8Rdd9rOJ4TT+l2 zOHW~yJ-N2bqE(_=!Xnv`a%nB_a^_`;)@3G@j;SQtkwnw-Q>ktx z?e1C%^jyLskXq9uy@^40%SA$y zaFt>&@%`hrm3oOPDK(NcOptDp*-WC1BtZeStrTl1Z6xX>7s{hbC`X;5ZOJ7luoJCi zb|j^z64sKOdrXpTj$I7;*#mqxL`8~Q3B8Vsq}Pv6B-uUtH6~J#bdOR=h`vTVm+S(t zOost2M5t~J==)6ezLsVchf-d5~q{R3G`rQo|9Y8C(h002ovPDHLkV1mfeo)Q26 literal 0 HcmV?d00001 diff --git a/public/images/trainer/buck.json b/public/images/trainer/buck.json new file mode 100644 index 00000000000..2088fa084f1 --- /dev/null +++ b/public/images/trainer/buck.json @@ -0,0 +1,272 @@ +{ + "textures": [ + { + "image": "buck.png", + "format": "RGBA8888", + "size": { + "w": 120, + "h": 78 + }, + "scale": 1, + "frames": [ + { + "filename": "0001.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 80, + "h": 80 + }, + "spriteSourceSize": { + "x": 33, + "y": 4, + "w": 35, + "h": 76 + }, + "frame": { + "x": 1, + "y": 1, + "w": 35, + "h": 76 + } + }, + { + "filename": "0003.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 80, + "h": 80 + }, + "spriteSourceSize": { + "x": 33, + "y": 4, + "w": 35, + "h": 76 + }, + "frame": { + "x": 1, + "y": 1, + "w": 35, + "h": 76 + } + }, + { + "filename": "0005.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 80, + "h": 80 + }, + "spriteSourceSize": { + "x": 33, + "y": 4, + "w": 35, + "h": 76 + }, + "frame": { + "x": 1, + "y": 1, + "w": 35, + "h": 76 + } + }, + { + "filename": "0007.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 80, + "h": 80 + }, + "spriteSourceSize": { + "x": 33, + "y": 4, + "w": 35, + "h": 76 + }, + "frame": { + "x": 1, + "y": 1, + "w": 35, + "h": 76 + } + }, + { + "filename": "0009.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 80, + "h": 80 + }, + "spriteSourceSize": { + "x": 18, + "y": 8, + "w": 44, + "h": 72 + }, + "frame": { + "x": 38, + "y": 1, + "w": 44, + "h": 72 + } + }, + { + "filename": "00010.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 80, + "h": 80 + }, + "spriteSourceSize": { + "x": 15, + "y": 8, + "w": 44, + "h": 72 + }, + "frame": { + "x": 38, + "y": 1, + "w": 44, + "h": 72 + } + }, + { + "filename": "00011.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 80, + "h": 80 + }, + "spriteSourceSize": { + "x": 13, + "y": 8, + "w": 44, + "h": 72 + }, + "frame": { + "x": 38, + "y": 1, + "w": 44, + "h": 72 + } + }, + { + "filename": "0000.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 80, + "h": 80 + }, + "spriteSourceSize": { + "x": 34, + "y": 5, + "w": 35, + "h": 75 + }, + "frame": { + "x": 84, + "y": 1, + "w": 35, + "h": 75 + } + }, + { + "filename": "0002.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 80, + "h": 80 + }, + "spriteSourceSize": { + "x": 34, + "y": 5, + "w": 35, + "h": 75 + }, + "frame": { + "x": 84, + "y": 1, + "w": 35, + "h": 75 + } + }, + { + "filename": "0004.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 80, + "h": 80 + }, + "spriteSourceSize": { + "x": 34, + "y": 5, + "w": 35, + "h": 75 + }, + "frame": { + "x": 84, + "y": 1, + "w": 35, + "h": 75 + } + }, + { + "filename": "0006.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 80, + "h": 80 + }, + "spriteSourceSize": { + "x": 34, + "y": 5, + "w": 35, + "h": 75 + }, + "frame": { + "x": 84, + "y": 1, + "w": 35, + "h": 75 + } + }, + { + "filename": "0008.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 80, + "h": 80 + }, + "spriteSourceSize": { + "x": 34, + "y": 5, + "w": 35, + "h": 75 + }, + "frame": { + "x": 84, + "y": 1, + "w": 35, + "h": 75 + } + } + ] + } + ], + "meta": { + "app": "https://www.codeandweb.com/texturepacker", + "version": "3.0", + "smartupdate": "$TexturePacker:SmartUpdate:bedd2f8769ba9b1430dc6479e53194f2:49cc02f839fd834c23053d7c92ce9e20:3347efe478119141b0e3e6eccdecd0f5$" + } +} diff --git a/public/images/trainer/buck.png b/public/images/trainer/buck.png new file mode 100644 index 0000000000000000000000000000000000000000..2384fb42a3369b69213b8d718aa1b9db15b965c7 GIT binary patch literal 1398 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 literal 0 HcmV?d00001 diff --git a/public/images/trainer/riley.json b/public/images/trainer/riley.json new file mode 100644 index 00000000000..e29f6e02e24 --- /dev/null +++ b/public/images/trainer/riley.json @@ -0,0 +1,461 @@ +{ + "textures": [ + { + "image": "riley.png", + "format": "RGBA8888", + "size": { + "w": 59, + "h": 246 + }, + "scale": 1, + "frames": [ + { + "filename": "0000.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 80, + "h": 80 + }, + "spriteSourceSize": { + "x": 10, + "y": 0, + "w": 57, + "h": 80 + }, + "frame": { + "x": 1, + "y": 1, + "w": 57, + "h": 80 + } + }, + { + "filename": "0003.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 80, + "h": 80 + }, + "spriteSourceSize": { + "x": 9, + "y": 0, + "w": 57, + "h": 80 + }, + "frame": { + "x": 1, + "y": 1, + "w": 57, + "h": 80 + } + }, + { + "filename": "0004.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 80, + "h": 80 + }, + "spriteSourceSize": { + "x": 10, + "y": 0, + "w": 57, + "h": 80 + }, + "frame": { + "x": 1, + "y": 1, + "w": 57, + "h": 80 + } + }, + { + "filename": "0006.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 80, + "h": 80 + }, + "spriteSourceSize": { + "x": 10, + "y": 0, + "w": 57, + "h": 80 + }, + "frame": { + "x": 1, + "y": 1, + "w": 57, + "h": 80 + } + }, + { + "filename": "0008.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 80, + "h": 80 + }, + "spriteSourceSize": { + "x": 10, + "y": 0, + "w": 57, + "h": 80 + }, + "frame": { + "x": 1, + "y": 1, + "w": 57, + "h": 80 + } + }, + { + "filename": "00010.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 80, + "h": 80 + }, + "spriteSourceSize": { + "x": 10, + "y": 0, + "w": 57, + "h": 80 + }, + "frame": { + "x": 1, + "y": 1, + "w": 57, + "h": 80 + } + }, + { + "filename": "00012.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 80, + "h": 80 + }, + "spriteSourceSize": { + "x": 10, + "y": 0, + "w": 57, + "h": 80 + }, + "frame": { + "x": 1, + "y": 1, + "w": 57, + "h": 80 + } + }, + { + "filename": "00014.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 80, + "h": 80 + }, + "spriteSourceSize": { + "x": 10, + "y": 0, + "w": 57, + "h": 80 + }, + "frame": { + "x": 1, + "y": 1, + "w": 57, + "h": 80 + } + }, + { + "filename": "00016.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 80, + "h": 80 + }, + "spriteSourceSize": { + "x": 10, + "y": 0, + "w": 57, + "h": 80 + }, + "frame": { + "x": 1, + "y": 1, + "w": 57, + "h": 80 + } + }, + { + "filename": "00018.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 80, + "h": 80 + }, + "spriteSourceSize": { + "x": 10, + "y": 0, + "w": 57, + "h": 80 + }, + "frame": { + "x": 1, + "y": 1, + "w": 57, + "h": 80 + } + }, + { + "filename": "00020.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 80, + "h": 80 + }, + "spriteSourceSize": { + "x": 10, + "y": 0, + "w": 57, + "h": 80 + }, + "frame": { + "x": 1, + "y": 1, + "w": 57, + "h": 80 + } + }, + { + "filename": "0005.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 80, + "h": 80 + }, + "spriteSourceSize": { + "x": 11, + "y": 0, + "w": 56, + "h": 80 + }, + "frame": { + "x": 1, + "y": 83, + "w": 56, + "h": 80 + } + }, + { + "filename": "0007.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 80, + "h": 80 + }, + "spriteSourceSize": { + "x": 11, + "y": 0, + "w": 56, + "h": 80 + }, + "frame": { + "x": 1, + "y": 83, + "w": 56, + "h": 80 + } + }, + { + "filename": "0009.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 80, + "h": 80 + }, + "spriteSourceSize": { + "x": 11, + "y": 0, + "w": 56, + "h": 80 + }, + "frame": { + "x": 1, + "y": 83, + "w": 56, + "h": 80 + } + }, + { + "filename": "00011.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 80, + "h": 80 + }, + "spriteSourceSize": { + "x": 11, + "y": 0, + "w": 56, + "h": 80 + }, + "frame": { + "x": 1, + "y": 83, + "w": 56, + "h": 80 + } + }, + { + "filename": "00013.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 80, + "h": 80 + }, + "spriteSourceSize": { + "x": 11, + "y": 0, + "w": 56, + "h": 80 + }, + "frame": { + "x": 1, + "y": 83, + "w": 56, + "h": 80 + } + }, + { + "filename": "00015.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 80, + "h": 80 + }, + "spriteSourceSize": { + "x": 11, + "y": 0, + "w": 56, + "h": 80 + }, + "frame": { + "x": 1, + "y": 83, + "w": 56, + "h": 80 + } + }, + { + "filename": "00017.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 80, + "h": 80 + }, + "spriteSourceSize": { + "x": 11, + "y": 0, + "w": 56, + "h": 80 + }, + "frame": { + "x": 1, + "y": 83, + "w": 56, + "h": 80 + } + }, + { + "filename": "00019.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 80, + "h": 80 + }, + "spriteSourceSize": { + "x": 11, + "y": 0, + "w": 56, + "h": 80 + }, + "frame": { + "x": 1, + "y": 83, + "w": 56, + "h": 80 + } + }, + { + "filename": "0001.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 80, + "h": 80 + }, + "spriteSourceSize": { + "x": 30, + "y": 0, + "w": 39, + "h": 80 + }, + "frame": { + "x": 1, + "y": 165, + "w": 39, + "h": 80 + } + }, + { + "filename": "0002.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 80, + "h": 80 + }, + "spriteSourceSize": { + "x": 29, + "y": 0, + "w": 39, + "h": 80 + }, + "frame": { + "x": 1, + "y": 165, + "w": 39, + "h": 80 + } + } + ] + } + ], + "meta": { + "app": "https://www.codeandweb.com/texturepacker", + "version": "3.0", + "smartupdate": "$TexturePacker:SmartUpdate:d0f27c1a776dc776dbc730ec409fafad:7a665e1bfee26403e5d49912c4dad042:cb98d9ba5e960a1d670368dad1073434$" + } +} diff --git a/public/images/trainer/riley.png b/public/images/trainer/riley.png new file mode 100644 index 0000000000000000000000000000000000000000..dd5d3bdd8c9953bb32b87d1ea44842b7d73fba85 GIT binary patch literal 1337 zcmV-91;+Y`P)6aJ|Og8UO$Q0d!JM zQvg8b*k%9#010qNS#tmY3ljhU3ljkVnw%H_00gB;L_t(&-tC(0mYg6AKuJJ%Se$wP z$88csQ9%j2KiX3`+taN(cN4>ha*Huf%~CU+?FX#2(=;K_cl5`p$w_GI3|LU0)84>= zRj@gVfEv``o-$I>7IiGqxHkTWg97e-fd$-~i#H7g(7*i+>uiN2j=%zob`LmB7E1XF z9L_M^;9g}0xn4y$_%~Gg$2x>>$)H##AGpzPKB5#2=_`E05?nx+{d~`uK*oJWL(GzY zCAbjY5adcRE`8Bm1NEle%M1|sGPrlSPz(nNObLLbnkF3>kgL?7Tqr5?nqsPtbL(_t znEC*uvr8~|xk1c^zN7Ky;(c=+9*3{Q-ui|{GW8Cn%EfLQ{~69>|LY5+wN9Tbdq?nx z(4d%o8%`{Ks23b4XcKd%in%~x=`RgzI5yuhp@CS`!Hy;_mkU44T2f9Y&y;rwAxvT%2yJuG!nD?4AJ(8OqsOCOxC?A$zc!Snseps?A<&TeTTfJks00mjk?mn>MSNq-6;UWQ7zoYBO+2 zo0aQCEH%iwVb^Aky%}q>f^y@G7mm9G5B5bv_^i#|G#(L($}PqXi@>oq(?y$A7XwK- zEL3lZ1-fXnnsSpegD6H!)xB!7igJt2Ev~;dbxwyilWon~u^rkh^JYET%nWTdwAs*R zLz@k4HniE$W<#3|Z8o&o&}KuM4Q=+HX)}HR_1dl}L?}518G(@xqfSD{f|1hxvHGtoE8M=`8FLeD;5}<4w#)$*38&?!0f_W+4E@*m~As4`fb@i=}cL6?6Aj_ znSv?nIH0zfGE|8pQDwU+Q*NgK52j41GmfUrYC^-olxfTWwSy^Jx1p`@!IY& { + const encounter = scene.currentBattle.mysteryEncounter; + + // Randomly pick from 1 of the 5 stat trainers to spawn + let trainerType: TrainerType; + let spriteKeys; + switch (randSeedInt(5)) { + default: + case 0: + trainerType = TrainerType.BUCK; + spriteKeys = getSpriteKeysFromSpecies(Species.CLAYDOL); + break; + case 1: + trainerType = TrainerType.CHERYL; + spriteKeys = getSpriteKeysFromSpecies(Species.BLISSEY); + break; + case 2: + trainerType = TrainerType.MARLEY; + spriteKeys = getSpriteKeysFromSpecies(Species.ARCANINE); + break; + case 3: + trainerType = TrainerType.MIRA; + spriteKeys = getSpriteKeysFromSpecies(Species.ALAKAZAM, false, 1); + break; + case 4: + trainerType = TrainerType.RILEY; + spriteKeys = getSpriteKeysFromSpecies(Species.LUCARIO, false, 1); + break; + } + + encounter.misc = { trainerType }; + const trainerConfig = trainerConfigs[trainerType].copy(); + const trainerSpriteKey = trainerConfig.getSpriteKey(); + encounter.enemyPartyConfigs.push({ + levelAdditiveMultiplier: 1, + trainerConfig: trainerConfig + }); + + encounter.spriteConfigs = [ + { + spriteKey: spriteKeys.spriteKey, + fileRoot: spriteKeys.fileRoot, + hasShadow: true, + repeat: true, + isPokemon: true + }, + { + spriteKey: trainerSpriteKey, + fileRoot: "trainer", + hasShadow: true, + disableAnimation: true + } + ]; + + return true; + }) + .withTitle(`${namespace}:title`) + .withDescription(`${namespace}:description`) + .withQuery(`${namespace}:query`) + .withSimpleOption( + { + buttonLabel: `${namespace}:option:1:label`, + buttonTooltip: `${namespace}:option:1:tooltip`, + selected: [ + { + text: `${namespace}:option:selected`, + }, + ], + }, + async (scene: BattleScene) => { + const encounter = scene.currentBattle.mysteryEncounter; + // Spawn standard trainer battle with memory mushroom reward + const config: EnemyPartyConfig = encounter.enemyPartyConfigs[0]; + + setEncounterRewards(scene, { guaranteedModifierTypeFuncs: [modifierTypes.TM_COMMON, modifierTypes.TM_GREAT, modifierTypes.MEMORY_MUSHROOM], fillRemaining: true }); + return initBattleWithEnemyConfig(scene, config); + } + ) + .withSimpleOption( + { + buttonLabel: `${namespace}:option:2:label`, + buttonTooltip: `${namespace}:option:2:tooltip`, + selected: [ + { + text: `${namespace}:option:selected`, + }, + ], + }, + async (scene: BattleScene) => { + const encounter = scene.currentBattle.mysteryEncounter; + // Spawn hard fight with ULTRA/GREAT reward (can improve with luck) + const config: EnemyPartyConfig = encounter.enemyPartyConfigs[1]; + + setEncounterRewards(scene, { guaranteedModifierTiers: [ModifierTier.ULTRA, ModifierTier.ULTRA, ModifierTier.GREAT, ModifierTier.GREAT], fillRemaining: true }); + + // Seed offsets to remove possibility of different trainers having exact same teams + let ret; + scene.executeWithSeedOffset(() => { + ret = initBattleWithEnemyConfig(scene, config); + }, scene.currentBattle.waveIndex * 100); + return ret; + } + ) + .withSimpleOption( + { + buttonLabel: `${namespace}:option:3:label`, + buttonTooltip: `${namespace}:option:3:tooltip`, + selected: [ + { + text: `${namespace}:option:selected`, + }, + ], + }, + async (scene: BattleScene) => { + const encounter = scene.currentBattle.mysteryEncounter; + // Spawn brutal fight with ROGUE/ULTRA/GREAT reward (can improve with luck) + const config: EnemyPartyConfig = encounter.enemyPartyConfigs[2]; + + // To avoid player level snowballing from picking this option + encounter.expMultiplier = 0.9; + + setEncounterRewards(scene, { guaranteedModifierTiers: [ModifierTier.ROGUE, ModifierTier.ROGUE, ModifierTier.ULTRA, ModifierTier.GREAT], fillRemaining: true }); + + // Seed offsets to remove possibility of different trainers having exact same teams + let ret; + scene.executeWithSeedOffset(() => { + ret = initBattleWithEnemyConfig(scene, config); + }, scene.currentBattle.waveIndex * 1000); + return ret; + } + ) + .withOutroDialogue([ + { + text: `${namespace}:outro`, + }, + ]) + .build(); diff --git a/src/data/mystery-encounters/encounters/absolute-avarice-encounter.ts b/src/data/mystery-encounters/encounters/absolute-avarice-encounter.ts index 2b379bdba86..bd39c586ad9 100644 --- a/src/data/mystery-encounters/encounters/absolute-avarice-encounter.ts +++ b/src/data/mystery-encounters/encounters/absolute-avarice-encounter.ts @@ -1,5 +1,5 @@ import { EnemyPartyConfig, generateModifierTypeOption, initBattleWithEnemyConfig, leaveEncounterWithoutBattle, setEncounterRewards, transitionMysteryEncounterIntroVisuals, } from "#app/data/mystery-encounters/utils/encounter-phase-utils"; -import Pokemon, { PokemonMove } from "#app/field/pokemon"; +import Pokemon, { EnemyPokemon, PokemonMove } from "#app/field/pokemon"; import { BerryModifierType, modifierTypes, PokemonHeldItemModifierType } from "#app/modifier/modifier-type"; import { MysteryEncounterType } from "#enums/mystery-encounter-type"; import { Species } from "#enums/species"; @@ -37,18 +37,20 @@ export const AbsoluteAvariceEncounter: IMysteryEncounter = .withSceneRequirement(new PersistentModifierRequirement("BerryModifier", 4)) // Must have at least 4 berries to spawn .withIntroSpriteConfigs([ { - spriteKey: Species.GREEDENT.toString(), - fileRoot: "pokemon", - hasShadow: false, + // This sprite has the shadow + spriteKey: null, + fileRoot: null, + species: Species.GREEDENT, + hasShadow: true, + alpha: 0.001, repeat: true, x: -5 }, { - // This sprite has the shadow - spriteKey: Species.GREEDENT.toString(), - fileRoot: "pokemon", - hasShadow: true, - alpha: 0.001, + spriteKey: null, + fileRoot: null, + species: Species.GREEDENT, + hasShadow: false, repeat: true, x: -5 }, @@ -328,7 +330,7 @@ export const AbsoluteAvariceEncounter: IMysteryEncounter = // Let it have the food // Greedent joins the team, level equal to 2 below highest party member const level = getHighestLevelPlayerPokemon(scene).level - 2; - const greedent = scene.addEnemyPokemon(getPokemonSpecies(Species.GREEDENT), level, TrainerSlot.NONE, false); + const greedent = new EnemyPokemon(scene, getPokemonSpecies(Species.GREEDENT), level, TrainerSlot.NONE, false, null); greedent.moveset = [new PokemonMove(Moves.THRASH), new PokemonMove(Moves.BODY_PRESS), new PokemonMove(Moves.STUFF_CHEEKS), new PokemonMove(Moves.SLACK_OFF)]; greedent.passive = true; @@ -344,7 +346,7 @@ function doGreedentSpriteSteal(scene: BattleScene) { const shakeDelay = 50; const slideDelay = 500; - const greedentSprites = scene.currentBattle.mysteryEncounter.introVisuals.getSpriteAtIndex(0); + const greedentSprites = scene.currentBattle.mysteryEncounter.introVisuals.getSpriteAtIndex(1); scene.playSound("Follow Me"); scene.tweens.chain({ @@ -418,7 +420,7 @@ function doGreedentSpriteSteal(scene: BattleScene) { } function doGreedentEatBerries(scene: BattleScene) { - const greedentSprites = scene.currentBattle.mysteryEncounter.introVisuals.getSpriteAtIndex(0); + const greedentSprites = scene.currentBattle.mysteryEncounter.introVisuals.getSpriteAtIndex(1); let index = 1; scene.tweens.add({ targets: greedentSprites, @@ -452,7 +454,7 @@ function doBerrySpritePile(scene: BattleScene, isEat: boolean = false) { } const encounter = scene.currentBattle.mysteryEncounter; animationOrder.forEach((berry, i) => { - const introVisualsIndex = encounter.spriteConfigs.findIndex(config => config.spriteKey.includes(berry)); + const introVisualsIndex = encounter.spriteConfigs.findIndex(config => config.spriteKey?.includes(berry)); const [ sprite, tintSprite ] = encounter.introVisuals.getSpriteAtIndex(introVisualsIndex); scene.time.delayedCall(berryAddDelay * i + 400, () => { if (sprite) { diff --git a/src/data/mystery-encounters/encounters/delibirdy-encounter.ts b/src/data/mystery-encounters/encounters/delibirdy-encounter.ts index c1c3fb8c3c8..7d1e7a61035 100644 --- a/src/data/mystery-encounters/encounters/delibirdy-encounter.ts +++ b/src/data/mystery-encounters/encounters/delibirdy-encounter.ts @@ -47,23 +47,26 @@ export const DelibirdyEncounter: IMysteryEncounter = )) .withIntroSpriteConfigs([ { - spriteKey: Species.DELIBIRD.toString(), - fileRoot: "pokemon", + spriteKey: null, + fileRoot: null, + species: Species.DELIBIRD, hasShadow: true, repeat: true, startFrame: 38, scale: 0.94 }, { - spriteKey: Species.DELIBIRD.toString(), - fileRoot: "pokemon", + spriteKey: null, + fileRoot: null, + species: Species.DELIBIRD, hasShadow: true, repeat: true, scale: 1.06 }, { - spriteKey: Species.DELIBIRD.toString(), - fileRoot: "pokemon", + spriteKey: null, + fileRoot: null, + species: Species.DELIBIRD, hasShadow: true, repeat: true, startFrame: 65, diff --git a/src/data/mystery-encounters/encounters/department-store-sale-encounter.ts b/src/data/mystery-encounters/encounters/department-store-sale-encounter.ts index 610b836ef9e..65873941bd5 100644 --- a/src/data/mystery-encounters/encounters/department-store-sale-encounter.ts +++ b/src/data/mystery-encounters/encounters/department-store-sale-encounter.ts @@ -32,8 +32,9 @@ export const DepartmentStoreSaleEncounter: IMysteryEncounter = x: -20, }, { - spriteKey: Species.FURFROU.toString(), - fileRoot: "pokemon", + spriteKey: null, + fileRoot: null, + species: Species.FURFROU, hasShadow: true, repeat: true, x: 30, diff --git a/src/data/mystery-encounters/encounters/fiery-fallout-encounter.ts b/src/data/mystery-encounters/encounters/fiery-fallout-encounter.ts index c7933129ff9..20d113bf940 100644 --- a/src/data/mystery-encounters/encounters/fiery-fallout-encounter.ts +++ b/src/data/mystery-encounters/encounters/fiery-fallout-encounter.ts @@ -1,5 +1,5 @@ import { MysteryEncounterOptionBuilder } from "#app/data/mystery-encounters/mystery-encounter-option"; -import { EnemyPartyConfig, generateModifierTypeOption, initBattleWithEnemyConfig, initCustomMovesForEncounter, leaveEncounterWithoutBattle, setEncounterExp, setEncounterRewards, transitionMysteryEncounterIntroVisuals } from "#app/data/mystery-encounters/utils/encounter-phase-utils"; +import { EnemyPartyConfig, generateModifierTypeOption, initBattleWithEnemyConfig, loadCustomMovesForEncounter, leaveEncounterWithoutBattle, setEncounterExp, setEncounterRewards, transitionMysteryEncounterIntroVisuals } from "#app/data/mystery-encounters/utils/encounter-phase-utils"; import { AttackTypeBoosterModifierType, modifierTypes, } from "#app/modifier/modifier-type"; import { MysteryEncounterType } from "#enums/mystery-encounter-type"; import BattleScene from "#app/battle-scene"; @@ -75,8 +75,9 @@ export const FieryFalloutEncounter: IMysteryEncounter = // Load hidden Volcarona sprites encounter.spriteConfigs = [ { - spriteKey: volcaronaSpecies.getSpriteId(false), - fileRoot: "pokemon", + spriteKey: null, + fileRoot: null, + species: Species.VOLCARONA, repeat: true, hidden: true, hasShadow: true, @@ -84,8 +85,9 @@ export const FieryFalloutEncounter: IMysteryEncounter = startFrame: 20 }, { - spriteKey: volcaronaSpecies.getSpriteId(true ), - fileRoot: "pokemon", + spriteKey: null, + fileRoot: null, + species: Species.VOLCARONA, repeat: true, hidden: true, hasShadow: true, @@ -94,7 +96,7 @@ export const FieryFalloutEncounter: IMysteryEncounter = ]; // Load animations/sfx for Volcarona moves - initCustomMovesForEncounter(scene, [Moves.FIRE_SPIN, Moves.QUIVER_DANCE]); + loadCustomMovesForEncounter(scene, [Moves.FIRE_SPIN, Moves.QUIVER_DANCE]); scene.arena.trySetWeather(WeatherType.SUNNY, true); diff --git a/src/data/mystery-encounters/encounters/fight-or-flight-encounter.ts b/src/data/mystery-encounters/encounters/fight-or-flight-encounter.ts index 77ef97ace84..55e31406cdb 100644 --- a/src/data/mystery-encounters/encounters/fight-or-flight-encounter.ts +++ b/src/data/mystery-encounters/encounters/fight-or-flight-encounter.ts @@ -7,7 +7,7 @@ import { setEncounterRewards } from "#app/data/mystery-encounters/utils/encounter-phase-utils"; import { STEALING_MOVES } from "#app/data/mystery-encounters/requirements/requirement-groups"; -import Pokemon from "#app/field/pokemon"; +import Pokemon, { EnemyPokemon } from "#app/field/pokemon"; import { ModifierTier } from "#app/modifier/modifier-tier"; import { getPartyLuckValue, @@ -27,6 +27,9 @@ import { queueEncounterMessage, showEncounterText } from "#app/data/mystery-enco import { getPokemonNameWithAffix } from "#app/messages"; import { MysteryEncounterTier } from "#enums/mystery-encounter-tier"; import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode"; +import { TrainerSlot } from "#app/data/trainer-config"; +import { getSpriteKeysFromPokemon } from "#app/data/mystery-encounters/utils/encounter-pokemon-utils"; +import PokemonData from "#app/system/pokemon-data"; /** the i18n namespace for the encounter */ const namespace = "mysteryEncounter:fightOrFlight"; @@ -53,9 +56,14 @@ export const FightOrFlightEncounter: IMysteryEncounter = // Calculate boss mon const bossSpecies = scene.arena.randomSpecies(scene.currentBattle.waveIndex, scene.currentBattle.waveIndex, 0, getPartyLuckValue(scene.getParty()), true); + const bossPokemon = new EnemyPokemon(scene, bossSpecies, scene.currentBattle.waveIndex, TrainerSlot.NONE, true, null); const config: EnemyPartyConfig = { levelAdditiveMultiplier: 1, - pokemonConfigs: [{ species: bossSpecies, isBoss: true }], + pokemonConfigs: [{ + species: bossSpecies, + dataSource: new PokemonData(bossPokemon), + isBoss: true + }], }; encounter.enemyPartyConfigs = [config]; @@ -74,7 +82,7 @@ export const FightOrFlightEncounter: IMysteryEncounter = encounter.setDialogueToken("itemName", item.type.name); encounter.misc = item; - const bossSpriteKey = bossSpecies.getSpriteId(false, bossSpecies.forms ? 0 : null, false, bossSpecies.hasVariants() ? 0 : null); + const { spriteKey, fileRoot } = getSpriteKeysFromPokemon(bossPokemon); encounter.spriteConfigs = [ { spriteKey: item.type.iconImage, @@ -87,12 +95,13 @@ export const FightOrFlightEncounter: IMysteryEncounter = disableAnimation: true }, { - spriteKey: bossSpriteKey, - fileRoot: "pokemon", + spriteKey: spriteKey, + fileRoot: fileRoot, hasShadow: true, tint: 0.25, x: -5, repeat: true, + isPokemon: true }, ]; diff --git a/src/data/mystery-encounters/encounters/lost-at-sea-encounter.ts b/src/data/mystery-encounters/encounters/lost-at-sea-encounter.ts index a4e47311f43..40c913584bd 100644 --- a/src/data/mystery-encounters/encounters/lost-at-sea-encounter.ts +++ b/src/data/mystery-encounters/encounters/lost-at-sea-encounter.ts @@ -31,8 +31,8 @@ export const LostAtSeaEncounter: MysteryEncounter = MysteryEncounterBuilder.with .withSceneWaveRangeRequirement(11, 179) .withIntroSpriteConfigs([ { - fileRoot: "mystery-encounters", spriteKey: "buoy", + fileRoot: "mystery-encounters", hasShadow: false, x: 20, y: 3, diff --git a/src/data/mystery-encounters/encounters/pokemon-salesman-encounter.ts b/src/data/mystery-encounters/encounters/pokemon-salesman-encounter.ts index d1750119add..b0cbb454042 100644 --- a/src/data/mystery-encounters/encounters/pokemon-salesman-encounter.ts +++ b/src/data/mystery-encounters/encounters/pokemon-salesman-encounter.ts @@ -4,7 +4,7 @@ import { MysteryEncounterType } from "#enums/mystery-encounter-type"; import BattleScene from "#app/battle-scene"; import IMysteryEncounter, { MysteryEncounterBuilder } from "../mystery-encounter"; import { MoneyRequirement } from "../mystery-encounter-requirements"; -import { catchPokemon, getRandomSpeciesByStarterTier } from "#app/data/mystery-encounters/utils/encounter-pokemon-utils"; +import { catchPokemon, getRandomSpeciesByStarterTier, getSpriteKeysFromPokemon } from "#app/data/mystery-encounters/utils/encounter-pokemon-utils"; import { getPokemonSpecies, speciesStarters } from "#app/data/pokemon-species"; import { Species } from "#enums/species"; import { PokeballType } from "#app/data/pokeball"; @@ -66,17 +66,16 @@ export const PokemonSalesmanEncounter: IMysteryEncounter = // If no HA mon found or you roll 1%, give shiny Magikarp species = getPokemonSpecies(Species.MAGIKARP); const hiddenIndex = species.ability2 ? 2 : 1; - pokemon = scene.addPlayerPokemon(species, 5, hiddenIndex, species.formIndex, null, true); + pokemon = new PlayerPokemon(scene, species, 5, hiddenIndex, species.formIndex, null, true, null, null, null, null); } else { const hiddenIndex = species.ability2 ? 2 : 1; - pokemon = scene.addPlayerPokemon(species, 5, hiddenIndex, species.formIndex); + pokemon = new PlayerPokemon(scene, species, 5, hiddenIndex, species.formIndex, null, null, null, null, null, null); } - const spriteKey = pokemon.getSpriteId(); - const spriteRoot = pokemon.getSpriteAtlasPath(); + const { spriteKey, fileRoot } = getSpriteKeysFromPokemon(pokemon); encounter.spriteConfigs.push({ spriteKey: spriteKey, - fileRoot: spriteRoot, + fileRoot: fileRoot, hasShadow: true, repeat: true, isPokemon: true diff --git a/src/data/mystery-encounters/encounters/safari-zone-encounter.ts b/src/data/mystery-encounters/encounters/safari-zone-encounter.ts index 7ca2e991305..d193b5a5d00 100644 --- a/src/data/mystery-encounters/encounters/safari-zone-encounter.ts +++ b/src/data/mystery-encounters/encounters/safari-zone-encounter.ts @@ -36,12 +36,11 @@ export const SafariZoneEncounter: IMysteryEncounter = .withSceneRequirement(new MoneyRequirement(0, 2.75)) // Cost equal to 1 Max Revive .withIntroSpriteConfigs([ { - spriteKey: "chest_blue", + spriteKey: "safari_zone", fileRoot: "mystery-encounters", - hasShadow: true, + hasShadow: false, x: 4, - y: 10, - yShadow: 3 + y: 6 }, ]) .withIntroDialogue([ @@ -52,6 +51,11 @@ export const SafariZoneEncounter: IMysteryEncounter = .withTitle(`${namespace}:title`) .withDescription(`${namespace}:description`) .withQuery(`${namespace}:query`) + // .withEnterIntroVisualsFromRight(true) + // .withOnVisualsStart((scene: BattleScene) => { + // scene.setFieldScale(0.9); + // return true; + // }) .withOption(new MysteryEncounterOptionBuilder() .withOptionMode(MysteryEncounterOptionMode.DISABLED_OR_DEFAULT) .withSceneRequirement(new MoneyRequirement(0, 2.75)) // Cost equal to 1 Max Revive diff --git a/src/data/mystery-encounters/encounters/slumbering-snorlax-encounter.ts b/src/data/mystery-encounters/encounters/slumbering-snorlax-encounter.ts index 316416e3809..dd3a2057502 100644 --- a/src/data/mystery-encounters/encounters/slumbering-snorlax-encounter.ts +++ b/src/data/mystery-encounters/encounters/slumbering-snorlax-encounter.ts @@ -7,7 +7,7 @@ import { StatusEffect } from "#app/data/status-effect"; import IMysteryEncounter, { MysteryEncounterBuilder } from "../mystery-encounter"; import { MysteryEncounterOptionBuilder } from "../mystery-encounter-option"; import { MoveRequirement } from "../mystery-encounter-requirements"; -import { EnemyPartyConfig, EnemyPokemonConfig, initBattleWithEnemyConfig, initCustomMovesForEncounter, leaveEncounterWithoutBattle, setEncounterExp, setEncounterRewards, } from "../utils/encounter-phase-utils"; +import { EnemyPartyConfig, EnemyPokemonConfig, initBattleWithEnemyConfig, loadCustomMovesForEncounter, leaveEncounterWithoutBattle, setEncounterExp, setEncounterRewards, } from "../utils/encounter-phase-utils"; import { queueEncounterMessage } from "#app/data/mystery-encounters/utils/encounter-dialogue-utils"; import { Moves } from "#enums/moves"; import { BattlerIndex } from "#app/battle"; @@ -66,7 +66,7 @@ export const SlumberingSnorlaxEncounter: IMysteryEncounter = encounter.enemyPartyConfigs = [config]; // Load animations/sfx for Snorlax fight start moves - initCustomMovesForEncounter(scene, [Moves.SNORE]); + loadCustomMovesForEncounter(scene, [Moves.SNORE]); return true; }) diff --git a/src/data/mystery-encounters/encounters/the-strong-stuff-encounter.ts b/src/data/mystery-encounters/encounters/the-strong-stuff-encounter.ts index 34967112a72..f92e33683d6 100644 --- a/src/data/mystery-encounters/encounters/the-strong-stuff-encounter.ts +++ b/src/data/mystery-encounters/encounters/the-strong-stuff-encounter.ts @@ -1,4 +1,4 @@ -import { EnemyPartyConfig, generateModifierTypeOption, initBattleWithEnemyConfig, initCustomMovesForEncounter, leaveEncounterWithoutBattle, setEncounterRewards, transitionMysteryEncounterIntroVisuals } from "#app/data/mystery-encounters/utils/encounter-phase-utils"; +import { EnemyPartyConfig, generateModifierTypeOption, initBattleWithEnemyConfig, loadCustomMovesForEncounter, leaveEncounterWithoutBattle, setEncounterRewards, transitionMysteryEncounterIntroVisuals } from "#app/data/mystery-encounters/utils/encounter-phase-utils"; import { modifierTypes, PokemonHeldItemModifierType, } from "#app/modifier/modifier-type"; import { MysteryEncounterType } from "#enums/mystery-encounter-type"; import BattleScene from "#app/battle-scene"; @@ -91,7 +91,7 @@ export const TheStrongStuffEncounter: IMysteryEncounter = encounter.enemyPartyConfigs = [config]; - initCustomMovesForEncounter(scene, [Moves.GASTRO_ACID, Moves.STEALTH_ROCK]); + loadCustomMovesForEncounter(scene, [Moves.GASTRO_ACID, Moves.STEALTH_ROCK]); return true; }) diff --git a/src/data/mystery-encounters/mystery-encounter.ts b/src/data/mystery-encounters/mystery-encounter.ts index 502d84d9124..8eababcfdeb 100644 --- a/src/data/mystery-encounters/mystery-encounter.ts +++ b/src/data/mystery-encounters/mystery-encounter.ts @@ -47,6 +47,7 @@ export default interface IMysteryEncounter { encounterAnimations?: EncounterAnim[]; hideBattleIntroMessage?: boolean; autoHideIntroVisuals?: boolean; + enterIntroVisualsFromRight?: boolean; catchAllowed?: boolean; maxAllowedEncounters?: number; @@ -159,14 +160,15 @@ export default class IMysteryEncounter implements IMysteryEncounter { if (!isNullOrUndefined(encounter)) { Object.assign(this, encounter); } - this.encounterTier = !isNullOrUndefined(this.encounterTier) ? this.encounterTier : MysteryEncounterTier.COMMON; + this.encounterTier = this.encounterTier ?? MysteryEncounterTier.COMMON; this.dialogue = this.dialogue ?? {}; // Default max is 1 for ROGUE encounters, 3 for others this.maxAllowedEncounters = this.maxAllowedEncounters ?? this.encounterTier === MysteryEncounterTier.ROGUE ? 1 : 3; this.encounterMode = MysteryEncounterMode.DEFAULT; this.requirements = this.requirements ? this.requirements : []; - this.hideBattleIntroMessage = !isNullOrUndefined(this.hideBattleIntroMessage) ? this.hideBattleIntroMessage : false; - this.autoHideIntroVisuals = !isNullOrUndefined(this.autoHideIntroVisuals) ? this.autoHideIntroVisuals : true; + this.hideBattleIntroMessage = this.hideBattleIntroMessage ?? false; + this.autoHideIntroVisuals = this.autoHideIntroVisuals ?? true; + this.enterIntroVisualsFromRight = this.enterIntroVisualsFromRight ?? false; // Reset any dirty flags or encounter data this.startOfBattleEffectsComplete = false; @@ -414,6 +416,7 @@ export class MysteryEncounterBuilder implements Partial { hideBattleIntroMessage?: boolean; hideIntroVisuals?: boolean; + enterIntroVisualsFromRight?: boolean; enemyPartyConfigs?: EnemyPartyConfig[] = []; /** @@ -717,6 +720,15 @@ export class MysteryEncounterBuilder implements Partial { return Object.assign(this, { autoHideIntroVisuals: autoHideIntroVisuals }); } + /** + * @param enterIntroVisualsFromRight - If true, will slide in intro visuals from the right side of the screen. If false, slides in from left, as normal + * Default false + * @returns + */ + withEnterIntroVisualsFromRight(enterIntroVisualsFromRight: boolean): this & Required> { + return Object.assign(this, { enterIntroVisualsFromRight: enterIntroVisualsFromRight }); + } + /** * Add a title for the encounter * diff --git a/src/data/mystery-encounters/mystery-encounters.ts b/src/data/mystery-encounters/mystery-encounters.ts index c41fd8dfe53..68f01220793 100644 --- a/src/data/mystery-encounters/mystery-encounters.ts +++ b/src/data/mystery-encounters/mystery-encounters.ts @@ -18,6 +18,7 @@ import { PokemonSalesmanEncounter } from "#app/data/mystery-encounters/encounter import { OfferYouCantRefuseEncounter } from "#app/data/mystery-encounters/encounters/offer-you-cant-refuse-encounter"; import { DelibirdyEncounter } from "#app/data/mystery-encounters/encounters/delibirdy-encounter"; import { AbsoluteAvariceEncounter } from "#app/data/mystery-encounters/encounters/absolute-avarice-encounter"; +import { ATrainersTestEncounter } from "#app/data/mystery-encounters/encounters/a-trainers-test-encounter"; // Spawn chance: (BASE_MYSTERY_ENCOUNTER_SPAWN_WEIGHT + WIGHT_INCREMENT_ON_SPAWN_MISS * ) / 256 export const BASE_MYSTERY_ENCOUNTER_SPAWN_WEIGHT = 1; @@ -154,6 +155,7 @@ const anyBiomeEncounters: MysteryEncounterType[] = [ MysteryEncounterType.MYSTERIOUS_CHEST, MysteryEncounterType.TRAINING_SESSION, MysteryEncounterType.DELIBIRDY, + MysteryEncounterType.A_TRAINERS_TEST ]; /** @@ -240,6 +242,7 @@ export function initMysteryEncounters() { allMysteryEncounters[MysteryEncounterType.OFFER_YOU_CANT_REFUSE] = OfferYouCantRefuseEncounter; allMysteryEncounters[MysteryEncounterType.DELIBIRDY] = DelibirdyEncounter; allMysteryEncounters[MysteryEncounterType.ABSOLUTE_AVARICE] = AbsoluteAvariceEncounter; + allMysteryEncounters[MysteryEncounterType.A_TRAINERS_TEST] = ATrainersTestEncounter; // Add extreme encounters to biome map extremeBiomeEncounters.forEach(encounter => { diff --git a/src/data/mystery-encounters/utils/encounter-phase-utils.ts b/src/data/mystery-encounters/utils/encounter-phase-utils.ts index 9fa24106417..21f54059828 100644 --- a/src/data/mystery-encounters/utils/encounter-phase-utils.ts +++ b/src/data/mystery-encounters/utils/encounter-phase-utils.ts @@ -305,7 +305,7 @@ export async function initBattleWithEnemyConfig(scene: BattleScene, partyConfig: * @param scene * @param moves */ -export function initCustomMovesForEncounter(scene: BattleScene, moves: Moves | Moves[]) { +export function loadCustomMovesForEncounter(scene: BattleScene, moves: Moves | Moves[]) { moves = Array.isArray(moves) ? moves : [moves]; return Promise.all(moves.map(move => initMoveAnim(scene, move))) .then(() => loadMoveAnimAssets(scene, moves)); diff --git a/src/data/mystery-encounters/utils/encounter-pokemon-utils.ts b/src/data/mystery-encounters/utils/encounter-pokemon-utils.ts index edfb72e6611..e3dd3106aeb 100644 --- a/src/data/mystery-encounters/utils/encounter-pokemon-utils.ts +++ b/src/data/mystery-encounters/utils/encounter-pokemon-utils.ts @@ -3,7 +3,7 @@ import i18next from "i18next"; import { isNullOrUndefined, randSeedInt } from "#app/utils"; import { PokemonHeldItemModifier } from "#app/modifier/modifier"; import { VictoryPhase } from "#app/phases"; -import { EnemyPokemon, PlayerPokemon } from "#app/field/pokemon"; +import Pokemon, { EnemyPokemon, PlayerPokemon } from "#app/field/pokemon"; import { doPokeballBounceAnim, getPokeballAtlasKey, getPokeballCatchMultiplier, getPokeballTintColor, PokeballType } from "#app/data/pokeball"; import { PlayerGender } from "#enums/player-gender"; import { addPokeballCaptureStars, addPokeballOpenParticles } from "#app/field/anims"; @@ -18,11 +18,25 @@ import PokemonSpecies, { getPokemonSpecies, speciesStarters } from "#app/data/po import { queueEncounterMessage, showEncounterText } from "#app/data/mystery-encounters/utils/encounter-dialogue-utils"; import { getPokemonNameWithAffix } from "#app/messages"; import { modifierTypes, PokemonHeldItemModifierType } from "#app/modifier/modifier-type"; +import { Gender } from "#app/data/gender"; export interface MysteryEncounterPokemonData { spriteScale?: number } +export function getSpriteKeysFromSpecies(species: Species, female?: boolean, formIndex?: integer, shiny?: boolean, variant?: integer): { spriteKey: string, fileRoot: string } { + const spriteKey = getPokemonSpecies(species).getSpriteKey(female ?? false, formIndex ?? 0, shiny ?? false, variant ?? 0); + const fileRoot = getPokemonSpecies(species).getSpriteAtlasPath(female ?? false, formIndex ?? 0, shiny ?? false, variant ?? 0); + return { spriteKey, fileRoot }; +} + +export function getSpriteKeysFromPokemon(pokemon: Pokemon): { spriteKey: string, fileRoot: string } { + const spriteKey = pokemon.getSpeciesForm().getSpriteKey(pokemon.getGender() === Gender.FEMALE, pokemon.formIndex, pokemon.shiny, pokemon.variant); + const fileRoot = pokemon.getSpeciesForm().getSpriteAtlasPath(pokemon.getGender() === Gender.FEMALE, pokemon.formIndex, pokemon.shiny, pokemon.variant); + + return { spriteKey, fileRoot }; +} + /** * * Will never remove the player's last non-fainted Pokemon (if they only have 1) diff --git a/src/data/trainer-config.ts b/src/data/trainer-config.ts index 8b251d59de9..f3e6009e02e 100644 --- a/src/data/trainer-config.ts +++ b/src/data/trainer-config.ts @@ -1,16 +1,16 @@ -import BattleScene, {startingWave} from "../battle-scene"; -import {ModifierTypeFunc, modifierTypes} from "../modifier/modifier-type"; -import {EnemyPokemon} from "../field/pokemon"; +import BattleScene, { startingWave } from "../battle-scene"; +import { ModifierTypeFunc, modifierTypes } from "../modifier/modifier-type"; +import { EnemyPokemon } from "../field/pokemon"; import * as Utils from "../utils"; -import {PokeballType} from "./pokeball"; -import {pokemonEvolutions, pokemonPrevolutions} from "./pokemon-evolutions"; -import PokemonSpecies, {getPokemonSpecies, PokemonSpeciesFilter} from "./pokemon-species"; -import {tmSpecies} from "./tms"; -import {Type} from "./type"; -import {doubleBattleDialogue} from "./dialogue"; -import {PersistentModifier} from "../modifier/modifier"; -import {TrainerVariant} from "../field/trainer"; -import {getIsInitialized, initI18n} from "#app/plugins/i18n"; +import { PokeballType } from "./pokeball"; +import { pokemonEvolutions, pokemonPrevolutions } from "./pokemon-evolutions"; +import PokemonSpecies, { getPokemonSpecies, PokemonSpeciesFilter } from "./pokemon-species"; +import { tmSpecies } from "./tms"; +import { Type } from "./type"; +import { doubleBattleDialogue } from "./dialogue"; +import { PersistentModifier } from "../modifier/modifier"; +import { TrainerVariant } from "../field/trainer"; +import { getIsInitialized, initI18n } from "#app/plugins/i18n"; import i18next from "i18next"; import { Moves } from "#enums/moves"; import { PartyMemberStrength } from "#enums/party-member-strength"; @@ -527,6 +527,44 @@ export class TrainerConfig { return this; } + /** + * Initializes the trainer configuration for a Stat Trainer, as part of the Trainer's Test Mystery Encounter. + * @param {Species | Species[]} signatureSpecies - The signature species for the Elite Four member. + * @param {Type[]} specialtyTypes - The specialty types for the Stat Trainer. + * @param isMale - Whether the Elite Four Member is Male or Female (for localization of the title). + * @returns {TrainerConfig} - The updated TrainerConfig instance. + **/ + initForStatTrainer(signatureSpecies: (Species | Species[])[], isMale: boolean, ...specialtyTypes: Type[]): TrainerConfig { + if (!getIsInitialized()) { + initI18n(); + } + + this.setPartyTemplates(trainerPartyTemplates.ELITE_FOUR); + + signatureSpecies.forEach((speciesPool, s) => { + if (!Array.isArray(speciesPool)) { + speciesPool = [speciesPool]; + } + this.setPartyMemberFunc(-(s + 1), getRandomPartyMemberFunc(speciesPool)); + }); + if (specialtyTypes.length) { + this.setSpeciesFilter(p => specialtyTypes.find(t => p.isOfType(t)) !== undefined); + this.setSpecialtyTypes(...specialtyTypes); + } + const nameForCall = this.name.toLowerCase().replace(/\s/g, "_"); + this.name = i18next.t(`trainerNames:${nameForCall}`); + // this.setTitle(title); + this.setMoneyMultiplier(2); + this.setBoss(); + this.setStaticParty(); + + // TODO: replace with more suitable music? + this.setBattleBgm("battle_trainer"); + this.setVictoryBgm("victory_trainer"); + + return this; + } + /** * Initializes the trainer configuration for an evil team leader. Temporarily hardcoding evil leader teams though. * @param {Species | Species[]} signatureSpecies - The signature species for the evil team leader. @@ -1787,4 +1825,137 @@ export const trainerConfigs: TrainerConfigs = { p.generateAndPopulateMoveset(); p.pokeball = PokeballType.MASTER_BALL; })), + // TODO: use signature species? + [TrainerType.BUCK]: new TrainerConfig(++t).setName("Buck").initForStatTrainer([], true) + .setPartyMemberFunc(0, getRandomPartyMemberFunc([ Species.CLAYDOL ], TrainerSlot.TRAINER, true, p => { + p.setBoss(true, 3); + p.generateAndPopulateMoveset(); + p.pokeball = PokeballType.ULTRA_BALL; + })) + .setPartyMemberFunc(1, getRandomPartyMemberFunc([ Species.VENUSAUR, Species.COALOSSAL ], TrainerSlot.TRAINER, true, p => { + p.generateAndPopulateMoveset(); + p.pokeball = PokeballType.GREAT_BALL; + if (p.species.speciesId === Species.VENUSAUR) { + p.formIndex = 2; // Gmax + p.abilityIndex = 2; // Venusaur gets Chlorophyll + } else { + p.formIndex = 1; // Gmax + } + p.generateName(); + })) + .setPartyMemberFunc(2, getRandomPartyMemberFunc([ Species.AGGRON ], TrainerSlot.TRAINER, true, p => { + p.generateAndPopulateMoveset(); + p.formIndex = 1; // Mega + p.generateName(); + })) + .setPartyMemberFunc(3, getRandomPartyMemberFunc([ Species.TORKOAL ], TrainerSlot.TRAINER, true, p => { + p.generateAndPopulateMoveset(); + p.abilityIndex = 1; // Drought + })) + .setPartyMemberFunc(4, getRandomPartyMemberFunc([ Species.GREAT_TUSK ], TrainerSlot.TRAINER, true)) + .setPartyMemberFunc(5, getRandomPartyMemberFunc([ Species.HEATRAN ], TrainerSlot.TRAINER, true, p => { + p.setBoss(true, 2); + p.generateAndPopulateMoveset(); + p.pokeball = PokeballType.MASTER_BALL; + })), + [TrainerType.CHERYL]: new TrainerConfig(++t).setName("Cheryl").initForStatTrainer([], false) + .setPartyMemberFunc(0, getRandomPartyMemberFunc([ Species.BLISSEY ], TrainerSlot.TRAINER, true, p => { + p.setBoss(true, 3); + p.generateAndPopulateMoveset(); + p.pokeball = PokeballType.ULTRA_BALL; + })) + .setPartyMemberFunc(1, getRandomPartyMemberFunc([ Species.SNORLAX, Species.LAPRAS ], TrainerSlot.TRAINER, true, p => { + p.generateAndPopulateMoveset(); + p.pokeball = PokeballType.GREAT_BALL; + p.formIndex = 1; // Gmax + p.generateName(); + })) + .setPartyMemberFunc(2, getRandomPartyMemberFunc([ Species.AUDINO ], TrainerSlot.TRAINER, true, p => { + p.generateAndPopulateMoveset(); + p.formIndex = 1; // Mega + p.generateName(); + })) + .setPartyMemberFunc(3, getRandomPartyMemberFunc([ Species.GOODRA ], TrainerSlot.TRAINER, true)) + .setPartyMemberFunc(4, getRandomPartyMemberFunc([ Species.IRON_HANDS ], TrainerSlot.TRAINER, true)) + .setPartyMemberFunc(5, getRandomPartyMemberFunc([ Species.CRESSELIA, Species.ENAMORUS ], TrainerSlot.TRAINER, true, p => { + p.setBoss(true, 2); + p.generateAndPopulateMoveset(); + if (p.species.speciesId === Species.ENAMORUS) { + p.formIndex = 1; // Therian + p.generateName(); + } + p.pokeball = PokeballType.MASTER_BALL; + })), + [TrainerType.MARLEY]: new TrainerConfig(++t).setName("Marley").initForStatTrainer([], false) + .setPartyMemberFunc(0, getRandomPartyMemberFunc([ Species.ARCANINE ], TrainerSlot.TRAINER, true, p => { + p.setBoss(true, 3); + p.generateAndPopulateMoveset(); + p.pokeball = PokeballType.ULTRA_BALL; + })) + .setPartyMemberFunc(1, getRandomPartyMemberFunc([ Species.CINDERACE, Species.INTELEON ], TrainerSlot.TRAINER, true, p => { + p.generateAndPopulateMoveset(); + p.pokeball = PokeballType.GREAT_BALL; + p.formIndex = 1; // Gmax + p.generateName(); + })) + .setPartyMemberFunc(2, getRandomPartyMemberFunc([ Species.AERODACTYL ], TrainerSlot.TRAINER, true, p => { + p.generateAndPopulateMoveset(); + p.formIndex = 1; // Mega + p.generateName(); + })) + .setPartyMemberFunc(3, getRandomPartyMemberFunc([ Species.DRAGAPULT ], TrainerSlot.TRAINER, true)) + .setPartyMemberFunc(4, getRandomPartyMemberFunc([ Species.IRON_BUNDLE ], TrainerSlot.TRAINER, true)) + .setPartyMemberFunc(5, getRandomPartyMemberFunc([ Species.REGIELEKI ], TrainerSlot.TRAINER, true, p => { + p.setBoss(true, 2); + p.generateAndPopulateMoveset(); + p.pokeball = PokeballType.MASTER_BALL; + })), + [TrainerType.MIRA]: new TrainerConfig(++t).setName("Mira").initForStatTrainer([], false) + .setPartyMemberFunc(0, getRandomPartyMemberFunc([ Species.ALAKAZAM ], TrainerSlot.TRAINER, true, p => { + p.setBoss(true, 2); + p.generateAndPopulateMoveset(); + p.formIndex = 1; + p.pokeball = PokeballType.ULTRA_BALL; + p.generateName(); + })) + .setPartyMemberFunc(1, getRandomPartyMemberFunc([ Species.GENGAR, Species.HATTERENE ], TrainerSlot.TRAINER, true, p => { + p.generateAndPopulateMoveset(); + p.pokeball = PokeballType.GREAT_BALL; + p.formIndex = p.species.speciesId === Species.GENGAR ? 2 : 1; // Gmax + p.generateName(); + })) + .setPartyMemberFunc(2, getRandomPartyMemberFunc([ Species.FLUTTER_MANE ], TrainerSlot.TRAINER, true)) + .setPartyMemberFunc(3, getRandomPartyMemberFunc([ Species.HYDREIGON ], TrainerSlot.TRAINER, true)) + .setPartyMemberFunc(4, getRandomPartyMemberFunc([ Species.MAGNEZONE ], TrainerSlot.TRAINER, true)) + .setPartyMemberFunc(5, getRandomPartyMemberFunc([ Species.LATIOS, Species.LATIAS ], TrainerSlot.TRAINER, true, p => { + p.setBoss(true, 2); + p.generateAndPopulateMoveset(); + p.pokeball = PokeballType.MASTER_BALL; + })), + [TrainerType.RILEY]: new TrainerConfig(++t).setName("Riley").initForStatTrainer([], true) + .setPartyMemberFunc(0, getRandomPartyMemberFunc([ Species.LUCARIO ], TrainerSlot.TRAINER, true, p => { + p.setBoss(true, 2); + p.generateAndPopulateMoveset(); + p.formIndex = 1; + p.pokeball = PokeballType.ULTRA_BALL; + p.generateName(); + })) + .setPartyMemberFunc(1, getRandomPartyMemberFunc([ Species.RILLABOOM, Species.CENTISKORCH ], TrainerSlot.TRAINER, true, p => { + p.generateAndPopulateMoveset(); + p.pokeball = PokeballType.GREAT_BALL; + p.formIndex = 1; // Gmax + p.generateName(); + })) + .setPartyMemberFunc(2, getRandomPartyMemberFunc([ Species.TYRANITAR ], TrainerSlot.TRAINER, true)) + .setPartyMemberFunc(3, getRandomPartyMemberFunc([ Species.ROARING_MOON ], TrainerSlot.TRAINER, true)) + .setPartyMemberFunc(4, getRandomPartyMemberFunc([ Species.URSALUNA ], TrainerSlot.TRAINER, true)) + .setPartyMemberFunc(5, getRandomPartyMemberFunc([ Species.REGIGIGAS, Species.LANDORUS ], TrainerSlot.TRAINER, true, p => { + p.setBoss(true, 2); + p.generateAndPopulateMoveset(); + if (p.species.speciesId === Species.LANDORUS) { + p.formIndex = 1; // Therian + p.generateName(); + } + p.pokeball = PokeballType.MASTER_BALL; + })), }; diff --git a/src/enums/mystery-encounter-type.ts b/src/enums/mystery-encounter-type.ts index 95283e63b36..3bb204ab9d8 100644 --- a/src/enums/mystery-encounter-type.ts +++ b/src/enums/mystery-encounter-type.ts @@ -15,5 +15,6 @@ export enum MysteryEncounterType { POKEMON_SALESMAN, OFFER_YOU_CANT_REFUSE, DELIBIRDY, - ABSOLUTE_AVARICE + ABSOLUTE_AVARICE, + A_TRAINERS_TEST } diff --git a/src/enums/trainer-type.ts b/src/enums/trainer-type.ts index 6bd8f567acb..0d3a0771604 100644 --- a/src/enums/trainer-type.ts +++ b/src/enums/trainer-type.ts @@ -70,6 +70,11 @@ export enum TrainerType { GHETSIS_2, LYSANDRE, LYSANDRE_2, + BUCK, + CHERYL, + MARLEY, + MIRA, + RILEY, BROCK = 200, MISTY, diff --git a/src/field/mystery-encounter-intro.ts b/src/field/mystery-encounter-intro.ts index 467d44c23cd..7055d29d45c 100644 --- a/src/field/mystery-encounter-intro.ts +++ b/src/field/mystery-encounter-intro.ts @@ -1,10 +1,11 @@ import { GameObjects } from "phaser"; import BattleScene from "../battle-scene"; import IMysteryEncounter from "../data/mystery-encounters/mystery-encounter"; +import { Species } from "#enums/species"; +import { isNullOrUndefined } from "#app/utils"; +import { getSpriteKeysFromSpecies } from "#app/data/mystery-encounters/utils/encounter-pokemon-utils"; type KnownFileRoot = - | "trainer" - | "pokemon" | "arenas" | "battle_anims" | "cg" @@ -33,6 +34,8 @@ export class MysteryEncounterSpriteConfig { spriteKey: string; /** Refer to [/public/images](../../public/images) directorty for all folder names */ fileRoot: KnownFileRoot & string | string; + /** Optional replacement for `spriteKey`/`fileRoot`. Just know this defaults to male/genderless, form 0, no shiny */ + species?: Species; /** Enable shadow. Defaults to `false` */ hasShadow?: boolean = false; /** Disable animation. Defaults to `false` */ @@ -69,15 +72,26 @@ export class MysteryEncounterSpriteConfig { export default class MysteryEncounterIntroVisuals extends Phaser.GameObjects.Container { public encounter: IMysteryEncounter; public spriteConfigs: MysteryEncounterSpriteConfig[]; + public enterFromRight: boolean; constructor(scene: BattleScene, encounter: IMysteryEncounter) { super(scene, -72, 76); this.encounter = encounter; + this.enterFromRight = encounter.enterIntroVisualsFromRight ?? false; // Shallow copy configs to allow visual config updates at runtime without dirtying master copy of Encounter this.spriteConfigs = encounter.spriteConfigs.map(config => { - return { + const result = { ...config }; + + if (!isNullOrUndefined(result.species)) { + const keys = getSpriteKeysFromSpecies(result.species); + result.spriteKey = keys.spriteKey; + result.fileRoot = keys.fileRoot; + result.isPokemon = true; + } + + return result; }); if (!this.spriteConfigs) { return; @@ -90,9 +104,10 @@ export default class MysteryEncounterIntroVisuals extends Phaser.GameObjects.Con return ret; }; - const getItemSprite = (spriteKey: string) => { + const getItemSprite = (spriteKey: string, hasShadow?: boolean, yShadow?: number) => { const icon = this.scene.add.sprite(-19, 2, "items", spriteKey); icon.setOrigin(0.5, 1); + icon.setPipeline(this.scene.spritePipeline, { tone: [0.0, 0.0, 0.0, 0.0], hasShadow: !!hasShadow, yShadowOffset: yShadow ?? 0 }); return icon; }; @@ -114,7 +129,7 @@ export default class MysteryEncounterIntroVisuals extends Phaser.GameObjects.Con sprite = getSprite(spriteKey, hasShadow, yShadow); tintSprite = getSprite(spriteKey); } else { - sprite = getItemSprite(spriteKey); + sprite = getItemSprite(spriteKey, hasShadow, yShadow); tintSprite = getItemSprite(spriteKey); } diff --git a/src/locales/en/dialogue.ts b/src/locales/en/dialogue.ts index dda8891b788..50dee033782 100644 --- a/src/locales/en/dialogue.ts +++ b/src/locales/en/dialogue.ts @@ -566,6 +566,67 @@ export const PGMdialogue: DialogueTranslationEntries = { 1: "Fools with no vision will continue to befoul this beautiful world." } }, + "stat_trainer_buck": { + "encounter": { + 1: "...I'm telling you right now. I'm seriously tough. Act surprised!", + 2: "I can feel my Pokémon shivering inside their Pokéballs!" + }, + "victory": { + 1: "Heeheehee!\nSo hot, you!" + }, + "defeat": { + 1: "Whoa! You're all out of gas, I guess." + } + }, + "stat_trainer_cheryl": { + "encounter": { + 1: "My Pokémon have been itching for a battle.", + 2: "I should warn you, my Pokémon can be quite rambunctious." + }, + "victory": { + 1: "Striking the right balance of offense and defense... It's not easy to do." + }, + "defeat": { + 1: "Do your Pokémon need any healing?" + } + }, + "stat_trainer_marley": { + "encounter": { + 1: "... OK.\nI'll do my best.", + 2: "... OK.\nI... won't lose...!" + }, + "victory": { + 1: "... Awww." + }, + "defeat": { + 1: "... Goodbye." + } + }, + "stat_trainer_mira": { + "encounter": { + 1: "You will be shocked by Mira!", + 2: "Mira will show you that Mira doesn't get lost anymore!" + }, + "victory": { + 1: "Mira wonders if she can get very far in this land." + }, + "defeat": { + 1: "Mira knew she would win!" + } + }, + "stat_trainer_riley": { + "encounter": { + 1: "Battling is our way of greeting!", + 2: "We're pulling out all the stops to put your Pokémon down.", + }, + "victory": { + 1: `At times we battle, and sometimes we team up... + $It's great how Trainers can interact.` + }, + "defeat": { + 1: "You put up quite the display.\nBetter luck next time." + } + }, "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 b59cfdc4fda..0581a6698de 100644 --- a/src/locales/en/trainers.ts +++ b/src/locales/en/trainers.ts @@ -270,6 +270,11 @@ export const trainerNames: SimpleTranslationEntries = { "cyrus": "Cyrus", "ghetsis": "Ghetsis", "lysandre": "Lysandre", + "buck": "Buck", + "cheryl": "Cheryl", + "marley": "Marley", + "mira": "Mira", + "riley": "Riley", // Double Names "blue_red_double": "Blue & Red", diff --git a/src/overrides.ts b/src/overrides.ts index 1196797fac0..ff833564899 100644 --- a/src/overrides.ts +++ b/src/overrides.ts @@ -127,9 +127,9 @@ class DefaultOverrides { // ------------------------- // 1 to 256, set to null to ignore - readonly MYSTERY_ENCOUNTER_RATE_OVERRIDE: number = null; + readonly MYSTERY_ENCOUNTER_RATE_OVERRIDE: number = 256; readonly MYSTERY_ENCOUNTER_TIER_OVERRIDE: MysteryEncounterTier = null; - readonly MYSTERY_ENCOUNTER_OVERRIDE: MysteryEncounterType = null; + readonly MYSTERY_ENCOUNTER_OVERRIDE: MysteryEncounterType = MysteryEncounterType.A_TRAINERS_TEST; // ------------------------- // MODIFIER / ITEM OVERRIDES diff --git a/src/phases.ts b/src/phases.ts index 7f2933a738a..b0bfc739ae8 100644 --- a/src/phases.ts +++ b/src/phases.ts @@ -1002,8 +1002,8 @@ export class EncounterPhase extends BattlePhase { const enemyField = this.scene.getEnemyField(); this.scene.tweens.add({ - targets: [this.scene.arenaEnemy, this.scene.currentBattle.trainer, enemyField, this.scene.currentBattle?.mysteryEncounter?.introVisuals, this.scene.arenaPlayer, this.scene.trainer].flat(), - x: (_target, _key, value, fieldIndex: integer) => fieldIndex < 3 + (enemyField.length) ? value + 300 : value - 300, + targets: [this.scene.arenaEnemy, this.scene.currentBattle.trainer, enemyField, this.scene.arenaPlayer, this.scene.trainer].flat(), + x: (_target, _key, value, fieldIndex: integer) => fieldIndex < 2 + (enemyField.length) ? value + 300 : value - 300, duration: 2000, onComplete: () => { if (!this.tryOverrideForBattleSpec()) { @@ -1011,6 +1011,19 @@ export class EncounterPhase extends BattlePhase { } } }); + + const encounterIntroVisuals = this.scene.currentBattle?.mysteryEncounter?.introVisuals; + if (encounterIntroVisuals) { + const enterFromRight = encounterIntroVisuals.enterFromRight; + if (enterFromRight) { + encounterIntroVisuals.x += 500; + } + this.scene.tweens.add({ + targets: encounterIntroVisuals, + x: enterFromRight ? "-=200" : "+=300", + duration: 2000 + }); + } } getEncounterMessage(): string { @@ -1106,8 +1119,6 @@ export class EncounterPhase extends BattlePhase { } const doEncounter = () => { - this.scene.playBgm(undefined); - const doShowEncounterOptions = () => { this.scene.ui.clearText(); this.scene.ui.getMessageHandler().hideNameText(); @@ -1264,7 +1275,17 @@ export class NextEncounterPhase extends EncounterPhase { } const nextEncounterVisuals = this.scene.currentBattle?.mysteryEncounter?.introVisuals; if (nextEncounterVisuals) { - moveTargets.push(nextEncounterVisuals); + const enterFromRight = nextEncounterVisuals.enterFromRight; + if (enterFromRight) { + nextEncounterVisuals.x += 500; + this.scene.tweens.add({ + targets: nextEncounterVisuals, + x: "-=200", + duration: 2000 + }); + } else { + moveTargets.push(nextEncounterVisuals); + } } this.scene.tweens.add({ targets: moveTargets.flat(),