Apply command burst skills to the bursts and charges. Handle renamed items.

2016-10-23 02:34:29 -04:00
parent 50911c7fc8
commit 34c95bea5d
69 changed files with 144 additions and 78 deletions
--- a/eos/effects/armoredcommanddurationbonus.py
+++ b/eos/effects/armoredcommanddurationbonus.py
@@ -0,0 +1,4 @@
+type = "passive"
+def handler(fit, src, context):
+    lvl = src.level
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Armored Command"), "buffDuration", src.getModifiedItemAttr("durationBonus") * lvl)
--- a/eos/effects/armoredcommandstrengthbonus.py
+++ b/eos/effects/armoredcommandstrengthbonus.py
@@ -0,0 +1,7 @@
+type = "passive"
+def handler(fit, src, context):
+    lvl = src.level
+    fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Armored Command"), "warfareBuff1Value", src.getModifiedItemAttr("commandStrengthBonus") * lvl)
+    fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Armored Command"), "warfareBuff2Value", src.getModifiedItemAttr("commandStrengthBonus") * lvl)
+    fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Armored Command"), "warfareBuff4Value", src.getModifiedItemAttr("commandStrengthBonus") * lvl)
+    fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Armored Command"), "warfareBuff3Value", src.getModifiedItemAttr("commandStrengthBonus") * lvl)
--- a/eos/effects/armoredsquadroncommand.py
+++ b/eos/effects/armoredsquadroncommand.py
@@ -1,9 +1,9 @@
 # armoredSquadronCommand
 #
 # Used by:
-# Skill: Armored Warfare Specialist
+# Skill: Armored Command Specialist
 runTime = "early"
 type = "passive"
 def handler(fit, skill, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Armored Warfare Specialist"),
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Armored Command Specialist"),
                                  "commandBonus", skill.getModifiedItemAttr("squadronCommandBonus") * skill.level)
--- a/eos/effects/armoredwarfaremindlink.py
+++ b/eos/effects/armoredwarfaremindlink.py
@@ -1,10 +1,10 @@
 # armoredWarfareMindlink
 #
 # Used by:
-# Implant: Armored Warfare Mindlink
+# Implant: Armored Command Mindlink
 # Implant: Federation Navy Warfare Mindlink
 # Implant: Imperial Navy Warfare Mindlink
 type = "passive"
 def handler(fit, implant, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Armored Warfare Specialist"),
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Armored Command Specialist"),
                                  "commandBonus", implant.getModifiedItemAttr("mindlinkBonus"))
--- a/eos/effects/armortankinggang.py
+++ b/eos/effects/armortankinggang.py
@@ -1,7 +1,7 @@
 # armorTankingGang
 #
 # Used by:
-# Skill: Armored Warfare
+# Skill: Armored Command
 type = "gang"
 gangBoost = "armorHP"
 gangBonus = "armorHpBonus"
--- a/eos/effects/armorwarfarearmorhpreplacer.py
+++ b/eos/effects/armorwarfarearmorhpreplacer.py
@@ -1,7 +1,7 @@
 # armorWarfareArmorHpReplacer
 #
 # Used by:
-# Implant: Armored Warfare Mindlink
+# Implant: Armored Command Mindlink
 # Implant: Federation Navy Warfare Mindlink
 # Implant: Imperial Navy Warfare Mindlink
 type = "gang", "active"
--- a/eos/effects/commandburstaoebonus.py
+++ b/eos/effects/commandburstaoebonus.py
@@ -0,0 +1,5 @@
+type = "passive"
+def handler(fit, src, context):
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Leadership"),
+                                  "maxRange",
+                                  src.getModifiedItemAttr("areaOfEffectBonus") * src.level)
--- a/eos/effects/commandburstreloadtimebonus.py
+++ b/eos/effects/commandburstreloadtimebonus.py
@@ -0,0 +1,6 @@
+type = "passive"
+def handler(fit, src, context):
+    lvl = src.level
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Leadership"),
+                                  "reloadTime",
+                                  src.getModifiedItemAttr("reloadTimeBonus") * lvl)
--- a/eos/effects/covertwarfaremindlink.py
+++ b/eos/effects/covertwarfaremindlink.py
@@ -6,6 +6,6 @@
 # Implant: Information Warfare Mindlink
 type = "passive"
 def handler(fit, implant, context):
-    fit.character.getSkill("Information Warfare").suppress()
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Information Warfare Specialist"),
+    fit.character.getSkill("Information Command").suppress()
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Information Command Specialist"),
                                  "commandBonus", implant.getModifiedItemAttr("mindlinkBonus"))
