From 1601c4e6207ebaa8ca82a5ab6d155b4b2760426b Mon Sep 17 00:00:00 2001 From: FireSplitter Date: Sat, 16 Mar 2024 14:30:22 +0200 Subject: [PATCH 1/4] Removed VFE android specific stations from whoring to fix UI --- 1.4/Assemblies/RimJobWorldWhoring.dll | Bin 69632 -> 69632 bytes 1.4/Source/Mod/Location/Brothel_Room.cs | 8 +++++++- 1.4/Source/Mod/Whoring_Bed_Utilities.cs | 14 ++++++++++++-- 1.4/Source/Mod/harmony_Building_BedPatches.cs | 8 +++++++- 4 files changed, 26 insertions(+), 4 deletions(-) diff --git a/1.4/Assemblies/RimJobWorldWhoring.dll b/1.4/Assemblies/RimJobWorldWhoring.dll index e0c11ef538494d295f85e9d8e1dc765d20950e9a..5ee066a806a46961db60dc5c48fd895fb693d21c 100644 GIT binary patch delta 7912 zcmb7}33yXgzQF(ICimVnNw?h4eJ5>io0RUWWhqOGf&vy03XClBQ7n*7a1;qNg@U35 zp&kZA?2OWJ-Zylf{`LAXF;@S`{34h=VZybMB>WeDmJ>UcN6U=l5UF zJ$sVI7mbZC8rMA~thv_G954JLz2)_ZA=Y#PV*p=62<$hsBrDeG1gyv>QwhY;WWhxz zlXT%BnJy;{(L>Ohy+-0&01=Xw18jc@fNb0*lVbl^AuJ-XADV;#ghPbc;64Ljwt(zD zi=Wn#UFb%aL}mF(SF{Nu**5H@S>bLL>7PnbV|TCj_y_kdPpAf#(Mt zmPl1b^5V=hE;LbhY@{znhI+FTq)fD_1T~2HW0ReY$!L?Qt)Fv$)rL%!?JhW}a>tO8an+TmN3SOcT1XqK{i8M>;4j z(#J#3V>YblWAkhP_C!wWjl73>v7(RHnE>qZaP zQStF8PHmir4N;?T2+cUvn5D%TBcolvq?IIzZcZ9VlIf|W(ySCzx%*?0Ww1LmiLG?siY>+*5on= zTOnTD49yKH7VZozc;^&=p*QM3lM|vK2*)uK)tD1|bmXuabA&}uoisNkGRTGUxfW29 z>9~}PSv6?7H8s+(BoBkDS*Y8Z8s&MOOQUU|4&ag)PaBuS+K6rw=lPsV;&DgOyb?S{ zGmDiNWHV@P>M0g8lb%hd6ZFOGosO zVM6aVo?j&JT|8@m@bC8StjNA%ee0%vM;^WCs2~oSnOf$=MChr5|MHqx#$I1;N{` zP#+$zj>j45>7a9So4hbO`Ju|j&rs)XL?uqX-g9;t6R@osH~RnK z(ECkc4!J~+7A9EOd3rH5NEUmEh zu5{)K;?5xCYyrPmoTzoblSlaLp#eWQduim6SWU^mqF5RKbI@iSI``9Kve@*PGghj zf4NWeE&^;fn)cpIEV4Aos&8xj*6?pG3;v8jQwVm^%E1Fk&bR0;OX|D4x7$5KL)gt? z2U24;4veS1m+>NI^t?#FA97Ln0_d3vM?!D+{uRvxoVJa-)GFLjEH>h~NfUS>B=)`rhb5~iV>V)U^94b`rjHxNH9Cbw7wKoJNt%jczrF#xSUlr8(pJ)8C98NOsUOV`D;3p-fBew0MHT zsW>i;4D`Fky-dhk^w|9?$v6H7s_!Et-v8?OH;f7F&MJ6u1>;>Kliy{AnBemVf4u465^tAjY>jkPE9Nc^^dL@VhF_p-JCVcAb1zB4h^H5rKK|B9cF> zuOZt$dcS&PrT;fw@6llqyvs2g{}vKqHI+V1=S~lHj-;0gE`b!AMK9EfwD8 zq(w=C_XFr8rxm8nt`=JwT+nG_E|t>Y2Or0F(~e?>yGnZ-lLq@awL~p<8bi{ci&MMl z!_<`|4gRSSl;F)h4Q}c5u9=ahTLy#n{TO78M8+yI595-|p-ZQ9=MI|-jJP(LU%GRbZ2(NyX@T>AEgKxTVwrAw(lJ{uln>JA zW#v;_KJ3=1+}UX>0Cfnk{2Ra@e$iG0lPWaRKRYkmO5nUs7o0!Y%3$PBP1oN4i;!|y zrIVlrD}&&Doerhjl_Aif)1~wnr2=Y)X?~*;gO#E1kxtQxc4au6N5cFYpdc|u83C)= z+(B9#lcZF_PMucA*p<7XOQ-6XFGB8tts|JFHZY@MJEslc3C>VPgQ-%BvIgm1n5xs2 zyv4$Ouu7-TkjB7vMm|g!m%msT3vBOZ=_e*H7RJHLI$4Sr3-?13`vn7agHTruD|Grt z(PCjdbn7HzlnD@pdndEZuw^I{VV+Knl58^Z!K2B41 zM}HbR9roX^QABDhnF-gcHHvdpD6=2|cf30*W;UdA()waH4CmAiA101eX2T*p{n^xe zJ8q_>7M{~-C(>Nltx-OFn|smxFr3$wjp5^!IxtOSj?3WD@Qdd8Fq~5x`M@Dt7r>;6 zbkSo)zImDu9=0@F9)VR4Fo!mH)A73HQP{<41z*#T!G2x0C_}bB2Hl+6fhAf5_DOdV zoiHzkX`HlG?1frRZNU7zu$q(Rw*-1+}{ggXVE}GY}C@jC0ejU8QmD-@MgL|ejQ?2tU zjOV1KpaJRE!#iB3O`Y}dF()m`dVL7B3>)DZ*D)%vZUo~rzHZy#FDbK>&F}&u8~Zaz zFF-e^4Uk>(h|&tyUoah`Rm#io1E&_)S+rSs1L_`RIxYQnXbqsgb9_6z#&u0_8s1d4 zLpviMG{Jhqd&(c7iz_!kM9H6(cfmTH1!Z(tc@IiBwLnhJ8RY{Q+oQXp?1b7Gnx&~E zM)?!$o~cnp$#KiBfF-sYhCg&i_o;2SuJdVK^AW7-QQlBK3UF+L4zAOlu3>zd#lfn|7GCtr<`;T|1>B}ON8 zI?CySP7`IO3!BRt(*$eqhr4#@(CHwjZk@U~J@l|2x)_*|r~Y9%Ct*;B%w{ z0iFMspV8O4Wu?&1XAe{!gqynZy3o&lFu?H;j9#Rr$P$`uhhT?J6~<=UVK|}FRk7K2 z1isVhU8&i26qLs`zkzbI?PDnAq)lhvv49lEV1#a(0CDy}-SGg+K@C{Dn~I4bN6%g3PE)(Ho6sx-*f&*2y+Z6+QcR=_gVVBqf zYvXg_7{rBllLLn9S$oAZz$V@=1@_hCabbU4hnOKgk#|OXT==G_1IsZbth}Ae$|z^2 zm@7tyUJ|gUzA7TB$-b zIjFD=GF^{KcZ)4~UTGUVP`XSSC)$FakS2@vqHb~%u4j!QSK$wZRJsbGNgE|2VcD+2 zm&Gqho3M`m#*vejQ)n6G{G&A2xYpVxy#`bA&yy{}@3M|abHxvolhO=vV%TYE3(wzT zjElYPlUhVuvR$_GaN`Vjmt@Q148yQ|jjRouDQ^<1!fUba#V*<+9xj?Mzb2OCEJVrC zoJI0B@#SKloFOI`uRzH*=kMh>9>+n<&avPk^9u1xf+&Vxk&hW0@~+753%^sZ$sdVN zSaRWj=uP@j&ORktizL$}vAdteG){af$6>l5ZVAdTT@iEh2AJj=Mut8`Iw9HGN`j$!S|N8rSy3y7d)U!RZiwGFGEAK?CgORN2 z-^wHtjd*6cuuG)RKQlU-N?WAIA}^XVM04u5W_-5L74i-7yZ8)x`P<7*7Wux8xdM%ImP)kfw!phzAV&bH1_=`B>TamJD%T@(Oxw z?cWqCwP8QT37zCsS6lEQ!k*yVy2<1UEp7P@zfEU6d(4>p7xAcAEzOs9OW#R9O7Ze2 zd4gOcKP?}TJLO2zU{jqxcH><_zsur};!J6^)GECxrOAJk|0K7|)&9Co2T9>M;vs)0 zqosbr0V!7S!)s(KqzWVCbbLRF^)>iz#`i2?E6l<7uZ0_?S^m1sH!9*RRq!jA4GZBB zfY1t901tr&+%OkE!T-?N6$by+^Q(ixEN@TSvn+r1h6p2qFG4m-h<(#D9FR6tB6)uQUR#={N##8UJ;;j5mS%tA|&wD4w(a_KbT*wLbXV zPowWY`8=v&c-hpd8S`f^+&En(U33VEvK6E=x%Rq`)stG1BZML88yA>J$Bqy)`OzRu PFWwOzLcSv{Ir6^%8Moy7 delta 7684 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 C=a^Rj 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 From 8fe6c145c4c68b4d4bbbae927c30a78f69b25236 Mon Sep 17 00:00:00 2001 From: FireSplitter Date: Sat, 16 Mar 2024 14:48:50 +0200 Subject: [PATCH 2/4] 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; From bf7b477fed159aaded2322492fb737658b9eb55f Mon Sep 17 00:00:00 2001 From: FireSplitter Date: Sat, 16 Mar 2024 15:08:44 +0200 Subject: [PATCH 3/4] Code beautification --- 1.4/Source/Mod/Whoring_Bed_Utilities.cs | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/1.4/Source/Mod/Whoring_Bed_Utilities.cs b/1.4/Source/Mod/Whoring_Bed_Utilities.cs index 21e51b6..74ac8a1 100644 --- a/1.4/Source/Mod/Whoring_Bed_Utilities.cs +++ b/1.4/Source/Mod/Whoring_Bed_Utilities.cs @@ -326,13 +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.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.def.defName.Contains("Android") || + bed.GetRoom()?.IsPrisonCell == true) { return false; } From efa0b296a56db3f2b7a8e834ea1c6254457601ad Mon Sep 17 00:00:00 2001 From: FireSplitter Date: Sun, 17 Mar 2024 21:10:35 +0200 Subject: [PATCH 4/4] Fix compatibility with latest RJW --- 1.4/Assemblies/RimJobWorldWhoring.dll | Bin 69632 -> 69632 bytes .../JobGiver_WhoreInvitingVisitors.cs | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/1.4/Assemblies/RimJobWorldWhoring.dll b/1.4/Assemblies/RimJobWorldWhoring.dll index a09a316396a1ff700466c316ff6dde0d53e38829..e063e78a0a1b52702a3e5a10a949e0cd21593768 100644 GIT binary patch delta 10061 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 obzb^^