From ef3791f84584bfb2442d1a24d945b186587543b3 Mon Sep 17 00:00:00 2001 From: blitzmann Date: Sun, 3 Jul 2016 01:11:28 -0400 Subject: [PATCH 01/10] bump dev --- config.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config.py b/config.py index d9df3c88c..cf1c3f3e3 100644 --- a/config.py +++ b/config.py @@ -18,8 +18,8 @@ debug = False saveInRoot = False # Version data -version = "1.22.1" -tag = "Stable" +version = "1.22.2" +tag = "git" expansionName = "YC 118.6" expansionVersion = "1.0" evemonMinVersion = "4081" From 2212311a4491e2818c8aa9f7214218262d84bbe7 Mon Sep 17 00:00:00 2001 From: blitzmann Date: Sun, 3 Jul 2016 14:25:05 -0400 Subject: [PATCH 02/10] Add effects for Asklepian implant set --- eos/effects/armorrepairamountbonussubcap.py | 3 +++ eos/effects/setbonusasklepian.py | 4 ++++ 2 files changed, 7 insertions(+) create mode 100644 eos/effects/armorrepairamountbonussubcap.py create mode 100644 eos/effects/setbonusasklepian.py diff --git a/eos/effects/armorrepairamountbonussubcap.py b/eos/effects/armorrepairamountbonussubcap.py new file mode 100644 index 000000000..9c4e6b0d4 --- /dev/null +++ b/eos/effects/armorrepairamountbonussubcap.py @@ -0,0 +1,3 @@ +type = "passive" +def handler(fit, src, context): + fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Repair Systems"), "armorDamageAmount", src.getModifiedItemAttr("armorRepairBonus"), stackingPenalties=True) diff --git a/eos/effects/setbonusasklepian.py b/eos/effects/setbonusasklepian.py new file mode 100644 index 000000000..763bd0575 --- /dev/null +++ b/eos/effects/setbonusasklepian.py @@ -0,0 +1,4 @@ +type = "passive" +def handler(fit, src, context): + fit.appliedImplants.filteredItemMultiply(lambda mod: mod.item.requiresSkill("Cybernetics"), + "armorRepairBonus", src.getModifiedItemAttr("implantSetSerpentis2")) From 92b2a35888ec4fce3e567ae68f9dc594ac606ebd Mon Sep 17 00:00:00 2001 From: blitzmann Date: Sun, 3 Jul 2016 17:42:12 -0400 Subject: [PATCH 03/10] Fix omega implant --- eos/effects/setbonusasklepian.py | 1 + 1 file changed, 1 insertion(+) diff --git a/eos/effects/setbonusasklepian.py b/eos/effects/setbonusasklepian.py index 763bd0575..0ed894692 100644 --- a/eos/effects/setbonusasklepian.py +++ b/eos/effects/setbonusasklepian.py @@ -1,3 +1,4 @@ +runTime = "early" type = "passive" def handler(fit, src, context): fit.appliedImplants.filteredItemMultiply(lambda mod: mod.item.requiresSkill("Cybernetics"), From f396077cd6ff68d529e546fa0ddf1c042700ead4 Mon Sep 17 00:00:00 2001 From: blitzmann Date: Mon, 4 Jul 2016 13:52:25 -0400 Subject: [PATCH 04/10] Remove stacking penalty from Asklepian implants --- eos/effects/armorrepairamountbonussubcap.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/eos/effects/armorrepairamountbonussubcap.py b/eos/effects/armorrepairamountbonussubcap.py index 9c4e6b0d4..f148f0929 100644 --- a/eos/effects/armorrepairamountbonussubcap.py +++ b/eos/effects/armorrepairamountbonussubcap.py @@ -1,3 +1,4 @@ type = "passive" def handler(fit, src, context): - fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Repair Systems"), "armorDamageAmount", src.getModifiedItemAttr("armorRepairBonus"), stackingPenalties=True) + fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Repair Systems"), + "armorDamageAmount", src.getModifiedItemAttr("armorRepairBonus")) From f141fac3a2a98497c1f96a0d6862ad1e6af06b09 Mon Sep 17 00:00:00 2001 From: blitzmann Date: Tue, 5 Jul 2016 23:34:19 -0400 Subject: [PATCH 05/10] Add fighters to overall fitting price (#674) --- gui/builtinStatsViews/priceViewFull.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/gui/builtinStatsViews/priceViewFull.py b/gui/builtinStatsViews/priceViewFull.py index 593a2ab8e..16935a136 100644 --- a/gui/builtinStatsViews/priceViewFull.py +++ b/gui/builtinStatsViews/priceViewFull.py @@ -83,6 +83,11 @@ class PriceViewFull(StatsView): for drone in fit.drones: for _ in xrange(drone.amount): typeIDs.append(drone.itemID) + + for fighter in fit.fighters: + for _ in xrange(fighter.amountActive): + typeIDs.append(fighter.itemID) + for cargo in fit.cargo: for _ in xrange(cargo.amount): typeIDs.append(cargo.itemID) From 45d338ba3d292f5f6b397059c109d1887ab865a6 Mon Sep 17 00:00:00 2001 From: blitzmann Date: Wed, 6 Jul 2016 22:30:03 -0400 Subject: [PATCH 06/10] Add price to item compare (#673) --- gui/itemStats.py | 11 +++++++++++ service/market.py | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/gui/itemStats.py b/gui/itemStats.py index 6f2087172..87ec947dc 100644 --- a/gui/itemStats.py +++ b/gui/itemStats.py @@ -29,6 +29,7 @@ from gui.utils.numberFormatter import formatAmount import service import config from gui.contextMenu import ContextMenu +from gui.utils.numberFormatter import formatAmount try: from collections import OrderedDict @@ -551,6 +552,10 @@ class ItemCompare(wx.Panel): self.UpdateList() event.Skip() + def processPrices(self, prices): + for i, price in enumerate(prices): + self.paramList.SetStringItem(i, len(self.attrs)+1, formatAmount(price.price, 3, 3, 9, currency=True)) + def PopulateList(self): self.paramList.InsertColumn(0, "Item") self.paramList.SetColumnWidth(0, 200) @@ -560,6 +565,12 @@ class ItemCompare(wx.Panel): self.paramList.InsertColumn(i+1, name) self.paramList.SetColumnWidth(i+1, 120) + self.paramList.InsertColumn(len(self.attrs)+1, "Price") + self.paramList.SetColumnWidth(len(self.attrs)+1, 60) + + sMkt = service.Market.getInstance() + sMkt.getPrices([x.ID for x in self.items], self.processPrices) + for item in self.items: i = self.paramList.InsertStringItem(sys.maxint, item.name) for x, attr in enumerate(self.attrs.keys()): diff --git a/service/market.py b/service/market.py index 65725a70e..6c6578b58 100644 --- a/service/market.py +++ b/service/market.py @@ -757,7 +757,7 @@ class Market(): def cb(): try: callback(requests) - except: + except Exception, e: pass eos.db.commit() From 842ee3d426db9c6f1e26e61d241794715975c775 Mon Sep 17 00:00:00 2001 From: blitzmann Date: Wed, 6 Jul 2016 23:50:31 -0400 Subject: [PATCH 07/10] Fix Genolution implant set bonus (#672) --- eos/effects/setbonuschristmasagilitybonus.py | 2 +- eos/effects/setbonuschristmasarmorhpbonus2.py | 2 +- eos/effects/setbonuschristmasbonusvelocity.py | 2 +- eos/effects/setbonuschristmascapacitorcapacity.py | 2 +- eos/effects/setbonuschristmascapacitorrecharge2.py | 2 +- eos/effects/setbonuschristmascpuoutput.py | 2 +- eos/effects/setbonuschristmaspowergrid.py | 2 +- eos/effects/setbonuschristmasshieldcapacitybonus.py | 2 +- eos/saveddata/implant.py | 5 +++++ 9 files changed, 13 insertions(+), 8 deletions(-) diff --git a/eos/effects/setbonuschristmasagilitybonus.py b/eos/effects/setbonuschristmasagilitybonus.py index f0ca5c03f..760c76e05 100644 --- a/eos/effects/setbonuschristmasagilitybonus.py +++ b/eos/effects/setbonuschristmasagilitybonus.py @@ -5,5 +5,5 @@ runTime = "early" type = "passive" def handler(fit, implant, context): - fit.appliedImplants.filteredItemMultiply(lambda mod: mod.item.group.name == "Cyberimplant", + fit.appliedImplants.filteredItemMultiply(lambda mod: mod.item.group.name == "Special Edition Implant", "agilityBonus", implant.getModifiedItemAttr("implantSetChristmas")) diff --git a/eos/effects/setbonuschristmasarmorhpbonus2.py b/eos/effects/setbonuschristmasarmorhpbonus2.py index 9f5c52fd4..6d096e01a 100644 --- a/eos/effects/setbonuschristmasarmorhpbonus2.py +++ b/eos/effects/setbonuschristmasarmorhpbonus2.py @@ -5,5 +5,5 @@ runTime = "early" type = "passive" def handler(fit, implant, context): - fit.appliedImplants.filteredItemMultiply(lambda mod: mod.item.group.name == "Cyberimplant", + fit.appliedImplants.filteredItemMultiply(lambda mod: mod.item.group.name == "Special Edition Implant", "armorHpBonus2", implant.getModifiedItemAttr("implantSetChristmas")) diff --git a/eos/effects/setbonuschristmasbonusvelocity.py b/eos/effects/setbonuschristmasbonusvelocity.py index 09b1ef21f..09352ce10 100644 --- a/eos/effects/setbonuschristmasbonusvelocity.py +++ b/eos/effects/setbonuschristmasbonusvelocity.py @@ -5,5 +5,5 @@ runTime = "early" type = "passive" def handler(fit, implant, context): - fit.appliedImplants.filteredItemMultiply(lambda mod: mod.item.group.name == "Cyberimplant", + fit.appliedImplants.filteredItemMultiply(lambda mod: mod.item.group.name == "Special Edition Implant", "implantBonusVelocity", implant.getModifiedItemAttr("implantSetChristmas")) diff --git a/eos/effects/setbonuschristmascapacitorcapacity.py b/eos/effects/setbonuschristmascapacitorcapacity.py index cc949b255..79cc5654a 100644 --- a/eos/effects/setbonuschristmascapacitorcapacity.py +++ b/eos/effects/setbonuschristmascapacitorcapacity.py @@ -5,5 +5,5 @@ runTime = "early" type = "passive" def handler(fit, implant, context): - fit.appliedImplants.filteredItemMultiply(lambda mod: mod.item.group.name == "Cyberimplant", + fit.appliedImplants.filteredItemMultiply(lambda mod: mod.item.group.name == "Special Edition Implant", "capacitorCapacityBonus", implant.getModifiedItemAttr("implantSetChristmas")) diff --git a/eos/effects/setbonuschristmascapacitorrecharge2.py b/eos/effects/setbonuschristmascapacitorrecharge2.py index a526176e4..a6c85f4de 100644 --- a/eos/effects/setbonuschristmascapacitorrecharge2.py +++ b/eos/effects/setbonuschristmascapacitorrecharge2.py @@ -5,5 +5,5 @@ runTime = "early" type = "passive" def handler(fit, implant, context): - fit.appliedImplants.filteredItemMultiply(lambda mod: mod.item.group.name == "Cyberimplant", + fit.appliedImplants.filteredItemMultiply(lambda mod: mod.item.group.name == "Special Edition Implant", "capRechargeBonus", implant.getModifiedItemAttr("implantSetChristmas")) diff --git a/eos/effects/setbonuschristmascpuoutput.py b/eos/effects/setbonuschristmascpuoutput.py index e264c8dd5..554485070 100644 --- a/eos/effects/setbonuschristmascpuoutput.py +++ b/eos/effects/setbonuschristmascpuoutput.py @@ -5,5 +5,5 @@ runTime = "early" type = "passive" def handler(fit, implant, context): - fit.appliedImplants.filteredItemMultiply(lambda mod: mod.item.group.name == "Cyberimplant", + fit.appliedImplants.filteredItemMultiply(lambda mod: mod.item.group.name == "Special Edition Implant", "cpuOutputBonus2", implant.getModifiedItemAttr("implantSetChristmas")) diff --git a/eos/effects/setbonuschristmaspowergrid.py b/eos/effects/setbonuschristmaspowergrid.py index 9c39919be..936f394dc 100644 --- a/eos/effects/setbonuschristmaspowergrid.py +++ b/eos/effects/setbonuschristmaspowergrid.py @@ -5,5 +5,5 @@ runTime = "early" type = "passive" def handler(fit, implant, context): - fit.appliedImplants.filteredItemMultiply(lambda mod: mod.item.group.name == "Cyberimplant", + fit.appliedImplants.filteredItemMultiply(lambda mod: mod.item.group.name == "Special Edition Implant", "powerEngineeringOutputBonus", implant.getModifiedItemAttr("implantSetChristmas")) diff --git a/eos/effects/setbonuschristmasshieldcapacitybonus.py b/eos/effects/setbonuschristmasshieldcapacitybonus.py index c604d0281..8de48f2ab 100644 --- a/eos/effects/setbonuschristmasshieldcapacitybonus.py +++ b/eos/effects/setbonuschristmasshieldcapacitybonus.py @@ -5,5 +5,5 @@ runTime = "early" type = "passive" def handler(fit, implant, context): - fit.appliedImplants.filteredItemMultiply(lambda mod: mod.item.group.name == "Cyberimplant", + fit.appliedImplants.filteredItemMultiply(lambda mod: mod.item.group.name == "Special Edition Implant", "shieldCapacityBonus", implant.getModifiedItemAttr("implantSetChristmas")) diff --git a/eos/saveddata/implant.py b/eos/saveddata/implant.py index b5be77986..a4a6de74d 100644 --- a/eos/saveddata/implant.py +++ b/eos/saveddata/implant.py @@ -104,3 +104,8 @@ class Implant(HandledItem, ItemAttrShortcut): copy = Implant(self.item) copy.active = self.active return copy + + def __repr__(self): + return "Implant(ID={}, name={}) at {}".format( + self.item.ID, self.item.name, hex(id(self)) + ) From 8f64c91677cf8133f04210ebf598cacacc73319f Mon Sep 17 00:00:00 2001 From: blitzmann Date: Wed, 6 Jul 2016 23:52:42 -0400 Subject: [PATCH 08/10] Update effect headers --- eos/effects/armorrepairamountbonussubcap.py | 4 ++++ eos/effects/setbonusasklepian.py | 5 +++++ 2 files changed, 9 insertions(+) diff --git a/eos/effects/armorrepairamountbonussubcap.py b/eos/effects/armorrepairamountbonussubcap.py index f148f0929..789904788 100644 --- a/eos/effects/armorrepairamountbonussubcap.py +++ b/eos/effects/armorrepairamountbonussubcap.py @@ -1,3 +1,7 @@ +# armorRepairAmountBonusSubcap +# +# Used by: +# Implants named like: Grade Asklepian (15 of 16) type = "passive" def handler(fit, src, context): fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Repair Systems"), diff --git a/eos/effects/setbonusasklepian.py b/eos/effects/setbonusasklepian.py index 0ed894692..4fa394586 100644 --- a/eos/effects/setbonusasklepian.py +++ b/eos/effects/setbonusasklepian.py @@ -1,3 +1,8 @@ +# setBonusAsklepian +# +# Used by: +# Implants named like: Asklepian Omega (3 of 3) +# Implants named like: Grade Asklepian (16 of 16) runTime = "early" type = "passive" def handler(fit, src, context): From 91c6e91023fdfc7527a59cbeed146143fc94e512 Mon Sep 17 00:00:00 2001 From: blitzmann Date: Thu, 7 Jul 2016 19:21:41 -0400 Subject: [PATCH 09/10] Fix Cataclysmic Variable effects (#628) --- eos/effects/systemarmorremoterepairamount.py | 2 +- eos/effects/systemarmorrepairamount.py | 3 ++- eos/effects/systemshieldremoterepairamount.py | 2 +- eos/effects/systemshieldrepairamountshieldskills.py | 3 ++- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/eos/effects/systemarmorremoterepairamount.py b/eos/effects/systemarmorremoterepairamount.py index ec0e84f4b..288ccfefd 100644 --- a/eos/effects/systemarmorremoterepairamount.py +++ b/eos/effects/systemarmorremoterepairamount.py @@ -5,6 +5,6 @@ runTime = "early" type = ("projected", "passive") def handler(fit, module, context): - fit.modules.filteredItemMultiply(lambda mod: mod.item.group.name == "Remote Armor Repairer", + fit.modules.filteredItemMultiply(lambda mod: mod.item.requiresSkill("Remote Armor Repair Systems"), "armorDamageAmount", module.getModifiedItemAttr("armorDamageAmountMultiplierRemote"), stackingPenalties=True) diff --git a/eos/effects/systemarmorrepairamount.py b/eos/effects/systemarmorrepairamount.py index 1c659a1b2..5ba4e2aa1 100644 --- a/eos/effects/systemarmorrepairamount.py +++ b/eos/effects/systemarmorrepairamount.py @@ -5,6 +5,7 @@ runTime = "early" type = ("projected", "passive") def handler(fit, module, context): - fit.modules.filteredItemMultiply(lambda mod: mod.item.group.name == "Armor Repair Unit", + fit.modules.filteredItemMultiply(lambda mod: mod.item.requiresSkill("Repair Systems") + or mod.item.requiresSkill("Capital Repair Systems"), "armorDamageAmount", module.getModifiedItemAttr("armorDamageAmountMultiplier"), stackingPenalties=True, penaltyGroup="postMul") diff --git a/eos/effects/systemshieldremoterepairamount.py b/eos/effects/systemshieldremoterepairamount.py index e1b1b4582..5c2edef34 100644 --- a/eos/effects/systemshieldremoterepairamount.py +++ b/eos/effects/systemshieldremoterepairamount.py @@ -5,6 +5,6 @@ runTime = "early" type = ("projected", "passive") def handler(fit, module, context): - fit.modules.filteredItemMultiply(lambda mod: mod.item.group.name == "Remote Shield Booster", + fit.modules.filteredItemMultiply(lambda mod: mod.item.requiresSkill("Shield Emission Systems"), "shieldBonus", module.getModifiedItemAttr("shieldBonusMultiplierRemote"), stackingPenalties=True, penaltyGroup="postMul") diff --git a/eos/effects/systemshieldrepairamountshieldskills.py b/eos/effects/systemshieldrepairamountshieldskills.py index 7ce51af06..40dc3377d 100644 --- a/eos/effects/systemshieldrepairamountshieldskills.py +++ b/eos/effects/systemshieldrepairamountshieldskills.py @@ -5,6 +5,7 @@ runTime = "early" type = ("projected", "passive") def handler(fit, module, context): - fit.modules.filteredItemMultiply(lambda mod: mod.item.requiresSkill("Shield Operation") or mod.item.requiresSkill("Capital Shield Operation"), + fit.modules.filteredItemMultiply(lambda mod: mod.item.requiresSkill("Shield Operation") + or mod.item.requiresSkill("Capital Shield Operation"), "shieldBonus", module.getModifiedItemAttr("shieldBonusMultiplier"), stackingPenalties=True, penaltyGroup="postMul") From 23a6849fe3884316e941c7130029659ef276a235 Mon Sep 17 00:00:00 2001 From: blitzmann Date: Thu, 7 Jul 2016 19:40:21 -0400 Subject: [PATCH 10/10] Bump release --- config.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config.py b/config.py index cf1c3f3e3..b5d8a27fb 100644 --- a/config.py +++ b/config.py @@ -19,7 +19,7 @@ saveInRoot = False # Version data version = "1.22.2" -tag = "git" +tag = "Stable" expansionName = "YC 118.6" expansionVersion = "1.0" evemonMinVersion = "4081"