--- a/eos/effects/elitebonuscommanddestroyerarmored1.py
+++ b/eos/effects/elitebonuscommanddestroyerarmored1.py
@@ -5,4 +5,4 @@
 # Ship: Pontifex
 type = "passive"
 def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Armored Warfare Specialist"), "commandBonus", src.getModifiedItemAttr("eliteBonusCommandDestroyer1"), skill="Command Destroyers")
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Armored Command Specialist"), "commandBonus", src.getModifiedItemAttr("eliteBonusCommandDestroyer1"), skill="Command Destroyers")
--- a/eos/effects/elitebonuscommanddestroyerinfo1.py
+++ b/eos/effects/elitebonuscommanddestroyerinfo1.py
@@ -5,4 +5,4 @@
 # Ship: Stork
 type = "passive"
 def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Information Warfare Specialist"), "commandBonus", src.getModifiedItemAttr("eliteBonusCommandDestroyer1"), skill="Command Destroyers")
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Information Command Specialist"), "commandBonus", src.getModifiedItemAttr("eliteBonusCommandDestroyer1"), skill="Command Destroyers")
--- a/eos/effects/elitebonuscommanddestroyerinfohidden1.py
+++ b/eos/effects/elitebonuscommanddestroyerinfohidden1.py
@@ -5,4 +5,4 @@
 # Ship: Stork
 type = "passive"
 def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Information Warfare Specialist"), "commandBonusHidden", src.getModifiedItemAttr("eliteBonusCommandDestroyer1"), skill="Command Destroyers")
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Information Command Specialist"), "commandBonusHidden", src.getModifiedItemAttr("eliteBonusCommandDestroyer1"), skill="Command Destroyers")
--- a/eos/effects/elitebonuscommanddestroyersiege1.py
+++ b/eos/effects/elitebonuscommanddestroyersiege1.py
@@ -5,4 +5,4 @@
 # Ship: Stork
 type = "passive"
 def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Siege Warfare Specialist"), "commandBonus", src.getModifiedItemAttr("eliteBonusCommandDestroyer1"), skill="Command Destroyers")
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Command Specialist"), "commandBonus", src.getModifiedItemAttr("eliteBonusCommandDestroyer1"), skill="Command Destroyers")
--- a/eos/effects/elitebonuscommanddestroyerskirmish1.py
+++ b/eos/effects/elitebonuscommanddestroyerskirmish1.py
@@ -5,4 +5,4 @@
 # Ship: Magus
 type = "passive"
 def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Skirmish Warfare Specialist"), "commandBonus", src.getModifiedItemAttr("eliteBonusCommandDestroyer1"), skill="Command Destroyers")
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Skirmish Command Specialist"), "commandBonus", src.getModifiedItemAttr("eliteBonusCommandDestroyer1"), skill="Command Destroyers")
--- a/eos/effects/elitebonuscommandshiparmoredcs3.py
+++ b/eos/effects/elitebonuscommandshiparmoredcs3.py
@@ -4,5 +4,5 @@
 # Ships from group: Command Ship (4 of 8)
 type = "passive"
 def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Armored Warfare Specialist"),
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Armored Command Specialist"),
                                  "commandBonus", ship.getModifiedItemAttr("eliteBonusCommandShips3"), skill="Command Ships")
--- a/eos/effects/elitebonuscommandshipinformationcs3.py
+++ b/eos/effects/elitebonuscommandshipinformationcs3.py
@@ -4,5 +4,5 @@
 # Ships from group: Command Ship (4 of 8)
 type = "passive"
 def handler(fit, module, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Information Warfare Specialist"),
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Information Command Specialist"),
                                  "commandBonus", module.getModifiedItemAttr("eliteBonusCommandShips3"), skill="Command Ships")
--- a/eos/effects/elitebonuscommandshipinformationhiddencs3.py
+++ b/eos/effects/elitebonuscommandshipinformationhiddencs3.py
@@ -4,5 +4,5 @@
 # Ships from group: Command Ship (4 of 8)
 type = "passive"
 def handler(fit, module, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Information Warfare Specialist"),
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Information Command Specialist"),
                                  "commandBonusHidden", module.getModifiedItemAttr("eliteBonusCommandShips3"), skill="Command Ships")
--- a/eos/effects/elitebonuscommandshipsiegecs3.py
+++ b/eos/effects/elitebonuscommandshipsiegecs3.py
@@ -4,5 +4,5 @@
 # Ships from group: Command Ship (4 of 8)
 type = "passive"
 def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Siege Warfare Specialist"),
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Command Specialist"),
                                  "commandBonus", ship.getModifiedItemAttr("eliteBonusCommandShips3"), skill="Command Ships")
--- a/eos/effects/elitebonuscommandshipskirmishcs3.py
+++ b/eos/effects/elitebonuscommandshipskirmishcs3.py
@@ -4,5 +4,5 @@
 # Ships from group: Command Ship (4 of 8)
 type = "passive"
 def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Skirmish Warfare Specialist"),
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Skirmish Command Specialist"),
                                  "commandBonus", ship.getModifiedItemAttr("eliteBonusCommandShips3"), skill="Command Ships")
--- a/eos/effects/gangarmorhardening.py
+++ b/eos/effects/gangarmorhardening.py
@@ -1,7 +1,7 @@
 # gangArmorHardening
 #
 # Used by:
-# Variations of module: Armored Warfare Link - Passive Defense I (2 of 2)
+# Variations of module: Armored Command Link - Passive Defense I (2 of 2)
 type = "gang", "active"
 gangBoost = "armorResistance"
 def handler(fit, module, context):
