From 24aefa840842963b6b498e502588d5debb30f962 Mon Sep 17 00:00:00 2001 From: John Date: Sat, 18 Jul 2015 00:39:11 +0300 Subject: [PATCH] Nametag styles are sent now --- toontown/catalog/CatalogGenerator.py | 4 ++-- toontown/catalog/GiftAvatar.py | 5 ++++- toontown/estate/DistributedPhoneAI.py | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/toontown/catalog/CatalogGenerator.py b/toontown/catalog/CatalogGenerator.py index 4afffce7..40752063 100755 --- a/toontown/catalog/CatalogGenerator.py +++ b/toontown/catalog/CatalogGenerator.py @@ -497,7 +497,6 @@ MonthlySchedule = ((7, CatalogRentalItem(1, 2880, 1000), CatalogRentalItem(2, 2890, 1000), CatalogGardenStarterItem(), - CatalogNametagItem(0), CatalogFurnitureItem(1530), CatalogFurnitureItem(1531), CatalogFurnitureItem(1532), @@ -1249,7 +1248,8 @@ WeeklySchedule = ((100, 4020, 4520, CatalogClothingItem(130, 0), - CatalogFurnitureItem(150)), + CatalogFurnitureItem(150), + CatalogNametagItem(14)), (100, (1, 2010), (2, 2020), diff --git a/toontown/catalog/GiftAvatar.py b/toontown/catalog/GiftAvatar.py index 52d58780..4303b2fd 100644 --- a/toontown/catalog/GiftAvatar.py +++ b/toontown/catalog/GiftAvatar.py @@ -83,4 +83,7 @@ class GiftAvatar: self.emoteAccess = emoteAccess[0] def setPetTrickPhrases(self, tricks): - self.petTrickPhrases = tricks[0] \ No newline at end of file + self.petTrickPhrases = tricks[0] + + def setNametagStyles(self, nametagStyles): + self.nametagStyles = nametagStyles[0] \ No newline at end of file diff --git a/toontown/estate/DistributedPhoneAI.py b/toontown/estate/DistributedPhoneAI.py index 6dd24e38..4aa404bc 100755 --- a/toontown/estate/DistributedPhoneAI.py +++ b/toontown/estate/DistributedPhoneAI.py @@ -36,7 +36,7 @@ class LoadGiftAvatar: newDict = self.copyDict(fields, 'setDNAString', 'setMailboxContents', 'setGiftSchedule', 'setDeliverySchedule', 'setHat', 'setGlasses', 'setBackpack', 'setShoes', 'setHatList', 'setGlassesList', 'setBackpackList', 'setShoes', 'setShoesList', 'setCustomMessages', 'setEmoteAccess', - 'setClothesTopsList', 'setClothesBottomsList', 'setPetTrickPhrases') + 'setClothesTopsList', 'setClothesBottomsList', 'setPetTrickPhrases', 'setNametagStyles') self.callback(self.avId, self.targetId, newDict, self.optional) del self.phone.fsms[self.avId]