From 964a861d30e8601d5e3be9a30e57ce06aaabaaaa Mon Sep 17 00:00:00 2001 From: c0ffee Date: Sat, 4 May 2024 08:58:07 -0700 Subject: [PATCH 1/3] added probability to voicetagdefs, to make voice clips play at random intervals --- 1.5/Assemblies/Rimworld-Animations.dll | Bin 50688 -> 50688 bytes .../AnimationWorker_KeyframesExtended.cs | 12 +++++++++++- 1.5/Source/Voices/VoiceTagDef.cs | 3 +++ 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/1.5/Assemblies/Rimworld-Animations.dll b/1.5/Assemblies/Rimworld-Animations.dll index fa7d7d7d9924faff6f48df0bbfb2fe387f336fff..9ea1dc79bc085505b152628f310dd899d33af720 100644 GIT binary patch delta 15733 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 h3|7u=3 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 diff --git a/1.5/Source/Animations/AnimationWorkers/AnimationWorker_KeyframesExtended.cs b/1.5/Source/Animations/AnimationWorkers/AnimationWorker_KeyframesExtended.cs index 395a16f..0c8440f 100644 --- a/1.5/Source/Animations/AnimationWorkers/AnimationWorker_KeyframesExtended.cs +++ b/1.5/Source/Animations/AnimationWorkers/AnimationWorker_KeyframesExtended.cs @@ -35,7 +35,17 @@ namespace Rimworld_Animations { if (tick == keyframe.tick) { - return (keyframe as ExtendedKeyframe).voice; + VoiceTagDef voiceTag = (keyframe as ExtendedKeyframe).voice; + + //probability checking + if (Rand.Chance(voiceTag.probability)) + { + return voiceTag; + } + else + { + return null; + } } } diff --git a/1.5/Source/Voices/VoiceTagDef.cs b/1.5/Source/Voices/VoiceTagDef.cs index 3ebb678..2127b22 100644 --- a/1.5/Source/Voices/VoiceTagDef.cs +++ b/1.5/Source/Voices/VoiceTagDef.cs @@ -9,5 +9,8 @@ namespace Rimworld_Animations { public class VoiceTagDef : Def { + + public float probability = 1; + } } From 0f6a37d83b8befcd14871dbfa1aa47b65fefa961 Mon Sep 17 00:00:00 2001 From: c0ffee Date: Sat, 4 May 2024 10:14:57 -0700 Subject: [PATCH 2/3] fix for null ref error from sound probability --- 1.5/Assemblies/Rimworld-Animations.dll | Bin 50688 -> 50688 bytes .../AnimationWorker_KeyframesExtended.cs | 12 +-- .../Assemblies/Patch_HumanoidAlienRaces.dll | Bin 4096 -> 4096 bytes .../Assemblies/Patch_SexToysMasturbation.dll | Bin 5120 -> 5120 bytes Rimworld-Animations.csproj | 71 ++++++------------ 5 files changed, 27 insertions(+), 56 deletions(-) diff --git a/1.5/Assemblies/Rimworld-Animations.dll b/1.5/Assemblies/Rimworld-Animations.dll index 9ea1dc79bc085505b152628f310dd899d33af720..d58497a6ac1fe785e0bb5747af06e42be185de5a 100644 GIT binary patch delta 3382 zcmY+_4Nw&483*wH9?N+g%I@cnCN`ba(Y{}tdp85a@BKf| z`@Fk%w={PKHFpN>>yW=q{p^anbGGzj_lXK=o=1|BgXNpRY)`x?%~L5QOS?TSlCG7J zHTo(dKPCi2^=hU+1xbCLe+1|0#o?0E1z4ve$kMck{P9ql5t5bx%dS{b-INK)Hd&L? z!Zf+5p1?^~tf^9zEm#Xqn+8p`nQtXUkYDpac3Mor`9rsqaOq*x3?Q~Kk}Ti`$y1@3 zQzVt1AQKgDK%pm!P51Vi|6QW@*{Ry`JI$onP>{s+r52(@;F5#uZdDl5s}9FaD0Y~s7&Y& zHk$RP={$T#rIhD$HQQDwvB>tTMv223CLe}mGZHW+)E@hSl7P_#yf4y1vyO#acVnn5 z8C;)4?je=em|85Z$fK4-jAx*Zr0vm_q%;x#;vrmURTA-tH?qu*S>%HZ|w~y5uq0j%NcZ>il|5v12Eb4-4ZOV3c5 zN)j#``W*Po(C2`plMgrGj($DnO~ru-CZF`F`7NRxp{A%V$%!(d3MUnR`GVz;G1-Z2 zENf#o#ECXu3A&3D{}rN@DR7W4%GAwDL3$?nYS54Pg!!0~g0notcIU8?iXxFc7c-*F z$0ecfBwkk1QRVrtJXYVbgm&|>i?NN#hl_J=DvR+66Mz4*aNUq)AwP@uwO~u)Z6zC% zOuRA&_X6}yfaX0#`+Szk8TXVNxO7hB#(xu>gRwjs@@;bQM<#w>b8*|B9X99UD<&Uq zB$|UYQ3MQ#WoozEbjVn2GP1kA8plK*L!PUku?o zO!ynC)peL#_;`FdoJ_Q@UM)wB(4?bLt-y7^bhQ$X41HCwET1}ByIO^}SAfp%#@+ZX zwHhB2PTj;B++m_4+SMBL(XuU4Or_@#MFlR=u!0tkc;W2qgXx7j0SvcGwHN( zz}kR8#x}e~Mr_9&@-|M5Xv7bnp=!ZQ>8jd@E+#&32i^=&Pk>JNHDKL=QKmM$LMFTb z%W5`3XIHTkKVxjcUvX94iGxgh#4em?@}bt@3)zL}HLMYPwK< z(#(gE=mP7@m=IbN{gPG3$U2(wJzH>@3;GlGzpE_>TR#;JSYLsYX;dmBCw&#qbFqWA zV}z*<7v|no+hH%GeQnT!AF3V5XW}C|P|D=PmkF}gfnlM!5l@A7BDGx1)5*Vvy>K!5 zKp(_=Aw4^F7%D3h|8DO^zCSAs-HS3NA6Aj4$3DbtpnX2PH`@$1TtcREpqf_}Xf;|7o@Z)DT;%<*ckzgeKI(P!VsQ;ECswIK}wG!j)@<% zA1O@yp#8`Yl@Fv=r61Ws>w~sxC$LN?L*AXBaZM=E;UX%iquY#!{KvjaJBd;*sXBpHt`}Kh(sH62k$pO=iB!HLln_%(vg0}< zKg~%DGqvK~pmtK~Gi0amdyx&1htMfJG-SiDYyx?;;`^qn>M-h=_@1Y+Lu6f~?=+g3 z_{~3q&Q0w9A1^(F1ESQ5H?%W2YS_k$lOkI!?bo~*5$Xs!q@BeTCcf!8+%WW=!=$L3 zV>+ar!yQBR9`0{~w`AiURlb;T=V|ZQ_6Lj9_=4&d)91AXKizUkGksif&3nD?8Ji_5 zeZiBN8JR9m&v}Pu{rN)U!iz>YJOvk)8x}rD_FTBI!mvR47hGKFU-vT)*i6 tul7Nx9A0#j-ctVBO#hzej*pVcJcYmhtvBq_w?U?zxn6Db3(1{6?f+5~wPXMQ delta 3372 zcmY+_e@ql-8VB(2z_2chI5RG*2-MbPS*SwY3Kmd6ViA#|fI<}nrTPc-XvAFgu7;X{ zvfYvv(aoa0*4Cn;1p!63Ht3Pmwsd1X(x_+ByF_fcU}G<_dg=A5Qgmc$8q9m+Np@5O;(Dk>Dlr&wa{WV76&tcrr~=Z{k*YEe!%QAn=Gv6`$XLuO&4X$NVo@UW zg^8*`sKvfeiA9UhJN9Iv4qfmk>$A!N^awq+W)lqwxwK9x4vr;!iF4M~N*v0V0*IPt zLmc+-3=^@9ay+_3_PJ(4Jk(UyhmWH(h{}ZiYNc6Es?NiYR7#|AwOH3G@yHCSMp=jw zrT_+I6YRJuXdf!%xzXk!u%2+^TQ=nGa-`GfK*Nf3efr#{98zl9FrHrPQDG( zr?nWVT$nVSRu*GOXjjURvIGU>%R!G|d)$bUh7qA+}nM^b=1wgY*Tr)Ig;0;xqHnvx?n64X2cROa)8L>S`3_(=oiX02NHMQd0}CYV}N3j3OqQxzu7jG-M^1 z64_nnO0@(9&(l6yxklZ9VIqBciE@kv!wR(=-!k##H{$zXwpHDT_%$=jSHi(Wht{i= z*dlb-*`#j9t)O(Z3Xcta)sPFx6rJqmuG6Dd<4j^c7JZNUoe-(1e3t)<#AFCr}-tolI@GCGF5oV80BlA}KBgZvqO=mf%<0E#hROlB4V42pASyf2qz&M(Asa-u$R?!> z4B~%6-C-u8Bl& zx+-6?KVR;@zH4f^`qjS3j<~n}P<%$$n*3eSZvX9`^;UCM_A|>|S*~>7v%`%>IDOZK z%R(;{T`CN{FmkCV^un^s>q0N|UCs-+;J5ubN{%iVr$@>^+k9!C#Y<(rb)S9Zb;@U!d( F6bR?y6~Az{atR@C5|9B12KLfCdZ&5VLy;h$6;8K&}9@^}k+d0JEG6 FWC-ny6N~@= diff --git a/Rimworld-Animations.csproj b/Rimworld-Animations.csproj index 8120d61..e27cfbc 100644 --- a/Rimworld-Animations.csproj +++ b/Rimworld-Animations.csproj @@ -186,56 +186,27 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + From bc283ec08e184f6bd18b67e6f3b2b63a4ce9f93c Mon Sep 17 00:00:00 2001 From: c0ffee Date: Sat, 4 May 2024 13:09:56 -0700 Subject: [PATCH 3/3] better fix for NALS facial anims; no more artifacting --- 1.5/Assemblies/Rimworld-Animations.dll | Bin 50688 -> 51200 bytes .../PawnRenderNodeWorker_GraphicVariants.cs | 2 ++ .../PawnRenderSubWorker_HideWhenAnimating.cs | 10 +++++++++- 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/1.5/Assemblies/Rimworld-Animations.dll b/1.5/Assemblies/Rimworld-Animations.dll index d58497a6ac1fe785e0bb5747af06e42be185de5a..1f8be2a8641dec0deb8420b4dd0e83c81db4717d 100644 GIT binary patch delta 12049 zcmbVy33wD$*7mto)zxd#OFCP366kE*gk6FdBtTe{C9;P_K=wg410y-d)~9$t*WbT zQ}U!-vRYofBKc^S4$C3@^Eo89w2KY^uc1LTjJ-Zv^TJ4RT^Ax~I`=6+f*z3C=wn3C z*6$d4w8Y=n^e04X@rM4A2#Q+$Gm#vh`k4{j5C2GDg1aUIY%T^6dg-fO^dZuX*uz-B zrpk*S1W-UK_TV4&mU={=C}+hU4Qn%+X~*=va*lXa|Cb!n2Pv%_nHUyjguSj0R=Q#b zo=`&imr5)Bf?^jnXp64?Mfue(j_W_WGWD5myPoClC{9+-azCwzm#c3^|5b=n)!SlU zlf{|pseY3~yr<6$wiajgb-{r6n|?6(hB%-Xhgw^zXgbu;OVxWq!$tglV$zUℜT= zdT+@NOB*Z7`*mN&Sg~JUm@zQ;K950Kynx0a55cjWLrcMb0BreYjDw8sEp8QjP<=Jy ztPr2-ue2E`F6wIAPU3UDYui#$rys%g7y9+K72>n%XWKm^#3en{p^vy+J*UHWRiUu>3Dhxwd z@;FLqZDZ4ytiZ-C^&3)$qmWiYN~i@uYYh4)oApq3fAOt8KYNDy9T`UIb=e^?O1E`S z5To^A_Zzr}0zKM@cl1F$I*505tw(m}F_^1u7pb@qv+=a&V+q@m`_bI4WfQZ}EdCkA z&{(~`M|X`}np(#-@cduNi+E@}g1t$aVhyF@2heKvNVlT90r)NX6OiJTYv=+ywQ$A8 z=1(LAGLofG0OKHI5W3O2V?X?uowrNI%&;oSix;9Mg(m4Idln3xjIr&9NX2+@C{pnv z8s8K&6;DN2G7Ta02ZT25{>$UNJ$N~Vu#9c~2|LX7dPCF6`$7GwoVa$B;yt{MCBxx- zqr>7EC`rw;>F?)ch$;H5oGw1<&MhUv+V$G4-+qh9NRo;l#x7;}3TEnqdu3!yLb;P& ziZO;@Yi*7x_yE_?rb@++qTk{o1Qnw~7xZnt%GFuuUOZdx-#bfush9O0+~pcNm(U(* zoGf2x4th262c+UB(4lxYEx|)5$@%%ZwNLBp&szheECI-E17K-|?cs&Y~V*W*hwIr*>Wf;bpehr%`*Sg>Y3O;cgq@a8~Cl)cy!Ft8fO(Z-PI20shQYY_J1; zG`ywBRO|$z4P2c1u$97wx(Iu4;d(?5OpY&4_rTr3@^l-#m_E}S3Eh*A;Q+3i$rGH^ z#l5LdCEH+*neeWd&Gs1B9K58c;ImWyFJj5k-hD~2!31pEG`NC&kA#PLLV89~xvOL&tVFyiSUf`IrKEekfvvHvEvvrESDw;A$+SOu^F}+%^E8l?p7D^qD26Vi%y?RwwY(4y+Nq?Ax9vk*G6$~< zA6%4Zc7`Coq|#^}v6xfw3ig{*Z7?=^ra1v8_TJPqN^(oS8h+Om~vU6hguOxnRHVYGO_UyOd1KiBCrY?^a`+SGB}E`~a4j z{%X6L*b;CjGux^XivkO?J6MYbJCtHzuM|oX3z4jOnZ;owC5?1m#hiYOB=)Q6YT^P& z057vQ=W7WoXKν*-MCL9E1nZuq3 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 diff --git a/1.5/Source/PawnRenderNode/GraphicVariants/PawnRenderNodeWorker_GraphicVariants.cs b/1.5/Source/PawnRenderNode/GraphicVariants/PawnRenderNodeWorker_GraphicVariants.cs index 4a8b195..e45c0d3 100644 --- a/1.5/Source/PawnRenderNode/GraphicVariants/PawnRenderNodeWorker_GraphicVariants.cs +++ b/1.5/Source/PawnRenderNode/GraphicVariants/PawnRenderNodeWorker_GraphicVariants.cs @@ -71,8 +71,10 @@ namespace Rimworld_Animations { foreach (BaseAnimationOffset offset in offsets) { + if (offset.appliesToPawn(node.tree.pawn)) { + //modify offset of prop for animationOffset position regularOffsets += offset.getOffset(node.tree.pawn) ?? Vector3.zero; return regularOffsets; diff --git a/1.5/Source/RenderSubWorkers/PawnRenderSubWorker_HideWhenAnimating.cs b/1.5/Source/RenderSubWorkers/PawnRenderSubWorker_HideWhenAnimating.cs index 2656a1e..57c174d 100644 --- a/1.5/Source/RenderSubWorkers/PawnRenderSubWorker_HideWhenAnimating.cs +++ b/1.5/Source/RenderSubWorkers/PawnRenderSubWorker_HideWhenAnimating.cs @@ -1,4 +1,5 @@ -using System; +using RimWorld; +using System; using System.Collections.Generic; using System.Linq; using System.Text; @@ -17,9 +18,16 @@ namespace Rimworld_Animations || node.tree.rootNode.children.Any(x => x.AnimationWorker is AnimationWorker_KeyframesExtended)) { material.color = Color.clear; + material.shader = ShaderTypeDefOf.Transparent.Shader; } } + public override void TransformLayer(PawnRenderNode node, PawnDrawParms parms, ref float layer) + { + base.TransformLayer(node, parms, ref layer); + layer -= 1000; + } + } }