--- a/eos/effects/gangarmorrepaircapreducerselfandprojected.py
+++ b/eos/effects/gangarmorrepaircapreducerselfandprojected.py
@@ -1,7 +1,7 @@
 # gangArmorRepairCapReducerSelfAndProjected
 #
 # Used by:
-# Variations of module: Armored Warfare Link - Damage Control I (2 of 2)
+# Variations of module: Armored Command Link - Damage Control I (2 of 2)
 type = "gang", "active"
 gangBoost = "armorRepairCapacitorNeed"
 def handler(fit, module, context):
--- a/eos/effects/gangarmorrepairspeedamplifierselfandprojected.py
+++ b/eos/effects/gangarmorrepairspeedamplifierselfandprojected.py
@@ -1,7 +1,7 @@
 # gangArmorRepairSpeedAmplifierSelfAndProjected
 #
 # Used by:
-# Variations of module: Armored Warfare Link - Rapid Repair I (2 of 2)
+# Variations of module: Armored Command Link - Rapid Repair I (2 of 2)
 type = "gang", "active"
 gangBoost = "armorRepairDuration"
 def handler(fit, module, context):
--- a/eos/effects/informationcommanddurationbonus.py
+++ b/eos/effects/informationcommanddurationbonus.py
@@ -0,0 +1,4 @@
+type = "passive"
+def handler(fit, src, context):
+    lvl = src.level
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Information Command"), "buffDuration", src.getModifiedItemAttr("durationBonus") * lvl)
--- a/eos/effects/informationcommandstrengthbonus.py
+++ b/eos/effects/informationcommandstrengthbonus.py
@@ -0,0 +1,7 @@
+type = "passive"
+def handler(fit, src, context):
+    lvl = src.level
+    fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Information Command"), "warfareBuff2Value", src.getModifiedItemAttr("commandStrengthBonus") * lvl)
+    fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Information Command"), "warfareBuff1Value", src.getModifiedItemAttr("commandStrengthBonus") * lvl)
+    fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Information Command"), "warfareBuff3Value", src.getModifiedItemAttr("commandStrengthBonus") * lvl)
+    fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Information Command"), "warfareBuff4Value", src.getModifiedItemAttr("commandStrengthBonus") * lvl)
--- a/eos/effects/informationsquadroncommand.py
+++ b/eos/effects/informationsquadroncommand.py
@@ -1,9 +1,9 @@
 # informationSquadronCommand
 #
 # Used by:
-# Skill: Information Warfare Specialist
+# Skill: Information Command Specialist
 runTime = "early"
 type = "passive"
 def handler(fit, skill, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Information Warfare Specialist"),
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Information Command Specialist"),
                                  "commandBonus", skill.getModifiedItemAttr("squadronCommandBonus") * skill.level)
--- a/eos/effects/informationsquadroncommandhidden.py
+++ b/eos/effects/informationsquadroncommandhidden.py
@@ -1,9 +1,9 @@
 # informationSquadronCommandHidden
 #
 # Used by:
-# Skill: Information Warfare Specialist
+# Skill: Information Command Specialist
 runTime = "early"
 type = "passive"
 def handler(fit, skill, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Information Warfare Specialist"),
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Information Command Specialist"),
                                  "commandBonusHidden", skill.getModifiedItemAttr("squadronCommandBonus") * skill.level)
--- a/eos/effects/informationwarfaremindlinkhidden.py
+++ b/eos/effects/informationwarfaremindlinkhidden.py
@@ -6,6 +6,6 @@
 # Implant: Information Warfare Mindlink
 type = "passive"
 def handler(fit, implant, context):
-    fit.character.getSkill("Information Warfare").suppress()
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Information Warfare Specialist"),
+    fit.character.getSkill("Information Command").suppress()
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Information Command Specialist"),
                                  "commandBonusHidden", implant.getModifiedItemAttr("mindlinkBonus"))
--- a/eos/effects/miningforemandurationbonus.py
+++ b/eos/effects/miningforemandurationbonus.py
@@ -0,0 +1,4 @@
+type = "passive"
+def handler(fit, src, context):
+    lvl = src.level
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Mining Foreman"), "buffDuration", src.getModifiedItemAttr("durationBonus") * lvl)
--- a/eos/effects/miningforemanstrengthbonus.py
+++ b/eos/effects/miningforemanstrengthbonus.py
@@ -0,0 +1,7 @@
+type = "passive"
+def handler(fit, src, context):
+    lvl = src.level
+    fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Mining Foreman"), "warfareBuff4Value", src.getModifiedItemAttr("commandStrengthBonus") * lvl)
+    fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Mining Foreman"), "warfareBuff3Value", src.getModifiedItemAttr("commandStrengthBonus") * lvl)
+    fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Mining Foreman"), "warfareBuff2Value", src.getModifiedItemAttr("commandStrengthBonus") * lvl)
+    fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Mining Foreman"), "warfareBuff1Value", src.getModifiedItemAttr("commandStrengthBonus") * lvl)
--- a/eos/effects/modulebonusarmoredwarfarelinkdamagecontrol.py
+++ b/eos/effects/modulebonusarmoredwarfarelinkdamagecontrol.py
@@ -1,7 +1,7 @@
 # moduleBonusArmoredWarfareLinkDamageControl
 #
 # Used by:
