diff --git a/config.py b/config.py index 65307aa99..3d0db405d 100644 --- a/config.py +++ b/config.py @@ -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" diff --git a/eos/effects/skillreactivearmorhardenercapneedbonus.py b/eos/effects/skillreactivearmorhardenercapneedbonus.py index a9c02f401..888995e40 100644 --- a/eos/effects/skillreactivearmorhardenercapneedbonus.py +++ b/eos/effects/skillreactivearmorhardenercapneedbonus.py @@ -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) diff --git a/eos/effects/skillreactivearmorhardenerdurationbonus.py b/eos/effects/skillreactivearmorhardenerdurationbonus.py index ff0861db3..20ff0d48e 100644 --- a/eos/effects/skillreactivearmorhardenerdurationbonus.py +++ b/eos/effects/skillreactivearmorhardenerdurationbonus.py @@ -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) diff --git a/gui/itemStats.py b/gui/itemStats.py index 0f2b26eeb..ad3e49b6c 100644 --- a/gui/itemStats.py +++ b/gui/itemStats.py @@ -246,7 +246,7 @@ class ItemDescription ( wx.Panel ): if not item.description: return - desc = item.description.replace("\r", "
") + desc = item.description.replace("\n", "
") # Strip font tags desc = re.sub("<( *)font( *)color( *)=(.*?)>(?P.*?)<( *)/( *)font( *)>", "\g", desc) # Strip URLs