Merge pull request #1705 from pyfa-org/release/v2.4.0

Release/v2.4.0

config.py

@@ -24,10 +24,10 @@ saveInRoot = False
 
 # Version data
 
-version = "2.3.1"
+version = "2.4.0"
 tag = "Stable"
-expansionName = "YC120.7"
-expansionVersion = "1.2"
+expansionName = "YC120.8"
+expansionVersion = "1.0"
 evemonMinVersion = "4081"
 
 minItemSearchLength = 3

eos/effects/boostershieldcapacitypenalty.py

@@ -1,7 +1,7 @@
 # boosterShieldCapacityPenalty
 #
 # Used by:
-# Implants from group: Booster (12 of 66)
+# Implants from group: Booster (12 of 65)
 type = "boosterSideEffect"
 
 # User-friendly name for the side effect

eos/effects/covertopsandreconopscloakmoduledelaybonus.py

@@ -3,9 +3,9 @@
 # Used by:
 # Ships from group: Black Ops (5 of 5)
 # Ships from group: Blockade Runner (4 of 4)
-# Ships from group: Covert Ops (7 of 7)
+# Ships from group: Covert Ops (8 of 8)
 # Ships from group: Expedition Frigate (2 of 2)
-# Ships from group: Force Recon Ship (8 of 8)
+# Ships from group: Force Recon Ship (9 of 9)
 # Ships from group: Stealth Bomber (5 of 5)
 # Ships named like: Stratios (2 of 2)
 # Subsystems named like: Defensive Covert Reconfiguration (4 of 4)

eos/effects/covertopscloakcpupercentbonus1.py

@@ -1,7 +1,7 @@
 # covertOpsCloakCpuPercentBonus1
 #
 # Used by:
-# Ships from group: Covert Ops (5 of 7)
+# Ships from group: Covert Ops (6 of 8)
 type = "passive"
 runTime = "early"
 

eos/effects/covertopswarpresistance.py

@@ -0,0 +1,9 @@
+# covertOpsWarpResistance
+#
+# Used by:
+# Ships from group: Covert Ops (5 of 8)
+type = "passive"
+
+
+def handler(fit, src, context):
+    fit.ship.increaseItemAttr("warpFactor", src.getModifiedItemAttr("eliteBonusCovertOps1"), skill="Covert Ops")

eos/effects/cynosuraldurationbonus.py

@@ -1,7 +1,7 @@
 # cynosuralDurationBonus
 #
 # Used by:
-# Ships from group: Force Recon Ship (7 of 8)
+# Ships from group: Force Recon Ship (8 of 9)
 type = "passive"
 
 

eos/effects/cynosuraltheoryconsumptionbonus.py

@@ -1,7 +1,7 @@
 # cynosuralTheoryConsumptionBonus
 #
 # Used by:
-# Ships from group: Force Recon Ship (7 of 8)
+# Ships from group: Force Recon Ship (8 of 9)
 # Skill: Cynosural Field Theory
 type = "passive"
 

eos/effects/elitebonuscoveropsscanprobestrength2.py

@@ -1,7 +1,7 @@
 # eliteBonusCoverOpsScanProbeStrength2
 #
 # Used by:
-# Ships from group: Covert Ops (7 of 7)
+# Ships from group: Covert Ops (8 of 8)
 type = "passive"
 
 

eos/effects/elitebonusmaxdmgmultibonusadd.py

@@ -0,0 +1,10 @@
+# eliteBonusMaxDmgMultiBonusAdd
+#
+# Used by:
+# Ship: Hydra
+type = "passive"
+
+
+def handler(fit, src, context):
+    fit.modules.filteredItemIncrease(lambda mod: mod.item.requiresSkill("Small Precursor Weapon"), "damageMultiplierBonusMax",
+                                     src.getModifiedItemAttr("eliteBonusCovertOps3"), skill="Covert Ops")

eos/effects/elitebonusreconmaxdmgmultimaxhpt.py

@@ -0,0 +1,10 @@
+# eliteBonusReconMaxDmgMultiMaxHPT
+#
+# Used by:
+# Ship: Tiamat
+type = "passive"
+
+
+def handler(fit, src, context):
+    fit.modules.filteredItemIncrease(lambda mod: mod.item.requiresSkill("Medium Precursor Weapon"), "damageMultiplierBonusMax",
+                                     src.getModifiedItemAttr("eliteBonusReconShip3"), skill="Recon Ships")

eos/effects/elitebonusreconscanprobestrength2.py