-# Variations of module: Armored Warfare Link - Damage Control I (2 of 2)
+# Variations of module: Armored Command Link - Damage Control I (2 of 2)
 type = "gang", "active"
 gangBoost = "armorRepairCapacitorNeed"
 #runTime = "late"
--- a/eos/effects/modulebonusarmoredwarfarelinkpassivedefense.py
+++ b/eos/effects/modulebonusarmoredwarfarelinkpassivedefense.py
@@ -1,7 +1,7 @@
 # moduleBonusArmoredWarfareLinkPassiveDefense
 #
 # Used by:
-# Variations of module: Armored Warfare Link - Passive Defense I (2 of 2)
+# Variations of module: Armored Command Link - Passive Defense I (2 of 2)
 type = "gang", "active"
 gangBoost = "armorResistance"
 #runTime = "late"
--- a/eos/effects/modulebonusarmoredwarfarelinkrapidrepair.py
+++ b/eos/effects/modulebonusarmoredwarfarelinkrapidrepair.py
@@ -1,7 +1,7 @@
 # moduleBonusArmoredWarfareLinkRapidRepair
 #
 # Used by:
-# Variations of module: Armored Warfare Link - Rapid Repair I (2 of 2)
+# Variations of module: Armored Command Link - Rapid Repair I (2 of 2)
 type = "gang", "active"
 gangBoost = "armorRepairDuration"
 #runTime = "late"
