dave/pyfa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 13 Wiki Activity

Merge pull request #1336 from pyfa-org/release/v1.33.2

Browse Source 
Release/v1.33.2
This commit is contained in:
Ryan Holmes
2017-11-12 16:59:03 -05:00
committed by GitHub
parent ca27cd3250 065747f425
commit eb644cce4e
4 changed files with 7 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
config.py
View File

@@ -19,10 +19,10 @@ debug = False
saveInRoot = False saveInRoot = False
# Version data # Version data
version = "1.33.1" version = "1.33.2"
tag = "Stable" tag = "Stable"
expansionName = "Lifeblood" expansionName = "Lifeblood"
expansionVersion = "1.0" expansionVersion = "1.7"
evemonMinVersion = "4081" evemonMinVersion = "4081"
pyfaPath = None pyfaPath = None

6
eos/effects/shipbonustitang2alldamagebonus.py → eos/effects/shipbonustitang2emexplosivedamagebonus.py
View File

@@ -6,21 +6,15 @@ type = "passive"
def handler(fit, src, context): 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", fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Torpedoes"), "explosiveDamage",
src.getModifiedItemAttr("shipBonusTitanG2"), skill="Gallente Titan") src.getModifiedItemAttr("shipBonusTitanG2"), skill="Gallente Titan")
fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Torpedoes"), "emDamage", fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Torpedoes"), "emDamage",
src.getModifiedItemAttr("shipBonusTitanG2"), skill="Gallente Titan") 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", fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("XL Torpedoes"), "emDamage",
src.getModifiedItemAttr("shipBonusTitanG2"), skill="Gallente Titan") src.getModifiedItemAttr("shipBonusTitanG2"), skill="Gallente Titan")
fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("XL Torpedoes"), "explosiveDamage", fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("XL Torpedoes"), "explosiveDamage",
src.getModifiedItemAttr("shipBonusTitanG2"), skill="Gallente Titan") src.getModifiedItemAttr("shipBonusTitanG2"), skill="Gallente Titan")
fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("XL Cruise Missiles"), "emDamage", fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("XL Cruise Missiles"), "emDamage",
src.getModifiedItemAttr("shipBonusTitanG2"), skill="Gallente Titan") 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", fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("XL Cruise Missiles"), "explosiveDamage",
src.getModifiedItemAttr("shipBonusTitanG2"), skill="Gallente Titan") src.getModifiedItemAttr("shipBonusTitanG2"), skill="Gallente Titan")

BIN
eve.db
View File

Binary file not shown.

8
scripts/itemDiff.py
View File

@@ -57,10 +57,12 @@ def main(old, new, groups=True, effects=True, attributes=True, renames=True):
implemented = set() implemented = set()
for filename in os.listdir(effectspath): 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' # 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 # Effects' names are used w/o any special symbols by eos
stripspec = "[^A-Za-z0-9]" stripspec = "[^A-Za-z0-9]"