From c7ec87b9795de29dd846d9651797bf6518029562 Mon Sep 17 00:00:00 2001 From: blitzmann Date: Thu, 25 Jun 2020 19:23:28 -0400 Subject: [PATCH] Fix a couple of bugs by referencing raw names, and include all translations for types table --- eos/db/gamedata/item.py | 6 ++---- eos/saveddata/character.py | 2 +- gui/builtinAdditionPanes/droneView.py | 2 +- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/eos/db/gamedata/item.py b/eos/db/gamedata/item.py index cad1ab3e1..b725a1bbc 100644 --- a/eos/db/gamedata/item.py +++ b/eos/db/gamedata/item.py @@ -31,10 +31,8 @@ import eos.config items_table = Table("invtypes", gamedata_meta, Column("typeID", Integer, primary_key=True), - Column("typeName", String, index=True), - Column("typeName_zh", String), - Column("description", String), - Column("description_zh", String), + *[Column("typeName{}".format(lang), String, index=True) for lang in eos.config.translation_mapping.values()], + *[Column("description{}".format(lang), String, index=True) for lang in eos.config.translation_mapping.values()], Column("raceID", Integer), Column("factionID", Integer), Column("published", Boolean), diff --git a/eos/saveddata/character.py b/eos/saveddata/character.py index 084f33d37..7bddcda77 100644 --- a/eos/saveddata/character.py +++ b/eos/saveddata/character.py @@ -96,7 +96,7 @@ class Character: if cls.__itemNameMap is None: map = {} for skill in cls.getSkillList(): - map[skill.name] = skill + map[skill.typeName] = skill cls.__itemNameMap = map diff --git a/gui/builtinAdditionPanes/droneView.py b/gui/builtinAdditionPanes/droneView.py index e111c7536..ad10cbfc0 100644 --- a/gui/builtinAdditionPanes/droneView.py +++ b/gui/builtinAdditionPanes/droneView.py @@ -195,7 +195,7 @@ class DroneView(Display): def droneKey(drone): sMkt = Market.getInstance() - groupName = sMkt.getMarketGroupByItem(drone.item).name + groupName = sMkt.getMarketGroupByItem(drone.item).marketGroupName return (DRONE_ORDER.index(groupName), drone.item.name)