Merge pull request #150 from AsdarDevelops/winstrate-challenge

adds Winstrate Challenge mystery encounter

public/images/trainer/vicky.json

@@ -0,0 +1,41 @@
+{
+	"textures": [
+		{
+			"image": "vicky.png",
+			"format": "RGBA8888",
+			"size": {
+				"w": 52,
+				"h": 53
+			},
+			"scale": 1,
+			"frames": [
+				{
+					"filename": "0001.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 80,
+						"h": 80
+					},
+					"spriteSourceSize": {
+						"x": 13,
+						"y": 27,
+						"w": 52,
+						"h": 53
+					},
+					"frame": {
+						"x": 0,
+						"y": 0,
+						"w": 52,
+						"h": 53
+					}
+				}
+			]
+		}
+	],
+	"meta": {
+		"app": "https://www.codeandweb.com/texturepacker",
+		"version": "3.0",
+		"smartupdate": "$TexturePacker:SmartUpdate:bf9d2d417a1982282dd711456ac71206:101e07828e3d6e2a2a7a80aebfa802ad:cabe44a4410c334298b1984a219f8160$"
+	}
+}

public/images/trainer/victor.json

@@ -0,0 +1,41 @@
+{
+	"textures": [
+		{
+			"image": "victor.png",
+			"format": "RGBA8888",
+			"size": {
+				"w": 55,
+				"h": 53
+			},
+			"scale": 1,
+			"frames": [
+				{
+					"filename": "0001.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 80,
+						"h": 80
+					},
+					"spriteSourceSize": {
+						"x": 12,
+						"y": 27,
+						"w": 55,
+						"h": 53
+					},
+					"frame": {
+						"x": 0,
+						"y": 0,
+						"w": 55,
+						"h": 53
+					}
+				}
+			]
+		}
+	],
+	"meta": {
+		"app": "https://www.codeandweb.com/texturepacker",
+		"version": "3.0",
+		"smartupdate": "$TexturePacker:SmartUpdate:64eff0f697754cdf9552b46342c9292a:611e0e2cacbd90c1229ce5443b2414f0:0cc0f5a2c1b2eedb46dd8318e8feb1d8$"
+	}
+}

public/images/trainer/victoria.json

@@ -0,0 +1,41 @@
+{
+	"textures": [
+		{
+			"image": "victoria.png",
+			"format": "RGBA8888",
+			"size": {
+				"w": 52,
+				"h": 54
+			},
+			"scale": 1,
+			"frames": [
+				{
+					"filename": "0001.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 80,
+						"h": 80
+					},
+					"spriteSourceSize": {
+						"x": 14,
+						"y": 26,
+						"w": 52,
+						"h": 54
+					},
+					"frame": {
+						"x": 0,
+						"y": 0,
+						"w": 52,
+						"h": 54
+					}
+				}
+			]
+		}
+	],
+	"meta": {
+		"app": "https://www.codeandweb.com/texturepacker",
+		"version": "3.0",
+		"smartupdate": "$TexturePacker:SmartUpdate:4dafeae3674d63b12cc4d8044f67b5a3:7834687d784c31169256927f419c7958:cf0eb39e0a3f2e42f23ca29747d73c40$"
+	}
+}

public/images/trainer/vito.json

@@ -0,0 +1,41 @@
+{
+	"textures": [
+		{
+			"image": "vito.png",
+			"format": "RGBA8888",
+			"size": {
+				"w": 41,
+				"h": 78
+			},
+			"scale": 1,
+			"frames": [
+				{
+					"filename": "0001.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 80,
+						"h": 80
+					},
+					"spriteSourceSize": {
+						"x": 20,
+						"y": 2,
+						"w": 41,
+						"h": 78
+					},
+					"frame": {
+						"x": 0,
+						"y": 0,
+						"w": 41,
+						"h": 78
+					}
+				}
+			]
+		}
+	],
+	"meta": {
+		"app": "https://www.codeandweb.com/texturepacker",
+		"version": "3.0",
+		"smartupdate": "$TexturePacker:SmartUpdate:cb988be58fcd5381174e9d120b051e38:4d4723dbbcd9713ee0ed3c2d84ef4bfb:1c7723b536b218346e3138016d865ce9$"
+	}
+}

public/images/trainer/vivi.json

@@ -0,0 +1,41 @@
+{
+	"textures": [
+		{
+			"image": "vivi.png",
+			"format": "RGBA8888",
+			"size": {
+				"w": 48,
+				"h": 69
+			},
+			"scale": 1,
+			"frames": [
+				{
+					"filename": "0001.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 80,
+						"h": 80
+					},
+					"spriteSourceSize": {
+						"x": 13,
+						"y": 11,
+						"w": 48,
+						"h": 69
+					},
+					"frame": {
+						"x": 0,
+						"y": 0,
+						"w": 48,
+						"h": 69
+					}
+				}
+			]
+		}
+	],
+	"meta": {
+		"app": "https://www.codeandweb.com/texturepacker",
+		"version": "3.0",
+		"smartupdate": "$TexturePacker:SmartUpdate:0a51b4df0b2ed0fed7e3bdb5dffd9e28:af1f3b1480023b3e3761c49e49faf5f1:4fc6bf2bec74c4bb8809df38231deb01$"
+	}
+}

