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

Merge branch 'master' into 'master' 

Fix compatibility with VRE - Androids

See merge request Ed86/rjw-whoring!7
This commit is contained in:
FireSplitter 2024-03-18 09:10:49 +00:00
parent 78e9291743 b64b6cc1b9
commit c7bf72b7ed
3 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File 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,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;
}

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

@ -52,7 +52,13 @@ 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") && !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