Merge branch 'c0ffeee-master'
This commit is contained in:
commit
44bc2ae59a
|
@ -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
|
||||
{
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -184,7 +184,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);
|
||||
}
|
||||
|
@ -220,6 +220,7 @@ namespace RJWSexperience
|
|||
|
||||
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());
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue