From 71f3ba9585f89839bcfa738f5fb44433e0d244bd Mon Sep 17 00:00:00 2001 From: lutepickle <28810-lutepickle@users.noreply.gitgud.io> Date: Wed, 27 Apr 2022 22:13:50 -0700 Subject: [PATCH] Animals will prefer partners in estrus --- 1.3/Assemblies/RJW_Menstruation.dll | Bin 151552 -> 151552 bytes .../RJW_Menstruation/Patch/RJW_Patch.cs | 6 ++++++ 2 files changed, 6 insertions(+) diff --git a/1.3/Assemblies/RJW_Menstruation.dll b/1.3/Assemblies/RJW_Menstruation.dll index bb410bf5a465adde88bb037dea372d59a7acb15b..321d8ad8c399ca0276971e19b163cd9471d4e7a3 100644 GIT binary patch delta 4516 zcmY+|3slrq9tZII{lg41PzsddgYkbyXt7oE#Vb+KG(jPfRBSg*Ghe$&RUFSUsuvkd zer1bqgW1@g#u(%A6S14rFU7C&2FjmO@XPAe!Q|@FpsV`N!H9&gL3_X=hq%Jy2K526 z54kf;{8VX(Uqu>fNL^;*nPAp3EBt~SUd0CY?u_k+!Adpk*nLCHcx33T&%voH3>ONt z*d3zMg*Bwhy*gt}>%SF z4$QcywMK=7q$iYilipN1LprMzeo2n2Qs*=R^Dj$nbgZ9jiaDRsVqs|u%n>+5>NoTW zb0pro%w+$KeZHCkHVS8TNa~={>jPSQjKa<4?+9oLLa#`jUn#P1JJajy0X>$kk$UOX)bOWa-0C#|ISZf!9fT z(y9NH4R2OHq|{2&6lpnr7O!?X&XJs1Z#u*#LdM;TYf3dNIrgOUUPOH*=d7{VSl3DC zXbjY3e;NA=BLlfg`hv=Y2b5smJADno zwo89CXP}w1YP#2)i3_A_GxtOlVEB)ET_6f$MSP-q3nqXaSCpt_Uqee+CiOuq}OUd=WB8 z-Z54bUyNzQFK5O(7UL4Bc6?911oNN=ruOf{e~UWOr|~8)#Ji+1{T?x%#syNs*m%cs z*bO;OzZ6A?Q>t;)xWuGc}#HnfOM4>h<=j(H4^R+lf*=OQyxEBAQEcUTfp$^KXX3ytqEewv3?b~r^ z$^#-CrKESU7MV(Vhij3g~rA z!zkt+ScepKi&8XG7~=pd#p!O@N0epQ*7H*QOGz(u13E)0H^44N%M-oCiune(NTo(0 z--x?NC&eb7#ZXI8x8H;m3S%5)d=nlZq>J|axN4*+>0N9?CS~r(X1)!- zAsvir<}aX@^yqEPyauO2#%;%klzkl0%(vqUshiKgT6|04VA}~^i|J8%F)@*4{6(xJ zy&Z9azl6_7FGrQ}9k`*Sm$nlTx5;rg)lJZyQWtMZo zyjEU^ewvUsj5@frobrZIhar^xE&F{@xr`+57j;;nB=>6*s-jHZpuE^dk`29hP(1a; zVpKmbW@*8a4ZV1jLfO!ZB^1hrUhF5yhF&x(=>zuSsFFBC@s9E0gRaab)IsCqV(Kv? zTAzhnOg$=Mq}H(qEOABFBS7ThwX8>rQoHl)yia&N-qTViQ;##0$%WSAJY`Q#`Manb z9IIQ%h1O$~l3r*%=6A^^vPvcSK}@{=8xVPi9H`&14d|_;2R2}Ul81d0*1;QacULC< z5WyrR{rdV)LXtc5;oCcDhhl?1MD|ikbKaO6YxoeWCAVaWurGyjPd+44_(JwK+=s;^ zxhEf%De0y8utLehE{ntWp-D+^!iTrIRi38GUE=xY!xvqdjah#{cyE1d@^$iKJW1}t zkLI{ryYS;5-9CV8TB>~jKT{^#2N2$0HXr;;|@%dsu zKDUT(+Y9&sbdpv(3-}+=FJA7#!=^+P@PkMt<%SjTSCB*M5#GQL;c3#U@B;oSHj}Q4 zSNkw(NsZ#;O(TwwmWDO(BWR0P&p!|A8_~dD!&M6J6Vtp7hfB9VBGiOL(jB$}-i+}| z`VikhHf26>w|oNyq^~0?`Jb>rNuR}0JQXtTC|0`E^UuS^v;OX**h&K(Ml(N#mq?ew z-R?JWfK(gdb|1%aQqVcbeFE<)=?m&4E-L9aWe^=Cc|8U3?f`XNI8){ha|dxoNId`A z)g=_fISS<^6vPEBoXQ$4N{5;Hf|8d|5NS%fVG#M0$qTpzGf1*w3sU&4hAkMYrTVpC zl2jjYN0tp+kV~O#*n%BRTPI-QM?GtDNBVm{`^uC(!N)#Xy}6?)te0{B$X+SmWv>&L zhWLL7V~yhbfcU@3f$ej$jD+Yym+#yr*Q;5F_eal<$a|)3du5ifJN8-nCyE^8l|S<; fcW+cTJ)CW9L{pEc#!q3!k<_M`JmVWw4UhOg+}i;$ delta 4501 zcmY+|4OCQR8VB(Af5(9tNd-(H9lY-diF>p{C7Are)D;xvNG7^RTxtE>)OFppO;_?F zg9>U0Qs6fX#4>)YnV8UO3Fx6tden7I%W4Zv%xdenYa6bK`+hv)z&RZG`G4N~+~?kR z?&XkE;moOU7Ug&OWa!B|#hYEoE#5l=Pn7_%_VM!#<|%O-gG+veSmc+ig%vh;fx+Zg ziug8|ovo-1Gv=Of%vAr$Sjqavcz6FUwupg62J1RF(lFBcGnSKN>oRaESdjRckDWEM z7EQ^^tczdBMa67T@AmLMxT{pkj*lH|x)AcE$|4U=dfAA=04>&2R7PP6>3XmBa1$$( z^g1{4bf(tzM?Ga*7bKbe@f|5QdV(2^NUMd3uTqv9on}6c6w)~n#$siM(#&7r0I4|o zd2(FfTNrYWhM{&&J`?GgD}_Y=_2S%CnNOo$hfJPZ0xl@E;%E=BMBLMvYM2Q7*AE*eqAy7{OvE@X)i4pM z9SU+KV!4t&rUzwG7ESL#xeA+|Lzcua58fipS2{_0Vqi_E2Op6}%m}i1a6=2TXF#mG zNs3eIc~hQfvt#lo)9Hari^-8Z*ra6Xi|@f63iZMdNcy0CzESh4nLOyP)J%sNujRNa z?zRVhk~8^ThZrJY-7`3)RLbJR8=TMJQ!R^)ifV8U$G<83Xw(2>1YF!0zbEyoH~cGcb~L+Df=)&cvm=I-I`XJ98F(B25s=M9j}RJD7gUoQ;+Dw6de_ zm~*hQU2E6Sc~NuWy03LcXdd!NtwQthEvfJ^J70hh22ondd?T$8z7U*vbGpm15JyPc z#`NHe5C>hF&^MC5h~Ja0xJ*tcjN>a&sH8XWDwHbeqpU(@r)-~+ zR~$8iuR=3vq>;g`KjSKKCo=eIw3C*JFdKb>P5m0D2j23rFU>HNGHp$aYM z(K(rX4g8dSDn5p5@Fr#9FC+-nQ#L8(H++qSyTn5ir-;xNEF0=6)}V)yo^TB!l)P+{ zZK-HslG1`#a0??z(QGNt!FWB&k9(W54&i~n3sh) z3V1%ENNHWc3J|BHPqY9Y$}Dj*1(+I;ZN$t@%A(50#lIV|p;NZSVLiCNGAyIgHn9gb z;yooj;YNJeY2gK`9D>z+BW{wG1{Lv5xD~K&Gwubf+YGx?4>*UF^38~ILcD+I4e%;F z6i&16=C2|}Nw+V=^GbU9LS$0qR8;XoY!0a0f^7knTTnrjbFq(aK{IJ{&^}&-kA*~k zFFTF5crkvWFv6A|u@(18*Mia`N)Rk=!GjZh4Ly{+%-yw~zlLW>2Se)l>sUnk^&|DX z6lDSH%1}<(#o&5ghB~PS@4szmpm31=1mA|}5PhM-x)$*5NFkjHKEZcjKWR@$0pE#p zO8Uy|!sSl-f+|OJO^?`xZjU@1VmEpzSzh)*NP5I>j0*_&AXUlBO6)~^59S7Bfp0V+9~c$5rR9_l zj0*fr*(WJyL}gNUwGi@oQGsM7IlW!z1jbYyn+1|IFHXOa_EV=75bSdE59 zX+kkzHLfVNIPcF1H>z<}OO9lT@FsL))l*u7#aGbKJiS45DK1mKygWyPcOuc1mEW{}4_I_lMWP3j<`aEp!$8jay z-j7pSs=XhlDU3x#iLX8MEA53o-ax3YEO^6}MhE1^ZhYg$1O-uD_!lP1=;)yI9Ho--qY}kawbtj(1 z{D1T~H~9UwTNmF{x?#PHUk>dxpzz4w#bywH`(UhAd}oWlkz|*>nruXe zz7%pc=AX5gaQMK{!zCv#A1!N0Hp;_i&>u|XqUG{uUhM9Txpny|#(I>UPch=^x=%9x RXEX8=>cY~DA5a_@{C}9T1jYaW diff --git a/1.3/source/RJW_Menstruation/RJW_Menstruation/Patch/RJW_Patch.cs b/1.3/source/RJW_Menstruation/RJW_Menstruation/Patch/RJW_Patch.cs index 6e20029..ef7199b 100644 --- a/1.3/source/RJW_Menstruation/RJW_Menstruation/Patch/RJW_Patch.cs +++ b/1.3/source/RJW_Menstruation/RJW_Menstruation/Patch/RJW_Patch.cs @@ -168,6 +168,8 @@ namespace RJW_Menstruation } public static void Postfix(ref float __result, Pawn fucker, Pawn fucked) { + if (__result <= 0) return; + if (HediffComp_Menstruation.IsInEstrus(fucker, true) && PregnancyHelper.CanImpregnate(fucked, fucker)) { __result *= (1f + GetNetFertility(fucker, fucked) / 4); @@ -176,6 +178,10 @@ namespace RJW_Menstruation { __result *= (1f + GetNetFertility(fucker, fucked) / 40); } + else if(xxx.is_animal(fucker) && HediffComp_Menstruation.IsInEstrus(fucked, true) && PregnancyHelper.CanImpregnate(fucker, fucked)) + { + __result *= 1.25f; + } } }