Attempting to check for ammo types

BattletechModders · Feb 23, 2020 · 3a74022 · 3a74022
1 parent 6aa90b7
commit 3a74022
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/CleverGirl/CleverGirl/Helper/AIHelper.cs b/CleverGirl/CleverGirl/Helper/AIHelper.cs
@@ -195,14 +195,17 @@ private static float CalculateWeaponDamageEV(CondensedWeapon cWeapon, BehaviorTr
                     float armorReduction = 0f;
                     foreach(AmmunitionBox aBox in cWeapon.First.ammoBoxes) {
                         //Mod.Log.Debug($" -- Checking ammo box defId: {aBox.mechComponentRef.ComponentDefID}");
-                        if (aBox.mechComponentRef.Is<CleverGirlComponent>(out CleverGirlComponent cgComp) && cgComp.ArmorDamageReduction != 0) {
+                        if (aBox.ammoDef.Is.mechComponentRef.Def.Is<CleverGirlComponent>(out CleverGirlComponent cgComp) && cgComp.ArmorDamageReduction != 0) {
                             armorReduction = cgComp.ArmorDamageReduction;
                         }
                     }
                     if (armorReduction != 0f) {
                         Mod.Log.Debug($" -- APPLY DAMAGE REDUCTION OF: {armorReduction}");
                     }
 
+                    // TODO: AMS provides a shield to allies
+
+
                     // Need to precalc some values on every combatant - 
                     //  find objective targets
                     //  heat to cripple / damage / etc

diff --git a/CleverGirl/CleverGirl/Properties/AssemblyInfo.cs b/CleverGirl/CleverGirl/Properties/AssemblyInfo.cs
@@ -31,5 +31,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("0.3.2.0")]
-[assembly: AssemblyFileVersion("0.3.2.0")]
+[assembly: AssemblyVersion("0.3.4.0")]
+[assembly: AssemblyFileVersion("0.3.4.0")]