From ebbbf8ee7f542f46ee0aafc49d8ed592d103410f Mon Sep 17 00:00:00 2001 From: lutepickle <28810-lutepickle@users.noreply.gitgud.io> Date: Mon, 3 Jul 2023 08:54:19 -0700 Subject: [PATCH 1/7] Initialize womb when displaying gizmo if needed. --- 1.4/Assemblies/RJW_Menstruation.dll | Bin 213504 -> 213504 bytes 1.4/MilkModule/Assemblies/MilkModule.dll | Bin 5632 -> 5632 bytes .../RJW_Menstruation/Patch/Gizmo_Patch.cs | 2 ++ 3 files changed, 2 insertions(+) diff --git a/1.4/Assemblies/RJW_Menstruation.dll b/1.4/Assemblies/RJW_Menstruation.dll index 2ac459a69e01808ea34979e2fd378dc5d7d251b7..1da015210bd45dc20e9b6efae2e34da33eb0b3a2 100644 GIT binary patch delta 11675 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 delta 11632 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 diff --git a/1.4/MilkModule/Assemblies/MilkModule.dll b/1.4/MilkModule/Assemblies/MilkModule.dll index d34b6738d7d413ac256f6bd76cf1ea590e4125ed..95909f5ede001722f0b10c4c333eda875950ae93 100644 GIT binary patch delta 68 zcmV-K0K5NyEPyPKhy>rgqo}cr{0k7r1f=0%fe1~zGX<@z$DP@;m<$901gM16my@6l aG!T*kd3wOp?o67CnI8~VZ0xh-4jczXMIQ73 delta 68 zcmV-K0K5NyEPyPKhy?lqOzyFa{0k7Zd(*EUrBp??gJX6M4`Nlbm<$901h}Zm$djNB aG!O#q6|rt$d_#$3YL&xPv^BHj4jc#dq8!8k diff --git a/1.4/source/RJW_Menstruation/RJW_Menstruation/Patch/Gizmo_Patch.cs b/1.4/source/RJW_Menstruation/RJW_Menstruation/Patch/Gizmo_Patch.cs index 86ef4d9..b0ab1a3 100644 --- a/1.4/source/RJW_Menstruation/RJW_Menstruation/Patch/Gizmo_Patch.cs +++ b/1.4/source/RJW_Menstruation/RJW_Menstruation/Patch/Gizmo_Patch.cs @@ -43,6 +43,8 @@ namespace RJW_Menstruation private static Gizmo CreateGizmo_WombStatus(Pawn pawn, HediffComp_Menstruation comp) { + if (!comp.loaded) + comp.Initialize(); Texture2D icon, icon_overlay; StringBuilder description = new StringBuilder(); if (Configurations.Debug) From 6fabfd6aafbdabe405a3f749d0b1edf04074bf80 Mon Sep 17 00:00:00 2001 From: lutepickle <28810-lutepickle@users.noreply.gitgud.io> Date: Mon, 3 Jul 2023 09:08:52 -0700 Subject: [PATCH 2/7] Revert "Initialize womb when displaying gizmo if needed." This reverts commit ebbbf8ee7f542f46ee0aafc49d8ed592d103410f. --- 1.4/Assemblies/RJW_Menstruation.dll | Bin 213504 -> 213504 bytes 1.4/MilkModule/Assemblies/MilkModule.dll | Bin 5632 -> 5632 bytes .../RJW_Menstruation/Patch/Gizmo_Patch.cs | 2 -- 3 files changed, 2 deletions(-) diff --git a/1.4/Assemblies/RJW_Menstruation.dll b/1.4/Assemblies/RJW_Menstruation.dll index 1da015210bd45dc20e9b6efae2e34da33eb0b3a2..2ac459a69e01808ea34979e2fd378dc5d7d251b7 100644 GIT binary patch delta 11632 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 delta 11675 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 diff --git a/1.4/MilkModule/Assemblies/MilkModule.dll b/1.4/MilkModule/Assemblies/MilkModule.dll index 95909f5ede001722f0b10c4c333eda875950ae93..d34b6738d7d413ac256f6bd76cf1ea590e4125ed 100644 GIT binary patch delta 68 zcmV-K0K5NyEPyPKhy?lqOzyFa{0k7Zd(*EUrBp??gJX6M4`Nlbm<$901h}Zm$djNB aG!O#q6|rt$d_#$3YL&xPv^BHj4jc#dq8!8k delta 68 zcmV-K0K5NyEPyPKhy>rgqo}cr{0k7r1f=0%fe1~zGX<@z$DP@;m<$901gM16my@6l aG!T*kd3wOp?o67CnI8~VZ0xh-4jczXMIQ73 diff --git a/1.4/source/RJW_Menstruation/RJW_Menstruation/Patch/Gizmo_Patch.cs b/1.4/source/RJW_Menstruation/RJW_Menstruation/Patch/Gizmo_Patch.cs index b0ab1a3..86ef4d9 100644 --- a/1.4/source/RJW_Menstruation/RJW_Menstruation/Patch/Gizmo_Patch.cs +++ b/1.4/source/RJW_Menstruation/RJW_Menstruation/Patch/Gizmo_Patch.cs @@ -43,8 +43,6 @@ namespace RJW_Menstruation private static Gizmo CreateGizmo_WombStatus(Pawn pawn, HediffComp_Menstruation comp) { - if (!comp.loaded) - comp.Initialize(); Texture2D icon, icon_overlay; StringBuilder description = new StringBuilder(); if (Configurations.Debug) From 48f020d832786b7473cfe65f0a18f1c2c6a7c914 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BA=D0=B8=D1=8F=D0=BC=D0=B8=20=D0=A1=D0=BE=D0=BB?= =?UTF-8?q?=D0=BE?= Date: Thu, 11 Jan 2024 20:38:38 +0300 Subject: [PATCH 3/7] fix display of breast fullness in gui for rjw-mc-biotech mod --- .../RJW_Menstruation/RJW_Menstruation/Utility.cs | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/1.4/source/RJW_Menstruation/RJW_Menstruation/Utility.cs b/1.4/source/RJW_Menstruation/RJW_Menstruation/Utility.cs index ae2cb4a..862a032 100644 --- a/1.4/source/RJW_Menstruation/RJW_Menstruation/Utility.cs +++ b/1.4/source/RJW_Menstruation/RJW_Menstruation/Utility.cs @@ -274,9 +274,15 @@ namespace RJW_Menstruation //List milkcomp = pawn.AllComps.FindAll(x => x is CompMilkable || x.GetType().ToString().ToLower().Contains("milkable")); ThingComp milkcomp = null; float res = 0; - if (VariousDefOf.Hediff_Heavy_Lactating_Permanent != null) + if (VariousDefOf.Hediff_Heavy_Lactating_Permanent != null + || VariousDefOf.Hediff_Lactating_Permanent != null + || VariousDefOf.Hediff_Lactating_Natural != null + || VariousDefOf.Hediff_Lactating_Drug != null) { - if (pawn.health.hediffSet.HasHediff(VariousDefOf.Hediff_Heavy_Lactating_Permanent)) milkcomp = pawn.AllComps.FirstOrDefault(x => x.GetType().ToString().ToLower().Contains("hypermilkable")); + if (pawn.health.hediffSet.HasHediff(VariousDefOf.Hediff_Heavy_Lactating_Permanent) + || pawn.health.hediffSet.HasHediff(VariousDefOf.Hediff_Lactating_Permanent) + || pawn.health.hediffSet.HasHediff(VariousDefOf.Hediff_Lactating_Natural) + || pawn.health.hediffSet.HasHediff(VariousDefOf.Hediff_Lactating_Drug)) milkcomp = pawn.AllComps.FirstOrDefault(x => x.GetType().ToString().ToLower().Contains("milkablehuman")); else milkcomp = pawn.AllComps.FirstOrDefault(x => x.GetType().ToString().ToLower().Contains("milkable")); } else From b21fc85a294eafcd1b44131879e15405cf51b2a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BA=D0=B8=D1=8F=D0=BC=D0=B8=20=D0=A1=D0=BE=D0=BB?= =?UTF-8?q?=D0=BE?= Date: Thu, 11 Jan 2024 20:39:07 +0300 Subject: [PATCH 4/7] fix JobDef link for mod rjw-mc-biotech mod --- 1.4/source/RJW_Menstruation/RJW_Menstruation/VariousDefOf.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/1.4/source/RJW_Menstruation/RJW_Menstruation/VariousDefOf.cs b/1.4/source/RJW_Menstruation/RJW_Menstruation/VariousDefOf.cs index 920bd78..b8408c5 100644 --- a/1.4/source/RJW_Menstruation/RJW_Menstruation/VariousDefOf.cs +++ b/1.4/source/RJW_Menstruation/RJW_Menstruation/VariousDefOf.cs @@ -184,7 +184,7 @@ namespace RJW_Menstruation public static readonly HediffDef Hediff_Lactating_Natural = DefDatabase.GetNamedSilentFail("Lactating_Natural"); public static readonly HediffDef Hediff_Lactating_Permanent = DefDatabase.GetNamedSilentFail("Lactating_Permanent"); public static readonly HediffDef Hediff_Heavy_Lactating_Permanent = DefDatabase.GetNamedSilentFail("Heavy_Lactating_Permanent"); - public static readonly JobDef Job_LactateSelf_MC = DefDatabase.GetNamedSilentFail("LactateSelf_MC"); + public static readonly JobDef Job_LactateSelf_MC = DefDatabase.GetNamedSilentFail("MilkSelf"); // Defs from Sexperience Ideology public static readonly PreceptDef Pregnancy_Elevated = DefDatabase.GetNamedSilentFail("Pregnancy_Elevated"); From cdfe9b44b828efc2a34d4c6eb1fd74d4a2d6a549 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BA=D0=B8=D1=8F=D0=BC=D0=B8=20=D0=A1=D0=BE=D0=BB?= =?UTF-8?q?=D0=BE?= Date: Thu, 11 Jan 2024 20:55:26 +0300 Subject: [PATCH 5/7] reduction of unnecessary inspections --- 1.4/source/RJW_Menstruation/RJW_Menstruation/Utility.cs | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/1.4/source/RJW_Menstruation/RJW_Menstruation/Utility.cs b/1.4/source/RJW_Menstruation/RJW_Menstruation/Utility.cs index 862a032..aba9ccd 100644 --- a/1.4/source/RJW_Menstruation/RJW_Menstruation/Utility.cs +++ b/1.4/source/RJW_Menstruation/RJW_Menstruation/Utility.cs @@ -274,10 +274,7 @@ namespace RJW_Menstruation //List milkcomp = pawn.AllComps.FindAll(x => x is CompMilkable || x.GetType().ToString().ToLower().Contains("milkable")); ThingComp milkcomp = null; float res = 0; - if (VariousDefOf.Hediff_Heavy_Lactating_Permanent != null - || VariousDefOf.Hediff_Lactating_Permanent != null - || VariousDefOf.Hediff_Lactating_Natural != null - || VariousDefOf.Hediff_Lactating_Drug != null) + if (VariousDefOf.Hediff_Heavy_Lactating_Permanent != null) { if (pawn.health.hediffSet.HasHediff(VariousDefOf.Hediff_Heavy_Lactating_Permanent) || pawn.health.hediffSet.HasHediff(VariousDefOf.Hediff_Lactating_Permanent) From d4f8312cee862c82a7de3280f8dfc697ca139a0b Mon Sep 17 00:00:00 2001 From: lutepickle <28810-lutepickle@users.noreply.gitgud.io> Date: Fri, 26 Jul 2024 22:02:23 -0700 Subject: [PATCH 6/7] HediffWithParents.PreRemoved doesn't like it if mother equals father, so add some checks for that --- 1.5/Assemblies/RJW_Menstruation.dll | Bin 219648 -> 219648 bytes .../HediffComps/HediffComp_Menstruation.cs | 4 +++- .../HediffComp_PregeneratedBabies.cs | 1 + About/Manifest.xml | 2 +- 4 files changed, 5 insertions(+), 2 deletions(-) diff --git a/1.5/Assemblies/RJW_Menstruation.dll b/1.5/Assemblies/RJW_Menstruation.dll index 2efb79c3f6b6a048a7b87672b840c17c4aa01d02..3cb48fb345062a79cba38e5e3a991d165a91ae70 100644 GIT binary patch delta 21916 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 delta 21998 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 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 b9fba68..57b31d3 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 @@ -1429,7 +1429,9 @@ namespace RJW_Menstruation pregnancy = HediffMaker.MakeHediff(HediffDefOf.PregnantHuman, Pawn); if (Configurations.EnableBiotechTwins) pregnancy.TryGetComp().AddNewBaby(Pawn, egg.fertilizer); - ((Hediff_Pregnant)pregnancy).SetParents(Pawn, egg.fertilizer, PregnancyUtility.GetInheritedGeneSet(egg.fertilizer, Pawn)); + Pawn father = egg.fertilizer; + if (Pawn == father) father = null; + ((Hediff_Pregnant)pregnancy).SetParents(Pawn, father, PregnancyUtility.GetInheritedGeneSet(father, Pawn)); Pawn.health.AddHediff(pregnancy); pregnant = true; deadeggs.Add(egg); diff --git a/1.5/source/RJW_Menstruation/RJW_Menstruation/HediffComps/HediffComp_PregeneratedBabies.cs b/1.5/source/RJW_Menstruation/RJW_Menstruation/HediffComps/HediffComp_PregeneratedBabies.cs index e687cb7..4709404 100644 --- a/1.5/source/RJW_Menstruation/RJW_Menstruation/HediffComps/HediffComp_PregeneratedBabies.cs +++ b/1.5/source/RJW_Menstruation/RJW_Menstruation/HediffComps/HediffComp_PregeneratedBabies.cs @@ -234,6 +234,7 @@ namespace RJW_Menstruation { Pawn baby = comp.PeekBaby(); Pawn thisFather = baby.GetFather() ?? father; + if (thisFather == geneticMother || thisFather == mother) thisFather = null; baby.relations.ClearAllRelations(); // To keep ApplyBirthOutcome from erroring when it tries to set up relations PregnancyUtility.ApplyBirthOutcome_NewTemp(thisOutcome, quality, ritual, genes, geneticMother, birtherThing, thisFather, doctor, lordJobRitual, assignments, preventLetter); diff --git a/About/Manifest.xml b/About/Manifest.xml index 9d624d9..990d2b7 100644 --- a/About/Manifest.xml +++ b/About/Manifest.xml @@ -1,7 +1,7 @@ RJW Menstruation - 1.5.0.1 + 1.5.0.2 From ad7919a25b3a566ffd4b7aa21d05b8579f9bae3d Mon Sep 17 00:00:00 2001 From: lutepickle <28810-lutepickle@users.noreply.gitgud.io> Date: Fri, 26 Jul 2024 22:26:52 -0700 Subject: [PATCH 7/7] Also add the father/mother check to the childbirth ritual --- 1.5/Assemblies/RJW_Menstruation.dll | Bin 219648 -> 219648 bytes .../HediffComp_PregeneratedBabies.cs | 1 + 2 files changed, 1 insertion(+) diff --git a/1.5/Assemblies/RJW_Menstruation.dll b/1.5/Assemblies/RJW_Menstruation.dll index 3cb48fb345062a79cba38e5e3a991d165a91ae70..a62164e75aa2e53186bf2fe001dc0462fe1496ea 100644 GIT binary patch delta 13073 zcmY-034Bav_XqHE&SYYO5PL$94Iwj`MWkY1Qc^;KAgz55v7{A*q^_6|TZl;Clor(r z)uQ#{Ep7csI)!EbX(mxG)q~6~8tTA1gs@XHCwsKSYgHf z29(mJ)kVQp01fI{=h*-h%;)boq=3-IqqjY|%7i^lFHRoyyUyX5`-_unNgx<`8xyB|#Kj!`3w z#8F}bD20U+Dr4qCno@D_>P#1AgWqVKB^7@glMTVFCZjIL%!4r2%kzJUnGY^jdyy@G z?yRd%U5?3tWLBlnLU@rir0M;bMR3Gm4k)=FlM8-hbi)CoEcQG|Wi=UfKjv9DTbxmDSg0-vZw$6$F>gKzIp$P%4MWeyyx8!BgUN1JKzkF!3K+qEre=#jEYF zz#FD)8yqra+u%1TgQqEj2i4(vdl_`fs%fzudMU|CH`=$uI8(L*GODw!_8stnDccE^ z)!A$Iosjl)&77~pXeC2VYQ($_hfU!wC|ARt~Ase?@f51sJC=4_|26K_1kbSq$|mWXY6}nr;@JR z2Yaituk8EaFH?2^Y}s-aIqs7E0E}1C z8Dj=H%Awn0%@Sw2<0u64n{r&(M8|RPTOzY!*gt!wqY}zk??udad-GAo7ex>w>C zu!dF7<8z#W%4)54{1@Vu%1XVXXW^O_{QGfZz2hwO@#<;f$7K7Thk>mB^vU-B64F>d zlxF*1fHADvG1>lK!BnLRh)8+SaS?J@?MCi$d;|NG$}!w~#PL5kprm)^5**eUh|F+Y zf=^80W%#@%bX)nVdye{szO9bmdLRSMsSje}|O@hqB@C@RpK3v|I3=DZ2$fo3h*R zyD7U3Ve(eVTk;1)E0u$s^A8wq%I?6Je`scbIv)#Q@EU|WFmt(@2Fjv3#@qqF6;c(p zU7d0p--ReG_-xT0%U!s}+U-WT2P;;}N*^2%**z#L)cUaKE606EUn3>X<02P6fD=mk zTzvplYt&6b9`7Z`0|;6xOLfDC;L=hJAHrQFaXTsc+3^?5Es~W!unfKA_#1pIc@ThQ z>vR^K-Z2KyuUJbi4bkKlwl+RclE)hoTNgt&%Q-95LDa*$tY1

SN&+5gCvV zABwfr$Dp0EG#?JH*<%U9!>sE zwR*ISiEWCLl}h2mzFlHNal~Gk>9Z>m$0`{GwoOy|2Sj4#Kf*0a`gMxLy-Ge?yS9av zNR0ZooW=+BauFhNftD@VC$nWr1-3#p=Ni`aCNldM>$y%+uW1>!Ws3jD;lfrjJf>6u zUpJL4eEZb8VUZ_V=!jAU+G)A%R%tmOBZ?TTgKH_MPH(0BT^gzE3Xn$7?R2PK~Sf->mzXP^EEVBw&RD#d} zJ1hC1-x8^;|I^vGrBWAJabnpWFzkJq@*i48Fy=`Ig|0Qk`MZe zN7G~jn|vx)BkrcHWU09GD{bl{HJo*4nAAumy_jSir<4zcfiioV)z4OFNya5g72p|i zC^i`@Ka+D-!1BJsLQ?R)lAa|M4Zl+|)F)diW@$mtEElF?nbM=ukk4i1BXv{q*{1bR zv!>#AtepNrnifwY6`d zWhjQ8)}?pGN~N=2QhJURG)`upu^t~RWjmwCEmj)MY9KC9L-9M-jZ&$&|LXgn?c5B> z!T;3*M@B}2XsDDA-6Lh@J1et%xU4kjoUUxIl*2l$w2k#{`tjJIc!2eZxFQb4)bo1W z?zX2zw&c9N|Ji;W80a??cYi6vih%Jgq|RN?rEAtn{mR<7E=Vlx4(mga4a0h0>B^HL z8-~HGx#G%_hS3*wwx>rlq+vG8=}5Dt;desf_zNI!L2T1Byuo3kwXzhx)&ti*BTH>c z6#-|8WtPF&msv8)V?8U5FbyxU+NyEaSPR8_Bn@kQtLNuDCxVya9nXoR#t$#AB@1p zmz8X9G!66{fh(1aa=hC%%{l_hbO?z(WN5o0OA8=-@VBueuor9A;LEWiF^AP8=AZ|QL}TP=$b zvnUlnhSXL(jonxc^5nR6toKLA%EY_6GB`d|RBl!BL96)s{&VpBJ(>AnvNsy$U^<8= zMWOv`4HP`a{H$+;a}L^3hp~g(JD)Flj}=W;Mm!#V{&n^ zQUUDEOmXHJSjzk`Yro}L+^waagcf6PkQ}IQPK$AK1F3wN=oji-j5}C^g$#U?HOxQF zxde}}X8I>L&BwD!1-8TUM>&_`|Fl$xrD$AJl;0#6F-tM2p<1^Jy_l*bvk6Ww9%1Db zJ?$*O=8bA9S74MFlB4;d!srma;`;NH z`hv3<>o$>@T+GYP_2^^$z5WGf37%*5F17?chx5dPoBUeg+|ZI%rMOv1e+#++_vlQ0 z3%U`nH5KQ-o^+>kBd%-qNc)|e&>s9qN1R)+Zit?A!p5;JU%?C|xtLF!Wq6abC&S0K zd=*2Q>v8gH*VnMUl70za$3!jYEh=Bf%;w_!mn&@~xEt4-2EKu>m0^6VB_FIk{v|#p-I<9g&&zjh`q3dJ3 zrln5q3cRIc=;yf#w1ul_;3vng^(*i&%Q85`Re{M7y2X8apx;qUW4%5o8jfNnYj&50 zfk&}KOSL$PJF3+&<|tNbiKT_Pj$z$MHKze`ZJ%J6;uVx1I*#K&9ol5W<2Z~Z8y?3Q zEZOiluGdlxkK+r~>KJnzk0|LmPvDj64B-UcQ>q9sPGlBZPGFrVxtfZAnJ+|(uqA7& zl9N>-8lJ%3tj>$mtS4}o7CyDuD#i_GIfN>4ol*fzcmd%gZfK)A*rq($Kj0*8)q*NR z9Pdf=YpcUKEd%{dqE|`3Fk+z2K(;uE4a7BDyxQt`KgAHG3Xr?@DR$Pf&79gl;8Wbh zS~PW#(00?f&+w2^DSSE5s0jKDKVvRwQ4w?sudwR0Zs+qpD>r4aO# z$L}DPG_Z!2e`h)*-C1hf&asu9G(tObNvs~ z#UqGpan#YI_9a|Vt)hcoszuy3f?>MrXu7u*&{+ktnTz3q-)m@hc*>||^;jJE8#|Q3nJ;Y5t zwIY-Ex&Fd#y|lUu{f)1(a@!WUfR3`hOs_(ui>z1jvi*^=dh2m8_K=I{Fzfy34_tm^ z++aQ#bIetXg8S&wS?xAh>X4H) zGdie3{pJd$_m%Xd!F1vu*=Z#&T!oJAVEW2b8A4Z0l_7MUEB}H7cL+5fAQz)MG^dCG z>i*}2rviGpo0F$Hv_cC?R;t2x-3Xy{h!s>6EtHq6k7=!VS_-8NtdGQ_Oeh^tstSl$ zRo_394r^hIIM7h~h_jbhbrz}=68FC<{CIkQcPP~#Bqy!Hq#1)m*i12-%v zjFJ~N+fv22j;z-MN4i^5SJSvw)Za9&6{T?HV9Qu{D_SI_|B}oKt?4-x>f;TgQ!IJB zVYDHo=6J*CfKpY!>6KI5VRTqa9bp)K#F;$8FskG%dwQm*Y#|=gA01#AMJlQLpH-Ch z;!tjPIOVZq`*1okq^5m1T~yNT!|9TiY9CHNb0*t|(=EZw#+lGgrl?=v2%4khg;&XEkDz?k2y2=%l2)?L*7Dh-=tb5>%RF}*+QxdzZ=Sm? z?PB@r&U3e;{jB}qvq#g%tj0zipS?X*G4EUQ+#Tpg)&;B29Yepd0&K6fwo~A6dAwd& z5V*$epeQB1>{zmM*0FY)GnTqlXI5}hx{^M-T(piARAfYhi}FU)Y_N+;m8t^fudE&G zqAgl#gI%Cd@c^gBy#u#5gw((fM^)fy=~=!LqdzLFQl)bbg27qwE< zrEcnADs_{GOFihbyD8OF>7mi4N)Ju0u1s@!=owRGM_O#E>_`RGm0R3KM_OAQS|N^h zD(Q{tM7vq?MC?QlwE|vVvEAK?tm!qUUMH%nrB1z0)R?m_8M{Q~K$hH@PBctO?u8XP z8I;ALJoDpeH%m5*r=U?aFHAhymGqe(PjOo6g^8!GoXHm^o)S5eXMQ{_XUX>QRHUSL zJD!Xe74<6XH-R3EsX5*R3LdK^uj>gE$MSC^m7-J?Fk#hy+zB*NOYKDhjpa=4MFM4T z=0D?IQF)Lh_acGbAFJ+vdNUH}gbMXuB+zLkFBDln76WgZvMzL=Ghe{wm@d?CoLs0L z*Oi(pdEvF7N_SUEWG!u2>F!3eS-l%oy1Ubcaq9l32lk+?90t~_boZb`N;>OFM>u=i zcG}&OBFD>yUf39P!QG3JSSJHdyL;0v){_k{xcks&N^%w}^rat_^vRt_*M!vlPi}r9 z4Vxe*tqMqA5z;b|Mro-nO{9sO$t_K!nVempR^?8lH(7E^6X~Fm-qA$*NJ$?=BArkY zJ4$KJMEX(6;BPk`r`x8|$LXP|^l_>`Q7%nS+K*Z&=}G%hq>>lH@Mm{FiZNC8r^if{ z{i&y^vOo1#GW4WLG|W_*M59clNi<1GS3W^=OqEa20#oG^WSA-k&}viV04m|iz5X}d z1L#F916l^&a}T6L98Q6o?qoW`npo$adk}riT8=l}gXuD>+yb5ydZ48DB9;6m>GPtU z`1&c8nkhZXT66ZDt(GU1dMNSzZwL)Al@6hyT>27S?xFNF>#{hCVYJXR zE{*azYgg}rJB>E7ehd;{TGMV*<#0N{S(Xt{%QKuRP2mVS^ABC*(yro|Mv!H)JVJd; zBdE?l)JVw-O=`=^E=u}E8$td4Q8}0^>yiPU5j2JAtFt*~B+W9Frqevm?%L{k(rKBJ zp7cp7HdQ`J8@ckm`b|7f(hgJh6z%1#j<{YtMVDB&0yi5mqv)QgbTr`<{Tfbh*upcK z8Y}6BV<=2XAN?4L=E@0{2+tTA%xYCP!ZVh}vwrdmj~YiAtgUs!qsCK~lAgtwKshE( zpe0;-HYhx50=;3%CemA+ZE6@EHIXhU>7`Ag8>Y%hbeAgw>ZUm-QQfKfkg#Ezb25b~ z>Go3$iso=fKr~FDG}cGrq?tlLRF_(XXqucxU%jT1A4^`mrc#{@l?BADZ10&$jkMIo zYbrJ8OkTXEQWR&OXE;TrF^ws&UQ=m~l3bfrXeDRzUNwyhS+e0Y>OZ}v;WSFoQVplk z2+m}~X*8ZQ*>DBI>kRT_(REf}&~VSwberX%Q0FuBkmdFp?U_rpGj+c{VrkjbFq1$3 zr3EE;=23GF&()penNJa{>Ea=L0rh8XuQS7wLn*Aw^?mk*G+asV#UdKRnL8lVxri2- zvRqoqS(M0fX_Jt+|LK8wRL0?L5$4f8)4*rx9nLO^>{&Wy$`;cp&dvt(^em=tOqoGf zIE$*?(__%B>dXpDC}^hG3xm(+e9Ds)lBZWb9h)VU5AqXkK7G%UPeS?hKuLeX%_qOv zdYt?OluvcE)MIEqHReoyz|E(TEP3kX(>Nvm{3qITD9`n!bbuunvy{%vsaecY`c94w1h*sGb`yMmfV?@bV5lk)GG7?XYz$vMN#wht1a8FqHc?7+OMK?CEb1% zjn|Sdj3G*=aVXobqAU(&`&G1`CEKr}ca`)Dvx<%?>0MhzpDB4^m(^!qMSqwoR}Tu&i+lyt*2)WcM{hWc^kGQXvsHI!n?)>1lWy#p?| z*U}CpJxdYoGgTHD^bVIMSbX*(I?K8xz86?WH(7B(K6^3M%acdpg=-Cb_Vv_(wNM;y z33X%5s#WNDjwZ5lpv3bpn!%cYn>?lT4C@O&pZ$3^KDxX#NKYh{NPJ0&1byo$PTmG77JN-vXT|TzcVb0`9x}C~7n>p=(sBFZu$dhzC zwNTRUk?qupGx;9bL7h$gc2LL?jIVCEgTj}n_Nw6yiq=wB@*U*jOg7v>#`4?cc<^>P z&3!EB)QvhPy*J(c54OGGy|<{@8wYb9(6Ql7J}j$MCgv9Z`UGIV`0W$_O2zm5@S&E- zpuBxmLszxFpLDR|%N@^M9o_l)6+N=Fl{S_tU6fL^{?BqGxA}a!eErVzoaa7s=iWP$kDP-cIR``5 zE(^H2Xxv`~`C+)Q;I(1cvJkPQwNr)#Iuu5by>K|T#GJxhG-{7{&I0l$N&G`#h55y` zY2Z^$PY5;zs9n=K#|D7GfeEjQKM9Q4DE^hOxp47Qjhp3&Kd2TnL;Qh#ezjS%#D8np zVp<^tH+NWC)C?>v?G%Gg75>tx136X{+B?S}_`IFp@pi`Op+=h#VlWiJf^lWBvmsHb zpyA5tF3g16oFx@}7n=#Tk-D<}h|95aAe8m;+?%m;A)M7pWb?qmy87(p*!j?jRVK6m zR$1dUgY9jMkMM z2Q{|mz}hidbqBSyFM%&uwn0w2A7H%BcBeS)FF?fvL-R$!Jcya7l`Kk^Lii-D6Db|+ z%V6wet-y6X>?`0X>(7*A`zmOdrn8$V!|ZDyb*k3wd1LHrVIQlxf3m#*Y}0fW)H*Y8 z9pp~~*}n*GW)(Iqgr7NVoITzCFK9kpm)@zD8CV1pSbsO{*rx<|FUV*{?P=-A3e7r2zbxvDw$Lb8$} zCpBXC!ah^@IviBe+3Nt$R}I_;HYJ%IwC{uVrfffS<*YRQuzf!yDHXu3=A}Xzto*{I zHQ#`Xy3$Z@yf@*7qTbR2a9fwEx8VUunl0PQhNtZZV55?*d<(W$W*6*l!Oy1bAl$3W zD(nX#C9~=v-iB1AA~2E)ezw028%*IL*v4T}!5{WRa73v98qKvj{tKr#YdQBx#}T;3 z*@)~`j`yHqUR8^ua6_pG?xwbN9EFnk`XIKYc6EFJ>lbKsGe-4ylz@0ci=QGWbf!8! z0UN(5$Aph}9EaOV1yDRQ-BAYXb7W-!ycapw@fk$tN)^GS&Sm%&EMnF4_#LO=NTpUf zzJ}-}YMk29GjLH0{@u%1=Qsl%pPnXuRA%5e(2@0@9+`pXAdz*gC^PUp^k)UfW(Hn> zp-QC?Iq)UNMMz_{9QL~7TX;pO1S5P$9Y4TMCHBUQDwep}r~n5h6|Db+B((xd|H^ z6VxC2VdLCS95>}u;-|#gX!?fOpJBSr)P>>~$W$tYzWJvezrY7dC6Fq{{R%ftmA}C~ zQ{`{a>jgEZs=NiyDf!i$zrzB9L)q|m*sY|Oe;eK~Ww+siDZ2wdn6f(%nkQT6aeqKV zr4o>H{sFyA*!Tagg;^aa+&$zsL1|=_4!&KuDRg24@s+}#Cg2Ng%9DdlD-K)gfCaAn}l3< zh2tT>YFVlq{srM$s^MR7O-bBN*8Jr78z!ugm42`cu5dhpOqM(d!1Zf&7L(d07VtJp zE)6k!z0N*dbIU<^bc4D{_~G3(4;%pqFUc^^_Q%j#fi|?Uc0L;%XG3xG5kGoqHXNZd zvFuQhWop5rp`mfXctc4ZZ=<*xSYwMCrw*bfUSr)Hh)@f&w~EYwT=-C|tro%_S(*z+ zR_(Wh;yzZNC-z%vV~5vtHmgBoTpdi?s}(3J>tQEx5trj?&E0RQj}6|`>e3`Ot^s)T0f(lTr>DDLNQK~otXQYwZ2HIOYb-%{&_ zg`OCp14^Zk+bg6&6owbetQ4+_+kP~9Ssyn;XpZZZ{LnA4ZiD8Sc2Lg}5-+oq|48}4 zIN46}-rJhiSyF2b>C)DTQm?XB&M&q!#}8SbtuMB;!2hwX3$?_1tha<>u-?0Rmb)_% zTH$Wi@tH>*t?&|Sg^?N(&>F)It5S7QXpQTY^yat5Mn_~;3JVJnT4RioAA09Vjr~8J zeODw^#%e2;-5NvRmsu_}P7G`$^nq3vp;+9hR0{JFjipc6u|m-grxpx}b7GB;^`zxu z^WE4&sRX{CF)q%Hos|60BV|Xd2d^pR!Q^#mac%M5F*z;|I<3oyi^qMRYF%64kL!qs zPUt!116XG~tfWpv1G?a6l`M$sf)z?vu;J_taosSwOb)z)e?-3=*8@ke8qQ9O>xnZf zvw=-|VV06UyL+RrQh|+n<9gG$KKQ$7obfcmNxinnIeX&zVw6$|beO$At{=8h(v$YX zj!J&pP)EL{9}d)&K@;XnO;!>&OfgG8T&^>0Hya@tH*2XmlX0JtANq(#(_{m!pUL*( zZrW6qHeqeN*$aMX#i|&dF=O7k6CJlGk-F z9#qPMByo9u22;M5S)RHdJcIeH*0C`nyQHM=4$t8H3O$Rw9}LBS%SyI48iWK4#RW=6 z3EperwGPGgI)ub7GQ6jh2blxDiyMlrE4tx~0hi;3VH&Icz#DO?n0-xW^#>-zj>Jya zrAm+n1~wXp$*d4@zaNhSSa${#TgGFGlHY)@SKo=7fVQ9X!0%W86*m#ju#T)QwoJxv zl=9%}YJ@2WKkJ59S66dR!DGK@9baA3ITe$C(^?=dJJWGE>w1P%nvx&dip$P)yvCU! zZ-*lMUAKQA?uOGbgB7H*OeH@Y7B}kYc#N~XBc;aO*5lHfz7Q*BQObifv7#WWyJHomg9oT3Nh6d|#XNBhCL8Uyn(W0Ys z9{$Q%n`EJ#%Gj7S2@4g9FnCIsZyTp$lMXm zC3s3pby$MNMMeE}$P(;ON3C0hKJ2C>vvE!z9$;m!dCr-K!F8)Dmtj4nBIsU_?OcXy zP1#D^$XQas3(l2z+?1`xuZ+rYjdL~LGlc~R^<)b<>5I++e8@^Fc-grQGwbW@(YhC% zg?NnBy}%N>9w&(_sJw}v9bDM72v;fTZ$UTW7M-at3pU}!2IBmeEs_fMI5%O=6OUEw z+>BujAM2=dJ3dq@fN`5fH+cn98$HfGb?(IPl?q^Z#ONlkV$hR1lV7{OhK-c;OSl)? zYC(5Vxfe$~Db9bn(z=5CaEWQ)8@SFi@J%e`EUDm>^G!Tfsq@YQc&+i{#awX~V_4W@ z{cJyoBUw>xZ#v(`WtF<)JcNgYME@el5aECE8iyHe?>LWOSQ9;sr|kphdze(I0M`dN zPs`TD<*r|Xud%*Wy1;6r6e1q#Ly>tnpArB3crtWYxa^IR$3li-NGC;2FQw)ugEv}&a&~Y3)D&^T^!{gYKB^w^cXIZl0aa^LM8Xm_Lm1+}v z91kezIZxo3$_(KI{-{(MWSp3uZ#jVvnCUOZh){fz6pJYh+OE`$RVo^uKsT$yVz2cC z_SC{>7hA=+UMz=D8RjVE!MGR2M+{unT+L~lG`vsHNnEQ1<%T%klX#oMSxrI$PU7qq zYP;1jiGfO`AX}UizhJ4#KEoiTQjoj$8OCVY(kJ%``V8|~3n%v%`j=_k=eS3y2+s90 zN<%-#_nA43OGCfFGpy>(TDrc(YpgG0OGCfHN376iJprdMM*Oa)5|1Eqnok_{gDY@;rAE3g zAuXs zpYalFlh7}i-9fiFKfiwPuQ)M5>*M+L?7v|)Ykzi;>lRk9q6Tes{f>P)=}IVQ7I+8K zSih}p7WfCQXFZy`)pggviq5(;)V|yGCsuUPI^ORs*I$_5RVym_E!W>@@21sR=n-yU zWwlu20(ysaF0~wy%2=;tX9gmT?XJhc=tC}|eXRFmK5zw)afvxR_L!?0*?Q>G87((j zs#7!8py8Q;A(X^wHu(!zP1?@t-+^LlQFKo=&UQcj8&@dJXT6$UE>xye01p@cB(yP6 zSH`6O>8edf4QBNW$!n~zEUD05x-@H6fV(zLRMJ8vgtuZRulO(i{PLpuDA z>?0)~T!l97hIGPI*@(`XDjU&vT=_R7xEoP$U%43F;Yq5~SKa@7@N7^w_mdP^8Csz+ zby6zF!)}By+QSN66C;$KtdD86cv=dhWvq|Hqf8j>R4NaOTv019jP_|^tT@mxD(39v z6&-|*2#Nb&Iet8~k2{PWacR=D{vxc_U$)RkA4YYR^t!{Sv62tA*iyu}DAwMPVeTdr zYZ}*-+MC8TrLJ5#z%tt1l%`4PUy@m&8TnPHk2jo-vgGlG)3Sk8#~V&NmCA!oEuZ8L zr+r%L2*atEGkJvJbcD0asnbPeb@7-k4_6*wIMr2B_dlzki$l5H5tPo7?IY;GpsMx} zRHmfcN6=|4)jonQa3+OI!?iTbC%U@%TyCv;l6@%X% zL;qpbGphUTt>{bUeM`2xHJxLfxBA_&RL%;rz1GZ5f3fC;ta3Z3-ZNFpj-xOoAG8Vf zI^)P*nOVU}NlNUy_}eqhNBcF|8t`u*dgyGr`~qq>>Lj z=(oG6o2k-6$)-vVc`GZuP7jSYRkop-rph)nx3Y4p+h{|JD?=-^rHx8@quSACmOK&L z(M_$OmzV8wx1&3p$xBN+diXdKJJXH=Qsp6)<5Ov`i^`5Hxijskr;>%#WvNE%n00Q!Holg^8!OoXImkp60P+`*<>x^ll5SRMguY zPlZZyyS>hM+G;9oPkT+3?ddI3WqbOsDeFKVa`tWzLI?V~GP4T(s-*WffpUzIdZXm= zCeV#hRmYn^w$WPhx}HGMtiZZbU6sm%#;y2|JAwLWsl7;`0i4ObNT5{C0;e4om9Mho zUL??)qt*RSZ$<(gR-xXD1o}wH2WzY!i-F&pvZv@eXa1lqu}=|=kqg!1I#RHb4_*r` zb9bb+tR;2I+?{ANt9#utcV}8QM&1APz%I0w!;qR~?k==PNoQT@0B7&oPPw~M-LbNv z4>pCKcXy)>tdk+9+}-IV*6=##-96}iB{_=~deS*1z4?iBQApkYkfJmzJ5xfY7?sVDTQh& z`QVbRnkR+CSFYm4=KJ3uddgHfhq2a9kmRs(@G>&yy9K{ftY8vOI=QwLw z^Ss+j%UM5$iZ88cv#IhK+R0gl5me3d3>`6rL#gB+D&x|Q;+Tfg@Bhdi{6m(B@|b*3 zKUh|_R?;upP>NU5`!tlgaAgfLz%!JdVfw3Yi5*6xOr@zbiL-mQnx0geqogMtPPwMa z;k2A9->X&MGn|S{*|W5rv+Ck{@hqKY-45Ae#EzgJO{F90Hx8%PY3vzE0h9FWBp*{o zQK*tWic!>1$p_;sk)Bc1h1Il1q-Qjxu&xJ0M313V*7h0^(PL?>lAgsFM`&2=K8$J1#gy%!VclBse6UE|828eZoFddR{$Ugty#om_QVPBN&W zq7QZl#lR#=WPKz~no0CcWvNx@mXf}DO{Uu{dGVS|52naT%Y)i3Z{?XxmNX@G@tRD* zTI#8AGS%bk%QUB`G=?$d)oU`1QIcC@6|h1yT8YB+_uYN>`(s5fWw zYB_~cIFk*hP$5h9n?f%ciu$#fLT4&v6=A?M*+PGRlSY|Jdb`soM@f%Mqh(4yNTLK! z8m(oGt&!lFN*h`6feD^zw4K$qT363>+B40NEqoAT3v;H^I~;a|uAUk6A?tK-Z_i9R z&Z?j`?pgE|>tyx*o(%eq6%zW4=Q+B}a!{D_dAiAR2aNR0ru(cOVriK~)A{qCH#EUB zhk~c;#hk4%!84cYu%?QK@OjjpwX6Cx&wT32x?Ia|UqHQ-^j<8a{+zjk!ki0fnkmbo z=Q)cOSr+9BiTj@(m`&?Byd%PFdc`zw5$)xyLS&2RkSSYCM>#ta)YY??J~L$oo#8Ax zxU0vYiptCiIRxqAa1HU0C{M3kN|zLpr&lf=njxhh$#dx|mV6S*r5j566K*cu)>5Zl zEtELAREL z1T3K|TB`jLy2+Vrzl82_wkmD5X9;!8(2J4nmrze7_4!XW?5F4h3YJ=_L-jUXLVI|i zT$+z6SaNATig~_jX+BC+(oe`fO4d?K^U)B_L$s&-~Mr7G#2Sx#fM#LkHK|8knbq1>9~ zl)<6gndMZ>k~_1U4lC*Q%jp}=dn=!uWY}9>fub?C)-F^k7Xvr7G5T(O7 zlYVz07t6~%Mq3js?!tEj6fTTMxvbq_l4UQId~# zcg!w2vPj+k^hI|UZCNZ=S{`(E>1&={v`b4}K6cSQ&g4nDiw<&@KINdOwD2tQB;7^T zmE<8=g_?6F-y^#z#?)^&1?6CTWy9T6J4dxw4R=#RE%ns0o5DGh4R_P5rPhz}9qY$5 zyM1V@M9awzmlh4&Zh!viffvYlXW2tK_Duazhms$Nxy4^M0Vo##WQxC*lDT2hU`tf! zqCo>D9lO3Wan+VSb->K=f T+_zA+`<>dUmS3>IRqg))IMv^m diff --git a/1.5/source/RJW_Menstruation/RJW_Menstruation/HediffComps/HediffComp_PregeneratedBabies.cs b/1.5/source/RJW_Menstruation/RJW_Menstruation/HediffComps/HediffComp_PregeneratedBabies.cs index 4709404..5d5afe4 100644 --- a/1.5/source/RJW_Menstruation/RJW_Menstruation/HediffComps/HediffComp_PregeneratedBabies.cs +++ b/1.5/source/RJW_Menstruation/RJW_Menstruation/HediffComps/HediffComp_PregeneratedBabies.cs @@ -294,6 +294,7 @@ namespace RJW_Menstruation { Pawn baby = comp.PeekBaby(); Pawn thisFather = baby.GetFather() ?? father; + if (thisFather == geneticMother || thisFather == mother) thisFather = null; baby.relations.ClearAllRelations(); PregnancyUtility.ApplyBirthOutcome(outcome, quality, ritual, genes, geneticMother, birtherThing, thisFather, doctor, lordJobRitual, assignments);