From e006e540209e3e60e6787a8df21f6170acda34c5 Mon Sep 17 00:00:00 2001 From: Platinum Date: Mon, 18 May 2020 08:19:25 -0700 Subject: [PATCH 1/3] build --- 1.1/Assemblies/Rimworld-Animations.dll | Bin 50176 -> 50176 bytes Rimworld-Animations.csproj | 3 +-- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/1.1/Assemblies/Rimworld-Animations.dll b/1.1/Assemblies/Rimworld-Animations.dll index 63fc2b63b4ed1aff64c8fd320da743a629b8246e..70b5a6ca48584c2dea1c3cba43d54858a7a94f32 100644 GIT binary patch delta 8175 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 delta 8131 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 diff --git a/Rimworld-Animations.csproj b/Rimworld-Animations.csproj index 85b59fc..15997b0 100644 --- a/Rimworld-Animations.csproj +++ b/Rimworld-Animations.csproj @@ -45,8 +45,7 @@ ..\..\RimWorldWin64_Data\Managed\Assembly-CSharp.dll False - - False + ..\rjw-master\1.1\Assemblies\RJW.dll False From 8ed4ebb5c275ffa6ed3baba1d0e4f768895c3907 Mon Sep 17 00:00:00 2001 From: Platinum Date: Fri, 29 May 2020 13:12:35 -0700 Subject: [PATCH 2/3] extra null ref checks and tweaks --- 1.1/Assemblies/Rimworld-Animations.dll | Bin 50176 -> 50176 bytes Defs/AnimationDefs/Animations_Beast.xml | 4 ++-- Defs/AnimationDefs/Animations_vanilla.xml | 12 ++++++------ Source/Comps/CompBodyAnimator.cs | 5 ++++- .../rjwPatches/HarmonyPatch_SexTick.cs | 6 ++++++ 5 files changed, 18 insertions(+), 9 deletions(-) diff --git a/1.1/Assemblies/Rimworld-Animations.dll b/1.1/Assemblies/Rimworld-Animations.dll index 70b5a6ca48584c2dea1c3cba43d54858a7a94f32..bedd746f2ffa90f7c5d83e7a46372f83f9365eae 100644 GIT binary patch delta 3265 zcmZ{l3s6+o8OQ(U?!pR}mx4Tm<*`PV@Gw?E5m52PLkSvJq6jXM?JA5QxWTlUn(i_f zWU3vd$Er!EleV-mnPxQR)>;#5Noq+P8((QB);1|lA0`uHCPVX>PSk$qoC|yDv^%r2 z-|zoD&v$n3h6Ze*0o%a=`^>BMvBCWr?ES$PH?aMjF?U4w4IqQ(Xob9yx!K=&FAJs( zlO|p@^wto8x(?uh9RTCKXBQZ2wVpKgg7LfbMJ%`yum@}!x?LhZIWGn%fVP_w?Expr z$;o-KN~#jlN|L6rd(&r8Ek|-*yv5b@KV79FYp119e&QSrt3@+-NyhdW?_`!U zc9O?u_pp=3p6uU7vOn`0x0BuCTix#k$0)z+Qy?0%0{1QUK8tyY1n|9*f<}?GIjKWBlC*J#5S<$iK+gclj3u%h*0% zR@lal8AF9OjXlAS&EB5+K_t2z-#S32of=W(2xty;7eoZ?4kQ1etxQXG7~h*Sti{eJ z*|s(>ks&(J&0FTZN~LBLA7^jy3&q`{Y{`n?4T>4Rzu@}+zKGx^p-h=#iD?kZY^$dK{A5gGVOC>yQH>?l&iG!rp9 zgd#eb%D08BI|`F1|2X;R%NqJkQkR=5=908Ln!?2aCkk{5g^uG4OI%3eJQG0|dF+Bl zEk);T3(l~W{A$@O*3O?R&t{#xy)>V0=uoN0s`HfcseH-89afE<;-4)nVQ=z+vS#)+ zA1JG_dimChM4n$>Z`HJj82);>car3cG1@A!rc7TFgYL&aqpQF20R6!72FVIk^U)R4 zwOuj%a#c!lU?L*$I>qL#5%)hPBcfs{B1bEaX36NZlcXoPtm?L%V93? zpHv@UH~HL}dF&%zQ|B`-)O^8;!qd9r$ESUoEOXkVq$}wY^M0RyyegahoX4&1WkdYn z>OLx$R7d5Enz}tKyuyHR~5 z@k#pI(U~|g$u|;|*o$i9P~xabcO`vnl3NqLm_?#}FV1VC#affr+hjvYBlvN~yVT;G zB-Jnrmn5kJX5k-Z-cIU}h5L(ws^~N(FmJJ<3TlysL6iPO?Xz&sq;_hUh1({blGMLM z<$WmWph?s1BJ!N1@%C>?8cbzre~He*lu86C^DvTKql6WeqRe4T&A1hvjWzTyG=4F; z*eFRQ=AxroMTT6T(^KKLNek>zdI2iMKOt4AvM1`Z5i%*{O4q-JJ0@i$&)4a0Ya#j{ zM#xo7*V#s>Xq~>`Mxsb$ zXog$TO*UVT#AXzl^!uC~qA$H7@n+Pz?3eV-K#L^ybf$=OD2n=9_B^5l(|0fB6^itj z#8Yd@*CeSwH7FWx#uKJfH1y(|CW(e#eBK&v=*2xnvY{6dk13yM=tY7eCK`I-F-bJ^ zqDhk4lNZ}0(Q$+H*zuxUVjpHgP^nK8?ZX}Xn#!z_q*mGjkLmjv&g(7cG-)ThsBgi5 zB-Nr7Z%v{2<`L@*MqNbrXnw!$SzUBzQqBuQO`50xf~&G<04O`ZNw_BGvy zGDUJTJ}fnTVlzI}nZ9MI*D3OVNwk?DIgdzGbNetPNlog*OOn)Pd?;!U59-4bNovrq zW0NE`s2|NHi9!9S+#Vj(j~YdC&<%d9F`Z&kKQ@|9F{vLvFiG5@A48JVpnjZ?qz3il zSCZ7Aek?Thw(g3zCpz;wU)dS&o}X4t={wMl9$I$?mXf`VK53h7AG(No5TMTv`X8{w z8MdRl;-&#nm+K>L-954Vhb8Tmwd;<2WDGoiJkBw1_S^*vi;H>JnOwtn%FC<*zw^tY zNnCTf*viI>r>iF?IM1xM1Ux=rUw+MPB)poS#s1=k*r9q|;zeiE*|1T2wvice=l*Te PM$3$;Z+yZA=Q#cYgb(9; delta 3125 zcmaKt3v5%@8OQ(U+DVEpc^DGMS>nVo5C@!6AkUIO(lpJBEDJax1X4pV9%QiDm{e;; zwd*J?fo&>er;F&OZLqCWOo)};vC@>RQJbdP=mtY;n<7xD`WQ@X6;iiuOwgUjwS6N^ zvlQj~eXsv_zjJ*YJ7|d=v>Z8TJ%8x0?~Q%8fJDbm_7XQG#G7Kh0u<07>HIZIeZnxixm z@IiS}g!1T@U0=$4fF(E_rRhAd4A6&M2MB4?|5I2?NSIc;he%jI<$gVtJVzs57kQpO zLGrE7-1wz)*qOwNPMz@#kA|d@knMENL^y2c}&J(GKr0qY< zp4Ogne_C{kp)V!+TB^R`fv*zfom72d#gvl%8FO2@N*5B?qRZ)M`2=g#SaF)f=Gj6~_%w-}GJ2^hzkSaZN zQ4*;>?%{(cJnOlK51#NGqLtNs%G)-2r21uIp~q{N5HF3?xQUOB)huI2alXbs$KT8R z*>v}VUz_9IM_sEc$K)zJIV|zOD~5R z;-|%(ZZb%#)(x{3=hls|;<^r2tVcSYBBl|4ml-e2&7$|(9Y$p}ZS3sK+mi(>>hYtS zy>raOqL!YvCiZ`aezNnG`C3OUvvI)ri8B>0{7ld=4&Y6j3sa_8A+F4!59iP=K{NPy zN-7GmtuEQK5Z@FujZgFcU@OGvoY;>wfx~D)F)KW0&|N`q801xW>?4Dw6)sV_hD!{i z+ad%7&ER;!yG&wSkQ6M!2|@A!i!f=_?PUr@cz2B^+bkd)u~t$YlPJQVLGLm7B8(d} z$OMZpZO~akfqGeYQ_wDha;!XaTu@y8n4mEy$-8PR!u5J+ta2O<&vk~`4ZO`b>;-?Z zx#4BM8u5cE!3sgLumnvlGBf7+C%YD=4XU=zQ+;sqpDNa+*}70&j!g!|Jo)NM%otSQ zs8VY&%ZTZZBj#yQ>(I~^Z@NKUi=%?1U;}227%yzV4O8qPWVOq>QBS}65c(6eQ+*hb z4jDUA5LTP;R%bkOr`m?2U5qp#|D@WErVTO}^Ngw;$nwYO2kLt45X8=xt<;Znb^*pW zBFB5dYjQ^T$Q9DLy4tq z!AFTgf_{7<=mS!vrs7dp`?=r;vB=U42&wSsAedsP{bi;_< z%l#G0^lg=0sI!g5$^{*8YM(d>!%ic}1q0|Zhzkbr$AP3^0Pjc=f&pAJVq7qQ8%B%^ z2H@MC6bztTkla%M^@7-*G$O}jCcTBQ29zk-YTj4We&tqEMibo9E zOD?F}uuYJZ7{IYPbV`uyGJtbN-6CkI7{HAkNx=c!5yVpowj(DbpMq~D2&X}OGeOvP ziP*en-IvuM7Dy7C2_nyk@y!IW*oZYcXIbV>gV<4MEEpCj=MG}OAUSCePYIHn2_j`M zIcN~Mg5;n(uu718XF{kjhz}Zqb9Zvk5Zsc)puHh@jUb;igcU}RPa48LgZN7m!hS(= z&=5ui$w5OnB1jGzf?faRz+;(KyX$nVUb;8at3PpcFe7W~`!CqL*4}COY4hh-f4C}t zrT*E8(-~ - Quadruped_Doggystyle - + Dog_Doggystyle + true
  • Anal
  • diff --git a/Defs/AnimationDefs/Animations_vanilla.xml b/Defs/AnimationDefs/Animations_vanilla.xml index 08b4870..f8e5e1c 100644 --- a/Defs/AnimationDefs/Animations_vanilla.xml +++ b/Defs/AnimationDefs/Animations_vanilla.xml @@ -632,7 +632,7 @@ 2 2 0 - 90 + 180
  • 59 @@ -652,7 +652,7 @@ 2 2 0 - 90 + 180
  • @@ -710,7 +710,7 @@ 2 2 0 - 90 + 180
  • 14 @@ -730,7 +730,7 @@ 2 2 0 - 90 + 180
  • @@ -815,7 +815,7 @@ 2 2 0 - 90 + 180
  • 7 @@ -864,7 +864,7 @@ 2 2 0 - 90 + 180
  • diff --git a/Source/Comps/CompBodyAnimator.cs b/Source/Comps/CompBodyAnimator.cs index 730b2ab..77195eb 100644 --- a/Source/Comps/CompBodyAnimator.cs +++ b/Source/Comps/CompBodyAnimator.cs @@ -154,7 +154,7 @@ namespace Rimworld_Animations { base.CompTick(); if(isAnimating) { - if (pawn?.jobs?.curDriver == null || (pawn?.jobs?.curDriver != null && !(pawn?.jobs?.curDriver is rjw.JobDriver_Sex))) { + if (pawn.Dead || pawn?.jobs?.curDriver == null || (pawn?.jobs?.curDriver != null && !(pawn?.jobs?.curDriver is rjw.JobDriver_Sex))) { isAnimating = false; } else { @@ -310,6 +310,9 @@ namespace Rimworld_Animations { Scribe_Values.Look(ref bodyAngle, "bodyAngle"); Scribe_Values.Look(ref headAngle, "headAngle"); + Scribe_Values.Look(ref genitalAngle, "GenitalAngle"); + Scribe_Values.Look(ref controlGenitalAngle, "controlGenitalAngle"); + Scribe_Values.Look(ref headFacing, "headFacing"); Scribe_Values.Look(ref headFacing, "bodyFacing"); diff --git a/Source/Patches/rjwPatches/HarmonyPatch_SexTick.cs b/Source/Patches/rjwPatches/HarmonyPatch_SexTick.cs index 5812861..bf29458 100644 --- a/Source/Patches/rjwPatches/HarmonyPatch_SexTick.cs +++ b/Source/Patches/rjwPatches/HarmonyPatch_SexTick.cs @@ -17,6 +17,12 @@ namespace Rimworld_Animations { public static bool Prefix(ref JobDriver_Sex __instance, ref Pawn pawn, ref Thing target, ref bool pawnnude, ref bool partnernude) { Pawn pawn2 = target as Pawn; + + if (pawn == null || pawn2 == null) { + return true; + } + + if (pawn.IsHashIntervalTick(__instance.ticks_between_thrusts)) { __instance.Animate(pawn, pawn2); From 08efc14b6c81e48be8f79ea55b2cadc503cf89f8 Mon Sep 17 00:00:00 2001 From: Platinum Date: Fri, 29 May 2020 13:15:19 -0700 Subject: [PATCH 3/3] build --- 1.1/Assemblies/Rimworld-Animations.dll | Bin 50176 -> 50176 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/1.1/Assemblies/Rimworld-Animations.dll b/1.1/Assemblies/Rimworld-Animations.dll index bedd746f2ffa90f7c5d83e7a46372f83f9365eae..3a0ccba0eb8e4cb1ec2540a20ffa1fd9550ca885 100644 GIT binary patch delta 16351 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 NU9P7NOIym!{|EPUinss(