diff --git a/eos/saveddata/character.py b/eos/saveddata/character.py index 1ac23f222..ca789208a 100644 --- a/eos/saveddata/character.py +++ b/eos/saveddata/character.py @@ -139,7 +139,7 @@ class Character(object): return self.__secStatus @secStatus.setter - def owner(self, sec): + def secStatus(self, sec): self.__secStatus = sec @property diff --git a/scripts/jsonToSql.py b/scripts/jsonToSql.py index 173fc59f3..ad263df4b 100755 --- a/scripts/jsonToSql.py +++ b/scripts/jsonToSql.py @@ -49,9 +49,9 @@ def main(db, json_path): tables = { "clonegrades": eos.gamedata.AlphaCloneSkill, "dgmattribs": eos.gamedata.AttributeInfo, - "dgmeffects": eos.gamedata.EffectInfo, + "dgmeffects": eos.gamedata.Effect, "dgmtypeattribs": eos.gamedata.Attribute, - "dgmtypeeffects": eos.gamedata.Effect, + "dgmtypeeffects": eos.gamedata.ItemEffect, "dgmunits": eos.gamedata.Unit, "icons": eos.gamedata.Icon, "evecategories": eos.gamedata.Category, @@ -62,7 +62,6 @@ def main(db, json_path): "phbtraits": eos.gamedata.Traits, "phbmetadata": eos.gamedata.MetaData, "mapbulk_marketGroups": eos.gamedata.MarketGroup, - } fieldMapping = {