From 5dbe301fc52b1b759425af3873d822f69b8cf3c0 Mon Sep 17 00:00:00 2001
From: Frederico Santos <frederico.f.santos@tecnico.ulisboa.pt>
Date: Sun, 12 May 2024 07:22:53 +0100
Subject: [PATCH] removed incorrect files

---
 src/data/pokemon-level-moves.ts | 7 +------
 src/data/terrain.ts             | 7 -------
 src/modifier/modifier-type.ts   | 2 +-
 3 files changed, 2 insertions(+), 14 deletions(-)

diff --git a/src/data/pokemon-level-moves.ts b/src/data/pokemon-level-moves.ts
index 1ec45ccc0bd..2823170b13d 100644
--- a/src/data/pokemon-level-moves.ts
+++ b/src/data/pokemon-level-moves.ts
@@ -73,11 +73,8 @@ export const pokemonSpeciesLevelMoves: PokemonSpeciesLevelMoves = {
     [ 1, Moves.SCRATCH ],
     [ 1, Moves.GROWL ],
     [ 4, Moves.EMBER ],
-    [ 6, Moves.POWER_SPLIT ],
-    [ 7, Moves.GUARD_SPLIT ],
+    [ 8, Moves.SMOKESCREEN ],
     [ 12, Moves.DRAGON_BREATH ],
-    [ 15, Moves.TRIPLE_KICK],
-    [ 16, Moves.TRIPLE_AXEL],
     [ 17, Moves.FIRE_FANG ],
     [ 20, Moves.SLASH ],
     [ 24, Moves.FLAMETHROWER ],
@@ -92,7 +89,6 @@ export const pokemonSpeciesLevelMoves: PokemonSpeciesLevelMoves = {
     [ 1, Moves.EMBER ],
     [ 1, Moves.SMOKESCREEN ],
     [ 12, Moves.DRAGON_BREATH ],
-    [ 17, Moves.LIFE_DEW],
     [ 19, Moves.FIRE_FANG ],
     [ 24, Moves.SLASH ],
     [ 30, Moves.FLAMETHROWER ],
@@ -15491,7 +15487,6 @@ export const pokemonSpeciesLevelMoves: PokemonSpeciesLevelMoves = {
     [ 1, Moves.BABY_DOLL_EYES ],
     [ 5, Moves.ECHOED_VOICE ],
     [ 8, Moves.HELPING_HAND ],
-    [ 10, Moves.PROTECT],
     [ 11, Moves.SUPER_FANG ],
     [ 14, Moves.DOUBLE_HIT ],
     [ 18, Moves.BULLET_SEED ],
diff --git a/src/data/terrain.ts b/src/data/terrain.ts
index fad055ad076..43b9aa0c7b6 100644
--- a/src/data/terrain.ts
+++ b/src/data/terrain.ts
@@ -53,13 +53,6 @@ export class Terrain {
   isMoveTerrainCancelled(user: Pokemon, targets: BattlerIndex[], move: Move): boolean {
     switch (this.terrainType) {
       case TerrainType.PSYCHIC:
-        var enemies = user.getOpponents().filter(o => targets.includes(o.getBattlerIndex()));
-        if (enemies.length > 0 && 
-          enemies.some(e => e.species.isOfType(Type.FLYING))|| 
-          enemies.some(e => e.species.getAbility(0) === Abilities.LEVITATE || e.species.getAbility(1) === Abilities.LEVITATE || e.species.getAbility(2) === Abilities.LEVITATE))
-        {
-          return false;
-        }
         if (!move.getAttrs(ProtectAttr).length) {
           const priority = new Utils.IntegerHolder(move.priority);
           applyAbAttrs(IncrementMovePriorityAbAttr, user, null, move, priority);
diff --git a/src/modifier/modifier-type.ts b/src/modifier/modifier-type.ts
index 385fb1d2253..2457a705bce 100644
--- a/src/modifier/modifier-type.ts
+++ b/src/modifier/modifier-type.ts
@@ -973,7 +973,7 @@ interface ModifierPool {
 const modifierPool: ModifierPool = {
   [ModifierTier.COMMON]: [
     new WeightedModifierType(modifierTypes.POKEBALL, 6),
-    new WeightedModifierType(modifierTypes.RARE_CANDY, 9999),
+    new WeightedModifierType(modifierTypes.RARE_CANDY, 2),
     new WeightedModifierType(modifierTypes.POTION, (party: Pokemon[]) => {
       const thresholdPartyMemberCount = Math.min(party.filter(p => p.getInverseHp() >= 10 || p.getHpRatio() <= 0.875).length, 3);
       return thresholdPartyMemberCount * 3;