diff --git a/dependencies/astron/dclass/stride.dc b/dependencies/astron/dclass/stride.dc index e40ff817..700c568a 100644 --- a/dependencies/astron/dclass/stride.dc +++ b/dependencies/astron/dclass/stride.dc @@ -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; diff --git a/toontown/catalog/CatalogFurnitureItem.py b/toontown/catalog/CatalogFurnitureItem.py index 3e5716e8..c0122786 100755 --- a/toontown/catalog/CatalogFurnitureItem.py +++ b/toontown/catalog/CatalogFurnitureItem.py @@ -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(): diff --git a/toontown/catalog/CatalogSurfaceItem.py b/toontown/catalog/CatalogSurfaceItem.py index 62691408..97f49aca 100755 --- a/toontown/catalog/CatalogSurfaceItem.py +++ b/toontown/catalog/CatalogSurfaceItem.py @@ -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) diff --git a/toontown/catalog/CatalogWindowItem.py b/toontown/catalog/CatalogWindowItem.py index 91aee656..192f97bf 100755 --- a/toontown/catalog/CatalogWindowItem.py +++ b/toontown/catalog/CatalogWindowItem.py @@ -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) diff --git a/toontown/catalog/MailboxScreen.py b/toontown/catalog/MailboxScreen.py index 7b2f62ac..be613f79 100755 --- a/toontown/catalog/MailboxScreen.py +++ b/toontown/catalog/MailboxScreen.py @@ -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() diff --git a/toontown/toon/DistributedToon.py b/toontown/toon/DistributedToon.py index 159bfcdc..57653721 100755 --- a/toontown/toon/DistributedToon.py +++ b/toontown/toon/DistributedToon.py @@ -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