src/battle-scene.ts

@@ -14,7 +14,7 @@ import { Arena, ArenaBase } from "./field/arena";
 import { GameData } from "./system/game-data";
 import { addTextObject, getTextColor, TextStyle } from "./ui/text";
 import { allMoves } from "./data/move";
-import { getDefaultModifierTypeForTier, getEnemyModifierTypesForWave, getLuckString, getLuckTextTint, getModifierPoolForType, getPartyLuckValue, ModifierPoolType, PokemonHeldItemModifierType } from "./modifier/modifier-type";
+import { getDefaultModifierTypeForTier, getEnemyModifierTypesForWave, getLuckString, getLuckTextTint, getModifierPoolForType, getPartyLuckValue, ModifierPoolType } from "./modifier/modifier-type";
 import AbilityBar from "./ui/ability-bar";
 import { allAbilities, applyAbAttrs, applyPostBattleInitAbAttrs, BlockItemTheftAbAttr, DoubleBattleChanceAbAttr, IncrementMovePriorityAbAttr, PostBattleInitAbAttr } from "./data/ability";
 import Battle, { BattleType, FixedBattleConfig } from "./battle";
@@ -67,12 +67,13 @@ import { UiTheme } from "#enums/ui-theme";
 import { TimedEventManager } from "#app/timed-event-manager.js";
 import i18next from "i18next";
 import { TrainerType } from "#enums/trainer-type";
-import IMysteryEncounter from "./data/mystery-encounters/mystery-encounter";
+import MysteryEncounter from "./data/mystery-encounters/mystery-encounter";
 import { allMysteryEncounters, AVERAGE_ENCOUNTERS_PER_RUN_TARGET, BASE_MYSTERY_ENCOUNTER_SPAWN_WEIGHT, mysteryEncountersByBiome, WEIGHT_INCREMENT_ON_SPAWN_MISS } from "./data/mystery-encounters/mystery-encounters";
 import { MysteryEncounterData } from "#app/data/mystery-encounters/mystery-encounter-data";
 import { MysteryEncounterType } from "#enums/mystery-encounter-type";
 import { MysteryEncounterMode } from "#enums/mystery-encounter-mode";
 import { MysteryEncounterTier } from "#enums/mystery-encounter-tier";
+import HeldModifierConfig from "#app/interfaces/held-modifier-config";
 
 export const bypassLogin = import.meta.env.VITE_BYPASS_LOGIN === "1";
 
@@ -223,7 +224,7 @@ export default class BattleScene extends SceneBase {
   public pokemonInfoContainer: PokemonInfoContainer;
   private party: PlayerPokemon[];
   public mysteryEncounterData: MysteryEncounterData = new MysteryEncounterData(null);
-  public lastMysteryEncounter: IMysteryEncounter;
+  public lastMysteryEncounter: MysteryEncounter;
   /** Combined Biome and Wave count text */
   private biomeWaveText: Phaser.GameObjects.Text;
   private moneyText: Phaser.GameObjects.Text;
@@ -1036,7 +1037,7 @@ export default class BattleScene extends SceneBase {
     }
   }
 
-  newBattle(waveIndex?: integer, battleType?: BattleType, trainerData?: TrainerData, double?: boolean, mysteryEncounter?: IMysteryEncounter): Battle {
+  newBattle(waveIndex?: integer, battleType?: BattleType, trainerData?: TrainerData, double?: boolean, mysteryEncounter?: MysteryEncounter): Battle {
     const _startingWave = Overrides.STARTING_WAVE_OVERRIDE || startingWave;
     const newWaveIndex = waveIndex || ((this.currentBattle?.waveIndex || (_startingWave - 1)) + 1);
     let newDouble: boolean;
@@ -2423,7 +2424,7 @@ export default class BattleScene extends SceneBase {
     });
   }
 
