Add luxury ball and golden egg sprite

src/battle-phase.ts

@@ -6,7 +6,7 @@ import { Mode } from './ui/ui';
 import { Command } from "./ui/command-ui-handler";
 import { interp } from "./temp_interpreter";
 import { Stat } from "./pokemon-stat";
-import { ExpBoosterModifier, getNewModifierType, PokemonBaseStatModifier, PokemonModifierType, regenerateModifierPoolThresholds } from "./modifier";
+import { ExpBoosterModifier, getNewModifierType, ModifierType, PokemonBaseStatModifier, PokemonModifierType, regenerateModifierPoolThresholds } from "./modifier";
 import PartyUiHandler from "./ui/party-ui-handler";
 import { doPokeballBounceAnim, getPokeballAtlasKey, getPokeballCatchMultiplier, getTintColor as getPokeballTintColor, PokeballType } from "./pokeball";
 import { pokemonLevelMoves } from "./pokemon-level-moves";
@@ -757,7 +757,9 @@ export class SelectModifierPhase extends BattlePhase {
     super.start();
 
     regenerateModifierPoolThresholds(this.scene.getParty());
-    const types = [ getNewModifierType(), getNewModifierType(), getNewModifierType() ];
+    const types: Array<ModifierType> = [];
+    for (let mt = 0; mt < 3; mt++)
+      types.push(getNewModifierType(this.scene.waveIndex));
 
     this.scene.ui.setMode(Mode.MODIFIER_SELECT, types, (cursor: integer) => {
       if (cursor < 0) {

src/pokeball.ts

@@ -5,7 +5,8 @@ export enum PokeballType {
   POKEBALL,
   GREAT_BALL,
   ULTRA_BALL,
-  MASTER_BALL
+  MASTER_BALL,
+  LUXURY_BALL
 };
 
 export function getPokeballAtlasKey(type: PokeballType): string {
@@ -18,6 +19,8 @@ export function getPokeballAtlasKey(type: PokeballType): string {
       return 'ub';
     case PokeballType.MASTER_BALL:
       return 'mb';
+    case PokeballType.LUXURY_BALL:
+      return 'lb';
   }
 }
 
@@ -36,6 +39,9 @@ export function getPokeballName(type: PokeballType): string {
     case PokeballType.MASTER_BALL:
       ret = 'Master Ball';
       break;
+    case PokeballType.LUXURY_BALL:
+      ret = 'Luxury Ball';
+      break;
   }
   return toPokemonUpperCase(ret);
 }
@@ -50,6 +56,8 @@ export function getPokeballCatchMultiplier(type: PokeballType): number {
       return 2;
     case PokeballType.MASTER_BALL:
       return -1;
+    case PokeballType.LUXURY_BALL:
+      return 1;
   }
 }
 
@@ -63,6 +71,8 @@ export function getTintColor(type: PokeballType): number {
       return 0xe6cd31;
     case PokeballType.MASTER_BALL:
       return 0xa441bd;
+    case PokeballType.LUXURY_BALL:
+      return 0xffde6a;
   }
 }
 

src/pokemon.ts

@@ -454,8 +454,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
     // Gen 1-4 formula
     // return ((this.pokemon.baseExp * this.level) / 7) * (1 / 1)
     // TODO: Update for exp share
-    const constantMultiplier = 4;
-    return Math.floor(((this.species.baseExp * this.level) / 5) * (1 / 1) * constantMultiplier * ((Math.round(Math.sqrt(2 * this.level + 10)) * Math.pow(2 * this.level + 10, 2)) / (Math.round(Math.sqrt(this.level + victorLevel + 10)) * Math.pow(this.level + victorLevel + 10, 2)))) + 1;
+    return Math.floor(((this.species.baseExp * this.level) / 5) * (1 / 1) * ((Math.round(Math.sqrt(2 * this.level + 10)) * Math.pow(2 * this.level + 10, 2)) / (Math.round(Math.sqrt(this.level + victorLevel + 10)) * Math.pow(this.level + victorLevel + 10, 2)))) + 1;
   }
 
   tint(color: number, alpha?: number, duration?: integer, ease?: string) {