Merge pull request #3262 from CombatExtended-Continued/BipodInjectorD…

…e-HardcodeAttempt enable custom verb on bipod injector
CombatExtended-Continued · Jul 14, 2024 · 01dfc2f · 01dfc2f
2 parents 2d4578b + 636ea48
commit 01dfc2f
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/Source/CombatExtended/Compatibility/Bipod_Injector.cs b/Source/CombatExtended/Compatibility/Bipod_Injector.cs
@@ -28,13 +28,13 @@ public static void Add_and_change_all()
                 List<ThingDef> defs = DefDatabase<ThingDef>.AllDefsListForReading.FindAll(k => (k.weaponTags?.Any(O => O == bipod_def.bipod_id) ?? false) && (!k.Verbs?.Any(P => P.verbClass == typeof(CompProperties_BipodComp)) ?? false));
                 foreach (ThingDef def in defs)
                 {
-                    if (def.Verbs?.Any(PP => PP.verbClass == typeof(Verb_ShootCE)) ?? false)
+                    if (def.Verbs?.Any(PP => PP.verbClass == typeof(Verb_ShootCE) || PP.verbClass.IsSubclassOf(typeof(Verb_ShootCE))) ?? false)
                     {
-                        var dar = def.Verbs.Find(PP => PP.verbClass == typeof(Verb_ShootCE)).MemberwiseClone();
-
+                        var tempVP = def.Verbs.Find(PP => PP.verbClass == typeof(Verb_ShootCE) || PP.verbClass.IsSubclassOf(typeof(Verb_ShootCE)));
+                        var dar = tempVP.MemberwiseClone();
                         if (dar != null)
                         {
-                            dar.verbClass = typeof(Verb_ShootCE);
+                            dar.verbClass = tempVP.verbClass;
                             def.Verbs.Clear();
                             def.comps.Add(new CompProperties_BipodComp { catDef = bipod_def, swayMult = bipod_def.swayMult, swayPenalty = bipod_def.swayPenalty, additionalrange = bipod_def.ad_Range, recoilMulton = bipod_def.recoil_mult_setup, recoilMultoff = bipod_def.recoil_mult_NOT_setup, ticksToSetUp = bipod_def.setuptime, warmupMult = bipod_def.warmup_mult_setup, warmupPenalty = bipod_def.warmup_mult_NOT_setup });
                             def.Verbs.Add(dar);