From 4f8a1621d89598903ab8531d5e153eeedd64ea79 Mon Sep 17 00:00:00 2001
From: Flashfyre <flashfireex@gmail.com>
Date: Sun, 23 Apr 2023 10:42:00 -0400
Subject: [PATCH] Remove boss at level over 100 logic

---
 src/arena.ts                  | 2 +-
 src/battle-scene.ts           | 2 +-
 src/modifier/modifier-type.ts | 2 +-
 src/modifier/modifier.ts      | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/arena.ts b/src/arena.ts
index b62e3ed0d..c637322be 100644
--- a/src/arena.ts
+++ b/src/arena.ts
@@ -29,7 +29,7 @@ export class Arena {
   }
 
   randomSpecies(waveIndex: integer, level: integer, attempt?: integer): PokemonSpecies {
-    const isBoss = (level >= 100 || waveIndex % 10 === 0) && !!this.pokemonPool[BiomePoolTier.BOSS].length;
+    const isBoss = waveIndex % 10 === 0 && !!this.pokemonPool[BiomePoolTier.BOSS].length;
     const tierValue = Utils.randInt(!isBoss ? 512 : 64);
     let tier = !isBoss
       ? tierValue >= 156 ? BiomePoolTier.COMMON : tierValue >= 32 ? BiomePoolTier.UNCOMMON : tierValue >= 6 ? BiomePoolTier.RARE : tierValue >= 1 ? BiomePoolTier.SUPER_RARE : BiomePoolTier.ULTRA_RARE
diff --git a/src/battle-scene.ts b/src/battle-scene.ts
index dccfdd2f9..8f69dba60 100644
--- a/src/battle-scene.ts
+++ b/src/battle-scene.ts
@@ -762,7 +762,7 @@ export default class BattleScene extends Phaser.Scene {
 		return new Promise(resolve => {
 			const waveIndex = this.currentBattle.waveIndex;
 			const chances = Math.ceil(waveIndex / 10);
-			const isBoss = this.getEnemyPokemon().level >= 100 || !(waveIndex % 10);
+			const isBoss = !(waveIndex % 10);
 			let count = 0;
 			for (let c = 0; c < chances; c++) {
 				if (!Utils.randInt(!isBoss ? 12 : 4))
diff --git a/src/modifier/modifier-type.ts b/src/modifier/modifier-type.ts
index 4d8e8ce3f..315ac5b35 100644
--- a/src/modifier/modifier-type.ts
+++ b/src/modifier/modifier-type.ts
@@ -600,7 +600,7 @@ const modifierPool = {
     new WeightedModifierType(modifierTypes.ULTRA_BALL, 8),
     new WeightedModifierType(modifierTypes.EVOLUTION_ITEM, 12),
     new WeightedModifierType(modifierTypes.ATTACK_TYPE_BOOSTER, 5),
-    new WeightedModifierType(modifierTypes.OVAL_CHARM, 1),
+    //new WeightedModifierType(modifierTypes.OVAL_CHARM, 1),
     new WeightedModifierType(modifierTypes.HEALING_CHARM, 1),
     new WeightedModifierType(modifierTypes.LEFTOVERS, 2),
     new WeightedModifierType(modifierTypes.SHELL_BELL, 2),
diff --git a/src/modifier/modifier.ts b/src/modifier/modifier.ts
index b123879cf..80ec2749b 100644
--- a/src/modifier/modifier.ts
+++ b/src/modifier/modifier.ts
@@ -657,7 +657,7 @@ export class PartyShareModifier extends PersistentModifier {
     for (let modifier of modifiers) {
       if (modifier instanceof PokemonHeldItemModifier) {
         const heldItemModifier = modifier as PokemonHeldItemModifier;
-        const extraStacks = Math.floor(modifier.stackCount / Math.max(party.length - (this.getStackCount() - 1), 1));
+        const extraStacks = Math.floor(modifier.stackCount / Math.max(party.length - (this.stackCount - 1), 1));
         for (let s = 0; s < extraStacks; s++) {
           for (let p of party) {
             if (p.id === heldItemModifier.pokemonId)