From a023c884d3f6da0755e6858808b63c99dd0adc62 Mon Sep 17 00:00:00 2001 From: lutepickle <28810-lutepickle@users.noreply.gitgud.io> Date: Thu, 13 Apr 2023 21:06:32 -0700 Subject: [PATCH] Fix cum not diminishing --- 1.4/Assemblies/RJW_Menstruation.dll | Bin 211456 -> 211456 bytes .../RJW_Menstruation/RJW_Menstruation/Cum.cs | 6 +++--- .../HediffComps/HediffComp_Menstruation.cs | 7 ++++--- .../RJW_Menstruation/Utility.cs | 2 +- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/1.4/Assemblies/RJW_Menstruation.dll b/1.4/Assemblies/RJW_Menstruation.dll index 3d3fb8878763ce97f133ad74de0624bcd845c260..748fca6a49b2be5cd259664ebc8d9b9c6eb1f54f 100644 GIT binary patch delta 8606 zcmY+~dwh)7x(D#}Jd;Ugav>2kk+=o9Ofv5~L`mJEmCB8}MNm{ELrCn1OEikUNhjhG zyF~18s=FMe)l;=;Xhu1wdgMsj9?9tE(?7nS-}A0#t@W;% z_nmx{-1RTH>%VTL*NmUHZm(PujuB%j|05GlRslqruZ%LWgsScsS2YQuAiAm)j3Cn( z6BGZX@c)sS*`S&r+}yQSegqpD{_^DL<&61G@{M4uB=ODejCpy@9S_W#(weWkZ`=+! zRkM$t?|y<`-_9pmGcn&_3r2fXMgPFZhzqD1Ro|;^J|(ZJ;j0$bmqAq3gZf%O27zJ% zU$e%&HJ>-UIW91q57>sWAlch%l6hllI83g6KOBC|#V<^?>&xKNVB^Y9yo!~xZ&oJQ zN5j%q{OZ%Y=mAgv#0GwO^PrVYE~o444jV0!$>ONk!ij zm345pNatClR5@Fil5C#<+ezVz#C7*cFOC(JyKaf=%2W2NI#qyMF}UCK=wEcFZNQz@?}s&Y_7aR_gZz*z?x*K2T6 zs+^_toN1p1H@SHKI+)QD*mQUx!!p)i>LKaIiURv|cud;x0nv!H&Y^SyyA6FjkO<0W+7{ zXMmGr$^XJM6P7B4m}daXgLRczQ$zaqrdm$XB%D9R>_IWVSUoO{>4U1ryq-glx_97@!q0EY* zgtEAb=lKDp~(mhICm5wzet@nc{6T zV1QI*h#@wy1d1t)uee|@f$+emEw0*K;BL|X*;l}(AdywF_3O`vuY$W$V%iVw74T*| zm4$XaAO1G%kg8^);X2r_GI`S~;S^PZ!AmRQ9`SUS^Wjy{CAf8_e*sNO-R)|~rYyd~ ztW|@vMgH1GSla&Sv_rIaV2@NK8y4$ozZo7=CML550z1fw^2r!FY=woA)hx1iS8Xe7 zZBdlA4Nj33@N7FUessj$UeG&A`vCfqp6_kfc0yK*`e`4-S|!WB*|)Xd4PTP7r0$Rw z+P4`z?Dd=+)Do(R(g~#7vUC;cgw#ROL8)I!A4zo$QKJly%8*jKwi`YT6?CTV|zPD=9V?SY7Alt7g)#OAi$1I?t*Qq#3Pury4yh_Z!x z?S(SZyi}d-h0Ua1{onTA3rCb>hrI@T+rqbF_QE42KDV*jr!XkIb!s(`DfJWd;M=zk zN>yeN4fnw+l4!UOwvt4{ebAsJ8}5TsEqXg<9~l3XRD*Ok(?T5jnwNj%<(|E)EFr8#C9%J4Q3zT3~v6)|2M2g`03_daxE!#7WS!!XQ z5)&(|g%Mp^CsPa4r0OhUGPN*E>L?R~*1`pkN;mvKnHa?lUR}i~M=clmy?4Vb()FxU zT=Tjbtt}2fnGCDhzb8ir9)QiHqE69)pTno5ew`<22ceGiujuH&LvWEaVf+xU{{*jY zVoY`PzJvywP>AnWcRR;jv1E?enxc*cJ=o`B%+u2N!F9hi_%5E<6E&ajLYcYpHeu z>PQ`98?0Z!-4?CVPC_?LRd$T6*1m>Kr1H!y+G!}%RaTz)p>_t|BE3<#M>`94HA zmw@$A*+(OeY5#z#zDhS%xAVRX`-BYM{t{;+G*Wo2@R-&Fj()0iaLj4#M{x94TAzGb z`x(xVZg5?L!UUC>Q!Z=Q!H++n#gdNpIHdgov7~^Ev8Ed^l=R7>6rUS#M#`vWev__h z&Cqjzy72p6ziGe0L{fS5@7irBAsz0y-Sj(bBrVBE@wo>Lq_?vkYxkksKsk!#&0H`2 z0ThyAa|5^zlh)0Aj>|nrRvMOpd4hWes|#a_gmw-QQYYa7^nOWZ{2>#;voTUCdk9&S z#Z~C=5FSaDvf+_7{UHPm6W9F&zbuQ_{{_*c9lhiACy*#r9%6`B3Wmv&YEXvbC{)>G zDHn@?;X1=|k4nJx9+iOaP~`+~w+(OyX`25?9q|*=ineZ>3EiX}M$kyz3l9^&^2yN6 z*dV1Qu%}cLoaUbZ3uciXuGG2Cyeuk9+2uAO zyCv0R{mErGbqn5CgwBga_=LiJWkb0v!^MS7@MBIMuS_S^Ix~4TPD-`6U?F9qy%l$n zM0+bXB)7J=;uR^;-f8GoY*v)*t$2q*(cX%WC=>0in3$p_BidUrSxU9HqLVVw-WRu$ zM0;O6l-k`HU;LRu(cTwtQ6}2^VtiU_dtV$VrEZfiCQGT?2j2YD^j1Mtrzlf`XogIh@L0^GK?c#t&IToE3K z=cH7_AiPZ3|5%%2g79WbW@hcsKV3~*>`X8wk;KjfqmeM8b!&ogtW=YAm1}rhFutlJ zcP1F8QzmvM80Sz{ma{|;#=nuojS0qDDYY}fctlD~G#HObxmYs)j0EEa!=to4{^U{G z9)F|KOmN%UqyI=TQ8j1>43ScUcED~@F8&L$Ii>?@9+e$&fJbFVe5s{!x!w`eMjB#J zF^ri#hfW!)4^RlsB8iO(!COk!eQ&MNL-0Oj;u8~sPo8FcXF|~OirVgvve)yxO#)M*nlsdDacuGm$m{2@NnYb~b*hrZ;vZ2^x zjGBySABwS3Y7axPKNo-gsZ9*UL>a1048=4lm36|gl%-qw>mtr*$;@0OQfd)l7&uln z6pIMMrQ=!`5r&&csX@TAeL@ERPFly`{=@L344bSA%ih()@SKudVHkc-nOI>MUZbqY zxs6x$&uCp?7$!=o6^3EDlv+d>j+1h+-@SJ6>*h-tDh$UrDC}sh(Zg}Q$Az8o9m@Oy z59pn-j^y9&fZhdvBmJGLD~600lTl-K!){V8RuFJN?}iB;S$7<&GJ{RG9M-$z`&9a{ zZM`0W4J0k#u-*e>GsU1T_G3`J-V;Yji56zo3ujBI&5y)6B(eFCcv{Jt|JGM}BwnOU z9N9?xfigpEX(TpN_*(WEUaC)M-O@N@%Rl@9)UZ0JYFYNny%_bU%XBHj<4c*eBg0mKZHr@=&cN>*ZW~8DLoKa ze~gn-6YYj#S#L~MkHas z$t}-6U@zkk3M1Q{jd&U7NU50)$6}9RhGPj;uJdb-8IBuBD}tJ1l5wX;WeV=0EWxU? z6ud<0#ZOQQ7EY1RKQU7?=jth9rs}&a71xl&cUdY{O_iB7*%j_c#m!3c>5z)sC=*|0 zskn=>p*az}@+L_<|5EXul9|}M6aUw8~@V>=VW||O3zzL?UQkuM>Yj>DLc-yDOl=} zO~qA|t+1Bbr{YGB>^0m%*&?33hM!O-fB#Lx{S?l!_Hj(ZBOVuK;W5fS<5?D-Z^_JT zI^LC1Cny`Uvc)3Q3ChM@IYR0uS2i9ciFcoDY?NxUK5vwnytDC|qCC&pc#}eLyt45= zWqq9!9N9R~salBRm5sxs)OqIZDHHGcIruI~9OoQlGg~KXm~Lin4tU z#!x8Q=U`vT9%W}aa`1JMXrF_Ilscq2xI)UsHt;X&9IS82%v@LKIx#gTcFS$qCxdg) ztk$_XaiWxZ({*B&lAM|ob14&3b7CQ7;!W3yH6$@LCmxhipC%{POR0%E@uZY^(RJGl zCpLMM&cI(iN@w8jEv3ydGw?B~$+tOXCYoo9X{#2w7$l`y`WfcqD<^e9)3&`JClbs zQtHg)p>c{racA<;e@@Gt;W{<9wS7J|OR4txcvnfb&&P+9iT3&ERj5W0?ej62B--cW zC@HmT`8e5-RNI!1IZ`ebWOm!~akWS39IW=JoP+OCr5FFjHwQmx$;|9ecvwp9XaPPV zi5)G#kom1kD!{(;4LMWsmk7N82g$HWuBiZrDOtsu3UCBvVoe3OmL%3xfE%UMA_{Pe zl#5-r%yJZ9t(02tTs-1YITw%3m(M>J^YfbPn2TpT!a}^%GEBW*h_(e{qH36V*iT9| zoQFfCTrA1tw#~y=NlX0Pw)wb-G>(7EF2MDq`9W^mLfp;8fB(7IWiPj_2oF=(!QX9L zgx`=BcrSLmj`v9;S&5?<*+MZH7h4Xi9E;IHn#f0a13Qr#c>5(7NBWSDvJ_KDTl^P0 zmZ4L~;KSVDkB2vL5ry*^|5V~ilGE31E5Yrgd;Akyil31>^A>MmgOu6}7oMVQp5=h< z!h574{0CSW`WK05tIFlrUWz~eqWLermB^{E8?y)JD1Sc2wX_e;EJX#}{6D|8nCy*Q{S>)kZhsBMtm(d$l!fiRd_b@90B( zRs3HeFjm9=4YR~pDb%5G7eNBIuuxIbupaj!RsC4-JKY4#{^Z)<= delta 8575 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 D()3-> diff --git a/1.4/source/RJW_Menstruation/RJW_Menstruation/Cum.cs b/1.4/source/RJW_Menstruation/RJW_Menstruation/Cum.cs index a51bdc9..d7a424c 100644 --- a/1.4/source/RJW_Menstruation/RJW_Menstruation/Cum.cs +++ b/1.4/source/RJW_Menstruation/RJW_Menstruation/Cum.cs @@ -174,7 +174,7 @@ namespace RJW_Menstruation } - public void MakeThinner(int speed) + public void MakeThinner(float speed) { cumthickness = cumthickness.LerpMultiple(DecayResist, 0.3f, speed); } @@ -205,8 +205,8 @@ namespace RJW_Menstruation { // comp is used for Hydrogen's RJW Muscle Injury float totalleak = volume; - float decayPerInterval = 1 - Mathf.Pow(1 - Configurations.CumDecayRatio, comp.TickInterval / GenDate.TicksPerHour); - float fertilityDecayPerInterval = 1 - Mathf.Pow(Configurations.CumFertilityDecayRatio, comp.TickInterval / GenDate.TicksPerHour); + float decayPerInterval = 1 - Mathf.Pow(1 - Configurations.CumDecayRatio, (float)comp.TickInterval / GenDate.TicksPerHour); + float fertilityDecayPerInterval = 1 - Mathf.Pow(Configurations.CumFertilityDecayRatio, (float)comp.TickInterval / GenDate.TicksPerHour); volume *= Math.Max(0, 1 - decayPerInterval * (1 - DecayResist) * leakfactor); fertility *= Math.Max(0, 1 - (fertilityDecayPerInterval * (1 - DecayResist) + antisperm)); CutMinor(); diff --git a/1.4/source/RJW_Menstruation/RJW_Menstruation/HediffComps/HediffComp_Menstruation.cs b/1.4/source/RJW_Menstruation/RJW_Menstruation/HediffComps/HediffComp_Menstruation.cs index 7024462..6580ce6 100644 --- a/1.4/source/RJW_Menstruation/RJW_Menstruation/HediffComps/HediffComp_Menstruation.cs +++ b/1.4/source/RJW_Menstruation/RJW_Menstruation/HediffComps/HediffComp_Menstruation.cs @@ -1025,15 +1025,16 @@ namespace RJW_Menstruation if (Pawn.CurJobDef == xxx.knotted) leakfactor = 0f; foreach (Cum cum in cums) { - cum.CumEffects(Pawn); + if (Rand.Chance((float)TickInterval / GenDate.TicksPerHour)) cum.CumEffects(Pawn); float vd = cum.DismishNatural(leakfactor, this, antisperm); - cum.MakeThinner(Configurations.CycleAcceleration); + cum.MakeThinner((float)Configurations.CycleAcceleration * TickInterval / GenDate.TicksPerHour); totalleak += AbsorbCum(vd, absorber); string tmp = "FilthLabelWithSource".Translate(cum.FilthDef.label, cum.pawn?.LabelShort ?? "Unknown", 1.ToString()); filthlabels.Add(tmp.Replace(" x1", "")); } int postCumAmount = Mathf.CeilToInt(TotalCum); - for (int i = 0; i < postCumAmount - preCumAmount; i++) // Emit a filth every time the integer cum amount drops + int totalFilth = preCumAmount - postCumAmount; + for (int i = 0; i < totalFilth; i++) // Emit a filth every time the integer cum amount drops { if (cums.Count > 1) MakeCumFilthMixture(totalleak, filthlabels); else if (cums.Count == 1) MakeCumFilth(cums.First(), totalleak); diff --git a/1.4/source/RJW_Menstruation/RJW_Menstruation/Utility.cs b/1.4/source/RJW_Menstruation/RJW_Menstruation/Utility.cs index 13aae6e..815d8ab 100644 --- a/1.4/source/RJW_Menstruation/RJW_Menstruation/Utility.cs +++ b/1.4/source/RJW_Menstruation/RJW_Menstruation/Utility.cs @@ -433,7 +433,7 @@ namespace RJW_Menstruation } - public static float LerpMultiple(this float a, float b, float t, int num) + public static float LerpMultiple(this float a, float b, float t, float num) { float tmult = Mathf.Pow(1 - t, num); return tmult * a + (1 - tmult) * b;