Sneed-Group/Poodletooth-iLand
1
0
Fork 0
mirror of https://github.com/Sneed-Group/Poodletooth-iLand synced 2024-12-24 04:02:40 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

Convert prints to writeServerEvents in code redemption manager AI and fix typos

Browse source
This commit is contained in:
John Cote 2015-07-08 07:47:01 -04:00
parent 8825da791e
commit da7ba5ce89
3 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
toontown/battle/DistributedBattleBaseAI.py
View file

@ -1364,8 +1364,8 @@ class DistributedBattleBaseAI(DistributedObjectAI.DistributedObjectAI, BattleBas
if toon != None and not toon.unlimitedGags:
check = toon.inventory.useItem(track, level)
if check == -1:
self.air.writeServerEvent('suspicious', toonId, 'Toon generating movie for non-existant gag track %s level %s' % (track, level))
self.notify.warning('generating movie for non-existant gag track %s level %s! avId: %s' % (track, level, toonId))
self.air.writeServerEvent('suspicious', toonId, 'Toon generating movie for non-existent gag track %s level %s' % (track, level))
self.notify.warning('generating movie for non-existent gag track %s level %s! avId: %s' % (track, level, toonId))
toon.d_setInventory(toon.inventory.makeNetString())
hps = attack[TOON_HP_COL]
if track == SOS:

12
toontown/coderedemption/TTCodeRedemptionMgrAI.py
View file

@ -96,7 +96,7 @@ class TTCodeRedemptionMgrAI(DistributedObjectAI):
if code in self.codes:
if av.isCodeRedeemed(code):
self.sendUpdateToAvatarId(avId, 'redeemCodeResult', [4])
print ('%s tried to redeem already redeemed code %s' % (avId, code))
self.air.writeServerEvent('suspicious', avId, 'Toon tried to redeem already redeemed code %s' % code)
return
codeInfo = self.codes[code]
@ -104,19 +104,19 @@ class TTCodeRedemptionMgrAI(DistributedObjectAI):
if ('year' in codeInfo and date.year is not codeInfo['year']) and date.year > codeInfo['year'] or ('expirationDate' in codeInfo and codeInfo['expirationDate'] - date < timedelta(hours = 1)):
self.sendUpdateToAvatarId(avId, 'redeemCodeResult', [2])
print ('%s attempted to redeem code %s but it was expired!' % (avId, code))
self.air.writeServerEvent('suspicious', avId, 'Toon attempted to redeem code %s but it was expired!' % code)
return
elif ('year' in codeInfo and date.year is not codeInfo['year']) and date.year < codeInfo['year'] or ('month' in codeInfo and date.month is not codeInfo['month']) or ('day' in codeInfo and date.day is not codeInfo['day']):
self.sendUpdateToAvatarId(avId, 'redeemCodeResult', [5])
print ("%s attempted to redeem code %s but it wasn't usable yet!" % (avId, code))
self.air.writeServerEvent('suspicious', avId, "Toon attempted to redeem code %s but it wasn't usable yet!" % code)
return
av.redeemCode(code)
self.requestCodeRedeem(avId, av, codeInfo['items'])
print ('%s successfully redeemed %s' % (avId, code))
self.air.writeServerEvent('code-redeemed', avId, 'Toon successfully redeemed %s' % code)
else:
self.sendUpdateToAvatarId(avId, 'redeemCodeResult', [1])
print ('%s tried to redeem non-existant code %s' % (avId, code))
self.air.writeServerEvent('suspicious', avId, 'Toon tried to redeem non-existent code %s' % code)
def requestCodeRedeem(self, avId, av, items):
count = self.getMailboxCount(items)
@ -134,4 +134,4 @@ class TTCodeRedemptionMgrAI(DistributedObjectAI):
av.b_setDeliverySchedule(av.onOrder)
self.sendUpdateToAvatarId(avId, 'redeemCodeResult', [0])
print ('%s is being sent %s from redeemed code' % (avId, items))
self.air.writeServerEvent('code-redeemed', avId, 'Toon is being sent %s from redeemed code' % items)

4
toontown/toon/DistributedNPCKartClerkAI.py
View file

@ -69,8 +69,8 @@ class DistributedNPCKartClerkAI(DistributedNPCToonBaseAI):
extraArgs = []
cost = getKartCost(whichKart)
if cost == 'key error':
self.air.writeServerEvent('suspicious', avId, 'Player trying to buy non-existant kart %s' % whichKart)
self.notify.warning('somebody is trying to buy non-existant kart%s! avId: %s' % (whichKart, avId))
self.air.writeServerEvent('suspicious', avId, 'Player trying to buy non-existent kart %s' % whichKart)
self.notify.warning('somebody is trying to buy non-existent kart%s! avId: %s' % (whichKart, avId))
return
elif cost > av.getTickets():
self.air.writeServerEvent('suspicious', avId, "DistributedNPCKartClerkAI.buyKart and toon doesn't have enough tickets!")