Merge branch 'master' into 'master'

Fix cup sizes not changing

See merge request Ed86/rjw-std!4

1.5/Source/Mod/STD.csproj

@@ -31,8 +31,8 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="0Harmony, Version=2.3.3.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Lib.Harmony.2.3.3\lib\net472\0Harmony.dll</HintPath>
+    <Reference Include="0Harmony">
+      <HintPath>..\..\..\..\..\..\..\workshop\content\294100\2009463077\Current\Assemblies\0Harmony.dll</HintPath>
       <Private>False</Private>
     </Reference>
     <Reference Include="Assembly-CSharp">
@@ -44,7 +44,7 @@
       <Private>False</Private>
     </Reference>
     <Reference Include="RJW">
-      <HintPath>..\..\..\..\rjw\1.5\Assemblies\RJW.dll</HintPath>
+      <HintPath>..\..\..\..\rjw-master\1.5\Assemblies\RJW.dll</HintPath>
       <Private>False</Private>
     </Reference>
     <Reference Include="System" />

1.5/Source/Mod/STDs/Boobitis/std_Boobitis.cs

@@ -3,6 +3,7 @@ using HarmonyLib;
 using System;
 using rjw;
 using RimWorld;
+using rjw.Modules.Interactions.Helpers;
 
 namespace rjwstd
 {
@@ -24,7 +25,7 @@ namespace rjwstd
 			{
 				foreach (Hediff hed in Parts)
 				{
-					if (!(hed is Hediff_PartBaseNatural))
+					if (!(HediffHelper.IsNaturalSexPart(hed.def)))
 						continue;
 
 					var boob = pawn.health.hediffSet.GetFirstHediffOfDef(boobitis.hediff_def).Severity;
@@ -37,14 +38,23 @@ namespace rjwstd
 					var hedstage = hed.CurStageIndex;
 					//GenderHelper.ChangeSex(pawn, () =>
 					//{
-						hed.Severity += boob * 0.01f; // ~0.7 beast grow
+
+					HediffComp_SexPart part = hed.TryGetComp<HediffComp_SexPart>();
+					part.UpdateSeverity(hed.Severity + boob * 0.01f); // ~0.7 beast grow
+                                
 					//});
 
+
+					/*
+					 * The cup size doesn't increase with the severity change, not sure if its RJW itself or something here. - Nalzurin
+					 */
                     if (hedstage < hed.CurStageIndex)
 					{
-						PartSizeExtension.TryGetCupSize(hed, out float size);
+						
+						PartSizeCalculator.TryGetCupSize(hed, out float size);
 						var cupSize = (int)size;
-						var cup = PartStagesDef.GetCupSizeLabel(cupSize);
+						var cup = BraSizeConfigDef.GetCupSizeLabel(cupSize);
+
 
 						string message_title = boobitis.LabelCap;
 						string message_text = "RJW_BreastsHaveGrownFromBoobitis".Translate(xxx.get_pawnname(pawn), pawn.Possessive(), hed.def.label.ToLower(), cup, boobitis.LabelCap).CapitalizeFirst();

1.5/Source/Mod/std.cs

@@ -41,14 +41,14 @@ namespace rjwstd
 		}
 		public static bool PartsImmune(Pawn pawn, List<Hediff> list = null)
 		{
-			List<string> propslist;
+			List<string> tagslist;
 			if (!list.NullOrEmpty())
 				if (list.Any())
 					foreach (var y in list)
 					{
-						PartProps.TryGetProps(y, out propslist);
-						if (!propslist.NullOrEmpty())
-							if (propslist.Contains("STDImmune"))
+						tagslist = ((HediffDef_SexPart)y.def).partTags;
+						if (!tagslist.NullOrEmpty())
+							if (tagslist.Contains("STDImmune"))
 							{
 								return true;
 							}

About/About.xml

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <ModMetaData>
+  <modVersion IgnoreIfNoMatchingField="True">1.0</modVersion>
 	<name>RimJobWorld - STD</name>
 	<author>Ed86</author>
 	<url>https://gitgud.io/Ed86/rjw-std</url>