From b04afef7b1db6e8e14b0bb7655b1437cf807b961 Mon Sep 17 00:00:00 2001 From: Platinum Date: Thu, 9 Apr 2020 17:03:56 -0700 Subject: [PATCH] Bugfixes --- 1.1/Assemblies/Rimworld-Animations.dll | Bin 36864 -> 36864 bytes Source/Comps/CompBodyAnimator.cs | 2 +- .../Patches/HarmonyPatch_FacialAnimation.cs | 2 +- ...HarmonyPatch_JobDriver_SexBaseInitiator.cs | 15 ++++++++------- 4 files changed, 10 insertions(+), 9 deletions(-) diff --git a/1.1/Assemblies/Rimworld-Animations.dll b/1.1/Assemblies/Rimworld-Animations.dll index 6c7166969417ca2240a84ac30b20f8d479a75996..3ffb81f23c2c96849031b7683d9e041fb1553192 100644 GIT binary patch delta 3367 zcma)36b2T>wgmQ3a?L0Ujv*aJG&qIi8QsC0YFaxL z2fMk?t&KX5y}&$o6u0iu3w+$A)&34mIfvEy#GZUVd@b$bwO+aZYgx^uxzt*}Ffea) zqy{wu2i=W39*Ez%7iW4k{~R~A^4b_C?=ZK;Wf`4d{3CUUVs%*!ds>?6euTn0qcAO> zWExMU1?YJ&wx*}6cAq1Ep7B~*g$FGDISz|{cY^9tA2y6h=@|-lapTA73#~Z6ARlOX z{c6LJ9&m~Pm*q}Gh-avLYg;gSlXF<-6WpUMqZ}5ywlEG^b`ke8!4rYo==N$Ne<4_< za47c)&X+Y!{;$yet(R#WhB`&Q&L%2%ctpI{YsWlydyp&;K(5y^kk3jUR5G4KF;5Yx zRg(K{B0es;*ZUC00Xfvr3NVgJzNCnFvE)(7v$heK`A~9YK&=1DUSK>M3Pr`y7yAW| zDuRYKK*Suu4{f8d>nxJMEk`NFb>6Ya_x+QRW8@{R-eoi!W+%@Hnq9~qV;z^|Y7Gq4v03q-Zsd=#IftqC)p9bMxlr^)d zh>sz~niX=vb24s>$M=`5jn5%4$^SFFzQ5WtZw~Vo+FE~MW zL-q*a9EGjETgHjfZBbSCz?+YY+^eu9XhGF0RZC#EN7cQMI@0t8gNdki-cwn63RsIw zFDEIiKLn|9H5i<(4~1r_%qcnW(F2t^aQ40z)pG$xnPVWe0#&5gRNP;s=fSAZeXjtz zOH4HwT%tb=&xh}-Rr~eoiRm0hLu*{k31*_Io*-8ATP!KN^wF@y zROHtIQMn@SZBH2iqoeTCxOv>Y7fTPt)dJ5%EbWv^9F3s55ckBw5L}Eau`mQbm~?+( z2wNz$b3Dinu_Lac%@k-HG0)r3qm4GceMT{|TI0mw%G9PIea^p(eFbtj3L}kBa za>{#p7*3c<-Y^Vj;-0u+82aL#%X1Jbv!=^FA}$z)e5uTXhM{PBRG8*T!w`|CdBZUL zA+E#?!*EI}^Pr`0T`KdS5%_0ZiGxO<5xT9 zoSPB5KDJkNzsw5B-|@SmOIaG&&U%z%TAT6d#HrCv*00#py4hu=-PXefmD|=Hc7Vq4 z8>Wm7YG-79FYAJTDFbX9X}4Wwgnc*hGApAQj`d0zy~5Tj#Wc@x9Y0NvvD<7PJ!A*9 z3y!-I)l9O|pHD69r0P{OsXHO4TG$7UZ0wCVhNyetFDVnEbT54B7)slr!&gTS(8+um zEmYRXte?dT>D%_X zyo;RDmh BJ~+`uWPH3^VJQ!TV8lKd(-nv-VtSW(9SJ%lc$4suo|@;i)Ld{2ixrs zaSVrA=zQMJ53q{V1DLO)?R*CPJmmGb5 zK9nLyNQNZG%KT&)kNN0KnVKtE4NqZe39Lh|gjP#6{Sy>hnkqZ)=kjE1DAbqYQN!HN;XKgN%l#CT~z+W$!Re%~K22=hU0(e^nQ6d%ye0X@z5Km6wryI7*e0mc)H=0I z&E(sS^V73PzoC>@BNvs|44tdKMQYSzWQW=%e?P(aON_r%FOd@dG_-OXZH?V59~hcg zc;(%q7yFk^T=&7qXMVJL=c3rfRkbY1tJ%Cs<4ICYQVGQ$SHmxi1@&2Wr>0YC8hY%N y`jd8JVRNEmVf~b(bya$%VV!K*Ab(yc~mT6!xswOJTm6mc!RV&qWurTuG*{s delta 3376 zcma)Cio+wHdSI1p@g;?M@o#D zwA3z&Nukrx;B)*@v;*}=2+>5l8Lh2}BuFd%7)<03+mHrI+L#~KX_MOGSm?R;ElT=V znc2^NzvrBL&bd46E;P2&#&-HrGyCYRA9uI@%ujyT`pQc3tU*Y&y6Omk-$z3p;Olbg4pgE5LSb;WV128Kue8E^A zv)OI|>e(zJ0Mj8d7&G7Itiuzr@^9nb zb4aRj#h1Oxr4L`(cxnP|WC)%{asl=#GO|`^$>~qCS2gcbHkMU;8*AjJ$d7Eu`!lgRZ z8Mz=rMoFsok%?S6=J1Rqah2VoPi%r)6|EQ_AEy;{hbE?Z>f*%(Cql9(zGy~%>Qf4C zZX8IR6}gzY&zF0XbNGoz@SwJVa#-iw#W-Zd2tCXM`@Od?JE-k4b`&LsZ=-%KfodEw z9n}hldYhX3ImqBe~Hl#@~sVZj=N9VX^4CM8R{4prMTr(Ma$e+gy2eu14UN zy##fALMigMiRH)=kGOy}VFS&AmGR58EEr^h_cRBmx0>a{eC3;(2M9cl`~i}{4ZT_+ z(3@NnM)MdGjZ!_|LrusCA#k45OfH&KvmW&Ti0ntQW+fH67b(VkUk=zLbvUZ;4civ& zLttTI3tnIWas`3wuoDv}$sS}a-H$v)H&6nf(`rRDJ^X()n&@+l>^J&~PdmD>&zUUo z+qxUtV^12bB|g$?94nbtctNwk5Wc+uw&?H2^`rZbbT5L}mBlO&mm_k*C8<^zm}WYQ zW593(eU3pb79PwsW2f9VjKbi%&y?0%@o(#Oe%w@+H>-T{->PCG_^i0?$o!KQD&P}S! zhJkyzu$}{VqDkm&1?r?L+2d{KZaGSiO=fjWYi=4SyxB!}^HA@SiRk|kpMA)qtz>%oiif%5vcDIs1 zA@oT%Od>jmBDfTFt9aOBP=kU=9p`KkCH50Bm1)Z(sm+n@$c4z=3E^3=BYLG$-Z-ApBX> zih%+6LOS!M3Bb5?<|`8beUTW^1R3}d7=V_jYlCChrcFBYTrs>Xoq4Vpj!!yQ40(&q zF5+A%% zs~s>7moEwTvSB4AW2;P*)>9n}V8{U2E${6iUL`^Zt-$BeMA z$9>F7X_~!7DW#vX7Nw9*vwx1CroHSIdxf5j8N>R^&R8{_Y)s6h7IsB-sp-@eo1|LU zTlOqG8?vXVhv2>BhmHD$iLT{XdDOOE>4U4<6ROy7tT$yWqVUyh8tc~tBH^Q2^r!e$j2Sm zkqeP)nRx%!Ggr(QMue^=Pdlu93mdT|@N=?fJzeb23G)`#r-pbd9$3!v=<6|+ypLSf zHt;^B(*F!*|E4{UT%$JgOYng`lXkF9cRN49>YDF=m_?- z&^5e^pJtW*Q=*=B@n!Tz^4pxkLvWqP!!h`jhi8HfzR+ia3+^C&;IqucH_Cm;Tqr@# zmJCRi$@n5D!}tmrSuI%ut1)!& zl8ut>lHHO+f=0)Z%%l$XE2gU1>MV7WdQ<(U>fm91iNDAHV0^eFy}B3way^`Q0l6)v zA9pe*~?#A!xNcE!uVq2gtR_oMXs8je} z(); - if (bodyAnim.isAnimating && !portrait) { + if (bodyAnim != null && bodyAnim.isAnimating && !portrait) { headFacing = bodyAnim.headFacing; headOrigin = new Vector3(bodyAnim.getPawnHeadPosition().x, headOrigin.y, bodyAnim.getPawnHeadPosition().z); diff --git a/Source/Patches/rjwPatches/HarmonyPatch_JobDriver_SexBaseInitiator.cs b/Source/Patches/rjwPatches/HarmonyPatch_JobDriver_SexBaseInitiator.cs index 14f6402..d3e0f6f 100644 --- a/Source/Patches/rjwPatches/HarmonyPatch_JobDriver_SexBaseInitiator.cs +++ b/Source/Patches/rjwPatches/HarmonyPatch_JobDriver_SexBaseInitiator.cs @@ -68,12 +68,18 @@ namespace Rimworld_Animations { Log.Message("Now playing " + anim.defName); bool mirror = GenTicks.TicksGame % 2 == 0; + + IntVec3 pos = pawn.Position; + for (int i = 0; i < pawnsToAnimate.Count; i++) { if (bed != null) pawnsToAnimate[i].TryGetComp().setAnchor(bed); - else - pawnsToAnimate[i].TryGetComp().setAnchor(pawn); + else { + + pawnsToAnimate[i].TryGetComp().setAnchor(pos); + } + pawnsToAnimate[i].TryGetComp().StartAnimation(anim, i, mirror); (pawnsToAnimate[i].jobs.curDriver as JobDriver_Sex).ticks_left = anim.animationTimeTicks; @@ -112,11 +118,6 @@ namespace Rimworld_Animations { if (!((parteners[i].jobs.curDriver as JobDriver_SexBaseInitiator) != null && (parteners[i].jobs.curDriver as JobDriver_SexBaseInitiator).Target != __instance.pawn)) parteners[i].TryGetComp().isAnimating = false; - if (xxx.is_human(parteners[i])) { - parteners[i].Drawer.renderer.graphics.ResolveApparelGraphics(); - PortraitsCache.SetDirty(parteners[i]); - } - } __instance.Target.TryGetComp().isAnimating = false;