From 54dcac6d73a8c254722e9dbf1dc386adb7b6bd40 Mon Sep 17 00:00:00 2001 From: c0ffeeeeeeee Date: Sat, 6 Mar 2021 17:02:45 -0800 Subject: [PATCH] made Expose Data labels more descriptive for better mid-animation saving --- 1.2/Assemblies/Rimworld-Animations.dll | Bin 58880 -> 59904 bytes About/Manifest.xml | 2 +- Source/AnimationUtility.cs | 19 ++++++------- Source/Comps/CompBodyAnimator.cs | 38 ++++++++++++------------- Source/Settings/AnimationSettings.cs | 24 ++++++++-------- 5 files changed, 40 insertions(+), 43 deletions(-) diff --git a/1.2/Assemblies/Rimworld-Animations.dll b/1.2/Assemblies/Rimworld-Animations.dll index e4865dea4a797f537d5ba681a6b12f9e18e86579..ba7dc0eea73316747ecd0e2ee3270709e07e1eab 100644 GIT binary patch delta 5485 zcmai&3s6+&701uLyWD+n7g^X{0eLO3u!g7LEAfR7P*D-o1VvQj?FIxFA6Op?YHgxM zA)k}6iHX)G8Izb!rmG?87)aU-XeUv;SI2<6uzfSw3H zsvAIg$6qr-W~299lF|EwuEQBF=L#SrXQ3gQImI-#NJufie3@ME?<(6NB%08f=ex$< z7UE180ayU8v(JQt$W{!b&kXz%Aqe)j0_^nx2(0+h7=MxYmL$B(1k+Tj^rO^(?KF=C zFuO4(mDQT!^_VD??KQaso&OJ}1VM*c{1?s7ilMy%G!;86V^5(1qWAA?vt{J?+p74q zA_^ijHO|9);i1;hv?$QI7ZF&k)-)OPUMre0Me0(FcZuwdCDxLoO4%sovB;1(VUhpQ zkkVjbm49z!ujE^gc6TuL1meaCxM=SI6oxw7I3kiJl5~22G>IhaJHTr)Nh4570BD`$ za9fmMT)5s_jk3ex4pF3BlJ+PPmB_*x<4Ak2UqfjONuLjhoI;Xa&vKnM!&JJSq+Cy< z>jt`x^!-}TTL92n$S3Q`pUKln{{Cn3ERr*W0vpD=toJsf6ej#=Pr8_-e`xqvLClfZ#YdX)%U_(jM-Z1t{;O#>1hGwGr!s~`?2(}9 zkSo%(VK3gt4Y(HbAy<_5fb?u;jQF0!;xc1Q=g=iJ$on^mdF+(vTmpqp;7TGDJ_ z@P3a9&Ar>!cp3F%l%6xNU71^5x z%$@gJY=@o7TRh}CS{!cNc4jM<`8J|Q7T(w15N}a?_yGDC7SXKDb%;7oEpL! zW=2(6LI-VM$$JPTAFW#R{fHD=qo#aK3awF79@ja(g4{?MS^(lqPl-yI;I4E>?7)zMDVvzW1nE&kDT0_7wNbWxdVXU~s zmh~+bQO{oUNPYlq?os%i?A6YWcS?BQNnIUILE?^Z_C|?QJRZ*eQgR`!-|>#-IM$}6 zJrk)N=y^6CS8ik9Eo>F{+1UC;Epq>Jpv%U7Sd=ZEu=z)n&c#z{XImDt*nRz}HtoUD zi)Z>5k!@!=WxGWT{8JePvJs^f{zXf^3w+KL*!#Laj92~7nK-R2sgRv3{+w(Z7G?0%gMCaQEc?u%d> z%vR|ap-!+tl}bB8?MU66+Kl&%w}S0(PNjp6dr05-RM$| z2Rz77Y)+eA9tyig67_(`DnSg)7^T?WwAVfo=$!UZuiDQO#gjOATW zpb`~yL5oUloT3U8&tsgDRJy`x9w#clGROr>IQ77o1PPL1twP2xeuV_Hk6wOoj8Rkpic} z^#I#62*o!d1zvHzEl-0ojXsd`VH>`k$(9~>Ql1VQ%N4rf`aqroGw}6GwhONFav@yA zS1%`@>mPCvOsgVP23!n9oXGX2Tnsa+Rae)K@)NM1QxCj`M{OZIQ_~-}5cY9W7O@a+ zYqoEUIL=z~?12~XW-kI)okHtld=ivGu8O;pztxpO2`8nQQYh!N6*2^$R0>ThRqM=_ z#h_nFX|}>kNM(?s(w~u*KprQhnWa$7Ny)hsN>xuY_zqaZ)_1pjWlEgWFOCS5(RqGA-5c zkdsoO2F90Wm8j8rxX(#xv>txqq%>L&##R9QUjwDndU)FZX-l!*^wp4s zf=TyDQj34orX?Z4USSVWY2L({V?p?K8(_u2K#GBFpLZ+q;OUGzMU4XVqoJBJTBQ$$VI`V4tsfB6?@EDMx z5|_6EngZ=PT86lE%&ORnFozeZ8Y`{_VYudFPsgrSpv?=7_$Q=mmPm?TgW7zp3n4|b zhEw;IXyH)&b64MdXT*@mU>g|qqN*YI*aR!Gze2QMN9`4)|qS=csu%%jpdfHv=U{}=OOvfox-hkv+yWE4jlDo01 z37Qv9(0MeRP3#UC>{!?xD+vCE?wy7(fXz$qcmKX;OX2HxH}@7YpGE3g@q5^%`>g!Z%Pi#bI3eC&aJf@wLQfg}4rckS*S-=uvJC$L^ZS&I delta 5065 zcmZvg2~<;88ppqP16jyIkRj{6fmK177dBq$+GwoWmv?_f1;Fv?@xHAl4hXPlCz{n2lhX3W$v4K+7tyRu)#V|e1jWL;JjFoC{YFA-j zYsUdZxG`5|(83oQQp}n`$~^{`!U9hjQkB4oi0#aJ4WOmWVIKE3)nvYtyxyE2m83}V zVJUu~@aN4*mP=C2T!w!CRrvenp=JXUj+uEVC2+-(tmFiomI|X%9O#HUshu+)?QSDB z0IXvYj@h>ag&2n$XNaW9B&`}GO(ALXAZaQ|zi0fh6no>#XmL2)78zeame-`Drkp_1 z=|R$1lKwF$a2iQhQ5pg_?a?^7T8BGQ=A2HZ8;qNsakC>ezvfX$9?57*rRj0F%`&iv zk5vfCA7X#O0Rfoo(~hAlI^`4S%Q zcE$S2gfY&r{&5u6&k$<7uO^IN&Q4-#uMF`8#@x%#V4PB=JM?@+K`N`& z^LYgcY@MFpRZuqclpb1iVrqX=ji)V2zkH<57o5|;xq_7nyQmLLpY}SlL>Qn&Q|ewo z!y0Gc*1~7896wlC8TlMq9By1n5xApJOD?*|aw2$maT9s0EuQW#ju==&{^hhlR)i{5 zq&yI+l*>gF619w!K&a0WQa%b*DoME-sw^eNIM*1GsDh;1P{A!Nwxqv?luA@+ZxpC| z!(U74dKno*OWW@u)hZa(|b z!k?Pk9(~gywz5XusIflON6gEh?03v-z9lp2)%ZE7}ej#m?3=LatCem`sK;2Xb693xu|KV-b5*WTTLkf$Er7n zhVLEHAAWsMxGkFV+PU#F@xGC^@J^UfM^6cOT)c1=URhy5UErtMGbaDXZUoo?ozVx4 zVbD6fpH3Phz&1kCQTsV#6wJyZdQktKJ)p6{B9+c2UozUDPNjRTPOw3TN}X0a(g%Vz z>c7>0X|%&tm7aEdi)8YTlu7T4bAlbxB|&}M_h`%y(hZ{ntU1CHoVGAi4E!mds299Z zT1bNG(bD#!-DXOHLn^f-xJ*vyQEA-}Eu=#180mRhPjq68Ut+a`up6IEaD-q^BHA}e zQoa34mI_vU3ZT(ni_S8of?K5*TzX9^6bR~tJz*4g9Ul%TORkM*3*Lv3ViOaH3h|l= zuo2e4ZJ4FD2&ld^ra^}=_R|A{Xq%v3xDu{~Gzi1n^*~&fpkA1qyeljX3I&~jM~03y zrNhDy&va-Kv=OSn3F+`464u`crv-A=IGmBOTcvlH7U{Z5qcucX^wfuwPX*JVR*)>{ z0-qo`2p2poNEUR#vno+N7raH}$MVCmgbPN`qNE$)9W3vHT9v4v3%04WQBYoq^gJkN zqDp;&yn?9w>Tnmd3F?KhsanW@MM1tlv8HOhUlxD&sKWaP<@BF(yF|weq(FSo#9JID6^+gSx1b%+ z=Q?DX0j)tgW-5Xw@#aQJM<%~%Du&0aCH1+EndU+@-d*JYKQzsQ>v(4ssi zaq6F%GH4J)bMb|#460YCuCAM=MQ}h+FYL#yRt|gW2ja@1TaawD9Ku)j+pg=&Ay!Z? z?81}11SU0*trzY|@@t_2%2j+c<9kg7Gz*gFsRG&sZH8>cudRSBDy`5&m@6T1HKo}M ze?+Q+DJq>pS_(@A$!3;8qac}c8TeGs2=M#0%itjut<0}o4%<~af>aGVgMkXvz(GNM z%3)lVwQxkGE9p+8``1u2eTKR;tGN~)k)*UZ$&;(L@6tvgJ*nFA;~i#v=sBkQfyXoNk2WNTj7 zrxLa1g`FJ(t$AU0hq(XsiQc@hUo}#1UN|60q1L?cgG$tz7k&{WTl0ePK1wQE^MXx~ zoI@}CP9>T{FZ?;^slZ)u{62C2lbtrf31RG0sM99cCtDMf*aY1njW)qy)kcjrL62&q zMw>vhL5xtLMw`GWNH*F8F@j{HO^||w|MkmGo8Xzi-`dN<4DY44D+bNg$nrqaeM>FI zEy~^CQ~Yp7Y2y!UZC2U>-);2{=WPeA{E36@enSnc#wlL~5Z!;Y0NI11TMJ-c3$3_q zSHcPiQKLQBSR=HAYBBv_eg)>m)o)&fo<96*#y3QHpbfw83}*F%u?C%6r8#=4 z+Dr{9jd+X~Ju|iC!PO)a)M4T#5nhT4wiwxfN)6P(G-SL+N7v$a9j;)?wGw^tf*alM z6QacxQ;R%sB$~l6-rbY9{b)os*!w+;FsG-#2YY|cL24X-J{9hQ!{WwIpA8bez)VbZGFmFMju@*SO{41Pm{^cvxfj2E@;4GbRP1E?-r; Ha&`X$wl^Z( diff --git a/About/Manifest.xml b/About/Manifest.xml index 37f30d2..5062923 100644 --- a/About/Manifest.xml +++ b/About/Manifest.xml @@ -1,5 +1,5 @@  Rimworld-Animations - 1.0.11 + 1.0.12 \ No newline at end of file diff --git a/Source/AnimationUtility.cs b/Source/AnimationUtility.cs index 1a94c9b..02899dd 100644 --- a/Source/AnimationUtility.cs +++ b/Source/AnimationUtility.cs @@ -16,15 +16,12 @@ namespace Rimworld_Animations { */ public static AnimationDef tryFindAnimation(ref List participants, rjw.xxx.rjwSextype sexType = 0, rjw.SexProps sexProps = null) { - //aggressors last - participants = participants.OrderBy(p => p.jobs.curDriver is rjw.JobDriver_SexBaseInitiator).ToList(); - - participants = participants.OrderBy(p => p == sexProps.Giver).ToList(); - - participants = participants.OrderByDescending(p => rjw.GenderHelper.GetSex(p) == rjw.GenderHelper.Sex.futa).ToList(); - - //pawns that can fuck last - participants = participants.OrderBy(p => rjw.xxx.can_fuck(p)).ToList(); + participants = + participants.OrderBy(p => p.jobs.curDriver is rjw.JobDriver_SexBaseInitiator) + .OrderBy(p => p == sexProps.Giver) + .OrderByDescending(p => rjw.GenderHelper.GetSex(p) == rjw.GenderHelper.Sex.futa) + .OrderBy(p => rjw.xxx.can_fuck(p)) + .ToList(); List localParticipants = new List(participants); @@ -220,7 +217,7 @@ namespace Rimworld_Animations { if (requiredGenitals.Contains("NoVagina")) { if (rjw.Genital_Helper.has_vagina(pawn)) { - failReason = "missing vagina"; + failReason = "has vagina"; return false; } @@ -229,7 +226,7 @@ namespace Rimworld_Animations { if (requiredGenitals.Contains("NoPenis")) { if ((rjw.Genital_Helper.has_multipenis(pawn) || rjw.Genital_Helper.has_penis_infertile(pawn) || rjw.Genital_Helper.has_penis_fertile(pawn))) { - failReason = "missing penis"; + failReason = "has penis"; return false; } diff --git a/Source/Comps/CompBodyAnimator.cs b/Source/Comps/CompBodyAnimator.cs index 2c6fbe2..a6b814c 100644 --- a/Source/Comps/CompBodyAnimator.cs +++ b/Source/Comps/CompBodyAnimator.cs @@ -345,32 +345,32 @@ namespace Rimworld_Animations { public override void PostExposeData() { base.PostExposeData(); - Scribe_Defs.Look(ref anim, "anim"); + Scribe_Defs.Look(ref anim, "RJWAnimations-Anim"); - Scribe_Values.Look(ref animTicks, "animTicks", 1); - Scribe_Values.Look(ref stageTicks, "stageTicks", 1); - Scribe_Values.Look(ref clipTicks, "clipTicks", 1); - Scribe_Values.Look(ref clipPercent, "clipPercent", 1); + Scribe_Values.Look(ref animTicks, "RJWAnimations-animTicks", 1); + Scribe_Values.Look(ref stageTicks, "RJWAnimations-stageTicks", 1); + Scribe_Values.Look(ref clipTicks, "RJWAnimations-clipTicks", 1); + Scribe_Values.Look(ref clipPercent, "RJWAnimations-clipPercent", 1); - Scribe_Values.Look(ref mirror, "mirror"); + Scribe_Values.Look(ref mirror, "RJWAnimations-mirror"); - Scribe_Values.Look(ref curStage, "curStage", 0); - Scribe_Values.Look(ref actor, "actor"); + Scribe_Values.Look(ref curStage, "RJWAnimations-curStage", 0); + Scribe_Values.Look(ref actor, "RJWAnimations-actor"); - Scribe_Values.Look(ref Animating, "Animating"); - Scribe_Values.Look(ref anchor, "anchor"); - Scribe_Values.Look(ref deltaPos, "deltaPos"); - Scribe_Values.Look(ref headBob, "headBob"); - Scribe_Values.Look(ref bodyAngle, "bodyAngle"); - Scribe_Values.Look(ref headAngle, "headAngle"); + Scribe_Values.Look(ref Animating, "RJWAnimations-Animating"); + Scribe_Values.Look(ref anchor, "RJWAnimations-anchor"); + Scribe_Values.Look(ref deltaPos, "RJWAnimations-deltaPos"); + Scribe_Values.Look(ref headBob, "RJWAnimations-headBob"); + Scribe_Values.Look(ref bodyAngle, "RJWAnimations-bodyAngle"); + Scribe_Values.Look(ref headAngle, "RJWAnimations-headAngle"); - Scribe_Values.Look(ref genitalAngle, "GenitalAngle"); - Scribe_Values.Look(ref controlGenitalAngle, "controlGenitalAngle"); + Scribe_Values.Look(ref genitalAngle, "RJWAnimations-GenitalAngle"); + Scribe_Values.Look(ref controlGenitalAngle, "RJWAnimations-controlGenitalAngle"); - Scribe_Values.Look(ref headFacing, "headFacing"); - Scribe_Values.Look(ref headFacing, "bodyFacing"); + Scribe_Values.Look(ref headFacing, "RJWAnimations-headFacing"); + Scribe_Values.Look(ref headFacing, "RJWAnimations-bodyFacing"); - Scribe_Values.Look(ref quiver, "orgasmQuiver"); + Scribe_Values.Look(ref quiver, "RJWAnimations-orgasmQuiver"); } public void shiftActorPositionAndRestartAnimation() { diff --git a/Source/Settings/AnimationSettings.cs b/Source/Settings/AnimationSettings.cs index a0f172d..7759262 100644 --- a/Source/Settings/AnimationSettings.cs +++ b/Source/Settings/AnimationSettings.cs @@ -22,20 +22,20 @@ namespace Rimworld_Animations { base.ExposeData(); - Scribe_Values.Look(ref debugMode, "AnimsDebugMode", false); - Scribe_Values.Look(ref offsetTab, "EnableOffsetTab", false); - Scribe_Values.Look(ref controlGenitalRotation, "controlGenitalRotation", false); - Scribe_Values.Look(ref orgasmQuiver, "orgasmQuiver"); - Scribe_Values.Look(ref fastAnimForQuickie, "fastAnimForQuickie"); - Scribe_Values.Look(ref rapeShiver, "rapeShiver"); - Scribe_Values.Look(ref hearts, "heartsOnLovin"); - Scribe_Values.Look(ref applySemenOnAnimationOrgasm, "applySemenOnOrgasm", false); - Scribe_Values.Look(ref soundOverride, "rjwAnimSoundOverride", true); - Scribe_Values.Look(ref shiverIntensity, "shiverIntensity", 2f); + Scribe_Values.Look(ref debugMode, "RJWAnimations-AnimsDebugMode", false); + Scribe_Values.Look(ref offsetTab, "RJWAnimations-EnableOffsetTab", false); + Scribe_Values.Look(ref controlGenitalRotation, "RJWAnimations-controlGenitalRotation", false); + Scribe_Values.Look(ref orgasmQuiver, "RJWAnimations-orgasmQuiver"); + Scribe_Values.Look(ref fastAnimForQuickie, "RJWAnimations-fastAnimForQuickie"); + Scribe_Values.Look(ref rapeShiver, "RJWAnimations-rapeShiver"); + Scribe_Values.Look(ref hearts, "RJWAnimation-sheartsOnLovin"); + Scribe_Values.Look(ref applySemenOnAnimationOrgasm, "RJWAnimations-applySemenOnOrgasm", false); + Scribe_Values.Look(ref soundOverride, "RJWAnimations-rjwAnimSoundOverride", true); + Scribe_Values.Look(ref shiverIntensity, "RJWAnimations-shiverIntensity", 2f); //todo: save offsetsByDefName - Scribe_Collections.Look(ref offsets, "animationOffsets"); - Scribe_Collections.Look(ref rotation, "rotationOffsets"); + Scribe_Collections.Look(ref offsets, "RJWAnimations-animationOffsets"); + Scribe_Collections.Look(ref rotation, "RJWAnimations-rotationOffsets");