From 401c2c3866313492f8df4eb094da775382fdd7dd Mon Sep 17 00:00:00 2001 From: Platinum Date: Fri, 21 Aug 2020 17:29:28 -0700 Subject: [PATCH] facial animation tweaks --- 1.2/Assemblies/Rimworld-Animations.dll | Bin 56832 -> 57344 bytes Defs/SoundDefs/Sounds_Sex.xml | 5 +++++ Rimworld-Animations.csproj | 2 +- .../Patches/HarmonyPatch_FacialAnimation.cs | 15 +++++++++++++++ 4 files changed, 21 insertions(+), 1 deletion(-) diff --git a/1.2/Assemblies/Rimworld-Animations.dll b/1.2/Assemblies/Rimworld-Animations.dll index cb05a163a8ae40f61247db8a7b57dee7506de05e..c209de467f8992ff167ce98d73a1ecb91db2f162 100644 GIT binary patch delta 12875 zcmb7q34D`P*7v#3lRR15G)CK0uZie?H`!ST_5Jzsx$Yzw*DbG}lp7q<@3)M*=Nu2?Knw z9DwmN=kID9DM<>8=VSD5X3qrBC~~+8FCa-H>u2L2y`wXueijazm4%pDT|R&@yP_*Lik`swH^r)T|izSY%*+g%<;qq}&uD@}}Qbrq;EslI|M z?udSdsyu^lb@yd68c(^OQrP^)CB9_F>KY$Nb4Y9&KM=UWF9rRk%{V)o(Q3?@0sLYx zz~eHsN+t1hQ8Eq#_%ia@4Biw>1pwhFdDVuqqLD;sIabPU(u<_L!y10C~OY+J;5 z@>8ALo2}$e<@RSG{#EXH#D1MRvdMg5rzdgj=sXs2UguG4NaGuw8OyKpkhj_^3M^cZ zf|cYpq6-X`sR*w=QxqD%i#1LT~}a&2cc z3!q&TZ@?BluVw-qbw_f(` zBqMNYoH`;Ti5a&XB&ZNG?`W0EumhctC$uz>kG^|aLBN!u+qAgN81i6@|LvU!j)XwAg z75e*Nc{R=kisxvc>>Ujh$HW@J%4TRFptL-T9ptS1i5td;Yh#Hrw?`zG0Go-|`XC@Nm?Db2Xz zfugidWDtHENo+m_Ce-kW=DUuz#%xfs(xhMpO+KqomO?Z6s3MyUeON&b4MWof7t2UR;QpXNwE(sL5)0 zS-(6~+|(~0@kqa+cUIrP$M^5f9_Cy6&*t|JG@7keYr#&MHbpiJ=zM4E=lSXZeKE}8 z0X93H+8X_WPB^=S;2gw`PI7T|K-W9F_z+##__Bdc2gKqbM#qcIZnYQimL#4S*y)ZQ zBy%iJ9+c_m)@tswI@{(@KIqPKkP2h@IW(_qHFsHEZRWO;JDan`d~->bV{fZv7YUCqQ(hSS^V!qb5Jp%^xr7f^ZQFjq|*c2g4MK-#qH%4EQg=A zsnh5%qKYMe(p4kvhfWc!Ji$bkNgJosvnamWrWasFqq;7N%=>u4|&ul|o}EaOeQW3e}=ra5@r#%aIwLM+rN_v>whZ$u0)b zwGgJNP4G3G!~(ok8GmD!c#~aSWCi(LKt4k%QbC%PuB{n*)bvT16kdtis-hztY8^Yn zt6Ik`^Y2CuzM>?;D8rhy_ujo#7^xRhRjkg<_1hdBSt(M8CY|N3i=gt#7E)}LyRduG z)iyXGfZ0m_W%&;XjUw_u+d{%O0r3A?^X% z0kyaTVub63yu;`L5z@kWpqG{%AjT>uG=|tIYOP2m${u@LcC%8@THjP*)6Pr%%k5ST zU&&~-F?K{_ifW(hH@#SqMCkDi;qY&ItiWXMo=|Xe@VafC%Tqu-L7i| ziTz413e>mwWQNBpt%TaQ)O&4xD;8SxZ3t5^DiL+j!;}^_t`x-kg_4z9w-zrA%PCUp z!=A0P0(9rbH%2Q2@5Q3kuRsOyC4e-WmGv~MH7H1LAW6`RO=wgKHlY#J?#0_mF7`9{W(-sFTOh^c>BeoOo)++l03oo9KnA2)en-+(!ZW~akb}Wu=HK>k511Eoe zf{{JSo5m&K%jPfRT=-Jy9Ped2dH(pjSUq1j-ai3vD{8{^BH{bn5++GY!r%Wk;o5gv z!zWtX!n<1Y?ZS&Dxa@7|7NM4!?!7#5LI<|}4)S|Y{yfSPDf_$LCQHoCm{lEp#+Kx8 z1Ev){HXBpt+JH}G#J42zH&NT=}#k5*R`-fSGh`a{3iQxwRTA8aH zyN7Hk6>%F8sn|WY$;RAT;?j6-oibyj&~^P*7xJ&) zF1yf!=s|=I?#59L9`Lv1zn(WuwB03UdW%%e%Y9RY=s+L9CE5Tj!|ThMR$IWVrP;VQL3)9_&Ico(B)%rC}5ATkb8~j3Tk=abM%6f4FTA zktDi@at5{A@wFRh#l`-;!XGPlvg`ctRBsQn?KaK61${)D9e1aC*VMy@3?Ng?V+%J; z?lp$A{;$2hgIq`sNij#A?7YRH*Oi|6}97D|e`^f#0b=o0{9_9NsDXcp4UU0GLeUF^g;G-ZQ%n zR}dZ@1`wBkym4dT+37e&p1)+=kO6po9qAlCY+5I_i-)Hru`Ir4+E!M;J5-d!T?{CJ zI&hc(;^A6~65#a}Ijo33Q<1J!0!Da|zh9BsYf_2=N7*2)0xkoMFPTrfy4MKtIznT>qKkzf?=-!8%sDTBg}p3rKVLMxDtl=9LDc_4yhUe(vs#NT z9{w)kJ?kjIV>$*j^Tj)$tQFcHU=LzW1*Af6{8W> zi<}F!M@<&i37-`d$cvU46HWD5fjL$RImJWM+our!ikREqO_Ww?24S)& z^aHV!^dy1bqaP#8$D$Y^S5LP0qSZmEX8`Y;Fx5!>rAfrE#9A03XvrjEGZODg9F-K{ zKAPFP4s!HBN`Xd!C5$+`xTi9+!^56~8aHgx9Yp>rQ(1x=-b0Q8z3pWQ3iM3!`4qUW z^YQtWNfCESF);Bz4j%Lp6$28|aqzOBEFcT&89m7o@YGt3vIp!$xiAybJcv{xct9_x zCj^y=Qz6amM$*i}-|Ud)7Ni3B^)*IN^+tCD$sSnx)hrI)Nhj4FV8I;_2bnH+$}Xhh z1r>wT0Vt(26lH%+B+XKEOVq!jRJL&Xw^(<|b12IZ)F_)ft7Q(wt?v!gt^~YoYR-v0>qy`J>bsbUTVTjP&uT`m1A@iV9k_{7+c*sdq z8HS`O{Ul^%7?P;JIaJwLVdqapDuSxx1o@U#6;2SU6>%z61`TK!_N&xHL8XXf%Aj0m zUdCBaz{w)D8?s7G5i)1g=QKgh3#hURG5d4L?vyZ#l;JM~s2HXccgkuu6DmQ*fL+j8 zG0cQHAp7DV8+So5%z}G_>|K18Du!yPYey}FP&>`#utvyAgqM|YAKZ%-eNK3(hfVD? z>qo<8p<0Ow#n1rT+6gzo?sl>*@JKt^PIw%f@1>+dBeuAQuq1UL;+O71K5n)zay)4m zQh)M}L;S`&5pksPHJQds6a}<~DaeTz_*^`VCs_#{Ucx~_b9dkZ>JRh~%5lYr2UDt0 znwUHv@sy4De~u-e{oOQvGieF(YZAkVJtL{B@lu+&5%C4X4#X1zcM3eIAc(jp5ZYZ|4!iR0;@H|87=TVfi;#VkW(VCqn8pYP1HSutT^jqJT#|c zWDL%MK?i}e1pbenI4gX!Bn37kQgxn8A$(6G&_Mj(34C2(iRBL{tr7UNp%`t0@duGp zp7a`GeCiRzE}~MG-BhU`l1}1R|8nPhh(%t7E>Qx<4%qDY5b+6IJO}JdD&)m;?d%Aj zFxL~w$e1NLpfdGSlq4ivLATdaX5)!nlR6DiYg#S$fOGOcP|Dy3#EXn@sq}*p`^QX^ z^7((k@dhm|iN+(D7+BdX2@{rxe>)uobv_4@4u}Y)mjtHDzZfZ)(d2-GU@<8m*=OS+ zdd2R-@kU5N?7%Wjq|+^`(-xorol+7E)}<7pW&cb5PYZG(bL`@ddF(~4`c}e)h&}UwWrxH{6 z0-vt|9)zy8#U>3j&%#z>X9q169x3F4&!u~i?mjtz5zb(;+ zhx84Vg8Ia#QKru(&GksVV6wsIIV$y{?PcDvCdqQhA*B|5$tTGs?Gi23qh$F4S?X7R=bFK0OSi&6%K@osPKGXv3Vdo+e$^uC2(%6 zYM7gHpLsBJo}g0a0}=CZ__<7_P6r+|kASD~mwq(q(}8{FQSghP){ABt4f^sH*#UC| z6QjF}P<`Dz0mcgI7_7tXFcG>=A(?785qb+sO>`n`Zk3hjC&FGq9fLc}cS*D!ZQ66{(R?*&x?B)Z|g> zW7iOrJwl&Y)dDjlUyceXU=_R)r6^z(^r&kKSOtYDB?4B#z^IG@R>8=qi~?2xk5Uw{ z3LX)ZTBj;_st&&_wXAOy{Fe}}!C%Bs_~rQVl!|`{E~1-Ff>KL53wTtv9j=&X!E;e+ zAiHLs4aWtghL{8TCFG@rN)VLlWe#|k0L51W&ViBmsj?;D9GD>}Qf2rj31LC0OHmCC zQHm;44Ye!CuF3FJ+K=XHSgBH?GS#p;Dx=C&!1K<-^8di)o@-2)l945 zvY^yVtKn-wsfkv@{FQBqRzpNkYNGStVL_>h*1)4tiW04XhE;8e*1!g$A{d^UrUte} zg_LOxJfu>LGOdA+qZB1t1D6G*CRzjE2ue+~25tySO|%A9gxeCO?ZTiwH7*YSp2`## zC*$oGfJ=+rlG(?9s!O9w%3=p=`cw@lF{`9LNnfDB$(m`d~1;G_|6PI z-nck3o%r|&f=_@F{C6x#X9-TBu^orACC+h%boxMBgYN+JOaq{U8>pifo(=FX^l5~_ z2J*HJQ)BR{jy$N|D2JA@Dy1Bd!{;x_jL=k6eJ1oJk)fJZiyzXLVG_$!>?LG>Y85)S9ho&cP@QR8%?ihi@$&qGLX4>8m#C2{YLJ zxv+z6#}?SZ?A)`g7vjWa{%pH%558m3-Mt(91*Y zzLTgriCL*SkUs$>{%*NR z{zuF^^5;OD&jqJ|(Roq863moagVhID(+N1)NvFYSqq_|HS)* zoH^?Pe(ed2n1@IYH~(Zk@fo~{B?d-oo7n#n`1?2-GaqjV^~`g7S7 z_A0A!tV8_4zeW2ASmG1d=K@z~2H{in1-6-g74ox(xMh_;=H+Ca@~S4uZB|^;ao%^8 zKT@6EO(|dp{arLZsWP=tIjlM3?~iy$;Gg1Xd=W8IicKDj_;b==#f<5W$1a=TD_8O) zdg*!_du@fX4<^_nI3DQBg-q#-q_wF3K4OB0g0j*(Y80&XRo6rz!Xb;**~7 z7vswG$aqXKuo?cxl@prhQ=U`KXfE?#S2-g$QcohkXZktig67xMONvjbbAPP_7YzMEPxyK4E5!$grCfI$T-Btf=jski zf3bGceWyuNiglwj^X!jGqcl!sux>ij<7>%U*xv(<*8(}ZD$$GKRq0oJYca?pbZc~0 zZ3p8nRH7vI$h)m1y5whbSc%Mzbaic5#pOw1V(8`8`eopP-#un|5Fl=blPdw4mcLC4RWr# zM9<_K$!_H;Td9=em>%E0154s6`M-fGJXd=>@Swg4jE3EseexK6v3vo#8-K6A02fo9 z(XZAfq`#=o5qmU;(J|GH(Sg>D(J>X-s9magO}|ka>mmHvK=`G=_v3bJHfp~~C5~JB zn*KZZ0=N7g?e@S~{Q>QK?Jk_tLXQGXur&QM40g@)h5kkDqp{cYuWG-w{-EzIdg@i} z^mwD;gjQ!yG@Q|9#HJZmi-lj!-1;7d)uY*9eJ^By0m7+I9+bYyz?2=jod$!F>)vlTENzN=4moAUxA>WeCvw(MD*Dc) zRJy-3WGXMfkA^*1(SPFDp!*Ru|D~M8@q1PphtSU+X}11HL!MHd&WxGLXVQ-bgFM-9 z!oPJiKo?^?elqJ~G($1mWt8xtyEoz#fzuJ=A(M4M&5no?E%LY!91(a~wy~iJvc|@aCioGv?EMk%x6efU&b|h5q2qDH zlMc{^(48#MFR;JBnF7}cd|coWEd{=$T>~9sFAI*WkgZpsKO!zg0{aWB5I9p{gTTE4 zFDYwaZLC*E#zg`v1U3lVEAWuOO9DYJ!Wb{Z>DVIU8gN>Qj9-cI4^VD7gq%uCMQr2< zx@(9fJS6avK(G+UE3imlg}?@ZhXh^{2ysGFV3EK}R^mWBVUfTJfeixp3OuCpZAUUt zsli67hXh^{2noWez#>Av?cVH6yUwQz>U!x$>gMV8=nm*4eX4$}ex`o5{+?e}~*oZnbG z-gY-WMc$;wr?1ZgA}8m_+&9>Jd{@f2*7-0d}-f4>(tcIFdY`+`%iyZ0P|rMVl6C&k;q+!UrE7E z@_X=QjifEQU~3r-L|GL|@P)xX0X65Mt?Fq8Qi~hMHok3+oAvUmbN!k{{r9Zf`bu{C zE1xuWK4j5pv^rU8?DOYidUIaxUER7D?_yXmh9|xUVq*#9lg#U cKEIfIKe^Nx`{7Tr^m&g)>nGo^9i4Um2TPG{asU7T delta 12708 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 TyFbd(q5M|+2Vb)7Jq`Z@x+QoZ diff --git a/Defs/SoundDefs/Sounds_Sex.xml b/Defs/SoundDefs/Sounds_Sex.xml index 7d3500c..4cce5d0 100644 --- a/Defs/SoundDefs/Sounds_Sex.xml +++ b/Defs/SoundDefs/Sounds_Sex.xml @@ -6,6 +6,7 @@ MapOnly 1 + 1
  • @@ -34,6 +35,7 @@ MapOnly 1 + 1
  • @@ -62,6 +64,7 @@ MapOnly 1 + 1
  • @@ -118,6 +121,7 @@ MapOnly 1 + 1
  • @@ -168,6 +172,7 @@ MapOnly 1 + 1
  • diff --git a/Rimworld-Animations.csproj b/Rimworld-Animations.csproj index e7e6ab0..9b564e6 100644 --- a/Rimworld-Animations.csproj +++ b/Rimworld-Animations.csproj @@ -45,7 +45,7 @@ False - ..\RJW\1.1\Assemblies\RJW.dll + ..\rjw-master\1.1\Assemblies\RJW.dll False diff --git a/Source/Patches/HarmonyPatch_FacialAnimation.cs b/Source/Patches/HarmonyPatch_FacialAnimation.cs index 6d561de..9de25d8 100644 --- a/Source/Patches/HarmonyPatch_FacialAnimation.cs +++ b/Source/Patches/HarmonyPatch_FacialAnimation.cs @@ -72,6 +72,12 @@ namespace Rimworld_Animations { "UseFM" }; + public static List rjwRapeDefNames = new List { + "RapeComfortPawn", + "RandomRape", + "RapeEnemy" + }; + public static bool Prefix_IsSameA(JobDef job, string ___jobDef, ref bool __result) { @@ -79,6 +85,11 @@ namespace Rimworld_Animations { __result = true; return false; } + else if (___jobDef != null && ___jobDef == "WaitCombat" && job?.defName != null && rjwRapeDefNames.Contains(job?.defName)) { + __result = true; + return false; + } + return true; } @@ -89,6 +100,10 @@ namespace Rimworld_Animations { __result = true; return false; } + if (___jobDef != null && ___jobDef == "WaitCombat" && jobName != null && rjwRapeDefNames.Contains(jobName)) { + __result = true; + return false; + } return true; }