From 1601c4e6207ebaa8ca82a5ab6d155b4b2760426b Mon Sep 17 00:00:00 2001 From: FireSplitter Date: Sat, 16 Mar 2024 14:30:22 +0200 Subject: [PATCH] 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 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 PFWwOzLcSv{Ir6^%8Moy7 delta 7684 zcmb7}33yXgzQF(ICimVnNtfh?bfJ6G_BKhOEp2H#g`t2f3es9Y3RGE!Cwofh$P(HV zii#G6dKeG|6-7rJoi`Xp)WHDZXkly$`qywD5Eku%>2)}m$vcwz4yI-Ur)~O zzn^o@a+@|iZESklxc))m!o}8>Bw=G#>x&bkhG!8N2lz9Dz#&6xnqr+sz=~|mB#=nc z1TU>2*}@iyt|E=`OVOJBjKW_5M3}u2VEeNGWYcsL85pV*Vw{OPP!|JW1E<;GI}2d8 zfb9DOKdqh`8jQ;=^5%fe==%&Mie!_#5$Po-(qbU!OR$NZ6zPEoHVgp?+zb6@C8 z4M+i8493Mq>@~4++)5q+3r=kx_K5vA(9Y}u$&Fq^Mt~}!oexLhX-d3#KDLIM6&?l2qi9+`#$J!jI5gJ+R>%$r+ z{af+?5=;B0-n=Gie;EKVD zg~l`##r9Ft>F?5t)g*)zbM2%_4JOQi85EFG%DcsyR8kXZM0%Nvt>HihdNjJQ@!_gtSG?XY7Xk2$&B+ia%sFBR5zC-_+Q|XzILM9B>LO9BnkJt=9TR48XkYeq86~{!B`&#Cdb2umj5J5!Es*$wOi-vR9-H zSxLCYp2!-RqT~ti3RZ(pG`t#IH%43{hU{%*e(1UEO{Dn$IPKU1b$W!9WV4{1n|AhC zuG6n_3hDDX_W!rLcI=}2{Ft6KdOHrnmr3Wk2lf(HYQmjvM=xQOCVbyr=I(L7g9)p# ziQ`v>NlJfw^X6Yp#)>r?TIxym^q7z5F|gq~0(3?%)P z)Rat7XgKf4Ss)mOa*urai9<7Fn8P)lV{hmH*5Q9(sH56oONfHe?XV zyM*qtq`t~#+TG?ah+^0MZltFE_ze8hdKll1jQ;iXk%~^CfY7BwUCBMu+lFQWuGFTz z>PS3REOz4WqHhe%3x3TMJx4M>0jms#N`GQB)b%=uROkb49jQLZW&fjmQ&mCY^4z$)i*GhVgyeN*bV-!&~3vBiDVa? zHszukLu+pNC%feETBbE4Dx=sz?2Qou`hmQA#FV7fED#?3Y=M?zb|Ekb+lKei(!YlG zA2}*#?N2Oxr%?y~_1$9i3>Rz&Jw0-Zfjma1k9CBqZu=!6yJ+i}W8{O-^sze);x)AI zOOI4#(6XvQ?%&4TOzX+A86$28_#(>RlOz3ydsG(x^%%OXDvRWX4pnU@aj2o86J9csZ|UWlL~N~-Yl)T4om@gx`s`$tSm=?-eTgO1IeCa7+KLtC&NK*t zg=~VYbl_d(sH(qf4_BwN5{KQ>PDC*R_S(5E4Q_8M*P%YA9`O3 z4XaSDX|)@rRtJ8gRnk99b9zd3QO}K+tx0YkF1@b1$mwa`B0JmTSTKKcYv?E7i@bk9 zxUfGLK5M7RGn}+;`ULV0ZJX}(q$oe*S`#kRTw7_3w~{P%cnWK5`rxCi)OKaeqU!sy|+7S&M0uSzYEwUQIWbk;s)uciBaIixo9r7x1m zwUPwRg4z&S)NBa42BHVt9~Xyj8)=ZoX(Jpp&9$dNrB3_$EwZP>51d-z`Qqhv7g$S} z-vJn9X|ZR*a86p3EEpR`vpKCcJ>hM&XTfrvHs!C8vS4kHW1DIBK!(+&J;h|fR8FmN zt31Z2ELh5^&GcsGeIyIkX#^$svYQ2u>h!9ak)~S-M>%cRb${WsudH{5BV|E`8==U& z8Ed=3l^bDB!ZUUi@_wP|qOxDKyJ4wL*`D2YFFe*wd+q(;nobKnhwc60HQb{t=Csrk z_Ix;wdzI04<&1p*j32B~xu@M;2z!1BEdNFb**fjT&^1I;?)O}=mq2}mMi)H)vX{YG zo!T-!k1B`6p_)!mBbC80R;MG`4rK_;*Xd$*f>HsUI^C8MsSJgRVVYljibEL=(~vO# zMkq{4P;P;*b>;GeRAmIDvz3IpwFwSoG>p=zI^pxETS2;o>9hwk2I4qv1b<|XG6v@B z^f1y`*r(Igg5|>P(52Hkq;U{80)qrGMdE@>hw+Va$!7Fj?ye;j4}aMjMgZ}o})~J<2sc__E+wNYj}pTn6KDNl*tfR$tbuH z{(@KwFL2xlUGZn4r-Anl&D5E>mCS%C)fy#wE0meAij%h1XF&@mZ7ycP3!K{E&6H8f zEI5nrH2`h!hr}6{+3=%IdywXU3ttvcHvqoM?=;Va;Tl4dZM-rM=5tyJ_u4wm3*ZG# z2gn;P*}4$+OrUv7i-X5CAWVue=I%-E>rW4YqJdr3Y7>0mC%REw z*9ZHSu1qOg1-QVyr~Aeo~OeCA#aNw7E{Y34o5v_0aTLZhP% z=4nLy`ONaBZfwyoq-8%i_2(uqy!LD<8o8QPLt><1z5UKX?&uJv!RAA$`!eTH;6 zZ1Vs56B@Tf^BW=b2|B`+@4z%&`JK?m@lKfI5%`0y%N1JeN1*RgElh>6#eNh9>U2$P zvA+w|I=w2j*pI;yod(G*_T#XXleV0LC&E&kfE~JNG9)^}btl6tPr{#c%eQfLpM=w# zv`29gu5oJTkKz;*E@OpikKz=(w4BjOxEmkusUUp7u{~mTVTR*WuP1{_IH&8_gE<9V z8WC{kqGkVp7L+}hQ(>i@f`MGu4CjS%v>eJw8}EBzmhVCEcHML=sc^gpQ*>HGMmpYy z1v*_ZjC6d^O(#+JVOW@tV5x3-uQ1Z_QJC&De5dQ4Lfz>w-5D?kSFlku!(^etaR%Zz zX_bB)X8JL>bj#n7v5t>nxK29_o#wMJMW=TS;~k%L)1Sogj&osA&cl4&@(O9OpGRGg zrPt2DPvMxZ1YBO9LR16OX~ndMg=vQbu4{%R&|+_gT%AT3Wb0>8#7SETpF<@lZ6$QT zdY#xY*8!bPz~1DvrO*N5N|vxaBC=?Tqa$o3^yt`1=zti_lI(C#N6Wich7wi^mYTD` z!Y&fnpCHSGLy1Sl9P$2w6XG)A%i^Qhjw@m9zw=oe=lMX)7vrPPi5(E<`4YN#n{RwV zF-R+gzOHDg9e$s*m6VD!{dW5B+N5BuR3VyNRM-h_?>uR=*ji90?Swl^@0F@Vdt^YW z5go-{v5)_vBJWvFqh*}uMQM(4o%MBT z2TU38DcL6cHg~@?M|?v$EKL_D#vGTn@v*cT6Z>8ZO0A+jEkbtia8-uUB`&$jFbvxr zWL?ai@@8?Qtrq)%q+z@ zo=WhN`9*`_by2ikkWUyJ3ogj73%^w_$#04GTk_$s7)ZS=_dhLKi+_+Wid}ucR3$!` z7jL>QZi`4ZT@~{SGE8#}qoN-q?T}{ON+Kk;%S}IgIH_Qq>2;wx*Jp~C9C`Joop9V0 zG^I(Z`Ax%N;r-;*rdC*o<(_~lSxNE zGIH=TxgE-iw_=*PuC3&{_$7X!(+=aDkE2A$PR4?EmaukY9xE%OAU)!`cs4%SbXxqd z><5{?`^YL`wTa%bZcO|dX`8epw$q#=nlryL=@&wuFT~5@ zozhC_QRx|}ul%AMlK&)+3S~V04k`MO_{n)vAw>#*mJ}fbJIFJTB$UZ1`1=6%AI9Gn z{GB2^19#)^Z-ncnDWQxl*DFFL=T;lcmXYvlm<5ZWKJ-TWBM~tp9-j5>9`m9xkM114 z{;mlXxuHpa-z$dFuf8o&zinq%$yni>HcL?7c-b%SGRcTOy7b9 zzJ;4&Or*m;Ka1IFKlihKYHONPSemt|ID&k%DK&~5+8t#k|1=1X74No1k;|ktPyP?S 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