AblativeAbsolute
/
RJW-Sexperience
mirror of https://github.com/amevarashi/RJW-Sexperience.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'c0ffeee-master'

This commit is contained in:
moreoreganostodump 2021-09-12 18:03:41 +09:00
parent a3c073a43e 5945acadf9
commit 44bc2ae59a
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
RJWSexperience/IdeologyAddon/Ideology/Rituals/JobGiver_DrugOrgy.cs
View File

@ -127,8 +127,9 @@ namespace RJWSexperience.Ideology
{ {
Partner.pather.StopDead(); Partner.pather.StopDead();
Partner.jobs.curDriver.asleep = false; Partner.jobs.curDriver.asleep = false;
usedCondom = CondomUtility.TryUseCondom(pawn) || CondomUtility.TryUseCondom(Partner);
Start(); Start();
Sexprops.usedCondom = CondomUtility.TryUseCondom(pawn) || CondomUtility.TryUseCondom(Partner);
}; };
SexToil.AddPreTickAction(delegate SexToil.AddPreTickAction(delegate
{ {

2
RJWSexperience/IdeologyAddon/Ideology/Rituals/JobGiver_GangbangVictim.cs
View File

@ -96,7 +96,7 @@ namespace RJWSexperience.Ideology
Partner.jobs.curDriver.asleep = false; Partner.jobs.curDriver.asleep = false;
// Unlike normal rape try use comfort prisoner condom // Unlike normal rape try use comfort prisoner condom
CondomUtility.GetCondomFromRoom(Partner); CondomUtility.GetCondomFromRoom(Partner);
usedCondom = CondomUtility.TryUseCondom(Partner); Sexprops.usedCondom = CondomUtility.TryUseCondom(Partner);
if (RJWSettings.DebugRape) ModLog.Message("JobDriver_RapeComfortPawn::MakeNewToils() - reserving prisoner"); if (RJWSettings.DebugRape) ModLog.Message("JobDriver_RapeComfortPawn::MakeNewToils() - reserving prisoner");
//pawn.Reserve(Partner, xxx.max_rapists_per_prisoner, 0); //pawn.Reserve(Partner, xxx.max_rapists_per_prisoner, 0);

3
RJWSexperience/RJWSexperience/RJW_Patch.cs
View File

@ -184,7 +184,7 @@ namespace RJWSexperience
{ {
if (__instance.Sexprops.sexType != xxx.rjwSextype.Masturbation && !(__instance is JobDriver_Masturbate)) 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); __instance.pawn?.skills?.Learn(VariousDefOf.SexSkill, 0.05f, true);
} }
@ -220,6 +220,7 @@ namespace RJWSexperience
public static void Prefix(SexProps props, ref float satisfaction) public static void Prefix(SexProps props, ref float satisfaction)
{ {
Pawn pawn = props.pawn;
Pawn partner = props.partner; Pawn partner = props.partner;
satisfaction = Mathf.Max(base_sat_per_fuck, satisfaction * partner.GetSexStat()); satisfaction = Mathf.Max(base_sat_per_fuck, satisfaction * partner.GetSexStat());
} }