Revert "Create variables before they are referenced. "
1dc15936ed
This is a problem for us. See #794 for more details.
This commit is contained in:
@@ -57,7 +57,6 @@ projectedFits_table = Table("projectedFits", saveddata_meta,
|
||||
|
||||
class ProjectedFit(object):
|
||||
def __init__(self, sourceID, source_fit, amount=1, active=True):
|
||||
self.victim_fit = None
|
||||
self.sourceID = sourceID
|
||||
self.source_fit = source_fit
|
||||
self.active = active
|
||||
|
||||
@@ -45,10 +45,6 @@ class Effect(EqBase):
|
||||
# Filter to change names of effects to valid python method names
|
||||
nameFilter = re.compile("[^A-Za-z0-9]")
|
||||
|
||||
def __init__(self):
|
||||
super(Effect, self).__init__()
|
||||
self.name = None
|
||||
|
||||
@reconstructor
|
||||
def init(self):
|
||||
"""
|
||||
@@ -171,14 +167,6 @@ class Item(EqBase):
|
||||
|
||||
MOVE_ATTR_INFO = None
|
||||
|
||||
def __init__(self):
|
||||
super(Item, self).__init__()
|
||||
self.raceID = None
|
||||
self.factionID = None
|
||||
self.category = None
|
||||
self.ID = None
|
||||
self.effects = None
|
||||
|
||||
@classmethod
|
||||
def getMoveAttrInfo(cls):
|
||||
info = getattr(cls, "MOVE_ATTR_INFO", None)
|
||||
@@ -425,13 +413,6 @@ class Icon(EqBase):
|
||||
|
||||
|
||||
class MarketGroup(EqBase):
|
||||
def __init__(self):
|
||||
super(MarketGroup, self).__init__()
|
||||
self.name = None
|
||||
self.parent = None
|
||||
self.name = None
|
||||
self.ID = None
|
||||
|
||||
def __repr__(self):
|
||||
return u"MarketGroup(ID={}, name={}, parent={}) at {}".format(
|
||||
self.ID, self.name, getattr(self.parent, "name", None), self.name, hex(id(self))
|
||||
|
||||
@@ -25,9 +25,6 @@ cappingAttrKeyCache = {}
|
||||
|
||||
|
||||
class ItemAttrShortcut(object):
|
||||
def __init__(self):
|
||||
self.itemModifiedAttributes = None
|
||||
|
||||
def getModifiedItemAttr(self, key):
|
||||
if key in self.itemModifiedAttributes:
|
||||
return self.itemModifiedAttributes[key]
|
||||
@@ -36,9 +33,6 @@ class ItemAttrShortcut(object):
|
||||
|
||||
|
||||
class ChargeAttrShortcut(object):
|
||||
def __init__(self):
|
||||
self.chargeModifiedAttributes = None
|
||||
|
||||
def getModifiedChargeAttr(self, key):
|
||||
if key in self.chargeModifiedAttributes:
|
||||
return self.chargeModifiedAttributes[key]
|
||||
|
||||
@@ -93,8 +93,6 @@ class Character(object):
|
||||
return all0
|
||||
|
||||
def __init__(self, name, defaultLevel=None, initSkills=True):
|
||||
self.ID = None
|
||||
self.apiID = None
|
||||
self.savedName = name
|
||||
self.__owner = None
|
||||
self.defaultLevel = defaultLevel
|
||||
@@ -261,7 +259,6 @@ class Character(object):
|
||||
|
||||
class Skill(HandledItem):
|
||||
def __init__(self, item, level=0, ro=False, learned=True):
|
||||
self.character = None
|
||||
self.__item = item if not isinstance(item, int) else None
|
||||
self.itemID = item.ID if not isinstance(item, int) else item
|
||||
self.__level = level if learned else None
|
||||
|
||||
@@ -24,7 +24,6 @@ class DamagePattern(object):
|
||||
DAMAGE_TYPES = ("em", "thermal", "kinetic", "explosive")
|
||||
|
||||
def __init__(self, emAmount=25, thermalAmount=25, kineticAmount=25, explosiveAmount=25):
|
||||
self.name = None
|
||||
self.emAmount = emAmount
|
||||
self.thermalAmount = thermalAmount
|
||||
self.kineticAmount = kineticAmount
|
||||
|
||||
@@ -35,7 +35,6 @@ class Fighter(HandledItem, HandledCharge, ItemAttrShortcut, ChargeAttrShortcut):
|
||||
|
||||
def __init__(self, item):
|
||||
"""Initialize a fighter from the program"""
|
||||
self.owner = None
|
||||
self.__item = item
|
||||
|
||||
if self.isInvalid:
|
||||
|
||||
@@ -46,7 +46,6 @@ class FighterAbility(object):
|
||||
|
||||
def __init__(self, effect):
|
||||
"""Initialize from the program"""
|
||||
self.fighter = None
|
||||
self.__effect = effect
|
||||
self.effectID = effect.ID if effect is not None else None
|
||||
self.active = False
|
||||
|
||||
@@ -57,9 +57,6 @@ class Fit(object):
|
||||
def __init__(self, ship=None, name=""):
|
||||
"""Initialize a fit from the program"""
|
||||
# use @mode.setter's to set __attr and IDs. This will set mode as well
|
||||
self.ID = None
|
||||
self.owner = None
|
||||
self.projectedOnto = None
|
||||
self.ship = ship
|
||||
if self.ship:
|
||||
self.ship.parent = self
|
||||
|
||||
@@ -80,8 +80,6 @@ class Module(HandledItem, HandledCharge, ItemAttrShortcut, ChargeAttrShortcut):
|
||||
|
||||
def __init__(self, item):
|
||||
"""Initialize a module from the program"""
|
||||
self.owner = None
|
||||
self.dummySlot = None
|
||||
self.__item = item
|
||||
|
||||
if item is not None and self.isInvalid:
|
||||
|
||||
@@ -25,7 +25,6 @@ class TargetResists(object):
|
||||
DAMAGE_TYPES = ("em", "thermal", "kinetic", "explosive")
|
||||
|
||||
def __init__(self, emAmount=0, thermalAmount=0, kineticAmount=0, explosiveAmount=0):
|
||||
self.name = None
|
||||
self.emAmount = emAmount
|
||||
self.thermalAmount = thermalAmount
|
||||
self.kineticAmount = kineticAmount
|
||||
|
||||
Reference in New Issue
Block a user