diff --git a/1.4/Assemblies/RimJobWorldWhoring.dll b/1.4/Assemblies/RimJobWorldWhoring.dll index e0c11ef..e063e78 100644 Binary files a/1.4/Assemblies/RimJobWorldWhoring.dll and b/1.4/Assemblies/RimJobWorldWhoring.dll differ diff --git a/1.4/Source/Mod/JobGivers/JobGiver_WhoreInvitingVisitors.cs b/1.4/Source/Mod/JobGivers/JobGiver_WhoreInvitingVisitors.cs index f6c9a3b..a81d6c7 100644 --- a/1.4/Source/Mod/JobGivers/JobGiver_WhoreInvitingVisitors.cs +++ b/1.4/Source/Mod/JobGivers/JobGiver_WhoreInvitingVisitors.cs @@ -110,7 +110,7 @@ namespace rjwwhoring { //Rand.PopState(); //Rand.PushState(RJW_Multiplayer.PredictableSeed()); - if (xxx.isSingleOrPartnerNotHere(client) || xxx.is_lecher(client) || Rand.Value < 0.9f) + if (xxx.IsSingleOrPartnersNotHere(client) || xxx.is_lecher(client) || Rand.Value < 0.9f) { if (client != LovePartnerRelationUtility.ExistingLovePartner(whore)) { //Exception for prisoners to account for PrisonerWhoreSexualEmergencyTree, which allows prisoners to try to hook up with anyone who's around (mostly other prisoners or warden) diff --git a/1.4/Source/Mod/Whoring_Bed_Utilities.cs b/1.4/Source/Mod/Whoring_Bed_Utilities.cs index a93a898..74ac8a1 100644 --- a/1.4/Source/Mod/Whoring_Bed_Utilities.cs +++ b/1.4/Source/Mod/Whoring_Bed_Utilities.cs @@ -287,7 +287,11 @@ namespace rjwwhoring } public static bool IsAllowedForWhoringOwner(this Building_Bed bed) { - if (!bed.def.building.bed_humanlike || bed.Faction != Faction.OfPlayerSilentFail || bed.Medical || bed.def.defName.Contains("Guest")) + if (!bed.def.building.bed_humanlike || + bed.Faction != Faction.OfPlayerSilentFail || + bed.Medical || + bed.def.defName.Contains("Guest") || + bed.def.defName.Contains("Android") ) { return false; } @@ -322,7 +326,13 @@ namespace rjwwhoring { if (WhoringBase.DataStore.GetBedData(bed).allowedForWhoringAll) { - if (!bed.def.building.bed_humanlike || bed.Faction != Faction.OfPlayerSilentFail || bed.Medical || bed.ForPrisoners || bed.def.defName.Contains("Guest") || bed.GetRoom()?.IsPrisonCell == true) + if (!bed.def.building.bed_humanlike || + bed.Faction != Faction.OfPlayerSilentFail || + bed.Medical || + bed.ForPrisoners || + bed.def.defName.Contains("Guest") || + bed.def.defName.Contains("Android") || + bed.GetRoom()?.IsPrisonCell == true) { return false; } diff --git a/1.4/Source/Mod/harmony_Building_BedPatches.cs b/1.4/Source/Mod/harmony_Building_BedPatches.cs index 78a1794..bd6c086 100644 --- a/1.4/Source/Mod/harmony_Building_BedPatches.cs +++ b/1.4/Source/Mod/harmony_Building_BedPatches.cs @@ -52,7 +52,13 @@ namespace rjwwhoring private static IEnumerable Process(Building_Bed __instance, IEnumerable __result) { var isPrisonCell = __instance.GetRoom()?.IsPrisonCell == true; - if (!__instance.ForPrisoners && !__instance.Medical && __instance.def.building.bed_humanlike && __instance.Faction == Faction.OfPlayerSilentFail && !__instance.def.defName.Contains("Guest") && !isPrisonCell) + if (!__instance.ForPrisoners && + !__instance.Medical && + __instance.def.building.bed_humanlike && + __instance.Faction == Faction.OfPlayerSilentFail && + !__instance.def.defName.Contains("Guest") && + !__instance.def.defName.Contains("Android") && + !isPrisonCell) { yield return