Compare commits

..

No commits in common. "673efd6a9d42d13a2083e4e7f88dcddc940a1569" and "78e92917437fb19267069a82d459f6eb54165785" have entirely different histories.

3 changed files with 3 additions and 19 deletions

View file

@ -287,11 +287,7 @@ namespace rjwwhoring
} }
public static bool IsAllowedForWhoringOwner(this Building_Bed bed) public static bool IsAllowedForWhoringOwner(this Building_Bed bed)
{ {
if (!bed.def.building.bed_humanlike || if (!bed.def.building.bed_humanlike || bed.Faction != Faction.OfPlayerSilentFail || bed.Medical || bed.def.defName.Contains("Guest"))
bed.Faction != Faction.OfPlayerSilentFail ||
bed.Medical ||
bed.def.defName.Contains("Guest") ||
bed.def.defName.Contains("Android") )
{ {
return false; return false;
} }
@ -326,13 +322,7 @@ namespace rjwwhoring
{ {
if (WhoringBase.DataStore.GetBedData(bed).allowedForWhoringAll) if (WhoringBase.DataStore.GetBedData(bed).allowedForWhoringAll)
{ {
if (!bed.def.building.bed_humanlike || if (!bed.def.building.bed_humanlike || bed.Faction != Faction.OfPlayerSilentFail || bed.Medical || bed.ForPrisoners || bed.def.defName.Contains("Guest") || bed.GetRoom()?.IsPrisonCell == true)
bed.Faction != Faction.OfPlayerSilentFail ||
bed.Medical ||
bed.ForPrisoners ||
bed.def.defName.Contains("Guest") ||
bed.def.defName.Contains("Android") ||
bed.GetRoom()?.IsPrisonCell == true)
{ {
return false; return false;
} }

View file

@ -52,13 +52,7 @@ namespace rjwwhoring
private static IEnumerable<Gizmo> Process(Building_Bed __instance, IEnumerable<Gizmo> __result) private static IEnumerable<Gizmo> Process(Building_Bed __instance, IEnumerable<Gizmo> __result)
{ {
var isPrisonCell = __instance.GetRoom()?.IsPrisonCell == true; var isPrisonCell = __instance.GetRoom()?.IsPrisonCell == true;
if (!__instance.ForPrisoners && if (!__instance.ForPrisoners && !__instance.Medical && __instance.def.building.bed_humanlike && __instance.Faction == Faction.OfPlayerSilentFail && !__instance.def.defName.Contains("Guest") && !isPrisonCell)
!__instance.Medical &&
__instance.def.building.bed_humanlike &&
__instance.Faction == Faction.OfPlayerSilentFail &&
!__instance.def.defName.Contains("Guest") &&
!__instance.def.defName.Contains("Android") &&
!isPrisonCell)
{ {
yield return yield return