Added Zach's megacorp.

This commit is contained in:
Loudrob 2015-03-04 05:42:16 -05:00
parent 9be3e7f13b
commit de77765d44
16 changed files with 5430 additions and 30 deletions

View file

@ -180,8 +180,10 @@ def factoryWarp(zoneNum):
"""
Warp to a specific factory zone.
"""
factory = base.cr.doFind('DistributedFactory')
if (not factory) or (not isinstance(factory, DistributedFactory)):
factory = [base.cr.doFind('DistributedFactory'), base.cr.doFind('DistributedMegaCorp')]
for f in factory:
if (not f) or (not isinstance(f, DistributedFactory)):
return 'You must be in a factory.'
factory = f
factory.warpToZone(zoneNum)
return 'Warped to zone: %d' % zoneNum

View file

@ -30,7 +30,7 @@ class DistributedFactoryElevatorExt(DistributedElevatorExt.DistributedElevatorEx
self.elevatorModel.setPosHpr(62.74, -85.31, 0.0, 2.0, 0.0, 0.0)
elif self.entranceId == 1:
self.elevatorModel.setPosHpr(-162.25, 26.43, 0.0, 269.0, 0.0, 0.0)
elif self.entranceId == 2 and base.config.GetBool('want-brutal-factory', True):
elif self.entranceId == 2 and base.config.GetBool('want-megacorp', True):
self.elevatorModel.setPosHpr(64.793, -2.34, 0.0, -900.0, 0.0, 0.0)
else:
self.notify.error('Invalid entranceId: %s' % entranceId)

View file

@ -0,0 +1,11 @@
from direct.directnotify import DirectNotifyGlobal
import DistributedFactory
class DistributedMegaCorp(DistributedFactory.DistributedFactory):
notify = DirectNotifyGlobal.directNotify.newCategory('DistributedMegaCorp')
def __init__(self, cr):
DistributedFactory.DistributedFactory.__init__(self, cr)
def getFloorOuchLevel(self):
return 8

View file

@ -0,0 +1,8 @@
from direct.directnotify import DirectNotifyGlobal
import DistributedFactoryAI
class DistributedMegaCorpAI(DistributedFactoryAI.DistributedFactoryAI):
notify = DirectNotifyGlobal.directNotify.newCategory('DistributedBrutalFactoryAI')
def __init__(self, air, factoryId, zoneId, entranceId, avIds):
DistributedFactoryAI.DistributedFactoryAI.__init__(self, air, factoryId, zoneId, entranceId, avIds)

View file

@ -1,5 +1,5 @@
from direct.directnotify import DirectNotifyGlobal
import DistributedBrutalFactoryAI
import DistributedMegaCorpAI
import DistributedFactoryAI
from toontown.toonbase import ToontownGlobals
from direct.showbase import DirectObject
@ -20,7 +20,7 @@ class FactoryManagerAI(DirectObject.DirectObject):
if FactoryManagerAI.factoryId is not None:
factoryId = FactoryManagerAI.factoryId
if entranceId == 2:
factory = DistributedBrutalFactoryAI.DistributedBrutalFactoryAI(self.air, factoryId, factoryZone, entranceId, players)
factory = DistributedMegaCorpAI.DistributedMegaCorpAI(self.air, factoryId, factoryZone, entranceId, players)
else:
factory = DistributedFactoryAI.DistributedFactoryAI(self.air, factoryId, factoryZone, entranceId, players)
factory.generateWithRequired(factoryZone)

View file

@ -18,13 +18,13 @@ CogSpecModules = {ToontownGlobals.SellbotFactoryInt: SellbotLegFactoryCogs,
ToontownGlobals.LawbotOfficeInt: LawbotLegFactoryCogs}
if config.GetBool('want-brutal-factory', True):
import SellbotBrutalLegFactorySpec
import SellbotBrutalLegFactoryCogs
FactorySpecModules[ToontownGlobals.SellbotBrutalFactoryInt] = SellbotBrutalLegFactorySpec
CogSpecModules[ToontownGlobals.SellbotBrutalFactoryInt] = SellbotBrutalLegFactoryCogs
import SellbotMegaCorpLegSpec
import SellbotMegaCorpLegCogs
FactorySpecModules[ToontownGlobals.SellbotMegaCorpInt] = SellbotMegaCorpLegSpec
CogSpecModules[ToontownGlobals.SellbotMegaCorpInt] = SellbotMegaCorpLegCogs
if __dev__:
import FactoryMockupSpec
FactorySpecModules[ToontownGlobals.MockupFactoryId] = FactoryMockupSpec
import FactoryMockupCogs
FactorySpecModules[ToontownGlobals.MockupFactoryId] = FactoryMockupSpec
CogSpecModules[ToontownGlobals.MockupFactoryId] = FactoryMockupCogs

View file

@ -0,0 +1,9 @@
from direct.directnotify import DirectNotifyGlobal
import FactoryInterior
class MegaCorpInterior(FactoryInterior.FactoryInterior):
notify = DirectNotifyGlobal.directNotify.newCategory('FactoryInterior')
def __init__(self, loader, parentFSM, doneEvent):
FactoryInterior.FactoryInterior.__init__(self, loader, parentFSM, doneEvent)
self.zoneId = ToontownGlobals.SellbotMegaCorpInt

View file

@ -6,7 +6,7 @@ from direct.gui import DirectGui
from toontown.toonbase import TTLocalizer
from toontown.toon import Toon
from direct.fsm import State
import BrutalFactoryInterior
import MegaCorpInterior
import FactoryExterior
import FactoryInterior
import SellbotHQExterior
@ -25,7 +25,7 @@ class SellbotCogHQLoader(CogHQLoader.CogHQLoader):
state.addTransition('factoryExterior')
self.fsm.addState(State.State('factoryInterior', self.enterFactoryInterior, self.exitFactoryInterior, ['quietZone', 'factoryExterior']))
self.fsm.addState(State.State('brutalFactoryInterior', self.enterBrutalFactoryInterior, self.exitBrutalFactoryInterior, ['quietZone', 'factoryExterior']))
self.fsm.addState(State.State('megaCorpInterior', self.enterMegaCorpInterior, self.exitMegaCorpInterior, ['quietZone', 'factoryExterior']))
for stateName in ['quietZone']:
state = self.fsm.getStateNamed(stateName)
state.addTransition('factoryInterior')
@ -168,11 +168,11 @@ class SellbotCogHQLoader(CogHQLoader.CogHQLoader):
self.exitPlace()
self.placeClass = None
def enterBrutalFactoryInterior(self, requestStatus):
self.placeClass = BrutalFactoryInterior.BrutalFactoryInterior
def enterMegaCorpInterior(self, requestStatus):
self.placeClass = MegaCorpInterior.MegaCorpInterior
self.enterPlace(requestStatus)
def exitBrutalFactoryInterior(self):
def exitMegaCorpInterior(self):
self.exitPlace()
self.placeClass = None

View file

@ -0,0 +1,549 @@
from SpecImports import *
LobbyParent = 10014
BoilerParent = 10030
PipeLeftParent = 10023
PipeRightParent = 10032
OilParent = 10034
ControlParent = 10037
DuctParent = 10036
PaintMixerStorageParent = 10660
EastCatwalkParent = 10661
WestCatwalkParent = 10662
CenterSiloOutsideBattleCellParent = 10663
CenterSiloBattleCellParent = 10064
CenterSiloParent = 20095
SigRoomParent = 20058
WestSiloParent = 20094
WestSiloBattleCellParent = 10047
EastSiloParent = 20096
EastSiloBattleCellParent = 10068
LobbyCell = 0
BoilerCell = 1
PipeLeftCell = 2
PipeRightCell = 3
OilCell = 4
ControlCell = 5
DuctCell = 6
CenterSiloCell = 7
SigRoomCell = 8
WestSiloCell = 9
EastSiloCell = 10
CenterSiloOutsideCell = 11
PaintMixerStorageCell = 12
EastCatwalkCell = 13
WestCatwalkCell = 14
BattleCells = {LobbyCell: {'parentEntId': LobbyParent,
'pos': Point3(0, 0, 0)},
BoilerCell: {'parentEntId': BoilerParent,
'pos': Point3(0, 0, 0)},
OilCell: {'parentEntId': OilParent,
'pos': Point3(0, 0, 0)},
ControlCell: {'parentEntId': ControlParent,
'pos': Point3(0, 0, 0)},
CenterSiloCell: {'parentEntId': CenterSiloBattleCellParent,
'pos': Point3(0, 0, 0)},
PipeLeftCell: {'parentEntId': PipeLeftParent,
'pos': Point3(0, 0, 0)},
PipeRightCell: {'parentEntId': PipeRightParent,
'pos': Point3(0, 0, 0)},
DuctCell: {'parentEntId': DuctParent,
'pos': Point3(0, 0, 0)},
SigRoomCell: {'parentEntId': SigRoomParent,
'pos': Point3(0, 0, 0)},
WestSiloCell: {'parentEntId': WestSiloBattleCellParent,
'pos': Point3(0, 0, 0)},
EastSiloCell: {'parentEntId': EastSiloBattleCellParent,
'pos': Point3(-20, -10, 0)},
CenterSiloOutsideCell: {'parentEntId': CenterSiloOutsideBattleCellParent,
'pos': Point3(0, 0, 0)},
PaintMixerStorageCell: {'parentEntId': PaintMixerStorageParent,
'pos': Point3(0, 0, 0)},
EastCatwalkCell: {'parentEntId': EastCatwalkParent,
'pos': Point3(0, 0, 0)},
WestCatwalkCell: {'parentEntId': WestCatwalkParent,
'pos': Point3(0, 0, 0)}}
CogData = [{'type': 'm',
'parentEntId': LobbyParent,
'boss': 0,
'level': 8,
'battleCell': LobbyCell,
'pos': Point3(0, 0, 0),
'h': 0,
'behavior': 'chase',
'path': 20078,
'skeleton': 0,
'revives': 1},
{'type': 'tf',
'parentEntId': LobbyParent,
'boss': 0,
'level': 9,
'battleCell': LobbyCell,
'pos': Point3(10, 0, 0),
'h': 0,
'behavior': 'chase',
'path': 20009,
'skeleton': 0,
'revives': 1},
{'type': 'tf',
'parentEntId': LobbyParent,
'boss': 0,
'level': 7,
'battleCell': LobbyCell,
'pos': Point3(10, 0, 0),
'h': 0,
'behavior': 'chase',
'path': 20079,
'skeleton': 0,
'revives': 1},
{'type': 'tf',
'parentEntId': BoilerParent,
'boss': 0,
'level': 8,
'battleCell': BoilerCell,
'pos': Point3(0, 0, 0),
'h': 0,
'behavior': 'walk',
'path': 20076,
'skeleton': 0,
'revives': 1},
{'type': 'm',
'parentEntId': BoilerParent,
'boss': 0,
'level': 10,
'battleCell': BoilerCell,
'pos': Point3(10, 0, 0),
'h': 0,
'behavior': 'walk',
'path': 20077,
'skeleton': 0,
'revives': 1},
{'type': 'tf',
'parentEntId': BoilerParent,
'boss': 0,
'level': 7,
'battleCell': BoilerCell,
'pos': Point3(0, 0, 0),
'h': 0,
'behavior': 'chase',
'path': None,
'skeleton': 0,
'revives': 1},
{'type': 'm',
'parentEntId': OilParent,
'boss': 0,
'level': 10,
'battleCell': OilCell,
'pos': Point3(-10, 0, 0),
'h': 0,
'behavior': 'chase',
'path': 60133,
'skeleton': 0,
'revives': 1},
{'type': 'ms',
'parentEntId': OilParent,
'boss': 0,
'level': 9,
'battleCell': OilCell,
'pos': Point3(0, 0, 0),
'h': 0,
'behavior': 'chase',
'path': 60134,
'skeleton': 0,
'revives': 1},
{'type': 'gh',
'parentEntId': OilParent,
'boss': 0,
'level': 8,
'battleCell': OilCell,
'pos': Point3(10, 0, 0),
'h': 0,
'behavior': 'chase',
'path': 60135,
'skeleton': 0,
'revives': 1},
{'type': 'gh',
'parentEntId': ControlParent,
'boss': 0,
'level': 8,
'battleCell': ControlCell,
'pos': Point3(-10, 0, 0),
'h': 0,
'behavior': 'chase',
'path': 20039,
'skeleton': 0,
'revives': 1},
{'type': 'ms',
'parentEntId': ControlParent,
'boss': 0,
'level': 9,
'battleCell': ControlCell,
'pos': Point3(0, 0, 0),
'h': 0,
'behavior': 'chase',
'path': 20049,
'skeleton': 0,
'revives': 1},
{'type': 'tf',
'parentEntId': ControlParent,
'boss': 0,
'level': 9,
'battleCell': ControlCell,
'pos': Point3(10, 0, 0),
'h': 0,
'behavior': 'chase',
'path': 20075,
'skeleton': 0,
'revives': 1},
{'type': 'm',
'parentEntId': CenterSiloParent,
'boss': 0,
'level': 11,
'battleCell': CenterSiloCell,
'pos': Point3(-10, 0, 0),
'h': 0,
'behavior': 'chase',
'path': 20103,
'skeleton': 0,
'revives': 1},
{'type': 'mh',
'parentEntId': CenterSiloParent,
'boss': 1,
'level': 12,
'battleCell': CenterSiloCell,
'pos': Point3(0, 0, 0),
'h': 180,
'behavior': 'stand',
'path': None,
'skeleton': 0,
'revives': 1},
{'type': 'tf',
'parentEntId': CenterSiloParent,
'boss': 0,
'level': 10,
'battleCell': CenterSiloCell,
'pos': Point3(10, 0, 0),
'h': 0,
'behavior': 'chase',
'path': 20104,
'skeleton': 0,
'revives': 1},
{'type': 'm',
'parentEntId': CenterSiloParent,
'boss': 0,
'level': 11,
'battleCell': CenterSiloCell,
'pos': Point3(10, 0, 0),
'h': 0,
'behavior': 'chase',
'path': 20105,
'skeleton': 0,
'revives': 1},
{'type': 'mh',
'parentEntId': WestSiloParent,
'boss': 0,
'level': 9,
'battleCell': WestSiloCell,
'pos': Point3(-10, 0, 0),
'h': 0,
'behavior': 'chase',
'path': 20097,
'skeleton': 0,
'revives': 1},
{'type': 'tf',
'parentEntId': WestSiloParent,
'boss': 0,
'level': 10,
'battleCell': WestSiloCell,
'pos': Point3(0, 0, 0),
'h': 0,
'behavior': 'chase',
'path': 20098,
'skeleton': 0,
'revives': 1},
{'type': 'm',
'parentEntId': WestSiloParent,
'boss': 0,
'level': 11,
'battleCell': WestSiloCell,
'pos': Point3(10, 0, 0),
'h': 0,
'behavior': 'chase',
'path': 20099,
'skeleton': 0,
'revives': 1},
{'type': 'ms',
'parentEntId': EastSiloParent,
'boss': 0,
'level': 9,
'battleCell': EastSiloCell,
'pos': Point3(0, -5, 0),
'h': 0,
'behavior': 'chase',
'path': 20100,
'skeleton': 0,
'revives': 1},
{'type': 'mh',
'parentEntId': EastSiloParent,
'boss': 0,
'level': 10,
'battleCell': EastSiloCell,
'pos': Point3(0, 0, 0),
'h': 0,
'behavior': 'chase',
'path': 20101,
'skeleton': 0,
'revives': 1},
{'type': 'm',
'parentEntId': EastSiloParent,
'boss': 0,
'level': 11,
'battleCell': EastSiloCell,
'pos': Point3(10, 0, 0),
'h': 0,
'behavior': 'chase',
'path': 20102,
'skeleton': 0,
'revives': 1},
{'type': 'ms',
'parentEntId': PipeLeftParent,
'boss': 0,
'level': 9,
'battleCell': PipeLeftCell,
'pos': Point3(-10, 0, 0),
'h': 0,
'behavior': 'chase',
'path': 20109,
'skeleton': 0,
'revives': 1},
{'type': 'ms',
'parentEntId': PipeLeftParent,
'boss': 0,
'level': 8,
'battleCell': PipeLeftCell,
'pos': Point3(0, 0, 0),
'h': 0,
'behavior': 'chase',
'path': 20110,
'skeleton': 0,
'revives': 1},
{'type': 'gh',
'parentEntId': PipeLeftParent,
'boss': 0,
'level': 8,
'battleCell': PipeLeftCell,
'pos': Point3(10, 0, 0),
'h': 0,
'behavior': 'chase',
'path': 20111,
'skeleton': 0,
'revives': 1},
{'type': 'ms',
'parentEntId': PipeRightParent,
'boss': 0,
'level': 9,
'battleCell': PipeRightCell,
'pos': Point3(-10, 0, 0),
'h': 0,
'behavior': 'chase',
'path': 20106,
'skeleton': 0,
'revives': 1},
{'type': 'gh',
'parentEntId': PipeRightParent,
'boss': 0,
'level': 8,
'battleCell': PipeRightCell,
'pos': Point3(0, 0, 0),
'h': 0,
'behavior': 'chase',
'path': 20107,
'skeleton': 0,
'revives': 1},
{'type': 'ms',
'parentEntId': PipeRightParent,
'boss': 0,
'level': 7,
'battleCell': PipeRightCell,
'pos': Point3(10, 0, 0),
'h': 0,
'behavior': 'chase',
'path': 20108,
'skeleton': 0,
'revives': 1},
{'type': 'mh',
'parentEntId': DuctParent,
'boss': 0,
'level': 10,
'battleCell': DuctCell,
'pos': Point3(0, 0, 0),
'h': 0,
'behavior': 'chase',
'path': 20038,
'skeleton': 0,
'revives': 1},
{'type': 'mh',
'parentEntId': DuctParent,
'boss': 0,
'level': 10,
'battleCell': DuctCell,
'pos': Point3(10, 0, 0),
'h': 0,
'behavior': 'chase',
'path': 20067,
'skeleton': 0,
'revives': 1},
{'type': 'ms',
'parentEntId': DuctParent,
'boss': 0,
'level': 8,
'battleCell': DuctCell,
'pos': Point3(-10, 0, 0),
'h': 0,
'behavior': 'chase',
'path': 20068,
'skeleton': 0,
'revives': 1},
{'type': 'm',
'parentEntId': SigRoomParent,
'boss': 0,
'level': 11,
'battleCell': SigRoomCell,
'pos': Point3(5, -10.75, 0),
'h': -90,
'behavior': 'stand',
'path': None,
'skeleton': 0,
'revives': 1},
{'type': 'tf',
'parentEntId': SigRoomParent,
'boss': 0,
'level': 8,
'battleCell': SigRoomCell,
'pos': Point3(5, -3.25, 0),
'h': -90,
'behavior': 'stand',
'path': None,
'skeleton': 0,
'revives': 1},
{'type': 'm',
'parentEntId': SigRoomParent,
'boss': 0,
'level': 11,
'battleCell': SigRoomCell,
'pos': Point3(5, 3.25, 0),
'h': -90,
'behavior': 'stand',
'path': None,
'skeleton': 0,
'revives': 1},
{'type': 'gh',
'parentEntId': SigRoomParent,
'boss': 0,
'level': 8,
'battleCell': SigRoomCell,
'pos': Point3(5, 10.75, 0),
'h': -90,
'behavior': 'stand',
'path': None,
'skeleton': 0,
'revives': 1},
{'type': 'ms',
'parentEntId': CenterSiloOutsideBattleCellParent,
'boss': 0,
'level': 9,
'battleCell': CenterSiloOutsideCell,
'pos': Point3(0, 0, 0),
'h': 0,
'behavior': 'stand',
'path': None,
'skeleton': 0,
'revives': 1},
{'type': 'ms',
'parentEntId':CenterSiloOutsideBattleCellParent,
'boss': 0,
'level': 9,
'battleCell': CenterSiloOutsideCell,
'pos': Point3(32.86, -21.97, 0),
'h': -119,
'behavior': 'stand',
'path': None,
'skeleton': 0,
'revives': 1},
{'type': 'm',
'parentEntId': CenterSiloOutsideBattleCellParent,
'boss': 0,
'level': 9,
'battleCell': CenterSiloOutsideCell,
'pos': Point3(-28.6, -28.2, 0),
'h': 111.9,
'behavior': 'stand',
'path': None,
'skeleton': 0,
'revives': 1},
{'type': 'm',
'parentEntId': CenterSiloOutsideBattleCellParent,
'boss': 0,
'level': 11,
'battleCell': CenterSiloOutsideCell,
'pos': Point3(0, 27, 0),
'h': 0,
'behavior': 'stand',
'path': None,
'skeleton': 0,
'revives': 1},
{'type': 'ms',
'parentEntId': PaintMixerStorageParent,
'boss': 0,
'level': 9,
'battleCell': PaintMixerStorageCell,
'pos': Point3(0, 0, 0),
'h': 0,
'behavior': 'stand',
'path': None,
'skeleton': 0,
'revives': 1},
{'type': 'ms',
'parentEntId': EastCatwalkParent,
'boss': 0,
'level': 9,
'battleCell': EastCatwalkCell,
'pos': Point3(0, 0, 0),
'h': 0,
'behavior': 'stand',
'path': None,
'skeleton': 0,
'revives': 1},
{'type': 'ms',
'parentEntId': EastCatwalkParent,
'boss': 0,
'level': 9,
'battleCell': EastCatwalkCell,
'pos': Point3(0, -5, 0),
'h': 0,
'behavior': 'stand',
'path': None,
'skeleton': 0,
'revives': 1},
{'type': 'ms',
'parentEntId': WestCatwalkParent,
'boss': 0,
'level': 9,
'battleCell': WestCatwalkCell,
'pos': Point3(0, 0, 0),
'h': 0,
'behavior': 'stand',
'path': None,
'skeleton': 0,
'revives': 1},
{'type': 'ms',
'parentEntId': WestCatwalkParent,
'boss': 0,
'level': 9,
'battleCell': WestCatwalkCell,
'pos': Point3(0, -5, 0),
'h': 0,
'behavior': 'stand',
'path': None,
'skeleton': 0,
'revives': 1}]
ReserveCogData = [{}]

File diff suppressed because it is too large Load diff

View file

@ -49,9 +49,9 @@ class SellbotHQAI(CogHQAI.CogHQAI):
factoryElevator.generateWithRequired(ToontownGlobals.SellbotFactoryExt)
self.factoryElevators.append(factoryElevator)
if simbase.config.GetBool('want-brutal-factory', True):
if simbase.config.GetBool('want-megacorp', True):
factoryElevator = DistributedFactoryElevatorExtAI(
self.air, self.air.factoryMgr, ToontownGlobals.SellbotBrutalFactoryInt, 2)
self.air, self.air.factoryMgr, ToontownGlobals.SellbotMegaCorpInt, 2)
factoryElevator.generateWithRequired(ToontownGlobals.SellbotFactoryExt)
self.factoryElevators.append(factoryElevator)

