tweaked nature generation and load to hopefully fix an issue affectin…

…g users with huge modlist (see github issues)
Gargamiel · Jan 17, 2022 · 4eca48a · 4eca48a
1 parent 8b43f4a
commit 4eca48a
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 4 deletions.
diff --git a/Assemblies/PokeWorld.dll b/Assemblies/PokeWorld.dll
diff --git a/Source/PokeWorld/.vs/PokeWorld/v16/.suo b/Source/PokeWorld/.vs/PokeWorld/v16/.suo
diff --git a/Source/PokeWorld/PokeWorld/CompPokemon.cs b/Source/PokeWorld/PokeWorld/CompPokemon.cs
@@ -93,7 +93,7 @@ public override void CompTickRare()
 
         public override IEnumerable<StatDrawEntry> SpecialDisplayStats()
         {
-            if (parent.Faction != null && parent.Faction == Faction.OfPlayer)
+            if (parent.Faction != null && parent.Faction == Faction.OfPlayer && statTracker.nature != null)
             {
                 NatureDef nature = statTracker.nature;
                 string natureLabel = nature.label;

diff --git a/Source/PokeWorld/PokeWorld/Stats/StatWorker_PokemonStats.cs b/Source/PokeWorld/PokeWorld/Stats/StatWorker_PokemonStats.cs
@@ -81,11 +81,11 @@ public override void FinalizeValue(StatRequest req, ref float val, bool applyPos
 
         public float GetNatureMultiplier(CompPokemon comp, StatDef stat)
         {
-            try //Huge modelist sometimes cause unknown issue with nature save, see github issue
+            if(comp.statTracker.nature != null) //Huge modelist sometimes cause unknown issue with nature save, see github issue
             {
                 return comp.statTracker.nature.GetMultiplier(stat);
             }
-            catch
+            else
             {
                 return 1;
             }

diff --git a/Source/PokeWorld/PokeWorld/Trackers/StatTracker.cs b/Source/PokeWorld/PokeWorld/Trackers/StatTracker.cs
@@ -57,7 +57,7 @@ public StatTracker(CompPokemon comp)
         {
             this.comp = comp;
             pokemonHolder = comp.Pokemon;
-            nature = DefDatabase<NatureDef>.GetRandom();
+            nature = DefDatabase<NatureDef>.AllDefs.RandomElement();
             RandomizeIV();
             SetAllEVZero();
         }
@@ -247,6 +247,13 @@ public void ExposeData()
 
             Scribe_Values.Look(ref healthScaleMult, "PW_healthScaleMult", 1);
             Scribe_Defs.Look(ref nature, "PW_nature");
+            if (Scribe.mode == LoadSaveMode.PostLoadInit)
+            {
+                if (nature == null)
+                {
+                    nature = DefDatabase<NatureDef>.AllDefs.RandomElement();
+                }
+            }
         }
     }
 }
diff --git a/Source/PokeWorld/PokeWorld/obj/Debug/PokeWorld.csproj.AssemblyReference.cache b/Source/PokeWorld/PokeWorld/obj/Debug/PokeWorld.csproj.AssemblyReference.cache
diff --git a/Source/PokeWorld/PokeWorld/obj/Debug/PokeWorld.dll b/Source/PokeWorld/PokeWorld/obj/Debug/PokeWorld.dll