diff --git a/otp/otpbase/OTPBase.py b/otp/otpbase/OTPBase.py index 1778fb2c..c1eca19b 100644 --- a/otp/otpbase/OTPBase.py +++ b/otp/otpbase/OTPBase.py @@ -25,7 +25,6 @@ class OTPBase(ShowBase): self.slowCloseShard = self.config.GetBool('slow-close-shard', 0) self.slowCloseShardDelay = self.config.GetFloat('slow-close-shard-delay', 10.0) self.fillShardsToIdealPop = self.config.GetBool('fill-shards-to-ideal-pop', 1) - self.logPrivateInfo = self.config.GetBool('log-private-info', __dev__) self.wantDynamicShadows = 1 self.stereoEnabled = False self.enviroDR = None diff --git a/toontown/chat/WhiteListData.py b/toontown/chat/WhiteListData.py index e70ef22e..5ef584e1 100644 --- a/toontown/chat/WhiteListData.py +++ b/toontown/chat/WhiteListData.py @@ -32771,7 +32771,6 @@ WHITELIST = [ 'thingies', 'things', 'thingy', - 'thinicetrobarrier', 'think', 'thinker', 'thinkers', @@ -32789,7 +32788,6 @@ WHITELIST = [ 'thirsty', 'thirty', 'this', - 'thisisasecretmessage', 'thistle', 'thistle-down', 'thnx', diff --git a/toontown/toonbase/ToontownGlobals.py b/toontown/toonbase/ToontownGlobals.py index d0222561..bbff5db2 100644 --- a/toontown/toonbase/ToontownGlobals.py +++ b/toontown/toonbase/ToontownGlobals.py @@ -5,11 +5,6 @@ from pandac.PandaModules import BitMask32, Vec4 MapHotkeyOn = 'alt' MapHotkeyOff = 'alt-up' MapHotkey = 'alt' -AccountDatabaseChannelId = 4008 -ToonDatabaseChannelId = 4021 -DoodleDatabaseChannelId = 4023 -DefaultDatabaseChannelId = AccountDatabaseChannelId -DatabaseIdFromClassName = {'Account': AccountDatabaseChannelId} CogHQCameraFov = 60.0 BossBattleCameraFov = 72.0 MakeAToonCameraFov = 48.0 @@ -1573,22 +1568,6 @@ DG = 5 BR = 6 OZ = 7 DL = 8 -gmMagicWordList = ['restock', - 'restockUber', - 'autoRestock', - 'resistanceRestock', - 'restockSummons', - 'uberDrop', - 'rich', - 'maxBankMoney', - 'toonUp', - 'rod', - 'cogPageFull', - 'pinkSlips', - 'Tickets', - 'newSummons', - 'who', - 'who all'] AnimPropTypes = Enum(('Unknown', 'Hydrant', 'Mailbox', @@ -1650,9 +1629,7 @@ AV_TOUCH_CHECK_DIST_Z = 5.0 AV_TOUCH_CHECK_TIMELIMIT_CL = 0.002 AV_TOUCH_COUNT_LIMIT = 5 AV_TOUCH_COUNT_TIME = 300 -GloveCost = 1 - -# Buffs... +GloveCost = 2000 BMovementSpeed = 0 BMovementSpeedMultiplier = 1.3 @@ -1668,4 +1645,4 @@ PropIdToColor = [ (0.93, 0.623, 0.196, 1), (0.96, 0.356, 0.839, 1), (0.196, 0.917, 0.929, 1) -] +] \ No newline at end of file