Sneed-Group/Poodletooth-iLand
1
0
Fork 0
mirror of https://github.com/Sneed-Group/Poodletooth-iLand synced 2024-12-23 11:42:39 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

Convert all tabs to spaces

Browse source
This commit is contained in:
DenialMC 2015-04-04 11:31:28 +03:00
parent edbd2d0584
commit b7654d438d
5 changed files with 21 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
toontown/building/SuitBuildingGlobals.py
View file

@ -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,

4
toontown/chat/TTChatInputSpeedChat.py
View file

@ -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

2
toontown/coderedemption/TTCodeRedemptionMgrAI.py
View file

@ -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)

8
toontown/parties/ServerTimeGui.py
View file

@ -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

24
toontown/suit/SuitInvasionManagerAI.py
View file

@ -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