- Consolidated ability defs under a common mod.json element. Combat.F…

…lexibleSensorLock.FreeActionWithAbility renamed to Abilities.FlexibleSensorLockId. JuggernautAbilityId renamed to Abilities.JuggernautId
BattletechModders · Jun 19, 2020 · 421a571 · 421a571
1 parent f856fa1
commit 421a571
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/IRTweaks/IRTweaks/Modules/Combat/BraceOnMeleeWithJuggernaut.cs b/IRTweaks/IRTweaks/Modules/Combat/BraceOnMeleeWithJuggernaut.cs
@@ -23,7 +23,7 @@ static void Prefix(MechMeleeSequence __instance)
             {
                 foreach (Ability ability in passives)
                 {
-                    if (ability.Def.Description.Id.Equals(Mod.Config.JuggernautAbilityId, StringComparison.InvariantCultureIgnoreCase))
+                    if (ability.Def.Description.Id.Equals(Mod.Config.Abilities.JuggernautId, StringComparison.InvariantCultureIgnoreCase))
                     {
                         Mod.Log.Info("Pilot has Juggernaut, bracing after melee attack.");
                         __instance.OwningMech.BracedLastRound = true;
@@ -51,7 +51,7 @@ static void Prefix(MechDFASequence __instance)
             {
                 foreach (Ability ability in passives)
                 {
-                    if (ability.Def.Description.Id.Equals(Mod.Config.JuggernautAbilityId, StringComparison.InvariantCultureIgnoreCase))
+                    if (ability.Def.Description.Id.Equals(Mod.Config.Abilities.JuggernautId, StringComparison.InvariantCultureIgnoreCase))
                     {
                         Mod.Log.Info("Pilot has Juggernaut, bracing after DFA attack.");
                         __instance.OwningMech.BracedLastRound = true;

diff --git a/IRTweaks/IRTweaks/Modules/Combat/FlexibleSensorLock.cs b/IRTweaks/IRTweaks/Modules/Combat/FlexibleSensorLock.cs
@@ -95,10 +95,10 @@ public static void OrderSequence_ConsumesActivation_Postfix(OrderSequence __inst
                 else
                 {
                     // Check if the pilot has the associated ability ID, and return true if so...
-                    Mod.Log.Debug($" OrderSequence_ConsumesActivation_Postfix - Sensor Lock is paired with ability [{Mod.Config.Combat.FlexibleSensorLock.AbilityId}], checking pilot...");
+                    Mod.Log.Debug($" OrderSequence_ConsumesActivation_Postfix - Sensor Lock is paired with ability [{Mod.Config.Abilities.FlexibleSensorLockId}], checking pilot...");
                     if (PilotHasFreeSensorLockAbility(___owningActor?.GetPilot()))
                     {
-                        Mod.Log.Debug($" OrderSequence_ConsumesActivation_Postfix - Sensor Lock paired ability [{Mod.Config.Combat.FlexibleSensorLock.AbilityId}] found, setting true...");
+                        Mod.Log.Debug($" OrderSequence_ConsumesActivation_Postfix - Sensor Lock paired ability [{Mod.Config.Abilities.FlexibleSensorLockId}] found, setting true...");
                         __result = false;
                     }
                 }
@@ -115,7 +115,7 @@ private static bool PilotHasFreeSensorLockAbility(Pilot pilot)
         {
             Mod.Log.Debug($"pilot = [{pilot}]\r\n" 
                           + $"abilities = [{string.Join(",", pilot?.Abilities.Select(ability => ability.Def.Id))}]");
-            return Mod.Config.Combat.FlexibleSensorLock.FreeActionWithAbility == false || (pilot?.Abilities?.Exists(ability => ability.Def.Id == Mod.Config.Combat.FlexibleSensorLock.AbilityId) ?? false);
+            return Mod.Config.Combat.FlexibleSensorLock.FreeActionWithAbility == false || (pilot?.Abilities?.Exists(ability => ability.Def.Id == Mod.Config.Abilities.FlexibleSensorLockId) ?? false);
         }
 
         public static bool AIUtil_EvaluateSensorLockQuality_Prefix(ref bool __result, AbstractActor movingUnit, ICombatant target, out float quality) {

diff --git a/mod.json b/mod.json
@@ -2,7 +2,7 @@
 	"Name": "IRTweaks",
 	"Enabled": true,
 	"Hidden": true,
-	"Version": "0.6.7",
+	"Version": "0.6.8",
 	"Description": "Miscellaneous Tweaks and Fixes",
 	"Author": "IceRaptor",
 	"Website": "https://github.com/IceRaptor/IRTweaks",
@@ -39,12 +39,13 @@
 			"WeaponTooltip": true
 		},
 		"Abilities": {
+            "FlexibleSensorLockId": "AbilityDefT8A",
+            "JuggernautId" : "AbilityDefGu8",
 			"MultiTargetId": "AbilityDefG5"
 		},
 		"Combat": {
 			"FlexibleSensorLock": {
-				"FreeActionWithAbility": false,
-				"AbilityId": "AbilityDefT8A"
+				"FreeActionWithAbility": false
 			},
 			"PainTolerance": {
 				"ResistPerGuts": 10,
@@ -65,7 +66,6 @@
 				"ApplyToReinforcements": true
 			}
 		},
-        "JuggernautAbilityId" : "AbilityDefGu8",
 		"Store": {
 			"QuantityOnShift": 5,
 			"QuantityOnControl": 20