Update final boss fight and restructure some files

src/ui/biome-select-ui-handler.ts

@@ -1,5 +1,6 @@
 import BattleScene, { Button } from "../battle-scene";
-import { Biome, biomeLinks, getBiomeName } from "../data/biome";
+import { biomeLinks, getBiomeName } from "../data/biomes";
+import { Biome } from "../data/enums/biome";
 import { addTextObject, TextStyle } from "./text";
 import { Mode } from "./ui";
 import UiHandler from "./ui-handler";

src/ui/egg-gacha-ui-handler.ts

@@ -3,9 +3,9 @@ import { Mode } from "./ui";
 import { TextStyle, addTextObject, getModifierTierTextTint } from "./text";
 import MessageUiHandler from "./message-ui-handler";
 import * as Utils from "../utils";
-import { ModifierTier } from "../modifier/modifier-type";
+import { ModifierTier } from "../modifier/modifier-tier";
 import { EGG_SEED, Egg, GachaType, getEggTierDefaultHatchWaves, getEggDescriptor, getLegendaryGachaSpeciesForTimestamp, getTypeGachaTypeForTimestamp } from "../data/egg";
-import { Voucher, VoucherType, getVoucherTypeIcon } from "../system/voucher";
+import { VoucherType, getVoucherTypeIcon } from "../system/voucher";
 import { getPokemonSpecies } from "../data/pokemon-species";
 import { Type } from "../data/type";
 import { addWindow } from "./window";

src/ui/party-ui-handler.ts

@@ -7,7 +7,8 @@ import MessageUiHandler from "./message-ui-handler";
 import { Mode } from "./ui";
 import * as Utils from "../utils";
 import { PokemonFormChangeItemModifier, PokemonHeldItemModifier, SwitchEffectTransferModifier } from "../modifier/modifier";
-import { Moves, allMoves } from "../data/move";
+import { allMoves } from "../data/move";
+import { Moves } from "../data/enums/moves";
 import { getGenderColor, getGenderSymbol } from "../data/gender";
 import { StatusEffect } from "../data/status-effect";
 import PokemonIconAnimHandler, { PokemonIconAnimMode } from "./pokemon-icon-anim-handler";

src/ui/starter-select-ui-handler.ts

@@ -1,6 +1,6 @@
 import BattleScene, { Button } from "../battle-scene";
 import PokemonSpecies, { SpeciesFormKey, allSpecies, getPokemonSpecies, speciesStarters as speciesStarterValues } from "../data/pokemon-species";
-import { Species } from "../data/species";
+import { Species } from "../data/enums/species";
 import { TextStyle, addBBCodeTextObject, addTextObject, getTextColor } from "./text";
 import { Mode } from "./ui";
 import MessageUiHandler from "./message-ui-handler";

src/ui/summary-ui-handler.ts

@@ -12,7 +12,7 @@ import { getLevelTotalExp } from "../data/exp";
 import { Stat, getStatName } from "../data/pokemon-stat";
 import { PokemonHeldItemModifier } from "../modifier/modifier";
 import { StatusEffect } from "../data/status-effect";
-import { getBiomeName } from "../data/biome";
+import { getBiomeName } from "../data/biomes";
 import { Nature, getNatureStatMultiplier } from "../data/nature";
 
 enum Page {

src/ui/text.ts

@@ -1,5 +1,6 @@
 import BBCodeText from "phaser3-rex-plugins/plugins/gameobjects/tagtext/bbcodetext/BBCodeText";
 import InputText from "phaser3-rex-plugins/plugins/inputtext";
+import { ModifierTier } from "../modifier/modifier-tier";
 
 export enum TextStyle {
   MESSAGE,
@@ -146,15 +147,15 @@ export function getTextColor(textStyle: TextStyle, shadow?: boolean): string {
 
 export function getModifierTierTextTint(tier: integer): integer {
   switch (tier) {
-    case 0: // ModifierTier.COMMON:
+    case ModifierTier.COMMON:
       return 0xffffff;
-    case 1: // ModifierTier.GREAT:
+    case ModifierTier.GREAT:
       return 0x3890f8;
-    case 2: // ModifierTier.ULTRA:
+    case ModifierTier.ULTRA:
       return 0xf8d038;
-    case 3: // ModifierTier.MASTER:
+    case ModifierTier.MASTER:
       return 0xe020c0;
-    case 4: // ModifierTier.LUXURY:
+    case ModifierTier.LUXURY:
       return 0xe64a18;
   }
 }

src/ui/ui.ts

@@ -189,12 +189,22 @@ export default class UI extends Phaser.GameObjects.Container {
       this.getMessageHandler().showText(text, delay, callback, callbackDelay, prompt, promptDelay);
   }
 
-  showDialogue(text: string, name: string, delay?: integer, callback?: Function, callbackDelay?: integer, prompt?: boolean, promptDelay?: integer): void {
-    const handler = this.getHandler();
-    if (handler instanceof MessageUiHandler)
-      (handler as MessageUiHandler).showDialogue(text, name, delay, callback, callbackDelay, prompt, promptDelay);
-    else
-      this.getMessageHandler().showDialogue(text, name, delay, callback, callbackDelay, prompt, promptDelay);
+  showDialogue(text: string, name: string, delay: integer = 0, callback: Function, callbackDelay?: integer, prompt?: boolean, promptDelay?: integer): void {
+    if (text.indexOf('$') > -1) {
+      const messagePages = text.split(/\$/g).map(m => m.trim());
+      let showMessageAndCallback = () => callback();
+      for (let p = messagePages.length - 1; p >= 0; p--) {
+        const originalFunc = showMessageAndCallback;
+        showMessageAndCallback = () => this.showDialogue(messagePages[p], name, null, originalFunc, null, true);
+      }
+      showMessageAndCallback();
+    } else {
+      const handler = this.getHandler();
+      if (handler instanceof MessageUiHandler)
+        (handler as MessageUiHandler).showDialogue(text, name, delay, callback, callbackDelay, prompt, promptDelay);
+      else
+        this.getMessageHandler().showDialogue(text, name, delay, callback, callbackDelay, prompt, promptDelay);
+    }
   }
 
   showTooltip(title: string, content: string, overlap?: boolean): void {