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

Merge branch 'master' into development

Browse Source 
Conflicts:
	requirements.txt
This commit is contained in:
blitzmann
2017-04-17 21:41:44 -04:00
parent 3b351603a3 1aaa93c1fd
commit 53cab4b1ab
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
eos/effects/modulebonusfightersupportunit.py
View File

@@ -9,13 +9,13 @@ def handler(fit, src, context):
fit.fighters.filteredItemMultiply(lambda mod: mod.item.requiresSkill("Fighters"), "shieldCapacity",
src.getModifiedItemAttr("fighterBonusShieldCapacityPercent"))
fit.fighters.filteredItemMultiply(lambda mod: mod.item.requiresSkill("Fighters"), "maxVelocity",
src.getModifiedItemAttr("fighterBonusVelocityPercent"), stackingPenalties=True)
src.getModifiedItemAttr("fighterBonusVelocityPercent"), stackingPenalties=True, penaltyGroup="postMul")
fit.fighters.filteredItemMultiply(lambda mod: mod.item.requiresSkill("Fighters"),
"fighterAbilityAttackMissileDuration",
src.getModifiedItemAttr("fighterBonusROFPercent"), stackingPenalties=True)
src.getModifiedItemAttr("fighterBonusROFPercent"), stackingPenalties=True, penaltyGroup="postMul")
fit.fighters.filteredItemMultiply(lambda mod: mod.item.requiresSkill("Fighters"), "fighterAbilityAttackTurretDuration",
src.getModifiedItemAttr("fighterBonusROFPercent"), stackingPenalties=True)
src.getModifiedItemAttr("fighterBonusROFPercent"), stackingPenalties=True, penaltyGroup="postMul")
fit.fighters.filteredItemMultiply(lambda mod: mod.item.requiresSkill("Fighters"), "fighterAbilityMissilesDuration",
src.getModifiedItemAttr("fighterBonusROFPercent"), stackingPenalties=True)
src.getModifiedItemAttr("fighterBonusROFPercent"), stackingPenalties=True, penaltyGroup="postMul")
fit.fighters.filteredItemMultiply(lambda mod: mod.item.requiresSkill("Fighters"), "shieldRechargeRate",
src.getModifiedItemAttr("fighterBonusShieldRechargePercent"))

4
requirements.txt
View File

@@ -2,5 +2,5 @@ logbook >= 1.0.0
matplotlib
python-dateutil
urllib3
requests == 2.11.1
sqlalchemy >= 1.0.5
requests==2.11.1
sqlalchemy==1.0.5