diff --git a/1.5/Assemblies/RimJobWorldSTD.dll b/1.5/Assemblies/RimJobWorldSTD.dll index 9512c57..6de4b9d 100644 Binary files a/1.5/Assemblies/RimJobWorldSTD.dll and b/1.5/Assemblies/RimJobWorldSTD.dll differ diff --git a/1.5/Source/Mod/STD.csproj b/1.5/Source/Mod/STD.csproj index 001d902..abb041f 100644 --- a/1.5/Source/Mod/STD.csproj +++ b/1.5/Source/Mod/STD.csproj @@ -31,8 +31,8 @@ 4 - - ..\packages\Lib.Harmony.2.3.3\lib\net472\0Harmony.dll + + ..\..\..\..\..\..\..\workshop\content\294100\2009463077\Current\Assemblies\0Harmony.dll False @@ -44,7 +44,7 @@ False - ..\..\..\..\rjw\1.5\Assemblies\RJW.dll + ..\..\..\..\rjw-master\1.5\Assemblies\RJW.dll False diff --git a/1.5/Source/Mod/STDs/Boobitis/std_Boobitis.cs b/1.5/Source/Mod/STDs/Boobitis/std_Boobitis.cs index c2dbe28..3a6352d 100644 --- a/1.5/Source/Mod/STDs/Boobitis/std_Boobitis.cs +++ b/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(); + part.UpdateSeverity(hed.Severity + boob * 0.01f); // ~0.7 beast grow + //}); - if (hedstage < hed.CurStageIndex) + + /* + * 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(); diff --git a/1.5/Source/Mod/std.cs b/1.5/Source/Mod/std.cs index c1d4fdc..5d2c19a 100644 --- a/1.5/Source/Mod/std.cs +++ b/1.5/Source/Mod/std.cs @@ -41,14 +41,14 @@ namespace rjwstd } public static bool PartsImmune(Pawn pawn, List list = null) { - List propslist; + List 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; } diff --git a/About/About.xml b/About/About.xml index 232e235..427c4be 100644 --- a/About/About.xml +++ b/About/About.xml @@ -1,6 +1,7 @@ + 1.0 RimJobWorld - STD Ed86 https://gitgud.io/Ed86/rjw-std