From e6074917b98e1a0e4c670a57d8136ccf714e89b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tadej=20Glin=C5=A1ek?= Date: Tue, 8 Nov 2022 15:14:06 +0100 Subject: [PATCH] general: Fix enum starting positions --- otp/distributed/OTPClientRepository.py | 2 +- .../cogdominium/CogdoFlyingGameGlobals.py | 12 +++++----- .../cogdominium/CogdoFlyingLocalPlayer.py | 2 +- toontown/cogdominium/CogdoFlyingObstacles.py | 2 +- toontown/cogdominium/CogdoMazeGameGlobals.py | 4 ++-- toontown/coghq/CogDisguiseGlobals.py | 2 +- toontown/effects/DustCloud.py | 2 +- toontown/minigame/MazeMapGui.py | 2 +- .../DistributedPartyDanceActivityBase.py | 2 +- toontown/parties/PartyGlobals.py | 24 +++++++++---------- toontown/pets/Pet.py | 2 +- toontown/pets/PetConstants.py | 2 +- toontown/pets/PetTraits.py | 4 ++-- toontown/pets/PetTricks.py | 2 +- toontown/racing/KartDNA.py | 6 ++--- toontown/racing/KartShopGlobals.py | 2 +- toontown/racing/KartShopGui.py | 2 +- toontown/safezone/DistributedPicnicBasket.py | 2 +- toontown/shtiker/GolfPage.py | 2 +- toontown/shtiker/KartPage.py | 2 +- toontown/shtiker/OptionsPage.py | 2 +- toontown/speedchat/TTSCJellybeanJamMenu.py | 2 +- toontown/toonbase/ToontownGlobals.py | 2 +- 23 files changed, 43 insertions(+), 43 deletions(-) diff --git a/otp/distributed/OTPClientRepository.py b/otp/distributed/OTPClientRepository.py index 23240b1..f52d47e 100644 --- a/otp/distributed/OTPClientRepository.py +++ b/otp/distributed/OTPClientRepository.py @@ -47,7 +47,7 @@ class OTPClientRepository(ClientRepositoryBase): WishNameResult = IntEnum('WishNameResult', ('Failure', 'PendingApproval', 'Approved', - 'Rejected')) + 'Rejected'), start=0) def __init__(self, serverVersion, launcher = None, playGame = None): ClientRepositoryBase.__init__(self) diff --git a/toontown/cogdominium/CogdoFlyingGameGlobals.py b/toontown/cogdominium/CogdoFlyingGameGlobals.py index 4b5ee1b..5dc4e3a 100644 --- a/toontown/cogdominium/CogdoFlyingGameGlobals.py +++ b/toontown/cogdominium/CogdoFlyingGameGlobals.py @@ -2,7 +2,7 @@ from pandac.PandaModules import VBase4, Vec3, Point3 from .CogdoUtil import VariableContainer, DevVariableContainer from enum import IntEnum 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.SafezoneId2DeathDamage = {2000: 1, 1000: 2, @@ -106,7 +106,7 @@ Gameplay.DepleteFuelStates = ['FlyingUp'] Gameplay.FuelNormalAmt = 1.0 Gameplay.FuelLowAmt = 0.66 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.OverdrivePropSpeed = 2.5 Gameplay.NormalPropSpeed = 1.5 @@ -116,7 +116,7 @@ Gameplay.TargetedWarningBlinkTime = 3.0 Gameplay.HitKnockbackDist = 15.0 Gameplay.HitKnockbackTime = 0.5 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.BackpackState2TextureName = {Gameplay.BackpackStates.Normal: 'tt_t_ara_cfg_propellerPack', 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', 'toonDialogue': 'phase_3.5/audio/dial/AV_dog_long.ogg'} Level = VariableContainer() -Level.GatherableTypes = IntEnum('GatherableTypes', ('Memo', 'Propeller', 'LaffPowerup', 'InvulPowerup')) -Level.ObstacleTypes = IntEnum('ObstacleTypes', ('Whirlwind', 'Fan', 'Minion')) -Level.PlatformTypes = IntEnum('PlatformTypes', ('Platform', 'StartPlatform', 'EndPlatform')) +Level.GatherableTypes = IntEnum('GatherableTypes', ('Memo', 'Propeller', 'LaffPowerup', 'InvulPowerup'), start=0) +Level.ObstacleTypes = IntEnum('ObstacleTypes', ('Whirlwind', 'Fan', 'Minion'), start=0) +Level.PlatformTypes = IntEnum('PlatformTypes', ('Platform', 'StartPlatform', 'EndPlatform'), start=0) Level.PlatformType2SpawnOffset = {Level.PlatformTypes.Platform: 2.5, Level.PlatformTypes.StartPlatform: 5.0, Level.PlatformTypes.EndPlatform: 5.0} diff --git a/toontown/cogdominium/CogdoFlyingLocalPlayer.py b/toontown/cogdominium/CogdoFlyingLocalPlayer.py index 65740c9..be681ae 100644 --- a/toontown/cogdominium/CogdoFlyingLocalPlayer.py +++ b/toontown/cogdominium/CogdoFlyingLocalPlayer.py @@ -27,7 +27,7 @@ class CogdoFlyingLocalPlayer(CogdoFlyingPlayer): BroadcastPosTask = 'CogdoFlyingLocalPlayerBroadcastPos' PlayWaitingMusicEventName = 'PlayWaitingMusicEvent' RanOutOfTimeEventName = 'RanOutOfTimeEvent' - PropStates = IntEnum('PropStates', ('Normal', 'Overdrive', 'Off')) + PropStates = IntEnum('PropStates', ('Normal', 'Overdrive', 'Off'), start=0) def __init__(self, toon, game, level, guiMgr): CogdoFlyingPlayer.__init__(self, toon) diff --git a/toontown/cogdominium/CogdoFlyingObstacles.py b/toontown/cogdominium/CogdoFlyingObstacles.py index 9c77b92..511c582 100644 --- a/toontown/cogdominium/CogdoFlyingObstacles.py +++ b/toontown/cogdominium/CogdoFlyingObstacles.py @@ -90,7 +90,7 @@ class CogdoFlyingObtacleFactory: class CogdoFlyingObstacle(DirectObject): EnterEventName = 'CogdoFlyingObstacle_Enter' 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): self.type = type diff --git a/toontown/cogdominium/CogdoMazeGameGlobals.py b/toontown/cogdominium/CogdoMazeGameGlobals.py index 0ae41c4..8e572e0 100644 --- a/toontown/cogdominium/CogdoMazeGameGlobals.py +++ b/toontown/cogdominium/CogdoMazeGameGlobals.py @@ -4,7 +4,7 @@ GameActions = IntEnum('GameActions', ('EnterDoor', 'RevealDoor', 'OpenDoor', 'Countdown', - 'TimeAlert')) + 'TimeAlert'), start=0) SecondsUntilTimeout = 4.0 * 60.0 SecondsUntilGameEnds = 60.0 SecondsForTimeAlert = 60.0 @@ -81,7 +81,7 @@ PickupsUntilDoorOpens = int(NumPickups * 0.6) SuitCollisionName = 'CogdoMazeSuit_Collision' SuitWalkSameDirectionProb = 1 SuitWalkTurnAroundProb = 100 -SuitTypes = IntEnum('SuitTypes', ('Boss', 'FastMinion', 'SlowMinion')) +SuitTypes = IntEnum('SuitTypes', ('Boss', 'FastMinion', 'SlowMinion'), start=0) SuitData = {} SuitData[SuitTypes.Boss] = {'dnaName': 'ms', 'cellWalkPeriod': 192, diff --git a/toontown/coghq/CogDisguiseGlobals.py b/toontown/coghq/CogDisguiseGlobals.py index f3c8ac3..23321ed 100644 --- a/toontown/coghq/CogDisguiseGlobals.py +++ b/toontown/coghq/CogDisguiseGlobals.py @@ -428,7 +428,7 @@ PartsQueryNames = ({1: PartNameStrings[0], 16384: PartNameStrings[14], 32768: PartNameStrings[15], 65536: PartNameStrings[15]}) -suitTypes = IntEnum('suitTypes', ('NoSuit', 'NoMerits', 'FullSuit')) +suitTypes = IntEnum('suitTypes', ('NoSuit', 'NoMerits', 'FullSuit'), start=0) def getNextPart(parts, partIndex, dept): dept = dept2deptIndex(dept) diff --git a/toontown/effects/DustCloud.py b/toontown/effects/DustCloud.py index f7882cc..9d35826 100644 --- a/toontown/effects/DustCloud.py +++ b/toontown/effects/DustCloud.py @@ -3,7 +3,7 @@ from direct.interval.IntervalGlobal import * from toontown.battle.BattleProps import globalPropPool from direct.directnotify import DirectNotifyGlobal 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', SFX.magic: 'phase_4/audio/sfx/SZ_DD_treasure.ogg'} diff --git a/toontown/minigame/MazeMapGui.py b/toontown/minigame/MazeMapGui.py index 626143d..a5f3ba6 100644 --- a/toontown/minigame/MazeMapGui.py +++ b/toontown/minigame/MazeMapGui.py @@ -6,7 +6,7 @@ from enum import IntEnum DEFAULT_MASK_RESOLUTION = 32 DEFAULT_RADIUS_RATIO = 0.05 MAP_RESOLUTION = 320 -MazeRevealType = IntEnum('MazeRevealType', ('SmoothCircle', 'HardCircle', 'Square')) +MazeRevealType = IntEnum('MazeRevealType', ('SmoothCircle', 'HardCircle', 'Square'), start=0) MAZE_REVEAL_TYPE = MazeRevealType.SmoothCircle class MazeMapGui(DirectFrame): diff --git a/toontown/parties/DistributedPartyDanceActivityBase.py b/toontown/parties/DistributedPartyDanceActivityBase.py index 3963e0b..2507f39 100644 --- a/toontown/parties/DistributedPartyDanceActivityBase.py +++ b/toontown/parties/DistributedPartyDanceActivityBase.py @@ -18,7 +18,7 @@ from toontown.parties.KeyCodesGui import KeyCodesGui from toontown.parties import PartyGlobals from enum import IntEnum DANCE_FLOOR_COLLISION = 'danceFloor_collision' -DanceViews = IntEnum('DanceViews', ('Normal', 'Dancing', 'Isometric')) +DanceViews = IntEnum('DanceViews', ('Normal', 'Dancing', 'Isometric'), start=0) class DistributedPartyDanceActivityBase(DistributedPartyActivity): notify = directNotify.newCategory('DistributedPartyDanceActivity') diff --git a/toontown/parties/PartyGlobals.py b/toontown/parties/PartyGlobals.py index f821da3..9330df4 100644 --- a/toontown/parties/PartyGlobals.py +++ b/toontown/parties/PartyGlobals.py @@ -41,35 +41,35 @@ AvailableGridSquares = 202 TrashCanPosition = (-0.24, 0.0, -0.65) TrashCanScale = 0.7 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', 'ReadButNotReplied', 'Accepted', - 'Rejected')) + 'Rejected'), start=0) InviteTheme = IntEnum('InviteTheme', ('Birthday', 'GenericMale', 'GenericFemale', 'Racing', 'Valentoons', 'VictoryParty', - 'Winter')) + 'Winter'), start=0) PartyStatus = IntEnum('PartyStatus', ('Pending', 'Cancelled', 'Finished', 'CanStart', 'Started', - 'NeverStarted')) + 'NeverStarted'), start=0) AddPartyErrorCode = IntEnum('AddPartyErrorCode', ('AllOk', 'ValidationError', 'DatabaseError', - 'TooManyHostedParties')) + 'TooManyHostedParties'), start=0) ChangePartyFieldErrorCode = IntEnum('ChangePartyFieldErrorCode', ('AllOk', 'ValidationError', 'DatabaseError', 'AlreadyStarted', - 'AlreadyRefunded')) -ActivityTypes = IntEnum('ActivityTypes', ('HostInitiated', 'GuestInitiated', 'Continuous')) -PartyGateDenialReasons = IntEnum('PartyGateDenialReasons', ('Unavailable', 'Full')) + 'AlreadyRefunded'), start=0) +ActivityTypes = IntEnum('ActivityTypes', ('HostInitiated', 'GuestInitiated', 'Continuous'), start=0) +PartyGateDenialReasons = IntEnum('PartyGateDenialReasons', ('Unavailable', 'Full'), start=0) ActivityIds = IntEnum('ActivityIds', ('PartyJukebox', 'PartyCannon', 'PartyTrampoline', @@ -89,7 +89,7 @@ ActivityIds = IntEnum('ActivityIds', ('PartyJukebox', 'PartyValentineDance20', 'PartyValentineJukebox', 'PartyValentineJukebox40', - 'PartyValentineTrampoline')) + 'PartyValentineTrampoline'), start=0) PartyEditorActivityOrder = [ActivityIds.PartyCog, ActivityIds.PartyWinterCog, ActivityIds.PartyJukebox, @@ -156,7 +156,7 @@ DecorationIds = IntEnum('DecorationIds', ('BalloonAnvil', 'CogStatueWinter', 'snowman', 'snowDoodle', - 'BalloonAnvilValentine')) + 'BalloonAnvilValentine'), start=0) DECORATION_VOLUME = 1.0 DECORATION_CUTOFF = 45 VictoryPartyDecorationIds = frozenset([DecorationIds.Hydra, @@ -181,7 +181,7 @@ GoToPartyStatus = IntEnum('GoToPartyStatus', ('AllowedToGo', 'PartyFull', 'PrivateParty', 'PartyOver', - 'PartyNotActive')) + 'PartyNotActive'), start=0) PlayGroundToPartyClockColors = {'the_burrrgh': (53.0 / 255.0, 116.0 / 255.0, 148.0 / 255.0, @@ -733,7 +733,7 @@ DanceReverseLoopAnims = ['left', ToonDancingStates = IntEnum('ToonDancingStates', ('Init', 'DanceMove', 'Run', - 'Cleanup')) + 'Cleanup'), start=0) JUKEBOX_TIMEOUT = 30.0 MUSIC_PATH = 'phase_%s/audio/bgm/' MUSIC_MIN_LENGTH_SECONDS = 50.0 diff --git a/toontown/pets/Pet.py b/toontown/pets/Pet.py index 86f0ff0..e8bab8f 100644 --- a/toontown/pets/Pet.py +++ b/toontown/pets/Pet.py @@ -29,7 +29,7 @@ Component2IconDict = {'boredom': 'Bored', class Pet(Avatar.Avatar): notify = DirectNotifyGlobal.directNotify.newCategory('Pet') SerialNum = 0 - Interactions = IntEnum('Interactions', ('SCRATCH', 'BEG', 'EAT', 'NEUTRAL')) + Interactions = IntEnum('Interactions', ('SCRATCH', 'BEG', 'EAT', 'NEUTRAL'), start=0) InteractAnims = {Interactions.SCRATCH: ('toPet', 'pet', 'fromPet'), Interactions.BEG: ('toBeg', 'beg', 'fromBeg'), Interactions.EAT: ('eat', 'swallow', 'neutral'), diff --git a/toontown/pets/PetConstants.py b/toontown/pets/PetConstants.py index 8cb8562..33d90fd 100644 --- a/toontown/pets/PetConstants.py +++ b/toontown/pets/PetConstants.py @@ -24,7 +24,7 @@ HungerChaseToonScale = 1.2 FleeFromOwnerScale = 0.5 GettingAttentionGoalScale = 1.2 GettingAttentionGoalScaleDur = 7.0 -AnimMoods = IntEnum('AnimMoods', ('EXCITED', 'SAD', 'NEUTRAL')) +AnimMoods = IntEnum('AnimMoods', ('EXCITED', 'SAD', 'NEUTRAL'), start=0) FwdSpeed = 12.0 RotSpeed = 360.0 _HappyMult = 1.0 diff --git a/toontown/pets/PetTraits.py b/toontown/pets/PetTraits.py index 1467190..7a34b3e 100644 --- a/toontown/pets/PetTraits.py +++ b/toontown/pets/PetTraits.py @@ -24,8 +24,8 @@ def gaussian(min, max, rng): class TraitDistribution: - TraitQuality = IntEnum('TraitQuality', ('VERY_BAD', 'BAD', 'AVERAGE', 'GOOD', 'VERY_GOOD')) - TraitTypes = IntEnum('TraitTypes', ('INCREASING', 'DECREASING')) + TraitQuality = IntEnum('TraitQuality', ('VERY_BAD', 'BAD', 'AVERAGE', 'GOOD', 'VERY_GOOD'), start=0) + TraitTypes = IntEnum('TraitTypes', ('INCREASING', 'DECREASING'), start=0) Sz2MinMax = None TraitType = None TraitCutoffs = {TraitTypes.INCREASING: {TraitQuality.VERY_BAD: 0.1, diff --git a/toontown/pets/PetTricks.py b/toontown/pets/PetTricks.py index 21ed459..02ae1b3 100644 --- a/toontown/pets/PetTricks.py +++ b/toontown/pets/PetTricks.py @@ -2,7 +2,7 @@ from direct.showbase.PythonUtil import invertDictLossless from direct.interval.IntervalGlobal import * import random 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 NonHappyMaxActualTrickAptitude = 0.6 MinActualTrickAptitude = 0.5 diff --git a/toontown/racing/KartDNA.py b/toontown/racing/KartDNA.py index 72784b4..8d3e7fc 100644 --- a/toontown/racing/KartDNA.py +++ b/toontown/racing/KartDNA.py @@ -6,10 +6,10 @@ from enum import IntEnum if (__debug__): import pdb 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 -KartInfo = IntEnum('KartInfo', ('name', 'model', 'cost', 'viewDist', 'decalId', 'LODmodel1', 'LODmodel2')) -AccInfo = IntEnum('AccInfo', ('name', 'model', 'cost', 'texCard', 'attach')) +KartInfo = IntEnum('KartInfo', ('name', 'model', 'cost', 'viewDist', 'decalId', 'LODmodel1', 'LODmodel2'), start=0) +AccInfo = IntEnum('AccInfo', ('name', 'model', 'cost', 'texCard', 'attach'), start=0) kNames = TTLocalizer.KartDNA_KartNames KartDict = {0: (kNames[0], 'phase_6/models/karting/Kart1_Final', diff --git a/toontown/racing/KartShopGlobals.py b/toontown/racing/KartShopGlobals.py index fb56d9e..f8ea031 100644 --- a/toontown/racing/KartShopGlobals.py +++ b/toontown/racing/KartShopGlobals.py @@ -15,7 +15,7 @@ class KartGlobals: COUNTDOWN_TIME = 30 BOARDING_TIME = 10.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_RIGHT_SPOT = 1 REAR_LEFT_SPOT = 2 diff --git a/toontown/racing/KartShopGui.py b/toontown/racing/KartShopGui.py index 947ada9..41f7b70 100644 --- a/toontown/racing/KartShopGui.py +++ b/toontown/racing/KartShopGui.py @@ -16,7 +16,7 @@ from toontown.toontowngui.TeaserPanel import TeaserPanel from enum import IntEnum if (__debug__): 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) BK_OPTIONS = IntEnum('BK_OPTIONS', ('Cancel, BuyKart'), start=-1) BA_OPTIONS = IntEnum('BA_OPTIONS', ('Cancel, BuyAccessory'), start=-1) diff --git a/toontown/safezone/DistributedPicnicBasket.py b/toontown/safezone/DistributedPicnicBasket.py index 75af429..d9d1f46 100644 --- a/toontown/safezone/DistributedPicnicBasket.py +++ b/toontown/safezone/DistributedPicnicBasket.py @@ -19,7 +19,7 @@ from toontown.battle.BattleSounds import * from enum import IntEnum class DistributedPicnicBasket(DistributedObject.DistributedObject): - seatState = IntEnum('seatState', ('Empty', 'Full', 'Eating')) + seatState = IntEnum('seatState', ('Empty', 'Full', 'Eating'), start=0) notify = DirectNotifyGlobal.directNotify.newCategory('DistributedPicnicBasket') def __init__(self, cr): diff --git a/toontown/shtiker/GolfPage.py b/toontown/shtiker/GolfPage.py index dd065d6..f1f3b34 100644 --- a/toontown/shtiker/GolfPage.py +++ b/toontown/shtiker/GolfPage.py @@ -10,7 +10,7 @@ from toontown.golf import GolfGlobals from enum import IntEnum if (__debug__): import pdb -PageMode = IntEnum('PageMode', ('Records', 'Trophy')) +PageMode = IntEnum('PageMode', ('Records', 'Trophy'), start=0) class GolfPage(ShtikerPage): notify = DirectNotifyGlobal.directNotify.newCategory('GolfPage') diff --git a/toontown/shtiker/KartPage.py b/toontown/shtiker/KartPage.py index 3a00323..01d6003 100644 --- a/toontown/shtiker/KartPage.py +++ b/toontown/shtiker/KartPage.py @@ -12,7 +12,7 @@ from .FishPage import FishingTrophy from enum import IntEnum if (__debug__): import pdb -PageMode = IntEnum('PageMode', ('Customize', 'Records', 'Trophy')) +PageMode = IntEnum('PageMode', ('Customize', 'Records', 'Trophy'), start=0) class KartPage(ShtikerPage): notify = DirectNotifyGlobal.directNotify.newCategory('KartPage') diff --git a/toontown/shtiker/OptionsPage.py b/toontown/shtiker/OptionsPage.py index 9ad3c57..a5789d3 100644 --- a/toontown/shtiker/OptionsPage.py +++ b/toontown/shtiker/OptionsPage.py @@ -50,7 +50,7 @@ speedChatStyles = ((2000, (170 / 255.0, 120 / 255.0, 20 / 255.0), (165 / 255.0, 120 / 255.0, 50 / 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): notify = DirectNotifyGlobal.directNotify.newCategory('OptionsPage') diff --git a/toontown/speedchat/TTSCJellybeanJamMenu.py b/toontown/speedchat/TTSCJellybeanJamMenu.py index ccfd025..c79e4e8 100644 --- a/toontown/speedchat/TTSCJellybeanJamMenu.py +++ b/toontown/speedchat/TTSCJellybeanJamMenu.py @@ -13,7 +13,7 @@ JellybeanJamMenu = [(OTPLocalizer.JellybeanJamMenuSections[0], [30180, 30188, 30189, 30190])] -JellybeanJamPhases = IntEnum('JellybeanJamPhases', ('TROLLEY', 'FISHING', 'PARTIES')) +JellybeanJamPhases = IntEnum('JellybeanJamPhases', ('TROLLEY', 'FISHING', 'PARTIES'), start=0) PhaseSpecifPhrases = [30180, 30181, 30182] class TTSCJellybeanJamMenu(SCMenu): diff --git a/toontown/toonbase/ToontownGlobals.py b/toontown/toonbase/ToontownGlobals.py index 53bae0c..f449d2c 100644 --- a/toontown/toonbase/ToontownGlobals.py +++ b/toontown/toonbase/ToontownGlobals.py @@ -1614,7 +1614,7 @@ AnimPropTypes = IntEnum('AnimPropTypes', ('Unknown', 'Hydrant', 'Mailbox', 'Trashcan'), start=-1) -EmblemTypes = IntEnum('EmblemTypes', ('Silver', 'Gold')) +EmblemTypes = IntEnum('EmblemTypes', ('Silver', 'Gold'), start=0) NumEmblemTypes = 2 DefaultMaxBankMoney = 12000 DefaultBankItemId = 1350