From a35b44f53148f3c04cf3ab425a1064807e03d1bb Mon Sep 17 00:00:00 2001 From: c0ffee Date: Tue, 16 Nov 2021 21:51:56 -0800 Subject: [PATCH 1/4] tweaks --- CRIALactation/Defs/JobDefs/Jobs_CRIALactation.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CRIALactation/Defs/JobDefs/Jobs_CRIALactation.xml b/CRIALactation/Defs/JobDefs/Jobs_CRIALactation.xml index 970f70b..776d708 100644 --- a/CRIALactation/Defs/JobDefs/Jobs_CRIALactation.xml +++ b/CRIALactation/Defs/JobDefs/Jobs_CRIALactation.xml @@ -6,4 +6,4 @@ stimulating TargetA's breasts. true - + From e1270b44124365daf8906f39b979147efc4e81d2 Mon Sep 17 00:00:00 2001 From: c0ffee Date: Wed, 17 Nov 2021 13:47:10 -0800 Subject: [PATCH 2/4] undid hucow --- .../1.3/Assemblies/CRIALactation.dll | Bin 26112 -> 26112 bytes .../Source/HediffDefOf/HediffDefOf_Milk.cs | 1 - CRIALactation/Source/LactationUtility.cs | 3 +-- 3 files changed, 1 insertion(+), 3 deletions(-) diff --git a/CRIALactation/1.3/Assemblies/CRIALactation.dll b/CRIALactation/1.3/Assemblies/CRIALactation.dll index aaf664be57a5f1a84ef785f44696ee69cf406be3..ef1e04b0c684c3561d2788d8c14f7395b60a4295 100644 GIT binary patch delta 4131 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 delta 4138 zcmZu!3vg8B6+ZvnyLWf*W*^zj?%ut3lTFBLvyWtxAQ0FDsi0zjpooGmNYSZ+n3lB< zTy_({c8W+L{#vWR_-K8Efw6TJ#g4X&3fAIt)WOnPGm~-D`kJwJ&>2I|`R@&^v|%{+ z|IYc&<3H!#Ll`;6Mvk#vzm!|YpMPoe_86NS9lMC-PM+sv&B3d*xCT50fm# zB2~_GEtGtGP-#k$b!ZWQnh7}y{rD6#p$QW?jC_wPZ9u6S`5J#oNoW+PU6o4YI~C9m zB|mpMT3SOCa4`mQJJL;{m@!3`C8(TIMEP<@+$&1+NreHCmv3=&ux9?aqeZI>qJcE+ zn^JP_6-p`0zi@Q12yb*^ReZoX9?f93~VUUfiXUFDs=Rg4Ar=l<3PgUUm`kO0)tfIC3eRJe!?JpvmLvxr=&c85ML1%GGju9!MK*x4{oh{iNdM7YFo)7?lwz zQc;nl6cPtW%|-4Jlgs-9_0@u}Yy4Y5Fy3QhP-H~~_{7V--hv9t25dSqks zgsMQAq2FTk!tYR&9zv0L7)83rWDGrmKoYdbiq59fZv4|=>-WwIQN&l7dQIs?ujwF_ z#xO!nejiGcpj8m~Wi`#i!Yx{%MK?&b(GC7@2K_85UWTqwB{?H2#1&0kae+zMg)2!ho_0k$_LFF)$Xvbmd)R{DK>3dS(dIo@Lu!tn*p%y36@QN9JI20UC zkx!&ZI?-YgBmWqMXeU#FWF(>D&|9W}`wYM^XrEND1xo%t@_HPFNu09bg)Lk8e{6hN zxO&)3WCp_9o8+N`NX9bBXcV71?HQR0i=$NXPoqAJ$>C4o#34LeHI~}Yt2q;CDN)ZR zmCK0x4BDGV$Wr_xg)?IpQ@Gn?N&9XK#9XO26>}Bv^jI+|brdP)SgGM>#wywop=;uvWb7s%rTK&RnpEBD3NwKMSt3GcZG@_{QgL|Elci^ zBC*8C=pgDP!&JRpQX$L#8Hr@cYF0?O&QwTxb8W1$D(pf{v5U88T|HOfa&0UDyoAr& zaW^$CyLrP6H~k=wjfP97100u8w|p6-djR~XYrJ6j!uj~j@lmatb@3OqC)xLTAzBPR zVXUyJ@Qjn>_0AXUDy-*jeYYg({82r|j_?=tws@;C?or^c@@-Wryd5CY)iHAL`$*o$ zJ;po?I$$(8(DTWA2%}W&)gTQ zb@Yg+&AdC-7=6_k3#l;bqj-D6w^b?driY?#_UDb*2s?XQ!#@*%8gosJ;G4n8noGk#tFQae2h5Y-Bl@DK{%+9u{}HJzT1Ac*^PGxNiQLADUI z3g$Aw3_-hKu0`ZwVdxNOMDO&35OoT)5%blu@Gx`>$GO5W3^N2eA<}EOZ7AUhcc-VB z=`c&69f&fBW((xAY&n4rVrf0hfVp79((oRz053FOprryez#_0U_@P50TLKc73S%E~ z7eEp&7idsWJ75(kz+J1bpDu$RtZR>d628tJh7W{%Sx9>oX(n`%OZm5Ti`h=zA8$lC z6h9}vGs^7@ZjkzI3iJejgXbrKG#;hj#$YFZK0d&*JXrt8waj=8Uy@_ECGqzjV8*9* zA85EbO!OanHLSMKH##Umc-TUk-=&1$X$$>5sw-iTagmsQ(-aM|rxCAfcxU)rTo+{g zu;!#K4tHAUYu9|G9*$dRRPU$#ho3w#@7GV-8X;k!i{z8GCRlADzo%bmhSvqc4<+!B zy#*!&Is%66Vx0R$`r3-GfP^arbWjdU+&~(>+WhUqy zK>5vP%!WqXSSDilHuniM&c^U{n*--sXs%w5=ol_SfN|HG+SAG$c*{iWP>7f(EZeow zPDB%yZEf|l$n3@qiGB7BFsaG z&$3a%9B7s;TKx(#ue1;)%)uIg%rWI)h|sWg`yBjC7`MW9b{rjt1u{#^!My^Rz37EK z7NXL6!GDff+C1$&r57|4iPCx@ZrP}`UPxHBxBU~yTqn@5*^FMu3uq?ngO~*y zvJfTgg9#J4V$si)KKR74QS+5bidyQ+i@!~*yN@E2QJ}Hwu}d@xd{Wauh;LuwCs*}GC*xQ2~OdpJ)l z4z4vu*^k)1ntRzI*b+RzHnLOv%fvs}jr@(abJ!Eykz5=d)bF;WCuEAR(-mcCxT5jIzSWZTB7 z<$23Q&BF6cu$`lk($%zcOtqtmnSoe z7#rmM9s7B4Wvm>^9tdj#8wT_F!JAes8eDVp;LZ3e!>Xm%ZCF2eQ~9~`x2XQuf&)Lf z>zTa+BhDSqe!T6Suggm>Zt{5E+C=Yx`STgye2u~0FYmpkhn2mnzp+WsTduzLb2gfF F{1*?F;vxV5 diff --git a/CRIALactation/Source/HediffDefOf/HediffDefOf_Milk.cs b/CRIALactation/Source/HediffDefOf/HediffDefOf_Milk.cs index cd8ebf5..a722532 100644 --- a/CRIALactation/Source/HediffDefOf/HediffDefOf_Milk.cs +++ b/CRIALactation/Source/HediffDefOf/HediffDefOf_Milk.cs @@ -18,7 +18,6 @@ namespace CRIALactation public static HediffDef Lactating_Drug; public static HediffDef Lactating_Permanent; public static HediffDef Heavy_Lactating_Permanent; - public static HediffDef Orassan_Lactating_Permanent; public static HediffDef Lactating_Natural; public static HediffDef Hucow; diff --git a/CRIALactation/Source/LactationUtility.cs b/CRIALactation/Source/LactationUtility.cs index 14dbc0d..99be2a4 100644 --- a/CRIALactation/Source/LactationUtility.cs +++ b/CRIALactation/Source/LactationUtility.cs @@ -19,8 +19,7 @@ namespace CRIALactation p.health.hediffSet.HasHediff(HediffDefOf_Milk.Lactating_Natural, false) || p.health.hediffSet.HasHediff(HediffDefOf_Milk.Lactating_Drug, false) || p.health.hediffSet.HasHediff(HediffDefOf_Milk.Lactating_Permanent, false) || - p.health.hediffSet.HasHediff(HediffDefOf_Milk.Heavy_Lactating_Permanent, false) || - p.health.hediffSet.HasHediff(HediffDefOf_Milk.Orassan_Lactating_Permanent, false); + p.health.hediffSet.HasHediff(HediffDefOf_Milk.Heavy_Lactating_Permanent, false); } From 6731b1794057f66c74b6c2bb450c0e535b8b49c4 Mon Sep 17 00:00:00 2001 From: c0ffee Date: Wed, 17 Nov 2021 14:24:11 -0800 Subject: [PATCH 3/4] added stage --- CRIALactation/Defs/PreceptDefs/Precepts_Lactating.xml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CRIALactation/Defs/PreceptDefs/Precepts_Lactating.xml b/CRIALactation/Defs/PreceptDefs/Precepts_Lactating.xml index d19760d..ed4be1b 100644 --- a/CRIALactation/Defs/PreceptDefs/Precepts_Lactating.xml +++ b/CRIALactation/Defs/PreceptDefs/Precepts_Lactating.xml @@ -84,6 +84,10 @@ Thought_SituationalSocial CRIALactation.ThoughtWorker_Precept_Lactating_Essential_Social +
  • + + 15 +
  • 15 From 1d846d98a65371d0e6aed1f0bb43652d22cbff9d Mon Sep 17 00:00:00 2001 From: c0ffee Date: Wed, 17 Nov 2021 20:15:49 -0800 Subject: [PATCH 4/4] hucow required precept --- .../1.3/Assemblies/CRIALactation.dll | Bin 26112 -> 26112 bytes CRIALactation/Defs/MemeDefs/Memes_Hucow.xml | 1 + .../Defs/PreceptDefs/Precepts_Lactating.xml | 159 +++++++++++++++++- CRIALactation/Source/LactationUtility.cs | 4 +- .../PreceptDefOf/PreceptDefOf_Lactation.cs | 1 + .../Source/Precepts/PreceptComp_Lactation.cs | 5 +- 6 files changed, 165 insertions(+), 5 deletions(-) diff --git a/CRIALactation/1.3/Assemblies/CRIALactation.dll b/CRIALactation/1.3/Assemblies/CRIALactation.dll index ef1e04b0c684c3561d2788d8c14f7395b60a4295..185541047f226bf3ce2abf51e4a4d8c930087828 100644 GIT binary patch delta 3184 zcmZuz3v63g8UD|;b7DJo634Z#UwJsG6UUC93C+?vX@REg+N|l;b?L^GG^CKOWecmz zqqsLtw{EaeXrcp%sjVomF$GOxtsz@iO$@1IMe8;dZBnM9v9Q9B*wkq%6cFYNFo#WAWAT0Sz0BrCl&GpUPx{0i zywgQ+VgSGvcUR`O;1lgXT#qGOhbsKosl=`Fz&i#2yrv>@HivVa^{UA8xT| z|6*~IV}rsn#bY(!WT61&p+rs~snz3alt*2uDwtvb2%SnkAiABIZc>4gZy<4=>dj*t zY+q5a4~eduEfXh^i~G?mPB~j{qfL=E0B*N*D4yue>PQ4BhqdSX*kBAHopapcGCR#3 zp9W?BQ4@Swx0iUexV_FF3Q`)XMoFnr#VubTwidPXx>jtdYjR4Jw@f7t)rAVu>MOIN z6YxYElsqv}f9}Va{5O^$xKavy78AoFs2M0}EOmO7JoQR;t+Pt;NNjvd_}+*Qjk>_24V_A4GfJX+mB?`n1d2%uA!AIS1z+U^IGn%<;6@A@5`(TaW26E_ z$*;s`!~zi0T4|q0!_Jy-X+kwNPnz;%nfNJs&p(OFdy4a zEn;(@F-r{@MQd`oL)C}1_wcnM2$W@>hq21$&zfb zN>2{YshnOId5t=a6H_90(7+P89r&2SkJTJ)Hij4VPmW;=%7+<69*60t&UBEL&J%|{ z3;@Gm5>X-Ctrn7DiE;58x2q7NJ*q}F*<$G<_X~27ASzF*8nNNfTbDr94S;TtFL7)E z&;5vYoxw#HE^%0}!4?096Wcw`f*weBgw^Zfi8&NwnnVV)=azS>OKx$LJoh}>Js2E* z?TMVlcO%EicH9+?tF4pNvl73Hv@akZo+3s&NA7grT5KO$6z?ZnAm>WGDVwW=%VWi$ z)KQe^W2J`Q7^`ffJd{HinhqtEr^Urq)w?>0ug0NEmJMb3LESdRsMGyR|Xax99}U$Znwdkb!5LMNSfLj zT2BZ^;6cS16jK3@|8M^1m<>J(&?=;h$7<=lA}F2>46_$SO|ZUlmE7GdI)g2~R|2zc z8_d+4ui$Xf^SGVE?;RB9t70O!kM)bo!OyWLMR)xZY*AdQ4;4I+1cr6&_NN_g=7F?C z2d!yGJ)%xHj0b3~Bkkx153G{tvW<`zx~1}RRoW3|ez--V?;wgJS}jqH!DS_yTakA3 zumG$D6RSlFKtBZfVZDUgBn-g-m_oIXREUhgos#QAZ9ha|NTN}xOu`6o5Y`balLy3H z!#b?zdP7oq%`ci8KV)&?YI-_W^1qJFy@(eIzz?A0|Dd7@v`G@#m)Y znv%bndm)9VODc->p^dC?D}MU`k9y;EoKli#9y;vz@CfWH!JICYjY5@<|QuqWcNJM0wC*V;$SW8?Aj!EEze+R@gH^|P8tiz@0L;T%)yH`Tb{Qyb{R!`a_Y(!3?6N+? zyP+CS&QieDpe`eZ6VFJr$YyaQYoNwFQFZE2wRiwx>EAeqEttcPcaHcO-j%))?yC}0+@;en=ri`}8HVT~gQMp6 z!4U&dz&=>ekrjMbc^|xEaMb)hc+cP{U>{sFxH;$FQQ3|EY66JiaF%JsqEDR;=FjZ5- delta 3145 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 Ygli;SZP@WI6MwZ(b?>^!CUchm0@ng4Bme*a diff --git a/CRIALactation/Defs/MemeDefs/Memes_Hucow.xml b/CRIALactation/Defs/MemeDefs/Memes_Hucow.xml index f70d22a..d115507 100644 --- a/CRIALactation/Defs/MemeDefs/Memes_Hucow.xml +++ b/CRIALactation/Defs/MemeDefs/Memes_Hucow.xml @@ -18,6 +18,7 @@
  • Lactating_Essential
  • +
  • Lactating_MandatoryHucow
  • IdeoRole_HucowHandler
  • diff --git a/CRIALactation/Defs/PreceptDefs/Precepts_Lactating.xml b/CRIALactation/Defs/PreceptDefs/Precepts_Lactating.xml index ed4be1b..6d76e2d 100644 --- a/CRIALactation/Defs/PreceptDefs/Precepts_Lactating.xml +++ b/CRIALactation/Defs/PreceptDefs/Precepts_Lactating.xml @@ -9,6 +9,8 @@ UI/Issues/Lactating + + Lactating_Essential Lactating @@ -86,7 +88,7 @@
  • - 15 + 20
  • @@ -157,4 +159,159 @@
  • + + + + + Lactating_MandatoryHucow + Lactating + + High + +
  • Hucow
  • +
    + 10 + 100 + Breast milk is the most natural sustenance. For all sizeable bosoms, maximum expression and hucow conversion is a duty. To not produce or eat a meal without breast milk is unthinkable. + +
  • + Lactating_MandatoryHucow + Colonists with sizeable breasts must become hucows + true +
  • +
  • + Lactating_MandatoryHucow_Social + true +
  • +
  • + DrankNonMilkMeal + DrankNonMilkMeal_MandatoryHucow +
  • +
  • + DrankMilkRaw + DrankMilkRaw_MandatoryHucow +
  • +
  • + DrankMilkMeal + DrankMilkMeal_MandatoryHucow +
  • +
    +
    + + + Lactating_MandatoryHucow + Thought_Situational + CRIALactation.ThoughtWorker_Precept_Lactating_Essential + +
  • + + Watching people's satisfied faces drink what I expressed gives me a motherly sense of pride. I'm the colony's cow. Moo! + 8 +
  • + +
  • + + I'm producing milk, but I'm not a cow yet. + -1 +
  • + +
  • + + It pains me to think my breasts aren't producing milk when we need it most. + -3 +
  • + +
  • + + My milk has run dry. I'm so embarrassed I don't think I can show my face in public. + -6 +
  • + +
  • + + What's my purpose if I have breasts but can't express milk? I'm useless! + -9 +
  • +
    +
    + + + Lactating_MandatoryHucow_Social + Thought_SituationalSocial + CRIALactation.ThoughtWorker_Precept_Lactating_Essential_Social + +
  • + + 25 +
  • +
  • + + -2 +
  • +
  • + + -5 +
  • +
  • + + -10 +
  • +
  • + + -15 +
  • + +
    +
    + + + DrankMilkRaw_MandatoryHucow + 1 + +
  • + + So divine, so succulent. Our cows produce delicious milk. + 7 +
  • +
    +
    + + + DrankMilkMeal_MandatoryHucow + 1 + +
  • + + The breast milk accentuated my meal beautifully. + 3 +
  • +
    +
    + + + DrankNonMilkMeal_MandatoryHucow + 1 + +
  • + + Gross! I had to eat food that didn't contain breast milk. This is a disgrace to my beliefs. + -4 +
  • +
    +
    + + + NoRecentHumanMilk_MandatoryHucow + Thought_Situational + CRIALactation.ThoughtWorker_Precept_NoRecentHumanMilk + True + +
  • + + I haven't had breast milk in days. My body feels weak. + -7 +
  • +
    +
    + diff --git a/CRIALactation/Source/LactationUtility.cs b/CRIALactation/Source/LactationUtility.cs index 99be2a4..a32e055 100644 --- a/CRIALactation/Source/LactationUtility.cs +++ b/CRIALactation/Source/LactationUtility.cs @@ -71,13 +71,13 @@ namespace CRIALactation var drugLact = p.health.hediffSet.GetFirstHediffOfDef(HediffDefOf_Milk.Lactating_Drug); if(drugLact != null) { - drugLact.TryGetComp().ticksToDisappear = 600000; + drugLact.TryGetComp().ticksToDisappear = 1800000; } var naturalLact = p.health.hediffSet.GetFirstHediffOfDef(HediffDefOf_Milk.Lactating_Natural); if (naturalLact != null) { - naturalLact.TryGetComp().ticksToDisappear = 600000; + naturalLact.TryGetComp().ticksToDisappear = 1800000; } } diff --git a/CRIALactation/Source/PreceptDefOf/PreceptDefOf_Lactation.cs b/CRIALactation/Source/PreceptDefOf/PreceptDefOf_Lactation.cs index ac0a438..0418597 100644 --- a/CRIALactation/Source/PreceptDefOf/PreceptDefOf_Lactation.cs +++ b/CRIALactation/Source/PreceptDefOf/PreceptDefOf_Lactation.cs @@ -17,6 +17,7 @@ namespace CRIALactation } public static PreceptDef Lactating_Essential; + public static PreceptDef Lactating_MandatoryHucow; //public static PreceptDef IdeoRole_Hucow; } diff --git a/CRIALactation/Source/Precepts/PreceptComp_Lactation.cs b/CRIALactation/Source/Precepts/PreceptComp_Lactation.cs index ba9cdf0..57e788c 100644 --- a/CRIALactation/Source/Precepts/PreceptComp_Lactation.cs +++ b/CRIALactation/Source/Precepts/PreceptComp_Lactation.cs @@ -16,8 +16,9 @@ namespace CRIALactation public override void Notify_MemberGenerated(Pawn pawn, Precept precept) { - if(precept.def == PreceptDefOf_Lactation.Lactating_Essential && - LactationUtility.HasMilkableBreasts(pawn)) + if((precept.def == PreceptDefOf_Lactation.Lactating_Essential + || precept.def == PreceptDefOf_Lactation.Lactating_MandatoryHucow) + && LactationUtility.HasMilkableBreasts(pawn)) { if (!LactationUtility.IsLactating(pawn))