diff --git a/1.3/Assemblies/RJW_Menstruation.dll b/1.3/Assemblies/RJW_Menstruation.dll index 7cef547..9f159dc 100644 Binary files a/1.3/Assemblies/RJW_Menstruation.dll and b/1.3/Assemblies/RJW_Menstruation.dll differ diff --git a/1.3/SexperienceModule/Assemblies/SexperienceModule.dll b/1.3/SexperienceModule/Assemblies/SexperienceModule.dll index 79ed7a6..fa2d04c 100644 Binary files a/1.3/SexperienceModule/Assemblies/SexperienceModule.dll and b/1.3/SexperienceModule/Assemblies/SexperienceModule.dll differ diff --git a/1.3/source/RJW_Menstruation/RJW_Menstruation/UI/Dialog_WombStatus.cs b/1.3/source/RJW_Menstruation/RJW_Menstruation/UI/Dialog_WombStatus.cs index 7bbbfad..21ed45b 100644 --- a/1.3/source/RJW_Menstruation/RJW_Menstruation/UI/Dialog_WombStatus.cs +++ b/1.3/source/RJW_Menstruation/RJW_Menstruation/UI/Dialog_WombStatus.cs @@ -394,10 +394,6 @@ namespace RJW_Menstruation FillableBarLabeled(lineRect, " " + xxx.vulnerability_stat.LabelCap.CapitalizeFirst() + " " + statvalue.ToStringPercent(), statvalue / 2, TextureCache.KhorneTexture, Texture2D.blackTexture, xxx.vulnerability_stat.description); lineRect.y += height; - statvalue = pawn.GetStatValue(xxx.sex_stat); - FillableBarLabeled(lineRect, " " + xxx.sex_stat.LabelCap.CapitalizeFirst() + " " + statvalue.ToStringPercent(), statvalue / 2, TextureCache.TzeentchTexture, Texture2D.blackTexture, xxx.sex_stat.description); - lineRect.y += height; - statvalue = pawn.records.GetValue(xxx.CountOfBirthHuman); FillableBarLabeled(lineRect, " " + xxx.CountOfBirthHuman.LabelCap.CapitalizeFirst() + " " + statvalue, statvalue / 10, TextureCache.HumanTexture, Texture2D.blackTexture, xxx.CountOfBirthHuman.description); lineRect.y += height; @@ -408,7 +404,7 @@ namespace RJW_Menstruation statvalue = pawn.records.GetValue(xxx.CountOfBirthEgg); FillableBarLabeled(lineRect, " " + xxx.CountOfBirthEgg.LabelCap.CapitalizeFirst() + " " + statvalue, statvalue / 100, TextureCache.NurgleTexture, Texture2D.blackTexture, xxx.CountOfBirthEgg.description); - lineRect.y += height * 3; + lineRect.y += height * 4; statvalue = Configurations.ImplantationChance * comp.ImplantFactor; float fertchance = comp.GetFertilityChance(); diff --git a/1.3/source/RJW_Menstruation/SexperienceModule/Patch/RJW_Patch.cs b/1.3/source/RJW_Menstruation/SexperienceModule/Patch/RJW_Patch.cs index b8d536e..b8ab565 100644 --- a/1.3/source/RJW_Menstruation/SexperienceModule/Patch/RJW_Patch.cs +++ b/1.3/source/RJW_Menstruation/SexperienceModule/Patch/RJW_Patch.cs @@ -1,5 +1,5 @@ using HarmonyLib; -using rjw; +using rjwcum; using RJWSexperience; using System.Linq; using Verse; diff --git a/1.3/source/RJW_Menstruation/SexperienceModule/SexperienceModule.csproj b/1.3/source/RJW_Menstruation/SexperienceModule/SexperienceModule.csproj index 71e0d9f..c0b2917 100644 --- a/1.3/source/RJW_Menstruation/SexperienceModule/SexperienceModule.csproj +++ b/1.3/source/RJW_Menstruation/SexperienceModule/SexperienceModule.csproj @@ -35,6 +35,10 @@ ..\..\..\..\..\..\RimWorldWin64_Data\Managed\Assembly-CSharp.dll False + + ..\..\..\..\..\rjw-cum\1.3\Assemblies\RimJobWorldCum.dll + False + ..\..\..\..\..\rjw\1.3\Assemblies\RJW.dll False @@ -110,7 +114,7 @@ 2.2.1 - runtime + runtime diff --git a/LoadFolders.xml b/LoadFolders.xml index b8b2066..c2d3849 100644 --- a/LoadFolders.xml +++ b/LoadFolders.xml @@ -9,6 +9,6 @@
  • 1.3
  • 1.3/RJW Menstruation Race Support
  • 1.3/MilkModule
  • -
  • 1.3/SexperienceModule
  • + \ No newline at end of file diff --git a/changelogs.txt b/changelogs.txt index f2d3030..45dff74 100644 --- a/changelogs.txt +++ b/changelogs.txt @@ -1,8 +1,9 @@ Version 1.0.7.0 - Not save compatible with previous versions. Expect glitches and many red errors if you try. However, things should stabilize eventually. - Designed for RJW 5.0.0, but should work with previous versions. + - Sexperience module/womb cleaning removed due to conflicts with separated cum module. - - Support for multiple vaginas, including each having a separate pregnancy. + - Support for multiple wombs, including each having a separate pregnancy. - More reliably generate a baby's race correctly when using pawnkind diversification mods. - Overhauled many things under the hood. - Cycle randomization completely redone. Everyone now has a (hidden) cycle speed and cycle variability.