diff --git a/1.4/Assemblies/RimJobWorldWhoring.dll b/1.4/Assemblies/RimJobWorldWhoring.dll index e0c11ef..5ee066a 100644 Binary files a/1.4/Assemblies/RimJobWorldWhoring.dll and b/1.4/Assemblies/RimJobWorldWhoring.dll differ diff --git a/1.4/Source/Mod/Location/Brothel_Room.cs b/1.4/Source/Mod/Location/Brothel_Room.cs index 27921c3..0068edd 100644 --- a/1.4/Source/Mod/Location/Brothel_Room.cs +++ b/1.4/Source/Mod/Location/Brothel_Room.cs @@ -17,7 +17,13 @@ namespace rjwwhoring if (building_Bed?.def.building.bed_humanlike == true) { if (building_Bed.ForPrisoners) return 0; - if (building_Bed.IsAllowedForWhoringAll()) num++; + if (building_Bed.def.building.bed_humanlike || + !(building_Bed.Faction != Faction.OfPlayerSilentFail) || + !building_Bed.Medical || + !building_Bed.ForPrisoners || + !building_Bed.def.defName.Contains("Guest") || + !building_Bed.def.defName.Contains("Android") ) + num++; } } if (num < 1) return 0; diff --git a/1.4/Source/Mod/Whoring_Bed_Utilities.cs b/1.4/Source/Mod/Whoring_Bed_Utilities.cs index a93a898..21e51b6 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