From 7c98a49ee3f5f5314411b2a54a818b816ef31096 Mon Sep 17 00:00:00 2001 From: lutepickle <28810-lutepickle@users.noreply.gitgud.io> Date: Sun, 31 Jul 2022 06:07:57 -0700 Subject: [PATCH] Let CompExposeData load the base values properly when they're already extant --- 1.3/Assemblies/RJW_Menstruation.dll | Bin 164864 -> 164864 bytes .../HediffComps/HediffComp_Breast.cs | 6 +++--- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/1.3/Assemblies/RJW_Menstruation.dll b/1.3/Assemblies/RJW_Menstruation.dll index 2e854497f4c39e2b6374baa73a20d5944df7a456..50512b57b1cd944a8c6f00e025e07cb6c0b0dffb 100644 GIT binary patch delta 8341 zcmY+~34Dy#`UmjmH_0S3Bu(r|D@|tJ*AjIJdW*(Zw12HwV_&NGQnW;(bVI!&X=t@2 zxF{N16cNisi8exIlG>XPwM0ciRMi?S?G5!m%Oi%*r~TyX_nh;*=gd3rnZbGXM?Iu|3v&Rq|@iJX4*_5-*+AaQG#u%{Lw9bv(wPJjeUro zvrS8q;WNQ9ls`ThCd;sk3gwSF+}>f>)f#BEAaX+e@cOo?pNYU;lj4689h(N&{hB#! zcE9*Q+gfsn?GTq1@^){~TAHDh8uCh? z`69D_EVF#-GEru=Kjv%O_J(9siVk;9lIqHeXerfnmdsM9S7+HGV78WB>4H)s`L~=O zEN1ysW{K29=xaKnluR3A4@Rt`@pELBOu0`NMr@$_b4d2j$Mj}P12$1R@oLFy8`-j1 z;1-&uluTa^Es5Ah>2r04nxGw&qvWALu`@fUNGX~8qn8Hkpc(UIWeUwnxE`^Swl2_` zp72LR7Ij;w74VAFwTCj7knEpAcSD@6y_Ei?4mS_2<@%nsE|ba^ukX@;T*_0@Tbf5l zs}$kNql-$H;T+J=^#d8p<+#geSwG5kkcP0F1FlCLqPVK;rP@bmij>8#(@~nKLfK+| z@KIXmHSieS@fuh_^p$LpPwNM^b`_Fa$wOfS+PRKXOC^1w$LU3-WXC9X4vte#UFlpg zMCwf?OHXs0X6X=54*;E@rCMsz6O^fxO!ZsI%r{N8_h3prsrsyMqolg9TpgrdR?-)9 zf_f+=(s-xLMrc{|u001QXoBJ*+8qCXt`jszDV3~216(I*HD{j>8s|DiS)7d?KE-v0 z-dH6sMz<)Yu}b-LA^KxiG5vS-0?jd$sUC$vz@u`D6g zb)HID8xj@^U1LoNb@`M~$8%D`I`#I@(r33)jiYd}neUsebGAxH}W15?Bu> zSiw|6A2J)qN82vYe^{;JgXsdTWStR@mQpI(pr@(bya|<3;|#48AugX%TB1eU2j8w< zO6xhZ#>>hqrF>_L1gQ=i^|<~0T$UI(jOi!VR7#nwPsVL>iH59+jdM^+u1q~Jsd2eb za~8z?Tt;nJ-zfEFtuVH^%IE{7e0op=R7M9k$yxGAKIE-3I>VGFz(qR8lF$50G-I=B zNGscBxh~P4tS{TycKoxYK^;%pxDo8x)#IF>3S7di+;m$`o>bgU{v$O`q z6}kSPBfGW6i#PK-%a#$W2Cew!_W$62Z)=OfAl{Alap~X2@CEa2TX?xN2fD#Yr%5COvu7|Xb z^-=-|*l|#2x?x<$x)~?SN-|Hz9=ZtswHH{l9N)2^iq#MTz-f-rOrQnru$>% zDH$fyrm(+V{s=lP<-zVS_&X7*luXOR#3vbaV|_8+&s`0ZS}Oe-Na4P2cMvwS8u@^Nv5Vz#NbO^#RhK#_Wr=~)0ws@gIQ}WAVpfwNsY|Re zO4nH#O6GalKE<(CJRyQHQAxkkgE5aK-`c^LuPfCeYGApNC6Amj;Wc2EsA*JK6HS$5 z*4SMW%UNY{ZQOP6hgYRI0x!sMsdT)37k54MR$4^s;(NP8uv1ANPW7>`D*KnaJ_<_3 zFj{1Z7USK|;*B!NRBAZ!J$D3lD9LF)a=S3DRtB+G){zQP~FS9n-&HY#zyg5Rrj#r-NGe^qljg3SZfVlb5T zn_)?Q&df8U_OebX-DYi9GOp@rTB>RKvm%scvEEVI&6=fjO-b)s3|_k?XGw8<6w}@k z4F_pbP`jJ%7%X9Z+~Tgg2exUc+p;IVeL@9Xnd?3t)Dy|q)uhzC?E`mD1mDmtBHhup zUI=0R(xwUZLUY#L=kjYa2ZUx|JL}c3c}5~muv&CpY|O+J)~4Ydoii~_oNaQJ?XN5|l5m6- z8lG-^3=-dUWR?@L(U^@$*8Q+U_zaz-ED-`JDg3mNibN&rGS-hQH5Out z;$@s{RBHSOTa@&jzX-dO^rVZB`$TqFDTx-)@5UnB^{QM9n>e7wb56Z07NeR{5@n&% zSd98w7QN;Ja|uiio7yXlFVTrrc3W>~1 zB3zA6SfALU%r#i4q+6t8J!d82hD^tIPh`2At@3MarlU+rU+7xg@Ty#kyIgsnqAYVQ z0&B??Ceb@KxA`^du-f~&&2NiQkWLMVs3{kof(h*Z*(Zo)skN;jcBSFS}La}(mcvdwsxvm<_k%*~jsq-WWJ zguW`GOYH^t7j5Bv(gIAb^9h^<^n`~yGUR}M3 z{sA4#-Dt;3b51tD#R^tdU3p28;~N2I^UlSFs09@o`?>h-HBz zL-(MylAb099XSj4f7#5zKqbAwdoj|haxcbl&$9ivs6x43yC{9YrSe&p3wm0$fNYqH@3d6IT;y^lpPjil z#F=cEiz3cs!(7yRM$aOjow*2?di3X?xoD)qB$^=JT)B8rNncDZ`td+{F&I=^ zwEDA;uiJxKO8UO=pmUY%VqAif{`i`Qt4jJV$-~{MN>CpDR!XvHlg~0U4}RgYMG`sf z%glT{#d;|81M0Gl`ncT((17)V-|bol5ydiTm3av5Sx)CN^Dtg!I@tkZ7akvE!DmdCppW0%Ze5QFK{@yXO>wA!_+Ng`$9aYq+jhqv{Fi< zIpQWQ#3UvC`WC`^qH-2jp2T`F=UlJsI2LpE&?yET$GWP}PAA||(%W4G66=(2QMtk* z_%?jJ!XiW{l{#;X-Deh|v6fn45t?%*Z|5Sk;cRHHd{H@-B^PKFAxTlMq6l-9^m>c1 zSSg9Vp-Q6&8@wt{;v28Zlh{*L3G*cKShvK7w4ZR)YuqWE@fvr^LaEolQ~1?u;Az~h zDz(!Y1T@lnAz%Bm=*E&ea~78xKi-+Mph#7zcIGS`T54y`B8W4&GiPCia45ItEQYe= z)||yiC4K9i#SG45`(k9XWcy;o{Nr)^VvJSNFHA8Kv{d_Iyw90zUyKY(kGH)_&*L2~ZD6Z3&f^PKqNCC%K?duS>XpU?-`OfIs4Qv&ioA(tj*%n#x?jysq;^lUPq9iyteM*gujk3CA~8@5UHdq zZ=eNN{%Zf#yn$}46vUY~5zDIYchkIu*Q>_a={7!4(r@hwOp~(syZ4+1EYLpaQupdCyefu#&t`yHGi2@|L}WD=c}--oe3^vR^CR z@D2(U^=Wtqr?s52;T>GyOg6lO=DWHK#lLr4*9(?m?(1Q7=V^*)&9^15N!^XvbPPMJ5d5Ztd ofE;vN{v46&s*8)e_D!?BAijD|xBbt@<{Q1M#!TByq(=GwKiDC@B>(^b delta 8321 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 diff --git a/1.3/source/RJW_Menstruation/RJW_Menstruation/HediffComps/HediffComp_Breast.cs b/1.3/source/RJW_Menstruation/RJW_Menstruation/HediffComps/HediffComp_Breast.cs index ef7d103..1a78f20 100644 --- a/1.3/source/RJW_Menstruation/RJW_Menstruation/HediffComps/HediffComp_Breast.cs +++ b/1.3/source/RJW_Menstruation/RJW_Menstruation/HediffComps/HediffComp_Breast.cs @@ -144,9 +144,9 @@ namespace RJW_Menstruation if (Scribe.mode == LoadSaveMode.LoadingVars) { // For compatibility - Scribe_Values.Look(ref baseAlpha, "alphaPermanent", -1, false); - Scribe_Values.Look(ref baseAreola, "areolaSizePermanent", -1, false); - Scribe_Values.Look(ref baseNipple, "nippleSizePermanent", -1, false); + Scribe_Values.Look(ref baseAlpha, "alphaPermanent", baseAlpha / 2, false); + Scribe_Values.Look(ref baseAreola, "areolaSizePermanent", baseAreola / 2, false); + Scribe_Values.Look(ref baseNipple, "nippleSizePermanent", baseNipple / 2, false); baseAlpha *= 2; baseAreola *= 2; baseNipple *= 2;