diff --git a/toontown/building/SuitBuildingGlobals.py b/toontown/building/SuitBuildingGlobals.py index 96da0e99..ffc29c64 100644 --- a/toontown/building/SuitBuildingGlobals.py +++ b/toontown/building/SuitBuildingGlobals.py @@ -201,7 +201,7 @@ buildingMinMax = { ToontownGlobals.PajamaPlace: [config.GetInt('pajama-place-building-min', 6), config.GetInt('pajama-place-building-max', 12)], ToontownGlobals.RockAByeRoad: [config.GetInt('rock-a-bye-road-building-min', 6), - config.GetInt('rock-a-bye-road-building-max', 12)], + config.GetInt('rock-a-bye-road-building-max', 12)], ToontownGlobals.SellbotHQ: [0, 0], ToontownGlobals.SellbotFactoryExt: [0, 0], ToontownGlobals.CashbotHQ: [0, 0], @@ -227,7 +227,7 @@ buildingChance = { ToontownGlobals.PolarPlace: config.GetFloat('polar-place-building-chance', 100.0), ToontownGlobals.LullabyLane: config.GetFloat('lullaby-lane-building-chance', 100.0), ToontownGlobals.PajamaPlace: config.GetFloat('pajama-place-building-chance', 100.0), - ToontownGlobals.RockAByeRoad: config.GetFloat('rock-a-bye-road-building-chance', 100.0), + ToontownGlobals.RockAByeRoad: config.GetFloat('rock-a-bye-road-building-chance', 100.0), ToontownGlobals.SellbotHQ: 0.0, ToontownGlobals.SellbotFactoryExt: 0.0, ToontownGlobals.CashbotHQ: 0.0, diff --git a/toontown/chat/TTChatInputSpeedChat.py b/toontown/chat/TTChatInputSpeedChat.py index 97e30b1f..3224af2e 100644 --- a/toontown/chat/TTChatInputSpeedChat.py +++ b/toontown/chat/TTChatInputSpeedChat.py @@ -446,8 +446,8 @@ class TTChatInputSpeedChat(DirectObject.DirectObject): scZ = -0.04 self.speedChat.setPos(0.283, 0, scZ) if not self.firstTime: - self.speedChat.setPos(-99, -99, -99) - self.firstTime = 1 + self.speedChat.setPos(-99, -99, -99) + self.firstTime = 1 self.speedChat.setWhisperMode(self.whisperAvatarId != None) self.speedChat.enter() return diff --git a/toontown/coderedemption/TTCodeRedemptionMgrAI.py b/toontown/coderedemption/TTCodeRedemptionMgrAI.py index 9152d8ca..76c3fd04 100644 --- a/toontown/coderedemption/TTCodeRedemptionMgrAI.py +++ b/toontown/coderedemption/TTCodeRedemptionMgrAI.py @@ -117,7 +117,7 @@ class TTCodeRedemptionMgrAI(DistributedObjectAI): for item in items: if item in av.onOrder: continue - + item.deliveryDate = int(time.time() / 60) + 0.01 av.onOrder.append(item) diff --git a/toontown/parties/ServerTimeGui.py b/toontown/parties/ServerTimeGui.py index 62f24e4c..e4a76827 100644 --- a/toontown/parties/ServerTimeGui.py +++ b/toontown/parties/ServerTimeGui.py @@ -33,11 +33,11 @@ class ServerTimeGui(DirectFrame): def updateTime(self): curServerDate = base.cr.toontownTimeManager.getCurServerDateTime() if TTLocalizer.HourFormat == '24': - self.hour = '%H' - self.ampm = '' + self.hour = '%H' + self.ampm = '' else: - self.hour = '%I' - self.ampm = '%p' + self.hour = '%I' + self.ampm = '%p' if self.hourCallback is not None: if curServerDate.hour != self.lastHour and self.lastHour != -1: self.lastHour = curServerDate.hour diff --git a/toontown/suit/SuitInvasionManagerAI.py b/toontown/suit/SuitInvasionManagerAI.py index ccc23c42..36d80b6a 100644 --- a/toontown/suit/SuitInvasionManagerAI.py +++ b/toontown/suit/SuitInvasionManagerAI.py @@ -81,8 +81,8 @@ class SuitInvasionManagerAI: self.total = 1000 elif type == INVASION_TYPE_MEGA: self.total = 5000 - elif type == INVASION_TYPE_BRUTAL: - self.total = 10000 + elif type == INVASION_TYPE_BRUTAL: + self.total = 10000 self.remaining = self.total self.flySuits() @@ -99,16 +99,16 @@ class SuitInvasionManagerAI: if type == INVASION_TYPE_NORMAL: timeout = config.GetInt('invasion-timeout', 1800) taskMgr.doMethodLater(timeout, self.stopInvasion, 'invasionTimeout') - - # If this is a mega invasion, and the players take to long to defeat - # all of the cogs, we want the invasion to take a bit longer to timeout: - if type == INVASION_TYPE_MEGA: - timeout = config.GetInt('invasion-timeout', 3200) - - # If this is a brutal invasion, the players will have a very long time to - # Defeat the cogs before the invasion times out: - if type == INVASION_TYPE_BRUTAL: - timeout = config.GetInt('invasion-timeout', 10000) + + # If this is a mega invasion, and the players take to long to defeat + # all of the cogs, we want the invasion to take a bit longer to timeout: + if type == INVASION_TYPE_MEGA: + timeout = config.GetInt('invasion-timeout', 3200) + + # If this is a brutal invasion, the players will have a very long time to + # Defeat the cogs before the invasion times out: + if type == INVASION_TYPE_BRUTAL: + timeout = config.GetInt('invasion-timeout', 10000) self.sendInvasionStatus() return True