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

Merge remote-tracking branch 'refs/remotes/pyfa-org/master'

Browse Source
This commit is contained in:
Ebag333
2016-05-16 07:55:15 -07:00
parent 8823baaef4 13a15a38c5
commit a089c4cbc2
4 changed files with 10 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
config.py
View File

@@ -18,7 +18,7 @@ debug = False
saveInRoot = False
# Version data
version = "1.21.1"
version = "1.21.2"
tag = "Stable"
expansionName = "Citadel"
expansionVersion = "1.3"

11
eos/effects/skillreactivearmorhardenercapneedbonus.py
View File

@@ -1,8 +1,5 @@
# skillReactiveArmorHardenerCapNeedBonus
#
# Used by:
# Skill: Resistance Phasing
type = "passive"
def handler(fit, skill, context):
fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Armor Resistance Shift Hardener",
"capacitorNeed", skill.getModifiedItemAttr("capNeedBonus") * skill.level)
def handler(fit, src, context):
lvl = src.level
fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Armor Resistance Shift Hardener", "capacitorNeed", src.getModifiedItemAttr("capNeedBonus") * lvl)
fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Resistance Phasing"), "capacitorNeed", src.getModifiedItemAttr("capNeedBonus") * lvl)

11
eos/effects/skillreactivearmorhardenerdurationbonus.py
View File

@@ -1,8 +1,5 @@
# skillReactiveArmorHardenerDurationBonus
#
# Used by:
# Skill: Resistance Phasing
type = "passive"
def handler(fit, skill, context):
fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Armor Resistance Shift Hardener",
"duration", skill.getModifiedItemAttr("durationBonus") * skill.level)
def handler(fit, src, context):
lvl = src.level
fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Armor Resistance Shift Hardener", "duration", src.getModifiedItemAttr("durationBonus") * lvl)
fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Resistance Phasing"), "duration", src.getModifiedItemAttr("durationBonus") * lvl)

2
gui/itemStats.py
View File

@@ -246,7 +246,7 @@ class ItemDescription ( wx.Panel ):
if not item.description:
return
desc = item.description.replace("\r", "<br>")
desc = item.description.replace("\n", "<br>")
# Strip font tags
desc = re.sub("<( *)font( *)color( *)=(.*?)>(?P<inside>.*?)<( *)/( *)font( *)>", "\g<inside>", desc)
# Strip URLs