From e639ae8fb85e3e1a46b9fba707214d780a48f0e2 Mon Sep 17 00:00:00 2001 From: c0ffee Date: Fri, 3 May 2024 10:51:59 -0700 Subject: [PATCH] Further debug logging for animations --- 1.5/Assemblies/Rimworld-Animations.dll | Bin 49152 -> 49152 bytes .../GroupAnimations/GroupAnimationDef.cs | 5 ----- 1.5/Source/Utilities/AnimationUtility.cs | 6 ++++++ 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/1.5/Assemblies/Rimworld-Animations.dll b/1.5/Assemblies/Rimworld-Animations.dll index 5605695ccee38076a66aae1760d7ad5d4708c35b..0e30d692071325c762949c63dbd04d758f95f5a5 100644 GIT binary patch delta 7454 zcmZu#34Bw<)<1J|m)x86CT-d@ZE0weUbNa=HfEGxwhFB^m$H5+ zYT6uDh0SL#%mqQTRvBZF=}=V8utfTxGqRed1g<3y)A0d=tfGqpIX;%dD-{}`rd2sq zp{6TK_b7cia4D&$rvshHTI$Lyylx%RT*O#!HjkOjK@%_rpGe# zdTc?nSGKb0)M}n)K(W?r#WqwdhEocqnrBciR-(E9vkKj&tL7P6niY<5lTD4}Vn#Dm zQ#z>+&d22w@>wI>+LJ^UqTUcniv}=DLnu9|yM~ZI8sydt-P#ZeBtWLFHiWXG`P`GO zYYoPBOpzGw4phU|SbNRUfygsJeA$EDkJ zyY4Vv!hq;T%;a_JZr#d1r|~ix@zXwy=0ZLC3^wT5hmG+HdW=OVINik;kMU{}eNfhe zG4n%5Kg9t2wuxE8ubcRUevh4xu_2U^umlpLZU|*YPqQfgQQP}*UM$8Jl`L(8js{Tg zSW)ycG{q8u?Q1UD7tL4-E|>NybS0?(w!|_M)nu_HmTfM{|5{y&?#5|kdy6kN{Lrk3 z1~x6Pp-4ezL2cj29yUcOdPGb%@>| z!mK$5(5}hGTi8V2W-$do!@)B0cRDe+jQlVCJ~+hscV-tO2Wh{~xv_T;)b+)kD@wD2 z*mz`*;<0+v$UhiMm)lnW?j2iEhEsHkvl$;XT8%?2 z_@6P9xCI@_WUKLh$Hc1f0W+{==ymGOWUgv_*pZuDgiCi7<+c~B@*=!$kK4c-(X2eh z9DC#=G$dvq@-e+Lx3lL6T6E3$gfY#5(&pUB>kX+D>Wcg)+8dlk}eh5%oth{x|e)L zp9|$EpRs(A6ZB{(BX$z?v~lxTBZO+cFcE8n$d@R=BGi0^t?@Mqn^JTK2o^DNig}pw zFRnydc~eu1P0cqb%woe}@fqJTmw2ZSKd@P_D}hW`8m=~>tz1zTas6Y|ak?ygiToYL z&i|h72@f228r3wP@gp{Nt9(Jmr6|uigUImWki$xvHS!Z8m~$4TLq!HIN_o!Di01u* zLP=L6KheSYCFC5Po1d+oN1G;8Mt-Fm^LsddMZ`<=iq@LX=vVp0d@(TVyhu7A# z8LPxo=>kJ`n13T~7`|@$Lv%WB65SrzMkg7mS$`q{qW765Rz1JW_~~N&NvTn)v3b@V zx;F0%`hl@f+kjMdn;j78q%Hw+p3dtsN@t%Z!h04Avpu45fu876O@5~13c8T9bYa01 z;gm?fEhuz!xLj#&;ex+do-J%5tK&BmX%~_77!Y*=LI~gEJvvK|i zK5m-ngzh&gThKAxI70V!9~vuAU=~iffb$D6Hsok6T6`BR?9_<9m~5$HmS2)BqnV|j zH7RNgv)q+z8Otn9$(C`UAC%`0^C}tS0Yaq`7_t6NOQ{3>b07iL)F!ybcn9O5-iDk z0Mp=pXSt8|%v13=?A7%(L5h+?D?Gle

at$8KX~<-9xyJ%A1Jd3 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 delta 7507 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 diff --git a/1.5/Source/Animations/GroupAnimations/GroupAnimationDef.cs b/1.5/Source/Animations/GroupAnimations/GroupAnimationDef.cs index fb9eb43..de2d7d8 100644 --- a/1.5/Source/Animations/GroupAnimations/GroupAnimationDef.cs +++ b/1.5/Source/Animations/GroupAnimations/GroupAnimationDef.cs @@ -19,11 +19,6 @@ namespace Rimworld_Animations public bool canAnimationBeUsed(List actors) { - if (RJWAnimationSettings.debugMode) - { - Log.Message("[anims] Checking if " + defName + " is valid animation"); - } - if (!contexts.NullOrEmpty()) { foreach (BaseGroupAnimationContext context in contexts) diff --git a/1.5/Source/Utilities/AnimationUtility.cs b/1.5/Source/Utilities/AnimationUtility.cs index 61e3d1f..1fdc73c 100644 --- a/1.5/Source/Utilities/AnimationUtility.cs +++ b/1.5/Source/Utilities/AnimationUtility.cs @@ -44,6 +44,12 @@ namespace Rimworld_Animations { //each participant gets their own unique extendedanimatoranchor, important for scribe_deep saving List allAnimationsForPawn = groupAnimationDef.GetAllAnimationsForActor(i, seed, reorder); BaseExtendedAnimatorAnchor animatorAnchor = new ExtendedAnimatorAnchor_Thing(anchor); + + if (RJWAnimationSettings.debugMode) + { + Log.Message("Now playing animation: " + groupAnimationDef.defName); + } + participants[i].TryGetComp().PlayGroupAnimation(allAnimationsForPawn, position, rotation, animatorAnchor); } }