diff --git a/Assemblies/RJWSexperience.dll b/Assemblies/RJWSexperience.dll index 9a66324..301a6c2 100644 Binary files a/Assemblies/RJWSexperience.dll and b/Assemblies/RJWSexperience.dll differ diff --git a/RJWSexperience/IdeologyAddon/Ideology/Rituals/JobGiver_DrugOrgy.cs b/RJWSexperience/IdeologyAddon/Ideology/Rituals/JobGiver_DrugOrgy.cs index 80aa619..a85ba70 100644 --- a/RJWSexperience/IdeologyAddon/Ideology/Rituals/JobGiver_DrugOrgy.cs +++ b/RJWSexperience/IdeologyAddon/Ideology/Rituals/JobGiver_DrugOrgy.cs @@ -127,8 +127,9 @@ namespace RJWSexperience.Ideology { Partner.pather.StopDead(); Partner.jobs.curDriver.asleep = false; - usedCondom = CondomUtility.TryUseCondom(pawn) || CondomUtility.TryUseCondom(Partner); + Start(); + Sexprops.usedCondom = CondomUtility.TryUseCondom(pawn) || CondomUtility.TryUseCondom(Partner); }; SexToil.AddPreTickAction(delegate { diff --git a/RJWSexperience/IdeologyAddon/Ideology/Rituals/JobGiver_GangbangVictim.cs b/RJWSexperience/IdeologyAddon/Ideology/Rituals/JobGiver_GangbangVictim.cs index 03f1fd0..a7766e8 100644 --- a/RJWSexperience/IdeologyAddon/Ideology/Rituals/JobGiver_GangbangVictim.cs +++ b/RJWSexperience/IdeologyAddon/Ideology/Rituals/JobGiver_GangbangVictim.cs @@ -96,7 +96,7 @@ namespace RJWSexperience.Ideology Partner.jobs.curDriver.asleep = false; // Unlike normal rape try use comfort prisoner condom CondomUtility.GetCondomFromRoom(Partner); - usedCondom = CondomUtility.TryUseCondom(Partner); + Sexprops.usedCondom = CondomUtility.TryUseCondom(Partner); if (RJWSettings.DebugRape) ModLog.Message("JobDriver_RapeComfortPawn::MakeNewToils() - reserving prisoner"); //pawn.Reserve(Partner, xxx.max_rapists_per_prisoner, 0); diff --git a/RJWSexperience/IdeologyAddon/Ideology/Rituals/RitualOutcomeComps.cs b/RJWSexperience/IdeologyAddon/Ideology/Rituals/RitualOutcomeComps.cs index 04fb530..2f8eef7 100644 --- a/RJWSexperience/IdeologyAddon/Ideology/Rituals/RitualOutcomeComps.cs +++ b/RJWSexperience/IdeologyAddon/Ideology/Rituals/RitualOutcomeComps.cs @@ -39,7 +39,7 @@ namespace RJWSexperience.Ideology return false; } - public override ExpectedOutcomeDesc GetExpectedOutcomeDesc(Precept_Ritual ritual, TargetInfo ritualTarget, RitualObligation obligation, RitualRoleAssignments assignments) + public override ExpectedOutcomeDesc GetExpectedOutcomeDesc(Precept_Ritual ritual, TargetInfo ritualTarget, RitualObligation obligation, RitualRoleAssignments assignments, RitualOutcomeComp_Data data) { return new ExpectedOutcomeDesc { @@ -74,7 +74,7 @@ namespace RJWSexperience.Ideology return false; } - public override ExpectedOutcomeDesc GetExpectedOutcomeDesc(Precept_Ritual ritual, TargetInfo ritualTarget, RitualObligation obligation, RitualRoleAssignments assignments) + public override ExpectedOutcomeDesc GetExpectedOutcomeDesc(Precept_Ritual ritual, TargetInfo ritualTarget, RitualObligation obligation, RitualRoleAssignments assignments, RitualOutcomeComp_Data data) { return new ExpectedOutcomeDesc { diff --git a/RJWSexperience/RJWSexperience/RJW_Patch.cs b/RJWSexperience/RJWSexperience/RJW_Patch.cs index bd111b0..fafc56c 100644 --- a/RJWSexperience/RJWSexperience/RJW_Patch.cs +++ b/RJWSexperience/RJWSexperience/RJW_Patch.cs @@ -69,7 +69,7 @@ namespace RJWSexperience { if (__instance.Sexprops.sexType != xxx.rjwSextype.Masturbation && !(__instance is JobDriver_Masturbate)) { - if (__instance.isRape) + if (__instance.Sexprops.isRape) { __instance.pawn?.skills?.Learn(VariousDefOf.SexSkill, 0.05f, true); } @@ -103,13 +103,18 @@ namespace RJWSexperience { private const float base_sat_per_fuck = 0.4f; - public static void Prefix(Pawn pawn, Pawn partner, SexProps props, bool pawn_is_raping , ref float satisfaction) + public static void Prefix(SexProps props, ref float satisfaction) { + Pawn pawn = props.pawn; + Pawn partner = props.partner; satisfaction = Mathf.Max(base_sat_per_fuck, satisfaction * partner.GetSexStat()); } - public static void Postfix(Pawn pawn, Pawn partner, SexProps props, bool pawn_is_raping, float satisfaction) + public static void Postfix(SexProps props, float satisfaction) { + + Pawn pawn = props.pawn; + Pawn partner = props.partner; float? lust = pawn.records?.GetValue(VariousDefOf.Lust); xxx.rjwSextype sextype = props.sexType; if (lust != null) diff --git a/RJWSexperience_Ideology/Assemblies/RJWSexperience.Ideology.dll b/RJWSexperience_Ideology/Assemblies/RJWSexperience.Ideology.dll index fe8bdde..851959c 100644 Binary files a/RJWSexperience_Ideology/Assemblies/RJWSexperience.Ideology.dll and b/RJWSexperience_Ideology/Assemblies/RJWSexperience.Ideology.dll differ