From eddccdc2ea78f9dfc10630b0c8197a017bd20294 Mon Sep 17 00:00:00 2001 From: lutepickle <28810-lutepickle@users.noreply.gitgud.io> Date: Sat, 15 Apr 2023 12:15:15 -0700 Subject: [PATCH 1/3] Remove some force saves from Egg --- .../RJW_Menstruation/HediffComps/HediffComp_Menstruation.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/1.4/source/RJW_Menstruation/RJW_Menstruation/HediffComps/HediffComp_Menstruation.cs b/1.4/source/RJW_Menstruation/RJW_Menstruation/HediffComps/HediffComp_Menstruation.cs index 130cf24..173ffc1 100644 --- a/1.4/source/RJW_Menstruation/RJW_Menstruation/HediffComps/HediffComp_Menstruation.cs +++ b/1.4/source/RJW_Menstruation/RJW_Menstruation/HediffComps/HediffComp_Menstruation.cs @@ -1991,10 +1991,10 @@ namespace RJW_Menstruation if (fertstage >= 0) ticksSinceFertilization = fertstage * GenDate.TicksPerHour; } Scribe_References.Look(ref fertilizer, "fertilizer", true); - Scribe_Values.Look(ref fertilized, "fertilized", fertilized, 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", ticksSinceFertilization, true); + Scribe_Values.Look(ref ticksSinceFertilization, "ticksSinceFertilization", 0); } } From 4af5195de9a31c83d55dab49ab2aaf928d8ffaf1 Mon Sep 17 00:00:00 2001 From: lutepickle <28810-lutepickle@users.noreply.gitgud.io> Date: Sun, 16 Apr 2023 12:20:01 -0700 Subject: [PATCH 2/3] Give eggs the proper lifetime --- .../RJW_Menstruation/HediffComps/HediffComp_Menstruation.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/1.4/source/RJW_Menstruation/RJW_Menstruation/HediffComps/HediffComp_Menstruation.cs b/1.4/source/RJW_Menstruation/RJW_Menstruation/HediffComps/HediffComp_Menstruation.cs index 173ffc1..5680a04 100644 --- a/1.4/source/RJW_Menstruation/RJW_Menstruation/HediffComps/HediffComp_Menstruation.cs +++ b/1.4/source/RJW_Menstruation/RJW_Menstruation/HediffComps/HediffComp_Menstruation.cs @@ -1968,10 +1968,10 @@ namespace RJW_Menstruation ageTicks = 0; } - public Egg(int lifespanhrs) + public Egg(int lifespanticks) { fertilized = false; - lifeSpanTicks = (int)(lifespanhrs * GenDate.TicksPerHour * Configurations.EggLifespanMultiplier); + lifeSpanTicks = (int)(lifespanticks * Configurations.EggLifespanMultiplier); fertilizer = null; ageTicks = 0; } From 08ebaa9db3f016436146063cdaec3ca5692f0462 Mon Sep 17 00:00:00 2001 From: lutepickle <28810-lutepickle@users.noreply.gitgud.io> Date: Sun, 16 Apr 2023 12:26:11 -0700 Subject: [PATCH 3/3] Unconditionally initialize cum and eggs (e.g. for infertile pawns) --- 1.4/Assemblies/RJW_Menstruation.dll | Bin 211456 -> 211456 bytes .../HediffComps/HediffComp_Menstruation.cs | 6 +++--- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/1.4/Assemblies/RJW_Menstruation.dll b/1.4/Assemblies/RJW_Menstruation.dll index 510a8eda82662837ca3e6d26f06715b8d44ddb95..2452c287e28b52dffc943e7a11b3ee5a7c6540c0 100644 GIT binary patch delta 18734 zcmbW930##$_xR_`-QlvyCITXxvfc}Bh&yHp3Mrx}xq$*g0@ETU)-XU3vU?JB`3iCy(@*qiJlxjLrWlBtE^a48x%eoG0EgWlov;E2p98$! zvG_dJQHSCS_~EDa+x=(T%pB_vsLyMJm|^v1idqHB3+NP!b>b`CIoA?E>x3k zeYdivnczO^-P|xYGvYTo%uP*VgLX!EkRNN0SDTS5#k}E`Ibif4{x2M__8|H($EzJk zFS{~-4-y{AYid^a!du6L6uzUR`B}wqQTggJn}8`HzOBv!RSD$dhqgT z)-(%T{gXwH2lwZug&1BkFf^sW9u|9 z_9k0c=xi{WMmKO zCg#B;HFTCHamS=YZ?fUmN%+Eq!*Px3Q_* zgZ*kQFXnK0asVI20g=+#DLn0E3wS0PD|xGO%VQ2^q%4G&FAwD&%3kHI_OVUq8cwl; zb07v(%r+iZQ3j^Xj5xCq@!)HlBcg`Z@-}~n7_-@;co+oVvz@4iH`%3l80Wveo~Lg# zCIwp#_>VqU&2<^jUFX^I#} zF58s=j?=ysikB1kob6730S7X#(Q@$<2ZAh3-dBuH3^Ghgo)JzoJ1secr5qscg(IIJ2jTTptCVYqCuD_LCo zm2l*@nwQ@m%rloZYetp_=@`OS;~62Zu6&%1o5vKs%tKgSB6!-jF5MZ?n|zk>f`gj) zr8E|)Nt#C^+mQ(Fw$~Q&ZvH-o%YHRnu4f&I;HZmBe?8BG+?%|UK@!+nSvIu3>`HJ~ zCM94^{$QR-xVGl7s3b^$9&Be4eC)bgn52+&G_od-@>*YRBPpa(&~jFi4DJ4@ncPbn z*(tn?o-ENGK_#Mj2017ibg|<3klNgc?&KD<0hl=G(W@@t}8D#{2>s7d`IE-ef4yw&7>zf7toC23qLvY1~s zBnD5etn&^g^DF0iM=yIgp$VdwO}A^pnM|Cr&KpQ!#9KX;gxe_5=5>^I>|i#YLl4kx z^s+NT4jskIVVK$IW#OXyy{Mlr$_l2zomvxH)Z}f0yWof%aEy4e;vsh7rT7oLW0%2L zK2y0BJoDq-nqV;b$3hRM*kuZD-f>0NZVbA5^j?(jF6HC>+J(!O{D)LYzGrXdK%9SQ z4)5{q*!?)hz}k7%YSKT!rCJlX+b@aBaYBX{@T6E~ zb2&(q`v^Hl$Xp>m6}`SMH?Nt=j^~0o#ThuC3!`lxreDUvOxI4@@54W_DHGGVbED8bEvITh% zX0bjcVDjEnE*~-HB0L=`SacD%+IHkUR1GF3 zJ1&cae4CY^0z%owBJkCW$TwIHCJyW*w((BN8`Bq^4dZTlyufAWQZDr-E;V-5JqP1z z^j!?YELtmP;Y26TJS z*sNl_#8+3ph;`%H;$k!|sGrg=c3Gs)6l@~^_E^JOPGZTTtmLk z9D;CnK^V$ALtpZF)})-5c|s&Dko)=x&$TQ88~e|${|YlXZVZ=)L%D>dT)sP-%O-y= zvwgUn&zelIL-R{|3�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 XTVsd5%AX1?4QaF=pxlDGVEz9CK>&zH diff --git a/1.4/source/RJW_Menstruation/RJW_Menstruation/HediffComps/HediffComp_Menstruation.cs b/1.4/source/RJW_Menstruation/RJW_Menstruation/HediffComps/HediffComp_Menstruation.cs index 5680a04..6791f86 100644 --- a/1.4/source/RJW_Menstruation/RJW_Menstruation/HediffComps/HediffComp_Menstruation.cs +++ b/1.4/source/RJW_Menstruation/RJW_Menstruation/HediffComps/HediffComp_Menstruation.cs @@ -1140,11 +1140,13 @@ namespace RJW_Menstruation initError = true; Props = (CompProperties_Menstruation)props; + if (cums == null) cums = new List(); + if (eggs == null) eggs = new List(); + Notify_UpdatedGenes(); if (Props.infertile) { - if (cums == null) cums = new List(); curStage = Stage.None; loaded = true; initError = false; @@ -1170,8 +1172,6 @@ namespace RJW_Menstruation } if (crampPain < 0) crampPain = PainRandomizer(); InitializeExtraValues(); - if (cums == null) cums = new List(); - if (eggs == null) eggs = new List(); TakeLoosePregnancy();