From 9a90026f80572241ac95a9625f333c8682dac2c3 Mon Sep 17 00:00:00 2001 From: Vegapnk Date: Thu, 6 Apr 2023 08:24:00 +0200 Subject: [PATCH] Changed youth fountain checks to fix #26 and fix #28. --- Common/Assemblies/Rjw-Genes.dll | Bin 107008 -> 107008 bytes Source/Genes/Special/Patch_AgeDrain.cs | 13 +++++-------- Source/Genes/Special/Patch_Youth_Fountain.cs | 16 ++++------------ 3 files changed, 9 insertions(+), 20 deletions(-) diff --git a/Common/Assemblies/Rjw-Genes.dll b/Common/Assemblies/Rjw-Genes.dll index db8c46a747021b90ab2a5a01e1a4115c5891eec2..219605fb6d040a1af535525f51bb5fe8da1388ea 100644 GIT binary patch delta 13809 zcmb7r30Rfo*7jQOp4gjtb~6YF2&jRmh>8dZh=8cbpr$4`PnG5rP8*Npd{lUxfK*J& zF-dpnu}mp#urf2PwA4VHuuLs0r=$OR*1Hw>&i|eN`n#^~{oL!mpS7OpecwG`@iBez zG5xB=nxUg3OPBehQo3Uxz9SGVXeZ{Q#eDeyg8Z*H{jY!ymcIiKVnD!kK@}J)`YW?> zllV#*k2^(YO)2gYpKFfdZn0e3UM$nvi_f$v;t;)h>0*Sv&R*o}mf}0sI^8rKeqhbF zPe43uUF$GWQD75zwK`vk5G3&1`9*Ca_bo(8@5O>|K;R$ix{ThB_ zJ?1eU@wABaO2O~NRIfPvK~#JFh-a-!y)WqSCo#^y1D+R^{vAYxzr8r?A1+S#+gt5h z<}3KK7!eqSwbru0mk{f$*lMRMUb61)I75RsMR05f{7vM?hT<(ThuXJAb!;!ZBmRn= zfcLG1U6!KRK>>ZJGWTx)ZJU-#_!&yC~SpIwoTh;zn_+&zE9jpZ>VfdaIA`)4=zADZtY2{bpmf zc&YzY9AM4MF4o}?@qKi2{Zd;_W$T5soc?Zee+iPLFaDAbZxk#Da zftGgmI)ay9QNR?4pPbiBh%OW_yb$T453D(ZFk!GQ7%Y~*5RS{JV^qRy0DZfm|M%V< zQk2;pn`JfW0}F0I(@gHeLqyu}t+-hHI=lm6K!HD&S>p?iq01uLaC@yGdj+O=W(^xrt7?u0BWngb(!57y-0Bl{Zk-t?;#OonWW9y+KtJkGVT(qrFTQ4N7>GI6P?{o%i?`gY4cSu}$RE9b(Lj zd5Tr-b@s(5#m%br`tVt=y}~?sCS6pelY{K&YLdO)7w=DQ<@q6z;*a-~*owWw_B5ZbMYr``o9H4D$J7xAg%J5ikC*uogf^)y8Zespycc)^y z9-rwZad37=v==vLk3tYhb-AbN=1bK9V&xHZ>Xd_Ol#c+MM)EyT<7hP5

