diff --git a/jsconfig.json b/jsconfig.json index d0406141d..2a15b4322 100644 --- a/jsconfig.json +++ b/jsconfig.json @@ -3,6 +3,7 @@ "target": "ES2020", "module": "ES2020", "moduleResolution": "node", + "resolveJsonModule": true, "checkJs": true, "esModuleInterop": true, "strictNullChecks": false diff --git a/public/audio/bgm/metropolis.mp3 b/public/audio/bgm/metropolis.mp3 new file mode 100644 index 000000000..3300317d6 Binary files /dev/null and b/public/audio/bgm/metropolis.mp3 differ diff --git a/public/audio/bgm/city.mp3 b/public/audio/bgm/slum.mp3 similarity index 100% rename from public/audio/bgm/city.mp3 rename to public/audio/bgm/slum.mp3 diff --git a/public/audio/bgm/snowy_forest.mp3 b/public/audio/bgm/snowy_forest.mp3 new file mode 100644 index 000000000..c0e945389 Binary files /dev/null and b/public/audio/bgm/snowy_forest.mp3 differ diff --git a/public/images/arenas/city_a.png b/public/images/arenas/slum_a.png similarity index 100% rename from public/images/arenas/city_a.png rename to public/images/arenas/slum_a.png diff --git a/public/images/arenas/city_b.png b/public/images/arenas/slum_b.png similarity index 100% rename from public/images/arenas/city_b.png rename to public/images/arenas/slum_b.png diff --git a/public/images/arenas/city_bg.png b/public/images/arenas/slum_bg.png similarity index 100% rename from public/images/arenas/city_bg.png rename to public/images/arenas/slum_bg.png diff --git a/public/images/pokemon/icons/4052.png b/public/images/pokemon/icons/4052.png index 907f4eddf..6cde27bbc 100644 Binary files a/public/images/pokemon/icons/4052.png and b/public/images/pokemon/icons/4052.png differ diff --git a/public/images/pokemon/icons/4077.png b/public/images/pokemon/icons/4077.png index 16a3139c4..d72877a5c 100644 Binary files a/public/images/pokemon/icons/4077.png and b/public/images/pokemon/icons/4077.png differ diff --git a/public/images/pokemon/icons/4078.png b/public/images/pokemon/icons/4078.png index d8219d1f4..063d2c2b5 100644 Binary files a/public/images/pokemon/icons/4078.png and b/public/images/pokemon/icons/4078.png differ diff --git a/public/images/pokemon/icons/4079.png b/public/images/pokemon/icons/4079.png index 84fe81106..c9cef6cc1 100644 Binary files a/public/images/pokemon/icons/4079.png and b/public/images/pokemon/icons/4079.png differ diff --git a/public/images/pokemon/icons/4080.png b/public/images/pokemon/icons/4080.png index aba0bec16..f89081f47 100644 Binary files a/public/images/pokemon/icons/4080.png and b/public/images/pokemon/icons/4080.png differ diff --git a/public/images/pokemon/icons/4083.png b/public/images/pokemon/icons/4083.png index 3f774961a..ab9dadf06 100644 Binary files a/public/images/pokemon/icons/4083.png and b/public/images/pokemon/icons/4083.png differ diff --git a/public/images/pokemon/icons/4110.png b/public/images/pokemon/icons/4110.png index f80e976fc..bcd324faa 100644 Binary files a/public/images/pokemon/icons/4110.png and b/public/images/pokemon/icons/4110.png differ diff --git a/public/images/pokemon/icons/4122.png b/public/images/pokemon/icons/4122.png index 33458fc1e..b89ee5dfc 100644 Binary files a/public/images/pokemon/icons/4122.png and b/public/images/pokemon/icons/4122.png differ diff --git a/public/images/pokemon/icons/4144.png b/public/images/pokemon/icons/4144.png index 3e4b6bd64..19e16130d 100644 Binary files a/public/images/pokemon/icons/4144.png and b/public/images/pokemon/icons/4144.png differ diff --git a/public/images/pokemon/icons/4145.png b/public/images/pokemon/icons/4145.png index 7b82d6106..bb4c423a2 100644 Binary files a/public/images/pokemon/icons/4145.png and b/public/images/pokemon/icons/4145.png differ diff --git a/public/images/pokemon/icons/4146.png b/public/images/pokemon/icons/4146.png index aff147ba6..62e2cbd0d 100644 Binary files a/public/images/pokemon/icons/4146.png and b/public/images/pokemon/icons/4146.png differ diff --git a/public/images/pokemon/icons/4199.png b/public/images/pokemon/icons/4199.png index 8cd0cf655..f1c51894d 100644 Binary files a/public/images/pokemon/icons/4199.png and b/public/images/pokemon/icons/4199.png differ diff --git a/public/images/pokemon/icons/4222.png b/public/images/pokemon/icons/4222.png index 35fed394e..93f82507b 100644 Binary files a/public/images/pokemon/icons/4222.png and b/public/images/pokemon/icons/4222.png differ diff --git a/public/images/pokemon/icons/4263.png b/public/images/pokemon/icons/4263.png index bfc8eb6bc..69acda767 100644 Binary files a/public/images/pokemon/icons/4263.png and b/public/images/pokemon/icons/4263.png differ diff --git a/public/images/pokemon/icons/4264.png b/public/images/pokemon/icons/4264.png index 6f6d4c035..8f93d0d7f 100644 Binary files a/public/images/pokemon/icons/4264.png and b/public/images/pokemon/icons/4264.png differ diff --git a/public/images/pokemon/icons/4554.png b/public/images/pokemon/icons/4554.png index 639fe4fc3..3df7688e0 100644 Binary files a/public/images/pokemon/icons/4554.png and b/public/images/pokemon/icons/4554.png differ diff --git a/public/images/pokemon/icons/4555-zen.png b/public/images/pokemon/icons/4555-zen.png index f53d19fe7..3ddc77e0c 100644 Binary files a/public/images/pokemon/icons/4555-zen.png and b/public/images/pokemon/icons/4555-zen.png differ diff --git a/public/images/pokemon/icons/4555.png b/public/images/pokemon/icons/4555.png index 7a40caca0..948e91049 100644 Binary files a/public/images/pokemon/icons/4555.png and b/public/images/pokemon/icons/4555.png differ diff --git a/public/images/pokemon/icons/4562.png b/public/images/pokemon/icons/4562.png index bdaebcbde..b80e2630a 100644 Binary files a/public/images/pokemon/icons/4562.png and b/public/images/pokemon/icons/4562.png differ diff --git a/public/images/pokemon/icons/4618.png b/public/images/pokemon/icons/4618.png index 927d5c1a6..e5f81014e 100644 Binary files a/public/images/pokemon/icons/4618.png and b/public/images/pokemon/icons/4618.png differ diff --git a/public/images/pokemon/icons/810.png b/public/images/pokemon/icons/810.png index bb4a79bad..608d3c35b 100644 Binary files a/public/images/pokemon/icons/810.png and b/public/images/pokemon/icons/810.png differ diff --git a/public/images/pokemon/icons/811.png b/public/images/pokemon/icons/811.png index 27be85363..0115fcdc2 100644 Binary files a/public/images/pokemon/icons/811.png and b/public/images/pokemon/icons/811.png differ diff --git a/public/images/pokemon/icons/812.png b/public/images/pokemon/icons/812.png index fc4e88d53..aa4a28182 100644 Binary files a/public/images/pokemon/icons/812.png and b/public/images/pokemon/icons/812.png differ diff --git a/public/images/pokemon/icons/813.png b/public/images/pokemon/icons/813.png index c77355d4a..8791ff7ea 100644 Binary files a/public/images/pokemon/icons/813.png and b/public/images/pokemon/icons/813.png differ diff --git a/public/images/pokemon/icons/814.png b/public/images/pokemon/icons/814.png index fa30021dc..8f01ffcc6 100644 Binary files a/public/images/pokemon/icons/814.png and b/public/images/pokemon/icons/814.png differ diff --git a/public/images/pokemon/icons/815.png b/public/images/pokemon/icons/815.png index c137f1846..5bf67790c 100644 Binary files a/public/images/pokemon/icons/815.png and b/public/images/pokemon/icons/815.png differ diff --git a/public/images/pokemon/icons/816.png b/public/images/pokemon/icons/816.png index c2cdd23f3..36f331d7a 100644 Binary files a/public/images/pokemon/icons/816.png and b/public/images/pokemon/icons/816.png differ diff --git a/public/images/pokemon/icons/817.png b/public/images/pokemon/icons/817.png index a97474be7..46edb3410 100644 Binary files a/public/images/pokemon/icons/817.png and b/public/images/pokemon/icons/817.png differ diff --git a/public/images/pokemon/icons/818.png b/public/images/pokemon/icons/818.png index b2c21c990..7edb90eeb 100644 Binary files a/public/images/pokemon/icons/818.png and b/public/images/pokemon/icons/818.png differ diff --git a/public/images/pokemon/icons/819.png b/public/images/pokemon/icons/819.png index 7b3c09708..1d3f703d7 100644 Binary files a/public/images/pokemon/icons/819.png and b/public/images/pokemon/icons/819.png differ diff --git a/public/images/pokemon/icons/820.png b/public/images/pokemon/icons/820.png index 43a69f13e..9fba0dba2 100644 Binary files a/public/images/pokemon/icons/820.png and b/public/images/pokemon/icons/820.png differ diff --git a/public/images/pokemon/icons/821.png b/public/images/pokemon/icons/821.png index 6e4b34a86..ec8300ee4 100644 Binary files a/public/images/pokemon/icons/821.png and b/public/images/pokemon/icons/821.png differ diff --git a/public/images/pokemon/icons/822.png b/public/images/pokemon/icons/822.png index f314b053e..f0cb06cc3 100644 Binary files a/public/images/pokemon/icons/822.png and b/public/images/pokemon/icons/822.png differ diff --git a/public/images/pokemon/icons/823.png b/public/images/pokemon/icons/823.png index 798f9214f..55238e75e 100644 Binary files a/public/images/pokemon/icons/823.png and b/public/images/pokemon/icons/823.png differ diff --git a/public/images/pokemon/icons/824.png b/public/images/pokemon/icons/824.png index 526969ab9..d0624a938 100644 Binary files a/public/images/pokemon/icons/824.png and b/public/images/pokemon/icons/824.png differ diff --git a/public/images/pokemon/icons/825.png b/public/images/pokemon/icons/825.png index ab42ab608..634528025 100644 Binary files a/public/images/pokemon/icons/825.png and b/public/images/pokemon/icons/825.png differ diff --git a/public/images/pokemon/icons/826.png b/public/images/pokemon/icons/826.png index f10c504ec..c946c4564 100644 Binary files a/public/images/pokemon/icons/826.png and b/public/images/pokemon/icons/826.png differ diff --git a/public/images/pokemon/icons/827.png b/public/images/pokemon/icons/827.png index 62d7939bb..0072868b0 100644 Binary files a/public/images/pokemon/icons/827.png and b/public/images/pokemon/icons/827.png differ diff --git a/public/images/pokemon/icons/828.png b/public/images/pokemon/icons/828.png index 90bf07fca..4db6ffa67 100644 Binary files a/public/images/pokemon/icons/828.png and b/public/images/pokemon/icons/828.png differ diff --git a/public/images/pokemon/icons/829.png b/public/images/pokemon/icons/829.png index 335530b1d..677d5bb73 100644 Binary files a/public/images/pokemon/icons/829.png and b/public/images/pokemon/icons/829.png differ diff --git a/public/images/pokemon/icons/830.png b/public/images/pokemon/icons/830.png index 196530b13..898cc5f7a 100644 Binary files a/public/images/pokemon/icons/830.png and b/public/images/pokemon/icons/830.png differ diff --git a/public/images/pokemon/icons/831.png b/public/images/pokemon/icons/831.png index 543e51f57..3bb315697 100644 Binary files a/public/images/pokemon/icons/831.png and b/public/images/pokemon/icons/831.png differ diff --git a/public/images/pokemon/icons/832.png b/public/images/pokemon/icons/832.png index cb4126ef8..d7ed6fb18 100644 Binary files a/public/images/pokemon/icons/832.png and b/public/images/pokemon/icons/832.png differ diff --git a/public/images/pokemon/icons/833.png b/public/images/pokemon/icons/833.png index e0be992bb..6df2530a4 100644 Binary files a/public/images/pokemon/icons/833.png and b/public/images/pokemon/icons/833.png differ diff --git a/public/images/pokemon/icons/834.png b/public/images/pokemon/icons/834.png index a837a1b30..cf699e5e7 100644 Binary files a/public/images/pokemon/icons/834.png and b/public/images/pokemon/icons/834.png differ diff --git a/public/images/pokemon/icons/835.png b/public/images/pokemon/icons/835.png index e6ec51a94..6e36f344e 100644 Binary files a/public/images/pokemon/icons/835.png and b/public/images/pokemon/icons/835.png differ diff --git a/public/images/pokemon/icons/836.png b/public/images/pokemon/icons/836.png index 98f3e5e68..a715ad736 100644 Binary files a/public/images/pokemon/icons/836.png and b/public/images/pokemon/icons/836.png differ diff --git a/public/images/pokemon/icons/837.png b/public/images/pokemon/icons/837.png index 3b7c2a1ee..52d4a37fb 100644 Binary files a/public/images/pokemon/icons/837.png and b/public/images/pokemon/icons/837.png differ diff --git a/public/images/pokemon/icons/838.png b/public/images/pokemon/icons/838.png index e0eeaebc3..c131197a9 100644 Binary files a/public/images/pokemon/icons/838.png and b/public/images/pokemon/icons/838.png differ diff --git a/public/images/pokemon/icons/839.png b/public/images/pokemon/icons/839.png index 21db63fa0..869aea89a 100644 Binary files a/public/images/pokemon/icons/839.png and b/public/images/pokemon/icons/839.png differ diff --git a/public/images/pokemon/icons/840.png b/public/images/pokemon/icons/840.png index 6d76d4ed9..8dfc5f0d7 100644 Binary files a/public/images/pokemon/icons/840.png and b/public/images/pokemon/icons/840.png differ diff --git a/public/images/pokemon/icons/841.png b/public/images/pokemon/icons/841.png index 2a0d511ad..b62affaf4 100644 Binary files a/public/images/pokemon/icons/841.png and b/public/images/pokemon/icons/841.png differ diff --git a/public/images/pokemon/icons/842.png b/public/images/pokemon/icons/842.png index 1fc398cf8..bc0e102d2 100644 Binary files a/public/images/pokemon/icons/842.png and b/public/images/pokemon/icons/842.png differ diff --git a/public/images/pokemon/icons/843.png b/public/images/pokemon/icons/843.png index 059cda9ed..918aa7257 100644 Binary files a/public/images/pokemon/icons/843.png and b/public/images/pokemon/icons/843.png differ diff --git a/public/images/pokemon/icons/844.png b/public/images/pokemon/icons/844.png index 377fee6b5..150877f69 100644 Binary files a/public/images/pokemon/icons/844.png and b/public/images/pokemon/icons/844.png differ diff --git a/public/images/pokemon/icons/845-gorging.png b/public/images/pokemon/icons/845-gorging.png index 998ae179c..f4c7658f0 100644 Binary files a/public/images/pokemon/icons/845-gorging.png and b/public/images/pokemon/icons/845-gorging.png differ diff --git a/public/images/pokemon/icons/845-gulping.png b/public/images/pokemon/icons/845-gulping.png index 2102210a8..29d0cab91 100644 Binary files a/public/images/pokemon/icons/845-gulping.png and b/public/images/pokemon/icons/845-gulping.png differ diff --git a/public/images/pokemon/icons/845.png b/public/images/pokemon/icons/845.png index 925ac2ccd..530d8024e 100644 Binary files a/public/images/pokemon/icons/845.png and b/public/images/pokemon/icons/845.png differ diff --git a/public/images/pokemon/icons/846.png b/public/images/pokemon/icons/846.png index 09a9de7f9..20d820532 100644 Binary files a/public/images/pokemon/icons/846.png and b/public/images/pokemon/icons/846.png differ diff --git a/public/images/pokemon/icons/847.png b/public/images/pokemon/icons/847.png index d86ca2c6c..d8ffac678 100644 Binary files a/public/images/pokemon/icons/847.png and b/public/images/pokemon/icons/847.png differ diff --git a/public/images/pokemon/icons/848.png b/public/images/pokemon/icons/848.png index c37ef992a..efc736652 100644 Binary files a/public/images/pokemon/icons/848.png and b/public/images/pokemon/icons/848.png differ diff --git a/public/images/pokemon/icons/849-lowkey.png b/public/images/pokemon/icons/849-lowkey.png index ea41c822f..ab095f59c 100644 Binary files a/public/images/pokemon/icons/849-lowkey.png and b/public/images/pokemon/icons/849-lowkey.png differ diff --git a/public/images/pokemon/icons/849.png b/public/images/pokemon/icons/849.png index 0ee359321..48503c7e3 100644 Binary files a/public/images/pokemon/icons/849.png and b/public/images/pokemon/icons/849.png differ diff --git a/public/images/pokemon/icons/850.png b/public/images/pokemon/icons/850.png index ef0ce119f..21db0175f 100644 Binary files a/public/images/pokemon/icons/850.png and b/public/images/pokemon/icons/850.png differ diff --git a/public/images/pokemon/icons/851.png b/public/images/pokemon/icons/851.png index fe2d6c1fc..8a46b72c2 100644 Binary files a/public/images/pokemon/icons/851.png and b/public/images/pokemon/icons/851.png differ diff --git a/public/images/pokemon/icons/852.png b/public/images/pokemon/icons/852.png index 240416b44..8b50e1cbe 100644 Binary files a/public/images/pokemon/icons/852.png and b/public/images/pokemon/icons/852.png differ diff --git a/public/images/pokemon/icons/853.png b/public/images/pokemon/icons/853.png index cd517a662..0f2da0e9b 100644 Binary files a/public/images/pokemon/icons/853.png and b/public/images/pokemon/icons/853.png differ diff --git a/public/images/pokemon/icons/854.png b/public/images/pokemon/icons/854.png index 2956bb37b..83960b21b 100644 Binary files a/public/images/pokemon/icons/854.png and b/public/images/pokemon/icons/854.png differ diff --git a/public/images/pokemon/icons/855.png b/public/images/pokemon/icons/855.png index e17974bf2..f62268f9e 100644 Binary files a/public/images/pokemon/icons/855.png and b/public/images/pokemon/icons/855.png differ diff --git a/public/images/pokemon/icons/856.png b/public/images/pokemon/icons/856.png index 822856faa..ab412104d 100644 Binary files a/public/images/pokemon/icons/856.png and b/public/images/pokemon/icons/856.png differ diff --git a/public/images/pokemon/icons/857.png b/public/images/pokemon/icons/857.png index 79f8e28a6..39564a3bf 100644 Binary files a/public/images/pokemon/icons/857.png and b/public/images/pokemon/icons/857.png differ diff --git a/public/images/pokemon/icons/858.png b/public/images/pokemon/icons/858.png index 67d9f2044..81b076df0 100644 Binary files a/public/images/pokemon/icons/858.png and b/public/images/pokemon/icons/858.png differ diff --git a/public/images/pokemon/icons/859.png b/public/images/pokemon/icons/859.png index 69bd42063..be31fc5be 100644 Binary files a/public/images/pokemon/icons/859.png and b/public/images/pokemon/icons/859.png differ diff --git a/public/images/pokemon/icons/860.png b/public/images/pokemon/icons/860.png index 381e64dee..b704402b7 100644 Binary files a/public/images/pokemon/icons/860.png and b/public/images/pokemon/icons/860.png differ diff --git a/public/images/pokemon/icons/861.png b/public/images/pokemon/icons/861.png index cf972f8ea..c92c66ed0 100644 Binary files a/public/images/pokemon/icons/861.png and b/public/images/pokemon/icons/861.png differ diff --git a/public/images/pokemon/icons/862.png b/public/images/pokemon/icons/862.png index b4ab0ce9f..6a7c0fdca 100644 Binary files a/public/images/pokemon/icons/862.png and b/public/images/pokemon/icons/862.png differ diff --git a/public/images/pokemon/icons/863.png b/public/images/pokemon/icons/863.png index 2db85db8f..a3818871d 100644 Binary files a/public/images/pokemon/icons/863.png and b/public/images/pokemon/icons/863.png differ diff --git a/public/images/pokemon/icons/864.png b/public/images/pokemon/icons/864.png index ce97f80b8..ce0d98540 100644 Binary files a/public/images/pokemon/icons/864.png and b/public/images/pokemon/icons/864.png differ diff --git a/public/images/pokemon/icons/865.png b/public/images/pokemon/icons/865.png index 2c07eeaf3..ec318c082 100644 Binary files a/public/images/pokemon/icons/865.png and b/public/images/pokemon/icons/865.png differ diff --git a/public/images/pokemon/icons/866.png b/public/images/pokemon/icons/866.png index bc6a0361c..94c5982dc 100644 Binary files a/public/images/pokemon/icons/866.png and b/public/images/pokemon/icons/866.png differ diff --git a/public/images/pokemon/icons/867.png b/public/images/pokemon/icons/867.png index a0ef7ae47..5c8dd6fba 100644 Binary files a/public/images/pokemon/icons/867.png and b/public/images/pokemon/icons/867.png differ diff --git a/public/images/pokemon/icons/868.png b/public/images/pokemon/icons/868.png index a3369753e..1fea3e99a 100644 Binary files a/public/images/pokemon/icons/868.png and b/public/images/pokemon/icons/868.png differ diff --git a/public/images/pokemon/icons/869-caramel-swirl.png b/public/images/pokemon/icons/869-caramel-swirl.png index f544eae8f..6d6dcd572 100644 Binary files a/public/images/pokemon/icons/869-caramel-swirl.png and b/public/images/pokemon/icons/869-caramel-swirl.png differ diff --git a/public/images/pokemon/icons/869-lemon-cream.png b/public/images/pokemon/icons/869-lemon-cream.png index 97c47da0f..798adc029 100644 Binary files a/public/images/pokemon/icons/869-lemon-cream.png and b/public/images/pokemon/icons/869-lemon-cream.png differ diff --git a/public/images/pokemon/icons/869-matcha-cream.png b/public/images/pokemon/icons/869-matcha-cream.png index 92acbd860..961e3ef48 100644 Binary files a/public/images/pokemon/icons/869-matcha-cream.png and b/public/images/pokemon/icons/869-matcha-cream.png differ diff --git a/public/images/pokemon/icons/869-mint-cream.png b/public/images/pokemon/icons/869-mint-cream.png index d612e3101..2cdff2c23 100644 Binary files a/public/images/pokemon/icons/869-mint-cream.png and b/public/images/pokemon/icons/869-mint-cream.png differ diff --git a/public/images/pokemon/icons/869-rainbow-swirl.png b/public/images/pokemon/icons/869-rainbow-swirl.png index 58e130b3d..2646f4807 100644 Binary files a/public/images/pokemon/icons/869-rainbow-swirl.png and b/public/images/pokemon/icons/869-rainbow-swirl.png differ diff --git a/public/images/pokemon/icons/869-ruby-cream.png b/public/images/pokemon/icons/869-ruby-cream.png index 2b4d059e8..27bc10bd6 100644 Binary files a/public/images/pokemon/icons/869-ruby-cream.png and b/public/images/pokemon/icons/869-ruby-cream.png differ diff --git a/public/images/pokemon/icons/869-ruby-swirl.png b/public/images/pokemon/icons/869-ruby-swirl.png index db5dc5b9b..c0d90466b 100644 Binary files a/public/images/pokemon/icons/869-ruby-swirl.png and b/public/images/pokemon/icons/869-ruby-swirl.png differ diff --git a/public/images/pokemon/icons/869-salted-cream.png b/public/images/pokemon/icons/869-salted-cream.png index d2ca458f2..b876c05b4 100644 Binary files a/public/images/pokemon/icons/869-salted-cream.png and b/public/images/pokemon/icons/869-salted-cream.png differ diff --git a/public/images/pokemon/icons/869.png b/public/images/pokemon/icons/869.png index c5f8a3daf..b823b192b 100644 Binary files a/public/images/pokemon/icons/869.png and b/public/images/pokemon/icons/869.png differ diff --git a/public/images/pokemon/icons/870.png b/public/images/pokemon/icons/870.png index d2bfc8f85..7571b5e3f 100644 Binary files a/public/images/pokemon/icons/870.png and b/public/images/pokemon/icons/870.png differ diff --git a/public/images/pokemon/icons/871.png b/public/images/pokemon/icons/871.png index b63656a8d..635afdce6 100644 Binary files a/public/images/pokemon/icons/871.png and b/public/images/pokemon/icons/871.png differ diff --git a/public/images/pokemon/icons/872.png b/public/images/pokemon/icons/872.png index a84a5c695..1b9c51852 100644 Binary files a/public/images/pokemon/icons/872.png and b/public/images/pokemon/icons/872.png differ diff --git a/public/images/pokemon/icons/873.png b/public/images/pokemon/icons/873.png index 049dd614f..46880bdac 100644 Binary files a/public/images/pokemon/icons/873.png and b/public/images/pokemon/icons/873.png differ diff --git a/public/images/pokemon/icons/874.png b/public/images/pokemon/icons/874.png index eccd89592..97a97918c 100644 Binary files a/public/images/pokemon/icons/874.png and b/public/images/pokemon/icons/874.png differ diff --git a/public/images/pokemon/icons/875-no-ice.png b/public/images/pokemon/icons/875-no-ice.png index 424b4b9fc..fc894c930 100644 Binary files a/public/images/pokemon/icons/875-no-ice.png and b/public/images/pokemon/icons/875-no-ice.png differ diff --git a/public/images/pokemon/icons/875.png b/public/images/pokemon/icons/875.png index 38436c131..9de4280b9 100644 Binary files a/public/images/pokemon/icons/875.png and b/public/images/pokemon/icons/875.png differ diff --git a/public/images/pokemon/icons/876-female.png b/public/images/pokemon/icons/876-female.png index e56c19339..5ddf6f4f4 100644 Binary files a/public/images/pokemon/icons/876-female.png and b/public/images/pokemon/icons/876-female.png differ diff --git a/public/images/pokemon/icons/876.png b/public/images/pokemon/icons/876.png index d0c864b1c..d48d711c5 100644 Binary files a/public/images/pokemon/icons/876.png and b/public/images/pokemon/icons/876.png differ diff --git a/public/images/pokemon/icons/877-hangry.png b/public/images/pokemon/icons/877-hangry.png index f2a730c96..8e1e3fc94 100644 Binary files a/public/images/pokemon/icons/877-hangry.png and b/public/images/pokemon/icons/877-hangry.png differ diff --git a/public/images/pokemon/icons/877.png b/public/images/pokemon/icons/877.png index 336466da3..67d9176e1 100644 Binary files a/public/images/pokemon/icons/877.png and b/public/images/pokemon/icons/877.png differ diff --git a/public/images/pokemon/icons/878.png b/public/images/pokemon/icons/878.png index 3351e5c89..8042c4aca 100644 Binary files a/public/images/pokemon/icons/878.png and b/public/images/pokemon/icons/878.png differ diff --git a/public/images/pokemon/icons/879.png b/public/images/pokemon/icons/879.png index c4d9f5541..63466d1b2 100644 Binary files a/public/images/pokemon/icons/879.png and b/public/images/pokemon/icons/879.png differ diff --git a/public/images/pokemon/icons/880.png b/public/images/pokemon/icons/880.png index e036931d3..6f9acf20e 100644 Binary files a/public/images/pokemon/icons/880.png and b/public/images/pokemon/icons/880.png differ diff --git a/public/images/pokemon/icons/881.png b/public/images/pokemon/icons/881.png index 5b3325c32..e41510632 100644 Binary files a/public/images/pokemon/icons/881.png and b/public/images/pokemon/icons/881.png differ diff --git a/public/images/pokemon/icons/882.png b/public/images/pokemon/icons/882.png index c7218f193..ca1a0aa04 100644 Binary files a/public/images/pokemon/icons/882.png and b/public/images/pokemon/icons/882.png differ diff --git a/public/images/pokemon/icons/883.png b/public/images/pokemon/icons/883.png index 17cd6b7a2..0333c08f1 100644 Binary files a/public/images/pokemon/icons/883.png and b/public/images/pokemon/icons/883.png differ diff --git a/public/images/pokemon/icons/884.png b/public/images/pokemon/icons/884.png index 6b432a96b..aa5f1bc5f 100644 Binary files a/public/images/pokemon/icons/884.png and b/public/images/pokemon/icons/884.png differ diff --git a/public/images/pokemon/icons/885.png b/public/images/pokemon/icons/885.png index e05db4b8b..b0800a4b4 100644 Binary files a/public/images/pokemon/icons/885.png and b/public/images/pokemon/icons/885.png differ diff --git a/public/images/pokemon/icons/886.png b/public/images/pokemon/icons/886.png index ab76d5630..6b03c70f9 100644 Binary files a/public/images/pokemon/icons/886.png and b/public/images/pokemon/icons/886.png differ diff --git a/public/images/pokemon/icons/887.png b/public/images/pokemon/icons/887.png index 97b39f680..c9c7deac0 100644 Binary files a/public/images/pokemon/icons/887.png and b/public/images/pokemon/icons/887.png differ diff --git a/public/images/pokemon/icons/888-crowned.png b/public/images/pokemon/icons/888-crowned.png index 9bb1676f5..713f4a497 100644 Binary files a/public/images/pokemon/icons/888-crowned.png and b/public/images/pokemon/icons/888-crowned.png differ diff --git a/public/images/pokemon/icons/888.png b/public/images/pokemon/icons/888.png index 869831a03..e8bf1bb05 100644 Binary files a/public/images/pokemon/icons/888.png and b/public/images/pokemon/icons/888.png differ diff --git a/public/images/pokemon/icons/889-crowned.png b/public/images/pokemon/icons/889-crowned.png index a85ab9d4a..20ce560a7 100644 Binary files a/public/images/pokemon/icons/889-crowned.png and b/public/images/pokemon/icons/889-crowned.png differ diff --git a/public/images/pokemon/icons/889.png b/public/images/pokemon/icons/889.png index 1cde43de5..0ce4501b9 100644 Binary files a/public/images/pokemon/icons/889.png and b/public/images/pokemon/icons/889.png differ diff --git a/public/images/pokemon/icons/890-eternamax.png b/public/images/pokemon/icons/890-eternamax.png index 0c00997b4..120f164c1 100644 Binary files a/public/images/pokemon/icons/890-eternamax.png and b/public/images/pokemon/icons/890-eternamax.png differ diff --git a/public/images/pokemon/icons/890.png b/public/images/pokemon/icons/890.png index e79c77de1..bb5d9b74d 100644 Binary files a/public/images/pokemon/icons/890.png and b/public/images/pokemon/icons/890.png differ diff --git a/public/images/pokemon/icons/891.png b/public/images/pokemon/icons/891.png index 66d17be11..88d5f7f53 100644 Binary files a/public/images/pokemon/icons/891.png and b/public/images/pokemon/icons/891.png differ diff --git a/public/images/pokemon/icons/892-rapid-strike.png b/public/images/pokemon/icons/892-rapid-strike.png index 0791ee84d..f60711ead 100644 Binary files a/public/images/pokemon/icons/892-rapid-strike.png and b/public/images/pokemon/icons/892-rapid-strike.png differ diff --git a/public/images/pokemon/icons/892.png b/public/images/pokemon/icons/892.png index f56ccb50e..1ffb30fd8 100644 Binary files a/public/images/pokemon/icons/892.png and b/public/images/pokemon/icons/892.png differ diff --git a/public/images/pokemon/icons/893-dada.png b/public/images/pokemon/icons/893-dada.png index 61c48c9d7..eb9457f8d 100644 Binary files a/public/images/pokemon/icons/893-dada.png and b/public/images/pokemon/icons/893-dada.png differ diff --git a/public/images/pokemon/icons/893.png b/public/images/pokemon/icons/893.png index 9967815a8..a28497c09 100644 Binary files a/public/images/pokemon/icons/893.png and b/public/images/pokemon/icons/893.png differ diff --git a/public/images/pokemon/icons/894.png b/public/images/pokemon/icons/894.png index 10b998d73..50d2fd6d5 100644 Binary files a/public/images/pokemon/icons/894.png and b/public/images/pokemon/icons/894.png differ diff --git a/public/images/pokemon/icons/895.png b/public/images/pokemon/icons/895.png index 2b5104f5f..ccdda20fe 100644 Binary files a/public/images/pokemon/icons/895.png and b/public/images/pokemon/icons/895.png differ diff --git a/public/images/pokemon/icons/896.png b/public/images/pokemon/icons/896.png index 5193fa015..a95d149ac 100644 Binary files a/public/images/pokemon/icons/896.png and b/public/images/pokemon/icons/896.png differ diff --git a/public/images/pokemon/icons/897.png b/public/images/pokemon/icons/897.png index 0dcb4d6a7..126514e23 100644 Binary files a/public/images/pokemon/icons/897.png and b/public/images/pokemon/icons/897.png differ diff --git a/public/images/pokemon/icons/898-ice.png b/public/images/pokemon/icons/898-ice.png index 661317663..8380cee0c 100644 Binary files a/public/images/pokemon/icons/898-ice.png and b/public/images/pokemon/icons/898-ice.png differ diff --git a/public/images/pokemon/icons/898-shadow.png b/public/images/pokemon/icons/898-shadow.png index 35bbebc35..479ad11c7 100644 Binary files a/public/images/pokemon/icons/898-shadow.png and b/public/images/pokemon/icons/898-shadow.png differ diff --git a/public/images/pokemon/icons/898.png b/public/images/pokemon/icons/898.png index db161d3f6..dbe174893 100644 Binary files a/public/images/pokemon/icons/898.png and b/public/images/pokemon/icons/898.png differ diff --git a/public/images/pokemon/icons/input/resize.ps1 b/public/images/pokemon/icons/input/resize.ps1 index 9d55bb3e1..a714983b2 100644 --- a/public/images/pokemon/icons/input/resize.ps1 +++ b/public/images/pokemon/icons/input/resize.ps1 @@ -1,3 +1,3 @@ Get-ChildItem -Path $dir -Filter *.png | ForEach-Object { - magick.exe convert $_.FullName -gravity center -extent 40x30 $_.FullName + magick.exe convert $_.FullName -background none -gravity center -extent 40x30 $_.FullName } \ No newline at end of file diff --git a/public/images/pokemon/icons/input/transparent.ps1 b/public/images/pokemon/icons/input/transparent.ps1 deleted file mode 100644 index d406f6d11..000000000 --- a/public/images/pokemon/icons/input/transparent.ps1 +++ /dev/null @@ -1,3 +0,0 @@ -Get-ChildItem -Path $dir -Filter *.png | ForEach-Object { - magick.exe convert $_.FullName -alpha on -fill none -draw 'color 0,0 replace' $_.FullName -} \ No newline at end of file diff --git a/public/images/ui/pokemon_icons_8.json b/public/images/ui/pokemon_icons_8.json index 5b3f42bf3..94ec8a7d8 100644 --- a/public/images/ui/pokemon_icons_8.json +++ b/public/images/ui/pokemon_icons_8.json @@ -3291,6 +3291,6 @@ "meta": { "app": "https://www.codeandweb.com/texturepacker", "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:9d68a4b7ba90f28a8faafcd649219a11:d158d08ecfd1d4170e206263fde8fee3:8190d2ecf16422e962cfb1a751b5e1fc$" + "smartupdate": "$TexturePacker:SmartUpdate:1b4924c94f0f55a9a20fb08338fbde59:6e04c9cb19b3def058f735f7c9250448:8190d2ecf16422e962cfb1a751b5e1fc$" } } diff --git a/public/images/ui/pokemon_icons_8.png b/public/images/ui/pokemon_icons_8.png index 631ee470d..cf2635246 100644 Binary files a/public/images/ui/pokemon_icons_8.png and b/public/images/ui/pokemon_icons_8.png differ diff --git a/src/arena.ts b/src/arena.ts index 88f5b57aa..0d6587b47 100644 --- a/src/arena.ts +++ b/src/arena.ts @@ -127,7 +127,7 @@ export class Arena { switch (this.biomeType) { case Biome.BEACH: return 1; - case Biome.CITY: + case Biome.SLUM: return 2; } break; @@ -145,6 +145,14 @@ export class Arena { if (!this.isDaytime()) return 1; } + case Species.CALYREX: + switch (this.biomeType) { + case Biome.SNOWY_FOREST: + return 1; + case Biome.GRAVEYARD: + return 2; + } + break; } return 0; @@ -154,13 +162,14 @@ export class Arena { switch (this.biomeType) { case Biome.TOWN: case Biome.PLAINS: + case Biome.METROPOLIS: return Type.NORMAL; case Biome.GRASS: case Biome.TALL_GRASS: return Type.GRASS; case Biome.FOREST: return Type.BUG; - case Biome.CITY: + case Biome.SLUM: case Biome.SWAMP: return Type.POISON; case Biome.SEA: @@ -176,6 +185,7 @@ export class Arena { case Biome.DESERT: return Type.ROCK; case Biome.ICE_CAVE: + case Biome.SNOWY_FOREST: return Type.ICE; case Biome.MEADOW: case Biome.FAIRY_CAVE: @@ -245,7 +255,9 @@ export class Arena { getTrainerChance(): integer { switch (this.biomeType) { - case Biome.CITY: + case Biome.METROPOLIS: + return 2; + case Biome.SLUM: case Biome.BEACH: case Biome.DOJO: case Biome.CONSTRUCTION_SITE: @@ -266,6 +278,7 @@ export class Arena { case Biome.POWER_PLANT: case Biome.GRAVEYARD: case Biome.FACTORY: + case Biome.SNOWY_FOREST: return 8; case Biome.ICE_CAVE: case Biome.VOLCANO: @@ -289,6 +302,7 @@ export class Arena { case Biome.TOWN: case Biome.PLAINS: case Biome.GRASS: + case Biome.METROPOLIS: case Biome.SEA: case Biome.BEACH: case Biome.LAKE: @@ -299,6 +313,7 @@ export class Arena { case Biome.DOJO: case Biome.CONSTRUCTION_SITE: case Biome.ISLAND: + case Biome.SNOWY_FOREST: return true; } } @@ -352,8 +367,8 @@ export class Arena { return 1.995; case Biome.TALL_GRASS: return 9.608; - case Biome.CITY: - return 1.221; + case Biome.METROPOLIS: + return 4.867; case Biome.FOREST: return 4.294; case Biome.SEA: @@ -408,6 +423,10 @@ export class Arena { return 2.751; case Biome.LABORATORY: return 0.797; + case Biome.SLUM: + return 1.221; + case Biome.SNOWY_FOREST: + return 3.047; } } } @@ -417,8 +436,9 @@ export function getBiomeKey(biome: Biome): string { case Biome.POWER_PLANT: case Biome.TEMPLE: return 'ruins'; + case Biome.METROPOLIS: case Biome.CONSTRUCTION_SITE: - return 'city'; + return 'slum'; case Biome.JUNGLE: return 'tall_grass'; case Biome.FAIRY_CAVE: @@ -427,6 +447,8 @@ export function getBiomeKey(biome: Biome): string { return 'beach'; case Biome.LABORATORY: return 'factory'; + case Biome.SNOWY_FOREST: + return 'ice_cave'; case Biome.END: return 'wasteland'; } diff --git a/src/battle-scene.ts b/src/battle-scene.ts index f1ec883e4..8eaf96285 100644 --- a/src/battle-scene.ts +++ b/src/battle-scene.ts @@ -132,8 +132,6 @@ export default class BattleScene extends Phaser.Scene { initSpecies(); initMoves(); initAbilities(); - - this.gameData = new GameData(this); this.phaseQueue = []; this.phaseQueuePrepend = []; @@ -345,6 +343,8 @@ export default class BattleScene extends Phaser.Scene { create() { initGameSpeed.apply(this); + this.gameData = new GameData(this); + this.setupControls(); this.load.setBaseURL(); @@ -854,13 +854,13 @@ export default class BattleScene extends Phaser.Scene { randomSpecies(waveIndex: integer, level: integer, fromArenaPool?: boolean, speciesFilter?: PokemonSpeciesFilter, filterAllEvolutions?: boolean): PokemonSpecies { if (fromArenaPool) return this.arena.randomSpecies(waveIndex, level); - const filteredSpecies = speciesFilter ? [...new Set(allSpecies.filter(s => s.generation <= 7).filter(speciesFilter).map(s => { + const filteredSpecies = speciesFilter ? [...new Set(allSpecies.filter(s => s.generation <= 8).filter(speciesFilter).map(s => { if (!filterAllEvolutions) { while (pokemonPrevolutions.hasOwnProperty(s.speciesId)) s = getPokemonSpecies(pokemonPrevolutions[s.speciesId]); } return s; - }))] : allSpecies.filter(s => s.generation <= 7); + }))] : allSpecies.filter(s => s.generation <= 8); let ret = filteredSpecies[Utils.randSeedInt(filteredSpecies.length)]; if (!filterAllEvolutions) ret = getPokemonSpecies(ret.getSpeciesForLevel(level, true)); diff --git a/src/data/biome.ts b/src/data/biome.ts index 8b617ff79..d13d4a651 100644 --- a/src/data/biome.ts +++ b/src/data/biome.ts @@ -11,7 +11,7 @@ export enum Biome { PLAINS, GRASS, TALL_GRASS, - CITY, + METROPOLIS, FOREST, SEA, SWAMP, @@ -37,6 +37,8 @@ export enum Biome { JUNGLE, FAIRY_CAVE, TEMPLE, + SLUM, + SNOWY_FOREST, ISLAND = 40, LABORATORY, END = 50 @@ -69,10 +71,10 @@ interface BiomeDepths { export const biomeLinks: BiomeLinks = { [Biome.TOWN]: Biome.PLAINS, - [Biome.PLAINS]: [ Biome.GRASS, Biome.CITY, Biome.LAKE ], + [Biome.PLAINS]: [ Biome.GRASS, Biome.METROPOLIS, Biome.LAKE ], [Biome.GRASS]: Biome.TALL_GRASS, [Biome.TALL_GRASS]: [ Biome.FOREST, Biome.CAVE ], - [Biome.CITY]: Biome.CONSTRUCTION_SITE, + [Biome.SLUM]: Biome.CONSTRUCTION_SITE, [Biome.FOREST]: [ Biome.JUNGLE, Biome.MEADOW ], [Biome.SEA]: [ Biome.SEABED, Biome.ICE_CAVE ], [Biome.SWAMP]: [ Biome.GRAVEYARD, Biome.TALL_GRASS ], @@ -83,7 +85,7 @@ export const biomeLinks: BiomeLinks = { [Biome.BADLANDS]: [ Biome.DESERT, Biome.MOUNTAIN ], [Biome.CAVE]: [ Biome.BADLANDS, Biome.BEACH ], [Biome.DESERT]: Biome.RUINS, - [Biome.ICE_CAVE]: Biome.LAKE, + [Biome.ICE_CAVE]: Biome.SNOWY_FOREST, [Biome.MEADOW]: [ Biome.PLAINS, [ Biome.FAIRY_CAVE, 2 ] ], [Biome.POWER_PLANT]: Biome.FACTORY, [Biome.VOLCANO]: [ Biome.BEACH, [ Biome.ICE_CAVE, 4 ] ], @@ -97,9 +99,11 @@ export const biomeLinks: BiomeLinks = { [Biome.CONSTRUCTION_SITE]: [ Biome.DOJO, Biome.POWER_PLANT ], [Biome.JUNGLE]: [ Biome.TEMPLE ], [Biome.FAIRY_CAVE]: [ Biome.ICE_CAVE, [ Biome.SPACE, 3 ] ], + [Biome.TEMPLE]: [ Biome.SWAMP, [ Biome.RUINS, 3 ] ], + [Biome.METROPOLIS]: Biome.SLUM, + [Biome.SNOWY_FOREST]: Biome.LAKE, [Biome.ISLAND]: Biome.SEA, - [Biome.LABORATORY]: Biome.CITY, - [Biome.TEMPLE]: [ Biome.SWAMP, [ Biome.RUINS, 3 ] ] + [Biome.LABORATORY]: Biome.METROPOLIS }; export const biomeDepths: BiomeDepths = {} @@ -157,11 +161,16 @@ export const biomePokemonPools: BiomePokemonPools = { Species.BIDOOF, Species.PATRAT, Species.LILLIPUP, - { 1: [ Species.PURRLOIN ], 20: [ Species.LIEPARD ] }, + Species.PURRLOIN, Species.PIDOVE, Species.COTTONEE, Species.FLETCHLING, - { 1: [ Species.SCATTERBUG ], 9: [ Species.SPEWPA ] } + { 1: [ Species.SCATTERBUG ], 9: [ Species.SPEWPA ] }, + Species.YUNGOOS, + Species.SKWOVET, + Species.ROOKIDEE, + Species.BLIPBUG, + Species.WOOLOO ], [BiomePoolTier.UNCOMMON]: [ Species.EKANS, @@ -176,7 +185,7 @@ export const biomePokemonPools: BiomePokemonPools = { Species.IGGLYBUFF, Species.LOTAD, Species.SEEDOT, - { 1: [ Species.SHROOMISH ], 23: [ Species.BRELOOM ] }, + Species.SHROOMISH, Species.NINCADA, Species.WHISMUR, Species.AZURILL, @@ -184,11 +193,11 @@ export const biomePokemonPools: BiomePokemonPools = { Species.KRICKETOT, Species.BUDEW, Species.COMBEE, - { 1: [ Species.CHERUBI ], 25: [ Species.CHERRIM ] }, + Species.CHERUBI, Species.VENIPEDE, Species.MINCCINO ], - [BiomePoolTier.RARE]: [ Species.ABRA, Species.CLEFFA, { 1: [ Species.SURSKIT ], 22: [ Species.MASQUERAIN ] } ], + [BiomePoolTier.RARE]: [ Species.ABRA, Species.CLEFFA, Species.SURSKIT ], [BiomePoolTier.SUPER_RARE]: [ Species.EEVEE, Species.TOGEPI, Species.TYROGUE, Species.SMOOCHUM, Species.ELEKID, Species.MAGBY, Species.RALTS, Species.WYNAUT, Species.BONSLY, Species.MIME_JR, Species.HAPPINY, Species.MUNCHLAX, Species.RIOLU ], [BiomePoolTier.ULTRA_RARE]: [ Species.DITTO ], [BiomePoolTier.BOSS]: [], @@ -203,7 +212,9 @@ export const biomePokemonPools: BiomePokemonPools = { { 1: [ Species.POOCHYENA ], 18: [ Species.MIGHTYENA ] }, { 1: [ Species.ZIGZAGOON ], 20: [ Species.LINOONE ] }, { 1: [ Species.BIDOOF ], 15: [ Species.BIBAREL ] }, - { 1: [ Species.YUNGOOS ], 30: [ Species.GUMSHOOS ] } + { 1: [ Species.YUNGOOS ], 30: [ Species.GUMSHOOS ] }, + { 1: [ Species.SKWOVET ], 24: [ Species.GREEDENT ] }, + { 1: [ Species.ROOKIDEE ], 18: [ Species.CORVISQUIRE ], 38: [ Species.CORVIKNIGHT ] } ], [BiomePoolTier.UNCOMMON]: [ { 1: [ Species.PIDGEY ], 18: [ Species.PIDGEOTTO ], 36: [ Species.PIDGEOT ] }, @@ -219,7 +230,7 @@ export const biomePokemonPools: BiomePokemonPools = { [BiomePoolTier.RARE]: [ { 1: [ Species.ABRA ], 16: [ Species.KADABRA ] }, { 1: [ Species.SHINX ], 15: [ Species.LUXIO ], 30: [ Species.LUXRAY ] }, { 1: [ Species.BUNEARY ], 20: [ Species.LOPUNNY ] } ], [BiomePoolTier.SUPER_RARE]: [ Species.FARFETCHD, Species.LICKITUNG, Species.CHANSEY, Species.EEVEE, Species.SNORLAX, Species.DUNSPARCE ], [BiomePoolTier.ULTRA_RARE]: [ Species.DITTO, Species.LATIAS, Species.LATIOS ], - [BiomePoolTier.BOSS]: [ Species.PERSIAN, Species.DODRIO, Species.FURRET, Species.MIGHTYENA, Species.LINOONE, Species.BIBAREL, Species.LOPUNNY, Species.GUMSHOOS ], + [BiomePoolTier.BOSS]: [ Species.PERSIAN, Species.DODRIO, Species.FURRET, Species.MIGHTYENA, Species.LINOONE, Species.BIBAREL, Species.LOPUNNY, Species.GUMSHOOS, Species.GREEDENT ], [BiomePoolTier.BOSS_RARE]: [ Species.FARFETCHD, Species.SNORLAX, Species.LICKILICKY, Species.LYCANROC ], [BiomePoolTier.BOSS_SUPER_RARE]: [ Species.LATIAS, Species.LATIOS ], [BiomePoolTier.BOSS_ULTRA_RARE]: [] @@ -260,20 +271,18 @@ export const biomePokemonPools: BiomePokemonPools = { [BiomePoolTier.BOSS_SUPER_RARE]: [], [BiomePoolTier.BOSS_ULTRA_RARE]: [] }, - [Biome.CITY]: { + [Biome.METROPOLIS]: { [BiomePoolTier.COMMON]: [ { 1: [ Species.RATTATA ], 20: [ Species.RATICATE ] }, - { 1: [ Species.GRIMER ], 38: [ Species.MUK ] }, - { 1: [ Species.KOFFING ], 35: [ Species.WEEZING ] }, + { 1: [ Species.ZIGZAGOON ], 20: [ Species.LINOONE ] }, { 1: [ Species.PATRAT ], 20: [ Species.WATCHOG ] }, - { 1: [ Species.LILLIPUP ], 16: [ Species.HERDIER ], 32: [ Species.STOUTLAND ] }, - { 1: [ Species.TRUBBISH ], 36: [ Species.GARBODOR ] } + { 1: [ Species.LILLIPUP ], 16: [ Species.HERDIER ], 32: [ Species.STOUTLAND ] } ], - [BiomePoolTier.UNCOMMON]: [ { 1: [ Species.BURMY ], 20: [ Species.WORMADAM ] }, { 1: [ Species.STUNKY ], 34: [ Species.SKUNTANK ] }, Species.FURFROU ], - [BiomePoolTier.RARE]: [], + [BiomePoolTier.UNCOMMON]: [ Species.PIKACHU, { 1: [ Species.GLAMEOW ], 38: [ Species.PURUGLY ] }, Species.FURFROU, Species.INDEEDEE ], + [BiomePoolTier.RARE]: [ Species.MORPEKO ], [BiomePoolTier.SUPER_RARE]: [ Species.DITTO, Species.EEVEE, Species.SMEARGLE ], [BiomePoolTier.ULTRA_RARE]: [ Species.CASTFORM ], - [BiomePoolTier.BOSS]: [ Species.MUK, Species.WEEZING, Species.WORMADAM, Species.SKUNTANK, Species.WATCHOG, Species.STOUTLAND, Species.GARBODOR, Species.FURFROU ], + [BiomePoolTier.BOSS]: [ Species.STOUTLAND, Species.FURFROU ], [BiomePoolTier.BOSS_RARE]: [ Species.CASTFORM ], [BiomePoolTier.BOSS_SUPER_RARE]: [], [BiomePoolTier.BOSS_ULTRA_RARE]: [] @@ -304,7 +313,8 @@ export const biomePokemonPools: BiomePokemonPools = { { 1: [ Species.BURMY ], 20: [ Species.MOTHIM, Species.WORMADAM ] }, { 1: [ Species.PANSAGE ], 20: [ Species.SIMISAGE ] }, { 1: [ Species.SEWADDLE ], 20: [ Species.SWADLOON ], 30: [ Species.LEAVANNY ] }, - { 1: [ Species.ROCKRUFF ], 25: [ Species.LYCANROC ] } + { 1: [ Species.ROCKRUFF ], 25: [ Species.LYCANROC ] }, + { 1: [ Species.DOTTLER ], 30: [ Species.ORBEETLE ] } ], [BiomePoolTier.RARE]: [ Species.EXEGGCUTE, @@ -336,21 +346,22 @@ export const biomePokemonPools: BiomePokemonPools = { Species.SIMISAGE, Species.SCOLIPEDE, Species.LILLIGANT, - Species.SAWSBUCK + Species.SAWSBUCK, + Species.ORBEETLE ], [BiomePoolTier.BOSS_RARE]: [ Species.HERACROSS, Species.STANTLER, Species.SCEPTILE, Species.ESCAVALIER, Species.ACCELGOR, Species.DURANT, Species.CHESNAUGHT, Species.DECIDUEYE, Species.LYCANROC ], [BiomePoolTier.BOSS_SUPER_RARE]: [ Species.KARTANA ], - [BiomePoolTier.BOSS_ULTRA_RARE]: [ Species.CELEBI ] + [BiomePoolTier.BOSS_ULTRA_RARE]: [ Species.CELEBI, Species.CALYREX ] }, [Biome.SEA]: { [BiomePoolTier.COMMON]: [ { 1: [ Species.TENTACOOL ], 30: [ Species.TENTACRUEL ] }, { 1: [ Species.HORSEA ], 32: [ Species.SEADRA ] }, { 1: [ Species.WINGULL ], 25: [ Species.PELIPPER ] }, - { 1: [ Species.CARVANHA ], 30: [ Species.SHARPEDO ] }, { 1: [ Species.BUIZEL ], 26: [ Species.FLOATZEL ] }, { 1: [ Species.FINNEON ], 31: [ Species.LUMINEON ] }, - { 1: [ Species.INKAY ], 30: [ Species.MALAMAR ] } + { 1: [ Species.INKAY ], 30: [ Species.MALAMAR ] }, + Species.CRAMORANT ], [BiomePoolTier.UNCOMMON]: [ { 1: [ Species.POLIWAG ], 25: [ Species.POLIWHIRL ] }, @@ -359,13 +370,14 @@ export const biomePokemonPools: BiomePokemonPools = { { 1: [ Species.GOLDEEN ], 33: [ Species.SEAKING ] }, { 1: [ Species.STARYU ], 20: [ Species.STARMIE ] }, { 1: [ Species.MAGIKARP ], 20: [ Species.GYARADOS ] }, + { 1: [ Species.CARVANHA ], 30: [ Species.SHARPEDO ] }, { 1: [ Species.WAILMER ], 40: [ Species.WAILORD ] }, { 1: [ Species.PANPOUR ], 20: [ Species.SIMIPOUR ] } ], [BiomePoolTier.RARE]: [ Species.LAPRAS, { 1: [ Species.PIPLUP ], 16: [ Species.PRINPLUP ], 36: [ Species.EMPOLEON ] }, { 1: [ Species.POPPLIO ], 17: [ Species.BRIONNE ], 36: [ Species.PRIMARINA ] } ], [BiomePoolTier.SUPER_RARE]: [ Species.KINGDRA, { 1: [ Species.TIRTOUGA ], 37: [ Species.CARRACOSTA ] } ], [BiomePoolTier.ULTRA_RARE]: [], - [BiomePoolTier.BOSS]: [ Species.TENTACRUEL, Species.PELIPPER, Species.SHARPEDO, Species.FLOATZEL, Species.LUMINEON, Species.SIMIPOUR, Species.MALAMAR ], + [BiomePoolTier.BOSS]: [ Species.TENTACRUEL, Species.PELIPPER, Species.SHARPEDO, Species.FLOATZEL, Species.LUMINEON, Species.SIMIPOUR, Species.MALAMAR, Species.CRAMORANT ], [BiomePoolTier.BOSS_RARE]: [ Species.KINGDRA, Species.EMPOLEON, Species.PRIMARINA ], [BiomePoolTier.BOSS_SUPER_RARE]: [], [BiomePoolTier.BOSS_ULTRA_RARE]: [ Species.LUGIA ] @@ -389,11 +401,11 @@ export const biomePokemonPools: BiomePokemonPools = { { 1: [ Species.MAREANIE ], 38: [ Species.TOXAPEX ] } ], [BiomePoolTier.RARE]: [ { 1: [ Species.TOTODILE ], 18: [ Species.CROCONAW ], 30: [ Species.FERALIGATR ] }, { 1: [ Species.MUDKIP ], 16: [ Species.MARSHTOMP ], 36: [ Species.SWAMPERT ] } ], - [BiomePoolTier.SUPER_RARE]: [ Species.POLITOED ], + [BiomePoolTier.SUPER_RARE]: [ Species.POLITOED, { 1: [ Species.GALAR_SLOWPOKE ], 37: [ Species.GALAR_SLOWBRO ] }, Species.GALAR_STUNFISK, Species.HISUI_SLIGGOO, Species.HISUI_GOODRA ], [BiomePoolTier.ULTRA_RARE]: [ Species.AZELF, Species.POIPOLE ], [BiomePoolTier.BOSS]: [ Species.ARBOK, Species.POLIWRATH, Species.QUAGSIRE, Species.LUDICOLO, Species.SWALOT, Species.WHISCASH, Species.GASTRODON, Species.SEISMITOAD, Species.STUNFISK, Species.TOXAPEX ], [BiomePoolTier.BOSS_RARE]: [ Species.FERALIGATR, Species.POLITOED, Species.SWAMPERT ], - [BiomePoolTier.BOSS_SUPER_RARE]: [ Species.AZELF, Species.NAGANADEL ], + [BiomePoolTier.BOSS_SUPER_RARE]: [ Species.AZELF, Species.NAGANADEL, Species.GALAR_SLOWBRO, Species.GALAR_SLOWKING, Species.GALAR_STUNFISK, Species.HISUI_GOODRA ], [BiomePoolTier.BOSS_ULTRA_RARE]: [] }, [Biome.BEACH]: { @@ -417,42 +429,65 @@ export const biomePokemonPools: BiomePokemonPools = { [Biome.LAKE]: { [BiomePoolTier.COMMON]: [ { 1: [ Species.PSYDUCK ], 33: [ Species.GOLDUCK ] }, - { 1: [ Species.SLOWPOKE ], 37: [ Species.SLOWBRO ] }, { 1: [ Species.GOLDEEN ], 33: [ Species.SEAKING ] }, { 1: [ Species.MAGIKARP ], 20: [ Species.GYARADOS ] }, { 1: [ Species.MARILL ], 18: [ Species.AZUMARILL ] }, { 1: [ Species.LOTAD ], 14: [ Species.LOMBRE ] }, - { 1: [ Species.DUCKLETT ], 35: [ Species.SWANNA ] } + { 1: [ Species.DUCKLETT ], 35: [ Species.SWANNA ] }, + { 1: [ Species.CHEWTLE ], 22: [ Species.DREDNAW ] } + ], + [BiomePoolTier.UNCOMMON]: [ + { 1: [ Species.SLOWPOKE ], 37: [ Species.SLOWBRO ] }, + { 1: [ Species.WOOPER ], 20: [ Species.QUAGSIRE ] }, + { 1: [ Species.SURSKIT ], 22: [ Species.MASQUERAIN ] }, + Species.WISHIWASHI, + { 1: [ Species.DEWPIDER ], 22: [ Species.ARAQUANID ] } ], - [BiomePoolTier.UNCOMMON]: [ { 1: [ Species.WOOPER ], 20: [ Species.QUAGSIRE ] }, { 1: [ Species.SURSKIT ], 22: [ Species.MASQUERAIN ] }, Species.WISHIWASHI, { 1: [ Species.DEWPIDER ], 22: [ Species.ARAQUANID ] } ], [BiomePoolTier.RARE]: [ { 1: [ Species.SQUIRTLE ], 16: [ Species.WARTORTLE ], 36: [ Species.BLASTOISE ] }, { 1: [ Species.OSHAWOTT ], 17: [ Species.DEWOTT ], 36: [ Species.SAMUROTT ] }, - { 1: [ Species.FROAKIE ], 16: [ Species.FROGADIER ], 36: [ Species.GRENINJA ] } + { 1: [ Species.FROAKIE ], 16: [ Species.FROGADIER ], 36: [ Species.GRENINJA ] }, + { 1: [ Species.SOBBLE ], 16: [ Species.DRIZZILE ], 35: [ Species.INTELEON ] } ], [BiomePoolTier.SUPER_RARE]: [ Species.VAPOREON, Species.SLOWKING ], [BiomePoolTier.ULTRA_RARE]: [ Species.SUICUNE, Species.MESPRIT ], - [BiomePoolTier.BOSS]: [ Species.GOLDUCK, Species.SLOWBRO, Species.SEAKING, Species.GYARADOS, Species.AZUMARILL, Species.MASQUERAIN, Species.SWANNA, Species.WISHIWASHI, Species.ARAQUANID ], - [BiomePoolTier.BOSS_RARE]: [ Species.BLASTOISE, Species.VAPOREON, Species.SLOWKING, Species.SAMUROTT, Species.GRENINJA ], - [BiomePoolTier.BOSS_SUPER_RARE]: [ Species.SUICUNE, Species.MESPRIT ], + [BiomePoolTier.BOSS]: [ Species.GOLDUCK, Species.SLOWBRO, Species.SEAKING, Species.GYARADOS, Species.AZUMARILL, Species.MASQUERAIN, Species.SWANNA, Species.WISHIWASHI, Species.ARAQUANID, Species.DREDNAW ], + [BiomePoolTier.BOSS_RARE]: [ Species.BLASTOISE, Species.VAPOREON, Species.SLOWKING, Species.SAMUROTT, Species.GRENINJA, Species.INTELEON ], + [BiomePoolTier.BOSS_SUPER_RARE]: [ Species.SUICUNE, Species.MESPRIT, Species.HISUI_SAMUROTT ], [BiomePoolTier.BOSS_ULTRA_RARE]: [] }, [Biome.SEABED]: { - [BiomePoolTier.COMMON]: [ { 1: [ Species.CHINCHOU ], 27: [ Species.LANTURN ] }, Species.REMORAID, Species.CLAMPERL, Species.BASCULIN, { 1: [ Species.FRILLISH ], 40: [ Species.JELLICENT ] } ], + [BiomePoolTier.COMMON]: [ + { 1: [ Species.CHINCHOU ], 27: [ Species.LANTURN ] }, + Species.REMORAID, + Species.CLAMPERL, + Species.BASCULIN, + { 1: [ Species.FRILLISH ], 40: [ Species.JELLICENT ] }, + { 1: [ Species.ARROKUDA ], 26: [ Species.BARRASKEWDA ] } + ], [BiomePoolTier.UNCOMMON]: [ { 1: [ Species.TENTACOOL ], 30: [ Species.TENTACRUEL ] }, Species.SHELLDER, { 1: [ Species.WAILMER ], 40: [ Species.WAILORD ] }, Species.LUVDISC, { 1: [ Species.SHELLOS ], 30: [ Species.GASTRODON ] }, - { 1: [ Species.SKRELP ], 48: [ Species.DRAGALGE ] } + { 1: [ Species.SKRELP ], 48: [ Species.DRAGALGE ] }, + Species.PINCURCHIN ], [BiomePoolTier.RARE]: [ Species.QWILFISH, Species.CORSOLA, Species.OCTILLERY, { 1: [ Species.MANTYKE ], 20: [ Species.MANTINE ] }, Species.PHIONE, Species.ALOMOMOLA, { 1: [ Species.TYNAMO ], 39: [ Species.EELEKTRIK ] }, Species.DHELMISE ], - [BiomePoolTier.SUPER_RARE]: [ { 1: [ Species.OMANYTE ], 40: [ Species.OMASTAR ] }, { 1: [ Species.KABUTO ], 40: [ Species.KABUTOPS ] }, Species.RELICANTH, Species.PYUKUMUKU ], + [BiomePoolTier.SUPER_RARE]: [ + { 1: [ Species.OMANYTE ], 40: [ Species.OMASTAR ] }, + { 1: [ Species.KABUTO ], 40: [ Species.KABUTOPS ] }, + Species.RELICANTH, + Species.PYUKUMUKU, + { 1: [ Species.GALAR_CORSOLA ], 38: [ Species.CURSOLA ] }, + Species.ARCTOVISH, + Species.HISUI_QWILFISH + ], [BiomePoolTier.ULTRA_RARE]: [ Species.FEEBAS, Species.MANAPHY, Species.NIHILEGO ], - [BiomePoolTier.BOSS]: [ Species.LANTURN, Species.QWILFISH, Species.CORSOLA, Species.OCTILLERY, Species.MANTINE, Species.WAILORD, Species.HUNTAIL, Species.GOREBYSS, Species.LUVDISC, Species.JELLICENT, Species.ALOMOMOLA, Species.DRAGALGE ], - [BiomePoolTier.BOSS_RARE]: [ Species.OMASTAR, Species.KABUTOPS, Species.RELICANTH, Species.PHIONE, Species.EELEKTROSS, Species.PYUKUMUKU, Species.DHELMISE ], - [BiomePoolTier.BOSS_SUPER_RARE]: [ Species.MILOTIC, Species.MANAPHY, Species.NIHILEGO ], + [BiomePoolTier.BOSS]: [ Species.LANTURN, Species.QWILFISH, Species.CORSOLA, Species.OCTILLERY, Species.MANTINE, Species.WAILORD, Species.HUNTAIL, Species.GOREBYSS, Species.LUVDISC, Species.JELLICENT, Species.ALOMOMOLA, Species.DRAGALGE, Species.BARRASKEWDA ], + [BiomePoolTier.BOSS_RARE]: [ Species.OMASTAR, Species.KABUTOPS, Species.RELICANTH, Species.PHIONE, Species.EELEKTROSS, Species.PYUKUMUKU, Species.DHELMISE, Species.ARCTOVISH, Species.BASCULEGION ], + [BiomePoolTier.BOSS_SUPER_RARE]: [ Species.MILOTIC, Species.MANAPHY, Species.NIHILEGO, Species.CURSOLA, Species.OVERQWIL ], [BiomePoolTier.BOSS_ULTRA_RARE]: [ Species.KYOGRE ] }, [Biome.MOUNTAIN]: { @@ -464,7 +499,8 @@ export const biomePokemonPools: BiomePokemonPools = { { 1: [ Species.STARLY ], 14: [ Species.STARAVIA ], 34: [ Species.STARAPTOR ] }, { 1: [ Species.PIDOVE ], 21: [ Species.TRANQUILL ], 32: [ Species.UNFEZANT ] }, { 1: [ Species.FLETCHLING ], 17: [ Species.FLETCHINDER ], 35: [ Species.TALONFLAME ] }, - { 1: [ Species.SKIDDO ], 32: [ Species.GOGOAT ] } + { 1: [ Species.SKIDDO ], 32: [ Species.GOGOAT ] }, + { 1: [ Species.ROOKIDEE ], 18: [ Species.CORVISQUIRE ], 38: [ Species.CORVIKNIGHT ] } ], [BiomePoolTier.UNCOMMON]: [ { 1: [ Species.MACHOP ], 28: [ Species.MACHOKE ] }, @@ -487,8 +523,8 @@ export const biomePokemonPools: BiomePokemonPools = { { 1: [ Species.AXEW ], 38: [ Species.FRAXURE ] } ], [BiomePoolTier.ULTRA_RARE]: [ Species.TORNADUS ], - [BiomePoolTier.BOSS]: [ Species.PIDGEOT, Species.FEAROW, Species.SKARMORY, Species.SWELLOW, Species.AGGRON, Species.ALTARIA, Species.STARAPTOR, Species.UNFEZANT, Species.BRAVIARY, Species.MANDIBUZZ, Species.TALONFLAME, Species.GOGOAT ], - [BiomePoolTier.BOSS_RARE]: [ Species.BLAZIKEN, Species.RAMPARDOS, Species.BASTIODON, Species.HAWLUCHA ], + [BiomePoolTier.BOSS]: [ Species.PIDGEOT, Species.FEAROW, Species.SKARMORY, Species.SWELLOW, Species.AGGRON, Species.ALTARIA, Species.STARAPTOR, Species.UNFEZANT, Species.BRAVIARY, Species.MANDIBUZZ, Species.TALONFLAME, Species.GOGOAT, Species.CORVIKNIGHT ], + [BiomePoolTier.BOSS_RARE]: [ Species.BLAZIKEN, Species.RAMPARDOS, Species.BASTIODON, Species.HAWLUCHA, Species.HISUI_BRAVIARY ], [BiomePoolTier.BOSS_SUPER_RARE]: [ Species.TORNADUS ], [BiomePoolTier.BOSS_ULTRA_RARE]: [ Species.HO_OH ] }, @@ -502,11 +538,17 @@ export const biomePokemonPools: BiomePokemonPools = { { 1: [ Species.DRILBUR ], 31: [ Species.EXCADRILL ] }, { 1: [ Species.MUDBRAY ], 30: [ Species.MUDSDALE ] } ], - [BiomePoolTier.UNCOMMON]: [ { 1: [ Species.SANDSHREW ], 22: [ Species.SANDSLASH ] }, { 1: [ Species.NUMEL ], 33: [ Species.CAMERUPT ] }, { 1: [ Species.ROGGENROLA ], 25: [ Species.BOLDORE ] } ], + [BiomePoolTier.UNCOMMON]: [ + { 1: [ Species.SANDSHREW ], 22: [ Species.SANDSLASH ] }, + { 1: [ Species.NUMEL ], 33: [ Species.CAMERUPT ] }, + { 1: [ Species.ROGGENROLA ], 25: [ Species.BOLDORE ] }, + { 1: [ Species.SIZZLIPEDE ], 28: [ Species.CENTISKORCH ] }, + { 1: [ Species.CUFANT ], 34: [ Species.COPPERAJAH ] } + ], [BiomePoolTier.RARE]: [ Species.ONIX, Species.GLIGAR ], [BiomePoolTier.SUPER_RARE]: [], [BiomePoolTier.ULTRA_RARE]: [ Species.LANDORUS ], - [BiomePoolTier.BOSS]: [ Species.DUGTRIO, Species.GOLEM, Species.MAROWAK, Species.DONPHAN, Species.RHYPERIOR, Species.GLISCOR, Species.EXCADRILL, Species.MUDSDALE ], + [BiomePoolTier.BOSS]: [ Species.DUGTRIO, Species.GOLEM, Species.MAROWAK, Species.DONPHAN, Species.RHYPERIOR, Species.GLISCOR, Species.EXCADRILL, Species.MUDSDALE, Species.CENTISKORCH, Species.COPPERAJAH ], [BiomePoolTier.BOSS_RARE]: [ Species.STEELIX ], [BiomePoolTier.BOSS_SUPER_RARE]: [ Species.LANDORUS ], [BiomePoolTier.BOSS_ULTRA_RARE]: [ Species.GROUDON ] @@ -544,13 +586,14 @@ export const biomePokemonPools: BiomePokemonPools = { { 1: [ Species.CACNEA ], 32: [ Species.CACTURNE ] }, { 1: [ Species.HIPPOPOTAS ], 34: [ Species.HIPPOWDON ] }, { 1: [ Species.SKORUPI ], 40: [ Species.DRAPION ] }, - { 1: [ Species.SANDILE ], 29: [ Species.KROKOROK ], 40: [ Species.KROOKODILE ] } + { 1: [ Species.SANDILE ], 29: [ Species.KROKOROK ], 40: [ Species.KROOKODILE ] }, + { 1: [ Species.SILICOBRA ], 36: [ Species.SANDACONDA ] } ], [BiomePoolTier.UNCOMMON]: [ Species.MARACTUS, Species.HELIOPTILE ], [BiomePoolTier.RARE]: [ { 1: [ Species.VIBRAVA ], 45: [ Species.FLYGON ] }, { 1: [ Species.DARUMAKA ], 35: [ Species.DARMANITAN ] } ], [BiomePoolTier.SUPER_RARE]: [ { 1: [ Species.LILEEP ], 40: [ Species.CRADILY ] }, { 1: [ Species.ANORITH ], 40: [ Species.ARMALDO ] } ], [BiomePoolTier.ULTRA_RARE]: [ Species.REGIROCK, Species.PHEROMOSA ], - [BiomePoolTier.BOSS]: [ Species.SANDSLASH, Species.CACTURNE, Species.HIPPOWDON, Species.DRAPION, Species.KROOKODILE, Species.DARMANITAN, Species.MARACTUS, Species.HELIOLISK ], + [BiomePoolTier.BOSS]: [ Species.SANDSLASH, Species.CACTURNE, Species.HIPPOWDON, Species.DRAPION, Species.KROOKODILE, Species.DARMANITAN, Species.MARACTUS, Species.HELIOLISK, Species.SANDACONDA ], [BiomePoolTier.BOSS_RARE]: [ Species.CRADILY, Species.ARMALDO ], [BiomePoolTier.BOSS_SUPER_RARE]: [ Species.REGIROCK, Species.PHEROMOSA ], [BiomePoolTier.BOSS_ULTRA_RARE]: [] @@ -559,18 +602,18 @@ export const biomePokemonPools: BiomePokemonPools = { [BiomePoolTier.COMMON]: [ { 1: [ Species.SEEL ], 34: [ Species.DEWGONG ] }, { 1: [ Species.SWINUB ], 33: [ Species.PILOSWINE ] }, - { 1: [ Species.SPHEAL ], 32: [ Species.SEALEO ], 44: [ Species.WALREIN ] }, { 1: [ Species.SNOVER ], 40: [ Species.ABOMASNOW ] }, { 1: [ Species.VANILLITE ], 35: [ Species.VANILLISH ], 47: [ Species.VANILLUXE ] }, { 1: [ Species.CUBCHOO ], 37: [ Species.BEARTIC ] }, { 1: [ Species.BERGMITE ], 37: [ Species.AVALUGG ] }, - { 0: [ Species.CRABOMINABLE ], 1: [ Species.CRABRAWLER ] } + Species.CRABRAWLER, + { 1: [ Species.SNOM ], 20: [ Species.FROSMOTH ] } ], - [BiomePoolTier.UNCOMMON]: [ Species.SNEASEL, { 1: [ Species.SNORUNT ], 42: [ Species.GLALIE ] } ], + [BiomePoolTier.UNCOMMON]: [ Species.SNEASEL, { 1: [ Species.SNORUNT ], 42: [ Species.GLALIE ] }, { 1: [ Species.SPHEAL ], 32: [ Species.SEALEO ], 44: [ Species.WALREIN ] }, Species.EISCUE ], [BiomePoolTier.RARE]: [ Species.JYNX, Species.LAPRAS, Species.FROSLASS, Species.CRYOGONAL ], [BiomePoolTier.SUPER_RARE]: [ Species.DELIBIRD, { 1: [ Species.AMAURA ], 59: [ Species.AURORUS ] } ], - [BiomePoolTier.ULTRA_RARE]: [ Species.REGICE ], - [BiomePoolTier.BOSS]: [ Species.DEWGONG, Species.GLALIE, Species.WALREIN, Species.ABOMASNOW, Species.WEAVILE, Species.MAMOSWINE, Species.FROSLASS, Species.VANILLUXE, Species.BEARTIC, Species.CRYOGONAL, Species.AVALUGG, Species.CRABOMINABLE ], + [BiomePoolTier.ULTRA_RARE]: [ Species.ARTICUNO, Species.REGICE ], + [BiomePoolTier.BOSS]: [ Species.DEWGONG, Species.GLALIE, Species.WALREIN, Species.WEAVILE, Species.MAMOSWINE, Species.FROSLASS, Species.VANILLUXE, Species.BEARTIC, Species.CRYOGONAL, Species.AVALUGG, Species.CRABOMINABLE ], [BiomePoolTier.BOSS_RARE]: [ Species.JYNX, Species.LAPRAS, Species.GLACEON, Species.AURORUS ], [BiomePoolTier.BOSS_SUPER_RARE]: [ Species.ARTICUNO, Species.REGICE ], [BiomePoolTier.BOSS_ULTRA_RARE]: [ Species.KYUREM ] @@ -582,7 +625,9 @@ export const biomePokemonPools: BiomePokemonPools = { { 1: [ Species.BLITZLE ], 27: [ Species.ZEBSTRIKA ] }, { 1: [ Species.COTTONEE ], 20: [ Species.WHIMSICOTT ] }, Species.MINCCINO, - { 1: [ Species.FLABEBE ], 19: [ Species.FLOETTE ] } + { 1: [ Species.FLABEBE ], 19: [ Species.FLOETTE ] }, + { 1: [ Species.GOSSIFLEUR ], 20: [ Species.ELDEGOSS ] }, + { 1: [ Species.WOOLOO ], 24: [ Species.DUBWOOL ] } ], [BiomePoolTier.UNCOMMON]: [ { 1: [ Species.JIGGLYPUFF ], 30: [ Species.WIGGLYTUFF ] }, @@ -594,12 +639,12 @@ export const biomePokemonPools: BiomePokemonPools = { { 1: [ Species.GLAMEOW ], 38: [ Species.PURUGLY ] }, Species.BOUFFALANT ], - [BiomePoolTier.RARE]: [ Species.TAUROS, Species.EEVEE, Species.MILTANK, Species.VOLBEAT, Species.ILLUMISE, Species.SPINDA ], + [BiomePoolTier.RARE]: [ Species.TAUROS, Species.EEVEE, Species.MILTANK, Species.VOLBEAT, Species.ILLUMISE, Species.SPINDA, Species.APPLIN ], [BiomePoolTier.SUPER_RARE]: [ Species.CHANSEY, Species.SYLVEON ], [BiomePoolTier.ULTRA_RARE]: [ Species.MELOETTA ], - [BiomePoolTier.BOSS]: [ Species.TAUROS, Species.LEDIAN, Species.GRANBULL, Species.MILTANK, Species.GARDEVOIR, Species.DELCATTY, Species.ROSERADE, Species.PURUGLY, Species.ZEBSTRIKA, Species.CINCCINO, Species.BOUFFALANT, Species.FLORGES ], - [BiomePoolTier.BOSS_RARE]: [ Species.BLISSEY, Species.SYLVEON ], - [BiomePoolTier.BOSS_SUPER_RARE]: [ Species.MELOETTA ], + [BiomePoolTier.BOSS]: [ Species.TAUROS, Species.LEDIAN, Species.GRANBULL, Species.MILTANK, Species.GARDEVOIR, Species.DELCATTY, Species.ROSERADE, Species.PURUGLY, Species.ZEBSTRIKA, Species.CINCCINO, Species.BOUFFALANT, Species.FLORGES, Species.DUBWOOL ], + [BiomePoolTier.BOSS_RARE]: [ Species.BLISSEY, Species.SYLVEON, Species.FLAPPLE, Species.APPLETUN ], + [BiomePoolTier.BOSS_SUPER_RARE]: [ Species.MELOETTA, Species.HISUI_LILLIGANT ], [BiomePoolTier.BOSS_ULTRA_RARE]: [] }, [Biome.POWER_PLANT]: { @@ -613,12 +658,12 @@ export const biomePokemonPools: BiomePokemonPools = { { 1: [ Species.GRUBBIN ], 20: [ Species.CHARJABUG ] } ], [BiomePoolTier.UNCOMMON]: [ Species.ELECTABUZZ, Species.PLUSLE, Species.MINUN, Species.PACHIRISU, Species.EMOLGA, Species.TOGEDEMARU ], - [BiomePoolTier.RARE]: [ { 1: [ Species.MAREEP ], 15: [ Species.FLAAFFY ] } ], + [BiomePoolTier.RARE]: [ { 1: [ Species.MAREEP ], 15: [ Species.FLAAFFY ] }, Species.HISUI_VOLTORB ], [BiomePoolTier.SUPER_RARE]: [ Species.JOLTEON ], - [BiomePoolTier.ULTRA_RARE]: [ Species.RAIKOU, Species.THUNDURUS, Species.XURKITREE, Species.ZERAORA ], + [BiomePoolTier.ULTRA_RARE]: [ Species.RAIKOU, Species.THUNDURUS, Species.XURKITREE, Species.ZERAORA, Species.REGIELEKI ], [BiomePoolTier.BOSS]: [ Species.RAICHU, Species.MANECTRIC, Species.LUXRAY, Species.MAGNEZONE, Species.ELECTIVIRE, Species.DEDENNE, Species.VIKAVOLT, Species.TOGEDEMARU ], - [BiomePoolTier.BOSS_RARE]: [ Species.JOLTEON, Species.AMPHAROS ], - [BiomePoolTier.BOSS_SUPER_RARE]: [ Species.ZAPDOS, Species.RAIKOU, Species.THUNDURUS, Species.XURKITREE, Species.ZERAORA ], + [BiomePoolTier.BOSS_RARE]: [ Species.JOLTEON, Species.AMPHAROS, Species.HISUI_ELECTRODE ], + [BiomePoolTier.BOSS_SUPER_RARE]: [ Species.ZAPDOS, Species.RAIKOU, Species.THUNDURUS, Species.XURKITREE, Species.ZERAORA, Species.REGIELEKI ], [BiomePoolTier.BOSS_ULTRA_RARE]: [ Species.ZEKROM ] }, [Biome.VOLCANO]: { @@ -628,7 +673,8 @@ export const biomePokemonPools: BiomePokemonPools = { { 1: [ Species.PONYTA ], 40: [ Species.RAPIDASH ] }, { 1: [ Species.SLUGMA ], 38: [ Species.MAGCARGO ] }, { 1: [ Species.NUMEL ], 33: [ Species.CAMERUPT ] }, - { 1: [ Species.SALANDIT ], 33: [ Species.SALAZZLE ] } + { 1: [ Species.SALANDIT ], 33: [ Species.SALAZZLE ] }, + { 1: [ Species.ROLYCOLY ], 18: [ Species.CARKOL ], 34: [ Species.COALOSSAL ] } ], [BiomePoolTier.UNCOMMON]: [ Species.MAGMAR, Species.TORKOAL, { 1: [ Species.PANSEAR ], 20: [ Species.SIMISEAR ] }, Species.HEATMOR, Species.TURTONATOR ], [BiomePoolTier.RARE]: [ @@ -637,13 +683,14 @@ export const biomePokemonPools: BiomePokemonPools = { { 1: [ Species.CHIMCHAR ], 14: [ Species.MONFERNO ], 36: [ Species.INFERNAPE ] }, { 1: [ Species.TEPIG ], 17: [ Species.PIGNITE ], 36: [ Species.EMBOAR ] }, { 1: [ Species.FENNEKIN ], 16: [ Species.BRAIXEN ], 36: [ Species.DELPHOX ] }, - { 1: [ Species.LITTEN ], 17: [ Species.TORRACAT ], 36: [ Species.INCINEROAR ] } + { 1: [ Species.LITTEN ], 17: [ Species.TORRACAT ], 36: [ Species.INCINEROAR ] }, + { 1: [ Species.SCORBUNNY ], 16: [ Species.RABOOT ], 35: [ Species.CINDERACE ] } ], - [BiomePoolTier.SUPER_RARE]: [ Species.FLAREON, { 1: [ Species.LARVESTA ], 59: [ Species.VOLCARONA ] } ], + [BiomePoolTier.SUPER_RARE]: [ Species.FLAREON, { 1: [ Species.LARVESTA ], 59: [ Species.VOLCARONA ] }, Species.HISUI_GROWLITHE ], [BiomePoolTier.ULTRA_RARE]: [ Species.ENTEI, Species.HEATRAN, Species.VOLCANION ], - [BiomePoolTier.BOSS]: [ Species.NINETALES, Species.ARCANINE, Species.RAPIDASH, Species.MAGCARGO, Species.CAMERUPT, Species.TORKOAL, Species.MAGMORTAR, Species.SIMISEAR, Species.HEATMOR, Species.SALAZZLE, Species.TURTONATOR ], - [BiomePoolTier.BOSS_RARE]: [ Species.CHARIZARD, Species.FLAREON, Species.TYPHLOSION, Species.INFERNAPE, Species.EMBOAR, Species.VOLCARONA, Species.DELPHOX, Species.INCINEROAR ], - [BiomePoolTier.BOSS_SUPER_RARE]: [ Species.MOLTRES, Species.ENTEI, Species.HEATRAN, Species.VOLCANION ], + [BiomePoolTier.BOSS]: [ Species.NINETALES, Species.ARCANINE, Species.RAPIDASH, Species.MAGCARGO, Species.CAMERUPT, Species.TORKOAL, Species.MAGMORTAR, Species.SIMISEAR, Species.HEATMOR, Species.SALAZZLE, Species.TURTONATOR, Species.COALOSSAL ], + [BiomePoolTier.BOSS_RARE]: [ Species.CHARIZARD, Species.FLAREON, Species.TYPHLOSION, Species.INFERNAPE, Species.EMBOAR, Species.VOLCARONA, Species.DELPHOX, Species.INCINEROAR, Species.CINDERACE ], + [BiomePoolTier.BOSS_SUPER_RARE]: [ Species.MOLTRES, Species.ENTEI, Species.HEATRAN, Species.VOLCANION, Species.HISUI_ARCANINE, Species.HISUI_TYPHLOSION ], [BiomePoolTier.BOSS_ULTRA_RARE]: [ Species.RESHIRAM ] }, [Biome.GRAVEYARD]: { @@ -656,30 +703,36 @@ export const biomePokemonPools: BiomePokemonPools = { Species.PHANTUMP, Species.PUMPKABOO ], - [BiomePoolTier.UNCOMMON]: [ { 1: [ Species.CUBONE ], 28: [ Species.MAROWAK ] }, { 1: [ Species.YAMASK ], 34: [ Species.COFAGRIGUS ] }, { 1: [ Species.ESPURR ], 25: [ Species.MEOWSTIC ] } ], + [BiomePoolTier.UNCOMMON]: [ + { 1: [ Species.CUBONE ], 28: [ Species.MAROWAK ] }, + { 1: [ Species.YAMASK ], 34: [ Species.COFAGRIGUS ] }, + { 1: [ Species.ESPURR ], 25: [ Species.MEOWSTIC ] }, + { 1: [ Species.SINISTEA ], 30: [ Species.POLTEAGEIST ] } + ], [BiomePoolTier.RARE]: [ Species.MISDREAVUS, Species.MIMIKYU ], [BiomePoolTier.SUPER_RARE]: [ Species.SPIRITOMB ], - [BiomePoolTier.ULTRA_RARE]: [ Species.MARSHADOW ], - [BiomePoolTier.BOSS]: [ Species.GENGAR, Species.BANETTE, Species.DRIFBLIM, Species.MISMAGIUS, Species.DUSKNOIR, Species.CHANDELURE, Species.MEOWSTIC, Species.TREVENANT, Species.GOURGEIST, Species.MIMIKYU ], + [BiomePoolTier.ULTRA_RARE]: [ Species.MARSHADOW, Species.SPECTRIER ], + [BiomePoolTier.BOSS]: [ Species.GENGAR, Species.BANETTE, Species.DRIFBLIM, Species.MISMAGIUS, Species.DUSKNOIR, Species.CHANDELURE, Species.MEOWSTIC, Species.TREVENANT, Species.GOURGEIST, Species.MIMIKYU, Species.POLTEAGEIST ], [BiomePoolTier.BOSS_RARE]: [], - [BiomePoolTier.BOSS_SUPER_RARE]: [ Species.MARSHADOW ], - [BiomePoolTier.BOSS_ULTRA_RARE]: [ Species.GIRATINA ] + [BiomePoolTier.BOSS_SUPER_RARE]: [ Species.MARSHADOW, Species.SPECTRIER ], + [BiomePoolTier.BOSS_ULTRA_RARE]: [ Species.GIRATINA, Species.CALYREX ] }, [Biome.DOJO]: { [BiomePoolTier.COMMON]: [ { 1: [ Species.MANKEY ], 28: [ Species.PRIMEAPE ] }, { 1: [ Species.MAKUHITA ], 24: [ Species.HARIYAMA ] }, { 1: [ Species.MEDITITE ], 37: [ Species.MEDICHAM ] }, - { 1: [ Species.STUFFUL ], 27: [ Species.BEWEAR ] } + { 1: [ Species.STUFFUL ], 27: [ Species.BEWEAR ] }, + { 1: [ Species.CLOBBOPUS ], 20: [ Species.GRAPPLOCT ] } ], [BiomePoolTier.UNCOMMON]: [ { 1: [ Species.CROAGUNK ], 37: [ Species.TOXICROAK ] }, { 1: [ Species.SCRAGGY ], 39: [ Species.SCRAFTY ] }, { 1: [ Species.MIENFOO ], 50: [ Species.MIENSHAO ] } ], [BiomePoolTier.RARE]: [ { 1: [ Species.TYROGUE ], 20: [ Species.HITMONLEE ] }, Species.HITMONCHAN, Species.LUCARIO, Species.THROH, Species.SAWK ], - [BiomePoolTier.SUPER_RARE]: [ Species.HITMONTOP, Species.GALLADE ], - [BiomePoolTier.ULTRA_RARE]: [ Species.TERRAKION ], - [BiomePoolTier.BOSS]: [ Species.PRIMEAPE, Species.HITMONLEE, Species.HITMONCHAN, Species.HARIYAMA, Species.MEDICHAM, Species.LUCARIO, Species.TOXICROAK, Species.THROH, Species.SAWK, Species.SCRAFTY, Species.MIENSHAO, Species.BEWEAR ], + [BiomePoolTier.SUPER_RARE]: [ Species.HITMONTOP, Species.GALLADE, Species.GALAR_FARFETCHD ], + [BiomePoolTier.ULTRA_RARE]: [ Species.TERRAKION, Species.KUBFU, Species.GALAR_ZAPDOS ], + [BiomePoolTier.BOSS]: [ Species.PRIMEAPE, Species.HITMONLEE, Species.HITMONCHAN, Species.HARIYAMA, Species.MEDICHAM, Species.LUCARIO, Species.TOXICROAK, Species.THROH, Species.SAWK, Species.SCRAFTY, Species.MIENSHAO, Species.BEWEAR, Species.GRAPPLOCT ], [BiomePoolTier.BOSS_RARE]: [ Species.HITMONTOP, Species.GALLADE ], - [BiomePoolTier.BOSS_SUPER_RARE]: [ Species.TERRAKION ], - [BiomePoolTier.BOSS_ULTRA_RARE]: [] + [BiomePoolTier.BOSS_SUPER_RARE]: [ Species.TERRAKION, Species.SIRFETCHD, Species.URSHIFU, Species.HISUI_DECIDUEYE ], + [BiomePoolTier.BOSS_ULTRA_RARE]: [ Species.ZAMAZENTA, Species.GALAR_ZAPDOS ] }, [Biome.FACTORY]: { [BiomePoolTier.COMMON]: [ @@ -708,12 +761,12 @@ export const biomePokemonPools: BiomePokemonPools = { { 1: [ Species.ELGYEM ], 42: [ Species.BEHEEYEM ] } ], [BiomePoolTier.UNCOMMON]: [ { 1: [ Species.ABRA ], 16: [ Species.KADABRA ] }, Species.SIGILYPH ], - [BiomePoolTier.RARE]: [ Species.MR_MIME, Species.WOBBUFFET, { 1: [ Species.GOTHITA ], 32: [ Species.GOTHORITA ], 41: [ Species.GOTHITELLE ] } ], - [BiomePoolTier.SUPER_RARE]: [ Species.ESPEON, { 1: [ Species.ARCHEN ], 37: [ Species.ARCHEOPS ] } ], + [BiomePoolTier.RARE]: [ Species.MR_MIME, Species.WOBBUFFET, { 1: [ Species.GOTHITA ], 32: [ Species.GOTHORITA ], 41: [ Species.GOTHITELLE ] }, Species.STONJOURNER ], + [BiomePoolTier.SUPER_RARE]: [ Species.ESPEON, { 1: [ Species.ARCHEN ], 37: [ Species.ARCHEOPS ] }, { 1: [ Species.GALAR_YAMASK ], 34: [ Species.RUNERIGUS ] } ], [BiomePoolTier.ULTRA_RARE]: [ Species.MEW, Species.VICTINI ], [BiomePoolTier.BOSS]: [ Species.ALAKAZAM, Species.HYPNO, Species.XATU, Species.GRUMPIG, Species.CLAYDOL, Species.SIGILYPH, Species.GOTHITELLE, Species.BEHEEYEM ], [BiomePoolTier.BOSS_RARE]: [ Species.MR_MIME, Species.ESPEON, Species.WOBBUFFET, Species.ARCHEOPS ], - [BiomePoolTier.BOSS_SUPER_RARE]: [ Species.VICTINI ], + [BiomePoolTier.BOSS_SUPER_RARE]: [ Species.VICTINI, Species.RUNERIGUS ], [BiomePoolTier.BOSS_ULTRA_RARE]: [ Species.MEW ] }, [Biome.WASTELAND]: { @@ -727,24 +780,32 @@ export const biomePokemonPools: BiomePokemonPools = { { 1: [ Species.JANGMO_O ], 35: [ Species.HAKAMO_O ], 45: [ Species.KOMMO_O ] } ], [BiomePoolTier.UNCOMMON]: [ { 1: [ Species.SWABLU ], 35: [ Species.ALTARIA ] }, { 1: [ Species.DEINO ], 50: [ Species.ZWEILOUS ], 64: [ Species.HYDREIGON ] }, Species.DRAMPA ], - [BiomePoolTier.RARE]: [ { 1: [ Species.DRATINI ], 30: [ Species.DRAGONAIR ], 55: [ Species.DRAGONITE ] } ], - [BiomePoolTier.SUPER_RARE]: [ Species.AERODACTYL, Species.DRUDDIGON, { 1: [ Species.TYRUNT ], 59: [ Species.TYRANTRUM ] } ], - [BiomePoolTier.ULTRA_RARE]: [], - [BiomePoolTier.BOSS]: [ Species.DRAGONITE, Species.TYRANITAR, Species.FLYGON, Species.SALAMENCE, Species.GARCHOMP, Species.HAXORUS, Species.GOODRA, Species.DRAMPA, Species.KOMMO_O ], - [BiomePoolTier.BOSS_RARE]: [ Species.AERODACTYL, Species.DRUDDIGON, Species.TYRANTRUM ], - [BiomePoolTier.BOSS_SUPER_RARE]: [], + [BiomePoolTier.RARE]: [ { 1: [ Species.DRATINI ], 30: [ Species.DRAGONAIR ], 55: [ Species.DRAGONITE ] }, { 1: [ Species.DREEPY ], 50: [ Species.DRAKLOAK ], 60: [ Species.DRAGAPULT ] } ], + [BiomePoolTier.SUPER_RARE]: [ Species.AERODACTYL, Species.DRUDDIGON, { 1: [ Species.TYRUNT ], 59: [ Species.TYRANTRUM ] }, Species.DRACOZOLT, Species.DRACOVISH ], + [BiomePoolTier.ULTRA_RARE]: [ Species.REGIDRAGO ], + [BiomePoolTier.BOSS]: [ Species.DRAGONITE, Species.TYRANITAR, Species.FLYGON, Species.SALAMENCE, Species.GARCHOMP, Species.HAXORUS, Species.GOODRA, Species.DRAMPA, Species.KOMMO_O, Species.DRAGAPULT ], + [BiomePoolTier.BOSS_RARE]: [ Species.AERODACTYL, Species.DRUDDIGON, Species.TYRANTRUM, Species.DRACOZOLT, Species.DRACOVISH ], + [BiomePoolTier.BOSS_SUPER_RARE]: [ Species.REGIDRAGO ], [BiomePoolTier.BOSS_ULTRA_RARE]: [ Species.DIALGA ] }, [Biome.ABYSS]: { - [BiomePoolTier.COMMON]: [ Species.MURKROW, { 1: [ Species.HOUNDOUR ], 24: [ Species.HOUNDOOM ] }, Species.SABLEYE, { 1: [ Species.PURRLOIN ], 20: [ Species.LIEPARD ] }, { 1: [ Species.PAWNIARD ], 52: [ Species.BISHARP ] } ], + [BiomePoolTier.COMMON]: [ + Species.MURKROW, + { 1: [ Species.HOUNDOUR ], 24: [ Species.HOUNDOOM ] }, + Species.SABLEYE, + { 1: [ Species.PURRLOIN ], 20: [ Species.LIEPARD ] }, + { 1: [ Species.PAWNIARD ], 52: [ Species.BISHARP ] }, + { 1: [ Species.NICKIT ], 18: [ Species.THIEVUL ] }, + { 1: [ Species.IMPIDIMP ], 32: [ Species.MORGREM ], 42: [ Species.GRIMMSNARL ] } + ], [BiomePoolTier.UNCOMMON]: [], [BiomePoolTier.RARE]: [ Species.ABSOL, Species.SPIRITOMB, { 1: [ Species.ZORUA ], 30: [ Species.ZOROARK ] }, { 1: [ Species.DEINO ], 50: [ Species.ZWEILOUS ], 64: [ Species.HYDREIGON ] } ], [BiomePoolTier.SUPER_RARE]: [ Species.UMBREON ], - [BiomePoolTier.ULTRA_RARE]: [ Species.DARKRAI, Species.GUZZLORD ], - [BiomePoolTier.BOSS]: [ Species.HOUNDOOM, Species.SABLEYE, Species.ABSOL, Species.HONCHKROW, Species.SPIRITOMB, Species.LIEPARD, Species.ZOROARK, Species.BISHARP, Species.HYDREIGON ], + [BiomePoolTier.ULTRA_RARE]: [ Species.DARKRAI, Species.GUZZLORD, Species.GALAR_MOLTRES ], + [BiomePoolTier.BOSS]: [ Species.HOUNDOOM, Species.SABLEYE, Species.ABSOL, Species.HONCHKROW, Species.SPIRITOMB, Species.LIEPARD, Species.ZOROARK, Species.BISHARP, Species.HYDREIGON, Species.THIEVUL, Species.GRIMMSNARL ], [BiomePoolTier.BOSS_RARE]: [ Species.UMBREON ], [BiomePoolTier.BOSS_SUPER_RARE]: [ Species.DARKRAI, Species.GUZZLORD ], - [BiomePoolTier.BOSS_ULTRA_RARE]: [ Species.PALKIA, Species.YVELTAL ] + [BiomePoolTier.BOSS_ULTRA_RARE]: [ Species.PALKIA, Species.YVELTAL, Species.GALAR_MOLTRES ] }, [Biome.SPACE]: { [BiomePoolTier.COMMON]: [ Species.CLEFAIRY, Species.LUNATONE, Species.SOLROCK, { 1: [ Species.BRONZOR ], 33: [ Species.BRONZONG ] }, { 1: [ Species.MUNNA ], 30: [ Species.MUSHARNA ] }, Species.MINIOR ], @@ -770,12 +831,12 @@ export const biomePokemonPools: BiomePokemonPools = { { 1: [ Species.RHYHORN ], 42: [ Species.RHYDON ] }, { 1: [ Species.SCRAGGY ], 39: [ Species.SCRAFTY ] } ], - [BiomePoolTier.RARE]: [ Species.ONIX, { 1: [ Species.TYROGUE ], 20: [ Species.HITMONLEE ] }, Species.HITMONCHAN ], - [BiomePoolTier.SUPER_RARE]: [ Species.DITTO, Species.HITMONTOP ], + [BiomePoolTier.RARE]: [ Species.ONIX, { 1: [ Species.TYROGUE ], 20: [ Species.HITMONLEE ] }, Species.HITMONCHAN, Species.DURALUDON ], + [BiomePoolTier.SUPER_RARE]: [ Species.DITTO, Species.HITMONTOP, { 1: [ Species.GALAR_MEOWTH ], 28: [ Species.PERRSERKER ] } ], [BiomePoolTier.ULTRA_RARE]: [ Species.COBALION ], [BiomePoolTier.BOSS]: [ Species.MACHAMP, Species.CONKELDURR ], [BiomePoolTier.BOSS_RARE]: [], - [BiomePoolTier.BOSS_SUPER_RARE]: [ Species.COBALION ], + [BiomePoolTier.BOSS_SUPER_RARE]: [ Species.COBALION, Species.PERRSERKER ], [BiomePoolTier.BOSS_ULTRA_RARE]: [] }, [Biome.JUNGLE]: { @@ -802,7 +863,8 @@ export const biomePokemonPools: BiomePokemonPools = { { 1: [ Species.JOLTIK ], 36: [ Species.GALVANTULA ] }, { 1: [ Species.LITLEO ], 35: [ Species.PYROAR ] }, { 1: [ Species.PANCHAM ], 52: [ Species.PANGORO ] }, - Species.KOMALA + Species.KOMALA, + Species.FALINKS ], [BiomePoolTier.RARE]: [ Species.SCYTHER, @@ -812,10 +874,11 @@ export const biomePokemonPools: BiomePokemonPools = { Species.CARNIVINE, { 1: [ Species.SNIVY ], 17: [ Species.SERVINE ], 36: [ Species.SERPERIOR ] }, Species.ORANGURU, - Species.PASSIMIAN + Species.PASSIMIAN, + { 1: [ Species.GROOKEY ], 16: [ Species.THWACKEY ], 35: [ Species.RILLABOOM ] } ], - [BiomePoolTier.SUPER_RARE]: [ Species.KANGASKHAN, Species.CHATOT ], - [BiomePoolTier.ULTRA_RARE]: [ Species.VIRIZION, Species.BUZZWOLE ], + [BiomePoolTier.SUPER_RARE]: [ Species.KANGASKHAN, Species.CHATOT, Species.KLEAVOR ], + [BiomePoolTier.ULTRA_RARE]: [ Species.VIRIZION, Species.BUZZWOLE, Species.ZARUDE ], [BiomePoolTier.BOSS]: [ Species.EXEGGUTOR, Species.BRELOOM, @@ -832,11 +895,12 @@ export const biomePokemonPools: BiomePokemonPools = { Species.PYROAR, Species.PANGORO, Species.TOUCANNON, - Species.KOMALA + Species.KOMALA, + Species.FALINKS ], - [BiomePoolTier.BOSS_RARE]: [ Species.KANGASKHAN, Species.SCIZOR, Species.SLAKING, Species.LEAFEON, Species.SERPERIOR ], - [BiomePoolTier.BOSS_SUPER_RARE]: [ Species.VIRIZION, Species.BUZZWOLE ], - [BiomePoolTier.BOSS_ULTRA_RARE]: [] + [BiomePoolTier.BOSS_RARE]: [ Species.KANGASKHAN, Species.SCIZOR, Species.SLAKING, Species.LEAFEON, Species.SERPERIOR, Species.RILLABOOM ], + [BiomePoolTier.BOSS_SUPER_RARE]: [ Species.VIRIZION, Species.BUZZWOLE, Species.ZARUDE ], + [BiomePoolTier.BOSS_ULTRA_RARE]: [ Species.KLEAVOR ] }, [Biome.FAIRY_CAVE]: { [BiomePoolTier.COMMON]: [ @@ -846,15 +910,23 @@ export const biomePokemonPools: BiomePokemonPools = { { 1: [ Species.SPRITZEE ], 20: [ Species.AROMATISSE ] }, { 1: [ Species.SWIRLIX ], 20: [ Species.SLURPUFF ] }, { 1: [ Species.CUTIEFLY ], 25: [ Species.RIBOMBEE ] }, - { 1: [ Species.MORELULL ], 24: [ Species.SHIINOTIC ] } + { 1: [ Species.MORELULL ], 24: [ Species.SHIINOTIC ] }, + { 1: [ Species.MILCERY ], 20: [ Species.ALCREMIE ] } + ], + [BiomePoolTier.UNCOMMON]: [ + Species.CLEFAIRY, + Species.TOGETIC, + { 1: [ Species.RALTS ], 20: [ Species.KIRLIA ], 30: [ Species.GARDEVOIR ] }, + Species.CARBINK, + Species.COMFEY, + { 1: [ Species.HATENNA ], 32: [ Species.HATTREM ], 42: [ Species.HATTERENE ] } ], - [BiomePoolTier.UNCOMMON]: [ Species.CLEFAIRY, Species.TOGETIC, { 1: [ Species.RALTS ], 20: [ Species.KIRLIA ], 30: [ Species.GARDEVOIR ] }, Species.CARBINK, Species.COMFEY ], [BiomePoolTier.RARE]: [ Species.AUDINO ], - [BiomePoolTier.SUPER_RARE]: [], - [BiomePoolTier.ULTRA_RARE]: [ Species.DIANCIE ], - [BiomePoolTier.BOSS]: [ Species.WIGGLYTUFF, Species.MAWILE, Species.TOGEKISS, Species.AUDINO, Species.AROMATISSE, Species.SLURPUFF, Species.CARBINK, Species.RIBOMBEE, Species.SHIINOTIC, Species.COMFEY ], + [BiomePoolTier.SUPER_RARE]: [ { 1: [ Species.GALAR_PONYTA ], 40: [ Species.GALAR_RAPIDASH ] } ], + [BiomePoolTier.ULTRA_RARE]: [ Species.DIANCIE, Species.ENAMORUS ], + [BiomePoolTier.BOSS]: [ Species.WIGGLYTUFF, Species.MAWILE, Species.TOGEKISS, Species.AUDINO, Species.AROMATISSE, Species.SLURPUFF, Species.CARBINK, Species.RIBOMBEE, Species.SHIINOTIC, Species.COMFEY, Species.HATTERENE, Species.ALCREMIE ], [BiomePoolTier.BOSS_RARE]: [], - [BiomePoolTier.BOSS_SUPER_RARE]: [ Species.DIANCIE ], + [BiomePoolTier.BOSS_SUPER_RARE]: [ Species.DIANCIE, Species.ENAMORUS, Species.GALAR_RAPIDASH ], [BiomePoolTier.BOSS_ULTRA_RARE]: [ Species.XERNEAS ] }, [Biome.TEMPLE]: { @@ -881,6 +953,48 @@ export const biomePokemonPools: BiomePokemonPools = { [BiomePoolTier.BOSS_SUPER_RARE]: [ Species.HOOPA, Species.TAPU_KOKO, Species.TAPU_LELE, Species.TAPU_BULU, Species.TAPU_FINI ], [BiomePoolTier.BOSS_ULTRA_RARE]: [ Species.REGIGIGAS ] }, + [Biome.SLUM]: { + [BiomePoolTier.COMMON]: [ + { 1: [ Species.RATTATA ], 20: [ Species.RATICATE ] }, + { 1: [ Species.GRIMER ], 38: [ Species.MUK ] }, + { 1: [ Species.KOFFING ], 35: [ Species.WEEZING ] }, + { 1: [ Species.PATRAT ], 20: [ Species.WATCHOG ] }, + { 1: [ Species.TRUBBISH ], 36: [ Species.GARBODOR ] }, + { 1: [ Species.YAMPER ], 25: [ Species.BOLTUND ] } + ], + [BiomePoolTier.UNCOMMON]: [ { 1: [ Species.BURMY ], 20: [ Species.WORMADAM ] }, { 1: [ Species.STUNKY ], 34: [ Species.SKUNTANK ] } ], + [BiomePoolTier.RARE]: [ { 1: [ Species.TOXEL ], 30: [ Species.TOXTRICITY ] }, { 1: [ Species.GALAR_LINOONE ], 65: [ Species.OBSTAGOON ] }, Species.GALAR_ZIGZAGOON ], + [BiomePoolTier.SUPER_RARE]: [], + [BiomePoolTier.ULTRA_RARE]: [], + [BiomePoolTier.BOSS]: [ Species.MUK, Species.WEEZING, Species.WORMADAM, Species.SKUNTANK, Species.WATCHOG, Species.GARBODOR, Species.BOLTUND ], + [BiomePoolTier.BOSS_RARE]: [ Species.TOXTRICITY, Species.OBSTAGOON ], + [BiomePoolTier.BOSS_SUPER_RARE]: [ Species.GALAR_WEEZING ], + [BiomePoolTier.BOSS_ULTRA_RARE]: [] + }, + [Biome.SNOWY_FOREST]: { + [BiomePoolTier.COMMON]: [ + Species.SNEASEL, + { 1: [ Species.TEDDIURSA ], 30: [ Species.URSARING ] }, + { 1: [ Species.SWINUB ], 33: [ Species.PILOSWINE ] }, + { 1: [ Species.SNOVER ], 40: [ Species.ABOMASNOW ] }, + { 1: [ Species.SNOM ], 20: [ Species.FROSMOTH ] }, + Species.EISCUE + ], + [BiomePoolTier.UNCOMMON]: [ Species.STANTLER ], + [BiomePoolTier.RARE]: [ + Species.DELIBIRD, + { 1: [ Species.ALOLA_SANDSHREW ], 30: [ Species.ALOLA_SANDSLASH ] }, + { 1: [ Species.ALOLA_VULPIX ], 30: [ Species.ALOLA_NINETALES ] }, + { 1: [ Species.GALAR_DARUMAKA ], 30: [ Species.GALAR_DARMANITAN ] }, + Species.HISUI_AVALUGG + ], + [BiomePoolTier.SUPER_RARE]: [ { 1: [ Species.GALAR_MR_MIME ], 42: [ Species.MR_RIME ] }, Species.ARCTOZOLT, Species.HISUI_SNEASEL, { 1: [ Species.HISUI_ZORUA ], 30: [ Species.HISUI_ZOROARK ] } ], + [BiomePoolTier.ULTRA_RARE]: [ Species.GLASTRIER, Species.GALAR_ARTICUNO ], + [BiomePoolTier.BOSS]: [ Species.ABOMASNOW, Species.FROSMOTH, Species.WYRDEER, Species.URSALUNA ], + [BiomePoolTier.BOSS_RARE]: [ Species.ARCTOZOLT, Species.ALOLA_SANDSLASH, Species.ALOLA_NINETALES ], + [BiomePoolTier.BOSS_SUPER_RARE]: [ Species.MR_RIME, Species.GLASTRIER, Species.SNEASLER, Species.GALAR_DARMANITAN, Species.HISUI_ZOROARK ], + [BiomePoolTier.BOSS_ULTRA_RARE]: [ Species.ZACIAN, Species.CALYREX, Species.GALAR_ARTICUNO ] + }, [Biome.ISLAND]: { [BiomePoolTier.COMMON]: [ { 1: [ Species.ALOLA_RATTATA ], 30: [ Species.ALOLA_RATICATE ] }, @@ -891,7 +1005,7 @@ export const biomePokemonPools: BiomePokemonPools = { { 1: [ Species.ALOLA_GEODUDE ], 20: [ Species.ALOLA_GOLEM ], 25: [ Species.ALOLA_GRAVELER ] }, { 1: [ Species.ALOLA_GRIMER ], 38: [ Species.ALOLA_MUK ] } ], - [BiomePoolTier.UNCOMMON]: [ Species.ORICORIO, Species.BRUXISH, Species.ALOLA_RAICHU, Species.ALOLA_SANDSLASH, Species.ALOLA_EXEGGUTOR, Species.ALOLA_MAROWAK ], + [BiomePoolTier.UNCOMMON]: [ Species.ORICORIO, Species.BRUXISH, Species.ALOLA_RAICHU, Species.ALOLA_EXEGGUTOR, Species.ALOLA_MAROWAK ], [BiomePoolTier.RARE]: [], [BiomePoolTier.SUPER_RARE]: [], [BiomePoolTier.ULTRA_RARE]: [ Species.STAKATAKA, Species.BLACEPHALON ], @@ -900,6 +1014,7 @@ export const biomePokemonPools: BiomePokemonPools = { Species.BRUXISH, Species.ALOLA_RATICATE, Species.ALOLA_RAICHU, + Species.ALOLA_SANDSLASH, Species.ALOLA_NINETALES, Species.ALOLA_DUGTRIO, Species.ALOLA_PERSIAN, @@ -987,9 +1102,9 @@ export const biomeTrainerPools: BiomeTrainerPools = { [BiomePoolTier.BOSS_SUPER_RARE]: [], [BiomePoolTier.BOSS_ULTRA_RARE]: [] }, - [Biome.CITY]: { - [BiomePoolTier.COMMON]: [ TrainerType.BAKER, TrainerType.CYCLIST ], - [BiomePoolTier.UNCOMMON]: [ TrainerType.BREEDER, TrainerType.GUITARIST ], + [Biome.METROPOLIS]: { + [BiomePoolTier.COMMON]: [ TrainerType.CLERK, TrainerType.CYCLIST, TrainerType.OFFICER ], + [BiomePoolTier.UNCOMMON]: [ TrainerType.BREEDER, TrainerType.DEPOT_AGENT, TrainerType.GUITARIST ], [BiomePoolTier.RARE]: [ TrainerType.ARTIST ], [BiomePoolTier.SUPER_RARE]: [], [BiomePoolTier.ULTRA_RARE]: [], @@ -1109,7 +1224,7 @@ export const biomeTrainerPools: BiomeTrainerPools = { [BiomePoolTier.BOSS_ULTRA_RARE]: [] }, [Biome.ICE_CAVE]: { - [BiomePoolTier.COMMON]: [], + [BiomePoolTier.COMMON]: [ TrainerType.SNOW_WORKER ], [BiomePoolTier.UNCOMMON]: [], [BiomePoolTier.RARE]: [], [BiomePoolTier.SUPER_RARE]: [], @@ -1230,7 +1345,7 @@ export const biomeTrainerPools: BiomeTrainerPools = { [BiomePoolTier.BOSS_ULTRA_RARE]: [] }, [Biome.CONSTRUCTION_SITE]: { - [BiomePoolTier.COMMON]: [ TrainerType.WORKER ], + [BiomePoolTier.COMMON]: [ TrainerType.OFFICER, TrainerType.WORKER ], [BiomePoolTier.UNCOMMON]: [], [BiomePoolTier.RARE]: [], [BiomePoolTier.SUPER_RARE]: [], @@ -1273,6 +1388,50 @@ export const biomeTrainerPools: BiomeTrainerPools = { [BiomePoolTier.BOSS_SUPER_RARE]: [], [BiomePoolTier.BOSS_ULTRA_RARE]: [] }, + [Biome.SLUM]: { + [BiomePoolTier.COMMON]: [ TrainerType.BAKER, TrainerType.OFFICER ], + [BiomePoolTier.UNCOMMON]: [], + [BiomePoolTier.RARE]: [], + [BiomePoolTier.SUPER_RARE]: [], + [BiomePoolTier.ULTRA_RARE]: [], + [BiomePoolTier.BOSS]: [ TrainerType.JANINE ], + [BiomePoolTier.BOSS_RARE]: [], + [BiomePoolTier.BOSS_SUPER_RARE]: [], + [BiomePoolTier.BOSS_ULTRA_RARE]: [] + }, + [Biome.SNOWY_FOREST]: { + [BiomePoolTier.COMMON]: [ TrainerType.SNOW_WORKER ], + [BiomePoolTier.UNCOMMON]: [], + [BiomePoolTier.RARE]: [], + [BiomePoolTier.SUPER_RARE]: [], + [BiomePoolTier.ULTRA_RARE]: [], + [BiomePoolTier.BOSS]: [ TrainerType.CANDICE ], + [BiomePoolTier.BOSS_RARE]: [], + [BiomePoolTier.BOSS_SUPER_RARE]: [], + [BiomePoolTier.BOSS_ULTRA_RARE]: [] + }, + [Biome.ISLAND]: { + [BiomePoolTier.COMMON]: [], + [BiomePoolTier.UNCOMMON]: [], + [BiomePoolTier.RARE]: [], + [BiomePoolTier.SUPER_RARE]: [], + [BiomePoolTier.ULTRA_RARE]: [], + [BiomePoolTier.BOSS]: [ TrainerType.CANDICE ], + [BiomePoolTier.BOSS_RARE]: [], + [BiomePoolTier.BOSS_SUPER_RARE]: [], + [BiomePoolTier.BOSS_ULTRA_RARE]: [] + }, + [Biome.LABORATORY]: { + [BiomePoolTier.COMMON]: [], + [BiomePoolTier.UNCOMMON]: [], + [BiomePoolTier.RARE]: [], + [BiomePoolTier.SUPER_RARE]: [], + [BiomePoolTier.ULTRA_RARE]: [], + [BiomePoolTier.BOSS]: [ TrainerType.GIOVANNI ], + [BiomePoolTier.BOSS_RARE]: [], + [BiomePoolTier.BOSS_SUPER_RARE]: [], + [BiomePoolTier.BOSS_ULTRA_RARE]: [] + }, [Biome.END]: { [BiomePoolTier.COMMON]: [], [BiomePoolTier.UNCOMMON]: [], @@ -1370,11 +1529,13 @@ export const biomeTrainerPools: BiomeTrainerPools = { ], [ Species.RATTATA, Type.NORMAL, -1, [ [ Biome.TOWN, BiomePoolTier.COMMON ], - [ Biome.CITY, BiomePoolTier.COMMON ] + [ Biome.METROPOLIS, BiomePoolTier.COMMON ], + [ Biome.SLUM, BiomePoolTier.COMMON ] ] ], [ Species.RATICATE, Type.NORMAL, -1, [ - [ Biome.CITY, BiomePoolTier.COMMON ] + [ Biome.METROPOLIS, BiomePoolTier.COMMON ], + [ Biome.SLUM, BiomePoolTier.COMMON ] ] ], [ Species.SPEAROW, Type.NORMAL, Type.FLYING, [ @@ -1403,11 +1564,12 @@ export const biomeTrainerPools: BiomeTrainerPools = { ], [ Species.PIKACHU, Type.ELECTRIC, -1, [ [ Biome.PLAINS, BiomePoolTier.UNCOMMON ], + [ Biome.METROPOLIS, BiomePoolTier.UNCOMMON ], [ Biome.POWER_PLANT, BiomePoolTier.COMMON ] ] ], [ Species.RAICHU, Type.ELECTRIC, -1, [ - [ Biome.POWER_PLANT, BiomePoolTier.BOSS ], + [ Biome.POWER_PLANT, BiomePoolTier.BOSS ] ] ], [ Species.SANDSHREW, Type.GROUND, -1, [ @@ -1670,12 +1832,12 @@ export const biomeTrainerPools: BiomeTrainerPools = { ], [ Species.SLOWPOKE, Type.WATER, Type.PSYCHIC, [ [ Biome.SEA, BiomePoolTier.UNCOMMON ], - [ Biome.LAKE, BiomePoolTier.COMMON ] + [ Biome.LAKE, BiomePoolTier.UNCOMMON ] ] ], [ Species.SLOWBRO, Type.WATER, Type.PSYCHIC, [ [ Biome.SEA, BiomePoolTier.UNCOMMON ], - [ Biome.LAKE, BiomePoolTier.COMMON ], + [ Biome.LAKE, BiomePoolTier.UNCOMMON ], [ Biome.LAKE, BiomePoolTier.BOSS ] ] ], @@ -1717,15 +1879,15 @@ export const biomeTrainerPools: BiomeTrainerPools = { ] ], [ Species.GRIMER, Type.POISON, -1, [ - [ Biome.CITY, BiomePoolTier.COMMON ], + [ Biome.SLUM, BiomePoolTier.COMMON ], [ Biome.CONSTRUCTION_SITE, BiomePoolTier.UNCOMMON ], [ Biome.LABORATORY, BiomePoolTier.COMMON ] ] ], [ Species.MUK, Type.POISON, -1, [ [ Biome.CONSTRUCTION_SITE, BiomePoolTier.UNCOMMON ], - [ Biome.CITY, BiomePoolTier.COMMON ], - [ Biome.CITY, BiomePoolTier.BOSS ], + [ Biome.SLUM, BiomePoolTier.COMMON ], + [ Biome.SLUM, BiomePoolTier.BOSS ], [ Biome.LABORATORY, BiomePoolTier.COMMON ], [ Biome.LABORATORY, BiomePoolTier.BOSS ] ] @@ -1831,13 +1993,13 @@ export const biomeTrainerPools: BiomeTrainerPools = { ] ], [ Species.KOFFING, Type.POISON, -1, [ - [ Biome.CITY, BiomePoolTier.COMMON ], + [ Biome.SLUM, BiomePoolTier.COMMON ], [ Biome.CONSTRUCTION_SITE, BiomePoolTier.UNCOMMON ] ] ], [ Species.WEEZING, Type.POISON, -1, [ - [ Biome.CITY, BiomePoolTier.COMMON ], - [ Biome.CITY, BiomePoolTier.BOSS ], + [ Biome.SLUM, BiomePoolTier.COMMON ], + [ Biome.SLUM, BiomePoolTier.BOSS ], [ Biome.CONSTRUCTION_SITE, BiomePoolTier.UNCOMMON ] ] ], @@ -1951,7 +2113,7 @@ export const biomeTrainerPools: BiomeTrainerPools = { [ Species.DITTO, Type.NORMAL, -1, [ [ Biome.TOWN, BiomePoolTier.ULTRA_RARE ], [ Biome.PLAINS, BiomePoolTier.ULTRA_RARE ], - [ Biome.CITY, BiomePoolTier.SUPER_RARE ], + [ Biome.METROPOLIS, BiomePoolTier.SUPER_RARE ], [ Biome.CONSTRUCTION_SITE, BiomePoolTier.SUPER_RARE ], [ Biome.LABORATORY, BiomePoolTier.RARE ] ] @@ -1959,7 +2121,7 @@ export const biomeTrainerPools: BiomeTrainerPools = { [ Species.EEVEE, Type.NORMAL, -1, [ [ Biome.TOWN, BiomePoolTier.SUPER_RARE ], [ Biome.PLAINS, BiomePoolTier.SUPER_RARE ], - [ Biome.CITY, BiomePoolTier.SUPER_RARE ], + [ Biome.METROPOLIS, BiomePoolTier.SUPER_RARE ], [ Biome.MEADOW, BiomePoolTier.RARE ] ] ], @@ -2013,6 +2175,7 @@ export const biomeTrainerPools: BiomeTrainerPools = { ] ], [ Species.ARTICUNO, Type.ICE, Type.FLYING, [ + [ Biome.ICE_CAVE, BiomePoolTier.ULTRA_RARE ], [ Biome.ICE_CAVE, BiomePoolTier.BOSS_SUPER_RARE ] ] ], @@ -2345,18 +2508,21 @@ export const biomeTrainerPools: BiomeTrainerPools = { ] ], [ Species.SNEASEL, Type.DARK, Type.ICE, [ - [ Biome.ICE_CAVE, BiomePoolTier.UNCOMMON ] + [ Biome.ICE_CAVE, BiomePoolTier.UNCOMMON ], + [ Biome.SNOWY_FOREST, BiomePoolTier.COMMON ] ] ], [ Species.TEDDIURSA, Type.NORMAL, -1, [ [ Biome.FOREST, BiomePoolTier.UNCOMMON ], - [ Biome.CAVE, BiomePoolTier.COMMON ] + [ Biome.CAVE, BiomePoolTier.COMMON ], + [ Biome.SNOWY_FOREST, BiomePoolTier.COMMON ] ] ], [ Species.URSARING, Type.NORMAL, -1, [ [ Biome.FOREST, BiomePoolTier.UNCOMMON ], [ Biome.CAVE, BiomePoolTier.COMMON ], - [ Biome.CAVE, BiomePoolTier.BOSS ] + [ Biome.CAVE, BiomePoolTier.BOSS ], + [ Biome.SNOWY_FOREST, BiomePoolTier.COMMON ] ] ], [ Species.SLUGMA, Type.FIRE, -1, [ @@ -2371,11 +2537,13 @@ export const biomeTrainerPools: BiomeTrainerPools = { ] ], [ Species.SWINUB, Type.ICE, Type.GROUND, [ - [ Biome.ICE_CAVE, BiomePoolTier.COMMON ] + [ Biome.ICE_CAVE, BiomePoolTier.COMMON ], + [ Biome.SNOWY_FOREST, BiomePoolTier.COMMON ] ] ], [ Species.PILOSWINE, Type.ICE, Type.GROUND, [ - [ Biome.ICE_CAVE, BiomePoolTier.COMMON] + [ Biome.ICE_CAVE, BiomePoolTier.COMMON ], + [ Biome.SNOWY_FOREST, BiomePoolTier.COMMON ] ] ], [ Species.CORSOLA, Type.WATER, Type.ROCK, [ @@ -2393,7 +2561,8 @@ export const biomeTrainerPools: BiomeTrainerPools = { ] ], [ Species.DELIBIRD, Type.ICE, Type.FLYING, [ - [ Biome.ICE_CAVE, BiomePoolTier.SUPER_RARE ] + [ Biome.ICE_CAVE, BiomePoolTier.SUPER_RARE ], + [ Biome.SNOWY_FOREST, BiomePoolTier.RARE ] ] ], [ Species.MANTINE, Type.WATER, Type.FLYING, [ @@ -2438,11 +2607,12 @@ export const biomeTrainerPools: BiomeTrainerPools = { ], [ Species.STANTLER, Type.NORMAL, -1, [ [ Biome.FOREST, BiomePoolTier.RARE ], - [ Biome.FOREST, BiomePoolTier.BOSS_RARE ] + [ Biome.FOREST, BiomePoolTier.BOSS_RARE ], + [ Biome.SNOWY_FOREST, BiomePoolTier.UNCOMMON ] ] ], [ Species.SMEARGLE, Type.NORMAL, -1, [ - [ Biome.CITY, BiomePoolTier.SUPER_RARE ] + [ Biome.METROPOLIS, BiomePoolTier.SUPER_RARE ] ] ], [ Species.TYROGUE, Type.FIGHTING, -1, [ @@ -2574,12 +2744,14 @@ export const biomeTrainerPools: BiomeTrainerPools = { ], [ Species.ZIGZAGOON, Type.NORMAL, -1, [ [ Biome.TOWN, BiomePoolTier.COMMON ], - [ Biome.PLAINS, BiomePoolTier.COMMON ] + [ Biome.PLAINS, BiomePoolTier.COMMON ], + [ Biome.METROPOLIS, BiomePoolTier.COMMON ] ] ], [ Species.LINOONE, Type.NORMAL, -1, [ [ Biome.PLAINS, BiomePoolTier.COMMON ], - [ Biome.PLAINS, BiomePoolTier.BOSS ] + [ Biome.PLAINS, BiomePoolTier.BOSS ], + [ Biome.METROPOLIS, BiomePoolTier.COMMON ] ] ], [ Species.WURMPLE, Type.BUG, -1, [ @@ -2676,7 +2848,6 @@ export const biomeTrainerPools: BiomeTrainerPools = { ] ], [ Species.MASQUERAIN, Type.BUG, Type.FLYING, [ - [ Biome.TOWN, BiomePoolTier.RARE ], [ Biome.LAKE, BiomePoolTier.UNCOMMON ], [ Biome.LAKE, BiomePoolTier.BOSS ] ] @@ -2689,7 +2860,6 @@ export const biomeTrainerPools: BiomeTrainerPools = { ] ], [ Species.BRELOOM, Type.GRASS, Type.FIGHTING, [ - [ Biome.TOWN, BiomePoolTier.UNCOMMON ], [ Biome.GRASS, BiomePoolTier.COMMON ], [ Biome.FOREST, BiomePoolTier.COMMON ], [ Biome.FOREST, BiomePoolTier.BOSS ], @@ -2838,11 +3008,11 @@ export const biomeTrainerPools: BiomeTrainerPools = { ] ], [ Species.CARVANHA, Type.WATER, Type.DARK, [ - [ Biome.SEA, BiomePoolTier.COMMON ] + [ Biome.SEA, BiomePoolTier.UNCOMMON ] ] ], [ Species.SHARPEDO, Type.WATER, Type.DARK, [ - [ Biome.SEA, BiomePoolTier.COMMON ], + [ Biome.SEA, BiomePoolTier.UNCOMMON ], [ Biome.SEA, BiomePoolTier.BOSS ] ] ], @@ -3001,8 +3171,8 @@ export const biomeTrainerPools: BiomeTrainerPools = { ] ], [ Species.CASTFORM, Type.NORMAL, -1, [ - [ Biome.CITY, BiomePoolTier.ULTRA_RARE ], - [ Biome.CITY, BiomePoolTier.BOSS_RARE ] + [ Biome.METROPOLIS, BiomePoolTier.ULTRA_RARE ], + [ Biome.METROPOLIS, BiomePoolTier.BOSS_RARE ] ] ], [ Species.KECLEON, Type.NORMAL, -1, [ @@ -3060,15 +3230,15 @@ export const biomeTrainerPools: BiomeTrainerPools = { ] ], [ Species.SPHEAL, Type.ICE, Type.WATER, [ - [ Biome.ICE_CAVE, BiomePoolTier.COMMON ] + [ Biome.ICE_CAVE, BiomePoolTier.UNCOMMON ] ] ], [ Species.SEALEO, Type.ICE, Type.WATER, [ - [ Biome.ICE_CAVE, BiomePoolTier.COMMON ] + [ Biome.ICE_CAVE, BiomePoolTier.UNCOMMON ] ] ], [ Species.WALREIN, Type.ICE, Type.WATER, [ - [ Biome.ICE_CAVE, BiomePoolTier.COMMON ], + [ Biome.ICE_CAVE, BiomePoolTier.UNCOMMON ], [ Biome.ICE_CAVE, BiomePoolTier.BOSS ] ] ], @@ -3292,18 +3462,18 @@ export const biomeTrainerPools: BiomeTrainerPools = { ] ], [ Species.BURMY, Type.BUG, -1, [ - [ Biome.CITY, BiomePoolTier.UNCOMMON ], [ Biome.FOREST, BiomePoolTier.UNCOMMON ], - [ Biome.BEACH, BiomePoolTier.UNCOMMON ] + [ Biome.BEACH, BiomePoolTier.UNCOMMON ], + [ Biome.SLUM, BiomePoolTier.UNCOMMON ] ] ], [ Species.WORMADAM, Type.BUG, Type.GRASS, [ - [ Biome.CITY, BiomePoolTier.UNCOMMON ], - [ Biome.CITY, BiomePoolTier.BOSS ], [ Biome.FOREST, BiomePoolTier.UNCOMMON ], [ Biome.FOREST, BiomePoolTier.BOSS ], [ Biome.BEACH, BiomePoolTier.UNCOMMON ], - [ Biome.BEACH, BiomePoolTier.BOSS ] + [ Biome.BEACH, BiomePoolTier.BOSS ], + [ Biome.SLUM, BiomePoolTier.UNCOMMON ], + [ Biome.SLUM, BiomePoolTier.BOSS ] ] ], [ Species.MOTHIM, Type.BUG, Type.FLYING, [ @@ -3345,7 +3515,6 @@ export const biomeTrainerPools: BiomeTrainerPools = { ] ], [ Species.CHERRIM, Type.GRASS, -1, [ - [ Biome.TOWN, BiomePoolTier.UNCOMMON ], [ Biome.GRASS, BiomePoolTier.UNCOMMON ], [ Biome.JUNGLE, BiomePoolTier.COMMON ], [ Biome.JUNGLE, BiomePoolTier.BOSS ] @@ -3393,10 +3562,12 @@ export const biomeTrainerPools: BiomeTrainerPools = { ] ], [ Species.GLAMEOW, Type.NORMAL, -1, [ + [ Biome.METROPOLIS, BiomePoolTier.UNCOMMON ], [ Biome.MEADOW, BiomePoolTier.UNCOMMON ] ] ], [ Species.PURUGLY, Type.NORMAL, -1, [ + [ Biome.METROPOLIS, BiomePoolTier.UNCOMMON ], [ Biome.MEADOW, BiomePoolTier.UNCOMMON ], [ Biome.MEADOW, BiomePoolTier.BOSS ] ] @@ -3406,12 +3577,12 @@ export const biomeTrainerPools: BiomeTrainerPools = { ] ], [ Species.STUNKY, Type.POISON, Type.DARK, [ - [ Biome.CITY, BiomePoolTier.UNCOMMON ] + [ Biome.SLUM, BiomePoolTier.UNCOMMON ] ] ], [ Species.SKUNTANK, Type.POISON, Type.DARK, [ - [ Biome.CITY, BiomePoolTier.UNCOMMON ], - [ Biome.CITY, BiomePoolTier.BOSS ] + [ Biome.SLUM, BiomePoolTier.UNCOMMON ], + [ Biome.SLUM, BiomePoolTier.BOSS ] ] ], [ Species.BRONZOR, Type.STEEL, Type.PSYCHIC, [ @@ -3532,12 +3703,14 @@ export const biomeTrainerPools: BiomeTrainerPools = { ] ], [ Species.SNOVER, Type.GRASS, Type.ICE, [ - [ Biome.ICE_CAVE, BiomePoolTier.COMMON ] + [ Biome.ICE_CAVE, BiomePoolTier.COMMON ], + [ Biome.SNOWY_FOREST, BiomePoolTier.COMMON ] ] ], [ Species.ABOMASNOW, Type.GRASS, Type.ICE, [ [ Biome.ICE_CAVE, BiomePoolTier.COMMON ], - [ Biome.ICE_CAVE, BiomePoolTier.BOSS ] + [ Biome.SNOWY_FOREST, BiomePoolTier.COMMON ], + [ Biome.SNOWY_FOREST, BiomePoolTier.BOSS ] ] ], [ Species.WEAVILE, Type.DARK, Type.ICE, [ @@ -3741,26 +3914,28 @@ export const biomeTrainerPools: BiomeTrainerPools = { ], [ Species.PATRAT, Type.NORMAL, -1, [ [ Biome.TOWN, BiomePoolTier.COMMON ], - [ Biome.CITY, BiomePoolTier.COMMON ] + [ Biome.METROPOLIS, BiomePoolTier.COMMON ], + [ Biome.SLUM, BiomePoolTier.COMMON ] ] ], [ Species.WATCHOG, Type.NORMAL, -1, [ - [ Biome.CITY, BiomePoolTier.COMMON ], - [ Biome.CITY, BiomePoolTier.BOSS ] + [ Biome.METROPOLIS, BiomePoolTier.COMMON ], + [ Biome.SLUM, BiomePoolTier.COMMON ], + [ Biome.SLUM, BiomePoolTier.BOSS ] ] ], [ Species.LILLIPUP, Type.NORMAL, -1, [ [ Biome.TOWN, BiomePoolTier.COMMON ], - [ Biome.CITY, BiomePoolTier.COMMON ] + [ Biome.METROPOLIS, BiomePoolTier.COMMON ] ] ], [ Species.HERDIER, Type.NORMAL, -1, [ - [ Biome.CITY, BiomePoolTier.COMMON ] + [ Biome.METROPOLIS, BiomePoolTier.COMMON ] ] ], [ Species.STOUTLAND, Type.NORMAL, -1, [ - [ Biome.CITY, BiomePoolTier.COMMON ], - [ Biome.CITY, BiomePoolTier.BOSS ] + [ Biome.METROPOLIS, BiomePoolTier.COMMON ], + [ Biome.METROPOLIS, BiomePoolTier.BOSS ] ] ], [ Species.PURRLOIN, Type.DARK, -1, [ @@ -3770,7 +3945,6 @@ export const biomeTrainerPools: BiomeTrainerPools = { ] ], [ Species.LIEPARD, Type.DARK, -1, [ - [ Biome.TOWN, BiomePoolTier.COMMON ], [ Biome.ABYSS, BiomePoolTier.COMMON ], [ Biome.ABYSS, BiomePoolTier.BOSS ], [ Biome.JUNGLE, BiomePoolTier.COMMON ] @@ -4064,12 +4238,12 @@ export const biomeTrainerPools: BiomeTrainerPools = { ] ], [ Species.TRUBBISH, Type.POISON, -1, [ - [ Biome.CITY, BiomePoolTier.COMMON ] + [ Biome.SLUM, BiomePoolTier.COMMON ] ] ], [ Species.GARBODOR, Type.POISON, -1, [ - [ Biome.CITY, BiomePoolTier.COMMON ], - [ Biome.CITY, BiomePoolTier.BOSS ] + [ Biome.SLUM, BiomePoolTier.COMMON ], + [ Biome.SLUM, BiomePoolTier.BOSS ] ] ], [ Species.ZORUA, Type.DARK, -1, [ @@ -4569,8 +4743,8 @@ export const biomeTrainerPools: BiomeTrainerPools = { ] ], [ Species.FURFROU, Type.NORMAL, -1, [ - [ Biome.CITY, BiomePoolTier.UNCOMMON ], - [ Biome.CITY, BiomePoolTier.BOSS ] + [ Biome.METROPOLIS, BiomePoolTier.UNCOMMON ], + [ Biome.METROPOLIS, BiomePoolTier.BOSS ] ] ], [ Species.ESPURR, Type.PSYCHIC, -1, [ @@ -4827,6 +5001,7 @@ export const biomeTrainerPools: BiomeTrainerPools = { ] ], [ Species.YUNGOOS, Type.NORMAL, -1, [ + [ Biome.TOWN, BiomePoolTier.COMMON ], [ Biome.PLAINS, BiomePoolTier.COMMON ] ] ], @@ -4852,7 +5027,6 @@ export const biomeTrainerPools: BiomeTrainerPools = { ] ], [ Species.CRABOMINABLE, Type.FIGHTING, Type.ICE, [ - [ Biome.ICE_CAVE, BiomePoolTier.COMMON ], [ Biome.ICE_CAVE, BiomePoolTier.BOSS ] ] ], @@ -5180,243 +5354,366 @@ export const biomeTrainerPools: BiomeTrainerPools = { ] ], [ Species.GROOKEY, Type.GRASS, -1, [ + [ Biome.JUNGLE, BiomePoolTier.RARE ] ] ], [ Species.THWACKEY, Type.GRASS, -1, [ + [ Biome.JUNGLE, BiomePoolTier.RARE ] ] ], [ Species.RILLABOOM, Type.GRASS, -1, [ + [ Biome.JUNGLE, BiomePoolTier.RARE ], + [ Biome.JUNGLE, BiomePoolTier.BOSS_RARE ] ] ], [ Species.SCORBUNNY, Type.FIRE, -1, [ + [ Biome.VOLCANO, BiomePoolTier.RARE ] ] ], [ Species.RABOOT, Type.FIRE, -1, [ + [ Biome.VOLCANO, BiomePoolTier.RARE ] ] ], [ Species.CINDERACE, Type.FIRE, -1, [ + [ Biome.VOLCANO, BiomePoolTier.RARE ], + [ Biome.VOLCANO, BiomePoolTier.BOSS_RARE ] ] ], [ Species.SOBBLE, Type.WATER, -1, [ + [ Biome.LAKE, BiomePoolTier.RARE ] ] ], [ Species.DRIZZILE, Type.WATER, -1, [ + [ Biome.LAKE, BiomePoolTier.RARE ] ] ], [ Species.INTELEON, Type.WATER, -1, [ + [ Biome.LAKE, BiomePoolTier.RARE ], + [ Biome.LAKE, BiomePoolTier.BOSS_RARE ] ] ], [ Species.SKWOVET, Type.NORMAL, -1, [ + [ Biome.TOWN, BiomePoolTier.COMMON ], + [ Biome.PLAINS, BiomePoolTier.COMMON ] ] ], [ Species.GREEDENT, Type.NORMAL, -1, [ + [ Biome.PLAINS, BiomePoolTier.COMMON ], + [ Biome.PLAINS, BiomePoolTier.BOSS ] ] ], [ Species.ROOKIDEE, Type.FLYING, -1, [ + [ Biome.TOWN, BiomePoolTier.COMMON ], + [ Biome.PLAINS, BiomePoolTier.COMMON ], + [ Biome.MOUNTAIN, BiomePoolTier.COMMON ] ] ], [ Species.CORVISQUIRE, Type.FLYING, -1, [ + [ Biome.PLAINS, BiomePoolTier.COMMON ], + [ Biome.MOUNTAIN, BiomePoolTier.COMMON ] ] ], [ Species.CORVIKNIGHT, Type.FLYING, Type.STEEL, [ + [ Biome.PLAINS, BiomePoolTier.COMMON ], + [ Biome.MOUNTAIN, BiomePoolTier.COMMON ], + [ Biome.MOUNTAIN, BiomePoolTier.BOSS ] ] ], [ Species.BLIPBUG, Type.BUG, -1, [ + [ Biome.TOWN, BiomePoolTier.COMMON ] ] ], [ Species.DOTTLER, Type.BUG, Type.PSYCHIC, [ + [ Biome.FOREST, BiomePoolTier.UNCOMMON ] ] ], [ Species.ORBEETLE, Type.BUG, Type.PSYCHIC, [ + [ Biome.FOREST, BiomePoolTier.UNCOMMON ], + [ Biome.FOREST, BiomePoolTier.BOSS ] ] ], [ Species.NICKIT, Type.DARK, -1, [ + [ Biome.ABYSS, BiomePoolTier.COMMON ] ] ], [ Species.THIEVUL, Type.DARK, -1, [ + [ Biome.ABYSS, BiomePoolTier.COMMON ], + [ Biome.ABYSS, BiomePoolTier.BOSS ] ] ], [ Species.GOSSIFLEUR, Type.GRASS, -1, [ + [ Biome.MEADOW, BiomePoolTier.COMMON ] ] ], [ Species.ELDEGOSS, Type.GRASS, -1, [ + [ Biome.MEADOW, BiomePoolTier.COMMON ] ] ], [ Species.WOOLOO, Type.NORMAL, -1, [ + [ Biome.TOWN, BiomePoolTier.COMMON ], + [ Biome.MEADOW, BiomePoolTier.COMMON ] ] ], [ Species.DUBWOOL, Type.NORMAL, -1, [ + [ Biome.MEADOW, BiomePoolTier.COMMON ], + [ Biome.MEADOW, BiomePoolTier.BOSS ] ] ], [ Species.CHEWTLE, Type.WATER, -1, [ + [ Biome.LAKE, BiomePoolTier.COMMON ] ] ], [ Species.DREDNAW, Type.WATER, Type.ROCK, [ + [ Biome.LAKE, BiomePoolTier.COMMON ], + [ Biome.LAKE, BiomePoolTier.BOSS ] ] ], [ Species.YAMPER, Type.ELECTRIC, -1, [ + [ Biome.SLUM, BiomePoolTier.COMMON ] ] ], [ Species.BOLTUND, Type.ELECTRIC, -1, [ + [ Biome.SLUM, BiomePoolTier.COMMON ], + [ Biome.SLUM, BiomePoolTier.BOSS ] ] ], [ Species.ROLYCOLY, Type.ROCK, -1, [ + [ Biome.VOLCANO, BiomePoolTier.COMMON ] ] ], [ Species.CARKOL, Type.ROCK, Type.FIRE, [ + [ Biome.VOLCANO, BiomePoolTier.COMMON ] ] ], [ Species.COALOSSAL, Type.ROCK, Type.FIRE, [ + [ Biome.VOLCANO, BiomePoolTier.COMMON ], + [ Biome.VOLCANO, BiomePoolTier.BOSS ] ] ], [ Species.APPLIN, Type.GRASS, Type.DRAGON, [ + [ Biome.MEADOW, BiomePoolTier.RARE ] ] ], [ Species.FLAPPLE, Type.GRASS, Type.DRAGON, [ + [ Biome.MEADOW, BiomePoolTier.BOSS_RARE ] ] ], [ Species.APPLETUN, Type.GRASS, Type.DRAGON, [ + [ Biome.MEADOW, BiomePoolTier.BOSS_RARE ] ] ], [ Species.SILICOBRA, Type.GROUND, -1, [ + [ Biome.DESERT, BiomePoolTier.COMMON ] ] ], [ Species.SANDACONDA, Type.GROUND, -1, [ + [ Biome.DESERT, BiomePoolTier.COMMON ], + [ Biome.DESERT, BiomePoolTier.BOSS ] ] ], [ Species.CRAMORANT, Type.FLYING, Type.WATER, [ + [ Biome.SEA, BiomePoolTier.COMMON ], + [ Biome.SEA, BiomePoolTier.BOSS ] ] ], [ Species.ARROKUDA, Type.WATER, -1, [ + [ Biome.SEABED, BiomePoolTier.COMMON ] ] ], [ Species.BARRASKEWDA, Type.WATER, -1, [ + [ Biome.SEABED, BiomePoolTier.COMMON ], + [ Biome.SEABED, BiomePoolTier.BOSS ] ] ], [ Species.TOXEL, Type.ELECTRIC, Type.POISON, [ + [ Biome.SLUM, BiomePoolTier.RARE ] ] ], [ Species.TOXTRICITY, Type.ELECTRIC, Type.POISON, [ + [ Biome.SLUM, BiomePoolTier.RARE ], + [ Biome.SLUM, BiomePoolTier.BOSS_RARE ] ] ], [ Species.SIZZLIPEDE, Type.FIRE, Type.BUG, [ + [ Biome.BADLANDS, BiomePoolTier.UNCOMMON ] ] ], [ Species.CENTISKORCH, Type.FIRE, Type.BUG, [ + [ Biome.BADLANDS, BiomePoolTier.UNCOMMON ], + [ Biome.BADLANDS, BiomePoolTier.BOSS ] ] ], [ Species.CLOBBOPUS, Type.FIGHTING, -1, [ + [ Biome.DOJO, BiomePoolTier.COMMON ] ] ], [ Species.GRAPPLOCT, Type.FIGHTING, -1, [ + [ Biome.DOJO, BiomePoolTier.COMMON ], + [ Biome.DOJO, BiomePoolTier.BOSS ] ] ], [ Species.SINISTEA, Type.GHOST, -1, [ + [ Biome.GRAVEYARD, BiomePoolTier.UNCOMMON ] ] ], [ Species.POLTEAGEIST, Type.GHOST, -1, [ + [ Biome.GRAVEYARD, BiomePoolTier.UNCOMMON ], + [ Biome.GRAVEYARD, BiomePoolTier.BOSS ] ] ], [ Species.HATENNA, Type.PSYCHIC, -1, [ + [ Biome.FAIRY_CAVE, BiomePoolTier.UNCOMMON ] ] ], [ Species.HATTREM, Type.PSYCHIC, -1, [ + [ Biome.FAIRY_CAVE, BiomePoolTier.UNCOMMON ] ] ], [ Species.HATTERENE, Type.PSYCHIC, Type.FAIRY, [ + [ Biome.FAIRY_CAVE, BiomePoolTier.UNCOMMON ], + [ Biome.FAIRY_CAVE, BiomePoolTier.BOSS ] ] ], [ Species.IMPIDIMP, Type.DARK, Type.FAIRY, [ + [ Biome.ABYSS, BiomePoolTier.COMMON ] ] ], [ Species.MORGREM, Type.DARK, Type.FAIRY, [ + [ Biome.ABYSS, BiomePoolTier.COMMON ] ] ], [ Species.GRIMMSNARL, Type.DARK, Type.FAIRY, [ + [ Biome.ABYSS, BiomePoolTier.COMMON ], + [ Biome.ABYSS, BiomePoolTier.BOSS ] ] ], [ Species.OBSTAGOON, Type.DARK, -1, [ + [ Biome.SLUM, BiomePoolTier.RARE ], + [ Biome.SLUM, BiomePoolTier.BOSS_RARE ] ] ], [ Species.PERRSERKER, Type.STEEL, -1, [ + [ Biome.CONSTRUCTION_SITE, BiomePoolTier.SUPER_RARE ], + [ Biome.CONSTRUCTION_SITE, BiomePoolTier.BOSS_SUPER_RARE ] ] ], [ Species.CURSOLA, Type.GHOST, -1, [ + [ Biome.SEABED, BiomePoolTier.SUPER_RARE ], + [ Biome.SEABED, BiomePoolTier.BOSS_SUPER_RARE ] ] ], [ Species.SIRFETCHD, Type.FIGHTING, -1, [ + [ Biome.DOJO, BiomePoolTier.BOSS_SUPER_RARE ] ] ], [ Species.MR_RIME, Type.ICE, Type.PSYCHIC, [ + [ Biome.SNOWY_FOREST, BiomePoolTier.SUPER_RARE ], + [ Biome.SNOWY_FOREST, BiomePoolTier.BOSS_SUPER_RARE ] ] ], [ Species.RUNERIGUS, Type.GROUND, Type.GHOST, [ + [ Biome.RUINS, BiomePoolTier.SUPER_RARE ], + [ Biome.RUINS, BiomePoolTier.BOSS_SUPER_RARE ] ] ], [ Species.MILCERY, Type.FAIRY, -1, [ + [ Biome.FAIRY_CAVE, BiomePoolTier.COMMON ] ] ], [ Species.ALCREMIE, Type.FAIRY, -1, [ + [ Biome.FAIRY_CAVE, BiomePoolTier.COMMON ], + [ Biome.FAIRY_CAVE, BiomePoolTier.BOSS ] ] ], [ Species.FALINKS, Type.FIGHTING, -1, [ + [ Biome.JUNGLE, BiomePoolTier.UNCOMMON ], + [ Biome.JUNGLE, BiomePoolTier.BOSS ] ] ], [ Species.PINCURCHIN, Type.ELECTRIC, -1, [ + [ Biome.SEABED, BiomePoolTier.UNCOMMON ] ] ], [ Species.SNOM, Type.ICE, Type.BUG, [ + [ Biome.ICE_CAVE, BiomePoolTier.COMMON ], + [ Biome.SNOWY_FOREST, BiomePoolTier.COMMON ] ] ], [ Species.FROSMOTH, Type.ICE, Type.BUG, [ + [ Biome.ICE_CAVE, BiomePoolTier.COMMON ], + [ Biome.SNOWY_FOREST, BiomePoolTier.COMMON ], + [ Biome.SNOWY_FOREST, BiomePoolTier.BOSS ] ] ], [ Species.STONJOURNER, Type.ROCK, -1, [ + [ Biome.RUINS, BiomePoolTier.RARE ] ] ], [ Species.EISCUE, Type.ICE, -1, [ + [ Biome.ICE_CAVE, BiomePoolTier.UNCOMMON ], + [ Biome.SNOWY_FOREST, BiomePoolTier.COMMON ] ] ], [ Species.INDEEDEE, Type.PSYCHIC, -1, [ + [ Biome.METROPOLIS, BiomePoolTier.UNCOMMON ] ] ], [ Species.MORPEKO, Type.ELECTRIC, Type.DARK, [ + [ Biome.METROPOLIS, BiomePoolTier.RARE ] ] ], [ Species.CUFANT, Type.STEEL, -1, [ + [ Biome.BADLANDS, BiomePoolTier.UNCOMMON ] ] ], [ Species.COPPERAJAH, Type.STEEL, -1, [ + [ Biome.BADLANDS, BiomePoolTier.UNCOMMON ], + [ Biome.BADLANDS, BiomePoolTier.BOSS ] ] ], [ Species.DRACOZOLT, Type.ELECTRIC, Type.DRAGON, [ + [ Biome.WASTELAND, BiomePoolTier.SUPER_RARE ], + [ Biome.WASTELAND, BiomePoolTier.BOSS_RARE ] ] ], [ Species.ARCTOZOLT, Type.ELECTRIC, Type.ICE, [ + [ Biome.SNOWY_FOREST, BiomePoolTier.SUPER_RARE ], + [ Biome.SNOWY_FOREST, BiomePoolTier.BOSS_RARE ] ] ], [ Species.DRACOVISH, Type.WATER, Type.DRAGON, [ + [ Biome.WASTELAND, BiomePoolTier.SUPER_RARE ], + [ Biome.WASTELAND, BiomePoolTier.BOSS_RARE ] ] ], [ Species.ARCTOVISH, Type.WATER, Type.ICE, [ + [ Biome.SEABED, BiomePoolTier.SUPER_RARE ], + [ Biome.SEABED, BiomePoolTier.BOSS_RARE ] ] ], [ Species.DURALUDON, Type.STEEL, Type.DRAGON, [ + [ Biome.CONSTRUCTION_SITE, BiomePoolTier.RARE ] ] ], [ Species.DREEPY, Type.DRAGON, Type.GHOST, [ + [ Biome.WASTELAND, BiomePoolTier.RARE ] ] ], [ Species.DRAKLOAK, Type.DRAGON, Type.GHOST, [ + [ Biome.WASTELAND, BiomePoolTier.RARE ] ] ], [ Species.DRAGAPULT, Type.DRAGON, Type.GHOST, [ + [ Biome.WASTELAND, BiomePoolTier.RARE ], + [ Biome.WASTELAND, BiomePoolTier.BOSS ] ] ], [ Species.ZACIAN, Type.FAIRY, -1, [ + [ Biome.SNOWY_FOREST, BiomePoolTier.BOSS_ULTRA_RARE ] ] ], [ Species.ZAMAZENTA, Type.FIGHTING, -1, [ + [ Biome.DOJO, BiomePoolTier.BOSS_ULTRA_RARE ] ] ], [ Species.ETERNATUS, Type.POISON, Type.DRAGON, [ @@ -5424,48 +5721,72 @@ export const biomeTrainerPools: BiomeTrainerPools = { ] ], [ Species.KUBFU, Type.FIGHTING, -1, [ + [ Biome.DOJO, BiomePoolTier.ULTRA_RARE ] ] ], [ Species.URSHIFU, Type.FIGHTING, Type.DARK, [ + [ Biome.DOJO, BiomePoolTier.BOSS_SUPER_RARE ] ] ], [ Species.ZARUDE, Type.DARK, Type.GRASS, [ + [ Biome.JUNGLE, BiomePoolTier.ULTRA_RARE ], + [ Biome.JUNGLE, BiomePoolTier.BOSS_SUPER_RARE ] ] ], [ Species.REGIELEKI, Type.ELECTRIC, -1, [ + [ Biome.POWER_PLANT, BiomePoolTier.ULTRA_RARE ], + [ Biome.POWER_PLANT, BiomePoolTier.BOSS_SUPER_RARE ] ] ], [ Species.REGIDRAGO, Type.DRAGON, -1, [ + [ Biome.WASTELAND, BiomePoolTier.ULTRA_RARE ], + [ Biome.WASTELAND, BiomePoolTier.BOSS_SUPER_RARE ] ] ], [ Species.GLASTRIER, Type.ICE, -1, [ + [ Biome.SNOWY_FOREST, BiomePoolTier.ULTRA_RARE ], + [ Biome.SNOWY_FOREST, BiomePoolTier.BOSS_SUPER_RARE ] ] ], [ Species.SPECTRIER, Type.GHOST, -1, [ + [ Biome.GRAVEYARD, BiomePoolTier.ULTRA_RARE ], + [ Biome.GRAVEYARD, BiomePoolTier.BOSS_SUPER_RARE ] ] ], [ Species.CALYREX, Type.PSYCHIC, Type.GRASS, [ + [ Biome.FOREST, BiomePoolTier.BOSS_ULTRA_RARE ], + [ Biome.GRAVEYARD, BiomePoolTier.BOSS_ULTRA_RARE ], + [ Biome.SNOWY_FOREST, BiomePoolTier.BOSS_ULTRA_RARE ] ] ], [ Species.WYRDEER, Type.NORMAL, Type.PSYCHIC, [ + [ Biome.SNOWY_FOREST, BiomePoolTier.BOSS ] ] ], [ Species.KLEAVOR, Type.BUG, Type.ROCK, [ + [ Biome.JUNGLE, BiomePoolTier.SUPER_RARE ], + [ Biome.JUNGLE, BiomePoolTier.BOSS_ULTRA_RARE ] ] ], - [ Species.URSALUNA, Type.GROUND, -1, [ + [ Species.URSALUNA, Type.GROUND, Type.NORMAL, [ + [ Biome.SNOWY_FOREST, BiomePoolTier.BOSS ] ] ], [ Species.BASCULEGION, Type.WATER, Type.GHOST, [ + [ Biome.SEABED, BiomePoolTier.BOSS_RARE ] ] ], [ Species.SNEASLER, Type.FIGHTING, Type.POISON, [ + [ Biome.SNOWY_FOREST, BiomePoolTier.BOSS_SUPER_RARE ] ] ], [ Species.OVERQWIL, Type.DARK, Type.POISON, [ + [ Biome.SEABED, BiomePoolTier.BOSS_SUPER_RARE ] ] ], [ Species.ENAMORUS, Type.FAIRY, Type.FLYING, [ + [ Biome.FAIRY_CAVE, BiomePoolTier.ULTRA_RARE ], + [ Biome.FAIRY_CAVE, BiomePoolTier.BOSS_SUPER_RARE ] ] ], [ Species.SPRIGATITO, Type.GRASS, -1, [ @@ -5819,21 +6140,27 @@ export const biomeTrainerPools: BiomeTrainerPools = { ] ], [ Species.ALOLA_SANDSHREW, Type.ICE, Type.STEEL, [ - [ Biome.ISLAND, BiomePoolTier.COMMON ] + [ Biome.ISLAND, BiomePoolTier.COMMON ], + [ Biome.SNOWY_FOREST, BiomePoolTier.RARE ] ] ], [ Species.ALOLA_SANDSLASH, Type.ICE, Type.STEEL, [ [ Biome.ISLAND, BiomePoolTier.COMMON ], - [ Biome.ISLAND, BiomePoolTier.UNCOMMON ] + [ Biome.ISLAND, BiomePoolTier.BOSS ], + [ Biome.SNOWY_FOREST, BiomePoolTier.RARE ], + [ Biome.SNOWY_FOREST, BiomePoolTier.BOSS_RARE ] ] ], [ Species.ALOLA_VULPIX, Type.ICE, -1, [ - [ Biome.ISLAND, BiomePoolTier.COMMON ] + [ Biome.ISLAND, BiomePoolTier.COMMON ], + [ Biome.SNOWY_FOREST, BiomePoolTier.RARE ] ] ], [ Species.ALOLA_NINETALES, Type.ICE, Type.FAIRY, [ [ Biome.ISLAND, BiomePoolTier.COMMON ], - [ Biome.ISLAND, BiomePoolTier.BOSS ] + [ Biome.ISLAND, BiomePoolTier.BOSS ], + [ Biome.SNOWY_FOREST, BiomePoolTier.RARE ], + [ Biome.SNOWY_FOREST, BiomePoolTier.BOSS_RARE ] ] ], [ Species.ALOLA_DIGLETT, Type.GROUND, Type.STEEL, [ @@ -5887,108 +6214,152 @@ export const biomeTrainerPools: BiomeTrainerPools = { ] ], [ Species.GALAR_MEOWTH, Type.STEEL, -1, [ + [ Biome.CONSTRUCTION_SITE, BiomePoolTier.SUPER_RARE ] ] ], [ Species.GALAR_PONYTA, Type.PSYCHIC, -1, [ + [ Biome.FAIRY_CAVE, BiomePoolTier.SUPER_RARE ] ] ], [ Species.GALAR_RAPIDASH, Type.PSYCHIC, Type.FAIRY, [ + [ Biome.FAIRY_CAVE, BiomePoolTier.SUPER_RARE ], + [ Biome.FAIRY_CAVE, BiomePoolTier.BOSS_SUPER_RARE ] ] ], [ Species.GALAR_SLOWPOKE, Type.PSYCHIC, -1, [ + [ Biome.SWAMP, BiomePoolTier.SUPER_RARE ] ] ], [ Species.GALAR_SLOWBRO, Type.POISON, Type.PSYCHIC, [ + [ Biome.SWAMP, BiomePoolTier.SUPER_RARE ], + [ Biome.SWAMP, BiomePoolTier.BOSS_SUPER_RARE ] ] ], [ Species.GALAR_FARFETCHD, Type.FIGHTING, -1, [ + [ Biome.DOJO, BiomePoolTier.SUPER_RARE ] ] ], [ Species.GALAR_WEEZING, Type.POISON, Type.FAIRY, [ + [ Biome.SLUM, BiomePoolTier.BOSS_SUPER_RARE ] ] ], [ Species.GALAR_MR_MIME, Type.ICE, Type.PSYCHIC, [ + [ Biome.SNOWY_FOREST, BiomePoolTier.SUPER_RARE ] ] ], [ Species.GALAR_ARTICUNO, Type.PSYCHIC, Type.FLYING, [ + [ Biome.SNOWY_FOREST, BiomePoolTier.ULTRA_RARE ], + [ Biome.SNOWY_FOREST, BiomePoolTier.BOSS_ULTRA_RARE ] ] ], [ Species.GALAR_ZAPDOS, Type.FIGHTING, Type.FLYING, [ + [ Biome.DOJO, BiomePoolTier.ULTRA_RARE ], + [ Biome.DOJO, BiomePoolTier.BOSS_ULTRA_RARE ] ] ], [ Species.GALAR_MOLTRES, Type.DARK, Type.FLYING, [ + [ Biome.ABYSS, BiomePoolTier.ULTRA_RARE ], + [ Biome.ABYSS, BiomePoolTier.BOSS_ULTRA_RARE ] ] ], [ Species.GALAR_SLOWKING, Type.POISON, Type.PSYCHIC, [ + [ Biome.SWAMP, BiomePoolTier.BOSS_SUPER_RARE ] ] ], [ Species.GALAR_CORSOLA, Type.GHOST, -1, [ + [ Biome.SEABED, BiomePoolTier.SUPER_RARE ] ] ], [ Species.GALAR_ZIGZAGOON, Type.DARK, -1, [ + [ Biome.SLUM, BiomePoolTier.RARE ] ] ], [ Species.GALAR_LINOONE, Type.DARK, -1, [ + [ Biome.SLUM, BiomePoolTier.RARE ] ] ], [ Species.GALAR_DARUMAKA, Type.ICE, -1, [ + [ Biome.SNOWY_FOREST, BiomePoolTier.RARE ] ] ], [ Species.GALAR_DARMANITAN, Type.ICE, -1, [ + [ Biome.SNOWY_FOREST, BiomePoolTier.RARE ], + [ Biome.SNOWY_FOREST, BiomePoolTier.BOSS_SUPER_RARE ] ] ], [ Species.GALAR_YAMASK, Type.GROUND, Type.GHOST, [ + [ Biome.RUINS, BiomePoolTier.SUPER_RARE ] ] ], [ Species.GALAR_STUNFISK, Type.GROUND, Type.STEEL, [ + [ Biome.SWAMP, BiomePoolTier.SUPER_RARE ], + [ Biome.SWAMP, BiomePoolTier.BOSS_SUPER_RARE ] ] ], [ Species.HISUI_GROWLITHE, Type.FIRE, Type.ROCK, [ + [ Biome.VOLCANO, BiomePoolTier.SUPER_RARE ] ] ], [ Species.HISUI_ARCANINE, Type.FIRE, Type.ROCK, [ + [ Biome.VOLCANO, BiomePoolTier.BOSS_SUPER_RARE ] ] ], [ Species.HISUI_VOLTORB, Type.ELECTRIC, Type.GRASS, [ + [ Biome.POWER_PLANT, BiomePoolTier.RARE ] ] ], [ Species.HISUI_ELECTRODE, Type.ELECTRIC, Type.GRASS, [ + [ Biome.POWER_PLANT, BiomePoolTier.BOSS_RARE ] ] ], [ Species.HISUI_TYPHLOSION, Type.FIRE, Type.GHOST, [ + [ Biome.VOLCANO, BiomePoolTier.BOSS_SUPER_RARE ] ] ], [ Species.HISUI_QWILFISH, Type.DARK, Type.POISON, [ + [ Biome.SEABED, BiomePoolTier.SUPER_RARE ] ] ], [ Species.HISUI_SNEASEL, Type.FIGHTING, Type.POISON, [ + [ Biome.SNOWY_FOREST, BiomePoolTier.SUPER_RARE ] ] ], [ Species.HISUI_SAMUROTT, Type.WATER, Type.DARK, [ + [ Biome.LAKE, BiomePoolTier.BOSS_SUPER_RARE ] ] ], [ Species.HISUI_LILLIGANT, Type.GRASS, Type.FIGHTING, [ + [ Biome.MEADOW, BiomePoolTier.BOSS_SUPER_RARE ] ] ], [ Species.HISUI_ZORUA, Type.NORMAL, Type.GHOST, [ + [ Biome.SNOWY_FOREST, BiomePoolTier.SUPER_RARE ] ] ], [ Species.HISUI_ZOROARK, Type.NORMAL, Type.GHOST, [ + [ Biome.SNOWY_FOREST, BiomePoolTier.SUPER_RARE ], + [ Biome.SNOWY_FOREST, BiomePoolTier.BOSS_SUPER_RARE ] ] ], [ Species.HISUI_BRAVIARY, Type.PSYCHIC, Type.FLYING, [ + [ Biome.MOUNTAIN, BiomePoolTier.BOSS_RARE ] ] ], [ Species.HISUI_SLIGGOO, Type.STEEL, Type.DRAGON, [ + [ Biome.SWAMP, BiomePoolTier.SUPER_RARE ] ] ], [ Species.HISUI_GOODRA, Type.STEEL, Type.DRAGON, [ + [ Biome.SWAMP, BiomePoolTier.SUPER_RARE ], + [ Biome.SWAMP, BiomePoolTier.BOSS_SUPER_RARE ] ] ], [ Species.HISUI_AVALUGG, Type.ICE, Type.ROCK, [ + [ Biome.SNOWY_FOREST, BiomePoolTier.RARE ] ] ], [ Species.HISUI_DECIDUEYE, Type.GRASS, Type.FIGHTING, [ + [ Biome.DOJO, BiomePoolTier.BOSS_SUPER_RARE ] ] ], [ Species.PALDEA_TAUROS, Type.FIGHTING, -1, [ @@ -6018,7 +6389,7 @@ export const biomeTrainerPools: BiomeTrainerPools = { ] ], [ TrainerType.ARTIST, [ - [ Biome.CITY, BiomePoolTier.RARE ] + [ Biome.METROPOLIS, BiomePoolTier.RARE ] ] ], [ TrainerType.BACKERS, [] ], @@ -6030,7 +6401,7 @@ export const biomeTrainerPools: BiomeTrainerPools = { ] ], [ TrainerType.BAKER, [ - [ Biome.CITY, BiomePoolTier.COMMON ] + [ Biome.SLUM, BiomePoolTier.COMMON ] ] ], [ TrainerType.BEAUTY, [ @@ -6053,21 +6424,25 @@ export const biomeTrainerPools: BiomeTrainerPools = { [ Biome.PLAINS, BiomePoolTier.COMMON ], [ Biome.GRASS, BiomePoolTier.COMMON ], [ Biome.TALL_GRASS, BiomePoolTier.UNCOMMON ], - [ Biome.CITY, BiomePoolTier.UNCOMMON ], + [ Biome.METROPOLIS, BiomePoolTier.UNCOMMON ], [ Biome.BEACH, BiomePoolTier.UNCOMMON ], [ Biome.LAKE, BiomePoolTier.COMMON ], [ Biome.MEADOW, BiomePoolTier.UNCOMMON ], [ Biome.FAIRY_CAVE, BiomePoolTier.UNCOMMON ] ] ], - [ TrainerType.CLERK, [] ], + [ TrainerType.CLERK, [ + [ Biome.METROPOLIS, BiomePoolTier.COMMON ] + ] ], [ TrainerType.CYCLIST, [ [ Biome.PLAINS, BiomePoolTier.UNCOMMON ], - [ Biome.CITY, BiomePoolTier.COMMON ] + [ Biome.METROPOLIS, BiomePoolTier.COMMON ] ] ], [ TrainerType.DANCER, [] ], - [ TrainerType.DEPOT_AGENT, [] ], + [ TrainerType.DEPOT_AGENT, [ + [ Biome.METROPOLIS, BiomePoolTier.UNCOMMON ] + ] ], [ TrainerType.DOCTOR, [] ], [ TrainerType.FISHERMAN, [ [ Biome.LAKE, BiomePoolTier.COMMON ], @@ -6076,7 +6451,7 @@ export const biomeTrainerPools: BiomeTrainerPools = { ], [ TrainerType.RICH, [] ], [ TrainerType.GUITARIST, [ - [ Biome.CITY, BiomePoolTier.UNCOMMON ], + [ Biome.METROPOLIS, BiomePoolTier.UNCOMMON ], [ Biome.POWER_PLANT, BiomePoolTier.COMMON ] ] ], [ TrainerType.HARLEQUIN, [] ], @@ -6096,8 +6471,9 @@ export const biomeTrainerPools: BiomeTrainerPools = { [ TrainerType.NURSE, [] ], [ TrainerType.NURSERY_AIDE, [] ], [ TrainerType.OFFICER, [ - [ Biome.CITY, BiomePoolTier.COMMON ] - [ Biome.CONSTRUCTION_SITE, BiomePoolTier.COMMON ] + [ Biome.METROPOLIS, BiomePoolTier.COMMON ], + [ Biome.CONSTRUCTION_SITE, BiomePoolTier.COMMON ], + [ Biome.SLUM, BiomePoolTier.COMMON ] ] ], [ TrainerType.PARASOL_LADY, [ @@ -6128,7 +6504,8 @@ export const biomeTrainerPools: BiomeTrainerPools = { ], [ TrainerType.SMASHER, [] ], [ TrainerType.SNOW_WORKER, [ - [ Biome.ICE_CAVE ] + [ Biome.ICE_CAVE, BiomePoolTier.COMMON ], + [ Biome.SNOWY_FOREST, BiomePoolTier.COMMON ] ] ], [ TrainerType.STRIKER, [] ], @@ -6173,7 +6550,8 @@ export const biomeTrainerPools: BiomeTrainerPools = { ] ], [ TrainerType.JANINE, [ - [ Biome.SWAMP, BiomePoolTier.BOSS ] + [ Biome.SWAMP, BiomePoolTier.BOSS ], + [ Biome.SLUM, BiomePoolTier.BOSS ] ] ], [ TrainerType.SABRINA, [ @@ -6287,7 +6665,8 @@ export const biomeTrainerPools: BiomeTrainerPools = { ], [ TrainerType.CANDICE, [ [ Biome.ICE_CAVE, BiomePoolTier.BOSS ], - [ Biome.ISLAND, BiomePoolTier.BOSS ] // Temporary + [ Biome.ISLAND, BiomePoolTier.BOSS ], // Temporary + [ Biome.SNOWY_FOREST, BiomePoolTier.BOSS ] ] ], [ TrainerType.VOLKNER, [ @@ -6299,7 +6678,7 @@ export const biomeTrainerPools: BiomeTrainerPools = { [ TrainerType.CRESS, [] ], [ TrainerType.CHEREN, [ [ Biome.PLAINS, BiomePoolTier.BOSS ], - [ Biome.CITY, BiomePoolTier.BOSS ] + [ Biome.METROPOLIS, BiomePoolTier.BOSS ] ] ], [ TrainerType.LENORA, [ diff --git a/src/data/pokemon-evolutions.ts b/src/data/pokemon-evolutions.ts index 8bfc7cbfe..96b71618c 100644 --- a/src/data/pokemon-evolutions.ts +++ b/src/data/pokemon-evolutions.ts @@ -267,7 +267,7 @@ export const pokemonEvolutions: PokemonEvolutions = { new SpeciesEvolution(Species.HITMONTOP, 20, null, new SpeciesEvolutionCondition((p: Pokemon) => p.stats[Stat.ATK] === p.stats[Stat.DEF])) ], [Species.KOFFING]: [ - new SpeciesEvolution(Species.GALAR_WEEZING, 35, null, new SpeciesEvolutionCondition((p: Pokemon) => p.scene.arena.biomeType === Biome.CITY), SpeciesWildEvolutionDelay.NEVER), + new SpeciesEvolution(Species.GALAR_WEEZING, 35, null, new SpeciesEvolutionCondition((p: Pokemon) => p.scene.arena.biomeType === Biome.METROPOLIS), SpeciesWildEvolutionDelay.NEVER), new SpeciesEvolution(Species.WEEZING, 35, null, null) ], [Species.RHYHORN]: [ diff --git a/src/data/pokemon-species.ts b/src/data/pokemon-species.ts index 20c7e1be8..752da5f22 100644 --- a/src/data/pokemon-species.ts +++ b/src/data/pokemon-species.ts @@ -106,7 +106,7 @@ export abstract class PokemonSpeciesForm { } isObtainable() { - return (this.generation <= 7 || pokemonPrevolutions.hasOwnProperty(this.speciesId)); + return (this.generation <= 8 || pokemonPrevolutions.hasOwnProperty(this.speciesId)); } getSpriteAtlasPath(female: boolean, formIndex?: integer, shiny?: boolean): string { @@ -1801,11 +1801,11 @@ export function initSpecies() { new PokemonSpecies(Species.CLOBBOPUS, "Clobbopus", 8, false, false, false, "Tantrum Pokémon", Type.FIGHTING, null, 0.6, 4, Abilities.LIMBER, Abilities.NONE, Abilities.TECHNICIAN, 310, 50, 68, 60, 50, 50, 32, 180, 50, 62, GrowthRate.MEDIUM_SLOW, 50, false), new PokemonSpecies(Species.GRAPPLOCT, "Grapploct", 8, false, false, false, "Jujitsu Pokémon", Type.FIGHTING, null, 1.6, 39, Abilities.LIMBER, Abilities.NONE, Abilities.TECHNICIAN, 480, 80, 118, 90, 70, 80, 42, 45, 50, 168, GrowthRate.MEDIUM_SLOW, 50, false), new PokemonSpecies(Species.SINISTEA, "Sinistea", 8, false, false, false, "Black Tea Pokémon", Type.GHOST, null, 0.1, 0.2, Abilities.WEAK_ARMOR, Abilities.NONE, Abilities.CURSED_BODY, 308, 40, 45, 45, 74, 54, 50, 120, 50, 62, GrowthRate.MEDIUM_FAST, null, false, false, - new PokemonForm("Phony Form", "phony", Type.GHOST, null, 0.1, 0.2, Abilities.WEAK_ARMOR, Abilities.NONE, Abilities.CURSED_BODY, 308, 40, 45, 45, 74, 54, 50, 120, 50, 62), + new PokemonForm("Phony Form", "phony", Type.GHOST, null, 0.1, 0.2, Abilities.WEAK_ARMOR, Abilities.NONE, Abilities.CURSED_BODY, 308, 40, 45, 45, 74, 54, 50, 120, 50, 62, false, ""), new PokemonForm("Antique Form", "antique", Type.GHOST, null, 0.1, 0.2, Abilities.WEAK_ARMOR, Abilities.NONE, Abilities.CURSED_BODY, 308, 40, 45, 45, 74, 54, 50, 120, 50, 62, false, ""), ), new PokemonSpecies(Species.POLTEAGEIST, "Polteageist", 8, false, false, false, "Black Tea Pokémon", Type.GHOST, null, 0.2, 0.4, Abilities.WEAK_ARMOR, Abilities.NONE, Abilities.CURSED_BODY, 508, 60, 65, 65, 134, 114, 70, 60, 50, 178, GrowthRate.MEDIUM_FAST, null, false, false, - new PokemonForm("Phony Form", "phony", Type.GHOST, null, 0.2, 0.4, Abilities.WEAK_ARMOR, Abilities.NONE, Abilities.CURSED_BODY, 508, 60, 65, 65, 134, 114, 70, 60, 50, 178), + new PokemonForm("Phony Form", "phony", Type.GHOST, null, 0.2, 0.4, Abilities.WEAK_ARMOR, Abilities.NONE, Abilities.CURSED_BODY, 508, 60, 65, 65, 134, 114, 70, 60, 50, 178, false, ""), new PokemonForm("Antique Form", "antique", Type.GHOST, null, 0.2, 0.4, Abilities.WEAK_ARMOR, Abilities.NONE, Abilities.CURSED_BODY, 508, 60, 65, 65, 134, 114, 70, 60, 50, 178, false, ""), ), new PokemonSpecies(Species.HATENNA, "Hatenna", 8, false, false, false, "Calm Pokémon", Type.PSYCHIC, null, 0.4, 3.4, Abilities.HEALER, Abilities.ANTICIPATION, Abilities.MAGIC_BOUNCE, 265, 42, 30, 45, 56, 53, 39, 235, 50, 53, GrowthRate.SLOW, 0, false), @@ -2701,7 +2701,7 @@ export const speciesStarters = { { //setTimeout(() => { /*for (let tc of Object.keys(trainerConfigs)) { - console.log(TrainerType[tc], !trainerConfigs[tc].speciesFilter ? 'all' : [...new Set(allSpecies.filter(s => s.generation <= 7).filter(trainerConfigs[tc].speciesFilter).map(s => { + console.log(TrainerType[tc], !trainerConfigs[tc].speciesFilter ? 'all' : [...new Set(allSpecies.filter(s => s.generation <= 8).filter(trainerConfigs[tc].speciesFilter).map(s => { while (pokemonPrevolutions.hasOwnProperty(s.speciesId)) s = getPokemonSpecies(pokemonPrevolutions[s.speciesId]); return s; @@ -2709,7 +2709,7 @@ export const speciesStarters = { } const speciesFilter = (species: PokemonSpecies) => !species.legendary && !species.pseudoLegendary && !species.mythical && species.baseTotal >= 540; - console.log(!speciesFilter ? 'all' : [...new Set(allSpecies.filter(s => s.generation <= 7).filter(speciesFilter).map(s => { + console.log(!speciesFilter ? 'all' : [...new Set(allSpecies.filter(s => s.generation <= 8).filter(speciesFilter).map(s => { while (pokemonPrevolutions.hasOwnProperty(s.speciesId)) s = getPokemonSpecies(pokemonPrevolutions[s.speciesId]); return s; diff --git a/src/data/trainer-type.ts b/src/data/trainer-type.ts index b830f3b53..3c863ae6f 100644 --- a/src/data/trainer-type.ts +++ b/src/data/trainer-type.ts @@ -10,7 +10,8 @@ import { tmSpecies } from "./tms"; import { Type } from "./type"; export enum TrainerType { - ACE_TRAINER = 1, + UNKNOWN, + ACE_TRAINER, ARTIST, BACKERS, BACKPACKER, @@ -59,7 +60,7 @@ export enum TrainerType { WORKER, YOUNGSTER, - BROCK, + BROCK = 200, MISTY, LT_SURGE, ERIKA, @@ -106,12 +107,12 @@ export enum TrainerType { DRAYDEN, MARLON, - SHAUNTAL, + SHAUNTAL = 300, MARSHAL, GRIMSLEY, CAITLIN, - BLUE, + BLUE = 325, RED, LANCE, STEVEN, @@ -120,7 +121,7 @@ export enum TrainerType { ALDER, IRIS, - RIVAL, + RIVAL = 350, RIVAL_2, RIVAL_3, RIVAL_4, @@ -134,7 +135,7 @@ export enum TrainerPoolTier { RARE, SUPER_RARE, ULTRA_RARE -}; +} export interface TrainerTierPools { [key: integer]: Species[] @@ -560,6 +561,7 @@ function getSpeciesFilterRandomPartyMemberFunc(speciesFilter: PokemonSpeciesFilt } export const trainerConfigs: TrainerConfigs = { + [TrainerType.UNKNOWN]: new TrainerConfig(0).setHasGenders(), [TrainerType.ACE_TRAINER]: new TrainerConfig(++t).setHasGenders().setMoneyMultiplier(2.25).setEncounterBgm(TrainerType.ACE_TRAINER) .setPartyTemplateFunc(scene => getWavePartyTemplate(scene, trainerPartyTemplates.THREE_WEAK_BALANCED, trainerPartyTemplates.FOUR_WEAK_BALANCED, trainerPartyTemplates.FIVE_WEAK_BALANCED, trainerPartyTemplates.SIX_WEAK_BALANCED)), [TrainerType.ARTIST]: new TrainerConfig(++t).setEncounterBgm(TrainerType.RICH).setPartyTemplates(trainerPartyTemplates.ONE_STRONG, trainerPartyTemplates.TWO_AVG, trainerPartyTemplates.THREE_AVG) @@ -568,10 +570,10 @@ export const trainerConfigs: TrainerConfigs = { [TrainerType.BACKPACKER]: new TrainerConfig(++t).setHasGenders().setSpeciesFilter(s => s.isOfType(Type.FLYING) || s.isOfType(Type.ROCK)).setEncounterBgm(TrainerType.BACKPACKER) .setPartyTemplates(trainerPartyTemplates.ONE_STRONG, trainerPartyTemplates.ONE_WEAK_ONE_STRONG, trainerPartyTemplates.ONE_AVG_ONE_STRONG) .setSpeciesPools({ - [TrainerPoolTier.COMMON]: [ Species.RHYHORN, Species.AIPOM, Species.MAKUHITA, Species.MAWILE, Species.NUMEL, Species.LILLIPUP, Species.SANDILE, /* Species.WOOLOO */ ], + [TrainerPoolTier.COMMON]: [ Species.RHYHORN, Species.AIPOM, Species.MAKUHITA, Species.MAWILE, Species.NUMEL, Species.LILLIPUP, Species.SANDILE, Species.WOOLOO ], [TrainerPoolTier.UNCOMMON]: [ Species.GIRAFARIG, Species.ZANGOOSE, Species.SEVIPER, Species.CUBCHOO, Species.PANCHAM, Species.SKIDDO, Species.MUDBRAY ], - [TrainerPoolTier.RARE]: [ Species.TAUROS, Species.STANTLER, Species.DARUMAKA, Species.BOUFFALANT, Species.DEERLING, /*Species.IMPIDIMP, */ ], - [TrainerPoolTier.SUPER_RARE]: [ /* Species.GALAR_DARUMAKA */ /* Species.TEDDIURSA */ ] + [TrainerPoolTier.RARE]: [ Species.TAUROS, Species.STANTLER, Species.DARUMAKA, Species.BOUFFALANT, Species.DEERLING, Species.IMPIDIMP ], + [TrainerPoolTier.SUPER_RARE]: [ Species.GALAR_DARUMAKA, Species.TEDDIURSA ] }), [TrainerType.BAKER]: new TrainerConfig(++t).setEncounterBgm(TrainerType.CLERK).setMoneyMultiplier(1.35).setSpeciesFilter(s => s.isOfType(Type.GRASS) || s.isOfType(Type.FIRE)), [TrainerType.BEAUTY]: new TrainerConfig(++t).setMoneyMultiplier(1.55).setEncounterBgm(TrainerType.PARASOL_LADY), @@ -597,10 +599,10 @@ export const trainerConfigs: TrainerConfigs = { [TrainerType.CYCLIST]: new TrainerConfig(++t).setMoneyMultiplier(1.3).setHasGenders().setEncounterBgm(TrainerType.CYCLIST).setSpeciesFilter(s => !!s.getLevelMoves().find(plm => plm[1] === Moves.QUICK_ATTACK)) .setPartyTemplates(trainerPartyTemplates.TWO_WEAK, trainerPartyTemplates.ONE_AVG) .setSpeciesPools({ - [TrainerPoolTier.COMMON]: [ Species.PICHU, Species.STARLY, Species.TAILLOW, /* Species.BOLTUND */ ], + [TrainerPoolTier.COMMON]: [ Species.PICHU, Species.STARLY, Species.TAILLOW, Species.BOLTUND ], [TrainerPoolTier.UNCOMMON]: [ Species.DODUO, Species.ELECTRIKE, Species.BLITZLE, /* Species.WATTREL */], [TrainerPoolTier.RARE]: [ Species.YANMA, Species.NINJASK, Species.WHIRLIPEDE, Species.EMOLGA ], - [TrainerPoolTier.SUPER_RARE]: [ Species.ACCELGOR, /* Species.DREEPY */ ] + [TrainerPoolTier.SUPER_RARE]: [ Species.ACCELGOR, Species.DREEPY ] }), [TrainerType.DANCER]: new TrainerConfig(++t).setMoneyMultiplier(1.55).setEncounterBgm(TrainerType.CYCLIST) .setPartyTemplates(trainerPartyTemplates.TWO_WEAK, trainerPartyTemplates.ONE_AVG, trainerPartyTemplates.TWO_AVG, trainerPartyTemplates.TWO_WEAK_SAME_TWO_WEAK_SAME) @@ -615,7 +617,7 @@ export const trainerConfigs: TrainerConfigs = { [TrainerType.FISHERMAN]: new TrainerConfig(++t).setMoneyMultiplier(1.25).setEncounterBgm(TrainerType.BACKPACKER) .setPartyTemplates(trainerPartyTemplates.TWO_WEAK_SAME_ONE_AVG, trainerPartyTemplates.ONE_AVG, trainerPartyTemplates.THREE_WEAK_SAME, trainerPartyTemplates.ONE_STRONG, trainerPartyTemplates.SIX_WEAKER) .setSpeciesPools({ - [TrainerPoolTier.COMMON]: [ Species.TENTACOOL, Species.MAGIKARP, Species.GOLDEEN, Species.STARYU, Species.REMORAID, Species.SKRELP, Species.CLAUNCHER, /* Species.ARROKUDA */ ], + [TrainerPoolTier.COMMON]: [ Species.TENTACOOL, Species.MAGIKARP, Species.GOLDEEN, Species.STARYU, Species.REMORAID, Species.SKRELP, Species.CLAUNCHER, Species.ARROKUDA ], [TrainerPoolTier.UNCOMMON]: [ Species.POLIWAG, Species.SHELLDER, Species.KRABBY, Species.HORSEA, Species.CARVANHA, Species.BARBOACH, Species.CORPHISH, Species.FINNEON, Species.TYMPOLE, Species.BASCULIN, Species.FRILLISH, Species.INKAY ], [TrainerPoolTier.RARE]: [ Species.CHINCHOU, Species.CORSOLA, Species.WAILMER, Species.BARBOACH, Species.CLAMPERL, Species.LUVDISC, Species.MANTYKE, Species.ALOMOMOLA, /* Species.TATSUGIRI */ /* Species.VELUZA */ ], [TrainerPoolTier.SUPER_RARE]: [ Species.LAPRAS, Species.FEEBAS, Species.RELICANTH, /* Species.DONDOZO */ ] @@ -627,7 +629,7 @@ export const trainerConfigs: TrainerConfigs = { .setSpeciesPools({ [TrainerPoolTier.COMMON]: [ Species.SANDSHREW, Species.DIGLETT, Species.GEODUDE, Species.MACHOP, Species.ARON, Species.ROGGENROLA, Species.DRILBUR, /* Species.NACLI */ ], [TrainerPoolTier.UNCOMMON]: [ Species.ZUBAT, Species.RHYHORN, Species.ONIX, Species.CUBONE, Species.WOOBAT, Species.SWINUB, Species.NOSEPASS, Species.HIPPOPOTAS, Species.DWEBBLE, /* Species.KLAWF */ /* Species.TOEDSCOOL */ ], - [TrainerPoolTier.RARE]: [ Species.TORKOAL, Species.TRAPINCH, Species.BARBOACH, Species.GOLETT, Species.ALOLA_DIGLETT, Species.ALOLA_GEODUDE, /* Species.GALAR_STUNFISK */ /* Species.PALDEA_WOOPER */ ], + [TrainerPoolTier.RARE]: [ Species.TORKOAL, Species.TRAPINCH, Species.BARBOACH, Species.GOLETT, Species.ALOLA_DIGLETT, Species.ALOLA_GEODUDE, Species.GALAR_STUNFISK /* Species.PALDEA_WOOPER */ ], [TrainerPoolTier.SUPER_RARE]: [ Species.MAGBY, Species.LARVITAR ] }), [TrainerType.HOOLIGANS]: new TrainerConfig(++t).setDouble().setEncounterBgm(TrainerType.ROUGHNECK).setSpeciesFilter(s => s.isOfType(Type.POISON) || s.isOfType(Type.DARK)), @@ -642,7 +644,7 @@ export const trainerConfigs: TrainerConfigs = { [TrainerType.OFFICER]: new TrainerConfig(++t).setMoneyMultiplier(1.55).setEncounterBgm(TrainerType.CLERK) .setPartyTemplates(trainerPartyTemplates.ONE_AVG, trainerPartyTemplates.ONE_STRONG, trainerPartyTemplates.TWO_AVG, trainerPartyTemplates.TWO_WEAK_SAME_ONE_AVG, ) .setSpeciesPools({ - [TrainerPoolTier.COMMON]: [ Species.VULPIX, Species.GROWLITHE, Species.SNUBBULL, Species.POOCHYENA, Species.ELECTRIKE, Species.LILLIPUP, /* Species.YAMPER */ /* , Species.FIDOUGH */ ], + [TrainerPoolTier.COMMON]: [ Species.VULPIX, Species.GROWLITHE, Species.SNUBBULL, Species.POOCHYENA, Species.ELECTRIKE, Species.LILLIPUP, Species.YAMPER /* , Species.FIDOUGH */ ], [TrainerPoolTier.UNCOMMON]: [ Species.HOUNDOUR, Species.ROCKRUFF /*, Species.MASCHIFF */ ], [TrainerPoolTier.RARE]: [ Species.JOLTEON, Species.RIOLU ], [TrainerPoolTier.SUPER_RARE]: [], @@ -655,23 +657,23 @@ export const trainerConfigs: TrainerConfigs = { [TrainerType.PRESCHOOLER]: new TrainerConfig(++t).setMoneyMultiplier(0.2).setEncounterBgm(TrainerType.YOUNGSTER).setHasGenders(undefined, 'lass') .setPartyTemplates(trainerPartyTemplates.THREE_WEAK, trainerPartyTemplates.FOUR_WEAKER, trainerPartyTemplates.TWO_WEAK_SAME_ONE_AVG, trainerPartyTemplates.FIVE_WEAKER) .setSpeciesPools({ - [TrainerPoolTier.COMMON]: [ Species.CATERPIE, Species.PICHU, Species.SANDSHREW, Species.LEDYBA, Species.BUDEW, Species.BURMY, /* Species.WOOLOO, Species.PAWMI, Species.SMOLIV, */ ], - [TrainerPoolTier.UNCOMMON]: [ Species.EEVEE, Species.CLEFFA, Species.IGGLYBUFF, Species.SWINUB, Species.WOOPER, Species.DRIFLOON, /* Species.DEDENNE, Species.STUFFUL, */ ], + [TrainerPoolTier.COMMON]: [ Species.CATERPIE, Species.PICHU, Species.SANDSHREW, Species.LEDYBA, Species.BUDEW, Species.BURMY, Species.WOOLOO, /* Species.PAWMI, Species.SMOLIV, */ ], + [TrainerPoolTier.UNCOMMON]: [ Species.EEVEE, Species.CLEFFA, Species.IGGLYBUFF, Species.SWINUB, Species.WOOPER, Species.DRIFLOON, Species.DEDENNE, Species.STUFFUL ], [TrainerPoolTier.RARE]: [ Species.RALTS, Species.RIOLU, Species.JOLTIK /* Species.TANDEMAUS, */ ], [TrainerPoolTier.SUPER_RARE]: [ Species.DARUMAKA, /* Species.TINKATINK, */], }), [TrainerType.PSYCHIC]: new TrainerConfig(++t).setHasGenders().setMoneyMultiplier(1.4).setEncounterBgm(TrainerType.PSYCHIC) .setPartyTemplates(trainerPartyTemplates.TWO_WEAK, trainerPartyTemplates.TWO_AVG, trainerPartyTemplates.TWO_WEAK_SAME_ONE_AVG, trainerPartyTemplates.TWO_WEAK_SAME_TWO_WEAK_SAME, trainerPartyTemplates.ONE_STRONGER) .setSpeciesPools({ - [TrainerPoolTier.COMMON]: [ Species.ABRA, Species.DROWZEE, Species.RALTS, Species.SPOINK, Species.GOTHITA, Species.SOLOSIS, Species.BLIPBUG, Species.ESPURR, /* Species.HATTENA */ ], + [TrainerPoolTier.COMMON]: [ Species.ABRA, Species.DROWZEE, Species.RALTS, Species.SPOINK, Species.GOTHITA, Species.SOLOSIS, Species.BLIPBUG, Species.ESPURR, Species.HATENNA ], [TrainerPoolTier.UNCOMMON]: [ Species.MIME_JR, Species.EXEGGCUTE, Species.MEDITITE, Species.NATU, Species.EXEGGCUTE, Species.WOOBAT, Species.INKAY, Species.ORANGURU ], [TrainerPoolTier.RARE]: [ Species.ELGYEM, Species.SIGILYPH, Species.BALTOY, Species.GIRAFARIG, Species.MEOWSTIC ], - [TrainerPoolTier.SUPER_RARE]: [ Species.BELDUM, Species.ESPEON /* Species.WYRDEER, */ ], + [TrainerPoolTier.SUPER_RARE]: [ Species.BELDUM, Species.ESPEON, Species.WYRDEER ], }), [TrainerType.RANGER]: new TrainerConfig(++t).setMoneyMultiplier(1.4).setEncounterBgm(TrainerType.BACKPACKER).setHasGenders() .setSpeciesPools({ - [TrainerPoolTier.COMMON]: [ Species.PICHU, Species.GROWLITHE, Species.PONYTA, Species.ZIGZAGOON, Species.SEEDOT, Species.BIDOOF, Species.RIOLU, Species.SEWADDLE, Species.SKIDDO, /* Species.SALANDIT */ /* Species.YAMPER */ ], - [TrainerPoolTier.UNCOMMON]: [ Species.AZURILL, Species.TAUROS, Species.MAREEP, Species.FARFETCHD, Species.TEDDIURSA, Species.SHROOMISH, Species.ELECTRIKE, Species.BUDEW, Species.BUIZEL, /* Species.MUDBRAY, */ /* Species.STUFFUL */ ], + [TrainerPoolTier.COMMON]: [ Species.PICHU, Species.GROWLITHE, Species.PONYTA, Species.ZIGZAGOON, Species.SEEDOT, Species.BIDOOF, Species.RIOLU, Species.SEWADDLE, Species.SKIDDO, Species.SALANDIT, Species.YAMPER ], + [TrainerPoolTier.UNCOMMON]: [ Species.AZURILL, Species.TAUROS, Species.MAREEP, Species.FARFETCHD, Species.TEDDIURSA, Species.SHROOMISH, Species.ELECTRIKE, Species.BUDEW, Species.BUIZEL, Species.MUDBRAY, Species.STUFFUL ], [TrainerPoolTier.RARE]: [ Species.EEVEE, Species.SCYTHER, Species.KANGASKHAN, Species.RALTS, Species.MUNCHLAX, Species.ZORUA, /* Species.PALDEA_TAUROS */ /* Species.TINKATINK */ /* Species.CYCLIZAR */ /* Species.FLAMIGO */ ], [TrainerPoolTier.SUPER_RARE]: [ Species.LARVESTA ], }), @@ -682,9 +684,9 @@ export const trainerConfigs: TrainerConfigs = { .setSpeciesPools({ [TrainerPoolTier.COMMON]: [ Species.MAGNEMITE, Species.GRIMER, Species.DROWZEE, Species.VOLTORB, Species.KOFFING ], [TrainerPoolTier.UNCOMMON]: [ Species.BALTOY, Species.BRONZOR, Species.FERROSEED, Species.KLINK, Species.CHARJABUG, Species.BLIPBUG, Species.HELIOPTILE ], - [TrainerPoolTier.RARE ]: [ Species.ABRA, Species.DITTO, Species.PORYGON, Species.ELEKID, Species.SOLOSIS, /* Species.GALAR_WEEZING */ ], - [TrainerPoolTier.SUPER_RARE ]: [ Species.OMANYTE, Species.KABUTO, Species.AERODACTYL, Species.LILEEP, Species.ANORITH, Species.CRANIDOS, Species.SHIELDON, Species.TIRTOUGA, Species.ARCHEN, /* Species.ARCTOVISH, Species.ARCTOZOLT, Species.DRACOVISH, Species.DRACOZOLT */ ], - [TrainerPoolTier.ULTRA_RARE]: [ Species.ROTOM, /* Species.MELTAN */ ] + [TrainerPoolTier.RARE ]: [ Species.ABRA, Species.DITTO, Species.PORYGON, Species.ELEKID, Species.SOLOSIS, Species.GALAR_WEEZING ], + [TrainerPoolTier.SUPER_RARE ]: [ Species.OMANYTE, Species.KABUTO, Species.AERODACTYL, Species.LILEEP, Species.ANORITH, Species.CRANIDOS, Species.SHIELDON, Species.TIRTOUGA, Species.ARCHEN, Species.ARCTOVISH, Species.ARCTOZOLT, Species.DRACOVISH, Species.DRACOZOLT ], + [TrainerPoolTier.ULTRA_RARE]: [ Species.ROTOM, Species.MELTAN ] }), [TrainerType.SMASHER]: new TrainerConfig(++t).setMoneyMultiplier(1.2).setEncounterBgm(TrainerType.CYCLIST), [TrainerType.SNOW_WORKER]: new TrainerConfig(++t).setName('Worker').setMoneyMultiplier(1.7).setEncounterBgm(TrainerType.CLERK).setSpeciesFilter(s => s.isOfType(Type.ICE) || s.isOfType(Type.STEEL)), @@ -719,7 +721,8 @@ export const trainerConfigs: TrainerConfigs = { `I didn't think you'd beat me that bad…`, `I hope we get to have a rematch some day.` ]), - [TrainerType.BROCK]: new TrainerConfig(++t).initForGymLeader(Species.GEODUDE, Type.ROCK), + + [TrainerType.BROCK]: new TrainerConfig((t = TrainerType.BROCK)).initForGymLeader(Species.GEODUDE, Type.ROCK), [TrainerType.MISTY]: new TrainerConfig(++t).initForGymLeader(Species.STARYU, Type.WATER), [TrainerType.LT_SURGE]: new TrainerConfig(++t).initForGymLeader(Species.ELECTABUZZ, Type.ELECTRIC), [TrainerType.ERIKA]: new TrainerConfig(++t).initForGymLeader(Species.TANGELA, Type.GRASS), @@ -882,11 +885,13 @@ export const trainerConfigs: TrainerConfigs = { [TrainerType.BRYCEN]: new TrainerConfig(++t).initForGymLeader(Species.CRYOGONAL, Type.ICE), [TrainerType.DRAYDEN]: new TrainerConfig(++t).initForGymLeader(Species.DRUDDIGON, Type.DRAGON), [TrainerType.MARLON]: new TrainerConfig(++t).initForGymLeader(Species.WAILMER, Type.WATER), - [TrainerType.SHAUNTAL]: new TrainerConfig(++t).initForEliteFour(Species.LITWICK, Type.GHOST), + + [TrainerType.SHAUNTAL]: new TrainerConfig((t = TrainerType.SHAUNTAL)).initForEliteFour(Species.LITWICK, Type.GHOST), [TrainerType.MARSHAL]: new TrainerConfig(++t).initForEliteFour(Species.TIMBURR, Type.FIGHTING), [TrainerType.GRIMSLEY]: new TrainerConfig(++t).initForEliteFour(Species.PAWNIARD, Type.DARK), [TrainerType.CAITLIN]: new TrainerConfig(++t).initForEliteFour(Species.GOTHITA, Type.PSYCHIC), - [TrainerType.BLUE]: new TrainerConfig(++t).initForChampion(Species.GYARADOS), + + [TrainerType.BLUE]: new TrainerConfig((t = TrainerType.BLUE)).initForChampion(Species.GYARADOS), [TrainerType.RED]: new TrainerConfig(++t).initForChampion(Species.CHARIZARD), [TrainerType.LANCE]: new TrainerConfig(++t).initForChampion(Species.DRAGONITE), [TrainerType.STEVEN]: new TrainerConfig(++t).initForChampion(Species.BELDUM), @@ -894,7 +899,8 @@ export const trainerConfigs: TrainerConfigs = { [TrainerType.CYNTHIA]: new TrainerConfig(++t).initForChampion(Species.GARCHOMP).setBattleBgm('battle_cynthia'), [TrainerType.ALDER]: new TrainerConfig(++t).initForChampion(Species.VOLCARONA), [TrainerType.IRIS]: new TrainerConfig(++t).initForChampion(Species.AXEW), - [TrainerType.RIVAL]: new TrainerConfig(++t).setStaticParty().setEncounterBgm(TrainerType.RIVAL).setBattleBgm('battle_rival').setPartyTemplates(trainerPartyTemplates.RIVAL).setEncounterMessages([ + + [TrainerType.RIVAL]: new TrainerConfig((t = TrainerType.RIVAL)).setStaticParty().setEncounterBgm(TrainerType.RIVAL).setBattleBgm('battle_rival').setPartyTemplates(trainerPartyTemplates.RIVAL).setEncounterMessages([ `There you are! I've been looking everywhere for you!\nDid you forget to say goodbye to your best friend? $So you're finally pursuing your dream, huh?\nI knew you'd do it one day… $Anyway, I'll forgive you for forgetting me, but on one condition. You have to battle me! diff --git a/src/main.ts b/src/main.ts index a9cbd3641..db44f0522 100644 --- a/src/main.ts +++ b/src/main.ts @@ -1,6 +1,7 @@ import Phaser from 'phaser'; import BattleScene from './battle-scene'; import InvertPostFX from './pipelines/invert'; +import { version } from '../package.json'; const config: Phaser.Types.Core.GameConfig = { type: Phaser.WEBGL, @@ -12,7 +13,8 @@ const config: Phaser.Types.Core.GameConfig = { }, pixelArt: true, pipeline: [ InvertPostFX ] as unknown as Phaser.Types.Core.PipelineConfig, - scene: [ BattleScene ] + scene: [ BattleScene ], + version: version }; const setPositionRelative = function (guideObject: any, x: number, y: number) { diff --git a/src/system/game-data.ts b/src/system/game-data.ts index 91ec085ee..9f463d005 100644 --- a/src/system/game-data.ts +++ b/src/system/game-data.ts @@ -21,6 +21,7 @@ interface SystemSaveData { dexData: DexData; unlocks: Unlocks; achvUnlocks: AchvUnlocks; + gameVersion: string; timestamp: integer; } @@ -38,6 +39,7 @@ interface SessionSaveData { waveIndex: integer; battleType: BattleType; trainer: TrainerData; + gameVersion: string; timestamp: integer; } @@ -116,6 +118,7 @@ export class GameData { dexData: this.dexData, unlocks: this.unlocks, achvUnlocks: this.achvUnlocks, + gameVersion: this.scene.game.config.gameVersion, timestamp: new Date().getTime() }; @@ -135,6 +138,12 @@ export class GameData { console.debug(data); + /*const versions = [ this.scene.game.config.gameVersion, data.gameVersion || '0.0.0' ]; + + if (versions[0] !== versions[1]) { + const [ versionNumbers, oldVersionNumbers ] = versions.map(ver => ver.split('.').map(v => parseInt(v))); + }*/ + this.trainerId = data.trainerId; this.secretId = data.secretId; @@ -201,6 +210,7 @@ export class GameData { waveIndex: scene.currentBattle.waveIndex, battleType: scene.currentBattle.battleType, trainer: scene.currentBattle.battleType == BattleType.TRAINER ? new TrainerData(scene.currentBattle.trainer) : null, + gameVersion: scene.game.config.gameVersion, timestamp: new Date().getTime() } as SessionSaveData; @@ -222,6 +232,12 @@ export class GameData { try { const sessionData = JSON.parse(atob(localStorage.getItem('sessionData')), (k: string, v: any) => { + /*const versions = [ scene.game.config.gameVersion, sessionData.gameVersion || '0.0.0' ]; + + if (versions[0] !== versions[1]) { + const [ versionNumbers, oldVersionNumbers ] = versions.map(ver => ver.split('.').map(v => parseInt(v))); + }*/ + if (k === 'party' || k === 'enemyParty' || k === 'enemyField') { const ret: PokemonData[] = []; for (let pd of v) @@ -248,7 +264,7 @@ export class GameData { console.debug(sessionData); - scene.seed = sessionData.seed || this.scene.game.config.seed[0]; + scene.seed = sessionData.seed || scene.game.config.seed[0]; scene.resetSeed(); scene.gameMode = sessionData.gameMode || GameMode.CLASSIC; diff --git a/src/trainer.ts b/src/trainer.ts index a9b94265b..64c5efae2 100644 --- a/src/trainer.ts +++ b/src/trainer.ts @@ -12,7 +12,9 @@ export default class Trainer extends Phaser.GameObjects.Container { constructor(scene: BattleScene, trainerType: TrainerType, female?: boolean, partyTemplateIndex?: integer) { super(scene, -72, 80); - this.config = trainerConfigs[trainerType]; + this.config = trainerConfigs.hasOwnProperty(trainerType) + ? trainerConfigs[trainerType] + : trainerConfigs[TrainerType.ACE_TRAINER]; this.female = female; this.partyTemplateIndex = Math.min(partyTemplateIndex !== undefined ? partyTemplateIndex : Phaser.Math.RND.weightedPick(this.config.partyTemplates.map((_, i) => i)), this.config.partyTemplates.length - 1); diff --git a/src/ui/starter-select-ui-handler.ts b/src/ui/starter-select-ui-handler.ts index e13257d2d..d19029fda 100644 --- a/src/ui/starter-select-ui-handler.ts +++ b/src/ui/starter-select-ui-handler.ts @@ -22,7 +22,7 @@ export interface Starter { pokerus: boolean; } -const gens = [ 'I', 'II', 'III', 'IV', 'V', 'VI', 'VII' ]; +const gens = [ 'I', 'II', 'III', 'IV', 'V', 'VI', 'VII', 'VIII' ]; const ivChartSize = 24; const ivChartStatCoordMultipliers = [ [ 0, 1 ], [ 0.825, 0.5 ], [ 0.825, -0.5 ], [ 0, -1 ], [ -0.825, -0.5 ], [ -0.825, 0.5 ] ]; const defaultIvChartData = new Array(12).fill(null).map(() => 0); @@ -135,8 +135,9 @@ export default class StarterSelectUiHandler extends MessageUiHandler { this.pokemonAbilityText.setOrigin(0, 0); this.starterSelectContainer.add(this.pokemonAbilityText); - this.genOptionsText = addTextObject(this.scene, 115, 6, '', TextStyle.WINDOW); - this.genOptionsText.setLineSpacing(16); + this.genOptionsText = addTextObject(this.scene, 124, 7, '', TextStyle.WINDOW, { fontSize: 72, lineSpacing: 39, align: 'center' }); + this.genOptionsText.setShadowOffset(4.5, 4.5); + this.genOptionsText.setOrigin(0.5, 0); this.starterSelectContainer.add(this.genOptionsText); this.updateGenOptions(); diff --git a/src/ui/text.ts b/src/ui/text.ts index 5b71fa7d2..9b31bf6e3 100644 --- a/src/ui/text.ts +++ b/src/ui/text.ts @@ -67,7 +67,8 @@ export function addTextObject(scene: Phaser.Scene, x: number, y: number, content const ret = scene.add.text(x, y, content, styleOptions); ret.setScale(0.1666666667); ret.setShadow(shadowSize, shadowSize, shadowColor); - ret.setLineSpacing(5); + if (!styleOptions.lineSpacing) + ret.setLineSpacing(5); return ret; }