--- a/eos/effects/shieldcommanddurationbonus.py
+++ b/eos/effects/shieldcommanddurationbonus.py
@@ -0,0 +1,4 @@
+type = "passive"
+def handler(fit, src, context):
+    lvl = src.level
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Command"), "buffDuration", src.getModifiedItemAttr("durationBonus") * lvl)
--- a/eos/effects/shieldcommandstrengthbonus.py
+++ b/eos/effects/shieldcommandstrengthbonus.py
@@ -0,0 +1,7 @@
+type = "passive"
+def handler(fit, src, context):
+    lvl = src.level
+    fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Shield Command"), "warfareBuff3Value", src.getModifiedItemAttr("commandStrengthBonus") * lvl)
+    fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Shield Command"), "warfareBuff1Value", src.getModifiedItemAttr("commandStrengthBonus") * lvl)
+    fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Shield Command"), "warfareBuff2Value", src.getModifiedItemAttr("commandStrengthBonus") * lvl)
+    fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Shield Command"), "warfareBuff4Value", src.getModifiedItemAttr("commandStrengthBonus") * lvl)
--- a/eos/effects/shipbonuscarriera4warfarelinksbonus.py
+++ b/eos/effects/shipbonuscarriera4warfarelinksbonus.py
@@ -4,5 +4,5 @@
 # Ship: Archon
 type = "passive"
 def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Information Warfare Specialist"), "commandBonus", src.getModifiedItemAttr("shipBonusCarrierA4"), skill="Amarr Carrier")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Armored Warfare Specialist"), "commandBonus", src.getModifiedItemAttr("shipBonusCarrierA4"), skill="Amarr Carrier")
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Information Command Specialist"), "commandBonus", src.getModifiedItemAttr("shipBonusCarrierA4"), skill="Amarr Carrier")
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Armored Command Specialist"), "commandBonus", src.getModifiedItemAttr("shipBonusCarrierA4"), skill="Amarr Carrier")
--- a/eos/effects/shipbonuscarrierc4warfarelinksbonus.py
+++ b/eos/effects/shipbonuscarrierc4warfarelinksbonus.py
@@ -4,5 +4,5 @@
 # Ship: Chimera
 type = "passive"
 def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Siege Warfare Specialist"), "commandBonus", src.getModifiedItemAttr("shipBonusCarrierC4"), skill="Caldari Carrier")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Information Warfare Specialist"), "commandBonus", src.getModifiedItemAttr("shipBonusCarrierC4"), skill="Caldari Carrier")
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Command Specialist"), "commandBonus", src.getModifiedItemAttr("shipBonusCarrierC4"), skill="Caldari Carrier")
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Information Command Specialist"), "commandBonus", src.getModifiedItemAttr("shipBonusCarrierC4"), skill="Caldari Carrier")
--- a/eos/effects/shipbonuscarrierg4warfarelinksbonus.py
+++ b/eos/effects/shipbonuscarrierg4warfarelinksbonus.py
@@ -4,5 +4,5 @@
 # Ship: Thanatos
 type = "passive"
 def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Armored Warfare Specialist"), "commandBonus", src.getModifiedItemAttr("shipBonusCarrierG4"), skill="Gallente Carrier")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Skirmish Warfare Specialist"), "commandBonus", src.getModifiedItemAttr("shipBonusCarrierG4"), skill="Gallente Carrier")
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Armored Command Specialist"), "commandBonus", src.getModifiedItemAttr("shipBonusCarrierG4"), skill="Gallente Carrier")
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Skirmish Command Specialist"), "commandBonus", src.getModifiedItemAttr("shipBonusCarrierG4"), skill="Gallente Carrier")
--- a/eos/effects/shipbonuscarrierm4warfarelinksbonus.py
+++ b/eos/effects/shipbonuscarrierm4warfarelinksbonus.py
@@ -4,5 +4,5 @@
 # Ship: Nidhoggur
 type = "passive"
 def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Skirmish Warfare Specialist"), "commandBonus", src.getModifiedItemAttr("shipBonusCarrierM4"), skill="Minmatar Carrier")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Siege Warfare Specialist"), "commandBonus", src.getModifiedItemAttr("shipBonusCarrierM4"), skill="Minmatar Carrier")
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Skirmish Command Specialist"), "commandBonus", src.getModifiedItemAttr("shipBonusCarrierM4"), skill="Minmatar Carrier")
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Command Specialist"), "commandBonus", src.getModifiedItemAttr("shipBonusCarrierM4"), skill="Minmatar Carrier")
--- a/eos/effects/shipbonusforceauxiliarya4warfarelinksbonus.py
+++ b/eos/effects/shipbonusforceauxiliarya4warfarelinksbonus.py
@@ -4,5 +4,5 @@
 # Ship: Apostle
 type = "passive"
 def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Armored Warfare Specialist"), "commandBonus", src.getModifiedItemAttr("shipBonusForceAuxiliaryA4"), skill="Amarr Carrier")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Information Warfare Specialist"), "commandBonus", src.getModifiedItemAttr("shipBonusForceAuxiliaryA4"), skill="Amarr Carrier")
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Armored Command Specialist"), "commandBonus", src.getModifiedItemAttr("shipBonusForceAuxiliaryA4"), skill="Amarr Carrier")
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Information Command Specialist"), "commandBonus", src.getModifiedItemAttr("shipBonusForceAuxiliaryA4"), skill="Amarr Carrier")
--- a/eos/effects/shipbonusforceauxiliaryc4warfarelinksbonus.py
+++ b/eos/effects/shipbonusforceauxiliaryc4warfarelinksbonus.py
@@ -4,5 +4,5 @@
 # Ship: Minokawa
 type = "passive"
 def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Siege Warfare Specialist"), "commandBonus", src.getModifiedItemAttr("shipBonusForceAuxiliaryC4"), skill="Caldari Carrier")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Information Warfare Specialist"), "commandBonus", src.getModifiedItemAttr("shipBonusForceAuxiliaryC4"), skill="Caldari Carrier")
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Command Specialist"), "commandBonus", src.getModifiedItemAttr("shipBonusForceAuxiliaryC4"), skill="Caldari Carrier")
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Information Command Specialist"), "commandBonus", src.getModifiedItemAttr("shipBonusForceAuxiliaryC4"), skill="Caldari Carrier")
--- a/eos/effects/shipbonusforceauxiliaryg4warfarelinksbonus.py
+++ b/eos/effects/shipbonusforceauxiliaryg4warfarelinksbonus.py
@@ -4,5 +4,5 @@
 # Ship: Ninazu
 type = "passive"
 def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Skirmish Warfare Specialist"), "commandBonus", src.getModifiedItemAttr("shipBonusForceAuxiliaryG4"), skill="Gallente Carrier")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Armored Warfare Specialist"), "commandBonus", src.getModifiedItemAttr("shipBonusForceAuxiliaryG4"), skill="Gallente Carrier")
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Skirmish Command Specialist"), "commandBonus", src.getModifiedItemAttr("shipBonusForceAuxiliaryG4"), skill="Gallente Carrier")
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Armored Command Specialist"), "commandBonus", src.getModifiedItemAttr("shipBonusForceAuxiliaryG4"), skill="Gallente Carrier")
--- a/eos/effects/shipbonusforceauxiliarym4warfarelinksbonus.py
+++ b/eos/effects/shipbonusforceauxiliarym4warfarelinksbonus.py
@@ -4,5 +4,5 @@
 # Ship: Lif
 type = "passive"
 def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Skirmish Warfare Specialist"), "commandBonus", src.getModifiedItemAttr("shipBonusForceAuxiliaryM4"), skill="Minmatar Carrier")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Siege Warfare Specialist"), "commandBonus", src.getModifiedItemAttr("shipBonusForceAuxiliaryM4"), skill="Minmatar Carrier")
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Skirmish Command Specialist"), "commandBonus", src.getModifiedItemAttr("shipBonusForceAuxiliaryM4"), skill="Minmatar Carrier")
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Command Specialist"), "commandBonus", src.getModifiedItemAttr("shipBonusForceAuxiliaryM4"), skill="Minmatar Carrier")
--- a/eos/effects/shipbonussupercarriera5warfarelinksbonus.py
+++ b/eos/effects/shipbonussupercarriera5warfarelinksbonus.py
@@ -4,5 +4,5 @@
 # Ship: Aeon
 type = "passive"
 def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Information Warfare Specialist"), "commandBonus", src.getModifiedItemAttr("shipBonusSupercarrierA5"), skill="Amarr Carrier")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Armored Warfare Specialist"), "commandBonus", src.getModifiedItemAttr("shipBonusSupercarrierA5"), skill="Amarr Carrier")
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Information Command Specialist"), "commandBonus", src.getModifiedItemAttr("shipBonusSupercarrierA5"), skill="Amarr Carrier")
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Armored Command Specialist"), "commandBonus", src.getModifiedItemAttr("shipBonusSupercarrierA5"), skill="Amarr Carrier")
--- a/eos/effects/shipbonussupercarrierc5warfarelinksbonus.py
+++ b/eos/effects/shipbonussupercarrierc5warfarelinksbonus.py
@@ -4,5 +4,5 @@
 # Ship: Wyvern
 type = "passive"
 def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Information Warfare Specialist"), "commandBonus", src.getModifiedItemAttr("shipBonusSupercarrierC5"), skill="Caldari Carrier")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Siege Warfare Specialist"), "commandBonus", src.getModifiedItemAttr("shipBonusSupercarrierC5"), skill="Caldari Carrier")
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Information Command Specialist"), "commandBonus", src.getModifiedItemAttr("shipBonusSupercarrierC5"), skill="Caldari Carrier")
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Command Specialist"), "commandBonus", src.getModifiedItemAttr("shipBonusSupercarrierC5"), skill="Caldari Carrier")
--- a/eos/effects/shipbonussupercarrierg5warfarelinksbonus.py
+++ b/eos/effects/shipbonussupercarrierg5warfarelinksbonus.py
@@ -4,5 +4,5 @@
 # Ship: Nyx
 type = "passive"
 def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Armored Warfare Specialist"), "commandBonus", src.getModifiedItemAttr("shipBonusSupercarrierG5"), skill="Gallente Carrier")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Skirmish Warfare Specialist"), "commandBonus", src.getModifiedItemAttr("shipBonusSupercarrierG5"), skill="Gallente Carrier")
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Armored Command Specialist"), "commandBonus", src.getModifiedItemAttr("shipBonusSupercarrierG5"), skill="Gallente Carrier")
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Skirmish Command Specialist"), "commandBonus", src.getModifiedItemAttr("shipBonusSupercarrierG5"), skill="Gallente Carrier")
--- a/eos/effects/shipbonussupercarrierm5warfarelinksbonus.py
+++ b/eos/effects/shipbonussupercarrierm5warfarelinksbonus.py
@@ -4,5 +4,5 @@
 # Ship: Hel
 type = "passive"
 def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Skirmish Warfare Specialist"), "commandBonus", src.getModifiedItemAttr("shipBonusSupercarrierM5"), skill="Minmatar Carrier")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Siege Warfare Specialist"), "commandBonus", src.getModifiedItemAttr("shipBonusSupercarrierM5"), skill="Minmatar Carrier")
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Skirmish Command Specialist"), "commandBonus", src.getModifiedItemAttr("shipBonusSupercarrierM5"), skill="Minmatar Carrier")
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Command Specialist"), "commandBonus", src.getModifiedItemAttr("shipBonusSupercarrierM5"), skill="Minmatar Carrier")
--- a/eos/effects/shirmishwarfaremindlink.py
+++ b/eos/effects/shirmishwarfaremindlink.py
@@ -6,6 +6,6 @@
 # Implant: Skirmish Warfare Mindlink
 type = "passive"
 def handler(fit, implant, context):
