From 2705bb9c369a782cb1522fc0cb3c81e3baa05d10 Mon Sep 17 00:00:00 2001
From: jecrell <matt.walls31@gmail.com>
Date: Fri, 31 Aug 2018 23:29:08 +0900
Subject: [PATCH] 1.1.0.1 - Fixed casting abilities while wielding equipment

---
 Assemblies/0JecsTools.dll                     | Bin 122880 -> 122880 bytes
 Assemblies/AbilityUser.dll                    | Bin 70144 -> 70144 bytes
 Assemblies/AbilityUserAI.dll                  | Bin 28160 -> 28160 bytes
 Assemblies/CompActivatableEffect.dll          | Bin 17920 -> 17920 bytes
 Assemblies/CompAnimated.dll                   | Bin 8192 -> 8192 bytes
 Assemblies/CompBalloon.dll                    | Bin 6656 -> 6656 bytes
 Assemblies/CompDeflector.dll                  | Bin 26624 -> 26624 bytes
 Assemblies/CompDelayedSpawner.dll             | Bin 8192 -> 8192 bytes
 Assemblies/CompExtraSounds.dll                | Bin 5632 -> 5632 bytes
 Assemblies/CompInstalledPart.dll              | Bin 22528 -> 22528 bytes
 Assemblies/CompLumbering.dll                  | Bin 7168 -> 7168 bytes
 Assemblies/CompOverlays.dll                   | Bin 5120 -> 5120 bytes
 Assemblies/CompOversizedWeapon.dll            | Bin 10240 -> 10240 bytes
 Assemblies/CompSlotLoadable.dll               | Bin 37888 -> 37888 bytes
 Assemblies/CompToggleDef.dll                  | Bin 8704 -> 8704 bytes
 Assemblies/CompVehicle.dll                    | Bin 99840 -> 99840 bytes
 Assemblies/PawnShields.dll                    | Bin 23552 -> 23552 bytes
 .../HarmonyCompActivatableEffect.cs           |  55 +++++++++---------
 18 files changed, 29 insertions(+), 26 deletions(-)

