Merge branch 'singularity'

Author: DarkFenX

config.py

@@ -15,8 +15,8 @@
 # Version data
 version = "1.1.15"
 tag = "git"
-expansionName = "Odyssey"
-expansionVersion = "1.0"
+expansionName = "Singularity"
+expansionVersion = "597398"
 evemonMinVersion = "4081"
 
 pyfaPath = None

eos/effects/armorallrepairsystemsamountbonuspassive.py

@@ -2,5 +2,5 @@
 # Implants named like: Exile Booster (4 of 4)
 type = "passive"
 def handler(fit, booster, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Repair Systems"),
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Repair Systems") or mod.item.requiresSkill("Capital Repair Systems"),
                                   "armorDamageAmount", booster.getModifiedItemAttr("armorDamageAmountBonus"))

eos/effects/armoredsquadroncommand.py

@@ -0,0 +1,7 @@
+# Used by:
+# Skill: Armored Warfare Specialist
+runTime = "early"
+type = "passive"
+def handler(fit, skill, context):
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Armored Warfare Specialist"),
+                                  "commandBonus", skill.getModifiedItemAttr("squadronCommandBonus") * skill.level)

eos/effects/armoredwarfaremindlink.py

@@ -1,5 +1,7 @@
 # Used by:
 # Implant: Armored Warfare 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"),

eos/effects/armorrepairprojectormaxrangebonus.py

@@ -5,5 +5,5 @@
 # Ship: Navitas
 type = "passive"
 def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Armor Repair Projector",
+    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Remote Armor Repairer",
                                   "maxRange", ship.getModifiedItemAttr("maxRangeBonus"))

eos/effects/armortankinggang2.py

@@ -1,5 +1,7 @@
 # Used by:
 # Implant: Armored Warfare Mindlink
+# Implant: Federation Navy Warfare Mindlink
+# Implant: Imperial Navy Warfare Mindlink
 type = "gang", "active"
 gangBonus = "armorHpBonus2"
 gangBoost = "armorHP"

eos/effects/armorupgradesmasspenaltyreductionbonus.py

@@ -1,7 +1,7 @@
-# Used by:
-# Skill: Armor Honeycombing
-type = "passive"
-def handler(fit, container, context):
-    level = container.level
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Armor Reinforcer",
-                                  "massAddition", container.getModifiedItemAttr("massPenaltyReduction") * level)
+# Used by:
+# Skill: Armor Layering
+type = "passive"
+def handler(fit, container, context):
+    level = container.level
+    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Armor Reinforcer",
+                                  "massAddition", container.getModifiedItemAttr("massPenaltyReduction") * level)

eos/effects/boostermodifyboosterarmorpenalties.py

@@ -1,7 +1,7 @@
 # Used by:
 # Implants named like: Eifyr and Co. 'Alchemist' Nanite Control NC (2 of 2)
 # Implants named like: Low grade Edge (5 of 6)
-# Skill: Nanite Control
+# Skill: Neurotoxin Control
 type = "passive"
 def handler(fit, container, context):
     level = container.level if "skill" in context else 1

eos/effects/boostermodifyboostermaxvelocityandcapacitorpenalty.py

@@ -1,7 +1,7 @@
 # Used by:
 # Implants named like: Eifyr and Co. 'Alchemist' Nanite Control NC (2 of 2)
 # Implants named like: Low grade Edge (5 of 6)
-# Skill: Nanite Control
+# Skill: Neurotoxin Control
 type = "passive"
 def handler(fit, container, context):
     level = container.level if "skill" in context else 1

eos/effects/boostermodifyboostermissilepenalty.py

@@ -1,7 +1,7 @@
 # Used by:
 # Implants named like: Eifyr and Co. 'Alchemist' Nanite Control NC (2 of 2)
 # Implants named like: Low grade Edge (5 of 6)
-# Skill: Nanite Control
+# Skill: Neurotoxin Control
 type = "passive"
 def handler(fit, container, context):
     level = container.level if "skill" in context else 1