Skip to content

Commit

Permalink
Merge pull request #2 from Inglix/unstable
Browse files Browse the repository at this point in the history 
Support for RimWorld 1.3.3117 which introduces glitterworld medicine …
  • Loading branch information
@Inglix
Inglix authored Sep 10, 2021
2 parents 0d91a78 + 05af89a commit 0e1bb55
Show file tree
Hide file tree
Showing 6 changed files with 30 additions and 9 deletions.
Binary file renamed 1.3/Assemblies/1SettingsHelper.dll → 1.3/Assemblies/1SettingsHelper-Inglix.dll
View file
Binary file not shown.
Binary file modified 1.3/Assemblies/FasterBiosculpterPod.dll
View file
Binary file not shown.
18 changes: 17 additions & 1 deletion 1.3/Source/FasterBiosculpterPod/FasterBiosculpterPod.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,10 @@ public class FasterBiosculpterPod_Settings : ModSettings

public const float VanillaBioregenerationCycleDays = 25f;
public const float VanillaBioregenerationCycleNutrition = 30f;
public const float VanillaBioregenerationCycleMedicineUltratech = 2f;
public const float RecommendedBioregenerationCycleDays = 6.3f;
public const float RecommendedBioregenerationCycleNutrition = 7.5f;
public const float RecommendedBioregenerationCycleMedicineUltratech = 1f;

public const float VanillaAgeReversalCycleDays = 8f;
public const float VanillaAgeReversalCycleNutrition = 5f;
Expand Down Expand Up @@ -52,6 +54,7 @@ public class FasterBiosculpterPod_Settings : ModSettings
public float MedicCycleNutrition = RecommendedMedicCycleNutrition;
public float BioregenerationCycleDays = RecommendedBioregenerationCycleDays;
public float BioregenerationCycleNutrition = RecommendedBioregenerationCycleNutrition;
public float BioregenerationCycleMedicineUltratech = RecommendedBioregenerationCycleMedicineUltratech;
public float AgeReversalCycleDays = RecommendedAgeReversalCycleDays;
public float AgeReversalCycleNutrition = RecommendedAgeReversalCycleNutrition;
public float PleasureCycleDays = RecommendedPleasureCycleDays;
Expand All @@ -66,6 +69,7 @@ public override void ExposeData()

Scribe_Values.Look(ref BioregenerationCycleDays, "bioregenerationCycleDays", RecommendedBioregenerationCycleDays);
Scribe_Values.Look(ref BioregenerationCycleNutrition, "bioregenerationCycleNutrition", RecommendedBioregenerationCycleNutrition);
Scribe_Values.Look(ref BioregenerationCycleMedicineUltratech, "bioregenerationCycleMedicineUltratech", RecommendedBioregenerationCycleMedicineUltratech);

Scribe_Values.Look(ref AgeReversalCycleDays, "ageReversalCycleDays", RecommendedAgeReversalCycleDays);
Scribe_Values.Look(ref AgeReversalCycleNutrition, "ageReversalCycleNutrition", RecommendedAgeReversalCycleNutrition);
Expand Down Expand Up @@ -97,7 +101,7 @@ public override void DoSettingsWindowContents(Rect canvas)
const float LeftPartPct = 0.2f;

