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 'master' of git://github.com/c0ffeee/RJW-Sexperience into c0ffeee-master

This commit is contained in:
moreoreganostodump 2021-09-12 18:01:04 +09:00
parent a3c073a43e 2c61e8b542
commit 8ea085a4ac
4 changed files with 16 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);

4
RJWSexperience/IdeologyAddon/Ideology/Rituals/RitualOutcomeComps.cs
View File

@ -40,8 +40,12 @@ namespace RJWSexperience.Ideology
} }
<<<<<<< HEAD
public override ExpectedOutcomeDesc GetExpectedOutcomeDesc(Precept_Ritual ritual, TargetInfo ritualTarget, RitualObligation obligation, RitualRoleAssignments assignments, RitualOutcomeComp_Data data) public override ExpectedOutcomeDesc GetExpectedOutcomeDesc(Precept_Ritual ritual, TargetInfo ritualTarget, RitualObligation obligation, RitualRoleAssignments assignments, RitualOutcomeComp_Data data)
=======
public override ExpectedOutcomeDesc GetExpectedOutcomeDesc(Precept_Ritual ritual, TargetInfo ritualTarget, RitualObligation obligation, RitualRoleAssignments assignments, RitualOutcomeComp_Data data)
>>>>>>> 2c61e8b5425da0190af8f9c6a499a3da7cd49dcf
{ {
return new ExpectedOutcomeDesc return new ExpectedOutcomeDesc
{ {

10
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,12 +220,20 @@ namespace RJWSexperience
public static void Prefix(SexProps props, ref float satisfaction) public static void Prefix(SexProps props, ref float satisfaction)
{ {
<<<<<<< HEAD
=======
Pawn pawn = props.pawn;
>>>>>>> 2c61e8b5425da0190af8f9c6a499a3da7cd49dcf
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());
} }
public static void Postfix(SexProps props, float satisfaction) public static void Postfix(SexProps props, float satisfaction)
{ {
<<<<<<< HEAD
=======
>>>>>>> 2c61e8b5425da0190af8f9c6a499a3da7cd49dcf
Pawn pawn = props.pawn; Pawn pawn = props.pawn;
Pawn partner = props.partner; Pawn partner = props.partner;
float? lust = pawn.records?.GetValue(VariousDefOf.Lust); float? lust = pawn.records?.GetValue(VariousDefOf.Lust);