AblativeAbsolute
/
rjw-whoring
mirror of https://gitgud.io/Ed86/rjw-whoring.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Compare commits

base: AblativeAbsolute:673efd6a9d42d13a2083e4e7f88dcddc940a1569
Branches Tags
AblativeAbsolute:master
..
compare: AblativeAbsolute:78e92917437fb19267069a82d459f6eb54165785
Branches Tags
AblativeAbsolute:master

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

3 changed files with 3 additions and 19 deletions
Show Stats Expand all files Collapse all files

BIN
1.4/Assemblies/RimJobWorldWhoring.dll
View File

Binary file not shown.

14
1.4/Source/Mod/Whoring_Bed_Utilities.cs
View File

@ -287,11 +287,7 @@ 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") ||
bed.def.defName.Contains("Android") )
if (!bed.def.building.bed_humanlike || bed.Faction != Faction.OfPlayerSilentFail || bed.Medical || bed.def.defName.Contains("Guest"))
{
return false;
}
@ -326,13 +322,7 @@ 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.def.defName.Contains("Android") ||
bed.GetRoom()?.IsPrisonCell == true)
if (!bed.def.building.bed_humanlike || bed.Faction != Faction.OfPlayerSilentFail || bed.Medical || bed.ForPrisoners || bed.def.defName.Contains("Guest") || bed.GetRoom()?.IsPrisonCell == true)
{
return false;
}

8
1.4/Source/Mod/harmony_Building_BedPatches.cs
View File

@ -52,13 +52,7 @@ namespace rjwwhoring
private static IEnumerable<Gizmo> Process(Building_Bed __instance, IEnumerable<Gizmo> __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") &&
!__instance.def.defName.Contains("Android") &&
!isPrisonCell)
if (!__instance.ForPrisoners && !__instance.Medical && __instance.def.building.bed_humanlike && __instance.Faction == Faction.OfPlayerSilentFail && !__instance.def.defName.Contains("Guest") && !isPrisonCell)
{
yield return