Skip to content

Commit

Permalink
fixed settings window issue due to outdated settingsHelper package
Browse files Browse the repository at this point in the history
  • Loading branch information
Gargamiel committed Oct 22, 2022
1 parent ac6e3d6 commit c7d25ae
Show file tree
Hide file tree
Showing 9 changed files with 15 additions and 17 deletions.
Binary file removed Assemblies/1SettingsHelper.dll
Binary file not shown.
Binary file modified Assemblies/PokeWorld.dll
Binary file not shown.
2 changes: 1 addition & 1 deletion Languages/English/Keyed/PokeWorld_Keys.xml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
<PW_IncidentBabyPokemonDesc>A baby {0}, abandoned or lost, has wandered into the area.\n\nIt seems accustomed to human contact and is joining your colony.</PW_IncidentBabyPokemonDesc>

<PW_SettingsWildPokemonFrequency>Wild Pokémon frequency:</PW_SettingsWildPokemonFrequency>
<PW_SettingsWildPokemonFrequencyDesc>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.</PW_SettingsWildPokemonFrequencyDesc>
<PW_SettingsWildPokemonFrequencyDesc>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.</PW_SettingsWildPokemonFrequencyDesc>
<PW_SettingsNoPokemon>No Pokémon</PW_SettingsNoPokemon>
<PW_SettingsOnlyPokemon>Only Pokémon</PW_SettingsOnlyPokemon>
<PW_SettingsWarningGenAllowed>Note: You may, on rare occasions, encounter Pokémon from unselected generations, especially when playing with other mods featuring new animal related events.</PW_SettingsWarningGenAllowed>
Expand Down
Binary file modified Source/PokeWorld/.vs/PokeWorld/v16/.suo
Binary file not shown.
27 changes: 13 additions & 14 deletions Source/PokeWorld/PokeWorld/ModSetting/PokeWorldSettings.cs
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
using RimWorld;
using Verse;
using UnityEngine;
using SettingsHelper;

namespace PokeWorld
{
Expand Down Expand Up @@ -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);
Expand Down
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -1 +1 @@
9a68fb3ff73eb58c20dbfa93d2b7a5bea84078da
ee6679291ea78897b0f1cecdaf524550607f5895
Original file line number Diff line number Diff line change
Expand Up @@ -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
Binary file modified Source/PokeWorld/PokeWorld/obj/Debug/PokeWorld.dll
Binary file not shown.

0 comments on commit c7d25ae

Please sign in to comment.