From 22054dddd5a7e3cfde5b02b8deaf6765d147e468 Mon Sep 17 00:00:00 2001 From: Madmadness65 Date: Sun, 18 Feb 2024 19:17:30 -0600 Subject: [PATCH] Add Hau as a potential Champion This fixes the Generation 7 Elite Four not having a corresponding Champion to go along with them. --- public/images/trainer/hau.json | 41 +++++++++++++++++++++++++++++++++ public/images/trainer/hau.png | Bin 0 -> 725 bytes src/battle.ts | 2 +- src/data/biomes.ts | 1 + src/data/enums/trainer-type.ts | 1 + src/data/trainer-config.ts | 1 + 6 files changed, 45 insertions(+), 1 deletion(-) create mode 100644 public/images/trainer/hau.json create mode 100644 public/images/trainer/hau.png diff --git a/public/images/trainer/hau.json b/public/images/trainer/hau.json new file mode 100644 index 000000000..5f2ef8bce --- /dev/null +++ b/public/images/trainer/hau.json @@ -0,0 +1,41 @@ +{ + "textures": [ + { + "image": "hau.png", + "format": "RGBA8888", + "size": { + "w": 70, + "h": 70 + }, + "scale": 1, + "frames": [ + { + "filename": "0001.png", + "rotated": false, + "trimmed": false, + "sourceSize": { + "w": 80, + "h": 80 + }, + "spriteSourceSize": { + "x": 27, + "y": 9, + "w": 29, + "h": 70 + }, + "frame": { + "x": 0, + "y": 0, + "w": 29, + "h": 70 + } + } + ] + } + ], + "meta": { + "app": "https://www.codeandweb.com/texturepacker", + "version": "3.0", + "smartupdate": "$TexturePacker:SmartUpdate:688d6d27e686efec45b144ba4544f248:676457a4e9dfbcad0510f6e7bfa73514:d4c7e8b349477c2295b49b0e99b91bb3$" + } +} diff --git a/public/images/trainer/hau.png b/public/images/trainer/hau.png new file mode 100644 index 0000000000000000000000000000000000000000..1ce2c98f6afde4c2f6e662c138eeec0fd2516c99 GIT binary patch literal 725 zcmV;`0xJE9P)a#J5L`Qc30004WQchCo!P&)Q$a=_F1!h%Bni=kY9ZM&cqc<~^MGM!03(aZncL z+;k=j!qY4x$gJYMch1Xm3i-9jrB3x?bstsFhOd%q6VDEa;a@u76*3=y>lfS``c~O*AeK5Lo7@hOR#BB?jWDLDA zP`<&~@v7u}LK`QGpeqt9m;|QOhN!vbQc6}VWZtsO;q=kJDb?Y8SWbg? z2e%!;^H@#HcP3xXKw)wX`EW>59BMkbkHg255ASkaTe!s^amgoP7p@2500000NkvXX Hu0mjfy^}|k literal 0 HcmV?d00001 diff --git a/src/battle.ts b/src/battle.ts index 48f6db50a..ceb552e55 100644 --- a/src/battle.ts +++ b/src/battle.ts @@ -250,7 +250,7 @@ export const fixedBattles: FixedBattleConfigs = { [188]: new FixedBattleConfig().setBattleType(BattleType.TRAINER).setSeedOffsetWave(182) .setGetTrainerFunc(getRandomTrainerFunc([ TrainerType.LANCE, TrainerType.KAREN, TrainerType.DRAKE, TrainerType.LUCIAN, TrainerType.CAITLIN, TrainerType.DRASNA, TrainerType.KAHILI, TrainerType.HASSEL, TrainerType.DRAYTON ])), [190]: new FixedBattleConfig().setBattleType(BattleType.TRAINER).setSeedOffsetWave(182) - .setGetTrainerFunc(getRandomTrainerFunc([ TrainerType.BLUE, TrainerType.RED, TrainerType.LANCE_CHAMPION, TrainerType.STEVEN, TrainerType.WALLACE, TrainerType.CYNTHIA, TrainerType.ALDER, TrainerType.IRIS, TrainerType.DIANTHA, TrainerType.LEON, [ TrainerType.GEETA, TrainerType.NEMONA ], TrainerType.KIERAN ])), + .setGetTrainerFunc(getRandomTrainerFunc([ TrainerType.BLUE, TrainerType.RED, TrainerType.LANCE_CHAMPION, TrainerType.STEVEN, TrainerType.WALLACE, TrainerType.CYNTHIA, TrainerType.ALDER, TrainerType.IRIS, TrainerType.DIANTHA, TrainerType.HAU, TrainerType.LEON, [ TrainerType.GEETA, TrainerType.NEMONA ], TrainerType.KIERAN ])), [195]: new FixedBattleConfig().setBattleType(BattleType.TRAINER) .setGetTrainerFunc(scene => new Trainer(scene, TrainerType.RIVAL_6, scene.gameData.gender === PlayerGender.MALE)) }; \ No newline at end of file diff --git a/src/data/biomes.ts b/src/data/biomes.ts index da5b242b1..60f45017c 100644 --- a/src/data/biomes.ts +++ b/src/data/biomes.ts @@ -7614,6 +7614,7 @@ export const biomeTrainerPools: BiomeTrainerPools = { [ TrainerType.ALDER, [] ], [ TrainerType.IRIS, [] ], [ TrainerType.DIANTHA, [] ], + [ TrainerType.HAU, [] ], [ TrainerType.LEON, [] ], [ TrainerType.GEETA, [] ], [ TrainerType.NEMONA, [] ], diff --git a/src/data/enums/trainer-type.ts b/src/data/enums/trainer-type.ts index f29506820..27a352eee 100644 --- a/src/data/enums/trainer-type.ts +++ b/src/data/enums/trainer-type.ts @@ -169,6 +169,7 @@ export enum TrainerType { ALDER, IRIS, DIANTHA, + HAU, LEON, GEETA, NEMONA, diff --git a/src/data/trainer-config.ts b/src/data/trainer-config.ts index 9523e8628..06c460a54 100644 --- a/src/data/trainer-config.ts +++ b/src/data/trainer-config.ts @@ -757,6 +757,7 @@ export const trainerConfigs: TrainerConfigs = { [TrainerType.ALDER]: new TrainerConfig(++t).initForChampion([ Species.VOLCARONA, Species.GROUDON, Species.BOUFFALANT, Species.ACCELGOR, Species.CONKELDURR ]), [TrainerType.IRIS]: new TrainerConfig(++t).initForChampion([ Species.HAXORUS, Species.YVELTAL, Species.DRUDDIGON, Species.ARON, Species.LAPRAS ]), [TrainerType.DIANTHA]: new TrainerConfig(++t).initForChampion([ Species.HAWLUCHA, Species.XERNEAS, Species.GOURGEIST, Species.GOODRA, Species.GARDEVOIR ]), + [TrainerType.HAU]: new TrainerConfig(++t).initForChampion([ Species.ALOLA_RAICHU, [ Species.SOLGALEO, Species.LUNALA ], Species.NOIVERN, [ Species.DECIDUEYE, Species.INCINEROAR, Species.PRIMARINA ], Species.CRABOMINABLE ]), [TrainerType.LEON]: new TrainerConfig(++t).initForChampion([ Species.DRAGAPULT, [ Species.ZACIAN, Species.ZAMAZENTA ], Species.SEISMITOAD, Species.AEGISLASH, Species.MR_RIME ]), [TrainerType.GEETA]: new TrainerConfig(++t).initForChampion([ Species.GLIMMORA, Species.MIRAIDON, Species.ESPATHRA, Species.VELUZA, Species.KINGAMBIT ]), [TrainerType.NEMONA]: new TrainerConfig(++t).initForChampion([ Species.LYCANROC, Species.KORAIDON, Species.KOMMO_O, Species.PAWMOT, Species.DUSKNOIR ]),