From d936088451f071fb6151e65c9558dfb713bcdff7 Mon Sep 17 00:00:00 2001 From: DarkPhoenix Date: Sat, 24 Aug 2013 01:03:20 +0400 Subject: [PATCH] Finalize Ody 1.1 current changes with AT prize ships --- eos/effects/covertwarfaremindlink.py | 9 +++++++++ eos/effects/informationwarfaremindlinkhidden.py | 2 -- eos/effects/shipsptoptimalbonusmf.py | 7 +++++++ ...bsystembonusamarrdefensiveinformationwarfare.py | 2 ++ ...mbonusamarrdefensiveinformationwarfarehidden.py | 2 ++ .../subsystembonusamarrdefensiveskirmishwarfare.py | 2 ++ ...ystembonuscaldaridefensiveinformationwarfare.py | 2 ++ ...onuscaldaridefensiveinformationwarfarehidden.py | 2 ++ ...ubsystembonuscaldaridefensiveskirmishwarfare.py | 2 ++ ...ubsystembonusgallentedefensivearmoredwarfare.py | 2 ++ ...bsystembonusgallentedefensiveskirmishwarfare.py | 2 ++ ...ubsystembonusminmatardefensivearmoredwarfare.py | 2 ++ .../subsystembonusminmatardefensivesiegewarfare.py | 2 ++ service/market.py | 14 ++++++++++---- 14 files changed, 46 insertions(+), 6 deletions(-) create mode 100644 eos/effects/covertwarfaremindlink.py create mode 100644 eos/effects/shipsptoptimalbonusmf.py diff --git a/eos/effects/covertwarfaremindlink.py b/eos/effects/covertwarfaremindlink.py new file mode 100644 index 000000000..861bcb2a8 --- /dev/null +++ b/eos/effects/covertwarfaremindlink.py @@ -0,0 +1,9 @@ +# Used by: +# Implant: Caldari Navy Warfare Mindlink +# Implant: Imperial Navy Warfare Mindlink +# Implant: Information Warfare Mindlink +type = "passive" +def handler(fit, implant, context): + fit.character.getSkill("Information Warfare").suppress() + fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Information Warfare Specialist"), + "commandBonus", implant.getModifiedItemAttr("mindlinkBonus")) diff --git a/eos/effects/informationwarfaremindlinkhidden.py b/eos/effects/informationwarfaremindlinkhidden.py index 31869d0d8..ee4dc6b09 100755 --- a/eos/effects/informationwarfaremindlinkhidden.py +++ b/eos/effects/informationwarfaremindlinkhidden.py @@ -5,7 +5,5 @@ type = "passive" def handler(fit, implant, context): fit.character.getSkill("Information Warfare").suppress() - fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Information Warfare Specialist"), - "commandBonus", implant.getModifiedItemAttr("mindlinkBonus")) fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Information Warfare Specialist"), "commandBonusHidden", implant.getModifiedItemAttr("mindlinkBonus")) diff --git a/eos/effects/shipsptoptimalbonusmf.py b/eos/effects/shipsptoptimalbonusmf.py new file mode 100644 index 000000000..21ebed784 --- /dev/null +++ b/eos/effects/shipsptoptimalbonusmf.py @@ -0,0 +1,7 @@ +# Used by: +# Ship: Chremoas +type = "passive" +def handler(fit, ship, context): + level = fit.character.getSkill("Minmatar Frigate").level + fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Projectile Turret"), + "maxRange", ship.getModifiedItemAttr("shipBonusMF") * level) diff --git a/eos/effects/subsystembonusamarrdefensiveinformationwarfare.py b/eos/effects/subsystembonusamarrdefensiveinformationwarfare.py index 9d1222b0a..098111ac9 100644 --- a/eos/effects/subsystembonusamarrdefensiveinformationwarfare.py +++ b/eos/effects/subsystembonusamarrdefensiveinformationwarfare.py @@ -1,3 +1,5 @@ +# Used by: +# Subsystem: Legion Defensive - Warfare Processor type = "passive" def handler(fit, module, context): level = fit.character.getSkill("Amarr Defensive Systems").level diff --git a/eos/effects/subsystembonusamarrdefensiveinformationwarfarehidden.py b/eos/effects/subsystembonusamarrdefensiveinformationwarfarehidden.py index 58eae4069..f9410b642 100644 --- a/eos/effects/subsystembonusamarrdefensiveinformationwarfarehidden.py +++ b/eos/effects/subsystembonusamarrdefensiveinformationwarfarehidden.py @@ -1,3 +1,5 @@ +# Used by: +# Subsystem: Legion Defensive - Warfare Processor type = "passive" def handler(fit, module, context): level = fit.character.getSkill("Amarr Defensive Systems").level diff --git a/eos/effects/subsystembonusamarrdefensiveskirmishwarfare.py b/eos/effects/subsystembonusamarrdefensiveskirmishwarfare.py index b59796e34..6eb6a7385 100644 --- a/eos/effects/subsystembonusamarrdefensiveskirmishwarfare.py +++ b/eos/effects/subsystembonusamarrdefensiveskirmishwarfare.py @@ -1,3 +1,5 @@ +# Used by: +# Subsystem: Legion Defensive - Warfare Processor type = "passive" def handler(fit, module, context): level = fit.character.getSkill("Amarr Defensive Systems").level diff --git a/eos/effects/subsystembonuscaldaridefensiveinformationwarfare.py b/eos/effects/subsystembonuscaldaridefensiveinformationwarfare.py index 5182a60b7..853f0d6b8 100644 --- a/eos/effects/subsystembonuscaldaridefensiveinformationwarfare.py +++ b/eos/effects/subsystembonuscaldaridefensiveinformationwarfare.py @@ -1,3 +1,5 @@ +# Used by: +# Subsystem: Tengu Defensive - Warfare Processor type = "passive" def handler(fit, module, context): level = fit.character.getSkill("Caldari Defensive Systems").level diff --git a/eos/effects/subsystembonuscaldaridefensiveinformationwarfarehidden.py b/eos/effects/subsystembonuscaldaridefensiveinformationwarfarehidden.py index 86fd0c8f2..563a7be5c 100644 --- a/eos/effects/subsystembonuscaldaridefensiveinformationwarfarehidden.py +++ b/eos/effects/subsystembonuscaldaridefensiveinformationwarfarehidden.py @@ -1,3 +1,5 @@ +# Used by: +# Subsystem: Tengu Defensive - Warfare Processor type = "passive" def handler(fit, module, context): level = fit.character.getSkill("Caldari Defensive Systems").level diff --git a/eos/effects/subsystembonuscaldaridefensiveskirmishwarfare.py b/eos/effects/subsystembonuscaldaridefensiveskirmishwarfare.py index d46c2d764..006c5a7fc 100644 --- a/eos/effects/subsystembonuscaldaridefensiveskirmishwarfare.py +++ b/eos/effects/subsystembonuscaldaridefensiveskirmishwarfare.py @@ -1,3 +1,5 @@ +# Used by: +# Subsystem: Tengu Defensive - Warfare Processor type = "passive" def handler(fit, module, context): level = fit.character.getSkill("Caldari Defensive Systems").level diff --git a/eos/effects/subsystembonusgallentedefensivearmoredwarfare.py b/eos/effects/subsystembonusgallentedefensivearmoredwarfare.py index af070d4e1..a05390dab 100644 --- a/eos/effects/subsystembonusgallentedefensivearmoredwarfare.py +++ b/eos/effects/subsystembonusgallentedefensivearmoredwarfare.py @@ -1,3 +1,5 @@ +# Used by: +# Subsystem: Proteus Defensive - Warfare Processor type = "passive" def handler(fit, module, context): level = fit.character.getSkill("Gallente Defensive Systems").level diff --git a/eos/effects/subsystembonusgallentedefensiveskirmishwarfare.py b/eos/effects/subsystembonusgallentedefensiveskirmishwarfare.py index 38efc1d7a..69a04ab6e 100644 --- a/eos/effects/subsystembonusgallentedefensiveskirmishwarfare.py +++ b/eos/effects/subsystembonusgallentedefensiveskirmishwarfare.py @@ -1,3 +1,5 @@ +# Used by: +# Subsystem: Proteus Defensive - Warfare Processor type = "passive" def handler(fit, module, context): level = fit.character.getSkill("Gallente Defensive Systems").level diff --git a/eos/effects/subsystembonusminmatardefensivearmoredwarfare.py b/eos/effects/subsystembonusminmatardefensivearmoredwarfare.py index bd720dfda..fc0393492 100644 --- a/eos/effects/subsystembonusminmatardefensivearmoredwarfare.py +++ b/eos/effects/subsystembonusminmatardefensivearmoredwarfare.py @@ -1,3 +1,5 @@ +# Used by: +# Subsystem: Loki Defensive - Warfare Processor type = "passive" def handler(fit, module, context): level = fit.character.getSkill("Minmatar Defensive Systems").level diff --git a/eos/effects/subsystembonusminmatardefensivesiegewarfare.py b/eos/effects/subsystembonusminmatardefensivesiegewarfare.py index b84e53718..d3625a7f1 100644 --- a/eos/effects/subsystembonusminmatardefensivesiegewarfare.py +++ b/eos/effects/subsystembonusminmatardefensivesiegewarfare.py @@ -1,3 +1,5 @@ +# Used by: +# Subsystem: Loki Defensive - Warfare Processor type = "passive" def handler(fit, module, context): level = fit.character.getSkill("Minmatar Defensive Systems").level diff --git a/service/market.py b/service/market.py index 2c6cf80f1..d19c8cee2 100644 --- a/service/market.py +++ b/service/market.py @@ -185,9 +185,11 @@ class Market(): "Malice": self.les_grp, # AT9 prize "Vangel": self.les_grp, # AT9 prize "Cambion": self.les_grp, # AT10 prize - "Etana": self.les_grp } # AT10 prize + "Etana": self.les_grp, # AT10 prize + "Chremoas": self.les_grp, # AT11 prize :( + "Moracha": self.les_grp } # AT11 prize self.ITEMS_FORCEGROUP_R = self.__makeRevDict(self.ITEMS_FORCEGROUP) - self.les_grp.items += list(self.getItem(itmn) for itmn in self.ITEMS_FORCEGROUP_R[self.les_grp]) + self.les_grp.addItems = list(self.getItem(itmn) for itmn in self.ITEMS_FORCEGROUP_R[self.les_grp]) self.customGroups.add(self.les_grp) # List of items which are forcibly published or hidden @@ -496,7 +498,10 @@ class Market(): """Get items assigned to group""" # Return only public items; also, filter out items # which were forcibly set to other groups - items = set(filter(lambda item: self.getPublicityByItem(item) and self.getGroupByItem(item) == group, group.items)) + groupItems = set(group.items) + if hasattr(group, 'addItems'): + groupItems.update(group.addItems) + items = set(filter(lambda item: self.getPublicityByItem(item) and self.getGroupByItem(item) == group, groupItems)) return items def getItemsByMarketGroup(self, mg, vars=True): @@ -568,7 +573,8 @@ class Market(): return item.icon.iconFile if item.icon else "" elif self.getMarketGroupChildren(mg) > 0: kids = self.getMarketGroupChildren(mg) - size = len(self.getIconByMarketGroup(kids)) + mktGroups = self.getIconByMarketGroup(kids) + size = len(mktGroups) return mktGroups.pop() if size > 0 else "" else: return ""