Stuff, remove unused Brutal Leg Factory (somebody renamed it to MegaCorp)

This commit is contained in:
DenialMC 2015-05-06 11:39:48 +03:00
parent 9cec2ff13b
commit d75887e862
13 changed files with 14 additions and 15283 deletions

View file

@ -33,8 +33,7 @@ class BanFSM(FSM):
datagram.addServerHeader(
av.GetPuppetConnectionChannel(self.avId),
self.air.ourChannel, CLIENTAGENT_EJECT)
datagram.addUint16(152)
datagram.addString(self.avName)
datagram.addUint16(103)
simbase.air.send(datagram)
def dbCallback(self, dclass, fields):
@ -116,7 +115,7 @@ def kick(reason):
datagram.addServerHeader(
target.GetPuppetConnectionChannel(target.doId),
simbase.air.ourChannel, CLIENTAGENT_EJECT)
datagram.addUint16(155)
datagram.addUint16(104)
datagram.addString('You were kicked by a moderator for the following reason: "%s"\n\nBehave next time!' % reason)
simbase.air.send(datagram)
simbase.air.writeServerEvent('kick', invoker.doId, target.doId, reason)

View file

@ -23,7 +23,7 @@ class MagicWordManagerAI(DistributedObjectAI):
self.air.writeServerEvent('suspicious', invokerId, 'Attempted to issue magic word: %s' % word)
dg = PyDatagram()
dg.addServerHeader(self.GetPuppetConnectionChannel(invokerId), self.air.ourChannel, CLIENTAGENT_EJECT)
dg.addUint16(126)
dg.addUint16(102)
dg.addString('Magic Words are reserved for administrators only!')
self.air.send(dg)
return

View file

@ -374,14 +374,8 @@ class OTPClientRepository(ClientRepositoryBase):
messenger.send('connectionIssue')
url = self.serverList[0]
self.notify.warning('Failed to connect to %s (%s %s). Notifying user.' % (url.cStr(), statusCode, statusString))
if statusCode == 1403 or statusCode == 1405 or statusCode == 1400:
message = OTPLocalizer.CRNoConnectProxyNoPort % (url.getServer(), url.getPort(), url.getPort())
style = OTPDialog.CancelOnly
else:
message = OTPLocalizer.CRNoConnectTryAgain % (url.getServer(), url.getPort())
style = OTPDialog.TwoChoice
dialogClass = OTPGlobals.getGlobalDialogClass()
self.failedToConnectBox = dialogClass(message=message, doneEvent='failedToConnectAck', text_wordwrap=18, style=style)
self.failedToConnectBox = dialogClass(message=OTPLocalizer.CRNoConnectTryAgain % (url.getServer(), url.getPort()), doneEvent='failedToConnectAck', text_wordwrap=18, style=OTPDialog.TwoChoice)
self.failedToConnectBox.show()
self.notify.info(message)
self.accept('failedToConnectAck', self.__handleFailedToConnectAck)

View file

@ -95,41 +95,22 @@ CRNoConnectProxyNoPort = 'Could not connect to %s:%s.\n\nYou are communicating t
CRNoDistrictsTryAgain = 'No Districts are available. Try again?'
CRRejectRemoveAvatar = 'The avatar was not able to be deleted, try again another time.'
CRLostConnection = 'Your internet connection to the servers has been unexpectedly broken.'
CRBootedReasons = {1: 'An unexpected problem has occurred. Your connection has been lost, but you should be able to connect again and go right back into the game.',
100: 'You have been disconnected because someone else just logged in using your account on another computer.',
120: 'You have been disconnected because of a problem with your authorization to use keyboard chat.',
122: 'Couldn\'t decode the token. Please relaunch the game from the official launcher.',
124: 'Your installed files are out of date. Please launch the game from the official launcher so that it can install updates. If you continue to get this error, contact support.',
125: 'Your installed files appear to be invalid. Please use the Play button on the official website to run.',
126: 'You are not authorized to use administrator privileges.',
127: 'A problem has occurred with your Toon. Please contact Member Services via phone or email and reference Error Code 127. Thank you.',
151: 'You have been logged out by an administrator working on the servers.',
152: "There has been a reported violation of our Terms of Use connected to '%(name)s'. For more details, please review the message sent to the e-mail address associated with '%(name)s'.",
153: 'The district you were playing on has been reset. Everyone who was playing on that district has been disconnected. However, you should be able to connect again and go right back into the game.',
154: 'Toontown United is now temporarily closed for maintenance. Everyone who was playing has been disconnected from the game.\n\nFor more information, please visit the Toontown United website.',
288: 'Sorry, you have used up all of your available minutes this month.',
349: 'Sorry, you have used up all of your available minutes this month.'}
CRBootedReasons = {100: 'You have been disconnected because someone else just logged in using your account on another computer.',
101: 'Please relaunch the game from the official launcher.',
102: 'You are not authorized to use administrator privileges.',
103: 'You were banned by a moderator.\n\nBehave next time!',
105: 'Toontown United is now temporarily closed for maintenance. Everyone who was playing has been disconnected from the game.\n\nFor more information, please visit the Toontown United website.'}
153: 'The district you were playing on has been reset. Everyone who was playing on that district has been disconnected. However, you should be able to connect again and go right back into the game.'}
CRBootedReasonUnknownCode = 'An unexpected problem has occurred (error code %s). Your connection has been lost, but you should be able to connect again and go right back into the game.'
CRTryConnectAgain = '\n\nTry to connect again?'
CRToontownUnavailable = 'The server appears to be temporarily unavailable, still trying...'
CRToontownUnavailableCancel = lCancel
CRNameCongratulations = 'CONGRATULATIONS!!'
CRNameAccepted = 'Your name has been\napproved by the Toon Council.\n\nFrom this day forth\nyou will be named\n"%s"'
CRServerDateTryAgain = 'Could not get server date from %s. Try again?'
CRMaintenanceCountdownMessage = 'Attention Toons! Toontown United will be going down for maintenance in %d minutes.'
CRMaintenanceMessage = 'Attention Toons! Toontown United is now going down for maintenance.'
AfkForceAcknowledgeMessage = 'Your toon got sleepy and went to bed.'
CREnteringToontown = 'Entering...'
LoginScreenUserName = 'Account Name'
LoginScreenPassword = 'Password'
LoginScreenLogin = 'Login'
LoginScreenQuit = lQuit
LoginScreenLoginPrompt = 'Please enter a user name and password.'
LoginScreenBadPassword = 'Bad password.\nPlease try again.'
LoginScreenInvalidUserName = 'Invalid user name.\nPlease try again.'
LoginScreenUserNameNotFound = 'User name not found.\nPlease try again or create a new account.'
LoginScreenNoNewAccounts = 'Sorry, we are not accepting new accounts at this time.'
LoginScreenTryAgain = 'Try Again'
DialogSpecial = 'ooo'
DialogExclamation = '!'
DialogQuestion = '?'
@ -707,7 +688,7 @@ SpeedChatStaticTextToontown = {100: 'Hi!',
103: 'Hey!',
104: 'Howdy!',
105: 'Hi everybody!',
106: 'Welcome to Toontown United!',
106: 'Welcome to Toontown!',
107: "What's up?",
108: 'How are you doing?',
109: 'Hello?',
@ -1752,73 +1733,6 @@ SpeedChatStaticTextToontown = {100: 'Hi!',
30451: 'Visit Green Bean Jeans and you can be green too!',
30452: "It's on Oak Street in Daisy Gardens."}
SpeedChatStaticText = SpeedChatStaticTextCommon
Emotes_Root = 'EMOTES'
Emotes_Dances = 'Dances'
Emotes_General = 'General'
Emotes_Music = 'Music'
Emotes_Expressions = 'Emotions'
Emote_MoveDenied = 'Cannot emote while moving.'
Emote_CombatDenied = 'Cannot emote while in combat.'
Emote_CannonDenied = 'Cannot emote while using a cannon.'
Emote_SwimDenied = 'Cannot emote while swimming.'
Emote_ParlorGameDenied = 'Cannot emote while playing a parlor game.'
Emotes = (60505,
60506,
60509,
60510,
60511,
60516,
60519,
60520,
60521,
60522,
60523,
60524,
60525,
60526,
60527,
60528,
60529,
60530,
60602,
60607,
60611,
60614,
60615,
60622,
60627,
60629,
60632,
60636,
60638,
60640,
60644,
60652,
60654,
60657,
60658,
60663,
60664,
60665,
60666,
60668,
60669,
60612,
60661,
60645,
60629,
60641,
60654,
60630,
60670,
60633,
60676,
60677,
65000,
65001,
60517,
60678,
60909)
SCFactoryMeetMenuIndexes = (1903,
1904,
1906,
@ -2344,7 +2258,6 @@ AvatarPanelGoTo = 'Go To'
AvatarPanelIgnore = 'Ignore'
AvatarPanelStopIgnore = 'Stop Ignoring'
AvatarPanelEndIgnore = 'End Ignore'
AvatarPanelTrade = 'Trade'
AvatarPanelCogLevel = 'Level: %s'
AvatarPanelCogDetailClose = lClose
TeleportPanelOK = lOK

View file

@ -1,635 +0,0 @@
from otp.level.EntityTypes import *
class FactoryLevelMgr(LevelMgr):
type = 'levelMgr'
attribs = (('cogLevel',
0,
'int',
{'min': 0,
'max': 11}), ('wantDoors', 1, 'bool'), ('farPlaneDistance', 1500, 'float'))
class BarrelBase(Nodepath):
abstract = 1
attribs = (('rewardPerGrab', 5, 'int'), ('rewardPerGrabMax', 0, 'int'))
class BeanBarrel(BarrelBase):
type = 'beanBarrel'
class GagBarrel(BarrelBase):
type = 'gagBarrel'
attribs = (('gagLevel',
0,
'int',
{'min': 0,
'max': 5}), ('gagLevelMax',
0,
'int',
{'min': 0,
'max': 5}), ('gagTrack',
0,
'choice',
{'choiceSet': ('heal', 'trap', 'lure', 'sound', 'throw', 'squirt', 'drop', 'random'),
'valueDict': {'heal': 0,
'trap': 1,
'lure': 2,
'sound': 3,
'throw': 4,
'squirt': 5,
'drop': 6,
'random': 'random'}}))
class HealBarrel(BarrelBase):
type = 'healBarrel'
class Switch(Nodepath):
abstract = 1
output = 'bool'
attribs = (('isOnEvent',
0,
'entId',
{'output': 'bool'}), ('isOn', 0, 'bool'), ('secondsOn', 1, 'float'))
class Button(Switch):
type = 'button'
attribs = (('scale', Vec3(3), 'scale'), ('color', Vec4(1, 1, 1, 1), 'color'))
class Trigger(Switch):
type = 'trigger'
attribs = (('scale', Vec3(10), 'scale'), ('triggerName', ''))
class ConveyorBelt(Nodepath):
type = 'conveyorBelt'
attribs = (('speed', 1.0, 'float'),
('length', 1.0, 'float'),
('widthScale', 1.0, 'float'),
('treadLength', 10.0, 'float'),
('treadModelPath', 'phase_9/models/cogHQ/platform1', 'bamfilename'),
('floorName', 'platformcollision'))
class Door(Nodepath):
type = 'door'
output = 'bool'
attribs = (('color', Vec4(1, 1, 1, 1), 'color'),
('isVisBlocker', 1, 'bool'),
('unlock0Event',
0,
'entId',
{'output': 'bool'}),
('unlock1Event',
0,
'entId',
{'output': 'bool'}),
('unlock2Event',
0,
'entId',
{'output': 'bool'}),
('unlock3Event',
0,
'entId',
{'output': 'bool'}),
('isOpenEvent',
0,
'entId',
{'output': 'bool'}),
('isLock0Unlocked', 1, 'bool'),
('isLock1Unlocked', 1, 'bool'),
('isLock2Unlocked', 1, 'bool'),
('isLock3Unlocked', 1, 'bool'),
('isOpen', 0, 'bool'),
('secondsOpen', 1, 'float'))
class Grid(Nodepath):
type = 'grid'
blockAttribs = ('hpr',)
attribs = (('cellSize', 3, 'float'), ('numCol', 3, 'int'), ('numRow', 3, 'int'))
class Crushable(Entity):
abstract = 1
attribs = (('pos', Point3(0, 0, 0), 'pos'),
('hpr', Vec3(0, 0, 0), 'hpr'),
('crushCellId',
None,
'entId',
{'type': 'crusherCell'}),
('gridId',
None,
'entId',
{'type': 'grid'}))
class Crusher(Nodepath):
abstract = 1
attribs = (('crushCellId',
None,
'entId',
{'type': 'crusherCell'}),)
class Crate(Crushable):
type = 'crate'
blockAttribs = ('hpr',)
attribs = (('modelType',
0,
'int',
{'min': 0,
'max': 1}), ('scale', 0.92, 'float'), ('pushable', 1, 'bool'))
class Goon(Crushable):
type = 'goon'
attribs = (('goonType',
'pg',
'choice',
{'choiceSet': ['pg', 'sg']}),
('strength',
5,
'int',
{'min': 0,
'max': 105}),
('velocity',
4,
'float',
{'min': 0,
'max': 10}),
('attackRadius',
15,
'float',
{'min': 1,
'max': 20}),
('scale', 1.5, 'float'),
('hFov',
70,
'float',
{'min': 0,
'max': 179}))
class GridGoon(Goon):
type = 'gridGoon'
attribs = ()
class GoonClipPlane(Nodepath):
type = 'goonClipPlane'
attribs = (('goonId',
None,
'entId',
{'type': 'goon'}),)
class ActiveCell(Nodepath):
type = 'activeCell'
attribs = (('row', 0, 'int'), ('col', 0, 'int'), ('gridId',
None,
'entId',
{'type': 'grid'}))
class CrusherCell(ActiveCell):
type = 'crusherCell'
attribs = ()
class DirectionalCell(ActiveCell):
type = 'directionalCell'
attribs = (('dir',
[0, 0],
'choice',
{'choiceSet': ['l',
'r',
'up',
'dn'],
'valueDict': {'l': [-1, 0],
'r': [1, 0],
'up': [0, 1],
'dn': [0, -1]}}),)
class GolfGreenGame(Nodepath):
type = 'golfGreenGame'
output = 'bool'
attribs = (('pos', Point3(0, 0, 0), 'pos'),
('hpr', Vec3(0, 0, 0), 'hpr'),
('cellId', 0, 'int'),
('switchId',
0,
'entId',
{'type': 'button'}),
('timeToPlay', 120, 'int'),
('puzzleBase', 4, 'int'),
('puzzlePerPlayer', 1, 'int'))
class LaserField(Nodepath):
type = 'laserField'
output = 'bool'
attribs = (('laserFactor', 3, 'float'),
('gridScaleX', 32.0, 'float'),
('gridScaleY', 32.0, 'float'),
('projector', Point3(6, 6, 25), 'pos'),
('modelPath',
0,
'choice',
{'choiceSet': ['square'],
'valueDict': {'square': 0}}),
('pos', Point3(0, 0, 0), 'pos'),
('hpr', Vec3(0, 0, 0), 'hpr'),
('cellId', 0, 'int'),
('switchId',
0,
'entId',
{'type': 'button'}),
('gridGame',
'Random',
'choice',
{'choiceSet': ['MineSweeper',
'Roll',
'Avoid',
'Random']}))
class SecurityCamera(Nodepath):
type = 'securityCamera'
attribs = (('damPow', 3, 'int'),
('radius', 5, 'float'),
('accel', 1, 'float'),
('maxVel', 5, 'float'),
('projector', Point3(6, 6, 25), 'pos'),
('modelPath',
0,
'choice',
{'choiceSet': ['square'],
'valueDict': {'square': 0}}),
('hideModel', 0, 'bool'),
('pos', Point3(0, 0, 0), 'pos'),
('hpr', Vec3(0, 0, 0), 'hpr'),
('switchId',
0,
'entId',
{'type': 'button'}),
('trackTarget1',
0,
'entId',
{'type': 'button'}),
('trackTarget2',
0,
'entId',
{'type': 'button'}),
('trackTarget3',
0,
'entId',
{'type': 'button'}))
class ElevatorMarker(Nodepath):
type = 'elevatorMarker'
attribs = (('modelPath',
0,
'choice',
{'choiceSet': ['square'],
'valueDict': {'square': 0}}), ('pos', Point3(0, 0, 0), 'pos'), ('hpr', Vec3(0, 0, 0), 'hpr'))
class Lift(Nodepath):
type = 'lift'
attribs = (('duration', 1, 'float'),
('startPos', Point3(0, 0, 0), 'pos'),
('endPos', Point3(0, 0, 0), 'pos'),
('modelPath', 'phase_9/models/cogHQ/Elevator.bam', 'bamfilename'),
('floorName', 'elevator_floor', 'string'),
('modelScale', Vec3(1), 'scale'),
('startGuardName', '', 'string'),
('endGuardName', '', 'string'),
('startBoardSides', ['front',
'back',
'left',
'right']),
('endBoardSides', ['front',
'back',
'left',
'right']),
('moveDelay',
1,
'float',
{'min': 0}),
('autoMoveDelay',
5,
'float',
{'min': 0}))
class Mover(Nodepath):
type = 'mover'
attribs = (('modelPath',
0,
'choice',
{'choiceSet': ['square'],
'valueDict': {'square': 0}}),
('pos', Point3(0, 0, 0), 'pos'),
('hpr', Vec3(0, 0, 0), 'hpr'),
('switchId',
0,
'entId',
{'type': 'button'}),
('entity2Move',
0,
'entId',
{'type': 'button'}),
('moveTarget',
0,
'entId',
{'type': 'button'}),
('pos0Move', 2, 'float'),
('pos0Wait', 2, 'float'),
('pos1Move', 2, 'float'),
('pos1Wait', 2, 'float'),
('startOn', 0, 'bool'),
('cycleType',
'return',
'choice',
{'choiceSet': ['return',
'linear',
'loop',
'oneWay']}))
class Platform(Nodepath):
type = 'platform'
attribs = (('modelPath', 'phase_9/models/cogHQ/platform1', 'bamfilename'),
('modelScale', Vec3(1, 1, 1), 'scale'),
('floorName', 'platformcollision', 'string'),
('offset', Point3(0, 0, 0), 'pos'),
('period', 2, 'float'),
('waitPercent',
0.1,
'float',
{'min': 0,
'max': 1}),
('phaseShift',
0.0,
'float',
{'min': 0,
'max': 1}),
('motion',
'noBlend',
'choice',
{'choiceSet': ['noBlend',
'easeInOut',
'easeIn',
'easeOut']}))
class SinkingPlatform(Nodepath):
type = 'sinkingPlatform'
attribs = (('verticalRange', 1, 'float'),
('sinkDuration', 1, 'float'),
('pauseBeforeRise', 1, 'float'),
('riseDuration', 1, 'float'))
class Stomper(Crusher):
type = 'stomper'
attribs = (('damage', 3, 'int'),
('style',
'vertical',
'choice',
{'choiceSet': ['horizontal', 'vertical']}),
('period', 2.0, 'float'),
('phaseShift',
0.0,
'float',
{'min': 0,
'max': 1}),
('range', 6, 'float'),
('motion',
3,
'choice',
{'choiceSet': ['linear',
'sinus',
'half sinus',
'slow fast',
'crush',
'switched'],
'valueDict': {'linear': 0,
'sinus': 1,
'half sinus': 2,
'slow fast': 3,
'crush': 4,
'switched': 5}}),
('headScale', Vec3(1, 1, 1), 'scale'),
('shaftScale', Vec3(1, 1, 1), 'scale'),
('wantSmoke', 1, 'bool'),
('wantShadow', 1, 'bool'),
('animateShadow', 1, 'bool'),
('soundOn', 0, 'bool'),
('soundPath',
0,
'choice',
{'choiceSet': ['small', 'medium', 'large'],
'valueDict': {'small': 0,
'medium': 1,
'large': 2}}),
('soundLen', 0, 'float'),
('zOffset', 0, 'float'),
('switchId',
0,
'entId',
{'type': 'button'}),
('modelPath',
0,
'choice',
{'choiceSet': ['square'],
'valueDict': {'square': 0}}),
('cogStyle',
0,
'choice',
{'choiceSet': ['default', 'lawbot'],
'valueDict': {'default': 0,
'lawbot': 1}}),
('removeHeadFloor', 0, 'bool'),
('removeCamBarrierCollisions', 0, 'bool'))
class StomperPair(Nodepath):
type = 'stomperPair'
attribs = (('headScale', Vec3(1, 1, 1), 'scale'),
('motion',
3,
'choice',
{'choiceSet': ['linear',
'sinus',
'half sinus',
'slow fast',
'crush',
'switched'],
'valueDict': {'linear': 0,
'sinus': 1,
'half sinus': 2,
'slow fast': 3,
'crush': 4,
'switched': 5}}),
('period', 2.0, 'float'),
('phaseShift',
0.0,
'float',
{'min': 0,
'max': 1}),
('range', 6, 'float'),
('shaftScale', Vec3(1, 1, 1), 'scale'),
('soundLen', 0, 'float'),
('soundOn', 0, 'bool'),
('stomperIds',
[],
'entId',
{'type': 'stomper',
'num': 2}),
('style',
'horizontal',
'choice',
{'choiceSet': ['horizontal', 'vertical']}))
class Gear(Nodepath):
type = 'gear'
attribs = (('modelType',
'factory',
'choice',
{'choiceSet': ['factory', 'mint']}),
('gearScale', 1, 'float'),
('orientation',
'horizontal',
'choice',
{'choiceSet': ['horizontal', 'vertical']}),
('degreesPerSec', 0, 'float'),
('phaseShift',
0,
'float',
{'min': 0,
'max': 1}))
class BattleBlocker(Nodepath):
type = 'battleBlocker'
attribs = (('radius', 10, 'float'), ('cellId', 0, 'int'))
class PaintMixer(Platform):
type = 'paintMixer'
attribs = (('modelPath', 'phase_9/models/cogHQ/PaintMixer', 'const'), ('floorName', 'PaintMixerFloorCollision', 'const'), ('shaftScale', 1, 'float'))
class MintProduct(Nodepath):
type = 'mintProduct'
attribs = (('mintId',
12500,
'choice',
{'choiceSet': ('coin', 'dollar', 'bullion'),
'valueDict': {'coin': 12500,
'dollar': 12600,
'bullion': 12700}}),)
class MintProductPallet(Nodepath):
type = 'mintProductPallet'
attribs = (('mintId',
12500,
'choice',
{'choiceSet': ('coin', 'dollar', 'bullion'),
'valueDict': {'coin': 12500,
'dollar': 12600,
'bullion': 12700}}),)
class MintShelf(Nodepath):
type = 'mintShelf'
attribs = (('mintId',
12500,
'choice',
{'choiceSet': ('coin', 'dollar', 'bullion'),
'valueDict': {'coin': 12500,
'dollar': 12600,
'bullion': 12700}}),)
class PathMaster(Nodepath):
type = 'pathMaster'
attribs = (('pathIndex', 0, 'int'),
('pathScale', 1.0, 'float'),
('pathTarget0',
0,
'entId',
{'type': 'button'}),
('pathTarget1',
0,
'entId',
{'type': 'button'}),
('pathTarget2',
0,
'entId',
{'type': 'button'}),
('pathTarget3',
0,
'entId',
{'type': 'button'}),
('pathTarget4',
0,
'entId',
{'type': 'button'}),
('pathTarget5',
0,
'entId',
{'type': 'button'}),
('pathTarget6',
0,
'entId',
{'type': 'button'}),
('pathTarget7',
0,
'entId',
{'type': 'button'}))
class Rendering(Nodepath):
type = 'rendering'
attribs = (('pos', Point3(0, 0, 0), 'pos'),
('hpr', Vec3(0, 0, 0), 'hpr'),
('colorR', 1.0, 'float'),
('colorG', 1.0, 'float'),
('colorB', 1.0, 'float'),
('colorA', 1.0, 'float'),
('blending',
'Normal',
'choice',
{'choiceSet': ['Normal', 'Additive', 'Alpha']}),
('fogOn', 0, 'bool'),
('renderBin',
'default',
'choice',
{'choiceSet': ['default', 'fixed', 'transparent']}))
class MoleField(Nodepath):
type = 'moleField'
attribs = (('numSquaresX', 5, 'int'),
('numSquaresY', 5, 'int'),
('spacingX', 5.0, 'float'),
('spacingY', 5.0, 'float'),
('timeToPlay', 60, 'int'),
('molesBase', 4, 'int'),
('molesPerPlayer', 1, 'int'))
class Maze(Nodepath):
type = 'maze'
attribs = (('numSections', 4, 'int'),)

View file

@ -1,4 +0,0 @@
from SpecImports import *
BattleCells = {}
CogData = []
ReserveCogData = []

File diff suppressed because it is too large Load diff

View file

@ -1,40 +0,0 @@
from direct.showbase.PythonUtil import invertDict
from toontown.coghq import LabotOfficeFloor_01a_Cogs
from toontown.coghq import LabotOfficeFloor_01b_Cogs
from toontown.coghq import NullCogs
from toontown.toonbase import ToontownGlobals
def getLawOfficeFloorSpecModule(floorId):
return LawbotOfficeSpecModules[floorId]
def getCogSpecModule(floorId):
floor = LawbotOfficeFloorId2FloorName[roomId]
return CogSpecModules.get(floorId, NullCogs)
def getNumBattles(floorId):
return floorId2numBattles[floorId]
LawbotOfficeFloorId2FloorName = {
0: 'LabotOfficeFloor_01_a',
1: 'LabotOfficeFloor_01_b' }
LawbotOfficeFloorName2FloorId = invertDict(LawbotOfficeFloorId2FloorName)
LawbotOfficeEntranceIDs = (0, 1)
LawbotOfficeFloorIDs = (0, 1)
LawbotOfficeSpecModules = {}
for roomName, roomId in LawbotOfficeFloorName2FloorId.items():
LawbotOfficeSpecModules[roomId] = __import__('toontown.coghq.' + roomName)
CogSpecModules = {
'CashbotMintBoilerRoom_Battle00': LabotOfficeFloor_01a_Cogs,
'CashbotMintBoilerRoom_Battle01': LabotOfficeFloor_01b_Cogs }
floorId2numBattles = { }
for (roomName, roomId) in LawbotOfficeFloorName2FloorId.items():
if roomName not in CogSpecModules:
floorId2numBattles[roomId] = 0
continue
cogSpecModule = CogSpecModules[roomName]
floorId2numBattles[roomId] = len(cogSpecModule.BattleCells)

View file

@ -1,549 +0,0 @@
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

@ -139,8 +139,7 @@ Headquarters = 'Headquarters'
SellbotFrontEntrance = 'Front Entrance'
SellbotSideEntrance = 'Side Entrance'
Office = 'Office'
FactoryNames = {0: 'Factory Mockup',
11500: 'Sellbot Cog Factory',
FactoryNames = {11500: 'Sellbot Cog Factory',
11600: 'Sellbot Cog Megacorp',
13300: 'Lawbot Cog Office'}
FactoryTypeLeg = 'Leg'

View file

@ -245,8 +245,6 @@ def dept2cogHQ(dept):
's': SellbotHQ}
return dept2hq[dept]
MockupFactoryId = 0
MintNumFloors = {CashbotMintIntA: 20,
CashbotMintIntB: 20,
CashbotMintIntC: 20}
@ -293,8 +291,7 @@ FT_FullSuit = 'fullSuit'
FT_Leg = 'leg'
FT_Arm = 'arm'
FT_Torso = 'torso'
factoryId2factoryType = {MockupFactoryId: FT_FullSuit,
SellbotFactoryInt: FT_FullSuit,
factoryId2factoryType = {SellbotFactoryInt: FT_FullSuit,
SellbotMegaCorpInt: FT_FullSuit,
LawbotOfficeInt: FT_FullSuit}
StreetNames = TTLocalizer.GlobalStreetNames

View file

@ -975,7 +975,7 @@ class ClientServicesManagerUD(DistributedObjectGlobalUD):
connId,
self.air.ourChannel,
CLIENTAGENT_EJECT)
datagram.addUint16(122)
datagram.addUint16(101)
datagram.addString(reason)
self.air.send(datagram)