diff --git a/Assemblies/1SettingsHelper.dll b/Assemblies/1SettingsHelper.dll
deleted file mode 100644
index 2b430e02..00000000
Binary files a/Assemblies/1SettingsHelper.dll and /dev/null differ
diff --git a/Assemblies/PokeWorld.dll b/Assemblies/PokeWorld.dll
index edc48ea2..12335f41 100644
Binary files a/Assemblies/PokeWorld.dll and b/Assemblies/PokeWorld.dll differ
diff --git a/Languages/English/Keyed/PokeWorld_Keys.xml b/Languages/English/Keyed/PokeWorld_Keys.xml
index 63f24de4..4e852983 100644
--- a/Languages/English/Keyed/PokeWorld_Keys.xml
+++ b/Languages/English/Keyed/PokeWorld_Keys.xml
@@ -39,7 +39,7 @@
A baby {0}, abandoned or lost, has wandered into the area.\n\nIt seems accustomed to human contact and is joining your colony.
Wild Pokémon frequency:
- The percentage of Pokémon found in the wild over other creatures, such as vanilla Rimworld animals and other modded creatures.\nThis setting affects wild creatures spawn, creatures in incidents, and those sold by traders (Can be changed anytime).\nNote: This setting may not work properly when playing with other mods featuring new animals and animal related events.
+ The percentage of Pokémon found in the wild (from 0% to 100%) over other creatures, such as vanilla Rimworld animals and other modded creatures.\nThis setting affects wild creatures spawn, creatures in incidents, and those sold by traders (Can be changed anytime).\nNote: This setting may not work properly when playing with other mods featuring new animals and animal related events.
No Pokémon
Only Pokémon
Note: You may, on rare occasions, encounter Pokémon from unselected generations, especially when playing with other mods featuring new animal related events.
diff --git a/Source/PokeWorld/.vs/PokeWorld/v16/.suo b/Source/PokeWorld/.vs/PokeWorld/v16/.suo
index e2d1ac1d..95be54b8 100644
Binary files a/Source/PokeWorld/.vs/PokeWorld/v16/.suo and b/Source/PokeWorld/.vs/PokeWorld/v16/.suo differ
diff --git a/Source/PokeWorld/PokeWorld/ModSetting/PokeWorldSettings.cs b/Source/PokeWorld/PokeWorld/ModSetting/PokeWorldSettings.cs
index 012910f4..aeb6581b 100644
--- a/Source/PokeWorld/PokeWorld/ModSetting/PokeWorldSettings.cs
+++ b/Source/PokeWorld/PokeWorld/ModSetting/PokeWorldSettings.cs
@@ -6,7 +6,6 @@
using RimWorld;
using Verse;
using UnityEngine;
-using SettingsHelper;
namespace PokeWorld
{
@@ -80,20 +79,20 @@ public PokeWorldMod(ModContentPack content) : base(content)
public override void DoSettingsWindowContents(Rect inRect)
{
- Listing_Standard listingStandard = ListingStandardHelper.BeginListingStandard(inRect);
-
- ListingStandardHelper.AddLabeledSlider(listingStandard, "PW_SettingsWildPokemonFrequency".Translate(), ref PokeWorldSettings.selectedPokemonFrequency, PokeWorldSettings.minFrequency, PokeWorldSettings.maxFrequency, "PW_SettingsNoPokemon".Translate(), "PW_SettingsOnlyPokemon".Translate());
+ Listing_Standard listingStandard = new Listing_Standard();
+ listingStandard.Begin(inRect);
+ PokeWorldSettings.selectedPokemonFrequency = listingStandard.SliderLabeled("PW_SettingsWildPokemonFrequency".Translate(), PokeWorldSettings.selectedPokemonFrequency, PokeWorldSettings.minFrequency, PokeWorldSettings.maxFrequency);
listingStandard.Label("PW_SettingsWildPokemonFrequencyDesc".Translate());
- ListingStandardHelper.AddHorizontalLine(listingStandard);
- ListingStandardHelper.AddLabeledCheckbox(listingStandard, "PW_SettingsAllowPokemonInfestation".Translate(), ref PokeWorldSettings.allowPokemonInfestation);
- ListingStandardHelper.AddLabeledCheckbox(listingStandard, "PW_SettingsAllowNPCPokemonPack".Translate(), ref PokeWorldSettings.allowNPCPokemonPack);
- ListingStandardHelper.AddLabeledCheckbox(listingStandard, "PW_SettingsEnableShinyMote".Translate(), ref PokeWorldSettings.enableShinyMote);
- //ListingStandardHelper.AddLabeledCheckbox(listingStandard, "PW_SettingsAllowPokemonInRaid".Translate(), ref PokeWorldSettings.allowPokemonInRaid);
- ListingStandardHelper.AddHorizontalLine(listingStandard);
- ListingStandardHelper.AddLabeledCheckbox(listingStandard, "PW_SettingsAllowGeneration".Translate(1), ref PokeWorldSettings.allowGen1);
- ListingStandardHelper.AddLabeledCheckbox(listingStandard, "PW_SettingsAllowGeneration".Translate(2), ref PokeWorldSettings.allowGen2);
- ListingStandardHelper.AddLabeledCheckbox(listingStandard, "PW_SettingsAllowGeneration".Translate(3), ref PokeWorldSettings.allowGen3);
- ListingStandardHelper.AddLabeledCheckbox(listingStandard, "PW_SettingsAllowGeneration".Translate(4), ref PokeWorldSettings.allowGen4);
+ listingStandard.GapLine();
+ listingStandard.CheckboxLabeled("PW_SettingsAllowPokemonInfestation".Translate(), ref PokeWorldSettings.allowPokemonInfestation);
+ listingStandard.CheckboxLabeled("PW_SettingsAllowNPCPokemonPack".Translate(), ref PokeWorldSettings.allowNPCPokemonPack);
+ listingStandard.CheckboxLabeled("PW_SettingsEnableShinyMote".Translate(), ref PokeWorldSettings.enableShinyMote);
+ //listingStandard.CheckboxLabeled("PW_SettingsAllowPokemonInRaid".Translate(), ref PokeWorldSettings.allowPokemonInRaid);
+ listingStandard.GapLine();
+ listingStandard.CheckboxLabeled("PW_SettingsAllowGeneration".Translate(1), ref PokeWorldSettings.allowGen1);
+ listingStandard.CheckboxLabeled("PW_SettingsAllowGeneration".Translate(2), ref PokeWorldSettings.allowGen2);
+ listingStandard.CheckboxLabeled("PW_SettingsAllowGeneration".Translate(3), ref PokeWorldSettings.allowGen3);
+ listingStandard.CheckboxLabeled("PW_SettingsAllowGeneration".Translate(4), ref PokeWorldSettings.allowGen4);
listingStandard.Label("PW_SettingsWarningGenAllowed".Translate());
PokeWorldSettings.selectedPokemonFrequency = (float)Math.Round(PokeWorldSettings.selectedPokemonFrequency);
diff --git a/Source/PokeWorld/PokeWorld/obj/Debug/PokeWorld.csproj.AssemblyReference.cache b/Source/PokeWorld/PokeWorld/obj/Debug/PokeWorld.csproj.AssemblyReference.cache
deleted file mode 100644
index 957a8066..00000000
Binary files a/Source/PokeWorld/PokeWorld/obj/Debug/PokeWorld.csproj.AssemblyReference.cache and /dev/null differ
diff --git a/Source/PokeWorld/PokeWorld/obj/Debug/PokeWorld.csproj.CoreCompileInputs.cache b/Source/PokeWorld/PokeWorld/obj/Debug/PokeWorld.csproj.CoreCompileInputs.cache
index 0e39d527..4de7f7ca 100644
--- a/Source/PokeWorld/PokeWorld/obj/Debug/PokeWorld.csproj.CoreCompileInputs.cache
+++ b/Source/PokeWorld/PokeWorld/obj/Debug/PokeWorld.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-9a68fb3ff73eb58c20dbfa93d2b7a5bea84078da
+ee6679291ea78897b0f1cecdaf524550607f5895
diff --git a/Source/PokeWorld/PokeWorld/obj/Debug/PokeWorld.csproj.FileListAbsolute.txt b/Source/PokeWorld/PokeWorld/obj/Debug/PokeWorld.csproj.FileListAbsolute.txt
index c80724b4..1ab02401 100644
--- a/Source/PokeWorld/PokeWorld/obj/Debug/PokeWorld.csproj.FileListAbsolute.txt
+++ b/Source/PokeWorld/PokeWorld/obj/Debug/PokeWorld.csproj.FileListAbsolute.txt
@@ -13,7 +13,6 @@ D:\Program Files (x86)\Steam\steamapps\common\RimWorld\Mods\PokeWorld\Source\GAR
D:\Program Files (x86)\Steam\steamapps\common\RimWorld\Mods\PokeWorld\Source\GAR_PokeWorld\GAR_PokeWorld\obj\Debug\PokeWorld.csproj.CoreCompileInputs.cache
D:\Program Files (x86)\Steam\steamapps\common\RimWorld\Mods\PokeWorld\Source\GAR_PokeWorld\GAR_PokeWorld\obj\Debug\PokeWorld.csproj.CopyComplete
D:\Program Files (x86)\Steam\steamapps\common\RimWorld\Mods\PokeWorld\Source\GAR_PokeWorld\GAR_PokeWorld\obj\Debug\PokeWorld.dll
-D:\Program Files (x86)\Steam\steamapps\common\RimWorld\Mods\PokeWorld\Source\PokeWorld\PokeWorld\obj\Debug\PokeWorld.csproj.AssemblyReference.cache
D:\Program Files (x86)\Steam\steamapps\common\RimWorld\Mods\PokeWorld\Source\PokeWorld\PokeWorld\obj\Debug\PokeWorld.csproj.CoreCompileInputs.cache
D:\Program Files (x86)\Steam\steamapps\common\RimWorld\Mods\PokeWorld\Source\PokeWorld\PokeWorld\obj\Debug\PokeWorld.csproj.CopyComplete
D:\Program Files (x86)\Steam\steamapps\common\RimWorld\Mods\PokeWorld\Source\PokeWorld\PokeWorld\obj\Debug\PokeWorld.dll
diff --git a/Source/PokeWorld/PokeWorld/obj/Debug/PokeWorld.dll b/Source/PokeWorld/PokeWorld/obj/Debug/PokeWorld.dll
index edc48ea2..12335f41 100644
Binary files a/Source/PokeWorld/PokeWorld/obj/Debug/PokeWorld.dll and b/Source/PokeWorld/PokeWorld/obj/Debug/PokeWorld.dll differ