Merge branch 'dev'

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();

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;

1.3/source/RJW_Menstruation/SexperienceModule/SexperienceModule.csproj

@@ -35,6 +35,10 @@
       <HintPath>..\..\..\..\..\..\RimWorldWin64_Data\Managed\Assembly-CSharp.dll</HintPath>
       <Private>False</Private>
     </Reference>
+    <Reference Include="RimJobWorldCum">
+      <HintPath>..\..\..\..\..\rjw-cum\1.3\Assemblies\RimJobWorldCum.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
     <Reference Include="RJW">
       <HintPath>..\..\..\..\..\rjw\1.3\Assemblies\RJW.dll</HintPath>
       <Private>False</Private>
@@ -110,7 +114,7 @@
   <ItemGroup>
     <PackageReference Include="Lib.Harmony">
       <Version>2.2.1</Version>
-	  <ExcludeAssets>runtime</ExcludeAssets>
+      <ExcludeAssets>runtime</ExcludeAssets>
     </PackageReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

LoadFolders.xml

@@ -9,6 +9,6 @@
 		<li>1.3</li>
 		<li IfModActive="Abraxas.RJW.RaceSupport">1.3/RJW Menstruation Race Support</li>
 		<li IfModActive="rjw.milk.humanoid">1.3/MilkModule</li>
-		<li IfModActive="rjw.sexperience">1.3/SexperienceModule</li>
+<!--		<li IfModActive="rjw.sexperience">1.3/SexperienceModule</li> -->
 	</v1.3>
 </loadFolders>

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.