From 670e0ffc32491065e0b50a9590eb1bcef108527c Mon Sep 17 00:00:00 2001 From: c0ffeeeeeeee Date: Fri, 19 Feb 2021 12:52:15 -0800 Subject: [PATCH] back compatibility with older animations --- 1.2/Assemblies/Rimworld-Animations.dll | Bin 58880 -> 58880 bytes Source/AnimationUtility.cs | 2 +- Source/Defs/AnimationDef.cs | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/1.2/Assemblies/Rimworld-Animations.dll b/1.2/Assemblies/Rimworld-Animations.dll index 7fc523e491d3a804737782f2cc02ccf67293c3bd..e4865dea4a797f537d5ba681a6b12f9e18e86579 100644 GIT binary patch delta 2075 zcmY+^e@v8h90&0CbH`l>4+e7K?F8kzd+uNnHAPvQ;!J)Bo5pRW$Ip-hJg-ZNfnmlT zh(<M z+97^gV8cuz$8y(~d)$&Y@EnjP-s$bj?E7rIa>WNhNd_s-G9_CQ~*v(8H1q4ZOpW4Go-CqJ{?Mm5N0R0~>3p z=n$@n_6FLOsG)%|r6Jb(I(hOuYjd3`nPf&dr1l4F2KrcYD1Y1zAC5_-zrS*u?!!ka z8!bFz^WlWpKi$*qRd)Dc6^kc*o=I}DOQ{Bw6FIIQxWBN(;tmeJh%qWYGoVGkqJTS+dG@+))`_w;kePp_+WZ zl_+A3BWZl8SE83>in)`f;cC>5u(4mFoUJ`OxYX`71+^;pwcnlAJ#^6vt-Ri^s|Ohs+smi98v1DW@I%X{{U4PHu0fgGqy_N z8=)4ou;ehU*w2zhThXIVX27(!;%%jDi)num$CWM$wc+IQbsF~KJS(YP5RYX$E-IO~ zyl%m_UZrW0D>^*cS?xF~rM=>&qj8np^K1~BP+6HPPn=v-y6UPG*$oyAstH+oxF$CY zAx(+;h45yt>Sv0EA&g3L!w_OBq=q3(sEithu&6{0L%6|`dkWz$OYSLz`>bJjU>7H6 z`>5eCF2gOVe8-}brX3wvRN)wkvO4gWQkC{pRwo<>=|b6}3(x;gZ7kWa3sIJA*oEJe zs9_f#E}zt}53bj!CVvzr!pK*o)re>05Qi&1@odTpBVCF&6UL(|qs@fjR9U}kvpCtL zM4JgC#FAr&(an;BhSATWLETwq7^BOfhW$9ll8;FQlS(vN1SjA4Z?p)`NbzV9OsR}U zi(p1&G+G3ID$!^WJY>nyA|^5isHmJR0tZVjF@g`2Xo(Sgx_nZ@OSr<4gGMo{M1w{# z$^X`qyu&D_rFhUNE~tzKjiTnV3Te_Ptb=@q8ciBSCQD8l#cGxuG>Sr&95jm4iLd($ zc4a^Idd-!We{k%)G<$24tLoCbiPYT9)vKHjsHl9cr{4=>?mW#Kw=LdFto-qBtEF;F NBIoDdwb;{-{0sZ5rO*HX delta 2069 zcmY+^e@xV690&0C_wKlmzUK}{hWwI?``!UVauZ{1Ng4>rQlT+C4n*WmIIojv6M`9i zxv>!|G;fF0Mm4h5a3gcwO8-k6qZw??`A0O}h9OkQH}XisB8LS1XA}H8a(@41PQ- zo-Ihicp}yEnmBX8fz4m^e&+#r8(n${b|%S%0uUjNqq+4LM>R_h(~NqS zJhT}H)XEf?_GTPaa#~FL0hme`gj(?0>OKtzahf%+oflurR(z;r{^WKEcD_W@%&!UN zIUTL&kR65%8E8@|DT>?$-*}HShBDU*OaKR4U4NQHMGP2GM&jE zg^3W773pe1SnA<$%}04pI6}B1#WxeeeU;J8gkbBH$Mj@8C014`(anUgmnFvzp^+sA z4I#*)L0t|rgznW)!(qf&@@o>th!Tw!#^5UtMhoMF6pt3hDV5P^VT`McMhoMn5{(wd zB1?`IHgS(BXA1*;R3R@hjHnV_Vi<82t<>-W&a&j75u8(^K_eL9f9vynhY`FZ#e+uh zfy!vm2&yJkNRvizTZtx(;2uj(8iBQ+Mw5d^ptIzl5gbo^*OR@+nfqz^Ve65_o##`( z=$#7w^Hw7HtA$4$wq@EVA35>mA2Ky(e8cs-@$Fh#V(pDTt(MK(5~)Al)?%9<`WFUt BsE+^u diff --git a/Source/AnimationUtility.cs b/Source/AnimationUtility.cs index 47c894e..1a94c9b 100644 --- a/Source/AnimationUtility.cs +++ b/Source/AnimationUtility.cs @@ -108,7 +108,7 @@ namespace Rimworld_Animations { Log.Message("Selecting animation for interaction type " + sexProps.DictionaryKey.defName + "..."); return optionsWithInteractionType.RandomElement(); } - List optionsWithSexType = options.ToList().FindAll(x => x.sexTypes.Contains(sexType)); + List optionsWithSexType = options.ToList().FindAll(x => x.sexTypes != null && x.sexTypes.Contains(sexType)); if (optionsWithSexType.Any()) { if (AnimationSettings.debugMode) Log.Message("Selecting animation for rjwSexType " + sexType.ToStringSafe() + "..."); diff --git a/Source/Defs/AnimationDef.cs b/Source/Defs/AnimationDef.cs index fe44534..119b98d 100644 --- a/Source/Defs/AnimationDef.cs +++ b/Source/Defs/AnimationDef.cs @@ -13,7 +13,7 @@ namespace Rimworld_Animations { public List actors; public int animationTimeTicks = 0; //do not set manually public bool sounds = false; - public List sexTypes; + public List sexTypes = null; public List interactionDefTypes = null; public override void PostLoad() {