From 59f8e9ff9160f615b47067d8a69e32b2bea920a1 Mon Sep 17 00:00:00 2001 From: dominiclopez391 Date: Tue, 16 Nov 2021 13:48:02 -0800 Subject: [PATCH] issues with people standing on top of each other --- 1.3/Assemblies/RJW-Events.dll | Bin 20480 -> 20480 bytes Defs/DutyDefs/DutyDefs_Sex.xml | 3 +++ Source/JobDrivers/JobDriver_OrgySex.cs | 7 ------- Source/JobGivers/JobGiver_FindOrgyPartner.cs | 2 +- Source/LordJobs/LordJob_Joinable_Orgy.cs | 4 ++++ 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/1.3/Assemblies/RJW-Events.dll b/1.3/Assemblies/RJW-Events.dll index e635c2831ef66f68fd5782353c6cafba3b247a92..c4095992701a61aed5475549889131b09f77e8d5 100644 GIT binary patch delta 7397 zcmaJ`3wTu3wO)IlGiPSbB=b0v%p{q-Ltv80011H*o{113N-ctjAPNx-g2<2u797GP zfCv>T@t_uq8j7gkt(qI}RTQsqd9-}Rd&SmTs?{L&RttV=_4?se)BEpzCJ?Nek6CB^ z>$TTjd+oi?4DDU4y^C$%tp57Cr~lBoHJfj0?A(7Ht27xKV#{bG$~FslnK_pY;ajJe z>)E=@TOkyG)9~SBqvu8vEgnw9OkaIf&kR0?v0>(u$`Y2|<5g35D3eGnjs^#>%K+1- zT~DO7{D?>|ZqGEUv_G&c(`|n}yOH=>6$Z`k60OV(gN=l3AXG|Z_S%PPH^C*gz)W-0 z<}U>6ijW;D|8P!-i$usrJl-ITZZ=mr%0i34wuy)ki-!_h3<+^1e2aO|kuwvs(Dlev zgThO|xyYW@r=&Q_Mv^@~34++I!rC4V<1yGCUW!Mmvn*hb6@ZHu3Q`0TTLyyh5#}~C z;>=^q&8wWH&f6g^^YYm3<~ry2x)ng-=^({Xb#Pk57MAK!JbqCT6OvUam`7ROcZy?! z@6!i|7^9UfF_`LFcqJaOCJ-tuhNWzu82;%csSNYa(tFG=+!buAS>nmgkn1-gnSdNstS(mj zMo&oF26okL<~mPJjmRzhGZDIUKxwheqO=gVxxtodrJ|2*^cPO#MIZCHu+X(So7v|H z&WZ#gfzh`xqS0M~#9%dg4@jVtr?<&iEmf#}8(dW$x2Okvo2WBpD){idA_+^|oX5;2 zZ2h>iA z#fDBErvoJ6pF`XhfGv*;TKMY8=@a`@m%S_}8P76~?}T06>g(IYlOknFYs{ghkEbMX zc7KO??p(_}8A5Ej_(LEA#*h61IMAo!oc`8;=te!S;`%o6q)6Ql#s~`Aaedsc`qY7$ zm@M6&5VKEu%k6_LCicuFai4~DNbVWeKPyq^?^hzq_bX9Qt;O1?-w_u{U*$6z2W zybE(`Lt-iqwu$AHT_wB0G7O`owKfF7rV}@`{T=JCtC_)bCM+rqMCR-8{ z5?uu&t0hI#$@Y^Mh#X&DAXj5_U9(bY6SdUP?BQ!6Egjl22ak4K@hUDCuXR14Z56^U zqJX(OFeC9WW*2@0L|0-sJakQo;ds!)kAk2VY!pn1sDYFSIpqBWsd%Z7SS021G1k9B|SE9FOo=%z^V`$5K zk#fjNIhnCM;O{|LY)gz5-z~!YQiN$mnCQ|0lK38oV~>GkZbN>oIM6&6_x>-7gUvsZ z&y3~;;u+oxljyK@kK>US95HBMh$kS6KMAsKA4qJ!nVB(h{AyIZXdTh}c;;g*ie|Mo zFI};uMa)*khFXd1rD*mnYQ;MbPB$u=I=g-{o*RLC&HFQk<=_Q^@IFB~_~2Th{rJF% zD)0%KXEKTs=uP}R;1p6+fw=vkTcbirAJz7`J@hszpwTI9l|!e;>^oGA;@(%CI#oH& za-DtyiB1I$L4TYgXt{EYOQ(r^o~F}TUC>gOpeZil8`gyH>;4_8n~peK2}P$50W{jh zV&HRA&vK1=G?7H3l*FAvvQbKo*icMpbNFLJfV{>O_+WyO;2MsbEph6*6AHp%wxS*gj
  • c0*`;T|)bbEbId5`?XVqZgdFRBp2l~ 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 delta 7617 zcmaJ`3wTpiwqARmlau7+owP~Yw9rxt=@ZKPSzCD&5ETUlM5I6kia;nW3KL3Ft7w&n z^{7}a3=FIRuBF9oj2PyW^;XU+n(#$O9o^8Egg%9vW+}mV$5d!xwqQ5ovqJ2 z1EKhvgbybR4H-tXWFQeU+9nO}n#N}`R%SeCK}z^EF!Jp zN+P`=k!1|m-eqCKZGFo)Z!Obqgfu$W7-*}?y$MZ6FYh5sd<>) zwk+XXQNmSF6eNTug0UCtT8V{%j$$<=%ZC1q($P{l5)H02SzyZ}tBqs&9CoWQ&{4u} zGv+!<2CasEu!9Fp1HCv9Y$!tnUE?tux-<#UihA+L5J=6;UU5_f)}UL_L>@!2RH4!% zYYdMwG6NH)6F4e}30uEbXl?-LDW5W-0Hywvbfl!1g_`a%GThCfyD#>Y1H;-#To!3He&OZ;o|U!rHp9A3j)px*vA211A;|7y~&APtn!9oM!Gj| z$!3uRkHNjV>IW>&5M~tdF-0nmc`jgV3#1V&sp5V;V$r2r8!i@Sn@}RDpDIUOR2t3R zkY?H$+r6RqFLfDxvCBXE8}k#TnTpIUGh&FmeKKPc%>>7aJ_DeOJ^&!jV?t|O9+mihAH4+=D@YUNfsnJgK-OX^k;d zc5`PO_sY+h_nK{*CtZl09D5Xy5$1#$=-7N;bay&?4r0^L-~^159h#7m6)VoR$>x!z5jeE=l1s zWl2h!vLunSSXD4Gm!w#9@-UT`os2IpyQ>gg$7LtV*d#z+b~7L?Dr=aDM?$>0;NtU| zS1FdQLTeBxWaI^>#kXU0kzWIJC5p2}*OX|55bXe9Em$bzELMZgVzSA*6H>x4E;r7# zcw)dlQg|$k7~Kr3)z$}6au$y=WpbG*(Vgh0EArlq4MThNM7(jObt^&RY|s&}th_-d zO~xo|z-yG25N`@8@x)HUMI|l}c z5_6S5y>V6Dip33Lv?bV3({M56UpJlBMdam1`PJ7=#@R(1!T-ZZ&lr%C12z{Q@x)C; zPve75GzgyzV}3?{T-<#`&)bC*RiL2toLi$|61%h$ZV#oQqeh=;57~4&V0~QGXovT- zU8fngAGuDSL84QIP2gQlftM?-4xOs`3QZ@kL*N35BORje7)|s&8+crG)2FuVxPlkV zG@mH3ZL#xrBEu!6xME%su{-R%} zqgD}ejUsx@VItUaBtNz-pInweCKIoIh+RgB|F zuWxT8`s)as+pxLK>|M7`jFad?LkAXy3 zZ(NS`x3bh{{bEe-djw8*2+Wk7r^=AatwK^H$Mm)gaHU;@`5(CU(~TI0PP3r((^REN3~V--*iT;i#9!@g26Mr$m&UlNy$^zUCEM$)_HF~q5-d)A z(NR#bMZM%fh{<5RWr(kJ5yCt3v9+vP`mO zSm&S?!%}oknkZTPb*T){Rixy3X&nZdLz#4aO2;tGPSIu4917CBKnDxbsK829V57=t zfOj7f*`!Tij4J(WAbC-lz%**~tV6puTZ3iX=t%(QD*4I<%lIXx37Gb0cK|;@2S$Zl z;Lka|8}f9v5%?A?htYd{3sOlZ0|9oiQyA-ee4CW)RHx-)jMSEKzx!#}FT8}sZ@q+W zl0+T(dc zwb3rg4$?iIH&r`zrS!AYtH#$k>D9u{PM@dP>GXYyosL&C5zX|WQ<`MWbf5hlEbbMO zArs^3Uc=*Qybq@OP|{+dWXFC~a_MTE5 zG^Ri@IYu{4lFYPp)6x{3hZ;?tEj{l0R`t-vB;8{<5B6A+6-wQ!N%o4=y)Bt2<5KRS zF zu)pnlC$45vg-O}JdxhzQq%z$<2y9wX*X;^fGRa7?%iR;9dsH$rwM=?UvKEX=g!p}u zl`+BIPO|@$?6V{rg2|3&(zi*v1~ilG;?0R#=w8XPlWaR~yiB?=$==7h$fT7?wi~-P zla3`BNy`p=brW7XrI-Clc2Mdn@hwj1J`yZWX{9D*(&-CHcC|D;ESVS~Lx@i$GfSF9 zr;<#RG>Zn63oo*yY8H($nXG6QRV8(zqFFRGsS_2=qWG316(!B0t&*7mv*`JxPRwDL zexGC_V3>Lhxfn1^{Y)kUhN(2E69L0CBB>Jr!xT$05id+FaY@ayCQMr-GiNkR4@=fU zy~u}-*+WG@Qpa zQ*TX}Zc4$_ZmxilonH|b)9)j3a%KYYItKJoxsqMxwo6&trwMTRDH$S<33E-93nnq}jQ^_Xt zM=gDjRyz*La(=CM0=tGQ_DO6u|BF5ic$4EgHlJ_y-@xj5wmvTor#ZN;*Ye4#4o5B8 z{j7?ONZZOLvpQP`+sWoxJ6JRSo1(K;K0w>S+IYM73D(XH%d>1J|AYSw?dE6H=h+aM zXeY1IUSpm73IB0;TcVt0KK3pDh8^Hn`@UzL^p#EJV`Oy?@NvF09zV>dC^>w*?0l4; z_m1Wx&Eh~llea;>l-E;*V?F+xWrstno6vZn2@+b;%r(-jr1JOx?9*PR>-g6HT-72 znm@w#@q^r=c$IYJI^|vEBSljkYL4o}aqPqUY5;GkY4Y1i<_KSZ9N)jS;D;6}mF<19 zy~0-x$umA2P4u&E1%qh4DZhcgP_ii68pb)SYQ|hBdm_{Eh!B+_% zEj1PvE}r>3Kh7gcr!qrT6S%Z4`5PmCbxn~hQ2XO+h`2`-I@#;T8dFt|>qlHV;(J@q z-mI&H69;p69V=lmhuVs^qbAXrF_9*F!~rV@9lGinTFXx2$65 zJmWyg0A4=C_@w0Ju3e=+Fn!wm#w8P0)Lt2_HMS4v-*sd_Ik!!TE*O9FqN^9}>Mmz$ zb+j>RbPw9o_3YpZrdQS0PFr>J-cTTZJ+mvyxY5LMCEFp zX|r0mll!Zh(!kxprd{=$R+6G$xA2vH%S^xk5 diff --git a/Defs/DutyDefs/DutyDefs_Sex.xml b/Defs/DutyDefs/DutyDefs_Sex.xml index c6048b3..dc8fbd6 100644 --- a/Defs/DutyDefs/DutyDefs_Sex.xml +++ b/Defs/DutyDefs/DutyDefs_Sex.xml @@ -22,6 +22,9 @@ 0.40
  • +
  • + 200~250 +
  • diff --git a/Source/JobDrivers/JobDriver_OrgySex.cs b/Source/JobDrivers/JobDriver_OrgySex.cs index a19f844..053e15b 100644 --- a/Source/JobDrivers/JobDriver_OrgySex.cs +++ b/Source/JobDrivers/JobDriver_OrgySex.cs @@ -30,14 +30,7 @@ namespace RJW_Events this.FailOn(() => this.Partner.IsFighting()); this.FailOn(() => this.pawn.Drafted); this.FailOn(() => this.Partner.Drafted); - var t = Toils_Goto.GotoThing(this.iTarget, PathEndMode.ClosestTouch); - t.AddPreInitAction(() => - { - Job newJob = JobMaker.MakeJob(JobDefOf.Wait); - Partner.jobs.StartJob(newJob, JobCondition.InterruptForced); - }); - yield return t; yield return new Toil { defaultCompleteMode = ToilCompleteMode.Delay, diff --git a/Source/JobGivers/JobGiver_FindOrgyPartner.cs b/Source/JobGivers/JobGiver_FindOrgyPartner.cs index ad9ae06..79e353b 100644 --- a/Source/JobGivers/JobGiver_FindOrgyPartner.cs +++ b/Source/JobGivers/JobGiver_FindOrgyPartner.cs @@ -96,7 +96,7 @@ namespace RJW_Events if(!(p.jobs.curDriver is JobDriver_Sex)) { //higher chance if person is doing nothing - chance *= 3f; + chance *= 7f; } return chance; diff --git a/Source/LordJobs/LordJob_Joinable_Orgy.cs b/Source/LordJobs/LordJob_Joinable_Orgy.cs index 40f1d97..e4248e0 100644 --- a/Source/LordJobs/LordJob_Joinable_Orgy.cs +++ b/Source/LordJobs/LordJob_Joinable_Orgy.cs @@ -48,6 +48,10 @@ namespace RJW_Events { } + public override void ExposeData() + { + Scribe_Collections.Look(ref this.participants, "orgyParticipants", LookMode.Reference, Array.Empty()); + } public override float VoluntaryJoinPriorityFor(Pawn p)