From e51daf188fd0c6ab93a4a1a6a65de44a49ace9cd Mon Sep 17 00:00:00 2001 From: c0ffee Date: Sat, 7 May 2022 19:26:11 -0700 Subject: [PATCH] changed harmony id to not match rjw --- 1.3/Assemblies/Rimworld-Animations.dll | Bin 59904 -> 59392 bytes 1.3/Source/Patches/Harmony_PatchAll.cs | 2 +- .../OtherModPatches/HarmonyPatch_AlienRace.cs | 2 +- .../HarmonyPatch_DontShaveYourHead.cs | 2 +- .../HarmonyPatch_FacialAnimation.cs | 2 +- .../HarmonyPatch_ShowHairWithHats.cs | 2 +- .../Assemblies/Patch_SexToysMasturbation.dll | Bin 7168 -> 7168 bytes 7 files changed, 5 insertions(+), 5 deletions(-) diff --git a/1.3/Assemblies/Rimworld-Animations.dll b/1.3/Assemblies/Rimworld-Animations.dll index ecf569763a623928f79f81374a6e851f4e08f4a2..7aefc8970283cfc5a6f6f942fe428ebdb46d46a9 100644 GIT binary patch delta 1424 zcmaKsUrd`-6u{5-KMn!Wil9pHgjt?$r7f~bGuT%^5A{A-?_hg z{@s)FozWZW=!|;${g!a(lar8MNvL$0aVtQQf#D%s{fECUDWlwqQnCV&BTu~2Y5>h+ zKW?_1W9_ySN4Tbrxl0OM2n7s2;){*sR%)mlt4*l@F2+gv5IsieTKZd}udu?%7Qg}E zS6akMoF`ODaz}?bKDn137kib~Mz_fbao;L{No!=uX7fE@dB(|hzHcRMr|F$H%iiX@ zST2I8rqr6BFt8BI<4qeEpErG~;#m>ceOFah^F?DIsNiSxZm=IW(%qov(HaxPC%k0_ zYfdb{{t}aN`+~O#Z@Jbi>RWCij+43d8RLbNrc+xI;nrg+Dm2&D;q{pz?r``l0FS|l z#&6RidU8aPv$SuoXXK8azasgj0-f!EBw;-{D#^H>#3cDePx>V(-vDvvS`LGf9AZ+* zb!~R|Hl#8e0te$Wj5*n|6na%E&XM`~i4lhd;v>?PEf(RbfkE3PiA+921|^B>$&@5A zrL@j*DVy_ZY;1pz?>K?cOSaeo*RqPy2ZgNO_n*2!6OwQx{A(Tz+N?yf6q&fzA||pF z8FEq*S?Ua#rh)b+&`9UnpT-KY(w>9(EM4yK;!!H^aN!W`=y)fKd`bD8i7fInecw5y zC(55zy0*U_Rr-7X>&3=m*(FXj-5I5tO7C@5v;WDixZVn@srNuMi!_PS?t^GP%pM;0 z@p(GYV^^*g)5V=mn(Q&*PjsQ@MUS~;O(Dusy3uX6nMX3M{s#F&E<8n%&o4 zLOZ=2uH!eK3HK-%qWcGz8O^`YjmJd8p$CXW+ag{(FAhXJDqa?EzO)NHKiJj+RoMS8 zP!lP=&y@|@0X&`ipfMsR0?UEU;2!?AifHeBul-8JJwKm#Rk5P{n-xGY^l|qVOQ8mR z@ERP3BM^lFy7A3~I6ZycT$J0j$vXwMz|`?Q!^-gPI??}Kvd~ytSG&2kVf*%ay0uV6 ziCO#Yd!#c8Mp>`cPwGhlAeYz8e7Kuf_ vT0A4iWqSRV8l7Wq2M@8^x1J=+@(u*ivi!Ab`~y-`@vkOfy|aR2Tl4+}$%<@e delta 1447 zcmaKse@t6d6vxkbkCnA$49aUuhe}IRXd)sovdM-x<}#!q8?bicS2k>>$Og1Nhcgx} z(>NBVQF8pT=wh_$qKO$Z&&)(Yvqa~nOT-_UfxyBLrcvWeFj=z2ALo{~zVe4RdH0?B zx!-f{c_-)Hp$U2Dd-?ezKHs~yeFlj!3q?*dmIKT&Ff74rKmaG(PJRRA#BB*6L#%it zWB^?w-i{W@>lL@ue6+OWi=%nAuVbM!R2jVzAGo2S!Q zXk-uI1K?-6ghluVp_I4cg+~F9&Md6gnxw`Wmt=&n_d0+{tzt`2yf@gMu(O}{te`#` zuf6CPNDDVcfBIxOIrQii?S3mYBlu@5{}W~hF&bA#Rm5+ zwI&G1JPt!{MyQ_SMMlMRlBbwwjoPAB`7R=!AamnA#tU(!UHwz*YjTr!j-5?Mlh(q3M5LA zI@g`UM3f>$UKB)>Iz_&wzLpJGK<~6{#R~0eO9tW|I^*}?leEU~#9`X#e=3c9K`R51 zH1ZRD75G3;B-ujec2=R4{@VG7rNAP(#4aZ~BVV=B@U9Y$Ke{Wd_rhxGZtY1U&02oj zZZto{5tjORoDQ{Hr5`NxNv)km+fBGYAGPmw-<+2eMA%9+x}r=Jq+0zb)pa=W4GMM~ zlDPdAI-bB1dZ2SHfAjIqb_x6F+U|Kq(|g+RIc;6n4aB#pGU&l^tu^SD@jGqszRl?V zQAr+DVg0{@nn~*3<~U*na0hlkQ&8LpY}W@Gw(z@4>*>Dcu^un{eVA7~idiWBX8xbG zfoI!pH)N`?4-V4wSS;V6LJ#!8K?s2gy|5SVg?>S_!SM@b3&2}0@0-Dwk8OLccJS2s z{l`AmTF=j}HkMacmaVN?UwsGFO?K;6?@tcsR&|rb6qwqYPP8wlIx!tlV7hV{IX%5@ z87Y{lSVkf<4a>;l%$9Vb-G6DbY? { if (LoadedModManager.RunningModsListForReading.Any(x => x.Name == "Don't Shave Your Head 1.0")) { - (new Harmony("rjw")).Patch(AccessTools.Method(AccessTools.TypeByName("DontShaveYourHead.Harmony_PawnRenderer"), "DrawHairReroute"), //typeof(ShowHair.Patch_PawnRenderer_RenderPawnInternal), nameof(ShowHair.Patch_PawnRenderer_RenderPawnInternal.Postfix)), + (new Harmony("rjwanim")).Patch(AccessTools.Method(AccessTools.TypeByName("DontShaveYourHead.Harmony_PawnRenderer"), "DrawHairReroute"), //typeof(ShowHair.Patch_PawnRenderer_RenderPawnInternal), nameof(ShowHair.Patch_PawnRenderer_RenderPawnInternal.Postfix)), transpiler: new HarmonyMethod(AccessTools.Method(typeof(Patch_ShowHairWithHats), "Transpiler"))); } }))(); diff --git a/1.3/Source/Patches/OtherModPatches/HarmonyPatch_FacialAnimation.cs b/1.3/Source/Patches/OtherModPatches/HarmonyPatch_FacialAnimation.cs index 9c01ccb..83ffd5b 100644 --- a/1.3/Source/Patches/OtherModPatches/HarmonyPatch_FacialAnimation.cs +++ b/1.3/Source/Patches/OtherModPatches/HarmonyPatch_FacialAnimation.cs @@ -18,7 +18,7 @@ namespace Rimworld_Animations { try { ((Action)(() => { if (LoadedModManager.RunningModsListForReading.Any(x => x.Name == "[NL] Facial Animation - WIP")) { - (new Harmony("rjw")).Patch(AccessTools.Method(AccessTools.TypeByName("FacialAnimation.DrawFaceGraphicsComp"), "DrawGraphics"), + (new Harmony("rjwanim")).Patch(AccessTools.Method(AccessTools.TypeByName("FacialAnimation.DrawFaceGraphicsComp"), "DrawGraphics"), prefix: new HarmonyMethod(AccessTools.Method(typeof(Patch_FacialAnimation), "Prefix"))); } }))(); diff --git a/1.3/Source/Patches/OtherModPatches/HarmonyPatch_ShowHairWithHats.cs b/1.3/Source/Patches/OtherModPatches/HarmonyPatch_ShowHairWithHats.cs index 3714503..a42ab7d 100644 --- a/1.3/Source/Patches/OtherModPatches/HarmonyPatch_ShowHairWithHats.cs +++ b/1.3/Source/Patches/OtherModPatches/HarmonyPatch_ShowHairWithHats.cs @@ -18,7 +18,7 @@ namespace Rimworld_Animations { ((Action)(() => { if (LoadedModManager.RunningModsListForReading.Any(x => x.Name == "[KV] Show Hair With Hats or Hide All Hats - 1.1")) { - (new Harmony("rjw")).Patch(AccessTools.Method(AccessTools.TypeByName("ShowHair.Patch_PawnRenderer_RenderPawnInternal"), "Postfix"), //typeof(ShowHair.Patch_PawnRenderer_RenderPawnInternal), nameof(ShowHair.Patch_PawnRenderer_RenderPawnInternal.Postfix)), + (new Harmony("rjwanim")).Patch(AccessTools.Method(AccessTools.TypeByName("ShowHair.Patch_PawnRenderer_RenderPawnInternal"), "Postfix"), //typeof(ShowHair.Patch_PawnRenderer_RenderPawnInternal), nameof(ShowHair.Patch_PawnRenderer_RenderPawnInternal.Postfix)), transpiler: new HarmonyMethod(AccessTools.Method(typeof(Patch_ShowHairWithHats), "Transpiler"))); } }))(); diff --git a/Patch_SexToysMasturbation/1.3/Assemblies/Patch_SexToysMasturbation.dll b/Patch_SexToysMasturbation/1.3/Assemblies/Patch_SexToysMasturbation.dll index 56be5f9ba99e1eba017b7a136757eadac7232666..3df90a623881e2322f3e31f8996c8a0ec4735588 100644 GIT binary patch delta 47 zcmZp$Xt0>j!D7Mk@5#oVCQg>a@?RV`3vsov3#9w?9aVR-aGZBf+R&L#VaDbaf)QK* Dx{eWp delta 47 zcmZp$Xt0>j!J_^l?)S!?CQg<)^6%O=3vsov3&`ot*6RB9#(TDwMnPDA;jPUp1S7Zr D*8LNQ