diff --git a/Assemblies/0JecsTools.dll b/Assemblies/0JecsTools.dll
index 0db3ffa236b7741ad439fd9489e1caa5abc3703e..6ab1079887ba2a078c98547a858a57f039ba9b0c 100644
GIT binary patch
delta 53
zcmV-50LuS>zz2Z92at#Z+)Igpi?xdZqZ$OB8WB0SG8+L}k`TbaJWiQtvQMmg!=g$2
L8o0NdtpQ{*QZ*K_

delta 53
zcmV-50LuS>zz2Z92at#Zt?__?i?xdZqZ$O88oW5SG8+L}k`S=DZc@qNNJxdc9kNJ3
Ld>OZ#tpQ{*acCB$

diff --git a/Assemblies/AbilityUser.dll b/Assemblies/AbilityUser.dll
index 47439468d5192242ddbadf21d7a3268d581b0a8f..e5284fade12e6a2f8b37f85c24e5aad040fcba76 100644
GIT binary patch
delta 48
zcmV-00MGw`qy&JZ1dxaW+e?YDi*u<2o*EH3vjVCTN)Ua1O1uAwjZTA}J&{?%0#>sm
G^xPfn@f6Mg

delta 48
zcmV-00MGw`qy&JZ1dxaWtMP!bi*u<2n;N`0vjVCTN)X%sSjtK5j7*t-TBHo;TSc=Z
G^xPdE=@!ob

diff --git a/Assemblies/AbilityUserAI.dll b/Assemblies/AbilityUserAI.dll
index dcd3dfe66c428a36b7b56c67defd1cff443bfe12..4b6668d3e0c06294c10c90518e2f9dd3dd61425b 100644
GIT binary patch
delta 48
zcmV-00MGw`+yQ{x0g#9T+)IhEi(@_no*EH3v+_Rf8W4bJud@Beg+{PqmzSVSj0Cgr
GSr8N&X%-j&

delta 48
zcmV-00MGw`+yQ{x0g#9Tt?_`di(@_nn;N`0v+_Rf8V~{1c*@@)Uq+23x|Yo_!vVAK
GSr8N{kro*M

diff --git a/Assemblies/CompActivatableEffect.dll b/Assemblies/CompActivatableEffect.dll
index 60f7d9667c903d6353c05b5dbde0afda8d34f29d..70461c51c1e7351a96aff53af72dda3785c023ef 100644
GIT binary patch
delta 4084
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
W%u($2jQfJK`qACSRUctyxb|O$h)JXX

delta 4083
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
T+dt`R&Vtq5;>ypktHSs%*HA}X

diff --git a/Assemblies/CompAnimated.dll b/Assemblies/CompAnimated.dll
index c1e8581a58031a5200e663545b9e310de4efc1e1..42817f7d59dd60da221c02a7afd523367c86d3f0 100644
GIT binary patch
delta 50
zcmV-20L}k^K!8Ayhy&b9iLr|@3<v-K69AqX5jnHO45$bY%wz-;_s}{;oa4}HBdQQe
IvwRhV3dSlDWB>pF

delta 50
zcmZp0XmFU&!K|F?ys_Jmhl7!UfgwlAuwnBNo)sJd20p%zei*tt@Az?FM(pxu*UdGe
GEnEPndlF{=

diff --git a/Assemblies/CompBalloon.dll b/Assemblies/CompBalloon.dll
index 6c2392a6d17d16ae6c182bf91bd42b37496ab911..174d0dda320b4f21b4b1bfe680ca2be35cdc4f9a 100644
GIT binary patch
delta 50
zcmV-20L}k^G=Maahy&Y8iLr}&2?ziH69AqX5jnFC3U&q%C+5T(a2bk5q&C;#p8UUQ
Ivy>2Q3Azgs%m4rY

delta 50
zcmZoLX)u}4!ECxCbz^rmCkG<~14FZv(4x(JTxDzm3ibz+WIN1VmZ@#btZ!+4wRws_
G4krMaco7Q#

diff --git a/Assemblies/CompDeflector.dll b/Assemblies/CompDeflector.dll
index a6a7dde6c7a8b6094eb818932c8cbd2716303e16..926f5e17eadf65ac604f2dcd0191abec0530a52b 100644
GIT binary patch
delta 52
zcmV-40L%Y?&;fwZ0g#9T+e?YDi&ZxW000vJo*EH3v*<UVAP|_q5*{yC)l8pl?Y#$&
KaR#%PSZEIo>l6S0

delta 52
zcmV-40L%Y?&;fwZ0g#9TbZl6$i&ZxW0RR91d>a3Fv*<UVAP^1n<=p<eSxJ&FuyV<f
KsEV_gSZEJABNrP0

diff --git a/Assemblies/CompDelayedSpawner.dll b/Assemblies/CompDelayedSpawner.dll
index 0fc1f11b8815e278846b9e92aa2184ce5a2de99c..6f2973d9af4485f15b26a6ffd2bbcd7470c1e068 100644
GIT binary patch
delta 50
zcmZp0XmFU&!F<QNb7OZr4+jH-FvC14LCejbc&a!BR+it-+&}-UZ$pNa{pp-6_RTe7
GEt~+_E)x#`

delta 50
zcmZp0XmFU&!K|F?ys<l;hl7!UfgwlAuwnBjo+?g(3r7Q{>U|OSp7}7>?l{BN(#<tu
GEt~+gV-kP>

diff --git a/Assemblies/CompExtraSounds.dll b/Assemblies/CompExtraSounds.dll
index 761bc905f69804a1f4a8a6a8d33990bc8e98b8b8..2d42c7ed0ce73d617ddc4294a1da2c6d56e98240 100644
GIT binary patch
delta 50
zcmZqBY0#O_!F=1hb7S{Sb`AyxVTO59f|i?eI0{$=+C=R+e?7|bp8l+q#p7wk*3EBt
GMK}P(S`w51

delta 50
zcmZqBY0#O_!K{?)ys`TxI|m~J14E9KVZ-JejsjMJ)D=4#_ij$~?Jzk$<@$Qh*v)Tv
GMK}PqeiFR^

diff --git a/Assemblies/CompInstalledPart.dll b/Assemblies/CompInstalledPart.dll
index 740138143e4290796a25ade769bde8f6f5b434fb..bde67c30df244c03eecd4875ef6a587a4177949c 100644
GIT binary patch
delta 48
zcmV-00MGw`umOOu0g#9T+)IhEi)}3go*EH3v-~ZH84#NDt0nLZjzgldy{_C-?6I?y
GM{E!S))rO(

delta 48
zcmV-00MGw`umOOu0g#9TO8jWCi)}3gh#D+<v-~ZH84%c_m>Eo2xl67l%_T2|LlU!;
GM{E%6aTACD

diff --git a/Assemblies/CompLumbering.dll b/Assemblies/CompLumbering.dll
index c85ba98c83baee09d0a59a620572d347545f4478..dffd28d967c244f6e50095473202f18dab68ba4c 100644
GIT binary patch
delta 50
zcmZp$Xt0>j!F=1hb7OZi7Y74_FvC14LCeiz+-@8KHNu>^k}h+-<^(c!2VP}(y*WpC
G3I_m`0T1*5

delta 50
zcmV-20L}k^IDj~ihyx;RL$Qm43J3uJ003+nF@Uoc3q}YKuj`pzjhC}eztpaB+(Mv`
IvuqQT2(V5Q9smFU

diff --git a/Assemblies/CompOverlays.dll b/Assemblies/CompOverlays.dll
index ae3589f6bc1721045f3fe6f01d57f8c512fa40b1..bbd7d5704f13db485dff74a529f693d442460e47 100644
GIT binary patch
delta 50
zcmZqBXwaC@!F<QNb7S{<HVy^`VTO59f|i?|*x6VF3Kt*raoi#A)WEnZd#2=(pv@87
GD>wkCq7dHz

delta 50
zcmZqBXwaC@!K|F?ys>*d8wVo;14E9KVZ&x8b~YA)X#piG6bxNGdx|C2Xg>SOu{nZ!
G1qT3thY$P!

diff --git a/Assemblies/CompOversizedWeapon.dll b/Assemblies/CompOversizedWeapon.dll
index 2716c3d2d66ee9d033543d7332db83242f4ce04b..1500eff39a6020023e788591ff21c15196699297 100644
GIT binary patch
delta 50
zcmV-20L}k^P=HX7hy&Y8iLr}u5(oeQ69AqX5jnF26VM6}`x!?GMXHrYnf~~Syc?9E
Iv*aBd3e1TUDF6Tf

delta 50
zcmV-20L}k^P=HX7hyx;RL$Ql-5(ohR003+nF@UoK6VM6}^1RmJA;A1evhjOJ<2%0Y
Iv*aBd3e(UO)&Kwi

diff --git a/Assemblies/CompSlotLoadable.dll b/Assemblies/CompSlotLoadable.dll
index 1295407be626ec505b1564460a7e2d000ec144fb..ac099f86e2b200b886199bf84e37a3c2cc2234ef 100644
GIT binary patch
delta 48
zcmZoz!PKyVX+j6{9q-PK-R>bQ^P~hVH(v{h(-fE`DEipPq0*r}b!l5&V*TIEE_HiE
E0otV$5dZ)H

