Compare commits

..

No commits in common. "70525e692e1eca6288b9d402dff9d618ae74623c" and "09fd18354af1681bedb6db39429381990b7a10b8" have entirely different histories.

5 changed files with 12 additions and 23 deletions

Binary file not shown.

View file

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

View file

@ -3,7 +3,6 @@ using HarmonyLib;
using System; using System;
using rjw; using rjw;
using RimWorld; using RimWorld;
using rjw.Modules.Interactions.Helpers;
namespace rjwstd namespace rjwstd
{ {
@ -25,7 +24,7 @@ namespace rjwstd
{ {
foreach (Hediff hed in Parts) foreach (Hediff hed in Parts)
{ {
if (!(HediffHelper.IsNaturalSexPart(hed.def))) if (!(hed is Hediff_PartBaseNatural))
continue; continue;
var boob = pawn.health.hediffSet.GetFirstHediffOfDef(boobitis.hediff_def).Severity; var boob = pawn.health.hediffSet.GetFirstHediffOfDef(boobitis.hediff_def).Severity;
@ -38,23 +37,14 @@ namespace rjwstd
var hedstage = hed.CurStageIndex; var hedstage = hed.CurStageIndex;
//GenderHelper.ChangeSex(pawn, () => //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) if (hedstage < hed.CurStageIndex)
{ {
PartSizeExtension.TryGetCupSize(hed, out float size);
PartSizeCalculator.TryGetCupSize(hed, out float size);
var cupSize = (int)size; var cupSize = (int)size;
var cup = BraSizeConfigDef.GetCupSizeLabel(cupSize); var cup = PartStagesDef.GetCupSizeLabel(cupSize);
string message_title = boobitis.LabelCap; 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(); string message_text = "RJW_BreastsHaveGrownFromBoobitis".Translate(xxx.get_pawnname(pawn), pawn.Possessive(), hed.def.label.ToLower(), cup, boobitis.LabelCap).CapitalizeFirst();

View file

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

View file

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