diff --git a/eos/effects/skillbonusdronedurability.py b/eos/effects/skillbonusdronedurability.py index f36e82a3f..e91f30acf 100644 --- a/eos/effects/skillbonusdronedurability.py +++ b/eos/effects/skillbonusdronedurability.py @@ -1,6 +1,8 @@ # skillBonusDroneDurability # # Used by: +# Implant: CreoDron 'Bumblebee' Drone Tuner T10-5D +# Implant: CreoDron 'Yellowjacket' Drone Tuner D5-10T # Skill: Drone Durability type = "passive" diff --git a/eos/effects/skillbonusdroneinterfacing.py b/eos/effects/skillbonusdroneinterfacing.py index d832d432b..93093efc3 100644 --- a/eos/effects/skillbonusdroneinterfacing.py +++ b/eos/effects/skillbonusdroneinterfacing.py @@ -1,6 +1,8 @@ # skillBonusDroneInterfacing # # Used by: +# Implant: CreoDron 'Bumblebee' Drone Tuner T10-5D +# Implant: CreoDron 'Yellowjacket' Drone Tuner D5-10T # Skill: Drone Interfacing type = "passive" 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", 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)