From 90bfe245c9ea8e313a6bde31c0bfb49a26d2e739 Mon Sep 17 00:00:00 2001 From: Matthew Walls Date: Fri, 30 Jul 2021 07:12:05 -0700 Subject: [PATCH] Hotfix 3 Reverts back to previous changes. Removes changes related to Carny Senpai's Enable Oversized Weapons. There are compatibility issues that need to be reviewed. --- 1.3/Assemblies/0JecsTools.dll | Bin 112640 -> 112640 bytes 1.3/Assemblies/AbilityUser.dll | Bin 76288 -> 76288 bytes 1.3/Assemblies/AbilityUserAI.dll | Bin 22528 -> 22528 bytes 1.3/Assemblies/CompActivatableEffect.dll | Bin 16896 -> 16896 bytes 1.3/Assemblies/CompAnimated.dll | Bin 12288 -> 12288 bytes 1.3/Assemblies/CompBalloon.dll | Bin 6144 -> 6144 bytes 1.3/Assemblies/CompBigBox.dll | Bin 6656 -> 6656 bytes 1.3/Assemblies/CompDeflector.dll | Bin 27648 -> 27648 bytes 1.3/Assemblies/CompDelayedSpawner.dll | Bin 8192 -> 8192 bytes 1.3/Assemblies/CompExtraSounds.dll | Bin 6144 -> 6144 bytes 1.3/Assemblies/CompInstalledPart.dll | Bin 20480 -> 20480 bytes 1.3/Assemblies/CompLumbering.dll | Bin 7168 -> 7168 bytes 1.3/Assemblies/CompOverlays.dll | Bin 5120 -> 5120 bytes 1.3/Assemblies/CompOversizedWeapon.dll | Bin 9728 -> 8704 bytes 1.3/Assemblies/CompSlotLoadable.dll | Bin 38400 -> 38400 bytes 1.3/Assemblies/CompToggleDef.dll | Bin 13312 -> 13312 bytes 1.3/Assemblies/PawnShields.dll | Bin 35328 -> 35328 bytes 1.3/Assemblies/ThinkNodes.dll | Bin 8192 -> 8192 bytes About/About.xml | 6 +++++- About/Changelog.txt | 4 ++++ About/Manifest.xml | 2 +- About/Version.txt | 2 +- .../HarmonyCompOversizedWeapon.cs | 14 +++++++------- 23 files changed, 18 insertions(+), 10 deletions(-) diff --git a/1.3/Assemblies/0JecsTools.dll b/1.3/Assemblies/0JecsTools.dll index 1d1e9ad6fbf0b3508064ab9b6abdb639798ea523..2c6d6b44f9065a8d34ffcc4e58483e0384928443 100644 GIT binary patch delta 154 zcmZqpz}E1AZ9)gjGe(t38+$5#vobR&R)cB~J~ z5U#l3(fN3(U!Z?!>UN!GMh;C@V?6^sqwSV!82#CJnHd-vn1F_W>FrZDFFrZDF>RO2!sp_V0!yh6-H}DP9p|A1_K~A+XaY6@6_E*z;8+$ewurf0+FfdJaG*o6eE@v1rIm1v1BDA^RFjS0xQPs*r z`40~}ui;Y5lXJ=2{MmgOJFBstfu7OkdH%1Mc$pa(8JK`3fa%RsgPa*TjT!V941m~Z U^TS|yB<^I+P<XaY6^nG&`4B8+$ewure_)FfdMbG*o6eDt9}0a)zN2L}+urVW=2?TDz7& zZB>bDL&CE~=PvVZ{_MVtoz+OsK+kaVJpWfryi5#?K*+!VrZ-Owa%SW-V$fqS0Aj<< U4};~AxRW_U^^qhUL-#WQ0H^XK=>Px# diff --git a/1.3/Assemblies/CompActivatableEffect.dll b/1.3/Assemblies/CompActivatableEffect.dll index 5417384277d8f8c63196cd82533c6bc4dfca8262..971422e89b99c98a1ad8d846c365610dc1e61db2 100644 GIT binary patch delta 152 zcmZo@VQgq&oY29-ak}LE#-2HHtjr7y3`~=C<(0*c%Nd3MIY9816GSpHfaNx)%WoAC z5S%|Jdj8Qk*M%jw&+X(g&EKqJ@{fhpSkFMuXtTa$Br`8FP(2e+7nt5W)h3yd)0jbz Z!2pPjHZ$7!BXK83+Up}pPPETw0sw5DBBKBR delta 152 zcmZo@VQgq&oY2AI^Y7gDjXiVZSeY0Y7#Jt($}5W>mAf4biFppn682E-<}$s!cK@rxAl5 Zg8>j5Zf3OeN8(P7wAV+HoM@lV1OS1aB_99) diff --git a/1.3/Assemblies/CompAnimated.dll b/1.3/Assemblies/CompAnimated.dll index 7591c0fc5e58fc159b10e8751e75541213655d3f..cef92b7eec5efaabcf1c25da934ec0a2f6fbcdd8 100644 GIT binary patch delta 131 zcmZojXh@jQ!IIUT^K4_!8ZlO81_lPE$+qIkEXU;xLpG;~2k;6=e{_#+o0sIin_X3; zMOV~%^AQyxW>#Z813jb7x7F7&@iH?oGB5!(g6YjuwVW9_jT!V941m~Z^FwWUB<^HR MU40};N8SBQ0AhC^IRF3v delta 131 zcmZojXh@jQ!J-wwI&ovq8ZlNT1_lPk$+qIkEJx*T2X9Uh58xGG4tcd&;53hGr=4c& z*9rf^Hy=?EVrDhcGte{Kd|Q1j6E713BM>q$fa%RswVW9_jTrP841m~h^FwWUB<^HR MU40};N8SBQ0I1j?i2wiq diff --git a/1.3/Assemblies/CompBalloon.dll b/1.3/Assemblies/CompBalloon.dll index 807b2514c94e164e94add3d80630e813398c3bea..2aa33200f6381b690db69c8abd1e9c9923328641 100644 GIT binary patch delta 135 zcmZoLXfT-2!Ls=1$1fXuBsf@^85kItCa>gBW;rfr7_#{SM*y1utAj5ZN4cijKrP% SRYV^lIayHb%4SBf|BL`GGa>B& delta 135 zcmZoLXfT-2!7{IiZ|TM!2@X~!1_lPk$tyXOS&qux4&Ho$BY;g{YOnDBI}(!KbAwsm z?qK>>z1e_&DkH0ro`Ig>=2HUu7PUi StC&7Qafv>KmSUN4$ zFPU<$`*qc3i|8~CRwF$FJ;Tk5lbGZU+^o`IgxW)6u4CSGO+Mg}IJMlij3s#G*1r!j*bg8>j5ZT>0kjKrPn SDyxr>oZKkUvYAotKO+E0h9X4( delta 135 zcmZp0XmFU&!E*Y{>*kF;6S!HK7#J8BCoA$OvmBMX9lY6t=Ld%XN5!0{=7C%;J2ymK z>EAwi)8+ut%}lIDdIoxin>i#Jn0T2O7=e(10Zeb6DizJhX~dw%U;xC1n}13>BXK9Y S%IYH|CpSv8Y-W`E&j9Z6xkw TSy6q2A delta 135 zcmZoLXfT-2!IHIR^1+Qg2^_3U3=9m6lRt7OvmBMX9lTkB^8>5E@g?Cl`qH}`R#e8V z?WaY6?RZ?9eR#-0*YR%QkU2ByiZYRW9f!>L~gf<7OeU%i@wz(DZ zaXP!-eE&UHBDD|sZ;o(aJ`k$Y0RLWaY6^nN^_pS8+%GrS(z9Z7#JtBswuM^mAf50Sw~F?BD6VJ?W?4KVTahs z0_|AGtxFnIMH#Y~H%B-yaoB1VRP|Fui%IS1==|5rZCs0T3H* Z{^)Iv#GP#DtB;VJEa*35Go#;sMgZ#JB542s diff --git a/1.3/Assemblies/CompLumbering.dll b/1.3/Assemblies/CompLumbering.dll index 53b9692924535eeadb0af7d6e8c8b60d8d001e9b..3cce4e108f8ac4549e19da7d0f11eb9f481dad40 100644 GIT binary patch delta 131 zcmZp$Xt0>j!E%a`Z_&mc8%|bc1_lPE$!9s0S&qvYhHU=A$-*I^d&keHe;$+XhWV$D zsn?xi-OM3$gpt))&p^*;^F`t9OuWntj0{XbjbM87R552pPGbf=1_K~A+Wb&l9*H}d NQ&JyE(ou3h698_kAF%)c delta 131 zcmZp$Xt0>j!P4_#)s>AsHk_=8MAHnRuBP7=e(10Zeb6D(1|{X~dw%U;xC1n;(kHBXK8l NO6ns?I!f+m0sw9pA?yGE diff --git a/1.3/Assemblies/CompOverlays.dll b/1.3/Assemblies/CompOverlays.dll index 6df32bef8af094888f1435a59b29e8a333d4a3fa..5bbe179e7f7e597c0e361c82f608494f65f42fb0 100644 GIT binary patch delta 131 zcmZqBXwaC@!7|~;^EVrNKC!VfGcYhPO>SmaW;rfr7_xa4yAg}P!U?zB-h>HzZdX6? zv+zmL|IKf>ix^pr^$hfkHYf9{GV(GrFfuR!HG=8QQ~8`3IgJ_g7z}{eX!ApUc_i*+ NPCq;!zuTiTEDvV z7cQIOu=x#l5hJUSo`Ig>=44(~MqVZcMj&Kh0MnbN@;Nhd8ZqcG7yz;1=7;?9NZiSs Mg8E33j)MD{0B-Ri!2kdN diff --git a/1.3/Assemblies/CompOversizedWeapon.dll b/1.3/Assemblies/CompOversizedWeapon.dll index 264066930399b2a72a3e4f0df3cb7ffde267e54b..b60001ccdce56a58687cfba1f016b2332c8e9b6e 100644 GIT binary patch delta 2630 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%0DR8F1x%Y^6av?Ff*hIP6+ zEhQc_KVdH@Q;B*XYtZ~mDLel+2gV#r;!-ki{LM)(8d6Jg^ zeN+z&(rk&165}m$SRt`pVu!@@K&CK-j2xWjR4xXeu9pLY*o81XhoW9q`B568t7Zc< zmyBi_A-);K|Dsarh>oG{M-O;hl4;6?ZZsgds}?@BL*!SpIn3=w9v`AfS|Rswi&_F6-$fOChgNVkU!z+_J)BmexyI?A%F{f=KS1jZ zai%AakI`kV3AjXC0wleOckwlS1z)EH^epeko@@sGR@=;n_&N0j_=wnJl!~>G;VgXv z%eYSSXgdmvy&R|K!LbpQ8aFXCo43(>bct@eW?*!7%$owOl zEwRSV{_vn1v8MQzMY>{5k>1VWZg;O$k+Y^F+KVrLYKbihcW>zzbZI1c+G^L!o13VE zq9mGV6>Y+}4RV-jsTsV3Hqutw7*E~rU>q>U~_Og)CLwtKsWgP zgwB7YtbmX6U|LAaX%HEsGWsR3F6h=^?7%c4$R{F1-WX-}OSN!_&}MSnf})DayzAqK zXCzH=hnB*z0~tlu)GSxi7Gx7SJ7Mcd*AR>Dmvw}t7ZwLA6VrLl$ zFpY?`ZCa97XDE{_AM4yog&|RL1OP=8og{#Nw8M>}%iJ zv3U3PkKTFv)JHSiiQJH}Lo=+ze)qH7W_!eL2$;lngOwQbIEtM(wH*evhXnM9;zJ%dsD|CXQcUp2cp z`$B$+P52Rd_sSRC87Y~p_~#~1=db103V!GY3SXKez77~RIVQ&n*Rgjx8lVnOee%<( hO%I4}bMa&Mjrb2^j~Bnf#s4eSbCZ^Hi%06re*>c1N)G@4 diff --git a/1.3/Assemblies/CompSlotLoadable.dll b/1.3/Assemblies/CompSlotLoadable.dll index 52bb0dc8948f8bee5644bbb10e0d68ed3ecb0895..c79f2a40acd2d5d35e117a6a2449d4ed0267d63f 100644 GIT binary patch delta 147 zcmZoz!_=^bX+j4}ePm|W#-0~`tjr7y3`~95RkRPJ{0k10xVJFo5aJQzry7avCw{F&F@` b;pUGM&5^j14JYd(Bqs|_nX#F1%6~=xCz>n- diff --git a/1.3/Assemblies/CompToggleDef.dll b/1.3/Assemblies/CompToggleDef.dll index f457f552d2eb6209619324103977b52de17b63ce..9f3ae1ab24d727d981299bab5d962c8653ac9584 100644 GIT binary patch delta 131 zcmZq3Xvmn*!7}T`)K43Gg2Y&v85kItCO;NaW;rfr7_ym5Jd9s}XW5L5PiIazY-A3c zRwv`IXmf$ubrx1*Jp(_%jXe+CSeY3Z7?>s(x+}9Bmop66Ji}c;PvFtk6-Exq0xmm@ zc|UsHnVhd#LUOWT$Cb^D9sd~t#%m{8 delta 137 zcmZpe!qhN@X+j6fqNeD#8+#tOu`)3*FfdLobXR6MDt9}0^9*+ZJ%I_0EFY)MC~)gP zFl&7k)B0DNca$dcuo~$Z=oxNSXv$#XWny3iLIwsfy?JVjH6y1HgC2tc5F2j3*(!|0 Uo&2>;A0ateu;a>R#*Y7t06Y{ZzW@LL diff --git a/1.3/Assemblies/ThinkNodes.dll b/1.3/Assemblies/ThinkNodes.dll index f7e15d17d7a1d4657794be091293343fad6ca7e2..bf2d6284e84d4da554dfd7a5fc590456ed5e1168 100644 GIT binary patch delta 135 zcmZp0XmFU&!Lqe(`_+v-LcFZZ3=9lRlNa+UvmBQ*4B32&H;F^wm|OKsV@?u_PmZNgFgEybzP2v#XKQ*&vam`WRO^SUp z->q?4v)M-M0~4!}o`Ig>W<$wvMqVZcMj&Kh0MnbNN?9{<8ZqcG7yz;1=9|*ONZiR^ SW%Ln}lLh6jY-W`E&jhttps://github.com/pardeike/HarmonyRimWorld/releases/latest - 1.3.0.2 (07-29-2021) + 1.3.0.3 (07-30-2021) Adds modding components to RimWorld: vehicles, spell casting, weapon slots, oversized weapons, and more! @@ -75,6 +75,10 @@ Michael Cailler, Jigsawjohn , Daniel Schott, Penelope Charli Whitman, Jerome Gon ======================== Changelog ======================== +1.3.0.3 (07-30-2021) +======================== +Due to comptability issues, the patch for Enable Oversized Weapons will require additional work. Reverting back to the previous version. + 1.3.0.2 (07-29-2021) ======================== Carny Senpai's Enable Oversized Weapons is now supported and JecsTools CompOversizedWeapon will yield for it. diff --git a/About/Changelog.txt b/About/Changelog.txt index c43da8cd..57300b81 100644 --- a/About/Changelog.txt +++ b/About/Changelog.txt @@ -1,3 +1,7 @@ +1.3.0.3 (07-30-2021) +======================== +Due to comptability issues, the patch for Enable Oversized Weapons will require additional work. Reverting back to the previous version. + 1.3.0.2 (07-29-2021) ======================== Carny Senpai's Enable Oversized Weapons is now supported and JecsTools CompOversizedWeapon will yield for it. diff --git a/About/Manifest.xml b/About/Manifest.xml index 711bfc29..f5634ba0 100644 --- a/About/Manifest.xml +++ b/About/Manifest.xml @@ -1,7 +1,7 @@  JecsTools - 1.3.0.2 + 1.3.0.3 https://raw.githubusercontent.com/jecrell/JecsTools/master/About/Manifest.xml diff --git a/About/Version.txt b/About/Version.txt index 0b9546c1..6b21cce5 100644 --- a/About/Version.txt +++ b/About/Version.txt @@ -1 +1 @@ -1.3.0.2 +1.3.0.3 diff --git a/Source/AllModdingComponents/CompOversizedWeapon/HarmonyCompOversizedWeapon.cs b/Source/AllModdingComponents/CompOversizedWeapon/HarmonyCompOversizedWeapon.cs index 8ed2ca9f..a0b91d84 100644 --- a/Source/AllModdingComponents/CompOversizedWeapon/HarmonyCompOversizedWeapon.cs +++ b/Source/AllModdingComponents/CompOversizedWeapon/HarmonyCompOversizedWeapon.cs @@ -13,14 +13,14 @@ static HarmonyCompOversizedWeapon() { var harmony = new Harmony("jecstools.jecrell.comps.oversized"); var type = typeof(HarmonyCompOversizedWeapon); - var CarnySenpaiEnableOversizedWeaponsModLoaded = ModsConfig.IsActive("CarnySenpai.EnableOversizedWeapons"); + //var CarnySenpaiEnableOversizedWeaponsModLoaded = ModsConfig.IsActive("CarnySenpai.EnableOversizedWeapons"); - if (CarnySenpaiEnableOversizedWeaponsModLoaded) - { - Log.Message("JecsTools:: Using Carny Senpai's Enable Oversized Weapons instead of CompOversizedWeapon"); - return; - } - Log.Warning("JecsTools CompOversizedWeapon Loaded:: This component is no longer recommended for performance. Please see Carny Senpai's Enable Oversized Weapons mod. Once the Carny Senpai's mod is loaded, it will be used instead of CompOversizedWeapon"); + // if (CarnySenpaiEnableOversizedWeaponsModLoaded) + // { + // Log.Message("JecsTools:: Using Carny Senpai's Enable Oversized Weapons instead of CompOversizedWeapon"); + // return; + //} + //Log.Warning("JecsTools CompOversizedWeapon Loaded:: This component is no longer recommended for performance. Please see Carny Senpai's Enable Oversized Weapons mod. Once the Carny Senpai's mod is loaded, it will be used instead of CompOversizedWeapon"); harmony.Patch(AccessTools.Method(typeof(PawnRenderer), nameof(PawnRenderer.DrawEquipmentAiming)), prefix: new HarmonyMethod(type, nameof(DrawEquipmentAimingPreFix)));