diff --git a/config.py b/config.py index 865dfb47d..b51c88773 100644 --- a/config.py +++ b/config.py @@ -19,10 +19,10 @@ debug = False saveInRoot = False # Version data -version = "1.33.2" +version = "1.33.3 " tag = "git" expansionName = "Lifeblood" -expansionVersion = "1.0" +expansionVersion = "1.7" evemonMinVersion = "4081" pyfaPath = None diff --git a/eos/effects/shipbonustitang2alldamagebonus.py b/eos/effects/shipbonustitang2emexplosivedamagebonus.py similarity index 68% rename from eos/effects/shipbonustitang2alldamagebonus.py rename to eos/effects/shipbonustitang2emexplosivedamagebonus.py index 42525d080..76ea9a030 100644 --- a/eos/effects/shipbonustitang2alldamagebonus.py +++ b/eos/effects/shipbonustitang2emexplosivedamagebonus.py @@ -6,21 +6,15 @@ type = "passive" def handler(fit, src, context): - fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Torpedoes"), "thermalDamage", - src.getModifiedItemAttr("shipBonusTitanG2"), skill="Gallente Titan") fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Torpedoes"), "explosiveDamage", src.getModifiedItemAttr("shipBonusTitanG2"), skill="Gallente Titan") fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Torpedoes"), "emDamage", src.getModifiedItemAttr("shipBonusTitanG2"), skill="Gallente Titan") - fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("XL Torpedoes"), "thermalDamage", - src.getModifiedItemAttr("shipBonusTitanG2"), skill="Gallente Titan") fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("XL Torpedoes"), "emDamage", src.getModifiedItemAttr("shipBonusTitanG2"), skill="Gallente Titan") fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("XL Torpedoes"), "explosiveDamage", src.getModifiedItemAttr("shipBonusTitanG2"), skill="Gallente Titan") fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("XL Cruise Missiles"), "emDamage", src.getModifiedItemAttr("shipBonusTitanG2"), skill="Gallente Titan") - fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("XL Cruise Missiles"), "thermalDamage", - src.getModifiedItemAttr("shipBonusTitanG2"), skill="Gallente Titan") fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("XL Cruise Missiles"), "explosiveDamage", src.getModifiedItemAttr("shipBonusTitanG2"), skill="Gallente Titan") diff --git a/eve.db b/eve.db index ebf5051c7..a862983e7 100644 Binary files a/eve.db and b/eve.db differ diff --git a/scripts/itemDiff.py b/scripts/itemDiff.py index a6287b97a..218233bbd 100755 --- a/scripts/itemDiff.py +++ b/scripts/itemDiff.py @@ -57,10 +57,12 @@ def main(old, new, groups=True, effects=True, attributes=True, renames=True): implemented = set() for filename in os.listdir(effectspath): - basename, extension = filename.rsplit('.', 1) + if filename.startswith("_") or not filename.endswith(".py"): + continue + + basename, _ = filename.rsplit('.', 1) # Ignore non-py files and exclude implementation-specific 'effect' - if extension == "py" and basename not in ("__init__",): - implemented.add(basename) + implemented.add(basename) # Effects' names are used w/o any special symbols by eos stripspec = "[^A-Za-z0-9]"