-    fit.character.getSkill("Skirmish Warfare Specialist").suppress()
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Skirmish Warfare Specialist"),
+    fit.character.getSkill("Skirmish Command Specialist").suppress()
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Skirmish Command Specialist"),
                                  "commandBonus", implant.getModifiedItemAttr("mindlinkBonus"))
--- a/eos/effects/siegesquadroncommand.py
+++ b/eos/effects/siegesquadroncommand.py
@@ -5,5 +5,5 @@
 runTime = "early"
 type = "passive"
 def handler(fit, skill, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Siege Warfare Specialist"),
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Command Specialist"),
                                  "commandBonus", skill.getModifiedItemAttr("squadronCommandBonus") * skill.level)
--- a/eos/effects/siegewarfaremindlink.py
+++ b/eos/effects/siegewarfaremindlink.py
@@ -6,6 +6,6 @@
 # Implant: Siege Warfare Mindlink
 type = "passive"
 def handler(fit, implant, context):
-    fit.character.getSkill("Siege Warfare Specialist").suppress()
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Siege Warfare Specialist"),
+    fit.character.getSkill("Shield Command Specialist").suppress()
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Command Specialist"),
                                  "commandBonus", implant.getModifiedItemAttr("mindlinkBonus"))
--- a/eos/effects/skirmishcommanddurationbonus.py
+++ b/eos/effects/skirmishcommanddurationbonus.py
@@ -0,0 +1,4 @@
+type = "passive"
+def handler(fit, src, context):
+    lvl = src.level
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Skirmish Command"), "buffDuration", src.getModifiedItemAttr("durationBonus") * lvl)
--- a/eos/effects/skirmishcommandstrengthbonus.py
+++ b/eos/effects/skirmishcommandstrengthbonus.py
@@ -0,0 +1,7 @@
+type = "passive"
+def handler(fit, src, context):
+    lvl = src.level
+    fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Skirmish Command"), "warfareBuff3Value", src.getModifiedItemAttr("commandStrengthBonus") * lvl)
+    fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Skirmish Command"), "warfareBuff4Value", src.getModifiedItemAttr("commandStrengthBonus") * lvl)
+    fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Skirmish Command"), "warfareBuff1Value", src.getModifiedItemAttr("commandStrengthBonus") * lvl)
+    fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Skirmish Command"), "warfareBuff2Value", src.getModifiedItemAttr("commandStrengthBonus") * lvl)
--- a/eos/effects/skirmishsquadroncommand.py
+++ b/eos/effects/skirmishsquadroncommand.py
@@ -1,9 +1,9 @@
 # skirmishSquadronCommand
 #
 # Used by:
-# Skill: Skirmish Warfare Specialist
+# Skill: Skirmish Command Specialist
 runTime = "early"
 type = "passive"
 def handler(fit, skill, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Skirmish Warfare Specialist"),
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Skirmish Command Specialist"),
                                  "commandBonus", skill.getModifiedItemAttr("squadronCommandBonus") * skill.level)
--- a/eos/effects/squadroncommand.py
+++ b/eos/effects/squadroncommand.py
@@ -1,7 +1,7 @@
 # squadronCommand
 #
 # Used by:
-# Skill: Warfare Link Specialist
+# Skill: Command Burst Specialist
 type = "passive"
 def handler(fit, skill, context):
    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Gang Coordinator",
--- a/eos/effects/squadroncommandhidden.py
+++ b/eos/effects/squadroncommandhidden.py
@@ -1,7 +1,7 @@
 # squadronCommandHidden
 #
 # Used by:
-# Skill: Warfare Link Specialist
+# Skill: Command Burst Specialist
 type = "passive"
 def handler(fit, skill, context):
    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Gang Coordinator",
--- a/eos/effects/subsystembonusamarrdefensivearmoredwarfare.py
+++ b/eos/effects/subsystembonusamarrdefensivearmoredwarfare.py
@@ -4,5 +4,5 @@
 # Subsystem: Legion Defensive - Warfare Processor
 type = "passive"
 def handler(fit, module, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Armored Warfare Specialist"),
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Armored Command Specialist"),
                                  "commandBonus", module.getModifiedItemAttr("subsystemBonusAmarrDefensive"), skill="Amarr Defensive Systems")
--- a/eos/effects/subsystembonusamarrdefensiveinformationwarfare.py
+++ b/eos/effects/subsystembonusamarrdefensiveinformationwarfare.py
@@ -4,5 +4,5 @@
 # Subsystem: Legion Defensive - Warfare Processor
 type = "passive"
 def handler(fit, module, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Information Warfare Specialist"),
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Information Command Specialist"),
                                  "commandBonus", module.getModifiedItemAttr("subsystemBonusAmarrDefensive"), skill="Amarr Defensive Systems")
--- a/eos/effects/subsystembonusamarrdefensiveinformationwarfarehidden.py
+++ b/eos/effects/subsystembonusamarrdefensiveinformationwarfarehidden.py
@@ -4,5 +4,5 @@
 # Subsystem: Legion Defensive - Warfare Processor
 type = "passive"
 def handler(fit, module, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Information Warfare Specialist"),
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Information Command Specialist"),
                                  "commandBonusHidden", module.getModifiedItemAttr("subsystemBonusAmarrDefensive"), skill="Amarr Defensive Systems")
--- a/eos/effects/subsystembonusamarrdefensiveskirmishwarfare.py
+++ b/eos/effects/subsystembonusamarrdefensiveskirmishwarfare.py
@@ -4,5 +4,5 @@
 # Subsystem: Legion Defensive - Warfare Processor
 type = "passive"
 def handler(fit, module, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Skirmish Warfare Specialist"),
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Skirmish Command Specialist"),
                                  "commandBonus", module.getModifiedItemAttr("subsystemBonusAmarrDefensive"), skill="Amarr Defensive Systems")
--- a/eos/effects/subsystembonuscaldaridefensiveinformationwarfare.py
+++ b/eos/effects/subsystembonuscaldaridefensiveinformationwarfare.py
@@ -4,5 +4,5 @@
 # Subsystem: Tengu Defensive - Warfare Processor
 type = "passive"
 def handler(fit, module, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Information Warfare Specialist"),
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Information Command Specialist"),
                                  "commandBonus", module.getModifiedItemAttr("subsystemBonusCaldariDefensive"), skill="Caldari Defensive Systems")
--- a/eos/effects/subsystembonuscaldaridefensiveinformationwarfarehidden.py
+++ b/eos/effects/subsystembonuscaldaridefensiveinformationwarfarehidden.py
@@ -4,5 +4,5 @@
 # Subsystem: Tengu Defensive - Warfare Processor
 type = "passive"
 def handler(fit, module, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Information Warfare Specialist"),
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Information Command Specialist"),
                                  "commandBonusHidden", module.getModifiedItemAttr("subsystemBonusCaldariDefensive"), skill="Caldari Defensive Systems")
