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

Preparation for next commit (sry have to git reset)

Browse source
This commit is contained in:
John 2015-07-17 15:40:14 +03:00
parent 0d3f31971e
commit 81e339d9e9
6 changed files with 1 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
dependencies/astron/dclass/stride.dc vendored
View file

@ -445,11 +445,6 @@ from toontown.parties.GlobalPartyManager/AI/UD import GlobalPartyManager/AI/UD
from toontown.uberdog.GlobalLobbyManager/AI/UD import GlobalLobbyManager/AI/UD
from toontown.uberdog.ARGManager import ARGManager
struct GiftItem {
blob Item;
string giftTag;
};
struct gardenSpecial {
uint8 index;
uint8 count;

1
toontown/catalog/CatalogFurnitureItem.py
View file

@ -1014,7 +1014,6 @@ class CatalogFurnitureItem(CatalogAtticItem.CatalogAtticItem):
def recordPurchase(self, avatar, optional):
house, retcode = self.getHouseInfo(avatar)
self.giftTag = None
if retcode >= 0:
if self.getFlags() & FLCloset:
if avatar.getMaxClothes() > self.getMaxClothes():

1
toontown/catalog/CatalogSurfaceItem.py
View file

@ -24,7 +24,6 @@ class CatalogSurfaceItem(CatalogAtticItem.CatalogAtticItem):
return 1
def recordPurchase(self, avatar, optional):
self.giftTag = None
house, retcode = self.getHouseInfo(avatar)
if retcode >= 0:
house.addWallpaper(self)

1
toontown/catalog/CatalogWindowItem.py
View file

@ -37,7 +37,6 @@ class CatalogWindowItem(CatalogAtticItem.CatalogAtticItem):
return TTLocalizer.WindowViewNames.get(self.windowType)
def recordPurchase(self, avatar, optional):
self.giftTag = None
house, retcode = self.getHouseInfo(avatar)
if retcode >= 0:
house.addWindow(self)

3
toontown/catalog/MailboxScreen.py
View file

@ -31,7 +31,6 @@ class MailboxScreen(DirectObject.DirectObject):
self.dialogBox = None
self.load()
self.hide()
return
def show(self):
self.frame.show()
@ -79,7 +78,7 @@ class MailboxScreen(DirectObject.DirectObject):
self.quitButton = DirectButton(parent=self.frame, relief=None, image=(gui2.find('**/QuitBtn_UP'), gui2.find('**/QuitBtn_DN'), gui2.find('**/QuitBtn_RLVR')), pos=(0.5, 1.0, -0.42), scale=0.9, text=TTLocalizer.MailboxExitButton, text_font=ToontownGlobals.getSignFont(), text0_fg=(0.152, 0.75, 0.258, 1), text1_fg=(0.152, 0.75, 0.258, 1), text2_fg=(0.977, 0.816, 0.133, 1), text_scale=0.045, text_pos=(0, -0.01), command=self.__handleExit)
self.gettingText = DirectLabel(parent=self.frame, relief=None, text='', text_wordwrap=10, pos=(0.0, 0.0, 0.32), scale=0.09)
self.gettingText.hide()
self.giftTagPanel = DirectLabel(parent=self.frame, relief=None, text='Gift TAG!!', text_wordwrap=16, pos=(0.0, 0.0, 0.01), scale=0.06)
self.giftTagPanel = DirectLabel(parent=self.frame, relief=None, text=TTLocalizer.MailboxGiftTag % TTLocalizer.MailboxGiftTagAnonymous, text_wordwrap=16, pos=(0.0, 0.0, 0.01), scale=0.06)
self.giftTagPanel.hide()
self.itemText = DirectLabel(parent=self.frame, relief=None, text='', text_wordwrap=16, pos=(0.0, 0.0, -0.022), scale=0.07)
self.itemText.hide()

1
toontown/toon/DistributedToon.py
View file

@ -119,7 +119,6 @@ class DistributedToon(DistributedPlayer.DistributedPlayer, Toon.Toon, Distribute
self.onOrder = CatalogItemList.CatalogItemList(store=CatalogItem.Customization | CatalogItem.DeliveryDate)
self.onGiftOrder = CatalogItemList.CatalogItemList(store=CatalogItem.Customization | CatalogItem.DeliveryDate)
self.mailboxContents = CatalogItemList.CatalogItemList(store=CatalogItem.Customization)
self.deliveryboxContentsContents = CatalogItemList.CatalogItemList(store=CatalogItem.Customization | CatalogItem.GiftTag)
self.awardMailboxContents = CatalogItemList.CatalogItemList(store=CatalogItem.Customization)
self.onAwardOrder = CatalogItemList.CatalogItemList(store=CatalogItem.Customization | CatalogItem.DeliveryDate)
self.splash = None