From 99f14746e4fbc778db8137695cd8082d934df2c6 Mon Sep 17 00:00:00 2001 From: WatchMeCalculate Date: Tue, 19 Jun 2018 00:16:32 -0700 Subject: [PATCH 1/6] Removed return and re-added apiUpdateCharSheet function --- eos/saveddata/character.py | 6 ++++++ service/character.py | 3 --- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/eos/saveddata/character.py b/eos/saveddata/character.py index 9316b32f7..7fc112d71 100644 --- a/eos/saveddata/character.py +++ b/eos/saveddata/character.py @@ -125,6 +125,12 @@ class Character(object): return all0 + def apiUpdateCharSheet(self, skills, secStatus=0.00): + self.clearSkills() + for skillRow in skills: + self.addSkill(Skill(self, skillRow["typeID"], skillRow["level"])) + self.secStatus = float(secStatus) + def clearSkills(self): del self.__skills[:] self.__skillIdMap.clear() diff --git a/service/character.py b/service/character.py index f5e771872..2ff03de67 100644 --- a/service/character.py +++ b/service/character.py @@ -51,9 +51,6 @@ class CharacterImportThread(threading.Thread): self.callback = callback def run(self): - wx.CallAfter(self.callback) - # todo: Fix character import (don't need CCP SML anymore, only support evemon?) - return paths = self.paths sCharacter = Character.getInstance() all5_character = es_Character("All 5", 5) From 0603e0c89d474811b0a5fd8d27c32977416e947d Mon Sep 17 00:00:00 2001 From: MaruMaruOO <37426450+MaruMaruOO@users.noreply.github.com> Date: Fri, 6 Jul 2018 23:41:34 -0400 Subject: [PATCH 2/6] Fixes the Helios's drone damage bonus. The required skill should be Light Drone Operation as light drones don't require Drone Avionics. This causes the damage bonus to apply correctly. Giving a max skill Hobgoblin II 29.7dps rather than 19.8dps. --- eos/effects/shipdronescoutthermaldamagegf2.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eos/effects/shipdronescoutthermaldamagegf2.py b/eos/effects/shipdronescoutthermaldamagegf2.py index afe18cb9d..54f7716e0 100644 --- a/eos/effects/shipdronescoutthermaldamagegf2.py +++ b/eos/effects/shipdronescoutthermaldamagegf2.py @@ -6,5 +6,5 @@ type = "passive" def handler(fit, ship, context): - fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill("Drone Avionics"), + fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill("Light Drone Operation"), "thermalDamage", ship.getModifiedItemAttr("shipBonusGF2"), skill="Gallente Frigate") From fe951e2ca112ce4d77bd469e1685506d8e62dc2c Mon Sep 17 00:00:00 2001 From: MaruMaruOO <37426450+MaruMaruOO@users.noreply.github.com> Date: Sun, 8 Jul 2018 21:44:55 -0400 Subject: [PATCH 3/6] Typo fix for eos.gamedata.translations["Boolean"] Fix for #1659. I assume the second argument is a typo given the use case. If not giving it a default value also works. --- eos/gamedata.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eos/gamedata.py b/eos/gamedata.py index 342a4caf4..243f71bad 100644 --- a/eos/gamedata.py +++ b/eos/gamedata.py @@ -592,7 +592,7 @@ class Unit(EqBase): lambda d: d * 1000.0, lambda u: u), "Boolean": ( - lambda v, u: "Yes" if v == 1 else "No", + lambda v: "Yes" if v == 1 else "No", lambda d: 1.0 if d == "Yes" else 0.0, lambda u: ""), "typeID": ( From 3fcad7ed3fd691fe1baa16fe7fd75384cdf39b7e Mon Sep 17 00:00:00 2001 From: MaruMaruOO Date: Mon, 9 Jul 2018 01:37:40 -0400 Subject: [PATCH 4/6] Allow drone skill effects to process implants --- eos/effects/skillbonusdronedurability.py | 4 +++- eos/effects/skillbonusdroneinterfacing.py | 4 +++- eos/effects/skillbonusdronenavigation.py | 2 +- eos/effects/skillbonusdronesharpshooting.py | 2 +- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/eos/effects/skillbonusdronedurability.py b/eos/effects/skillbonusdronedurability.py index 1023c8412..e91f30acf 100644 --- a/eos/effects/skillbonusdronedurability.py +++ b/eos/effects/skillbonusdronedurability.py @@ -1,12 +1,14 @@ # skillBonusDroneDurability # # Used by: +# Implant: CreoDron 'Bumblebee' Drone Tuner T10-5D +# Implant: CreoDron 'Yellowjacket' Drone Tuner D5-10T # Skill: Drone Durability type = "passive" def handler(fit, src, context): - lvl = src.level + lvl = src.level if "skill" in context else 1 fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill("Drones"), "hp", src.getModifiedItemAttr("hullHpBonus") * lvl) fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill("Drones"), "armorHP", diff --git a/eos/effects/skillbonusdroneinterfacing.py b/eos/effects/skillbonusdroneinterfacing.py index 4aec63e83..93093efc3 100644 --- a/eos/effects/skillbonusdroneinterfacing.py +++ b/eos/effects/skillbonusdroneinterfacing.py @@ -1,12 +1,14 @@ # skillBonusDroneInterfacing # # Used by: +# Implant: CreoDron 'Bumblebee' Drone Tuner T10-5D +# Implant: CreoDron 'Yellowjacket' Drone Tuner D5-10T # Skill: Drone Interfacing type = "passive" def handler(fit, src, context): - lvl = src.level + lvl = src.level if "skill" in context else 1 fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill("Drones"), "damageMultiplier", src.getModifiedItemAttr("damageMultiplierBonus") * lvl) fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"), diff --git a/eos/effects/skillbonusdronenavigation.py b/eos/effects/skillbonusdronenavigation.py index 01453e891..4f5dd8bc5 100644 --- a/eos/effects/skillbonusdronenavigation.py +++ b/eos/effects/skillbonusdronenavigation.py @@ -6,7 +6,7 @@ type = "passive" def handler(fit, src, context): - lvl = src.level + lvl = src.level if "skill" in context else 1 fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill("Drones"), "maxVelocity", src.getModifiedItemAttr("maxVelocityBonus") * lvl) fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"), "maxVelocity", diff --git a/eos/effects/skillbonusdronesharpshooting.py b/eos/effects/skillbonusdronesharpshooting.py index 29654615c..ea0738dc1 100644 --- a/eos/effects/skillbonusdronesharpshooting.py +++ b/eos/effects/skillbonusdronesharpshooting.py @@ -6,7 +6,7 @@ type = "passive" def handler(fit, src, context): - lvl = src.level + lvl = src.level if "skill" in context else 1 fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill("Drones"), "maxRange", src.getModifiedItemAttr("rangeSkillBonus") * lvl) fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"), "fighterAbilityMissilesRange", From 29541bc5d9d8e8040719d637a68e7840cf0a7656 Mon Sep 17 00:00:00 2001 From: MaruMaruOO Date: Mon, 9 Jul 2018 05:51:23 -0400 Subject: [PATCH 5/6] Make itemStats.closeBtn fire a close event --- gui/itemStats.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gui/itemStats.py b/gui/itemStats.py index 6a75b543d..9e5b07016 100644 --- a/gui/itemStats.py +++ b/gui/itemStats.py @@ -102,7 +102,7 @@ class ItemStatsDialog(wx.Dialog): if "wxGTK" in wx.PlatformInfo: self.closeBtn = wx.Button(self, wx.ID_ANY, "Close", wx.DefaultPosition, wx.DefaultSize, 0) self.mainSizer.Add(self.closeBtn, 0, wx.ALL | wx.ALIGN_RIGHT, 5) - self.closeBtn.Bind(wx.EVT_BUTTON, self.closeEvent) + self.closeBtn.Bind(wx.EVT_BUTTON, (lambda e: self.Close()))) self.SetSizer(self.mainSizer) From 89efa9cbf9855e4a07b9c79a7fafc39496f0a297 Mon Sep 17 00:00:00 2001 From: blitzmann Date: Mon, 9 Jul 2018 22:59:26 -0400 Subject: [PATCH 6/6] Fix syntax issue (see #1657) --- gui/itemStats.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gui/itemStats.py b/gui/itemStats.py index 9e5b07016..3768780e2 100644 --- a/gui/itemStats.py +++ b/gui/itemStats.py @@ -102,7 +102,7 @@ class ItemStatsDialog(wx.Dialog): if "wxGTK" in wx.PlatformInfo: self.closeBtn = wx.Button(self, wx.ID_ANY, "Close", wx.DefaultPosition, wx.DefaultSize, 0) self.mainSizer.Add(self.closeBtn, 0, wx.ALL | wx.ALIGN_RIGHT, 5) - self.closeBtn.Bind(wx.EVT_BUTTON, (lambda e: self.Close()))) + self.closeBtn.Bind(wx.EVT_BUTTON, (lambda e: self.Close())) self.SetSizer(self.mainSizer)