Rect outRect = canvas.TopPart(0.9f);
Rect rect = new Rect(0f, 0f, outRect.width - 18f, 650f);
Rect rect = new Rect(0f, 0f, outRect.width - 18f, 682.5f);
Widgets.BeginScrollView(outRect, ref scrollPosition, rect, true);
Listing_Standard listing = new Listing_Standard();
listing.Begin(rect);
Expand All @@ -109,6 +113,7 @@ public override void DoSettingsWindowContents(Rect canvas)
listing.AddLabelLine("Bioregeneration_Cycle".Translate());
listing.AddLabeledSlider("Cycle_Duration".Translate(), ref settings.BioregenerationCycleDays, 0f, 60f, null, null, 0.1f, true, settings.BioregenerationCycleDays.ToString() + "_days".Translate(), LeftPartPct);
listing.AddLabeledSlider("Nutrition_Required".Translate(), ref settings.BioregenerationCycleNutrition, 0f, 60f, null, null, 0.1f, true, settings.BioregenerationCycleNutrition.ToString() + "_nutrition".Translate(), LeftPartPct);
listing.AddLabeledSlider("MedicineUltratech_Required".Translate(), ref settings.BioregenerationCycleMedicineUltratech, 0f, 10f, null, null, 1f, true, settings.BioregenerationCycleMedicineUltratech.ToString() + "_medicine_ultratech".Translate(), LeftPartPct);
listing.AddHorizontalLine(ListingStandardHelper.Gap);
listing.AddLabelLine("Age_Reversal_Cycle".Translate());
listing.AddLabeledSlider("Cycle_Duration".Translate(), ref settings.AgeReversalCycleDays, 0f, 60f, null, null, 0.1f, true, settings.AgeReversalCycleDays.ToString() + "_days".Translate(), LeftPartPct);
Expand Down Expand Up @@ -139,6 +144,7 @@ public override void DoSettingsWindowContents(Rect canvas)

settings.BioregenerationCycleDays = FasterBiosculpterPod_Settings.RecommendedBioregenerationCycleDays;
settings.BioregenerationCycleNutrition = FasterBiosculpterPod_Settings.RecommendedBioregenerationCycleNutrition;
settings.BioregenerationCycleMedicineUltratech = FasterBiosculpterPod_Settings.RecommendedBioregenerationCycleMedicineUltratech;

settings.AgeReversalCycleDays = FasterBiosculpterPod_Settings.RecommendedAgeReversalCycleDays;
settings.AgeReversalCycleNutrition = FasterBiosculpterPod_Settings.RecommendedAgeReversalCycleNutrition;
Expand All @@ -161,6 +167,7 @@ public override void DoSettingsWindowContents(Rect canvas)

settings.BioregenerationCycleDays = FasterBiosculpterPod_Settings.VanillaBioregenerationCycleDays;
settings.BioregenerationCycleNutrition = FasterBiosculpterPod_Settings.VanillaBioregenerationCycleNutrition;
settings.BioregenerationCycleMedicineUltratech = FasterBiosculpterPod_Settings.VanillaBioregenerationCycleMedicineUltratech;

settings.AgeReversalCycleDays = FasterBiosculpterPod_Settings.VanillaAgeReversalCycleDays;
settings.AgeReversalCycleNutrition = FasterBiosculpterPod_Settings.VanillaAgeReversalCycleNutrition;
Expand Down Expand Up @@ -217,9 +224,18 @@ public static void ApplySettings()
(DefDatabase<ThingDef>.GetNamed("BiosculpterPod", true).comps.Find(x => x.GetType() == typeof(CompProperties_BiosculpterPod_HealingCycle) && x.compClass == typeof(CompBiosculpterPod_MedicCycle)) as CompProperties_BiosculpterPod_HealingCycle).durationDays = settings.MedicCycleDays;
(DefDatabase<ThingDef>.GetNamed("BiosculpterPod", true).comps.Find(x => x.GetType() == typeof(CompProperties_BiosculpterPod_HealingCycle) && x.compClass == typeof(CompBiosculpterPod_MedicCycle)) as CompProperties_BiosculpterPod_HealingCycle).nutritionRequired = settings.MedicCycleNutrition;


(DefDatabase<ThingDef>.GetNamed("BiosculpterPod", true).comps.Find(x => x.GetType() == typeof(CompProperties_BiosculpterPod_HealingCycle) && x.compClass == typeof(CompBiosculpterPod_RegenerationCycle)) as CompProperties_BiosculpterPod_HealingCycle).durationDays = settings.BioregenerationCycleDays;
(DefDatabase<ThingDef>.GetNamed("BiosculpterPod", true).comps.Find(x => x.GetType() == typeof(CompProperties_BiosculpterPod_HealingCycle) && x.compClass == typeof(CompBiosculpterPod_RegenerationCycle)) as CompProperties_BiosculpterPod_HealingCycle).nutritionRequired = settings.BioregenerationCycleNutrition;