View file

@ -108,7 +108,7 @@ def getWhereName(zoneId, isToon):
elif suffix >= 500:
if getHoodId(zoneId) == SellbotHQ:
if suffix == 600:
where = 'brutalFactoryInterior'
where = 'megaCorpInterior'
else:
where = 'factoryInterior'
elif getHoodId(zoneId) == CashbotHQ:

View file

@ -1,7 +1,7 @@
from pandac.PandaModules import *
from toontown.toonbase import ToontownGlobals
taskZoneId2pathId = {ToontownGlobals.SellbotFactoryInt: 'sellbotFactory',
ToontownGlobals.SellbotBrutalFactoryInt: 'sellbotFactory',
ToontownGlobals.SellbotMegaCorpInt: 'sellbotFactory',
ToontownGlobals.CashbotMintIntA: 'cashbotMint',
ToontownGlobals.CashbotMintIntB: 'cashbotMint',
ToontownGlobals.CashbotMintIntC: 'cashbotMint',

View file

@ -120,7 +120,7 @@ GlobalStreetNames = {20000: ('to', 'on', 'Tutorial Terrace'),
11100: ('to the', 'in the', 'Sellbot HQ Lobby'),
11200: ('to the', 'in the', 'Sellbot Factory'),
11500: ('to the', 'in the', 'Sellbot Factory'),
11600: ('to the', 'in the', 'Brutal Sellbot Factory'),
11600: ('to the', 'in the', 'Sellbot Megacorp'),
12000: ('to', 'in', 'Cashbot Train Yard'),
12100: ('to the', 'in the', 'Cashbot HQ Lobby'),
12500: ('to the', 'in the', 'Cashbot Coin Mint'),
@ -158,7 +158,7 @@ SellbotSideEntrance = 'Side Entrance'
Office = 'Office'
FactoryNames = {0: 'Factory Mockup',
11500: 'Sellbot Cog Factory',
11600: 'Brutal Sellbot Cog Factory',
11600: 'Sellbot Cog Megacorp',
13300: 'Lawbot Cog Office'}
FactoryTypeLeg = 'Leg'
FactoryTypeArm = 'Arm'
@ -9578,8 +9578,7 @@ ElevatorCashBotMint2 = 'Bullion Mint'
ElevatorSellBotBoss = 'Sellbot Towers'
ElevatorSellBotFactory0 = 'Front Entrance'
ElevatorSellBotFactory1 = 'Side Entrance'
ElevatorSellBotFactory2 = 'Brutal Front Entrance'
ElevatorSellBotFactory3 = 'Brutal Side Entrance'
ElevatorSellBotFactory2 = 'Megacorp Entrance'
ElevatorLawBotBoss = 'Lawbot Courthouse'
ElevatorLawBotCourse0 = 'Office A'
ElevatorLawBotCourse1 = 'Office B'

View file

@ -759,7 +759,7 @@ def getCreditMultiplier(floorIndex):
def getFactoryCreditMultiplier(factoryId):
if factoryId == SellbotBrutalFactoryInt:
if factoryId == SellbotMegaCorpInt:
return 6.0
return 2.0

View file

@ -189,7 +189,7 @@ SellbotHQ = 11000
SellbotLobby = 11100
SellbotFactoryExt = 11200
SellbotFactoryInt = 11500
SellbotBrutalFactoryInt = 11600
SellbotMegaCorpInt = 11600
CashbotHQ = 12000
CashbotLobby = 12100
CashbotMintIntA = 12500
@ -298,7 +298,7 @@ FT_Arm = 'arm'
FT_Torso = 'torso'
factoryId2factoryType = {MockupFactoryId: FT_FullSuit,
SellbotFactoryInt: FT_FullSuit,
SellbotBrutalFactoryInt: FT_FullSuit,
SellbotMegaCorpInt: FT_FullSuit,
LawbotOfficeInt: FT_FullSuit}
StreetNames = TTLocalizer.GlobalStreetNames
StreetBranchZones = StreetNames.keys()