delta 48
zcmV-00MGw`r~-hf0+5IUN&INBi$_!hh#D+<v({8zDG)&~g4>>f21>eXq?pZI1^2T=
Ge!Law(iFS^

diff --git a/Assemblies/CompToggleDef.dll b/Assemblies/CompToggleDef.dll
index 85f2af6bad9d9726c3f71d01771c8580b463c5c5..e76a2fcbbe40072ac6479c22f02975b2108096a2 100644
GIT binary patch
delta 50
zcmV-20L}k^M1Vw)hy&b9iLr|h4F~`L69AqX5jnG>4VnoMsen>fB%$m|hM1p^<=AIQ
IvrHGX3dYM5H~;_u

delta 50
zcmZp0X>gg)!K|F?ys?{~mxGakfgwlAuwnBe-dUUi-Fk+SM}_<y+a@p_OVTQ|-0UO1
Gg$n?FVGniy

diff --git a/Assemblies/CompVehicle.dll b/Assemblies/CompVehicle.dll
index e1fcbd18eeeaca49c7dda590b9bc9ab8ca5165c0..c3e3f46d06ab0a3320d95bccb534eeb513d163e2 100644
GIT binary patch
delta 49
zcmV-10M7q_j0S*=29SsY+e?YDixchyo*EH3v!d?KZV=e=p;A~NDN3=8D)lK{Ho3Qe
HT>*e798nc`

delta 49
zcmV-10M7q_j0S*=29SsYtMP!bixchyn;N`0v!d?KZV-U>48O9V4NR$Hp@{xCzVx?%
HT>*e7P4E~S

diff --git a/Assemblies/PawnShields.dll b/Assemblies/PawnShields.dll
index c3ceb9abed5269931f04ccb605ee1f9fad417bfd..16d1d64179d26401daa2d56f99101cc6951034b0 100644
GIT binary patch
delta 3974
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

delta 3956
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
S^Udv3Q|f-%cjo&3*8c#2HR3e@

diff --git a/Source/AllModdingComponents/CompActivatableEffect/HarmonyCompActivatableEffect.cs b/Source/AllModdingComponents/CompActivatableEffect/HarmonyCompActivatableEffect.cs
index c7bb73fb..8f93d57f 100644
--- a/Source/AllModdingComponents/CompActivatableEffect/HarmonyCompActivatableEffect.cs
+++ b/Source/AllModdingComponents/CompActivatableEffect/HarmonyCompActivatableEffect.cs
@@ -1,4 +1,5 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 using System.Linq;
 using Harmony;
 using RimWorld;
@@ -17,9 +18,9 @@ static HarmonyCompActivatableEffect()
             harmony.Patch(typeof(Pawn).GetMethod("GetGizmos"), null,
                 new HarmonyMethod(typeof(HarmonyCompActivatableEffect).GetMethod("GetGizmosPrefix")));
             harmony.Patch(typeof(PawnRenderer).GetMethod("DrawEquipmentAiming"), null,
-                new HarmonyMethod(typeof(HarmonyCompActivatableEffect).GetMethod("DrawEquipmentAimingPostFix")));
+                new HarmonyMethod(typeof(HarmonyCompActivatableEffect), nameof(DrawEquipmentAimingPostFix)));
             harmony.Patch(typeof(Verb).GetMethod("TryStartCastOn"),
-                new HarmonyMethod(typeof(HarmonyCompActivatableEffect).GetMethod("TryStartCastOnPrefix")), null);
+                new HarmonyMethod(typeof(HarmonyCompActivatableEffect), nameof(TryStartCastOnPrefix)), null);
             harmony.Patch(typeof(Pawn_DraftController).GetMethod("set_Drafted"), null,
                 new HarmonyMethod(typeof(HarmonyCompActivatableEffect).GetMethod("set_Drafted_PostFix")));
             harmony.Patch(typeof(Pawn).GetMethod("ExitMap"),
@@ -74,31 +75,33 @@ public static bool TryStartCastOnPrefix(ref bool __result, Verb __instance)
         {
             if (__instance.caster is Pawn pawn)
             {
-                var pawn_EquipmentTracker = pawn.equipment;
-                if (pawn_EquipmentTracker != null)
-                {
-                    //Log.Message("2");
-                    //ThingWithComps thingWithComps = (ThingWithComps)AccessTools.Field(typeof(Pawn_EquipmentTracker), "primaryInt").GetValue(pawn_EquipmentTracker);
-                    var thingWithComps =
-                        pawn_EquipmentTracker
-                            .Primary; //(ThingWithComps)AccessTools.Field(typeof(Pawn_EquipmentTracker), "primaryInt").GetValue(pawn_EquipmentTracker);
+                var pawn_EquipmentTracker = pawn?.equipment;
+                if (pawn_EquipmentTracker == null) return true;
 
-                    if (thingWithComps != null)
-                    {
-                        //Log.Message("3");
-                        var compActivatableEffect = thingWithComps.GetComp<CompActivatableEffect>();
-                        if (compActivatableEffect != null)
-                            if (__instance.EquipmentSource == thingWithComps)
-                                if (compActivatableEffect.CurrentState != CompActivatableEffect.State.Activated)
-                                {
-                                    if (Find.TickManager.TicksGame % 250 == 0)
-                                        Messages.Message("DeactivatedWarning".Translate(pawn.Label),
-                                            MessageTypeDefOf.RejectInput);
-                                    __result = false;
-                                    return false;
-                                }
-                    }
+                var thingWithComps =
+                    pawn_EquipmentTracker?.Primary; //(ThingWithComps)AccessTools.Field(typeof(Pawn_EquipmentTracker), "primaryInt").GetValue(pawn_EquipmentTracker);
+
+                var compActivatableEffect = thingWithComps?.GetComp<CompActivatableEffect>();
+                if (compActivatableEffect == null) return true;
+
+                //Equipment source throws errors when checked while casting abilities with a weapon equipped.
+                // to avoid this error preventing our code from executing, we do a try/catch.
+                try
+                {
+                    if (__instance?.EquipmentSource != thingWithComps)
+                        return true;
+                }
+                catch (Exception e)
+                {
                 }
+
+                if (compActivatableEffect.CurrentState == CompActivatableEffect.State.Activated) return true;
+                
+                if (Find.TickManager.TicksGame % 250 == 0)
+                    Messages.Message("DeactivatedWarning".Translate(pawn.Label),
+                        MessageTypeDefOf.RejectInput);
+                __result = false;
+                return false;
             }
             return true;
         }