diff --git a/otp/level/EntityCreator.py b/otp/level/EntityCreator.py index 8d73961..3eba12f 100644 --- a/otp/level/EntityCreator.py +++ b/otp/level/EntityCreator.py @@ -19,8 +19,8 @@ def nothing(*args): return 'nothing' -def nonlocal(*args): - return 'nonlocal' +def nonlocalEnt(*args): + return 'nonlocalEnt' class EntityCreator(EntityCreatorBase.EntityCreatorBase): diff --git a/otp/level/Level.py b/otp/level/Level.py index 62220d5..ed29b67 100644 --- a/otp/level/Level.py +++ b/otp/level/Level.py @@ -104,7 +104,7 @@ class Level: Level.notify.debug('creating %s %s' % (spec['type'], entId)) entity = self.entityCreator.createEntity(entId) announce = False - if entity is 'nonlocal': + if entity is 'nonlocalEnt': self.nonlocalEntIds[entId] = None elif entity is 'nothing': self.nothingEntIds[entId] = None diff --git a/toontown/cogdominium/CogdoEntityCreator.py b/toontown/cogdominium/CogdoEntityCreator.py index c9d3715..eba1506 100644 --- a/toontown/cogdominium/CogdoEntityCreator.py +++ b/toontown/cogdominium/CogdoEntityCreator.py @@ -9,7 +9,7 @@ class CogdoEntityCreator(EntityCreator.EntityCreator): def __init__(self, level): EntityCreator.EntityCreator.__init__(self, level) nothing = EntityCreator.nothing - nonlocal = EntityCreator.nonlocal + nonlocalEnt = EntityCreator.nonlocalEnt self.privRegisterTypes({'levelMgr': CogdoLevelMgr, 'cogdoBoardroomGameSettings': Functor(self._createCogdoSettings, CogdoBoardroomGameConsts.Settings), 'cogdoCraneGameSettings': Functor(self._createCogdoSettings, CogdoCraneGameConsts.Settings), diff --git a/toontown/coghq/FactoryEntityCreator.py b/toontown/coghq/FactoryEntityCreator.py index 6a0f10e..4ad3092 100644 --- a/toontown/coghq/FactoryEntityCreator.py +++ b/toontown/coghq/FactoryEntityCreator.py @@ -16,40 +16,40 @@ class FactoryEntityCreator(EntityCreator.EntityCreator): def __init__(self, level): EntityCreator.EntityCreator.__init__(self, level) nothing = EntityCreator.nothing - nonlocal = EntityCreator.nonlocal - self.privRegisterTypes({'activeCell': nonlocal, - 'crusherCell': nonlocal, - 'battleBlocker': nonlocal, - 'beanBarrel': nonlocal, - 'button': nonlocal, + nonlocalEnt = EntityCreator.nonlocalEnt + self.privRegisterTypes({'activeCell': nonlocalEnt, + 'crusherCell': nonlocalEnt, + 'battleBlocker': nonlocalEnt, + 'beanBarrel': nonlocalEnt, + 'button': nonlocalEnt, 'conveyorBelt': ConveyorBelt.ConveyorBelt, - 'crate': nonlocal, - 'door': nonlocal, - 'directionalCell': nonlocal, - 'gagBarrel': nonlocal, + 'crate': nonlocalEnt, + 'door': nonlocalEnt, + 'directionalCell': nonlocalEnt, + 'gagBarrel': nonlocalEnt, 'gear': GearEntity.GearEntity, - 'goon': nonlocal, - 'gridGoon': nonlocal, - 'golfGreenGame': nonlocal, + 'goon': nonlocalEnt, + 'gridGoon': nonlocalEnt, + 'golfGreenGame': nonlocalEnt, 'goonClipPlane': GoonClipPlane.GoonClipPlane, - 'grid': nonlocal, - 'healBarrel': nonlocal, + 'grid': nonlocalEnt, + 'healBarrel': nonlocalEnt, 'levelMgr': FactoryLevelMgr.FactoryLevelMgr, - 'lift': nonlocal, + 'lift': nonlocalEnt, 'mintProduct': MintProduct.MintProduct, 'mintProductPallet': MintProductPallet.MintProductPallet, 'mintShelf': MintShelf.MintShelf, - 'mover': nonlocal, + 'mover': nonlocalEnt, 'paintMixer': PaintMixer.PaintMixer, 'pathMaster': PathMasterEntity.PathMasterEntity, 'rendering': RenderingEntity.RenderingEntity, 'platform': PlatformEntity.PlatformEntity, - 'sinkingPlatform': nonlocal, - 'stomper': nonlocal, - 'stomperPair': nonlocal, - 'laserField': nonlocal, - 'securityCamera': nonlocal, - 'elevatorMarker': nonlocal, - 'trigger': nonlocal, - 'moleField': nonlocal, - 'maze': nonlocal}) + 'sinkingPlatform': nonlocalEnt, + 'stomper': nonlocalEnt, + 'stomperPair': nonlocalEnt, + 'laserField': nonlocalEnt, + 'securityCamera': nonlocalEnt, + 'elevatorMarker': nonlocalEnt, + 'trigger': nonlocalEnt, + 'moleField': nonlocalEnt, + 'maze': nonlocalEnt})