|6*;sEjQCC}ktYulxzinqKI$z_wb zB3fBn%8}O7%lD$Uye&yl-k0V^KNTm6$`vU%*;>0IRdJgv3wg|qCs7^gOCq+kh_3p* zrJi=vNTiX?6knHq8(%vTAb1`?pHToVL#UlI?UnH_jh!kVQ$vpcvCe8P7p7bvWFEKhnMy#B}!bsV^ z(ZwkCuIX9`LnM18Pb&EQem6I0$a~(&1m+Bx=|pSUJ0wWv3-*%j&^{7>Ns<^wb)2B8 zRnMMIaJtXqJ|;-!`b+eCe7#^vmp{!Wh!&Y^1CnHR*G?ryJ=}`aMYzHGfwD#_jo%59 z+oh&D!FTyGOBv^y+37m9dq<_Fn&5nb%(YMKS{pT_A$L!j6XXWT{iw*7Ie(#%IYApI z*?vOnsfRh<1+DKt*XCQhu6N29PW z55kG!xpMF9yuotC-}RK})j@ie@UC1Rw4uEo(p$)}bsH?#^Lm1u(Lbo|1!G(NX>JAY z_B48!z$r}j&FLsT^Y15JXp<2@=v}{C!@@xXeAiZlH6Q`CjtP zh@{h!v_}l9oQ_fAbY)K4@Ilq_>5vZe<7xcftVY!5v09`W1$7kM;EA1ldCWue3&h2E7?TwW9M>FxGA>lEE>soI0+&+ zb|bYq9*MPM)~7Q?r{GKz z_8pw#fv%)0Bo%&ypP4=3DP4eCW-sf(LgLSGsY%Bx@C%Eb46@@5xWlZ3JN^dunW;&C z2UO%bsoGs|V5VyK!J~=x5X?&B8UhBfww_kpl1e8vgy~_eEU3ZO%uX@0$0%lMQfG{1 zrWSO?9?bUfK)tY6lM=qzkF|}g`Qv~lSz6-|X6xjXxfXoTi%pUy z;0)G`H11SLq7NN^Y#HxyzSkH-XPBBMv81=ehrPw*t*rt&aA*kQmn^hNmvXOx5<7^! zTVq0dJ}=vwx=5TACJ}Naj^_3N#xBDC&8&cSsWNVgl^7B(QJ*OBo3!bkone)j`DRRX z@3i@z8mR3pF(FLir;ZY}9M6iMPj4n&Tg%9>fNQ9Mx5R}vgYk8NZw1F6e*PNjp--D@ zbX}yG*Lda^k2T52o0-=zyZESEfV&<#*;`5U#5wU+aHw{`RAXl-j+MBI+Fqaud7$%x-f`E^3vOo0_7}o) zTLi8W3ETW}gBZ3ghu-n--8PdkSoGO`nOf01lFZ$+E4>iuol*f)ZIr(F}^+5f7bKi ziaQJql*+;uJ>&G?0Z+mtTML)OmbX)#NA%KzCxk@E*aBL+zbWS5TgFDUQDZ|z=AMVn zGsx!!eo<=dbCFk_iZetdVWhRL`nZBV)?NFG5N}&U-`#@vk~sce4yFnJ{k}Lxblvak zZ%NfdHk?nE2|k4b?W%OyU`SEf4l!kaAr2L%_viQz9T=w{2;0+CCf(SWG(SYy2>ZvWB~FIT(rkpI z%s#d2nJ2X`Y%FVlWT$NGZiaaL;k)>)upZ9wznxd%z8!L>$RukasGYBQ2TXoNW&1_& zkq8=R7Gar~Nmwm56TU6JJmO33Yut9N@ukP}b2X{{Ukse3`3Nr4mnL#GTJ`Gd@)7*X z>?*z>R@OvVWVK^ZGe^xY*(We?u4JVxUXBa#{uIVBTMHk@JG*`gUFc(u99Kqp3PSbmQ;%wIzHVpU7&@`m|qILoXQ+V=?YJ_SbtrA7zLLMQAL%$YB# zOjB(>1=Ieavg@5bG@pSI8~ZrEqQ!UcD>LRMcco6MwE zy3nAV}7_q3Pb9UI%7 z8%FH*Qkir<%-2cHVVPug#^nC@%$LAJWwYr)fkaqbQi`E)_t~_I(>5M*CpRsLvqt7*1!8zqx zAY6y-w!z5hHdx@Yjmr5pK%W(j^KF1}%+&cdG@EauCgGfX|qz z^Cc}%R!}#l0lJ=MaRL0KIQulfjV9I`&8#=zFPrloId8yYaq_6Ii%CB5={EQp#eM;| zmEyrspRO%!!4E0;E3{^&R=?RSQSaZNSCihin)SW~PmBM7 z&OWzbfY^M@*ZBoo?@;P}8^(w)kNH}j#@?XV9eAZl#^0M|{2k`mdi&D`{|*&4_BOFU zV84wGK`)=XaJWg9KbvLw^Vztvz}e?d=wY#S{Eg^e@N_V9XwZMd7dGt#v3t$Z-2Wf! zy3OgP(ZhX6UG;PmkyrsU^#XbT>upRPs0T2vly6Gv74!i9Q7Svu8O!?b)jVi+q8c@M zq8`9<)rqfm^Y?iGCv8lgs0Z)^Gj&fNG#luHXA|5{Q+fdPrF1396Ea8}?(^{3()^}# z_IV^l*1pz<`}`YzVWwUsk3m-^HFZu;z|O|xoSs0SV9kjA$Fz9TY!Z!{oWv6dCnwdf z!}_jKK2Knx+7aa}p1@RQYQZPX3Ie^mQOnDMfHkWd3j#L1?=)(%AmHb!lj{N6uc3Z) zi{pZTO)ot_cPY}!6li3LL>pV7m27~G4b@9F%Ep2WlD%qUBklCWlGmzPma#V4#_9}G z+se$c0K(WhihgX61^Y9bVq>$IEnudu1z^*~N33G44&_=PhF8ceb-eiWrLFDmCGWwF znp_LS_Nvpui-9;*rMwo{Y%LIHv!<>E;uaf|Yk~Nljmfn@{M^QZXoiU6D&=6*VPmsl zD_Fu>9a`kL72NWA>>Cyrz%trHJ$9>-n!5LT9BN}Lv{DB@2H; zWpeNJ7-M7dtm`q2nK~tXvng2&IEqDeP6mwGD$}SZ*wAcFjhdX30TWdxp9BLguraxY z23*EWEoi{)HcdX%?XcFywj$F5oVMopHt!|kdQ4|W?! z&R=Xymbb${n5hTRuG#w9;S<&tz-Yxt{VZN@$@1z*jo6-x<<4d8dUt@@>Z+ud%4Eg?+Pv z4yfIwI^|k8;LzQT1s$3dY}8~y2OOn3xu64XvoX0%4p_aLpMPpW2mHz=%46b)c5gQp zbi_&3lBuV}5f?L4-}*T=E8nQe@{YJlb@E$3M?7s~vb-byL~Pj8k1~$Uj)@~)W9tHl zgt8?c^JH5^U5ae$Qp!$8y3fv+?d~09hDbsU%oa(fBWNTOPX}B6 zGY@^$PJXkW#0Q-7zoY6ju(K)t_g<>=c3ZP7bDQzMcQE^j9%sBn-!m=kRHGqJ^grXL zJm44Wo-;q9J73b!KD!eH;c86ygyDOPZylS{vsUd76wH) zEg+L3a#Yi}S0S21N29B*ZN>yN>t-apj6u3U(S-ji^v-&S)_oyP{E$UI*!rFgcK;~nkn%bedqSV3-F?p} z^L5Kb_SvX_BLh4%LAstfamr>acs@iaM5jTKnkBj~eL8B&bu+}KvuSN(GRA8P@l=ax znkDdl@GK2YGJPIJzK<=@9M_e1UaC2zyBoJsb53_!xSsRIVi9pJCP042bBL#Rj3@9F zPv8*DbN)l~73>ys&-tgz4LHLSD1pV{0owDtpqJTsUndvzzRssbmNrOtG%-#I(#>_0 zSkqggAxYv{j+Be~a}n+>(`Cei<5xL;TLk>*ZO+YnQESv6_MM>(QgSnkwXXWy%tczW zzDo4_F?j6Z{G-}v{m^!wYm>Bp=bs|1C%l6l+FiptI6ChdZOQzEE7}s6l&vLv6n;y) z8N>4aB+qTH5akXIrth{kqn*nG?R`9*?4tXX=X;lDahGTJ2quYhKgQ6pbNLN#xbqS5`vzs|$18p-V!m!{Fmw#LMK~ZpXUbOIb$+00 z(4G}R7yUy=rnfOQXnoor(VOj7r*)4meBIVI!qmWHxUZ-S`o7a!RI4Ckw<%pI5XUc0Y#Z0>n6XYt zXzyTOWY=SWn|+aHywTgMOtAdgp!u1-5L z-NOOtkoh>6^}|KK+6cqQ^h5`vu~1lQ{Vnp)PeOSaOydt#rJ4kDkwZD(Z#HY3Ta-Jv z8edP@=rG4N<`ud79HQ-d_4&%dYz)nrYK*qq+9t~`TPdTJ%vR=SKhPE8fsPj)f{cUd zplsH(bgg$NMD3s(4iUzgF}EB_P#)Q?M!7o&l`7#|7h^b{JKeF+xKs?Ri!+zx-g6vp zjOy}l!g&FTQ>oHFU#l%uMu}Z@!O3#8btu2+t;5#z1@F5wsyL_DdHlP1{Lyy1;*y=@ ze0w{|TSGrmwhp6%K1B4ZkKuLRVZ7tM#(A&t6}L*~)jX;*JgOw^hE{u>&+zz9X)3$_%lSO3 zms!1Ri!Vty?qR`FSgT^r;?6N=oeNgJ*Mv|`ddzXogWAgYQLb8^SSOBjQg(~9EB=l$e+p%L0{69nV#<{?M>&R}T)j>^ zRD5zJ!hP(ZdGw?7M@fs_Mk(?T2bqilug1Ao4JdL8GTjT8_>qQC=Oy}G^$+NmdE2e4 zX?pqtw<67}NqV|_9qsAvo@7c0Y~fy{86=injR{Q~pob#O?a+np*_fMCM)8o$W5)Z+ z#Bh38YmT_lPa$X(SFUE^KGE@7RNF^+do>N{)F%u|O-G{s;Zbgi%3SWT*(4v_(c1iw zT^@V2B}t!o>@{VJe_p#{G5SV=JGc@0LNsA8bR%pF>4Y5_;~0}Uo(cUZp2LwLj3Z$z zMJ7Ti;Z)e@n+&tT+iwfKC-(L`3IfUk>IokP09L|vU%)LC*Pwvhz+#H{S^SDQgt}$$ zYJf&3pgJ&!+ewUdjKM}>x{yLfeVGisb=JD4$!17jj%GGhVbNX7+>TNsZr)-!6{xG!Te<4DE@ zj9VCwGS)L{+}Y2V>~4`{B$EY7+^DPSyStYWm( z@JlTt^y1Wv1&qavRg5(%rb$mNV_3Nw_*y5I#!Y$hehpC*hv9Qhk*C4&n2j`w8tcWu#61A;Nz~ z)exQz`;_oe@)v~R0aA7J{DyFOhEyLVf6sWH(2i9#5B0TBsA)PiQLj9iI(vY`dl?e* zx?Cch$Y{-%#Z=7ed!5?e{eF|4Che-evalNW?)&@y+NQ6K{?pX7^SLZp>_0s}^}Y8j z-qb%d>+!RA({|(F6#59Rp%3Fr>0foA7q5Ktfk#Frl9^gs`PDjIfO|oUolzNZ3IcN!UplO_-#N zB}`Vv6J{tA3Hw--7wIKmd6{sKGKH`}nMyc9nNB!PnMpW7DI%Pr%qEmvA+tc&1tvMz$JGzo-XlXVe%L)Jy`ttN@^3^|v;WpXZotK?h)*EPw6H^{jJekJD; z_)U{ac$=I{;VwCs!e8WE3irsl6dsUsDLf+QQh2OMwa^P_yTWqt(LP7$r;Q?PsZAyf z)OI9nrHvsB(WVl%Cg%$1M9vk^nVc)23prOnH*&6k?&MqnJ;=EN63JN#eaTr0{mEGh zx!MH6d~%l3Ph~NL&uf#wQVK)KS_TDVErStcErU_oOu{i_ErW4nErSW#EW%0TTn+Qc zxf+Vexf=dKikxd;wYDGOT5_&|_2gUw720fA zV}aMnx(?nV>pIv@)^)I(M!F96kaZorL)LY$k4Cx<-X&)_93p2q942Qu)M#@EKPG26 z93y8re5%bO{G6N>@D({L;A?VLz>qfN#lJ0cXfr0pF9e0@|J>YbBf~Yb9JHYb9LL zMiX8pYb9JIE4|&)#uDBT@pn&X!-D1w6;6Lf;yP>mpASf@uE*Bv`me*>{}K9j9i}u3 z4QR$%AK17a!_e)l?H^~!?@ND|?ZDC?FT8xW#%0oN+Lg{AEc F{|6GphjRb` delta 13720 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�be8#n_**n6Zwr zk+F#p`jgV;A0$8g>rx~(GQt2(!PuX%n6XT=q)KlwV;y57V-q8!aV%pKBc!vQv5c{f zv60c%#2+w_!x)Ph%NXkz8yTB4%#cbLB(XnZF=H8H9b+S76C-4DdB!rvI>tuECL4bg zXGu{RV-q7}OG^-Af5u|QM#d(_puyY(V=-eHV;y57V-sUg4l5ap8Os>!a=J-JBaKBBOfzs>j^$lT7mh|3BJ;m5e=)hhr55?NZ)Ha=#D6c@K z9y?s3K3ifzp9_Rj85;{_F%8ELxkBTxp*INIj$a!h3v2eUA;10CF}>LNPf^?8^EtBE ze`+ocx&Of4RzEpMrB?}>zU{cRIfZ^5tMog0IsNw*C`Mj;&-Nmw5`PKl-^jpQm_gWp znS>WGoA46m5Z=O}guh`f;eE^_{1XcZU6m1p?#f8Q0A(~`pz<(b7iAn_H>HHIr!s*s zPI-iIfbu9|nlhO%TbW9jV^gNn#|UL6;YejRVTm$_aDwtU;bdhV;Z&uR@G)gR;ap`Q z%!2`HH^MYEhH#J?OPHnhBpj^95e`w~35Tf(Pzn=CSqhU#Sqf7~SqjrgSqd{qSqigM zTReR{M$!uSCrK;dQ<7G|=V~(Hmn5x#uSi+}$J7+U*VJ^vUr4zeekJ8{xJ}CCaEFx3;T|cM!ylwvPH%wHZSEZ}G>Cy=!Nx2ewlX4~WA>~SVh?Fa#FDX|-KT@uQ{-j(914vl~!$?^L z!%0~Mg}P+IB2retC{ohD5YVN7tqR7HbQO#z=_;5=(p4}?mreLLlCFX&BwYp5bUB1G zNVyuyNVyuGBIRmWLgiP(Qc|vlWu#mU%c=Zoc!rc~;CWK6fmNhj18a3d3D=Qw4Xh{S z8hAmM3u|n!k)+k|GD)jp2T7~pb?USl-XLi;yh+k(*iD^Q!`q~+fe%Po1C6Atfe&?g zga=7k10R#J2L7olApDe+>)~@!u7@v4xgNeE<$5?q%Jp!Zl3R=p0;$=vYDb2#4U(5rWJY(lSu zxavhU*r__P8uS0n^nNv_{hKLf9d>PRYN%X?5$HzmHm}+LV=DQc)BH~L2Q}!6_Zm*t WV1Uv diff --git a/Source/Genes/Special/Patch_AgeDrain.cs b/Source/Genes/Special/Patch_AgeDrain.cs index fce28db..4138a78 100644 --- a/Source/Genes/Special/Patch_AgeDrain.cs +++ b/Source/Genes/Special/Patch_AgeDrain.cs @@ -14,18 +14,14 @@ namespace RJW_Genes.Genes.Special /** * Update Issue #26: * There are options that a 16 yo pawn and a 16 yo pawn have sex, - * or there are races that have a different age-limits. - * I don't want to account for "trust me this race is really adult with Age 6!!!"-stuff. - * As it is somewhat a bug when the pawns age tho, I added that the youth-fountain also needs to have MIN_AGE. - * If you'd like a different behaviour, you have to do it yourself. + * or there are races that have a different age-limits. + * I am not sure how I feel about this, but as some people that I consider "normal" asked me about this I changed it as requested in #26 and #28 */ const long AGE_TRANSFERED = 120000; // 120k == 2 days // 18 Years * 60 Days / Year * 60k Ticks/Day + 1 for safety const long MINIMUM_AGE = 18 * 60 * 60000 + 1; - // Comment AGE_TRANSFERED in for debugging, changes years - // const long AGE_TRANSFERED = 12000000; public static void Postfix(SexProps props) { if (props == null || props.pawn == null || props.partner == null || props.partner.IsAnimal() ) @@ -39,8 +35,9 @@ namespace RJW_Genes.Genes.Special // Make Partner older props.partner.ageTracker.AgeBiologicalTicks += AGE_TRANSFERED; - // Make Pawn younger - props.pawn.ageTracker.AgeBiologicalTicks = Math.Max(MINIMUM_AGE, (pawnAge - AGE_TRANSFERED)); + // Make Pawn younger if he is older than minimum age + if (pawnAge - AGE_TRANSFERED > MINIMUM_AGE) + props.pawn.ageTracker.AgeBiologicalTicks = Math.Max(MINIMUM_AGE, (pawnAge - AGE_TRANSFERED)); } } diff --git a/Source/Genes/Special/Patch_Youth_Fountain.cs b/Source/Genes/Special/Patch_Youth_Fountain.cs index ff90e93..bc07f1b 100644 --- a/Source/Genes/Special/Patch_Youth_Fountain.cs +++ b/Source/Genes/Special/Patch_Youth_Fountain.cs @@ -14,19 +14,14 @@ namespace RJW_Genes.Genes.Special /** * Update Issue #26: * There are options that a 16 yo pawn and a 16 yo pawn have sex, - * or there are races that have a different age-limits. - * I don't want to account for "trust me this race is really adult with Age 6!!!"-stuff. - * As it is somewhat a bug when the pawns age tho, I added that the youth-fountain also needs to have MIN_AGE. - * If you'd like a different behaviour, you have to do it yourself. + * or there are races that have a different age-limits. + * I am not sure how I feel about this, but as some people that I consider "normal" asked me about this I changed it as requested in #26 and #28 */ - const long AGE_REDUCTION = 60000; // 60k == 1 day // 18 Years * 60 Days / Year * 60k Ticks/Day + 1 for safety const long MINIMUM_AGE = 18 * 60 * 60000 + 1; - // Comment Below in for debugging - // const long AGE_REDUCTION = 6000000; // 6000k == 100 days public static void Postfix(SexProps props) { if (props == null || props.pawn == null || props.partner == null || props.partner.IsAnimal()) @@ -37,15 +32,12 @@ namespace RJW_Genes.Genes.Special { var partnerAge = props.partner.ageTracker.AgeBiologicalTicks; - props.partner.ageTracker.AgeBiologicalTicks = Math.Max(MINIMUM_AGE, partnerAge - AGE_REDUCTION); + if(partnerAge - AGE_REDUCTION > MINIMUM_AGE) + props.partner.ageTracker.AgeBiologicalTicks = Math.Max(MINIMUM_AGE, partnerAge - AGE_REDUCTION); } } - private static float ticksToYears(long ticks) - { - return (ticks / 60000f) / 60f; - } } }