From 8fe6c145c4c68b4d4bbbae927c30a78f69b25236 Mon Sep 17 00:00:00 2001 From: FireSplitter Date: Sat, 16 Mar 2024 14:48:50 +0200 Subject: [PATCH] Restore GetScore function to use IsAllowedForWhoringAll --- 1.4/Assemblies/RimJobWorldWhoring.dll | Bin 69632 -> 69632 bytes 1.4/Source/Mod/Location/Brothel_Room.cs | 8 +------- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/1.4/Assemblies/RimJobWorldWhoring.dll b/1.4/Assemblies/RimJobWorldWhoring.dll index 5ee066a806a46961db60dc5c48fd895fb693d21c..a09a316396a1ff700466c316ff6dde0d53e38829 100644 GIT binary patch delta 6818 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 diff --git a/1.4/Source/Mod/Location/Brothel_Room.cs b/1.4/Source/Mod/Location/Brothel_Room.cs index 0068edd..27921c3 100644 --- a/1.4/Source/Mod/Location/Brothel_Room.cs +++ b/1.4/Source/Mod/Location/Brothel_Room.cs @@ -17,13 +17,7 @@ namespace rjwwhoring if (building_Bed?.def.building.bed_humanlike == true) { if (building_Bed.ForPrisoners) return 0; - 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 (building_Bed.IsAllowedForWhoringAll()) num++; } } if (num < 1) return 0;