diff --git a/1.3/Assemblies/RJW_Menstruation.dll b/1.3/Assemblies/RJW_Menstruation.dll index ab99f28..ec1a329 100644 Binary files a/1.3/Assemblies/RJW_Menstruation.dll and b/1.3/Assemblies/RJW_Menstruation.dll differ diff --git a/1.3/MilkModule/Assemblies/MilkModule.dll b/1.3/MilkModule/Assemblies/MilkModule.dll index 4cc2bea..7cfd6ea 100644 Binary files a/1.3/MilkModule/Assemblies/MilkModule.dll and b/1.3/MilkModule/Assemblies/MilkModule.dll differ diff --git a/1.3/SexperienceModule/Assemblies/SexperienceModule.dll b/1.3/SexperienceModule/Assemblies/SexperienceModule.dll index c67dbcd..562ae4b 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/HediffComps/HediffComp_Menstruation.cs b/1.3/source/RJW_Menstruation/RJW_Menstruation/HediffComps/HediffComp_Menstruation.cs index 86dd11c..aaf5f27 100644 --- a/1.3/source/RJW_Menstruation/RJW_Menstruation/HediffComps/HediffComp_Menstruation.cs +++ b/1.3/source/RJW_Menstruation/RJW_Menstruation/HediffComps/HediffComp_Menstruation.cs @@ -475,7 +475,7 @@ namespace RJW_Menstruation { get { - return curStageHrs / CurStageIntervalHours; + return Mathf.Clamp01(curStageHrs / CurStageIntervalHours); } } @@ -1340,6 +1340,7 @@ namespace RJW_Menstruation EggDecay(); Implant(); } + if (parent.pawn.IsPregnant()) { curStageHrs += 1; diff --git a/1.3/source/RJW_Menstruation/RJW_Menstruation/Hediff_MultiplePregnancy.cs b/1.3/source/RJW_Menstruation/RJW_Menstruation/Hediff_MultiplePregnancy.cs index 6397594..6f2bc4c 100644 --- a/1.3/source/RJW_Menstruation/RJW_Menstruation/Hediff_MultiplePregnancy.cs +++ b/1.3/source/RJW_Menstruation/RJW_Menstruation/Hediff_MultiplePregnancy.cs @@ -326,22 +326,22 @@ namespace RJW_Menstruation } } - if (xxx.has_traits(pawn) && pawn.RaceProps.Humanlike) - { - foreach (Trait momtrait in pawn.story.traits.allTraits) - { - if (!RJWPregnancySettings.trait_filtering_enabled || !non_genetic_traits.Contains(momtrait.def.defName)) - traitpool.Add(momtrait); - } - } - if (father != null && xxx.has_traits(father) && father.RaceProps.Humanlike) - { - foreach (Trait poptrait in father.story.traits.allTraits) - { - if (!RJWPregnancySettings.trait_filtering_enabled || !non_genetic_traits.Contains(poptrait.def.defName)) - traitpool.Add(poptrait); - } - } + //if (xxx.has_traits(pawn) && pawn.RaceProps.Humanlike) + //{ + // foreach (Trait momtrait in pawn.story.traits.allTraits) + // { + // if (!RJWPregnancySettings.trait_filtering_enabled || !non_genetic_traits.Contains(momtrait.def.defName)) + // traitpool.Add(momtrait); + // } + //} + //if (father != null && xxx.has_traits(father) && father.RaceProps.Humanlike) + //{ + // foreach (Trait poptrait in father.story.traits.allTraits) + // { + // if (!RJWPregnancySettings.trait_filtering_enabled || !non_genetic_traits.Contains(poptrait.def.defName)) + // traitpool.Add(poptrait); + // } + //} updateTraits(baby, traitpool); } diff --git a/1.3/source/RJW_Menstruation/RJW_Menstruation/Patch/RJW_Patch.cs b/1.3/source/RJW_Menstruation/RJW_Menstruation/Patch/RJW_Patch.cs index 9bea537..cf1ab42 100644 --- a/1.3/source/RJW_Menstruation/RJW_Menstruation/Patch/RJW_Patch.cs +++ b/1.3/source/RJW_Menstruation/RJW_Menstruation/Patch/RJW_Patch.cs @@ -9,8 +9,12 @@ namespace RJW_Menstruation [HarmonyPatch(typeof(PregnancyHelper), "impregnate")] public static class impregnate_Patch { - public static bool Prefix(Pawn pawn, Pawn partner, xxx.rjwSextype sextype = xxx.rjwSextype.None) + public static bool Prefix(SexProps props) { + xxx.rjwSextype sextype = props.sexType; + Pawn pawn = props.pawn; + Pawn partner = props.partner; + if (sextype == xxx.rjwSextype.Vaginal) { var pawnpartBPR = Genital_Helper.get_genitalsBPR(pawn); @@ -107,30 +111,6 @@ namespace RJW_Menstruation } } - [HarmonyPatch(typeof(JobDriver_Sex), "Orgasm")] - public static class Orgasm_Patch - { - public static void Postfix(JobDriver_Sex __instance, int ___sex_ticks, int ___orgasmstick, Pawn ___pawn, xxx.rjwSextype ___sexType, bool ___usedCondom) - { - if (___sex_ticks - 1 > ___orgasmstick) //~3s at speed 1 - { - return; - } - - if (___pawn.jobs?.curDriver is JobDriver_SexBaseInitiator) - { - if (___sexType == xxx.rjwSextype.Vaginal && !___usedCondom) - { - if (!___pawn.Dead && !__instance.Partner.Dead) - { - PregnancyHelper.impregnate(___pawn, __instance.Partner, ___sexType); - } - } - } - } - } - - [HarmonyPatch(typeof(Hediff_BasePregnancy), "PostBirth")] public static class RJW_Patch_PostBirth { 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 c0c51db..1d06b44 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 @@ -74,10 +74,9 @@ namespace RJW_Menstruation if (window != null) { List pawns = Find.Selector.SelectedPawns.FindAll(x => x.ShouldShowWombGizmo()); - if (!pawns.NullOrEmpty() && pawns.Count > 1) + if (Input.GetKey(VariousDefOf.OpenStatusWindowKey.MainKey) && !pawns.NullOrEmpty() && pawns.Count > 1) { int index = pawns.IndexOf(window.pawn); - SoundDefOf.TabOpen.PlayOneShotOnCamera(); Pawn newpawn = pawns[(index + 1) % pawns.Count]; window.ChangePawn(newpawn, newpawn.GetMenstruationComp()); diff --git a/1.3/source/RJW_Menstruation/RJW_Menstruation/UI/Gizmo_Womb.cs b/1.3/source/RJW_Menstruation/RJW_Menstruation/UI/Gizmo_Womb.cs index e0291c9..d836c57 100644 --- a/1.3/source/RJW_Menstruation/RJW_Menstruation/UI/Gizmo_Womb.cs +++ b/1.3/source/RJW_Menstruation/RJW_Menstruation/UI/Gizmo_Womb.cs @@ -11,7 +11,7 @@ namespace RJW_Menstruation public const float progressbarHeight = 2f; - protected override void DrawIcon(Rect rect, Material buttonMat, GizmoRenderParms parms) + public override void DrawIcon(Rect rect, Material buttonMat, GizmoRenderParms parms) { Texture2D badTex = icon; Texture2D overay = icon_overay; diff --git a/changelogs.txt b/changelogs.txt index 4efc30e..831a27f 100644 --- a/changelogs.txt +++ b/changelogs.txt @@ -1,4 +1,9 @@ +Version 1.0.5.6 + - requires RJW 4.8.0 or later + - fixed womb gizmo not worked properly + Version 1.0.5.5 + - not compatible with RJW 4.8.0 or later - clicking vagina and anus image will show origin state - fixed loadfolders.xml for other platforms - added load orders