random-mirrors
/
pokerogue
mirror of https://github.com/pagefaultgames/pokerogue.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'fiery-fallout' of https://github.com/InnocentGameDev/PokeRogue-Events into fiery-fallout

This commit is contained in:
ImperialSympathizer 2024-07-19 20:07:00 -04:00
parent e795a62629 8814175906
commit 8c6610b78f
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/data/mystery-encounters/encounters/fiery-fallout-encounter.ts
View File

@ -202,8 +202,8 @@ export const FieryFalloutEncounter: IMysteryEncounter =
.withOption( .withOption(
new MysteryEncounterOptionBuilder() new MysteryEncounterOptionBuilder()
.withOptionMode(EncounterOptionMode.DISABLED_OR_SPECIAL) .withOptionMode(EncounterOptionMode.DISABLED_OR_SPECIAL)
.withPrimaryPokemonRequirement(new TypeRequirement(Type.FIRE, true,1)) // Will set option3PrimaryName dialogue token automatically .withPrimaryPokemonRequirement(new TypeRequirement(Type.FIRE, true, 1)) // Will set option3PrimaryName dialogue token automatically
.withSecondaryPokemonRequirement(new TypeRequirement(Type.FIRE, true,1)) // Will set option3SecondaryName dialogue token automatically .withSecondaryPokemonRequirement(new TypeRequirement(Type.FIRE, true, 1)) // Will set option3SecondaryName dialogue token automatically
.withDialogue({ .withDialogue({
buttonLabel: `${namespace}:option:3:label`, buttonLabel: `${namespace}:option:3:label`,
buttonTooltip: `${namespace}:option:3:tooltip`, buttonTooltip: `${namespace}:option:3:tooltip`,

6
src/data/mystery-encounters/utils/encounter-phase-utils.ts
View File

@ -641,11 +641,11 @@ export function transitionMysteryEncounterIntroVisuals(scene: BattleScene, hide:
// Transition // Transition
scene.tweens.add({ scene.tweens.add({
targets: introVisuals, targets: introVisuals,
x: hide ? "+=16" : "-=16", x: `${hide? "+" : "-"}=16`,
y: hide ? "-=16" : "+=16", y: `${hide ? "-" : "+"}=16`,
alpha: hide ? 0 : 1, alpha: hide ? 0 : 1,
ease: "Sine.easeInOut", ease: "Sine.easeInOut",
duration: duration, duration,
onComplete: () => { onComplete: () => {
if (hide && destroy) { if (hide && destroy) {
scene.field.remove(introVisuals); scene.field.remove(introVisuals);

2
src/test/utils/overridesHelper.ts
View File

@ -45,7 +45,7 @@ export class OverridesHelper {
* @param encounterType * @param encounterType
* @returns spy instance * @returns spy instance
*/ */
mysteryEncounter(encounterType: MysteryEncounterType): MockInstance { mysteryEncounter(encounterType: MysteryEncounterType) {
const spy = vi.spyOn(overrides, "MYSTERY_ENCOUNTER_OVERRIDE", "get").mockReturnValue(encounterType); const spy = vi.spyOn(overrides, "MYSTERY_ENCOUNTER_OVERRIDE", "get").mockReturnValue(encounterType);
this.log(`Mystery encounter override set to ${encounterType}!`); this.log(`Mystery encounter override set to ${encounterType}!`);
return spy; return spy;