From 6dc73a848eee867d679e4e00af7fcb4fa7b705b1 Mon Sep 17 00:00:00 2001 From: lutepickle <28810-lutepickle@users.noreply.gitgud.io> Date: Sat, 29 Apr 2023 17:49:02 -0700 Subject: [PATCH] Give the ovulation stage the color of the sex drive --- 1.4/Assemblies/RJW_Menstruation.dll | Bin 212480 -> 212480 bytes .../HediffComps/HediffComp_Menstruation.cs | 3 ++- .../RJW_Menstruation/TextureCache.cs | 15 +++++---------- .../RJW_Menstruation/UI/Dialog_WombStatus.cs | 2 +- 4 files changed, 8 insertions(+), 12 deletions(-) diff --git a/1.4/Assemblies/RJW_Menstruation.dll b/1.4/Assemblies/RJW_Menstruation.dll index 3a5e8351dcbf7cfd2bd204225a59fbede3d3b8c7..14f759709ebd9dad17bdf2e001106a3ba0a8cd28 100644 GIT binary patch delta 8764 zcmb_iXIPZiwqASBFyKfL6&p+hsnZ9QCWI5^`;zMq`Vds4Cs*_#{#V$YyZN zPAW!Et0~Y_4mYQ*_3RAWG+RA=!Bxxg<1UHR7XqU{c(^|*{b^VtB`~(*E}1XP3FJ{X zcaG0>9JhS5)zcBG`tEKMm7d(cl=#B0OG?piox8{%J9Af5`jD2TguvaH1D-^X$_0@e zMdes^@%&PvfU@XuN&>!drgMd63$~|{wti*g)x`d z<`m*?{T*hy6MBt(okF6?TGl?5xcB`5W#1MgHdDZ%v3~6oJiF)M^e{f2!o?|(4o+9h zy@{UNT{u>b;JCCe$Kp{OF9&iw5O|a2r()Kd>`p2Pwywpj^E@6fx7ozc?gEWe-^GSL{>llB;CH{v5 ze|hc?-xyQp@fvAd&6Eyc|I{ITG>5NwJ8blSUyvp33oI>L?bG zM*PTRmXStUn-g&2>w0o5iQ(9zLxN}hqP@`0L(hawbhI-S*@)q`g@_3b+)i^WG-I>bdYvHJ=|#ZL#1G-- z>^*32XvgiC!~;0*0f+>a*`N4-)9|v+dIh(FczOwoD3o7AG+J}Jx%>{|_kw-JmU|)< zkFf~8%O6TS&8{rO1$-sc{uhe)1bJ4OH=p<=!L||XYl3Yj*v-8^q)?$P&ho#{n`iDI zWfO0aaL)VSRjcpp-H`5mqRv|ZZxIR9xQ$aP;07XJK!5Z+Z`K`gWb;1WJZTgrEtC&t zdlwN^*jViLIG1;Da^-l^As#&^91*3P^vjS$@4@Lo-8p($I2QXPV!HYwQkjDpmt{U? zji=(o&5i6VVG4P|$SWJ!YZ}=b8rfUWuC&^T7;bwIu`O_WmXh1!2)C!pPGN~wf&5}5 zOus1FX2PfT4?%QF5OJxsVrL`i)doB8lj;V0wf!x$>pfWx3RrD_S19)(X84WpY)6z& zQL_*4A|K@ydj4Vm7CjxO$bEPbc0OjTsQox44>$K|1+KEzh<_vap2h3ks}|h71T84n5pQD z%C-=KIF3Z9Tbc31^FXo?zAJ=tY`I8$XQS}JYz6K@(rbjV&NFQead!Al?E?@hI$ya}v)CM>CbyXxW8?u_hb;EB zx-$&y$t4z0T3)OD;HbnbJzuN+!8J^bHSO|R9RRr!8#42?IuPn4wkYVeItUVbiOQ7G zuUXqAmQ8IlV=}jD2avn~it>zP`j^@f@ zI5xtA?M5f@VAsXweI9W(2WTciZJa2%Gq}5E3Oth7fTVEERCpt?7Z{rciXozMKeFl2 zQewr(X25uft#FFb%!FKt-Cq`?Nq}!8W*awBlL!-r){hrs)+E7WiQ2|Z)XW0;Ffq8% zZKfs}OcEOvnW{;F--nAa|Hur@YzQ17GHqm@W-hcGC9;eC^EC6|zQj%XDV)7leoUt$+sFR>Y) zV(MybCD^8k9rBEKv}YkjV3sy{@kVkEnk^J#9eX~|o`ZOSor92w=h_P}S7N=R-)k?y z0fAMLFBi6Cw=gwn$=+b2YN@*dw}qIv@881%Q3+h>yIfF4ip>>%9#TVP}69nL{bjzM<|Vg)8B zS^Gj9)`taS6Xc_-fhR&tEU*?{NJ<)k~9ElOp_EUm6=(gu`a*C`l<5V_~5y z%U2bVB?LD@wUVqEU#4>=*G}=^IdE@9Kt+BLSS46b`9h~6@-KNT3!?iwYCapzoygS&$u};3q()%ppe}*v{RutKyH`SonF@9W zJ5Zu$ZaM8TYjNdi9W*~R$LreZQiDpc`V!kTdJQ%e#E~z0c5~BD6z}gw|$ttwL=CN3&5mK8bQaDix5xuzE-$=dImd{5+tdbZzi zm6(k6?3Cd;*(ovixbub|NV-XkxyOBHs3t`c^Gm8`ZMWe1+-H7Uu!xzOJEWwesGKzC ziJ^ux>m;&|BVVw*Ekqsu!tfIb4G^7c)qfZslF&erIrOnMJ|XudHW}Gdk{%?+79)E` zoV$q3(c?aQgUM8O#yZkDSab$^wKD!nCQIy|kBW8QisN}2|0Jfag2bl%WS#LHNtf6+ zll+ifmYDCP?#M256O}ioa&|gIWYwwN+1{-<&3^1_%&8h=d`}{K@z?`WwrIGK(g_ly z9fvc=ZMcs!S>J6$9aN>UqP0RS69(F*8Wr@B#O69wX{_l>iDf&c8g1yG68q9RjqS$n zB%58|hS#xxId4Z+#CmVXjW1wpL{=fP);ok)j~yf+yh>wF*GKTmGGUEesd1p&Bo=60 zrD;abNX$iEVsxYzCH4|y&FKw^-LS1^N_f z>?hvrVGgAjJH*0Ek$u6EN`*Sla#qBi^O%x(@4^STl5N|C&P(jOT_hm(nz23oJeHR$ zJ}IvBh`=)8z0D1yEB!~Km>aEtgd>Y}9-3@Y$J6G;XMvdb({(lP^t?m^;{+I?^205DosOK;-=WLmsDUj+V=BThU1yMhNiIeU^yGgMq zyXUOa=U8qBHu7__(81Z%mAVZVvz%7mV2?h>^^dr@Ly#=ZFYa>E!(H%XF@>~653 z=)~`?sVGr(Glfy*2(i0w({83-)J0+yG>skKOY$9*ntt@M43v#u8_--jdg zW3~J6Wc6a+`vn%YpNuufmGL$7}HSd zDY4-WF{WWuFR}Kv38vxHPhxl~H6!RSiPb7+n?}-c5_@l7r5Qyh3ryUP(KJztePvUs zA5E7vim`nMh%G5)ClBBV>k zeF(qp;1h8O7q*C19KwTB#r{Bs8#0CJr;4*5r&O{|hXv;}8r8@-?Xd9P?8g{(zj0W& z$HpT98+t@YX5mc9jvo<}q+Ez;c~i(@dBd2w94mXy)*&-jX;SIZ6meMVrd68Rbi2en z@d=zmzmnJ>$12TSdRt;A^Ci> zff5UpSD7`7Xg`TA#586)LSj!bO*)+`u|nI;rVP4LVmI+cTuir1Y&cYDGU-u?>6KNQ zEP731w@H;In?8`(28`v<-vuUax$_bVv&FiH+0+`BP;ZG@+tspLM{%8Qus28XN*y&V zr3vN^|aeJ``k$8hb>vWEgIcl?5k)U}BBv;|xGm4_`f zqvt&+IMR5Q@c_TcPG)N!kcnfPW4xEFHDVvxS`Ql-A#*{yTIPm$Q&#F>4>d9`v|q}? z5Pz4g!c2e4`k)Q+NYCb=l0U{?L5LJeAIHA;xWBi|Dgr(=_jb3s3Qiw~A^A9bJmSUhOeSq-xbk1Fch(Ckb9G+C4Jlx+xHDq zUWJmr&UDGN<5?^0B4FRZ8uZu&-$OefD%76)L+#hW zpx`ijUgH@1XxPbaJi<%UkA}K#HHK*LV;i56)-5taYPv?lsgN<>&9Hg`WA5e?VNGoKL$EAt%_z`UHF5Ff{L%+)?Z%o6b3EN*Aya=hE(8RBOD7l>QO z{*KtK%R5BtRQ$az3~kpGv9Q1a(RLZfn2sDny*c`HYSDm}=r(BU;#8u?jLp6=Jlz?0 zK8&ZC<6*%Q;l%A{9XZ|>@TLp5uWC4IlQ|CR<&GITeCmxD*q+;-q1<0IjAOWfy9J!r zk9!UX_;?Yw2Us4N@ShW&OynfijiW`t!Wca!x+N6xv4=m}0e$%V#97AXb30GKJ~7-L z5X@(JQp1PelgsVc8Qd1vhY;2wurG<^-Xs5TrG8 zd0o9@`F4n+O+r%l$$ij&c~TUj-=yJ)HB&j>OyyXS5s#R?c=~^^r)Kc|7B!pG6C3Ob zbED3E7td}8j7U#wuyq-W|JJr&%#V_o^p|u#@BduH-xb=HSAEBv+t9heF5mWwwEm^p zwH@a8Ha#>0c3-&euIds#to)mMv<3dU9{;mN`E487E?pb^7QN_^?lm?*@y|j0Q;Gkd zqmr%nlessO7wg;RKYP_HJ84Z^lFl`NUG|f0Y`!r@#`VI_F>bqB+**;{<*WT=GfBC9 UpzN)Te$%ljY1r)_TgCG_}9ShrD0`^|f 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 O@^+=}?Pbr< StageTexture = new Dictionary() { { Stage.Follicular, TextureCache.FollicularTexture }, + { Stage.Ovulatory, TextureCache.OvulatoryTexture }, { Stage.Luteal, TextureCache.LutealTexture }, { Stage.Bleeding, TextureCache.BleedingTexture }, { Stage.Pregnant, TextureCache.PregnantTexture }, diff --git a/1.4/source/RJW_Menstruation/RJW_Menstruation/TextureCache.cs b/1.4/source/RJW_Menstruation/RJW_Menstruation/TextureCache.cs index b1c3853..4c9c591 100644 --- a/1.4/source/RJW_Menstruation/RJW_Menstruation/TextureCache.cs +++ b/1.4/source/RJW_Menstruation/RJW_Menstruation/TextureCache.cs @@ -15,13 +15,13 @@ namespace RJW_Menstruation return milktexturecache; } } - // Sex drive - public static Texture2D SexDriveTexture + // Ovulation, sex drive + public static Texture2D OvulatoryTexture { get { - if (sexdrivetexturecache == null) sexdrivetexturecache = SolidColorMaterials.NewSolidColorTexture(0.686f, 0.062f, 0.698f, 1.0f); - return sexdrivetexturecache; + if (ovulatorytexturecache == null) ovulatorytexturecache = SolidColorMaterials.NewSolidColorTexture(0.686f, 0.062f, 0.698f, 1.0f); + return ovulatorytexturecache; } } // Bleeding, vulnerability @@ -93,7 +93,7 @@ namespace RJW_Menstruation public static readonly Texture2D GatherCum_Pussy = ContentFinder.Get("UI/Icon/ToPussy"); private static Texture2D milktexturecache = SolidColorMaterials.NewSolidColorTexture(0.992f, 1.0f, 0.960f, 1.0f); - private static Texture2D sexdrivetexturecache = SolidColorMaterials.NewSolidColorTexture(0.686f, 0.062f, 0.698f, 1.0f); + private static Texture2D ovulatorytexturecache = SolidColorMaterials.NewSolidColorTexture(0.686f, 0.062f, 0.698f, 1.0f); private static Texture2D bleedingtexturecache = SolidColorMaterials.NewSolidColorTexture(0.415f, 0.0f, 0.003f, 1.0f); private static Texture2D pregnanttexturecache = SolidColorMaterials.NewSolidColorTexture(0.082f, 0.453f, 0.6f, 1.0f); private static Texture2D recovertexturecache = SolidColorMaterials.NewSolidColorTexture(0.6f, 0.83f, 0.35f, 1.0f); @@ -101,10 +101,5 @@ namespace RJW_Menstruation private static Texture2D animaltexturecache = SolidColorMaterials.NewSolidColorTexture(0.411f, 0.521f, 0.878f, 1.0f); private static Texture2D lutealtexturecache = SolidColorMaterials.NewSolidColorTexture(0.843f, 0.474f, 0.6f, 1.0f); private static Texture2D whoredtexturecache = SolidColorMaterials.NewSolidColorTexture(0.7f, 0.7f, 0.0f, 1.0f); - - - - - } } diff --git a/1.4/source/RJW_Menstruation/RJW_Menstruation/UI/Dialog_WombStatus.cs b/1.4/source/RJW_Menstruation/RJW_Menstruation/UI/Dialog_WombStatus.cs index 9b726b2..2c8b4c8 100644 --- a/1.4/source/RJW_Menstruation/RJW_Menstruation/UI/Dialog_WombStatus.cs +++ b/1.4/source/RJW_Menstruation/RJW_Menstruation/UI/Dialog_WombStatus.cs @@ -433,7 +433,7 @@ namespace RJW_Menstruation float statvalue; const float height = 24f; statvalue = pawn.GetStatValue(xxx.sex_drive_stat); - FillableBarLabeled(lineRect, " " + xxx.sex_drive_stat.LabelCap.CapitalizeFirst() + " " + statvalue.ToStringPercent(), statvalue / 2, TextureCache.SexDriveTexture, Texture2D.blackTexture, xxx.sex_drive_stat.description); + FillableBarLabeled(lineRect, " " + xxx.sex_drive_stat.LabelCap.CapitalizeFirst() + " " + statvalue.ToStringPercent(), statvalue / 2, TextureCache.OvulatoryTexture, Texture2D.blackTexture, xxx.sex_drive_stat.description); lineRect.y += height; statvalue = pawn.GetStatValue(xxx.vulnerability_stat);