@@ -0,0 +1,10 @@
+# eliteBonusReconScanProbeStrength2
+#
+# Used by:
+# Ship: Tiamat
+type = "passive"
+
+
+def handler(fit, src, context):
+    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Astrometrics"), "baseSensorStrength",
+                                    src.getModifiedItemAttr("eliteBonusReconShip2"), skill="Recon Ships")

eos/effects/minigamevirusstrengthbonus.py

@@ -1,7 +1,7 @@
 # minigameVirusStrengthBonus
 #
 # Used by:
-# Ships from group: Covert Ops (7 of 7)
+# Ships from group: Covert Ops (7 of 8)
 # Ships named like: Stratios (2 of 2)
 # Subsystems named like: Defensive Covert Reconfiguration (4 of 4)
 # Ship: Astero

eos/effects/reconshipcloakcpubonus1.py

@@ -1,7 +1,7 @@
 # reconShipCloakCpuBonus1
 #
 # Used by:
-# Ships from group: Force Recon Ship (6 of 8)
+# Ships from group: Force Recon Ship (7 of 9)
 type = "passive"
 runTime = "early"
 

eos/effects/shipbonusneutcapneedrolebonus2.py

@@ -2,7 +2,9 @@
 #
 # Used by:
 # Ship: Damavik
+# Ship: Hydra
 # Ship: Leshak
+# Ship: Tiamat
 # Ship: Vedmak
 type = "passive"
 

eos/effects/shipbonuspctdamagepc1.py

@@ -1,6 +1,7 @@
 # shipbonusPCTDamagePC1
 #
 # Used by:
+# Ship: Tiamat
 # Ship: Vedmak
 type = "passive"
 

eos/effects/shipbonuspctdamagepf1.py

@@ -2,6 +2,7 @@
 #
 # Used by:
 # Ship: Damavik
+# Ship: Hydra
 type = "passive"
 
 

eos/effects/shipbonuspctoptimalpf2.py

@@ -2,6 +2,7 @@
 #
 # Used by:
 # Ship: Damavik
+# Ship: Hydra
 type = "passive"
 
 

eos/effects/shipbonuspcttrackingpc2.py

@@ -1,6 +1,7 @@
 # shipbonusPCTTrackingPC2
 #
 # Used by:
+# Ship: Tiamat
 # Ship: Vedmak
 type = "passive"
 

eos/effects/shipbonusremoterepcapneedrolebonus2.py

@@ -2,7 +2,9 @@
 #
 # Used by:
 # Ship: Damavik
+# Ship: Hydra
 # Ship: Leshak
+# Ship: Tiamat
 # Ship: Vedmak
 type = "passive"
 

eos/effects/shipbonusremoterepmaxrangerolebonus1.py

@@ -2,7 +2,9 @@
 #
 # Used by:
 # Ship: Damavik
+# Ship: Hydra
 # Ship: Leshak
+# Ship: Tiamat
 # Ship: Vedmak
 type = "passive"
 

eos/effects/shipbonussmartbombcapneedrolebonus2.py

@@ -2,7 +2,9 @@
 #
 # Used by:
 # Ship: Damavik
+# Ship: Hydra
 # Ship: Leshak
+# Ship: Tiamat
 # Ship: Vedmak
 type = "passive"
 

eos/effects/shipbonussurveyprobeexplosiondelayskillsurveycovertops3.py

@@ -1,7 +1,7 @@
 # shipBonusSurveyProbeExplosionDelaySkillSurveyCovertOps3
 #
 # Used by:
-# Ships from group: Covert Ops (5 of 7)
+# Ships from group: Covert Ops (5 of 8)
 type = "passive"
 
 

scripts/icons_update.py

@@ -141,6 +141,7 @@ def get_icon_file(res_path, size):
     icon for it. Return as PIL image object down-
     scaled for use in pyfa.
     """
+    res_path = res_path.replace('//', '/')  #1703
     if res_path not in res_index:
         return None
     res_icon = res_index[res_path]
@@ -192,7 +193,10 @@ if toadd:
     print(('Adding {} icons...'.format(len(toadd))))
     missing = set()
     for fname in sorted(toadd):
-        icon = icon_json[str(fname)]
+        icon = icon_json.get(str(fname), None)
+        if icon is None:
+            print("Can't find iconID {}".format(fname))
+            continue
         key = icon['iconFile'].lower()
         icon = get_icon_file(key, ICON_SIZE)
         if icon is None: