sneedgroup-holder/oldschool-toontown
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #63 from Toonfisch/bugfix

Browse source 
general: Fix enum starting positions
This commit is contained in:
Little Cat 2022-12-10 19:18:06 -04:00 committed by GitHub
commit 3addd67421
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
23 changed files with 43 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
otp/distributed/OTPClientRepository.py
View file

@ -47,7 +47,7 @@ class OTPClientRepository(ClientRepositoryBase):
WishNameResult = IntEnum('WishNameResult', ('Failure', WishNameResult = IntEnum('WishNameResult', ('Failure',
'PendingApproval', 'PendingApproval',
'Approved', 'Approved',
'Rejected')) 'Rejected'), start=0)
def __init__(self, serverVersion, launcher = None, playGame = None): def __init__(self, serverVersion, launcher = None, playGame = None):
ClientRepositoryBase.__init__(self) ClientRepositoryBase.__init__(self)

12
toontown/cogdominium/CogdoFlyingGameGlobals.py
View file

@ -2,7 +2,7 @@ from pandac.PandaModules import VBase4, Vec3, Point3
from .CogdoUtil import VariableContainer, DevVariableContainer from .CogdoUtil import VariableContainer, DevVariableContainer
from enum import IntEnum from enum import IntEnum
AI = VariableContainer() AI = VariableContainer()
AI.GameActions = IntEnum('GameActions', ('LandOnWinPlatform', 'WinStateFinished', 'GotoWinState', 'HitWhirlwind', 'HitLegalEagle', 'HitMinion', 'DebuffInvul', 'RequestEnterEagleInterest', 'RequestExitEagleInterest', 'RanOutOfTimePenalty', 'Died', 'Spawn', 'SetBlades', 'BladeLost')) AI.GameActions = IntEnum('GameActions', ('LandOnWinPlatform', 'WinStateFinished', 'GotoWinState', 'HitWhirlwind', 'HitLegalEagle', 'HitMinion', 'DebuffInvul', 'RequestEnterEagleInterest', 'RequestExitEagleInterest', 'RanOutOfTimePenalty', 'Died', 'Spawn', 'SetBlades', 'BladeLost'), start=0)
AI.BroadcastPeriod = 0.3 AI.BroadcastPeriod = 0.3
AI.SafezoneId2DeathDamage = {2000: 1, AI.SafezoneId2DeathDamage = {2000: 1,
1000: 2, 1000: 2,
@ -106,7 +106,7 @@ Gameplay.DepleteFuelStates = ['FlyingUp']
Gameplay.FuelNormalAmt = 1.0 Gameplay.FuelNormalAmt = 1.0
Gameplay.FuelLowAmt = 0.66 Gameplay.FuelLowAmt = 0.66
Gameplay.FuelVeryLowAmt = 0.33 Gameplay.FuelVeryLowAmt = 0.33
Gameplay.FuelStates = IntEnum('FuelStates', ('FuelNoPropeller', 'FuelEmpty', 'FuelVeryLow', 'FuelLow', 'FuelNormal')) Gameplay.FuelStates = IntEnum('FuelStates', ('FuelNoPropeller', 'FuelEmpty', 'FuelVeryLow', 'FuelLow', 'FuelNormal'), start=0)
Gameplay.RefuelPropSpeed = 5.0 Gameplay.RefuelPropSpeed = 5.0
Gameplay.OverdrivePropSpeed = 2.5 Gameplay.OverdrivePropSpeed = 2.5
Gameplay.NormalPropSpeed = 1.5 Gameplay.NormalPropSpeed = 1.5
@ -116,7 +116,7 @@ Gameplay.TargetedWarningBlinkTime = 3.0
Gameplay.HitKnockbackDist = 15.0 Gameplay.HitKnockbackDist = 15.0
Gameplay.HitKnockbackTime = 0.5 Gameplay.HitKnockbackTime = 0.5
Gameplay.HitCooldownTime = 2.0 Gameplay.HitCooldownTime = 2.0
Gameplay.BackpackStates = IntEnum('BackpackStates', ('Normal', 'Targeted', 'Attacked', 'Refuel')) Gameplay.BackpackStates = IntEnum('BackpackStates', ('Normal', 'Targeted', 'Attacked', 'Refuel'), start=0)
Gameplay.BackpackRefuelDuration = 4.0 Gameplay.BackpackRefuelDuration = 4.0
Gameplay.BackpackState2TextureName = {Gameplay.BackpackStates.Normal: 'tt_t_ara_cfg_propellerPack', Gameplay.BackpackState2TextureName = {Gameplay.BackpackStates.Normal: 'tt_t_ara_cfg_propellerPack',
Gameplay.BackpackStates.Targeted: 'tt_t_ara_cfg_propellerPack_eagleTarget', Gameplay.BackpackStates.Targeted: 'tt_t_ara_cfg_propellerPack_eagleTarget',
@ -200,9 +200,9 @@ Audio.SfxFiles = {'propeller': 'phase_4/audio/sfx/TB_propeller.ogg',
'cogDialogue': 'phase_3.5/audio/dial/COG_VO_statement.ogg', 'cogDialogue': 'phase_3.5/audio/dial/COG_VO_statement.ogg',
'toonDialogue': 'phase_3.5/audio/dial/AV_dog_long.ogg'} 'toonDialogue': 'phase_3.5/audio/dial/AV_dog_long.ogg'}
Level = VariableContainer() Level = VariableContainer()
Level.GatherableTypes = IntEnum('GatherableTypes', ('Memo', 'Propeller', 'LaffPowerup', 'InvulPowerup')) Level.GatherableTypes = IntEnum('GatherableTypes', ('Memo', 'Propeller', 'LaffPowerup', 'InvulPowerup'), start=0)
Level.ObstacleTypes = IntEnum('ObstacleTypes', ('Whirlwind', 'Fan', 'Minion')) Level.ObstacleTypes = IntEnum('ObstacleTypes', ('Whirlwind', 'Fan', 'Minion'), start=0)
Level.PlatformTypes = IntEnum('PlatformTypes', ('Platform', 'StartPlatform', 'EndPlatform')) Level.PlatformTypes = IntEnum('PlatformTypes', ('Platform', 'StartPlatform', 'EndPlatform'), start=0)
Level.PlatformType2SpawnOffset = {Level.PlatformTypes.Platform: 2.5, Level.PlatformType2SpawnOffset = {Level.PlatformTypes.Platform: 2.5,
Level.PlatformTypes.StartPlatform: 5.0, Level.PlatformTypes.StartPlatform: 5.0,
Level.PlatformTypes.EndPlatform: 5.0} Level.PlatformTypes.EndPlatform: 5.0}

2
toontown/cogdominium/CogdoFlyingLocalPlayer.py
View file

@ -27,7 +27,7 @@ class CogdoFlyingLocalPlayer(CogdoFlyingPlayer):
BroadcastPosTask = 'CogdoFlyingLocalPlayerBroadcastPos' BroadcastPosTask = 'CogdoFlyingLocalPlayerBroadcastPos'
PlayWaitingMusicEventName = 'PlayWaitingMusicEvent' PlayWaitingMusicEventName = 'PlayWaitingMusicEvent'
RanOutOfTimeEventName = 'RanOutOfTimeEvent' RanOutOfTimeEventName = 'RanOutOfTimeEvent'
PropStates = IntEnum('PropStates', ('Normal', 'Overdrive', 'Off')) PropStates = IntEnum('PropStates', ('Normal', 'Overdrive', 'Off'), start=0)
def __init__(self, toon, game, level, guiMgr): def __init__(self, toon, game, level, guiMgr):
CogdoFlyingPlayer.__init__(self, toon) CogdoFlyingPlayer.__init__(self, toon)

2
toontown/cogdominium/CogdoFlyingObstacles.py
View file

@ -90,7 +90,7 @@ class CogdoFlyingObtacleFactory:
class CogdoFlyingObstacle(DirectObject): class CogdoFlyingObstacle(DirectObject):
EnterEventName = 'CogdoFlyingObstacle_Enter' EnterEventName = 'CogdoFlyingObstacle_Enter'
ExitEventName = 'CogdoFlyingObstacle_Exit' ExitEventName = 'CogdoFlyingObstacle_Exit'
MotionTypes = IntEnum('MotionTypes', ('BackForth', 'Loop')) MotionTypes = IntEnum('MotionTypes', ('BackForth', 'Loop'), start=0)
def __init__(self, type, index, model, collSolid, motionPath = None, motionPattern = None, blendMotion = True, instanceModel = True): def __init__(self, type, index, model, collSolid, motionPath = None, motionPattern = None, blendMotion = True, instanceModel = True):
self.type = type self.type = type

4
toontown/cogdominium/CogdoMazeGameGlobals.py
View file

@ -4,7 +4,7 @@ GameActions = IntEnum('GameActions', ('EnterDoor',
'RevealDoor', 'RevealDoor',
'OpenDoor', 'OpenDoor',
'Countdown', 'Countdown',
'TimeAlert')) 'TimeAlert'), start=0)
SecondsUntilTimeout = 4.0 * 60.0 SecondsUntilTimeout = 4.0 * 60.0
SecondsUntilGameEnds = 60.0 SecondsUntilGameEnds = 60.0
SecondsForTimeAlert = 60.0 SecondsForTimeAlert = 60.0
@ -81,7 +81,7 @@ PickupsUntilDoorOpens = int(NumPickups * 0.6)
SuitCollisionName = 'CogdoMazeSuit_Collision' SuitCollisionName = 'CogdoMazeSuit_Collision'
SuitWalkSameDirectionProb = 1 SuitWalkSameDirectionProb = 1
SuitWalkTurnAroundProb = 100 SuitWalkTurnAroundProb = 100
SuitTypes = IntEnum('SuitTypes', ('Boss', 'FastMinion', 'SlowMinion')) SuitTypes = IntEnum('SuitTypes', ('Boss', 'FastMinion', 'SlowMinion'), start=0)
SuitData = {} SuitData = {}
SuitData[SuitTypes.Boss] = {'dnaName': 'ms', SuitData[SuitTypes.Boss] = {'dnaName': 'ms',
'cellWalkPeriod': 192, 'cellWalkPeriod': 192,

2
toontown/coghq/CogDisguiseGlobals.py
View file

@ -428,7 +428,7 @@ PartsQueryNames = ({1: PartNameStrings[0],
16384: PartNameStrings[14], 16384: PartNameStrings[14],
32768: PartNameStrings[15], 32768: PartNameStrings[15],
65536: PartNameStrings[15]}) 65536: PartNameStrings[15]})
suitTypes = IntEnum('suitTypes', ('NoSuit', 'NoMerits', 'FullSuit')) suitTypes = IntEnum('suitTypes', ('NoSuit', 'NoMerits', 'FullSuit'), start=0)
def getNextPart(parts, partIndex, dept): def getNextPart(parts, partIndex, dept):
dept = dept2deptIndex(dept) dept = dept2deptIndex(dept)

2
toontown/effects/DustCloud.py
View file

@ -3,7 +3,7 @@ from direct.interval.IntervalGlobal import *
from toontown.battle.BattleProps import globalPropPool from toontown.battle.BattleProps import globalPropPool
from direct.directnotify import DirectNotifyGlobal from direct.directnotify import DirectNotifyGlobal
from enum import IntEnum from enum import IntEnum
SFX = IntEnum('SFX', ('poof', 'magic')) SFX = IntEnum('SFX', ('poof', 'magic'), start=0)
SFXPATHS = {SFX.poof: 'phase_4/audio/sfx/firework_distance_02.ogg', SFXPATHS = {SFX.poof: 'phase_4/audio/sfx/firework_distance_02.ogg',
SFX.magic: 'phase_4/audio/sfx/SZ_DD_treasure.ogg'} SFX.magic: 'phase_4/audio/sfx/SZ_DD_treasure.ogg'}

2
toontown/minigame/MazeMapGui.py
View file

@ -6,7 +6,7 @@ from enum import IntEnum
DEFAULT_MASK_RESOLUTION = 32 DEFAULT_MASK_RESOLUTION = 32
DEFAULT_RADIUS_RATIO = 0.05 DEFAULT_RADIUS_RATIO = 0.05
MAP_RESOLUTION = 320 MAP_RESOLUTION = 320
MazeRevealType = IntEnum('MazeRevealType', ('SmoothCircle', 'HardCircle', 'Square')) MazeRevealType = IntEnum('MazeRevealType', ('SmoothCircle', 'HardCircle', 'Square'), start=0)
MAZE_REVEAL_TYPE = MazeRevealType.SmoothCircle MAZE_REVEAL_TYPE = MazeRevealType.SmoothCircle
class MazeMapGui(DirectFrame): class MazeMapGui(DirectFrame):

2
toontown/parties/DistributedPartyDanceActivityBase.py
View file

@ -18,7 +18,7 @@ from toontown.parties.KeyCodesGui import KeyCodesGui
from toontown.parties import PartyGlobals from toontown.parties import PartyGlobals
from enum import IntEnum from enum import IntEnum
DANCE_FLOOR_COLLISION = 'danceFloor_collision' DANCE_FLOOR_COLLISION = 'danceFloor_collision'
DanceViews = IntEnum('DanceViews', ('Normal', 'Dancing', 'Isometric')) DanceViews = IntEnum('DanceViews', ('Normal', 'Dancing', 'Isometric'), start=0)
class DistributedPartyDanceActivityBase(DistributedPartyActivity): class DistributedPartyDanceActivityBase(DistributedPartyActivity):
notify = directNotify.newCategory('DistributedPartyDanceActivity') notify = directNotify.newCategory('DistributedPartyDanceActivity')

24
toontown/parties/PartyGlobals.py
View file

@ -41,35 +41,35 @@ AvailableGridSquares = 202
TrashCanPosition = (-0.24, 0.0, -0.65) TrashCanPosition = (-0.24, 0.0, -0.65)
TrashCanScale = 0.7 TrashCanScale = 0.7
PartyEditorTrashBounds = ((-0.16, -0.38), (-0.05, -0.56)) PartyEditorTrashBounds = ((-0.16, -0.38), (-0.05, -0.56))
ActivityRequestStatus = IntEnum('ActivityRequestStatus', ('Joining', 'Exiting')) ActivityRequestStatus = IntEnum('ActivityRequestStatus', ('Joining', 'Exiting'), start=0)
InviteStatus = IntEnum('InviteStatus', ('NotRead', InviteStatus = IntEnum('InviteStatus', ('NotRead',
'ReadButNotReplied', 'ReadButNotReplied',
'Accepted', 'Accepted',
'Rejected')) 'Rejected'), start=0)
InviteTheme = IntEnum('InviteTheme', ('Birthday', InviteTheme = IntEnum('InviteTheme', ('Birthday',
'GenericMale', 'GenericMale',
'GenericFemale', 'GenericFemale',
'Racing', 'Racing',
'Valentoons', 'Valentoons',
'VictoryParty', 'VictoryParty',
'Winter')) 'Winter'), start=0)
PartyStatus = IntEnum('PartyStatus', ('Pending', PartyStatus = IntEnum('PartyStatus', ('Pending',
'Cancelled', 'Cancelled',
'Finished', 'Finished',
'CanStart', 'CanStart',
'Started', 'Started',
'NeverStarted')) 'NeverStarted'), start=0)
AddPartyErrorCode = IntEnum('AddPartyErrorCode', ('AllOk', AddPartyErrorCode = IntEnum('AddPartyErrorCode', ('AllOk',
'ValidationError', 'ValidationError',
'DatabaseError', 'DatabaseError',
'TooManyHostedParties')) 'TooManyHostedParties'), start=0)
ChangePartyFieldErrorCode = IntEnum('ChangePartyFieldErrorCode', ('AllOk', ChangePartyFieldErrorCode = IntEnum('ChangePartyFieldErrorCode', ('AllOk',
'ValidationError', 'ValidationError',
'DatabaseError', 'DatabaseError',
'AlreadyStarted', 'AlreadyStarted',
'AlreadyRefunded')) 'AlreadyRefunded'), start=0)
ActivityTypes = IntEnum('ActivityTypes', ('HostInitiated', 'GuestInitiated', 'Continuous')) ActivityTypes = IntEnum('ActivityTypes', ('HostInitiated', 'GuestInitiated', 'Continuous'), start=0)
PartyGateDenialReasons = IntEnum('PartyGateDenialReasons', ('Unavailable', 'Full')) PartyGateDenialReasons = IntEnum('PartyGateDenialReasons', ('Unavailable', 'Full'), start=0)
ActivityIds = IntEnum('ActivityIds', ('PartyJukebox', ActivityIds = IntEnum('ActivityIds', ('PartyJukebox',
'PartyCannon', 'PartyCannon',
'PartyTrampoline', 'PartyTrampoline',
@ -89,7 +89,7 @@ ActivityIds = IntEnum('ActivityIds', ('PartyJukebox',
'PartyValentineDance20', 'PartyValentineDance20',
'PartyValentineJukebox', 'PartyValentineJukebox',
'PartyValentineJukebox40', 'PartyValentineJukebox40',
'PartyValentineTrampoline')) 'PartyValentineTrampoline'), start=0)
PartyEditorActivityOrder = [ActivityIds.PartyCog, PartyEditorActivityOrder = [ActivityIds.PartyCog,
ActivityIds.PartyWinterCog, ActivityIds.PartyWinterCog,
ActivityIds.PartyJukebox, ActivityIds.PartyJukebox,
@ -156,7 +156,7 @@ DecorationIds = IntEnum('DecorationIds', ('BalloonAnvil',
'CogStatueWinter', 'CogStatueWinter',
'snowman', 'snowman',
'snowDoodle', 'snowDoodle',
'BalloonAnvilValentine')) 'BalloonAnvilValentine'), start=0)
DECORATION_VOLUME = 1.0 DECORATION_VOLUME = 1.0
DECORATION_CUTOFF = 45 DECORATION_CUTOFF = 45
VictoryPartyDecorationIds = frozenset([DecorationIds.Hydra, VictoryPartyDecorationIds = frozenset([DecorationIds.Hydra,
@ -181,7 +181,7 @@ GoToPartyStatus = IntEnum('GoToPartyStatus', ('AllowedToGo',
'PartyFull', 'PartyFull',
'PrivateParty', 'PrivateParty',
'PartyOver', 'PartyOver',
'PartyNotActive')) 'PartyNotActive'), start=0)
PlayGroundToPartyClockColors = {'the_burrrgh': (53.0 / 255.0, PlayGroundToPartyClockColors = {'the_burrrgh': (53.0 / 255.0,
116.0 / 255.0, 116.0 / 255.0,
148.0 / 255.0, 148.0 / 255.0,
@ -733,7 +733,7 @@ DanceReverseLoopAnims = ['left',
ToonDancingStates = IntEnum('ToonDancingStates', ('Init', ToonDancingStates = IntEnum('ToonDancingStates', ('Init',
'DanceMove', 'DanceMove',
'Run', 'Run',
'Cleanup')) 'Cleanup'), start=0)
JUKEBOX_TIMEOUT = 30.0 JUKEBOX_TIMEOUT = 30.0
MUSIC_PATH = 'phase_%s/audio/bgm/' MUSIC_PATH = 'phase_%s/audio/bgm/'
MUSIC_MIN_LENGTH_SECONDS = 50.0 MUSIC_MIN_LENGTH_SECONDS = 50.0

2
toontown/pets/Pet.py
View file

@ -29,7 +29,7 @@ Component2IconDict = {'boredom': 'Bored',
class Pet(Avatar.Avatar): class Pet(Avatar.Avatar):
notify = DirectNotifyGlobal.directNotify.newCategory('Pet') notify = DirectNotifyGlobal.directNotify.newCategory('Pet')
SerialNum = 0 SerialNum = 0
Interactions = IntEnum('Interactions', ('SCRATCH', 'BEG', 'EAT', 'NEUTRAL')) Interactions = IntEnum('Interactions', ('SCRATCH', 'BEG', 'EAT', 'NEUTRAL'), start=0)
InteractAnims = {Interactions.SCRATCH: ('toPet', 'pet', 'fromPet'), InteractAnims = {Interactions.SCRATCH: ('toPet', 'pet', 'fromPet'),
Interactions.BEG: ('toBeg', 'beg', 'fromBeg'), Interactions.BEG: ('toBeg', 'beg', 'fromBeg'),
Interactions.EAT: ('eat', 'swallow', 'neutral'), Interactions.EAT: ('eat', 'swallow', 'neutral'),

2
toontown/pets/PetConstants.py
View file

@ -24,7 +24,7 @@ HungerChaseToonScale = 1.2
FleeFromOwnerScale = 0.5 FleeFromOwnerScale = 0.5
GettingAttentionGoalScale = 1.2 GettingAttentionGoalScale = 1.2
GettingAttentionGoalScaleDur = 7.0 GettingAttentionGoalScaleDur = 7.0
AnimMoods = IntEnum('AnimMoods', ('EXCITED', 'SAD', 'NEUTRAL')) AnimMoods = IntEnum('AnimMoods', ('EXCITED', 'SAD', 'NEUTRAL'), start=0)
FwdSpeed = 12.0 FwdSpeed = 12.0
RotSpeed = 360.0 RotSpeed = 360.0
_HappyMult = 1.0 _HappyMult = 1.0

4
toontown/pets/PetTraits.py
View file

@ -24,8 +24,8 @@ def gaussian(min, max, rng):
class TraitDistribution: class TraitDistribution:
TraitQuality = IntEnum('TraitQuality', ('VERY_BAD', 'BAD', 'AVERAGE', 'GOOD', 'VERY_GOOD')) TraitQuality = IntEnum('TraitQuality', ('VERY_BAD', 'BAD', 'AVERAGE', 'GOOD', 'VERY_GOOD'), start=0)
TraitTypes = IntEnum('TraitTypes', ('INCREASING', 'DECREASING')) TraitTypes = IntEnum('TraitTypes', ('INCREASING', 'DECREASING'), start=0)
Sz2MinMax = None Sz2MinMax = None
TraitType = None TraitType = None
TraitCutoffs = {TraitTypes.INCREASING: {TraitQuality.VERY_BAD: 0.1, TraitCutoffs = {TraitTypes.INCREASING: {TraitQuality.VERY_BAD: 0.1,

2
toontown/pets/PetTricks.py
View file

@ -2,7 +2,7 @@ from direct.showbase.PythonUtil import invertDictLossless
from direct.interval.IntervalGlobal import * from direct.interval.IntervalGlobal import *
import random import random
from enum import IntEnum from enum import IntEnum
Tricks = IntEnum('Tricks', ('JUMP', 'BEG', 'PLAYDEAD', 'ROLLOVER', 'BACKFLIP', 'DANCE', 'SPEAK', 'BALK')) Tricks = IntEnum('Tricks', ('JUMP', 'BEG', 'PLAYDEAD', 'ROLLOVER', 'BACKFLIP', 'DANCE', 'SPEAK', 'BALK'), start=0)
NonHappyMinActualTrickAptitude = 0.1 NonHappyMinActualTrickAptitude = 0.1
NonHappyMaxActualTrickAptitude = 0.6 NonHappyMaxActualTrickAptitude = 0.6
MinActualTrickAptitude = 0.5 MinActualTrickAptitude = 0.5

6
toontown/racing/KartDNA.py
View file

@ -6,10 +6,10 @@ from enum import IntEnum
if (__debug__): if (__debug__):
import pdb import pdb
import copy import copy
KartDNA = IntEnum('KartDNA', ('bodyType', 'bodyColor', 'accColor', 'ebType', 'spType', 'fwwType', 'bwwType', 'rimsType', 'decalType')) KartDNA = IntEnum('KartDNA', ('bodyType', 'bodyColor', 'accColor', 'ebType', 'spType', 'fwwType', 'bwwType', 'rimsType', 'decalType'), start=0)
InvalidEntry = -1 InvalidEntry = -1
KartInfo = IntEnum('KartInfo', ('name', 'model', 'cost', 'viewDist', 'decalId', 'LODmodel1', 'LODmodel2')) KartInfo = IntEnum('KartInfo', ('name', 'model', 'cost', 'viewDist', 'decalId', 'LODmodel1', 'LODmodel2'), start=0)
AccInfo = IntEnum('AccInfo', ('name', 'model', 'cost', 'texCard', 'attach')) AccInfo = IntEnum('AccInfo', ('name', 'model', 'cost', 'texCard', 'attach'), start=0)
kNames = TTLocalizer.KartDNA_KartNames kNames = TTLocalizer.KartDNA_KartNames
KartDict = {0: (kNames[0], KartDict = {0: (kNames[0],
'phase_6/models/karting/Kart1_Final', 'phase_6/models/karting/Kart1_Final',

2
toontown/racing/KartShopGlobals.py
View file

@ -15,7 +15,7 @@ class KartGlobals:
COUNTDOWN_TIME = 30 COUNTDOWN_TIME = 30
BOARDING_TIME = 10.0 BOARDING_TIME = 10.0
ENTER_RACE_TIME = 6.0 ENTER_RACE_TIME = 6.0
ERROR_CODE = IntEnum('ERROR_CODE', ('success', 'eGeneric', 'eTickets', 'eBoardOver', 'eNoKart', 'eOccupied', 'eTrackClosed', 'eTooLate', 'eUnpaid')) ERROR_CODE = IntEnum('ERROR_CODE', ('success', 'eGeneric', 'eTickets', 'eBoardOver', 'eNoKart', 'eOccupied', 'eTrackClosed', 'eTooLate', 'eUnpaid'), start=0)
FRONT_LEFT_SPOT = 0 FRONT_LEFT_SPOT = 0
FRONT_RIGHT_SPOT = 1 FRONT_RIGHT_SPOT = 1
REAR_LEFT_SPOT = 2 REAR_LEFT_SPOT = 2

2
toontown/racing/KartShopGui.py
View file

@ -16,7 +16,7 @@ from toontown.toontowngui.TeaserPanel import TeaserPanel
from enum import IntEnum from enum import IntEnum
if (__debug__): if (__debug__):
import pdb import pdb
MENUS = IntEnum('MENUS', ('MainMenu, BuyKart, BuyAccessory, ReturnKart, ConfirmBuyAccessory, ConfirmBuyKart, BoughtKart, BoughtAccessory, TeaserPanel')) MENUS = IntEnum('MENUS', ('MainMenu, BuyKart, BuyAccessory, ReturnKart, ConfirmBuyAccessory, ConfirmBuyKart, BoughtKart, BoughtAccessory, TeaserPanel'), start=0)
MM_OPTIONS = IntEnum('MM_OPTIONS', ('Cancel, BuyAccessory, BuyKart'), start=-1) MM_OPTIONS = IntEnum('MM_OPTIONS', ('Cancel, BuyAccessory, BuyKart'), start=-1)
BK_OPTIONS = IntEnum('BK_OPTIONS', ('Cancel, BuyKart'), start=-1) BK_OPTIONS = IntEnum('BK_OPTIONS', ('Cancel, BuyKart'), start=-1)
BA_OPTIONS = IntEnum('BA_OPTIONS', ('Cancel, BuyAccessory'), start=-1) BA_OPTIONS = IntEnum('BA_OPTIONS', ('Cancel, BuyAccessory'), start=-1)

2
toontown/safezone/DistributedPicnicBasket.py
View file

@ -19,7 +19,7 @@ from toontown.battle.BattleSounds import *
from enum import IntEnum from enum import IntEnum
class DistributedPicnicBasket(DistributedObject.DistributedObject): class DistributedPicnicBasket(DistributedObject.DistributedObject):
seatState = IntEnum('seatState', ('Empty', 'Full', 'Eating')) seatState = IntEnum('seatState', ('Empty', 'Full', 'Eating'), start=0)
notify = DirectNotifyGlobal.directNotify.newCategory('DistributedPicnicBasket') notify = DirectNotifyGlobal.directNotify.newCategory('DistributedPicnicBasket')
def __init__(self, cr): def __init__(self, cr):

2
toontown/shtiker/GolfPage.py
View file

@ -10,7 +10,7 @@ from toontown.golf import GolfGlobals
from enum import IntEnum from enum import IntEnum
if (__debug__): if (__debug__):
import pdb import pdb
PageMode = IntEnum('PageMode', ('Records', 'Trophy')) PageMode = IntEnum('PageMode', ('Records', 'Trophy'), start=0)
class GolfPage(ShtikerPage): class GolfPage(ShtikerPage):
notify = DirectNotifyGlobal.directNotify.newCategory('GolfPage') notify = DirectNotifyGlobal.directNotify.newCategory('GolfPage')

2
toontown/shtiker/KartPage.py
View file

@ -12,7 +12,7 @@ from .FishPage import FishingTrophy
from enum import IntEnum from enum import IntEnum
if (__debug__): if (__debug__):
import pdb import pdb
PageMode = IntEnum('PageMode', ('Customize', 'Records', 'Trophy')) PageMode = IntEnum('PageMode', ('Customize', 'Records', 'Trophy'), start=0)
class KartPage(ShtikerPage): class KartPage(ShtikerPage):
notify = DirectNotifyGlobal.directNotify.newCategory('KartPage') notify = DirectNotifyGlobal.directNotify.newCategory('KartPage')

2
toontown/shtiker/OptionsPage.py
View file

@ -50,7 +50,7 @@ speedChatStyles = ((2000,
(170 / 255.0, 120 / 255.0, 20 / 255.0), (170 / 255.0, 120 / 255.0, 20 / 255.0),
(165 / 255.0, 120 / 255.0, 50 / 255.0), (165 / 255.0, 120 / 255.0, 50 / 255.0),
(210 / 255.0, 200 / 255.0, 180 / 255.0))) (210 / 255.0, 200 / 255.0, 180 / 255.0)))
PageMode = IntEnum('PageMode', ('Options', 'Codes')) PageMode = IntEnum('PageMode', ('Options', 'Codes'), start=0)
class OptionsPage(ShtikerPage.ShtikerPage): class OptionsPage(ShtikerPage.ShtikerPage):
notify = DirectNotifyGlobal.directNotify.newCategory('OptionsPage') notify = DirectNotifyGlobal.directNotify.newCategory('OptionsPage')

2
toontown/speedchat/TTSCJellybeanJamMenu.py
View file

@ -13,7 +13,7 @@ JellybeanJamMenu = [(OTPLocalizer.JellybeanJamMenuSections[0], [30180,
30188, 30188,
30189, 30189,
30190])] 30190])]
JellybeanJamPhases = IntEnum('JellybeanJamPhases', ('TROLLEY', 'FISHING', 'PARTIES')) JellybeanJamPhases = IntEnum('JellybeanJamPhases', ('TROLLEY', 'FISHING', 'PARTIES'), start=0)
PhaseSpecifPhrases = [30180, 30181, 30182] PhaseSpecifPhrases = [30180, 30181, 30182]
class TTSCJellybeanJamMenu(SCMenu): class TTSCJellybeanJamMenu(SCMenu):

2
toontown/toonbase/ToontownGlobals.py
View file

@ -1614,7 +1614,7 @@ AnimPropTypes = IntEnum('AnimPropTypes', ('Unknown',
'Hydrant', 'Hydrant',
'Mailbox', 'Mailbox',
'Trashcan'), start=-1) 'Trashcan'), start=-1)
EmblemTypes = IntEnum('EmblemTypes', ('Silver', 'Gold')) EmblemTypes = IntEnum('EmblemTypes', ('Silver', 'Gold'), start=0)
NumEmblemTypes = 2 NumEmblemTypes = 2
DefaultMaxBankMoney = 12000 DefaultMaxBankMoney = 12000
DefaultBankItemId = 1350 DefaultBankItemId = 1350