From 26db3aeb9c3bf27c547a4498f213a8a786771bdb Mon Sep 17 00:00:00 2001 From: CowardlySeahorse Date: Tue, 30 Sep 2025 03:48:45 +0000 Subject: [PATCH 1/2] Fix for colony wealth -> NaN with Vanilla Trading Expanded --- 1.6/Defs/ThingDefs/Apparel_Absorbers.xml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/1.6/Defs/ThingDefs/Apparel_Absorbers.xml b/1.6/Defs/ThingDefs/Apparel_Absorbers.xml index 541dbed..f7e7ae2 100644 --- a/1.6/Defs/ThingDefs/Apparel_Absorbers.xml +++ b/1.6/Defs/ThingDefs/Apparel_Absorbers.xml @@ -1,4 +1,4 @@ - + @@ -93,7 +93,6 @@ 20 0.05 - 0 1000 0.2 2 @@ -231,7 +230,6 @@ 40 0.10 - 0 1000 0.2 4 From d8b98ca05ed89d1adb0955a6a42e49816ba7ec75 Mon Sep 17 00:00:00 2001 From: lutepickle <28810-lutepickle@users.noreply.gitgud.io> Date: Mon, 8 Jun 2026 09:29:12 -0700 Subject: [PATCH 2/2] Fix patch to RJW tab with 6.1.4 --- .../Assemblies/Animal Genetics.dll | Bin 5632 -> 5632 bytes 1.6/Assemblies/RJW_Menstruation.dll | Bin 220160 -> 220160 bytes 1.6/Humanoid Alien Races/Assemblies/HAR.dll | Bin 5120 -> 5120 bytes 1.6/Patches/RJW_PawnTableDefs.xml | 6 ------ 1.6/Quirks/Assemblies/Quirks.dll | Bin 7680 -> 7680 bytes .../Assemblies/VECore.dll | Bin 5120 -> 5120 bytes .../HediffComps/HediffComp_Menstruation.cs | 8 ++++---- About/Manifest.xml | 2 +- changelogs.txt | 3 +++ 9 files changed, 8 insertions(+), 11 deletions(-) diff --git a/1.6/Animal Genetics/Assemblies/Animal Genetics.dll b/1.6/Animal Genetics/Assemblies/Animal Genetics.dll index 359163132e6fe3261eacd1c2eac05c7b14e737a0..e28598fd4b4facdbb2112795ddd9febb3b2bb98d 100644 GIT binary patch delta 68 zcmV-K0K5NyEPyPKhy+?BfTFRCoCy%EXy<|BA5Kn=m^MWk|3m|`I12az1fj5RNg{QHMoCy%{69iV*KU_?q!V$I!+9X)BI12az1S!^Tijy=A aG!W6R8OJhLLq@4kI*E*CWWTd`4TuQBDI0hI diff --git a/1.6/Assemblies/RJW_Menstruation.dll b/1.6/Assemblies/RJW_Menstruation.dll index 2dcbb04e4333a4baa21c4bbcb224395b3592c9be..86b237632be7015b90fcf5744aeecea8ebfd5468 100644 GIT binary patch delta 241 zcmZqJ!P~HdcR~k??UKZ<#-7$5#;rX})3{l-sd^S~SL0zi^hx04<-@xRwk+{!oocOc zOsLd!`;UK2H~cxxOilEREKLoKrwf=ft4;s!$83Ql=HSnqfW!qWIq%QxfG%bifT9ho zZfO9s7m_-lQR>s>1DVZ{#K7uW1DTx=V%skSGW#&H*!etsGF>5<*+k%t?v|Qe0ilk| S)LBne#!Wr9JtdfV4hH}WHcDy$ delta 241 zcmZqJ!P~HdcR~kCVCKywjXkYBj9Yt{rg5`GtNtn5uExW3=#v1G#l3mcj{12vNN1GV zB=rh!|M8FMhCipNnX#U+fr**HbOCc_wdw!;m@SaR9Q>IRkhowa=lz)-(8cTmP_%*7 zEe&AyLQ)4bN`1O~AhS7=7+76vAhQ!fZ2N^kW*1k*>>+>=BL aG!V@u%iZ@%NkyCub7=XY+i;0Ry>1Oaw&q?1Go aG!P^joX9N6>`A(lIKs)KH@dTk3wQ_&r5+mq diff --git a/1.6/Patches/RJW_PawnTableDefs.xml b/1.6/Patches/RJW_PawnTableDefs.xml index 3548ef3..edbc555 100644 --- a/1.6/Patches/RJW_PawnTableDefs.xml +++ b/1.6/Patches/RJW_PawnTableDefs.xml @@ -2,12 +2,6 @@ -
  • - /Defs/PawnTableDef[defName="RJW_PawnTable_Humanlikes"]/columns/li[text()="Pregnant"] - -
  • RJWMenstruation_Womb
    • - -
  • /Defs/PawnTableDef[defName="RJW_PawnTable_Colonists"]/columns/li[text()="Pregnant"] diff --git a/1.6/Quirks/Assemblies/Quirks.dll b/1.6/Quirks/Assemblies/Quirks.dll index 7f771af716e564632b1174b92df1e431c73b495e..91a4a19b19d85db5ac759d79ad10d7da71b70235 100644 GIT binary patch delta 78 zcmV-U0I~moJb*lqhynZ3~&dTGa8ow diff --git a/1.6/source/RJW_Menstruation/RJW_Menstruation/HediffComps/HediffComp_Menstruation.cs b/1.6/source/RJW_Menstruation/RJW_Menstruation/HediffComps/HediffComp_Menstruation.cs index 188608b..afca25e 100644 --- a/1.6/source/RJW_Menstruation/RJW_Menstruation/HediffComps/HediffComp_Menstruation.cs +++ b/1.6/source/RJW_Menstruation/RJW_Menstruation/HediffComps/HediffComp_Menstruation.cs @@ -126,7 +126,7 @@ namespace RJW_Menstruation protected int? opcache = null; protected float antisperm = 0.0f; // RJW pregnancy, or Biotech pregnancy/labor/laborpushing - protected Hediff pregnancy = null; + protected Hediff pregnancy = null; // Remove, instead reference per-genital pregnancy list protected int eggLifeSpanTicks = GenDate.DaysToTicks(2); protected EstrusLevel estrusLevel = EstrusLevel.Visible; @@ -313,7 +313,7 @@ namespace RJW_Menstruation { StatDefOf.Fertility.Worker.ClearCacheForThing(Pawn); // No effect for now, but a future RW update might add caching for this calculatingOvulationChance = true; - ovulationChance *= PawnCapacityUtility.CalculateCapacityLevel(Pawn.health.hediffSet, xxx.reproduction); + ovulationChance *= PawnCapacityUtility.CalculateCapacityLevel(Pawn.health.hediffSet, xxx.reproduction); // Add genital fertility } finally { @@ -1481,7 +1481,7 @@ namespace RJW_Menstruation try { if (Configurations.Debug) Log.Message($"Implanting fertilized egg of {Pawn} into {parent}, father {egg.fertilizer}"); - if (pregnancy == null) + if (pregnancy == null) // Support pregnancy list, maybe split off into function { Configurations.PregnancyType usePregnancy = xxx.is_human(Pawn) ? Configurations.PregnancySource : Configurations.PregnancyType.MultiplePregnancy; switch (usePregnancy) @@ -1499,7 +1499,7 @@ namespace RJW_Menstruation case Configurations.PregnancyType.MultiplePregnancy: if (Configurations.Debug) Log.Message($"Creating new menstruation pregnancy"); - pregnancy = Hediff_BasePregnancy.Create(Pawn, egg.fertilizer); + pregnancy = Hediff_BasePregnancy.Create(Pawn, egg.fertilizer); // Add fertility comp of mother pregnant = true; deadeggs.Add(egg); break; diff --git a/About/Manifest.xml b/About/Manifest.xml index a0e5926..bef173d 100644 --- a/About/Manifest.xml +++ b/About/Manifest.xml @@ -1,7 +1,7 @@ RJW Menstruation - 1.6.2.3 + 1.6.2.4 diff --git a/changelogs.txt b/changelogs.txt index fcd64af..7316879 100644 --- a/changelogs.txt +++ b/changelogs.txt @@ -1,3 +1,6 @@ +Version 1.6.2.4 + - Fix error on startup and missing womb status in RJW tab with RJW 6.1.4. + Version 1.6.2.3 - Fix multiple breasts not appearing in the menstruation UI. - Status of wombs now appears in RJW main tab, contributed by GhostClinic.