diff --git a/public/images/trainer/worker_f.json b/public/images/trainer/worker_f.json new file mode 100644 index 000000000..0927cf169 --- /dev/null +++ b/public/images/trainer/worker_f.json @@ -0,0 +1,41 @@ +{ + "textures": [ + { + "image": "worker_f.png", + "format": "RGBA8888", + "size": { + "w": 74, + "h": 74 + }, + "scale": 1, + "frames": [ + { + "filename": "0001.png", + "rotated": false, + "trimmed": false, + "sourceSize": { + "w": 35, + "h": 74 + }, + "spriteSourceSize": { + "x": 0, + "y": 0, + "w": 35, + "h": 74 + }, + "frame": { + "x": 0, + "y": 0, + "w": 35, + "h": 74 + } + } + ] + } + ], + "meta": { + "app": "https://www.codeandweb.com/texturepacker", + "version": "3.0", + "smartupdate": "$TexturePacker:SmartUpdate:6bad32daffd14d5a21c9b090c23b87ea:0b8b4c8146d9853ebe149c44d58484c7:4f90b07dc4792fdf9004b880b7277b97$" + } +} diff --git a/public/images/trainer/worker_f.png b/public/images/trainer/worker_f.png new file mode 100644 index 000000000..e52dbf315 Binary files /dev/null and b/public/images/trainer/worker_f.png differ diff --git a/public/images/trainer/worker.json b/public/images/trainer/worker_m.json similarity index 99% rename from public/images/trainer/worker.json rename to public/images/trainer/worker_m.json index d4b6c9d66..d4a27e030 100644 --- a/public/images/trainer/worker.json +++ b/public/images/trainer/worker_m.json @@ -1,7 +1,7 @@ { "textures": [ { - "image": "worker.png", + "image": "worker_m.png", "format": "RGBA8888", "size": { "w": 252, diff --git a/public/images/trainer/worker.png b/public/images/trainer/worker_m.png similarity index 100% rename from public/images/trainer/worker.png rename to public/images/trainer/worker_m.png diff --git a/src/data/trainer-config.ts b/src/data/trainer-config.ts index 6c340e640..2f9466562 100644 --- a/src/data/trainer-config.ts +++ b/src/data/trainer-config.ts @@ -659,7 +659,7 @@ export const trainerConfigs: TrainerConfigs = { [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)), + [TrainerType.SNOW_WORKER]: new TrainerConfig(++t).setName('Worker').setHasGenders().setHasDouble('Workers').setMoneyMultiplier(1.7).setEncounterBgm(TrainerType.CLERK).setSpeciesFilter(s => s.isOfType(Type.ICE) || s.isOfType(Type.STEEL)), [TrainerType.STRIKER]: new TrainerConfig(++t).setMoneyMultiplier(1.2).setEncounterBgm(TrainerType.CYCLIST), [TrainerType.STUDENT]: new TrainerConfig(++t).setMoneyMultiplier(0.75).setEncounterBgm(TrainerType.YOUNGSTER).setHasGenders(undefined, 'lass').setHasDouble('Students') .setSpeciesPools({ @@ -681,7 +681,7 @@ export const trainerConfigs: TrainerConfigs = { [TrainerPoolTier.UNCOMMON]: [ Species.TROPIUS, Species.PETILIL, Species.BOUNSWEET, Species.INDEEDEE ], [TrainerPoolTier.RARE]: [ Species.APPLIN, Species.SINISTEA, Species.POLTCHAGEIST ] }), - [TrainerType.WORKER]: new TrainerConfig(++t).setEncounterBgm(TrainerType.CLERK).setMoneyMultiplier(1.7).setSpeciesFilter(s => s.isOfType(Type.ROCK) || s.isOfType(Type.STEEL)), + [TrainerType.WORKER]: new TrainerConfig(++t).setHasGenders().setHasDouble('Workers').setEncounterBgm(TrainerType.CLERK).setMoneyMultiplier(1.7).setSpeciesFilter(s => s.isOfType(Type.ROCK) || s.isOfType(Type.STEEL)), [TrainerType.YOUNGSTER]: new TrainerConfig(++t).setMoneyMultiplier(0.5).setEncounterBgm(TrainerType.YOUNGSTER).setHasGenders('Lass', 'lass').setHasDouble('Beginners').setPartyTemplates(trainerPartyTemplates.TWO_WEAKER) .setSpeciesPools( [ Species.CATERPIE, Species.WEEDLE, Species.RATTATA, Species.SENTRET, Species.POOCHYENA, Species.ZIGZAGOON, Species.WURMPLE, Species.BIDOOF, Species.PATRAT, Species.LILLIPUP ]