List<ThingDefCountClass> requiredExtraIngredients = new List<ThingDefCountClass>();
if (settings.BioregenerationCycleMedicineUltratech > 0f)
{
ThingDefCountClass ultratechMedicine = new ThingDefCountClass(ThingDefOf.MedicineUltratech, (int)settings.BioregenerationCycleMedicineUltratech);
requiredExtraIngredients.Add(ultratechMedicine);
}
(DefDatabase<ThingDef>.GetNamed("BiosculpterPod", true).comps.Find(x => x.GetType() == typeof(CompProperties_BiosculpterPod_HealingCycle) && x.compClass == typeof(CompBiosculpterPod_RegenerationCycle)) as CompProperties_BiosculpterPod_HealingCycle).extraRequiredIngredients = requiredExtraIngredients;

(DefDatabase<ThingDef>.GetNamed("BiosculpterPod", true).comps.Find(x => x.GetType() == typeof(CompProperties_BiosculpterPod_PleasureCycle)) as CompProperties_BiosculpterPod_PleasureCycle).durationDays = settings.PleasureCycleDays;
(DefDatabase<ThingDef>.GetNamed("BiosculpterPod", true).comps.Find(x => x.GetType() == typeof(CompProperties_BiosculpterPod_PleasureCycle)) as CompProperties_BiosculpterPod_PleasureCycle).nutritionRequired = settings.PleasureCycleNutrition;

Expand Down
5 changes: 2 additions & 3 deletions 1.3/Source/FasterBiosculpterPod/FasterBiosculpterPod.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,8 @@
<HintPath>..\..\..\..\..\..\..\workshop\content\294100\2009463077\Current\Assemblies\0Harmony.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="1SettingsHelper, Version=0.19.1.36477, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\..\..\Tools\SettingsHelper\Assemblies\1SettingsHelper.dll</HintPath>
<Reference Include="1SettingsHelper-Inglix">
<HintPath>..\..\..\..\..\Tools\SettingsHelper\Assemblies\1SettingsHelper-Inglix.dll</HintPath>
</Reference>
<Reference Include="Assembly-CSharp">
<HintPath>..\..\..\..\..\RimWorldWin64_Data\Managed\Assembly-CSharp.dll</HintPath>
Expand Down
9 changes: 4 additions & 5 deletions Languages/English/Keyed/FasterBiosculpterPod_Keys.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,19 +13,18 @@
<Age_Reversal>Age Reversal</Age_Reversal>
<Pleasure>Pleasure</Pleasure>

<Cycle_Durations>Cycle Durations</Cycle_Durations>
<Cycle_Nutrition_Requirements>Cycle Nutrition Requirements</Cycle_Nutrition_Requirements>

<Years_Reversed>Age Reversed</Years_Reversed>



<Apply_Custom_Values>Apply Custom Values</Apply_Custom_Values>
<Apply_Recommended_Values>Apply Recommended Values</Apply_Recommended_Values>
<Apply_Vanilla_Values>Apply Vanilla Values</Apply_Vanilla_Values>

<Cycle_Duration>Cycle Duration</Cycle_Duration>
<Nutrition_Required>Nutrition Required</Nutrition_Required>
<MedicineUltratech_Required>Medicine Required</MedicineUltratech_Required>

<_days> days</_days>
<_nutrition> nutrition</_nutrition>
<_W> W</_W>
<_medicine_ultratech> glitterworld medicine</_medicine_ultratech>
</LanguageData>
7 changes: 7 additions & 0 deletions _PublisherPlus.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Configuration>
<Excluded>
<exclude>M:\Games\SteamLibrary\steamapps\common\RimWorld\Mods\FasterBiosculpterPod\.git</exclude>
<exclude>M:\Games\SteamLibrary\steamapps\common\RimWorld\Mods\FasterBiosculpterPod\1.3\Source</exclude>
</Excluded>
</Configuration>

0 comments on commit 0e1bb55

Please sign in to comment.