From 1d0263983baf6af01b11dbd87594ecd280e367f3 Mon Sep 17 00:00:00 2001
From: GARCIN David <david.garcin.pro@gmail.com>
Date: Fri, 25 Aug 2023 18:32:49 +0200
Subject: [PATCH] Utils.Gym: Improve best option selection

Since v0.10.2 a gym leader might have more potential pokemons listed
than the ones that are actually used.

This would lead to many wrong decisions for the automation.
The `getPokemonList()` is now used to access the correct pokemon list.
---
 src/lib/Utils/Gym.js                  | 17 ++++++-----------
 tst/stubs/Gym/Gym.pokeclicker.stub.js |  5 +++++
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/lib/Utils/Gym.js b/src/lib/Utils/Gym.js
index 9b864dc3..16ca0fb9 100644
--- a/src/lib/Utils/Gym.js
+++ b/src/lib/Utils/Gym.js
@@ -63,7 +63,8 @@ class AutomationUtilsGym
                                                          : playerClickAttack;
 
             let currentGymGemPerTick = 0;
-            for (const pokemon of gym.pokemons)
+            const gymPokemons = gym.getPokemonList()
+            for (const pokemon of gymPokemons)
             {
                 const pokemonData = pokemonMap[pokemon.name];
                 if (!pokemonData.type.includes(pokemonType))
@@ -77,7 +78,7 @@ class AutomationUtilsGym
             }
 
             // TODO (26/06/2022): Be more precise, all pokemons do not have the same health
-            currentGymGemPerTick /= gym.pokemons.length;
+            currentGymGemPerTick /= gymPokemons.length;
 
             // Compare with a 1/1000 precision
             if (Math.ceil(currentGymGemPerTick * 1000) >= Math.ceil(bestGymRate * 1000))
@@ -151,7 +152,7 @@ class AutomationUtilsGym
 
             const weatherType = Weather.regionalWeather[townRegion]();
 
-            const ticksToWin = gym.pokemons.reduce(
+            const ticksToWin = gym.getPokemonList().reduce(
                 (count, pokemon) =>
                 {
                     const partyAttack =
@@ -198,7 +199,7 @@ class AutomationUtilsGym
         {
             let gym = GymList[gymName];
 
-            for (const pokemon of gym.pokemons)
+            for (const pokemon of gym.getPokemonList())
             {
                 let pokemonData = pokemonMap[pokemon.name];
 
@@ -225,15 +226,9 @@ class AutomationUtilsGym
                                              gymName: gymName,
                                              gymTown: gymTown,
                                              region: TownList[gymTown].region,
-                                             subRegion: TownList[gymTown].subRegion,
-                                             pokemonMathingType: 1,
-                                             totalPokemons: gym.pokemons.length
+                                             subRegion: TownList[gymTown].subRegion
                                          });
                     }
-                    else
-                    {
-                        gemTypeData.at(-1).pokemonMathingType += 1;
-                    }
                 }
             }
         }
diff --git a/tst/stubs/Gym/Gym.pokeclicker.stub.js b/tst/stubs/Gym/Gym.pokeclicker.stub.js
index 0d9d1893..2fba8e20 100644
--- a/tst/stubs/Gym/Gym.pokeclicker.stub.js
+++ b/tst/stubs/Gym/Gym.pokeclicker.stub.js
@@ -10,4 +10,9 @@ class Gym extends TownContent
         this.town = town;
         this.pokemons = pokemons;
     }
+
+    getPokemonList()
+    {
+        return this.pokemons
+    }
 }