From b855c5291ec947517c1f58d1b6ed52bf5f939a29 Mon Sep 17 00:00:00 2001 From: lutepickle <28810-lutepickle@users.noreply.gitgud.io> Date: Fri, 15 Mar 2024 20:59:27 -0700 Subject: [PATCH] Remove compatibility code for hour-based saves --- .../HediffComps/HediffComp_Breast.cs | 1 - .../HediffComps/HediffComp_Menstruation.cs | 26 ------------------- .../HediffComp_PeriodicOvulator.cs | 9 ------- .../RJW_Menstruation/Things.cs | 6 ----- 4 files changed, 42 deletions(-) diff --git a/1.5/source/RJW_Menstruation/RJW_Menstruation/HediffComps/HediffComp_Breast.cs b/1.5/source/RJW_Menstruation/RJW_Menstruation/HediffComps/HediffComp_Breast.cs index eacab7d..766e532 100644 --- a/1.5/source/RJW_Menstruation/RJW_Menstruation/HediffComps/HediffComp_Breast.cs +++ b/1.5/source/RJW_Menstruation/RJW_Menstruation/HediffComps/HediffComp_Breast.cs @@ -136,7 +136,6 @@ namespace RJW_Menstruation public override void CompExposeData() { base.CompExposeData(); - Scribe_Values.Look(ref ageOfLastBirth, "ageOfLastBirth", -1); Scribe_Values.Look(ref maxBreastIncrement, "maxBreastIncrement", maxBreastIncrement, true); Scribe_Values.Look(ref breastSizeIncreased, "breastSizeIncreased", 0.0f); diff --git a/1.5/source/RJW_Menstruation/RJW_Menstruation/HediffComps/HediffComp_Menstruation.cs b/1.5/source/RJW_Menstruation/RJW_Menstruation/HediffComps/HediffComp_Menstruation.cs index 8547640..437478c 100644 --- a/1.5/source/RJW_Menstruation/RJW_Menstruation/HediffComps/HediffComp_Menstruation.cs +++ b/1.5/source/RJW_Menstruation/RJW_Menstruation/HediffComps/HediffComp_Menstruation.cs @@ -622,16 +622,6 @@ namespace RJW_Menstruation public override void CompExposeData() { base.CompExposeData(); - if (Scribe.mode == LoadSaveMode.LoadingVars) - { - int curStageHrs = -1; - int currentIntervalHours = -1; - Scribe_Values.Look(ref curStageHrs, "curStageHrs", curStageHrs, true); - Scribe_Values.Look(ref currentIntervalHours, "currentIntervalHours", currentIntervalHours, true); - if (curStageHrs >= 0) curStageTicks = curStageHrs * GenDate.TicksPerHour; - if (currentIntervalHours >= 0) currentIntervalTicks = currentIntervalHours * GenDate.TicksPerHour; - } - Scribe_Collections.Look(ref cums, saveDestroyedThings: true, label: "cums", lookMode: LookMode.Deep, ctorArgs: new object[0]); Scribe_Collections.Look(ref eggs, saveDestroyedThings: true, label: "eggs", lookMode: LookMode.Deep, ctorArgs: new object[0]); Scribe_Values.Look(ref curStage, "curStage", curStage, true); @@ -1995,27 +1985,11 @@ namespace RJW_Menstruation public void ExposeData() { - if (Scribe.mode == LoadSaveMode.LoadingVars) - { - int lifespanhrs = -1; - int position = -1; - Scribe_Values.Look(ref lifespanhrs, "lifespanhrs", lifespanhrs, true); - Scribe_Values.Look(ref position, "position", position, true); - if (lifespanhrs >= 0) lifeSpanTicks = lifespanhrs * GenDate.TicksPerHour; - if (position >= 0) ageTicks = position * GenDate.TicksPerHour; - } Scribe_References.Look(ref fertilizer, "fertilizer", true); Scribe_Values.Look(ref fertilized, "fertilized", false); Scribe_Values.Look(ref lifeSpanTicks, "lifeSpanTicks", lifeSpanTicks, true); Scribe_Values.Look(ref ageTicks, "ageTicks", ageTicks, true); Scribe_Values.Look(ref ticksSinceFertilization, "ticksSinceFertilization", 0); - if (ticksSinceFertilization == 0 && Scribe.mode == LoadSaveMode.LoadingVars) - { - // A bit awkward to do this twice, but it prevents ticksSinceFertilization from getting overwritten on a fertstage load - int fertstage = -1; - Scribe_Values.Look(ref fertstage, "fertstage", fertstage, true); - if (fertstage >= 0) ticksSinceFertilization = fertstage * GenDate.TicksPerHour; - } } } } diff --git a/1.5/source/RJW_Menstruation/RJW_Menstruation/HediffComps/HediffComp_PeriodicOvulator.cs b/1.5/source/RJW_Menstruation/RJW_Menstruation/HediffComps/HediffComp_PeriodicOvulator.cs index cfb9a16..62a9651 100644 --- a/1.5/source/RJW_Menstruation/RJW_Menstruation/HediffComps/HediffComp_PeriodicOvulator.cs +++ b/1.5/source/RJW_Menstruation/RJW_Menstruation/HediffComps/HediffComp_PeriodicOvulator.cs @@ -57,15 +57,6 @@ namespace RJW_Menstruation public override void CompExposeData() { base.CompExposeData(); - if (Scribe.mode == LoadSaveMode.LoadingVars) - { - int hoursToNextCycle = -1; - int averageCycleIntervalHours = -1; - Scribe_Values.Look(ref hoursToNextCycle, "hoursToNextCycle", hoursToNextCycle, true); - Scribe_Values.Look(ref averageCycleIntervalHours, "averageCycleIntervalHours", averageCycleIntervalHours, true); - if (hoursToNextCycle >= 0) ticksToNextCycle = hoursToNextCycle * GenDate.TicksPerHour; - if (averageCycleIntervalHours >= 0) averageCycleIntervalTicks = averageCycleIntervalHours * GenDate.TicksPerHour; - } Scribe_Values.Look(ref ticksToNextCycle, "ticksToNextCycle", ticksToNextCycle, true); Scribe_Values.Look(ref averageCycleIntervalTicks, "averageCycleIntervalTicks", averageCycleIntervalTicks, true); } diff --git a/1.5/source/RJW_Menstruation/RJW_Menstruation/Things.cs b/1.5/source/RJW_Menstruation/RJW_Menstruation/Things.cs index c95454a..8b110d7 100644 --- a/1.5/source/RJW_Menstruation/RJW_Menstruation/Things.cs +++ b/1.5/source/RJW_Menstruation/RJW_Menstruation/Things.cs @@ -237,12 +237,6 @@ namespace RJW_Menstruation public override void ExposeData() { base.ExposeData(); - if(Scribe.mode == LoadSaveMode.LoadingVars) - { - int wearhours = -1; - Scribe_Values.Look(ref wearhours, "wearhours", wearhours, true); - if (wearhours >= 0) wearTicks = wearhours * GenDate.TicksPerHour; - } Scribe_Values.Look(ref absorbedfluids, "absorbedfluids", 0); Scribe_Values.Look(ref dirty, "dirty", false); Scribe_Values.Look(ref wearTicks, "wearTicks", 0);