Sneed-Group/Poodletooth-iLand
2
0
Fork 0
mirror of https://github.com/Sneed-Group/Poodletooth-iLand synced 2025-01-09 17:53:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

More gifting.

Browse source
This commit is contained in:
Loudrob 2015-07-13 10:17:56 -04:00
parent 8ad6894fb5
commit 87efdba167
3 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
toontown/catalog/CatalogItem.py
View file

@ -42,8 +42,8 @@ class CatalogItem:
return return
def isAward(self): def isAward(self):
result = self.specialEventId != 0 #result = self.specialEventId != 0
return result return False
def makeNewItem(self): def makeNewItem(self):
pass pass

7
toontown/toon/DistributedToonAI.py
View file

@ -175,6 +175,7 @@ class DistributedToonAI(DistributedPlayerAI.DistributedPlayerAI, DistributedSmoo
from toontown.toon.DistributedNPCToonBaseAI import DistributedNPCToonBaseAI from toontown.toon.DistributedNPCToonBaseAI import DistributedNPCToonBaseAI
if not isinstance(self, DistributedNPCToonBaseAI): if not isinstance(self, DistributedNPCToonBaseAI):
self.sendUpdate('setDefaultShard', [self.air.districtId]) self.sendUpdate('setDefaultShard', [self.air.districtId])
self.accept('CATALOG_addGift_UD2Toon_%d' % self.doId, self.__handleAddGift) self.accept('CATALOG_addGift_UD2Toon_%d' % self.doId, self.__handleAddGift)
def setLocation(self, parentId, zoneId): def setLocation(self, parentId, zoneId):
@ -238,11 +239,11 @@ class DistributedToonAI(DistributedPlayerAI.DistributedPlayerAI, DistributedSmoo
del self.kart del self.kart
self._sendExitServerEvent() self._sendExitServerEvent()
self.ignore('CATALOG_addGift_UD2Toon_%d' % self.doId)
DistributedSmoothNodeAI.DistributedSmoothNodeAI.delete(self) DistributedSmoothNodeAI.DistributedSmoothNodeAI.delete(self)
DistributedPlayerAI.DistributedPlayerAI.delete(self) DistributedPlayerAI.DistributedPlayerAI.delete(self)
self.ignore('CATALOG_addGift_UD2Toon_%d' % self.doId)
def deleteDummy(self): def deleteDummy(self):
if self.inventory: if self.inventory:
self.inventory.unload() self.inventory.unload()
@ -2182,7 +2183,7 @@ class DistributedToonAI(DistributedPlayerAI.DistributedPlayerAI, DistributedSmoo
self.b_setCatalogNotify(self.catalogNotify, ToontownGlobals.NewItems) self.b_setCatalogNotify(self.catalogNotify, ToontownGlobals.NewItems)
return Task.done return Task.done
def __handleAddGift(self, blob): def __handleAddGift(self, blob, ctx):
store = CatalogItem.Customization | CatalogItem.DeliveryDate | CatalogItem.GiftTag store = CatalogItem.Customization | CatalogItem.DeliveryDate | CatalogItem.GiftTag
self.onGiftOrder.append(CatalogItem.getItem(blob, store=store)) self.onGiftOrder.append(CatalogItem.getItem(blob, store=store))
self.b_setBothSchedules(self.onOrder, self.onGiftOrder) self.b_setBothSchedules(self.onOrder, self.onGiftOrder)