-  generateEnemyModifiers(customHeldModifiers?: PokemonHeldItemModifierType[][]): Promise<void> {
+  generateEnemyModifiers(heldModifiersConfigs?: HeldModifierConfig[][]): Promise<void> {
     return new Promise(resolve => {
       if (this.currentBattle.battleSpec === BattleSpec.FINAL_BOSS) {
         return resolve();
@@ -2445,8 +2446,16 @@ export default class BattleScene extends SceneBase {
       }
 
       party.every((enemyPokemon: EnemyPokemon, i: integer) => {
-        if (customHeldModifiers && i < customHeldModifiers.length && customHeldModifiers[i] && customHeldModifiers[i].length > 0) {
-          customHeldModifiers[i].forEach(mt => mt.newModifier(enemyPokemon).add(this.enemyModifiers, false, this));
+        if (heldModifiersConfigs && i < heldModifiersConfigs.length && heldModifiersConfigs[i] && heldModifiersConfigs[i].length > 0) {
+          heldModifiersConfigs[i].forEach(mt => {
+            const stackCount = mt.stackCount ?? 1;
+            // const isTransferable = mt.isTransferable ?? true;
+            const modifier = mt.modifierType.newModifier(enemyPokemon);
+            modifier.stackCount = stackCount;
+            // TODO: set isTransferable
+            // modifier.setIsTransferable(isTransferable);
+            this.addEnemyModifier(modifier, false, true);
+          });
           return true;
         }
 
@@ -2702,9 +2711,9 @@ export default class BattleScene extends SceneBase {
    * @param override - used to load session encounter when restarting game, etc.
    * @returns
    */
-  getMysteryEncounter(override: IMysteryEncounter): IMysteryEncounter {
+  getMysteryEncounter(override: MysteryEncounter): MysteryEncounter {
     // Loading override or session encounter
-    let encounter: IMysteryEncounter;
+    let encounter: MysteryEncounter;
     if (!isNullOrUndefined(Overrides.MYSTERY_ENCOUNTER_OVERRIDE) && allMysteryEncounters.hasOwnProperty(Overrides.MYSTERY_ENCOUNTER_OVERRIDE)) {
       encounter = allMysteryEncounters[Overrides.MYSTERY_ENCOUNTER_OVERRIDE];
     } else {
@@ -2726,7 +2735,7 @@ export default class BattleScene extends SceneBase {
     }
 
     if (encounter) {
-      encounter = new IMysteryEncounter(encounter);
+      encounter = new MysteryEncounter(encounter);
       encounter.populateDialogueTokensFromRequirements(this);
       return encounter;
     }
@@ -2755,7 +2764,7 @@ export default class BattleScene extends SceneBase {
       tier = Overrides.MYSTERY_ENCOUNTER_TIER_OVERRIDE;
     }
 
-    let availableEncounters: IMysteryEncounter[] = [];
+    let availableEncounters: MysteryEncounter[] = [];
     // New encounter will never be the same as the most recent encounter
     const previousEncounter = this.mysteryEncounterData.encounteredEvents?.length > 0 ? this.mysteryEncounterData.encounteredEvents[this.mysteryEncounterData.encounteredEvents.length - 1][0] : null;
     const biomeMysteryEncounters = mysteryEncountersByBiome.get(this.arena.biomeType) ?? [];
@@ -2802,7 +2811,7 @@ export default class BattleScene extends SceneBase {
     }
     encounter = availableEncounters[Utils.randSeedInt(availableEncounters.length)];
     // New encounter object to not dirty flags
-    encounter = new IMysteryEncounter(encounter);
+    encounter = new MysteryEncounter(encounter);
     encounter.populateDialogueTokensFromRequirements(this);
     return encounter;
   }

src/battle.ts

@@ -14,7 +14,7 @@ import { PlayerGender } from "#enums/player-gender";
 import { Species } from "#enums/species";
 import { TrainerType } from "#enums/trainer-type";
 import i18next from "#app/plugins/i18n";
-import IMysteryEncounter from "./data/mystery-encounters/mystery-encounter";
+import MysteryEncounter from "./data/mystery-encounters/mystery-encounter";
 import { MysteryEncounterMode } from "#enums/mystery-encounter-mode";
 
 export enum BattleType {
@@ -70,7 +70,7 @@ export default class Battle {
   public lastUsedPokeball: PokeballType;
   public playerFaints: number; // The amount of times pokemon on the players side have fainted
   public enemyFaints: number; // The amount of times pokemon on the enemies side have fainted
-  public mysteryEncounter: IMysteryEncounter;
+  public mysteryEncounter: MysteryEncounter;
 
   private rngCounter: integer = 0;
 

src/data/dialogue.ts

@@ -735,6 +735,56 @@ export const trainerTypeDialogue: TrainerTypeDialogue = {
       ]
     }
   ],
+  [TrainerType.VICTOR]: [
+    {
+      encounter: [
+        "dialogue:winstrates_victor.encounter.1",
+      ],
+      victory: [
+        "dialogue:winstrates_victor.victory.1"
+      ],
+    }
+  ],
+  [TrainerType.VICTORIA]: [
+    {
+      encounter: [
+        "dialogue:winstrates_victoria.encounter.1",
+      ],
+      victory: [
+        "dialogue:winstrates_victoria.victory.1"
+      ],
+    }
+  ],
+  [TrainerType.VIVI]: [
+    {
+      encounter: [
+        "dialogue:winstrates_vivi.encounter.1",
+      ],
+      victory: [
+        "dialogue:winstrates_vivi.victory.1"
+      ],
+    }
+  ],
+  [TrainerType.VICKY]: [
+    {
+      encounter: [
+        "dialogue:winstrates_vicky.encounter.1",
+      ],
+      victory: [
+        "dialogue:winstrates_vicky.victory.1"
+      ],
+    }
+  ],
+  [TrainerType.VITO]: [
+    {
+      encounter: [
+        "dialogue:winstrates_vito.encounter.1",
+      ],
+      victory: [
+        "dialogue:winstrates_vito.victory.1"
+      ],
+    }
+  ],
   [TrainerType.BROCK]: {
     encounter: [
       "dialogue:brock.encounter.1",