--- a/eos/effects/subsystembonuscaldaridefensivesiegewarfare.py
+++ b/eos/effects/subsystembonuscaldaridefensivesiegewarfare.py
@@ -4,5 +4,5 @@
 # Subsystem: Tengu Defensive - Warfare Processor
 type = "passive"
 def handler(fit, module, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Siege Warfare Specialist"),
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Command Specialist"),
                                  "commandBonus", module.getModifiedItemAttr("subsystemBonusCaldariDefensive"), skill="Caldari Defensive Systems")
--- a/eos/effects/subsystembonuscaldaridefensiveskirmishwarfare.py
+++ b/eos/effects/subsystembonuscaldaridefensiveskirmishwarfare.py
@@ -4,5 +4,5 @@
 # Subsystem: Tengu Defensive - Warfare Processor
 type = "passive"
 def handler(fit, module, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Skirmish Warfare Specialist"),
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Skirmish Command Specialist"),
                                  "commandBonus", module.getModifiedItemAttr("subsystemBonusCaldariDefensive"), skill="Caldari Defensive Systems")
--- a/eos/effects/subsystembonusgallentedefensivearmoredwarfare.py
+++ b/eos/effects/subsystembonusgallentedefensivearmoredwarfare.py
@@ -4,5 +4,5 @@
 # Subsystem: Proteus Defensive - Warfare Processor
 type = "passive"
 def handler(fit, module, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Armored Warfare Specialist"),
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Armored Command Specialist"),
                                  "commandBonus", module.getModifiedItemAttr("subsystemBonusGallenteDefensive"), skill="Gallente Defensive Systems")
--- a/eos/effects/subsystembonusgallentedefensiveinformationwarfare.py
+++ b/eos/effects/subsystembonusgallentedefensiveinformationwarfare.py
@@ -4,5 +4,5 @@
 # Subsystem: Proteus Defensive - Warfare Processor
 type = "passive"
 def handler(fit, module, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Information Warfare Specialist"),
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Information Command Specialist"),
                                  "commandBonus", module.getModifiedItemAttr("subsystemBonusGallenteDefensive"), skill="Gallente Defensive Systems")
--- a/eos/effects/subsystembonusgallentedefensiveinformationwarfarehidden.py
+++ b/eos/effects/subsystembonusgallentedefensiveinformationwarfarehidden.py
@@ -4,5 +4,5 @@
 # Subsystem: Proteus Defensive - Warfare Processor
 type = "passive"
 def handler(fit, module, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Information Warfare Specialist"),
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Information Command Specialist"),
                                  "commandBonusHidden", module.getModifiedItemAttr("subsystemBonusGallenteDefensive"), skill="Gallente Defensive Systems")
--- a/eos/effects/subsystembonusgallentedefensiveskirmishwarfare.py
+++ b/eos/effects/subsystembonusgallentedefensiveskirmishwarfare.py
@@ -4,5 +4,5 @@
 # Subsystem: Proteus Defensive - Warfare Processor
 type = "passive"
 def handler(fit, module, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Skirmish Warfare Specialist"),
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Skirmish Command Specialist"),
                                  "commandBonus", module.getModifiedItemAttr("subsystemBonusGallenteDefensive"), skill="Gallente Defensive Systems")
--- a/eos/effects/subsystembonusminmatardefensivearmoredwarfare.py
+++ b/eos/effects/subsystembonusminmatardefensivearmoredwarfare.py
@@ -4,5 +4,5 @@
 # Subsystem: Loki Defensive - Warfare Processor
 type = "passive"
 def handler(fit, module, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Armored Warfare Specialist"),
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Armored Command Specialist"),
                                  "commandBonus", module.getModifiedItemAttr("subsystemBonusMinmatarDefensive"), skill="Minmatar Defensive Systems")
--- a/eos/effects/subsystembonusminmatardefensivesiegewarfare.py
+++ b/eos/effects/subsystembonusminmatardefensivesiegewarfare.py
@@ -4,5 +4,5 @@
 # Subsystem: Loki Defensive - Warfare Processor
 type = "passive"
 def handler(fit, module, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Siege Warfare Specialist"),
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Command Specialist"),
                                  "commandBonus", module.getModifiedItemAttr("subsystemBonusMinmatarDefensive"), skill="Minmatar Defensive Systems")
--- a/eos/effects/subsystembonusminmatardefensiveskirmishwarfare.py
+++ b/eos/effects/subsystembonusminmatardefensiveskirmishwarfare.py
@@ -4,5 +4,5 @@
 # Subsystem: Loki Defensive - Warfare Processor
 type = "passive"
 def handler(fit, module, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Skirmish Warfare Specialist"),
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Skirmish Command Specialist"),
                                  "commandBonus", module.getModifiedItemAttr("subsystemBonusMinmatarDefensive"), skill="Minmatar Defensive Systems")