From f30f494c3df9f9da92676b39750aad2df030c976 Mon Sep 17 00:00:00 2001 From: dominiclopez391 Date: Tue, 16 Nov 2021 21:37:17 -0800 Subject: [PATCH 1/7] Milk drink thoughts --- .../1.3/Assemblies/CRIALactation.dll | Bin 22016 -> 23552 bytes CRIALactation/CRIALactation.csproj | 3 + .../HistoryEventDefs/HistoryEventDefs.xml | 14 +++++ .../Defs/PreceptDefs/Precepts_Lactating.xml | 36 +++++++++++- .../HarmonyPatch_FoodUtility.cs | 54 ++++++++++++++++++ .../HistoryEventDefOf_Milk.cs | 22 +++++++ .../Source/ThingDefOf/ThingDefOf_Milk.cs | 24 ++++++++ 7 files changed, 150 insertions(+), 3 deletions(-) create mode 100644 CRIALactation/Defs/HistoryEventDefs/HistoryEventDefs.xml create mode 100644 CRIALactation/Source/HarmonyPatches/HarmonyPatch_FoodUtility.cs create mode 100644 CRIALactation/Source/HistoryEventDefOf/HistoryEventDefOf_Milk.cs create mode 100644 CRIALactation/Source/ThingDefOf/ThingDefOf_Milk.cs diff --git a/CRIALactation/1.3/Assemblies/CRIALactation.dll b/CRIALactation/1.3/Assemblies/CRIALactation.dll index dc0294dcb94a3a1c178c1e5bfd6b7e120b225cc3..365a7dbac4acb1df6f2374e3e6c462a9035c9850 100644 GIT binary patch literal 23552 zcmeHvdwg6~wf{PgIWw6&nwh-&oKgzYCJjyBg;1I%X&Xq|(uC3iHJ!|yBts{2(le8` zAtok8xS)dIgNM9|2p>T~Q9*l^EA_z@1qJILO0Uitk1wfw$oopUCWwDh9C z-^b7W;}@89_F8-Gwbx#2?X@3srX82uKpGM0_`LNN(U!mfj%Jxs%WnF?#-rstn4SA>(TiCAn zW8GBp(N~retvQcK5$fL#%9g5BgJx(SA{%fpvw$cVG@|f$&{_yUi+k1R8C)Rs86QCO zOdz9CfW`l!o`xn(qiCpeF|vLX1JTv!B9|Y2cKH`GKb0-j=mOCl{moFKwV(!#y0wNL ztwXVHDGE!taHcv^kLSo)0H7hdf^}s^6bc!2g$BzvDvv9*N@Za!`5n14Ar~PLB309) z4QMdg0rz9j;?vaVGNv=XkE&Q};g7S<3u)qdV6%%Q85qZp;W<~uyB5iX)paRE2t*{P184}GsX0@d({7C_Dj8|l)W z(N*YS?{U3M59xIUq*jgkK}QP~3u}&_ciabAWxkNFZjcOXHQ22+0QMYMJ-Qa9G9#Zn zQ*p`Bvr!i^-7zTGrPX({eeCrZEQ~}{8HFabAaiH-evl)FE8cpmG72j*nO$Ok z9OTN%D4f6~*2n%r9tqKjm{4gWp5SNwTu;LNdU;XpGW*+LcZ?8ih8kl2pgO{$;O!DJ zY(sU;55pGKQeg4V)ySTgiALG=swm|cMAXg?9@q716!u1Vp5Zx!OH~qHi$6|o+ zGLKs)%rDM=7`IdhRcTz0Ckyk0l+suU3sDWX{o-|S8|1Ou=A#Ba)(LJTL^<@zpHQOX zSQtzel2;Ha@hp0CZ1H)Q7-MB1S4G=Ezoe*ESH*ZTN9REntjGSCoSd4r#TYA}Y_h|d z&+m};e0rvkW9dvb!}$P`;4a_-5*&==CaiW)FdkKGggWS;MLU>Hjc&n1auKE{j9%iA zkQ8B6&NEn~AQ*kYU{m@!N%!IdKOv_PG~=;uL+dK*LO?{=c03H1R#C1+JAq5qW8-_$$`-%2({sHJRyAw%h+WgIey(Ks)#)Yp##i( zY8@OQJQB%)NV*~9U(E1Y3vp^tb#d(y2bYOjSLz~|5S)Jz^paJ5R8w55R~6S%fs7yX zi{Oz{^=;J6Fsyg+*t!8^jd6M(*#mr5Rh1RP6J9>s8!Bsgsj~+4LB10!BRwdM!~w?O zRK3zlptxkSnn%Y#Jo?gnIwp@tug<4KuuI4ABx~k!)(ja_6p696TtZUE!njN=kDBPU zZq`^Y9#JS4Tv7yLKMIbKuz+H4SPKhlxdkt!GVid;@HQ+&qCA=;(FD5!%fw?1Ee#2wThK)sa~CiKDk0p6#bU^9oAZ6*WdwWAh% z2n+a5;sEom)Nq_1FeDB0ZotojK@O?(a)?F{LdZMp^GTmLwr6F61~Mm%5Jr4q^43Nk zKeK>F5v1N2^PR{I3jJt+lpiMl^aecP(bbd*FJojK5Sk&woa!D4^+09uPV&rqWWg!@FE#hS|_ZLx&7Ym6udJ@aD)Jsp&uFl=y688%4RNlhV% zJ}P|!Ph@Xiw}#Q$NufoR(JO!yuK6TtHFabJNc7zR@Jun5c&GCHTq#CFE4U!&)zoGk z>&c{N>L?4VeU}y;Lt*4S0Au4`>9~s4va1SGmCLyzpL1d=rx7yHQ?<((q#Cz`*#Zk3 z0<&vtm9B+?STW&ePfM7rz*WC?P!}s=NRujFmf!JI6=i_$L_yv^zP*B1x(aeEus`u( z+rO6wc@=&;B#jW1lOH}2N_}(8Gh@Z&>)J?F(h|X7S~pjziMZp->|MhjkBR$ z@^4PoTc^5k6RPzp7pzQga#?N-0c?YeUf3&ssDS!r1B zw`wCjzOyU z@Dn+l7aFP!)rQvm423l{U|+KlpmMQVAtI5G&|X(Zc*i@rzo}m_onn0iT`!q=0{NpL zOCGOuQlARZBGL;pAxxDnaamlj7Hy%e(>2nba|mf7)!u>x;Lwj77=e+w3BAlLFF%bN zl$TdkW^QIfz?(Yurabhj+<nOmUP6&@f|hG74*c#2~-{ zQtt%_x8>bb1kWgzj@nT;fX`A3@K_T88@wl^5vEul!`Me|0~osh zY*jlOPS0;vwNo0(G35h@G9`K!cqN+F9zqwa!L&|B=dvDEqpYBKo(t;OVYDmH+zse3 zR8MF4II5n(vg<4fc0`Ad%cJ*zn%AmkYAdQ;^tKwzoW=@supx@nK-Eq$l7r`&;5ZIy zXFqWqM?;Po9!6fw2r4nN8pFnzT>m*S!|t7o85wb~)?X=SAC8&%s2`00NSt(VoYZHw z;W2(XcY~xNxn%K7*)ZqF5Ox4w3`LohbBjU!@Gmri4qT5I(%2XHaBjhLrP>1gw`|Qh z;FEm9Y_Py0JgTCwa_t#vRdw`UcE_2Z!C%ZF{^Ej~xsR)m!;yX%R`Ed|ja(!+i8w-! z8xeFYxnT5uG<6ugIt<^fd*FmRgpZN=6v)=60idJPDQkM%fXAGM)`OFkvqm4vNvZO> zfE|s@XF#unK>BKB^s^|t`i?Dxu!T#i&KP5BA2%*!-iJ}YaGYyKKgZ&njvZ@MPql`` z1Dh!?9t6$B1N`s$!ifiV)nq(~MJ0!9N6#D&JUTg)Nj&TXbun$|Jb!~ia2Wouy`}vt z>X+6pU%I?uEmM4y0t{gDuwaZRi)SP9&VtUYolN&(6G-&gvxxfP{{xw@*@)8l>yNW6&RcOu1F(+S5w!4jc46 z)Eac1&gD--{}P%PJf@UTlaFB`%0W6}S3JAGk# zzxHIXgkr_VlrSwU;_@oU2~!!$K?;b3H6r1AGKvn-xk4yEo^c!cI$X$bU-4~oJo&TARMIs5^cLg zpB>=*jq*e}`*eYf`n@7;z4Y>P8EIU~*GgZ16&+p@*d>(TNWbeu<{!mYAFA129;BB+ zLDW@n?5&rPMrShR3HWp_{k&{3$}<(Vz?|~!Irjv?f^8Xpk!-tkiH#e`+36$Oe^q>_3a{D!LFQO|S!~y9i}nu;SvoiekY0kWxx}Ywjv)#T{a)V8fb&l?k>?cd!b< zdR(j$7*Q(d)K!Vh8w&0!`XMq+wP1t5oRoYx6wG4^xZ?j~r~io7*jI1iTHRrCV- zo+CYcQgp$*6V9W;8Kyen{4p?}QbtPz+lmnt13OEwv(aA#um)-OptLKa6@raQ?-jIC zINJ*EDw?BIA$PLP{*1bXz}5)X4P6!iJDW7vWdORiQWb7R8C#Bw*$OQ;kv6}S%8;U4 z>2!Rf#dUt+JcG6)XLc35tQ+)n^~?HvS`dCyRp@n%;qS_s{#E}gfUjt;=#})#fk2iOy$nis;a}BCveh@0N}8)Nd^q?f z=$`;o=r=y@@m*DKq1>Tz`Q_p-L$_lBYr>julE;s-!*e8Dgy{VOph6#@3c$DMO?4F| zm3f$P7bwrjTMR|-C__jrORk^WxL#PgvA;GS$ZbYtD=z~+R#|3+WskuzT#kkva;1aA3Z176ZEriBd|ZX z*mp6r47v=P74G4S${WBQ63pqrpkE6%fhCqX|KMUV!QK??CVI7C6D$+J76s8u->lw& z%+!^`_WDZb1{d2mBkL=r!!Guzs;hh<`dyCmI$s%8V_)M)xz1NX&4M{LtD+r(Ihs|` zpkPl>cknP`^1i&fYWhrGyK4H{6zs=tyQ{-D`KqZHTO7j8&4%!8z8ab%nA1ZIH3~KX z|G; zx;~FHN;eDU^cSTEreKc?_6_={@}K*nbVKcA?~CYm!MN_%zD3kfH(6IpjewrH^$6ySZw2kmVG6R_)q=gCT#4vhN!Peo zNp%ERIrf}HFBH5~S!1lE*$$@kVC`8+3*5TpRSm%E+`6xq&IKobZ;N)yjL=5ZT`3s% zt^m8!t>gYy(P0sYhZH0ajVm$riQ^Df4k@ySx53(8ANRXQ4S%Dhki3oaozyE6PlfGPLS;P1U= zqpVX)4by*seTYX-YfR@_h5Xo>J9LGPgqd=*j45&OC<0Y!JGESoRtnv(GJFWPJo!+i zt8kLYr%Wxgo+>?;(^;ketuwy^S(-zzYTL5*P!lprn-d2^-w>=y;VWwS@o+kW+*SI%YzG)SJiLNSfnW0C;bh|QJPbBHXyI11=@Fm z>y(i8)AHS*h%Yp@{}K9qai6kQsjnGO=4;=rdatrb`<(y%N`n?Gy-B%WEO5UfV^MfL zdsyKSJuLL2$_(|>$}Y93{9)y&!Xs+ZzT-cFGRuFM{v+_La)e$i`H^y=)`N52F74Lx zpMtVA{2L{yogMz264Rb4epT70U5)+Fu+~#js2-t`zhkl{TeY7DTGYF>N6L1p_iJAc_Nt9^Px%lip8(~E_C(-=>PyP3nRhTn`8ZmA zCGdH)Iz8|$l%EZJUwr|6{Z@TWd#dD3HKcwi@K?xxcUaY4(ypxXYu8dk!5j3dR-zYb z1*+Ie;39!X=!QN-d=SX-1<~qyG$&=j%(WTeSK5 zCwwj1T4~!RFsYnfvRhlE|2Z7j8uWit`?YrZec?5L!|448y$tzBs7Pb@b*!Rm^~R!` zwO!hp>N~WDG1B|AChc4PhqNaB4drXvg(CA>@oAgBOyy{K6SDx8tclQtdSmE^+DoYY zi8g_LR^MdK^}Mt<~wb>MvB)={M>Z*EE36I^3_fh0X!Jh3fQSc(WPhM+@up zhxJzN0{y6dVNqOvQm2B9{-hHL`g4VG(4W*nR~n120&D=h4E_F4dr}!I{xB%>i|+#b zzILCU5c&)HS4uvor(B+=3!l+dWQ+d*d_>?;flmY0;~TZhvBH*725=UA2yg-223SiE z0WKGKj=*N2UqD{~y;CTc3XIcJpzNjp1(+et-%KO)VgHNt13*oAk-l26K>0H*3$9nL zqznDcDBlx|E1L3Q|KrO0!Si(~KQHAMrA+Ei=oUYzFVfxq2;khndcZpZ%__Irqh3j8 z7JOaGFA9unEaysr_XvDkyOPEWzAk0bxi%tjy}&&J#|1v`{|;&?z;M05Jp#uC9v1kx zz~=>0fp7}kBXC^cVS$eeTpwhfJpvC4d|cr30;!N|BLc6cPtdpMhqO}Jq4X&Gl~Lt( z%bq5nY`_{2YZ-a%Yk^50ch(|J|r8v^fd zA$BFxr9Bz+YA2tccjZk|h<-LHCP)4Y_7Kx`*@bnVzrQhHg8)v=r5Ir;T}9_BSJ4)H zwkuzza`nr!UHt|9NnNhY(c6@?zEydTejz^GmKr-^d(AE8fi5eV%B<_@?q1ftlp33@ zfx(R_E0*mr(?eSavq>v0m20`O%Z{ZpgUOU>uS;};(4L6deOz&(sD@LCLghd#lZo}2 z>sEGm152V4DQz4|$M-bQmZ4NC){`<(Y->#q4Vbozb(+~MZhbe$(g~?;inE4!Y+1_& z)}G8{nV8NlUv@I>KumIn(g#!EPd|ZXMrW4IWwr!@f zj9rdTg&Xa3&me zCF6TDok=Lwj=1uu9i~i2;`y}SY(i|ozm&|l^{mfS#oN+x4op)_v(d6Q55=tmn}-KY zn}_rc`E#s!lbqUGk{JZDh}b@q&L#)UF35GJJZ&Evy*cLA2 zag*a{*1$8zc5^>ZS8=D%b2G>`>Ec*2+uadMLak()=jafKJn9WFoj2F=23+rq-E>j_ zv0H5n#tBLkw&V}dnF}Y3oZJ~CX28sB=L~+$~CfM33DK3@13mb z!fIk>H{vH3<^e0e!coYyHzyMbGdg|hSkY_^4%7l~yv6L@+Dn~#lc|(b#G-&aF8Vu!cC4VL?ed|* zDRD2z?T!S=R-ki_8yV*=6dm)%GYdIx%!n$s#cLNDyqpnyVRyk*#MZR?loJY2s`-YOXIRO2-+hby2@VCTDx}eD(#)Kk6G33-HFT#tXT-L2pNX6YP1-GdJiWSG z?4dq3n#-CI-h^p&OV&DBCi7?xL%$hIW&0)HI6j36@x9cRfl2$Z$wKsD-N(WrIVM-& zgeQnIc6e`VudH~v(DCriQyrfp^TKE)6Pz)zrvW0R-c&5x+>eoN!djIPQoCjC#U>~V ze_#uOWqPmpHnRy|`o~h#f{p85X6(R7yoh5i)9&_`he>m_BCm;@?oKNXac|S$l$9ru zmgkTyF{}g-oOYk0u!XgYr(Aoi$3&l4-aRike!{*6vz-ApiLQJrU7r92o`xx89+I;j zBCR>wpRG1;rJS__J3DvL$*m|ILz(ObQ*0~FVp+Qg{~dsQ>dSsIxFr9^HJEpB?wrLgWPW0b~D_~e>+%lg}pWui?o zGnzNA+S1sCVgux6Mt4^|m4^9(Jzg@?-z580$|AnqBJXtF;zr2e0eMNp>~;6ekeM*C zQ_tGYewT-ar6_?tGT0%U_un~u+L4Qp8rpbk#|g$vv>xOQ47UTlb7*kTvZqkn&6u4Q z7xTuKEZ$8^sd3%%?rx3)$N!k}ImdTmm2G2!v!!WE_gctb1F=3RjbghM$CQ=@S#UWe zc5~7cQ5~^C>cmbxl|ax9x{CrE*_ql-$sR^DOVOQUQf_iqIH&CHAeJHWVz#&ji5Huv*x(>+LD+qpHeor1A=vPI z=CNHZowAe1oHCoL8(cWv#+gs>&64w`kYs*Mq44H_{gUyhjs=~}GBs@wSlq)iaXsfQ zySp=v- zc7}lj-oFuNBkKT5aL#*q%QWUE4uTnMOWT~&Tk;As(Uxw;GMqbkb2+!EJ>ghbpSO2! zu_?+x~KQQLB`~n6?^k3Q|Rv$=qNR9hP?w>c>|j^lKME0r#>!^t#B9) zgl!owu-5%4~RHC7CRZ#EVtYmOvSkc{`#qXbKYZ|u+!)<9^ z!!sPBPQf{|XCwr@`y(B|dUjI5Nr=;g90cYWe57W5tDnVq2luONE_PA1HsaS|vtUl|${n73ui zrIrlE!P}gQWmt|Jn!QXUinQVqC!WpZO>y@Ky}`N1krhtnC(eb^+^fJ|%3FLrQhzMd zjq4H9y96R8xEDe&qH{Np@it(*`^3o8@mLlc?l=H8s*XNlkjW6}b^{}?aw-K0DwWvU zb2&@F`rt+vLWKI|D8MC5ZfAWU>__`R@a{+IaVwJsev+KwO({&DdUiILWD(gM+i$v? zQ$k9Ln|yF4Yp|Oa!DJle6V})I)&Y>6d<#*y_`rP&Y{CU^tG>;IsB{+hfbOLe`#EKD z#`dZ(op67XWUguZdgR6ZN!v>E5=B1p~IIiOCg`1}R_$~nd zkOOCVe&$Y0+hYgFzWe~+NDa4J2l&3BIhGm1IRq;M-}J<@TR@)7HMq{iRUo!<*5C#c z)5}3|RunSNz$v+=8yO38D?3?zVxF49;%!P3=0Umk?oA$~E?g3Nca@1I*oL!H>p?R< z#HV5JwuYJp2UEjh_O?uC3OQ$MuiPYiv~6}WV_`d%BQJG>jK$&Tn02mjn{k`ghkFVd zIFW>$)w&PXL9XzYU+)wrXX);ZxCy=p_ma%uEHEDC9;V<`K3aLy+#$syaNfjuo0FJF z;$_V%%bLbk_6T{qy^Ke59~jmFz$Ew+pv6%e5$>to&Ih#%{3Z>f6o)jHkFyXRz>|CI6B!X2gkF{_i>3CV zegJhTeCZsaUewumVx>cyq?F^JrSM5Zwlg-Sq@n!~S`Nw>7_TQ~;Z#j|G(57Yy3)!v za66;%%+?HvEGvaxJ=!*uZ5eSIG^*`_K5=M?y^)NCZNUy;D|W~;1K0;Dh1x)El75q7 zb*gAaU3xm-Ig^^4+^%fP6E!;<$k>1svP#A14N< zx91Vi+KV8Y?T|t5eJDFKVQM5zZz)r4Wy{~wD)#rZicl1qv8TMb62q+GXq`UO@%CtI z6UKA7JMv939-d9M#7jn^!HMe@)D2_Y8$rW?6(1AcF=b96&2+4P^?T>dd9CTX@Bg~D z<*6M%Bt4=i0laXd_)rLi7%gF-G9FH%M)g;O$FEYtLwW?Sp@1;ks0i-^UJxOvDI;Hm z!s8PLOBnyC5mC{wB;d3fe+tC@NN~ohj-&&kCCzwo@hnY?f_}PxfT+3<6RUbv@5i$$R7ZS|4PE94&FAr zKB0!k9|_<+#Q-ZiaS_H*f>$d_O7JrWB{Z?Sg!xPiC2Ru2|G>f%1L28%qSr9X4o{4h zKtd6BR*LQ~EG$)YrF1Tp%*8KvgGv!T0en=$ua~GLDt@|90%qtTecl*APviH8$L}@# zDhgoJpl1<=tcEA>!wIbjI)*1|R3C}${f-w(i(rA!E|oQ0;*anUC+@&2{1|y?7f69X zc;a3N6I@*J2(#Xg-?YFe0mzi54}&=VYJj~k{%VnsY6|^676NTvQUj%mG8cY)L=P(A zYCr3S8j<%iZpvWdo7|qcrTvpkdK#vIai3LvevOBU*5gm&?G&hk5O@&SYkow`#B;EV z^C%>x450%`85KkA@z*Ls<8MIhUyDft24QgO#0wmUMH~qeFJK%VPk98x0@K6`9wj{S zQbB~puoe<&OaW&oRLH)dNIey9a)ceC0E0GKa;A52OhqbGQJ{E=cZ#L14weF(#eCHR#iAlwt$ z<@ftoCVZwUv#U>!1eKETp+%uXODe*L8kEqXl@L*c@>&&THGJq?HNc^qLbwLhfLe+G z5OwClIr|U`;>yQ(wz3x=(~Z!fHoSs_)@}ITnNyF=mRWbGZFULi;X}JI!{>yP_@5;Y z!kmF%siMxs%QOgDj;!@~eJMPC3|Qz;QhGSX7FxvJyuzVX2(No(aps{#-17i}2Mk5! zgjhW0NN^}BeugV0#C3tgg%bCFF!04IF56MF;`wXw8zZAgHQ15k&oa21!M&KoL-l?EolM0-WXPz?a@{c$)??}`NNzF};n~t)#BuaccsIrl3*8Opjo*uzT@JKVWQ4{a zX5u5DBYePfZ+LepxdHN++aD}hgsFeT;W%1aguqu-2^rSs7~%+aL5vm|EMvEmA9e>g zC1IWvpishv5X@DA2XKT53Y;t^=7)DgX$zj^JBef@g zDNNp8Lg--du!4-0-i>$ZbJsw5C!M;8cLsBB`s*T|+70!~>sPN`wW5C6vQ;bA)J2+c zfrIPlbJONf7GIIoMYav~;0ovhbGXaeYo^al<9nsDlYEy+H1?0_ykg3?sJU-kY5bah zO#kyR_%`Wwnj+pk7VT81bE;R}W2|!m4==0}Od|2qqh0E_0kYW!P(3hiV`_$mRt<-eXJ zI{aUCQ{vslG!5`|jxz)H!uGiixsdxZ_5XceoOg16rMZ$*Sd*C~Z0B-h63;Jr|8Ay3 z!)=V+l1lL_OU@gErYT=AbM0FTA!B+s`J(;@mHD@)^6%=5PgTlERLG+z(3x*DK08s< zh{ebCm%8=kDbCmpVe=NP{bULm^LKvf$~I2 z2Zd)TdH=1z(G51huYlMd&eel=(DuUSw7fb#V)Nz47Cf2H`)k2(ij-V`&asjY*GW0R zx%WX}KE-Vj^uR$QCu0Ys+j0<=11{P&;96yA?nBgq-!myMyG zG==}z&n%-I?faxPTVN35W6k-}370Kmm8rA{eghQ2f6JiHGU&zsP6XR;QjX&(KFaeo zh%Hw&V3WUg>2s^w2YZV3_I$;dW7&72f1}u)kIUXgRyNN9r?&SBvG>%r)2%+;=4+%) o6a2zgCIfQt=WDkAuAMjbf5>wXJ0*0KSpE;`?f-Z3KgLxGFquI%WpM#SlwFWT)(VKqR3X4fEsiruK&)6d z3{|O1!L4AemQG!0)uJpdZGB2DwrEALVxLW)%C?0s;B?M@gUXUJE3^J%BYFO$5l@?rMO>ptN0xR`7;V%O%_pqOddj{ic6;s zEKbz1bXOw3-%fYKBikK->MqgglXyV-MNH7?S|BYwir>|p=k+Yn;bn=Q2BnT-eGD2a zCMZf}D%}fIzg<7rHq&(&*7w06!-Jl>xgO8v1_01{Gc9Jb6Lx*TPS+NFM$H8$gL+I$ z8b)oZ>!#C45!{0@i;{}SBpB1_zD(84{qR_xL}Y%u%Yrn*^e2w0fT!N3LGQye*eK?W z32H#`1*7-0Q^3xi3b3p*(USB)jAFK(Jw~onC31QYcu`v(t%EU+$J5B4KjulF#vD&P zdpe$EC)3@Flg-hQGk{H>Ics_ga%bxFfa1eums8FJ@e25>{TZ_BW_CH+1RZv*Zb?C? z)@Xs>W?ih0Nps+;d~|x~t=6@jhhw6+=hw|12!(w0VX~Lmn%yhjXPu$WDju{dCY}kE zXSpg7k%^?UwxLjkSy3`NrYAcBN?Rik%btx9a+D(7?Vqi6LucBpQIM1Ak;VOX=fts; z8pZ^>)hV%}o<#2JSQCVdWQ(o*O004;^~Ewv7M(vP4uN=oFFVjAhu zET+?A@Q|)R5z$EDb`lyBy;qk*H=y63`D=`E>>ff3l24R2kAq|~i$&r`7O}|uwsvXd zaU+fO49;PP}B6|U|wQd%pBGNh? zBov2ekbk;3Bk5ZLCj$SM6RwtU@k8&F97^!Nd2H90+1Z)w%`AYU*ijNeZ+(>P=Gnlj zlF2N(6j9d=X?KoOG|SxuE`>90Et|gqspbm-TH&3U$j-&EVU%vp9b-VUozX{kn1I5y z(^DPkuv(&LR8rOwYOM)PMj;6*ja8S4OV5~zK&GFLr{}?JeO2pxJkl4j3sw-+1;umy zwK+H*C2=Sip4vK%p!|+HS`K%su;3Rmv+mXszoUQ1Ec|N(Kl@D) zf@8clcKW)k1S!!Tjf4{GqX?TMl@(QBU<&J#i*#bH8jBMH6{*Wvc}J$3;l^SiP>~ZR zFAS(SZWW3v3t$0@JW6KsB509)pugAP1HeY5vDikD(Z2MsHw-4jXkN?_WdRaLbsDFH zP0Q-B1sSqq);5?u;u$N8KIFYB2e=eN*x^lk84v4#aCmT&u#H4%*=$UgsC(#ilSu!& z%%9t3WNxC}ao0OIien&<;WA_O!qOFDX-tk@jGq`d6lmJPPOxz!yBwnK&Js+dzXc>P zXcM@GZoU#o`r80#`4F`;zspQX5oTcz_P28~SGeB9%%~~U6&!yc^9>_?6_hkL1GHY< zK02x~J!VBMh$ho3Kn`REbd+p4Ueb=*kW7^%{ZvsJx$(9_xRhBVn2_#)4n!yxB|@1Ld6Lru9y@ytI7iKxS=j{bF6rK zS-%{MVHqQ0Q#bQf;Mg(Ud%%g5>@CpNQ2B4a!$~hAgO<4Tqc(O)yXjV#sf@?vAdJV8iKZe4hn6#SQsPb4>2euR zW+)U4>7W3I&(|s7?r=4vPS8M^lc8b>RK)*-&59FdB2kC`PL*L1VvQHSeUEFo7jz9Mi^t?n1SJqS_V3N290ZSc(sH90q3EgLA5-n&%~2y5KRW2GXd6keZp2y$!B4 z-wx1v2S9o~K>c7>BKv(HTEvpm`<~QsT5`HfteN``(G6%)mA(_QXpLOJGZ@PaMmma% za0_z7Wn>Sfj1o}mU6>eex*O0HNS!Ef4_GfE68Dr@_Is{ZJpBVuJItym&B~!YBn6pX z|IvlY<1KJPI2A$dO-`3Ixp;>p9L1G*$gZPbekl#Wadc<^L8So(;?BmWFc$+dZU=C! zjx~V9?9X@-a*^f+=nQ@fS4)aMii_U6X)GT38W8!&k@a3zDc81+4S`kC-VnI4x(yMs zX(4J1rEsEK@#9#J9E%~uT0D|zFFK-!PNvcuIpH{Dxgsnf6%mb1_c9B+AGQmI$uurX zm{dai#}HTPQ5)X7E3f4NOmzj@d7X1#F(3RlCi>8B`XR_!9E^O|aILbdM{U%^)tcRW zj9Jz4&{tZL?KY4oyXi-uClCPrGLe25Zrv+*1Se1NZ5 zo#;`E9f`LBLK0~TzV-NGQzS&lKVxYyzSYIXM6cZIe)I@FHvQASF=ErD9)|z0W<|>A zF=)4`#%>DQ^qRnD1WxcUrBYyjfm4MZv=?LUI~K!@LRn%z?e){fP_t!IZLCuuOwrUK z<)_0=Kf_Odi!|pfKZRqAWFX|H_ks);$oR1^PwQ)S3fMGIoZCc6?WdnY#-yXMhG!TfN4tdy# zkeAK>KEiN@IPsB($FGL(gx5R#48Iq=6N+x5P61r1ygX|iX4!PNP-T%oTBF?V-@ z;ad{%>n4x=afahrCPz04`w5Fl6a5UY3p0E|TnT74_HvRF{(Z#ir@xAGkEK{*9A;o%rBI9IEM0<*{KCxyi zLEjH2lMY>AeeSEI$0-o?)0dLcDdNg}Nd8Lg#tQLM4~e)z)QuA}SBvXe8BdiGJSa}w zDzHWcBiJk%8Q)ALcz&}kut4;c&}H}16XnC29R zRmO9>{cF`oQu1Gf3d!w(@fd4-Bjg0P2PR=;2sR(QsTiAr^#yMpFb@?}gccjy10(T^ z7#e`}G+oRQ?1B;&14i^`pUaDjmJvCikKtEsxuD&FZ3UJP(VqucG(;)kH9Ok_&r%pS zOExhn#k>f070E*)8KJaD{tMV4++%wQHUw_J4=f|t``+z=Pk}Yaygh*&tBFz{VJ`A- z4}5_iPkjaJ0?bk|yi4R<%!hd&uv5r@`9+9iBqWCj)*n0BNH}&D8C@e3(~Q;77~y$D zvKx)Zp62nrWZLv(@+Gq?^@#4*ir&u|{P-ZojJrH91HNIrY$ho0+Xpx_&Tz26+xz3;qmF92VFq z`UdDbteh+K)>lGLMc;)JPXH>qfj$BJlJ@IUsZkw;nXziCOmk;x%T;Ytr>Fqw^-Hm2fL-E)UnSyr8?t^51K9rTa_RgwP{aH~L2jd%*jcbrM~}R~W>!$@@#ICp{>b ztEP?~{R&f5N52v5pqh)`%Fyphn4PQvHoZ4%Ip{lB{#z@Pqq#1sF2=Ti^STIXV7uby&u zmY8g?p6)L(mzN!Y=wC}18?2`f1as3}PoE3sMqf`Ru6;zSXo`9l^8$jouGLcy!Q5Ol z5dY}{(JOYXf$rj$>YR*;<%g{Xy5Ggbw+8xAiN~%r(9cS|zGZ)hy=` zB!c%{5qFGVQS?cI$DaimJ{4uS!(sYG29FtP%Ds$Zyd81JJ#gh!v>E%hqMwJ3hnhC~ zkEa|j!^Sl2`O2`S_e_>|A!}==lr-mr^jGoG_4KnK$8p(L<~5ZkBN3xSaSe2&?6BBC zJ51qDlERCz6!wP{wcuO8QRLve246leTktL5VqS^w8p>7Sc&!4l3Pc}qGerSy2n~(+ zacB;WL~sH!94v6Sz|jIH37jEt9w5J6V9BKdR|qTs+O!X_k`BxG2sNQem2^NbM`IH8 zK(0aeD>Vj{j#J;r=@eCcQP~Q`lY0S%VC$C9L;oseU8z5v|a#IG<5LKN$NLt-}z`aC#a z9n`xL3)S2DW=~cf)}gYiRHMY*s5pY9iVvHmio;kc^nxnWx2UfA?AZ5IL2($$*yOnz zW7fHa?({yUw$cZoU#O@tU*}M1!)T0(vV=Lx+wwlrG2kE?>2tWDJRQ*E5W@-n5=)Jn5XS8;$pUWAy3tU~C2` zKLllkvBKM=H>(|~0x0*ZYcVV9y*-C%M?4P$xyJjr-Uwqa==H{*Li_a|b(!}q7|2E6 z)timx#D{tfz3Kgkwit%_iQX;I>=XF5z^(Lzt|5iA`;4u|W!{Lf+qgrQ!_9zMZR|1r z9r0GR)di{B9ncZlT)G337uoSZ5)k`GY%Us!>Mr;3oHd(3iDg( z9T?b3L4)B2tA>ska|3y!!swp7*4TnrZ#IoCO$Q$h{?X{RioUTVeU(mo0H6nRHZpZoM<%1MNR_! zY$`YV!u5KLU-6flOU;qS0JC5&4~#R{m~GzK<{AmCV1D5r2l_K6=xT0oG2m3d*|7VJ zu}0$l!H=zcOw%7YJjc`RmY~=H(@!!~U(N#_q5O@J4~_1wH`S8-L&EWcSAH zw-&I9&IasG;{h`?7qGv;(*%wX`dGRI^vOb*h4T-{Mbrv-8Epb=qQ~qJ)J!8if1#J? z4UeJTrK#TTfV;fI)G9JOBh<&>-Y0OI`Yy%?1d?7wV?2gt?ka(X!QAcwhZ(ErKFcQYAjmd>2LzJI(}sC|3piKc27%iI9uP=g=GF)tCUCC64Fb0bJRp#KA}Mf# zz-j1!w=6efpZ1s1?KQ$9yFH|3Wv3^?b&hGPmQ(jvF+NnhN|p!(R|^K2|z-EkS>YdjNZtMWr=O#7{6y=i`EzqHj?x;J2wK;8i#)Qgk(C z09$b+rzlS+1FppBQGx4uE#P&Ktf1>@Am9y^tq`rEyC7Oc_dv9Y zHo$=@x)-8VbU!4k=s_9|xCxRc;m6lxnoW!8N;+TPge@m%Hks?ppO|KzPsEO&?E&|d zQ#7uRU2N_@y6v_8os=^!dnt{ZchME|uE0CE3(sD*{L|9SaCXUsBbP3pcX{I#D`@!q;v;82)3#`2Mz_6n?t3aS zbM>1S`2Y3s@GU(nM$NnDp}!U196jL@t(?ZNx7^9ER!)Asr`%b}PhX9}^l1KpcGk`k zYp3Z^&S(Vg6w2)yrSR|&WTS-&!*&`ik9Ov0vxb~GHeP=7*merNia!{W8PkBa(oP}d z#U;#(ozy7|#;zJh%Z0;XbZ@jUJj~LgV`MoO1H(UHPGOQ$m?{?McxvEpVO}vlwqLdF zF`zyuik89^?c@*o$q2%NlRr{iF}5lf_0*{7jA)@HLhM&`hEs@oy-s1Zwq0B%huG*E zKbgvz17=8EUJGJ=kC*e1-xFj~{z$-Mu@W84@7CUkQq>3{Wcrnp@~|)9u)h4$EX*KR zcz_kKxaiyrTH(it0j_S*7IrPIElkgE#`1!HsKVXA_Im7cr?6G&(j!24=^&ICh2VF7 zZ+SGo4{BcvkpT?KoH@ zkUHp<&@gbRUUBe!XAY})--io^JIm)$(tCxF)Z|lUAMw>7ZqCV^kjE;GyfA=X%->yX z9N)7`ArvB8O6%6uLU$JM>JEJtMG=aRj!))%(UqZcXJu4HS0am{AjTCMW9_W$tPzxQ z=Gq?9tGzmcqKcVn*jG5a?2n6GV8tim6xD<^)9LWgH>T{(qVh1kwp7q34v!_)IIIsrq^z5LvrGi_qSeN6Q zg5msnFQ&Nbp65!a;4Ng{P7DSWBj;5OjF4NQ{Q8nG!VdRZ{9(is#sfIYh5;|p0xFD-l&3QX(U)2Qn}~=(sln1%n}HgG zODkjEW|q4>g57JmEWY)A=^5G0gs=xN4R4OocbaK(A`F%rY3gKQkY6uwXWN8{y;WOa z@~5i!<& + + @@ -88,6 +90,7 @@ + diff --git a/CRIALactation/Defs/HistoryEventDefs/HistoryEventDefs.xml b/CRIALactation/Defs/HistoryEventDefs/HistoryEventDefs.xml new file mode 100644 index 0000000..c2dffbb --- /dev/null +++ b/CRIALactation/Defs/HistoryEventDefs/HistoryEventDefs.xml @@ -0,0 +1,14 @@ + + + + + DrankMilkRaw + + + + + DrankMilkMeal + + + + diff --git a/CRIALactation/Defs/PreceptDefs/Precepts_Lactating.xml b/CRIALactation/Defs/PreceptDefs/Precepts_Lactating.xml index 8236b04..00c59d7 100644 --- a/CRIALactation/Defs/PreceptDefs/Precepts_Lactating.xml +++ b/CRIALactation/Defs/PreceptDefs/Precepts_Lactating.xml @@ -18,7 +18,6 @@ 100 Milk from breasts is creamy and delicious. It should be produced and consumed on a regular basis. Lactating colonists will produce double the normal amount of milk. -
  • Lactating_Essential Sizeable breasts must produce milk @@ -28,6 +27,14 @@ Lactating_Essential_Social true
    • +
  • + DrankMilkRaw + DrankMilkRawReligion +
    • +
  • + DrankMilkMeal + DrankMilkMealReligion +
    • @@ -38,8 +45,8 @@
  • - Expressing milk fills me with maternal pride. - 3 + I'm a good cow to be producing milk. Moo! + 8
  • @@ -89,4 +96,27 @@ + + DrankMilkRawReligion + 1 + +
  • + + The taste of breast milk from humans is a taste of the gods! + 10 +
    • +     + + + + DrankMilkMealReligion + 1 + +
  • + + Human breast milk with a meal is just the best! + 20 +
    • +     +     diff --git a/CRIALactation/Source/HarmonyPatches/HarmonyPatch_FoodUtility.cs b/CRIALactation/Source/HarmonyPatches/HarmonyPatch_FoodUtility.cs new file mode 100644 index 0000000..f01b771 --- /dev/null +++ b/CRIALactation/Source/HarmonyPatches/HarmonyPatch_FoodUtility.cs @@ -0,0 +1,54 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using HarmonyLib; +using RimWorld; +using Verse; + +namespace CRIALactation +{ + [HarmonyPatch] + public static class HarmonyPatch_FoodUtility + { + + [HarmonyReversePatch(HarmonyReversePatchType.Snapshot)] + [HarmonyPatch(typeof(FoodUtility), "AddThoughtsFromIdeo")] + public static void AddThoughtsFromIdeo_Patch(HistoryEventDef eventDef, Pawn ingester, ThingDef foodDef, MeatSourceCategory meatSourceCategory) + { + throw new NotImplementedException("thoughts from ideo wasn't implemented!"); + } + + [HarmonyPatch(typeof(FoodUtility), "ThoughtsFromIngesting")] + public static void Postfix(ref List __result, Pawn ingester, Thing foodSource, ThingDef foodDef) + { + + if (ingester.Ideo != null) + { + + if (foodDef == ThingDefOf_Milk.HumanMilk || foodDef == ThingDefOf_Milk.HumanoidMilk) + { + AddThoughtsFromIdeo_Patch(HistoryEventDefOf_Milk.DrankMilkRaw, ingester, foodDef, FoodUtility.GetMeatSourceCategory(foodDef)); + } + + + } + + } + + [HarmonyPatch(typeof(FoodUtility), "AddIngestThoughtsFromIngredient")] + public static void Postfix(ThingDef ingredient, Pawn ingester) { + + MeatSourceCategory meatSourceCategory = FoodUtility.GetMeatSourceCategory(ingredient); + + if(ingredient == ThingDefOf_Milk.HumanoidMilk || ingredient == ThingDefOf_Milk.HumanMilk) + { + AddThoughtsFromIdeo_Patch(HistoryEventDefOf_Milk.DrankMilkMeal, ingester, ingredient, meatSourceCategory); + } + + } + + + } +} diff --git a/CRIALactation/Source/HistoryEventDefOf/HistoryEventDefOf_Milk.cs b/CRIALactation/Source/HistoryEventDefOf/HistoryEventDefOf_Milk.cs new file mode 100644 index 0000000..0e17b05 --- /dev/null +++ b/CRIALactation/Source/HistoryEventDefOf/HistoryEventDefOf_Milk.cs @@ -0,0 +1,22 @@ +using RimWorld; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace CRIALactation +{ + [DefOf] + public static class HistoryEventDefOf_Milk + { + static HistoryEventDefOf_Milk() + { + DefOfHelper.EnsureInitializedInCtor(typeof(HistoryEventDefOf_Milk)); + } + + public static HistoryEventDef DrankMilkRaw; + + public static HistoryEventDef DrankMilkMeal; + } +} diff --git a/CRIALactation/Source/ThingDefOf/ThingDefOf_Milk.cs b/CRIALactation/Source/ThingDefOf/ThingDefOf_Milk.cs new file mode 100644 index 0000000..6964b77 --- /dev/null +++ b/CRIALactation/Source/ThingDefOf/ThingDefOf_Milk.cs @@ -0,0 +1,24 @@ +using RimWorld; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using Verse; + +namespace CRIALactation +{ + [DefOf] + public static class ThingDefOf_Milk + { + static ThingDefOf_Milk() + { + DefOfHelper.EnsureInitializedInCtor(typeof(ThingDefOf_Milk)); + } + + public static ThingDef HumanMilk; + + public static ThingDef HumanoidMilk; + + } +} From 3bcff610d5befbfed91b77a5184311854b6cc99a Mon Sep 17 00:00:00 2001 From: c0ffee Date: Tue, 16 Nov 2021 21:39:06 -0800 Subject: [PATCH 2/7] tweak --- CRIALactation/Source/HarmonyPatches/HarmonyPatch_FoodUtility.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CRIALactation/Source/HarmonyPatches/HarmonyPatch_FoodUtility.cs b/CRIALactation/Source/HarmonyPatches/HarmonyPatch_FoodUtility.cs index f01b771..5942f09 100644 --- a/CRIALactation/Source/HarmonyPatches/HarmonyPatch_FoodUtility.cs +++ b/CRIALactation/Source/HarmonyPatches/HarmonyPatch_FoodUtility.cs @@ -32,7 +32,7 @@ namespace CRIALactation AddThoughtsFromIdeo_Patch(HistoryEventDefOf_Milk.DrankMilkRaw, ingester, foodDef, FoodUtility.GetMeatSourceCategory(foodDef)); } - + } } From 3b7637b977543f36ad04a3fa3b0e67e4a01c58c2 Mon Sep 17 00:00:00 2001 From: c0ffee Date: Tue, 16 Nov 2021 22:13:27 -0800 Subject: [PATCH 3/7] potential fix to raw milk drink --- .../1.3/Assemblies/CRIALactation.dll | Bin 23552 -> 23552 bytes CRIALactation/CRIALactation.csproj | 5 ++++- .../HarmonyPatch_FoodUtility.cs | 12 +++++++++--- 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/CRIALactation/1.3/Assemblies/CRIALactation.dll b/CRIALactation/1.3/Assemblies/CRIALactation.dll index 365a7dbac4acb1df6f2374e3e6c462a9035c9850..4e80b339d5704d910a4314b627b5866b604c739e 100644 GIT binary patch delta 6490 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 Tocs?ZC)Rd_Z~8*CU*`FL+`r&w delta 6554 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 diff --git a/CRIALactation/CRIALactation.csproj b/CRIALactation/CRIALactation.csproj index 30d9d7e..7ee399b 100644 --- a/CRIALactation/CRIALactation.csproj +++ b/CRIALactation/CRIALactation.csproj @@ -95,10 +95,13 @@ - + + + + diff --git a/CRIALactation/Source/HarmonyPatches/HarmonyPatch_FoodUtility.cs b/CRIALactation/Source/HarmonyPatches/HarmonyPatch_FoodUtility.cs index 5942f09..3691ad9 100644 --- a/CRIALactation/Source/HarmonyPatches/HarmonyPatch_FoodUtility.cs +++ b/CRIALactation/Source/HarmonyPatches/HarmonyPatch_FoodUtility.cs @@ -21,7 +21,7 @@ namespace CRIALactation } [HarmonyPatch(typeof(FoodUtility), "ThoughtsFromIngesting")] - public static void Postfix(ref List __result, Pawn ingester, Thing foodSource, ThingDef foodDef) + public static void Prefix(Pawn ingester, Thing foodSource, ThingDef foodDef) { if (ingester.Ideo != null) @@ -42,9 +42,15 @@ namespace CRIALactation MeatSourceCategory meatSourceCategory = FoodUtility.GetMeatSourceCategory(ingredient); - if(ingredient == ThingDefOf_Milk.HumanoidMilk || ingredient == ThingDefOf_Milk.HumanMilk) + if (ingester.Ideo != null) { - AddThoughtsFromIdeo_Patch(HistoryEventDefOf_Milk.DrankMilkMeal, ingester, ingredient, meatSourceCategory); + + if (ingredient == ThingDefOf_Milk.HumanoidMilk || ingredient == ThingDefOf_Milk.HumanMilk) + { + AddThoughtsFromIdeo_Patch(HistoryEventDefOf_Milk.DrankMilkMeal, ingester, ingredient, meatSourceCategory); + } + + } } From 994a525cb708da19ac64083d5eba0faa5d5d3f7d Mon Sep 17 00:00:00 2001 From: c0ffee Date: Tue, 16 Nov 2021 22:28:13 -0800 Subject: [PATCH 4/7] food utility fix --- .../1.3/Assemblies/CRIALactation.dll | Bin 23552 -> 23552 bytes .../HarmonyPatch_FoodUtility.cs | 5 ++++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/CRIALactation/1.3/Assemblies/CRIALactation.dll b/CRIALactation/1.3/Assemblies/CRIALactation.dll index 4e80b339d5704d910a4314b627b5866b604c739e..0bb7276edd4292aea51ac60363ec4e6e22df9eb0 100644 GIT binary patch delta 6258 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 AS^xk5 delta 6225 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 __result, ref List ___ingestThoughts, Pawn ingester, Thing foodSource, ThingDef foodDef) { if (ingester.Ideo != null) @@ -30,6 +30,9 @@ namespace CRIALactation if (foodDef == ThingDefOf_Milk.HumanMilk || foodDef == ThingDefOf_Milk.HumanoidMilk) { AddThoughtsFromIdeo_Patch(HistoryEventDefOf_Milk.DrankMilkRaw, ingester, foodDef, FoodUtility.GetMeatSourceCategory(foodDef)); + + __result = ___ingestThoughts; + } From e1a817c55f6f08fc72bf52a375de0d278ee23519 Mon Sep 17 00:00:00 2001 From: c0ffee Date: Wed, 17 Nov 2021 09:59:06 -0800 Subject: [PATCH 5/7] added tracker for when pawn last ingested human milk --- CRIALactation/CRIALactation.csproj | 2 ++ .../Source/Comps/CompInduceLactation.cs | 4 +++ .../HarmonyPatch_FoodUtility.cs | 2 -- .../HarmonyPatches/HarmonyPatch_Thing.cs | 25 +++++++++++++++++ ...ThoughtWorker_Precept_NoRecentHumanMilk.cs | 27 +++++++++++++++++++ 5 files changed, 58 insertions(+), 2 deletions(-) create mode 100644 CRIALactation/Source/HarmonyPatches/HarmonyPatch_Thing.cs create mode 100644 CRIALactation/Source/Thoughts/ThoughtWorker_Precept_NoRecentHumanMilk.cs diff --git a/CRIALactation/CRIALactation.csproj b/CRIALactation/CRIALactation.csproj index 7ee399b..4105640 100644 --- a/CRIALactation/CRIALactation.csproj +++ b/CRIALactation/CRIALactation.csproj @@ -76,6 +76,7 @@ + @@ -93,6 +94,7 @@ + diff --git a/CRIALactation/Source/Comps/CompInduceLactation.cs b/CRIALactation/Source/Comps/CompInduceLactation.cs index be442d2..bda7a63 100644 --- a/CRIALactation/Source/Comps/CompInduceLactation.cs +++ b/CRIALactation/Source/Comps/CompInduceLactation.cs @@ -16,9 +16,12 @@ namespace CRIALactation private int TicksSinceLastMassage = -60000; private float InductionCompletionPercent = 0f; + public bool isActive = false; public bool CanMassage = true; + public int lastHumanLactationIngestedTick = 0; + public override void CompTick() { base.CompTick(); @@ -107,6 +110,7 @@ namespace CRIALactation base.PostExposeData(); Scribe_Values.Look(ref this.InductionCompletionPercent, "InductionCompletionPercent", 0f); Scribe_Values.Look(ref this.TicksSinceLastMassage, "TicksSinceLastMassage", -60000); + Scribe_Values.Look(ref this.lastHumanLactationIngestedTick, "lastHumanLactationIngestedTick", 0); Scribe_Values.Look(ref this.isActive, "IsActive", false); Scribe_Values.Look(ref this.CanMassage, "CanMassage", false); diff --git a/CRIALactation/Source/HarmonyPatches/HarmonyPatch_FoodUtility.cs b/CRIALactation/Source/HarmonyPatches/HarmonyPatch_FoodUtility.cs index 0cfb0ee..c60c105 100644 --- a/CRIALactation/Source/HarmonyPatches/HarmonyPatch_FoodUtility.cs +++ b/CRIALactation/Source/HarmonyPatches/HarmonyPatch_FoodUtility.cs @@ -53,11 +53,9 @@ namespace CRIALactation AddThoughtsFromIdeo_Patch(HistoryEventDefOf_Milk.DrankMilkMeal, ingester, ingredient, meatSourceCategory); } - } } - } } diff --git a/CRIALactation/Source/HarmonyPatches/HarmonyPatch_Thing.cs b/CRIALactation/Source/HarmonyPatches/HarmonyPatch_Thing.cs new file mode 100644 index 0000000..e77e30f --- /dev/null +++ b/CRIALactation/Source/HarmonyPatches/HarmonyPatch_Thing.cs @@ -0,0 +1,25 @@ +using HarmonyLib; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using Verse; +using RimWorld; + +namespace CRIALactation +{ + [HarmonyPatch(typeof(Thing), "Ingested")] + public static class HarmonyPatch_Thing + { + public static void Prefix(Thing __instance, Pawn ingester) + { + + if(__instance.def == ThingDefOf_Milk.HumanMilk || __instance.def == ThingDefOf_Milk.HumanoidMilk) + { + ingester.TryGetComp().lastHumanLactationIngestedTick = Find.TickManager.TicksGame; + } + + } + } +} diff --git a/CRIALactation/Source/Thoughts/ThoughtWorker_Precept_NoRecentHumanMilk.cs b/CRIALactation/Source/Thoughts/ThoughtWorker_Precept_NoRecentHumanMilk.cs new file mode 100644 index 0000000..cf208d8 --- /dev/null +++ b/CRIALactation/Source/Thoughts/ThoughtWorker_Precept_NoRecentHumanMilk.cs @@ -0,0 +1,27 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using Verse; +using RimWorld; +using UnityEngine; + +namespace CRIALactation +{ + public class ThoughtWorker_Precept_NoRecentHumanMilk : ThoughtWorker_Precept, IPreceptCompDescriptionArgs + { + public IEnumerable GetDescriptionArgs() + { + yield return MinDaysSinceLastHumanMeatForThought.Named("HUMANMILKREQUIREDINTERVAL"); + } + + protected override ThoughtState ShouldHaveThought(Pawn p) + { + int num = Mathf.Max(0, p.TryGetComp().lastHumanLactationIngestedTick); + return Find.TickManager.TicksGame - num > 480000; + } + + public const int MinDaysSinceLastHumanMeatForThought = 8; + } +} From 40c79dd0cd370555d0d584abe17ceaa5ac420c28 Mon Sep 17 00:00:00 2001 From: c0ffee Date: Wed, 17 Nov 2021 11:36:41 -0800 Subject: [PATCH 6/7] Made eating human milk raw + in meals a requirement --- .../1.3/Assemblies/CRIALactation.dll | Bin 23552 -> 26112 bytes .../HistoryEventDefs/HistoryEventDefs.xml | 9 ++- .../Defs/PreceptDefs/Precepts_Lactating.xml | 72 ++++++++++++------ .../HarmonyPatch_FoodUtility.cs | 23 +++++- .../HistoryEventDefOf_Milk.cs | 2 + 5 files changed, 81 insertions(+), 25 deletions(-) diff --git a/CRIALactation/1.3/Assemblies/CRIALactation.dll b/CRIALactation/1.3/Assemblies/CRIALactation.dll index 0bb7276edd4292aea51ac60363ec4e6e22df9eb0..b32b2ffb1c362d92fa06cfb74e88eb120f399c33 100644 GIT binary patch literal 26112 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 DrankMilkRaw - + DrankMilkMeal - + + + DrankNonMilkMeal + + + diff --git a/CRIALactation/Defs/PreceptDefs/Precepts_Lactating.xml b/CRIALactation/Defs/PreceptDefs/Precepts_Lactating.xml index 00c59d7..3e0fc73 100644 --- a/CRIALactation/Defs/PreceptDefs/Precepts_Lactating.xml +++ b/CRIALactation/Defs/PreceptDefs/Precepts_Lactating.xml @@ -16,7 +16,7 @@ High 20 100 - Milk from breasts is creamy and delicious. It should be produced and consumed on a regular basis. Lactating colonists will produce double the normal amount of milk. + Milk from breasts is creamy and delicious. It should be produced and consumed on a regular basis. Lactating colonists can be converted to hucow, which will produce double the normal amount of milk.

  • Lactating_Essential @@ -27,14 +27,18 @@ Lactating_Essential_Social true
    • +
  • + DrankNonMilkMeal + DrankNonMilkMeal_Essential +
  • DrankMilkRaw - DrankMilkRawReligion -
    • + DrankMilkRaw_Essential +
  • DrankMilkMeal - DrankMilkMealReligion -
    • + DrankMilkMeal_Essential + @@ -69,8 +73,6 @@ - - Lactating_Essential_Social Thought_SituationalSocial @@ -86,36 +88,62 @@
  • - -20 + -10
  • - -40 + -15
    • - - DrankMilkRawReligion - 1 + + DrankMilkRaw_Essential + 1
  • - - The taste of breast milk from humans is a taste of the gods! - 10 + + The taste of fresh breast milk is sweet, fulfilling, and intimate. + 6
    • -     +     - - DrankMilkMealReligion - 1 + + DrankMilkMeal_Essential + 1
  • - - Human breast milk with a meal is just the best! - 20 + + The breast milk accentuated my meal beautifully. + 2 +
    • +     +     + + + DrankNonMilkMeal_Essential + 1 + +
  • + + I had to eat food that wasn't produced from a person's breasts. My beliefs strictly forbid such things. + -2 +
    • +     +     + + + NoRecentHumanMilk_Essential + Thought_Situational + CRIALactation.ThoughtWorker_Precept_NoRecentHumanMilk + True + +
  • + + It's been so long since I've tasted the milk of a woman's breasts. I should have had some by now. + -6
    • diff --git a/CRIALactation/Source/HarmonyPatches/HarmonyPatch_FoodUtility.cs b/CRIALactation/Source/HarmonyPatches/HarmonyPatch_FoodUtility.cs index c60c105..d4c175e 100644 --- a/CRIALactation/Source/HarmonyPatches/HarmonyPatch_FoodUtility.cs +++ b/CRIALactation/Source/HarmonyPatches/HarmonyPatch_FoodUtility.cs @@ -23,10 +23,14 @@ namespace CRIALactation [HarmonyPatch(typeof(FoodUtility), "ThoughtsFromIngesting")] public static void Postfix(ref List __result, ref List ___ingestThoughts, Pawn ingester, Thing foodSource, ThingDef foodDef) { + /** + * checks if food has milk or not + */ if (ingester.Ideo != null) { - + + CompIngredients ingredients = foodSource.TryGetComp(); if (foodDef == ThingDefOf_Milk.HumanMilk || foodDef == ThingDefOf_Milk.HumanoidMilk) { AddThoughtsFromIdeo_Patch(HistoryEventDefOf_Milk.DrankMilkRaw, ingester, foodDef, FoodUtility.GetMeatSourceCategory(foodDef)); @@ -34,6 +38,11 @@ namespace CRIALactation __result = ___ingestThoughts; } + else if (ingredients == null + || !(ingredients.ingredients.Contains(ThingDefOf_Milk.HumanMilk) || (ingredients.ingredients.Contains(ThingDefOf_Milk.HumanoidMilk)))) { + AddThoughtsFromIdeo_Patch(HistoryEventDefOf_Milk.DrankNonMilkMeal, ingester, foodDef, FoodUtility.GetMeatSourceCategory(foodDef)); + __result = ___ingestThoughts; + } } @@ -57,5 +66,17 @@ namespace CRIALactation } + [HarmonyPatch(typeof(FoodUtility), "GenerateGoodIngredients")] + public static void Postfix(Thing meal, Ideo ideo) + { + CompIngredients compIngredients = meal.TryGetComp(); + + if(ideo.HasPrecept(PreceptDefOf_Lactation.Lactating_Essential)) + { + compIngredients.ingredients.Add(ThingDefOf_Milk.HumanMilk); + compIngredients.ingredients.Add(ThingDefOf_Milk.HumanoidMilk); + } + } + } } diff --git a/CRIALactation/Source/HistoryEventDefOf/HistoryEventDefOf_Milk.cs b/CRIALactation/Source/HistoryEventDefOf/HistoryEventDefOf_Milk.cs index 0e17b05..2cb99f2 100644 --- a/CRIALactation/Source/HistoryEventDefOf/HistoryEventDefOf_Milk.cs +++ b/CRIALactation/Source/HistoryEventDefOf/HistoryEventDefOf_Milk.cs @@ -18,5 +18,7 @@ namespace CRIALactation public static HistoryEventDef DrankMilkRaw; public static HistoryEventDef DrankMilkMeal; + + public static HistoryEventDef DrankNonMilkMeal; } } From ef4b1dc57ed235168fffe4ec8038dd382c7fa47b Mon Sep 17 00:00:00 2001 From: c0ffee Date: Wed, 17 Nov 2021 11:52:07 -0800 Subject: [PATCH 7/7] bugfixes --- .../1.3/Assemblies/CRIALactation.dll | Bin 26112 -> 26112 bytes .../Defs/PreceptDefs/Precepts_Lactating.xml | 10 ++++++++-- ...oughtWorker_Precept_Lactating_Essential.cs | 14 ++++++++------ ...rker_Precept_Lactating_Essential_Social.cs | 13 ++++++++----- 4 files changed, 24 insertions(+), 13 deletions(-) diff --git a/CRIALactation/1.3/Assemblies/CRIALactation.dll b/CRIALactation/1.3/Assemblies/CRIALactation.dll index b32b2ffb1c362d92fa06cfb74e88eb120f399c33..ef1e04b0c684c3561d2788d8c14f7395b60a4295 100644 GIT binary patch delta 8237 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 diff --git a/CRIALactation/Defs/PreceptDefs/Precepts_Lactating.xml b/CRIALactation/Defs/PreceptDefs/Precepts_Lactating.xml index 3e0fc73..d19760d 100644 --- a/CRIALactation/Defs/PreceptDefs/Precepts_Lactating.xml +++ b/CRIALactation/Defs/PreceptDefs/Precepts_Lactating.xml @@ -48,9 +48,15 @@ CRIALactation.ThoughtWorker_Precept_Lactating_Essential
  • - + I'm a good cow to be producing milk. Moo! - 8 + 7 +
    • + +
  • + + I'm glad I can support my colony by producing some milk. + 3
  • diff --git a/CRIALactation/Source/Thoughts/ThoughtWorker_Precept_Lactating_Essential.cs b/CRIALactation/Source/Thoughts/ThoughtWorker_Precept_Lactating_Essential.cs index 8b7468c..21353a6 100644 --- a/CRIALactation/Source/Thoughts/ThoughtWorker_Precept_Lactating_Essential.cs +++ b/CRIALactation/Source/Thoughts/ThoughtWorker_Precept_Lactating_Essential.cs @@ -23,28 +23,30 @@ namespace CRIALactation return false; } - if(!LactationUtility.HasMilkableBreasts(p)) { return false; } - - if(LactationUtility.IsLactating(p)) + if (LactationUtility.IsHucow(p)) { return ThoughtState.ActiveAtStage(0); } + if (LactationUtility.IsLactating(p)) + { + return ThoughtState.ActiveAtStage(1); + } if(ExpectationsUtility.CurrentExpectationFor(p).order <= ExpectationDefOf.VeryLow.order) { - return ThoughtState.ActiveAtStage(1); + return ThoughtState.ActiveAtStage(2); } else if(ExpectationsUtility.CurrentExpectationFor(p).order <= ExpectationDefOf.Moderate.order) { - return ThoughtState.ActiveAtStage(2); + return ThoughtState.ActiveAtStage(3); } else { - return ThoughtState.ActiveAtStage(3); + return ThoughtState.ActiveAtStage(4); } } } diff --git a/CRIALactation/Source/Thoughts/ThoughtWorker_Precept_Lactating_Essential_Social.cs b/CRIALactation/Source/Thoughts/ThoughtWorker_Precept_Lactating_Essential_Social.cs index 98d75e2..b5853ec 100644 --- a/CRIALactation/Source/Thoughts/ThoughtWorker_Precept_Lactating_Essential_Social.cs +++ b/CRIALactation/Source/Thoughts/ThoughtWorker_Precept_Lactating_Essential_Social.cs @@ -17,24 +17,27 @@ namespace CRIALactation if (!LactationUtility.HasMilkableBreasts(otherPawn)) return false; - if(LactationUtility.IsLactating(otherPawn)) + if (LactationUtility.IsHucow(otherPawn)) { - return ThoughtState.ActiveAtStage(0); + } + else if (LactationUtility.IsLactating(otherPawn)) + { + return ThoughtState.ActiveAtStage(1); } if (ExpectationsUtility.CurrentExpectationFor(p).order <= ExpectationDefOf.VeryLow.order) { - return ThoughtState.ActiveAtStage(1); + return ThoughtState.ActiveAtStage(2); } else if (ExpectationsUtility.CurrentExpectationFor(p).order <= ExpectationDefOf.Moderate.order) { - return ThoughtState.ActiveAtStage(2); + return ThoughtState.ActiveAtStage(3); } else { - return ThoughtState.ActiveAtStage(3); + return ThoughtState.ActiveAtStage(4); } }