Fix trunk

toontown/catalog/CatalogItemPanel.py

@@ -291,11 +291,7 @@ class CatalogItemPanel(DirectFrame):
                 auxText = TTLocalizer.CatalogOnOrderText
         else:
             auxText = ''
-        isNameTag = typeCode == CatalogItemTypes.NAMETAG_ITEM
-        if isNameTag and self['item'].nametagStyle == base.localAvatar.getNametagStyle():
-            auxText = TTLocalizer.CatalogCurrent
-            self.buyButton['state'] = DGG.DISABLED
-        elif self['item'].reachedPurchaseLimit(base.localAvatar):
+        if self['item'].reachedPurchaseLimit(base.localAvatar):
             max = self['item'].getPurchaseLimit()
             if max <= 1:
                 auxText = TTLocalizer.CatalogPurchasedText

toontown/estate/TrunkGUI.py

@@ -242,17 +242,14 @@ class TrunkGUI(StateData.StateData):
         self.glasses = []
         self.backpacks = []
         self.shoes = []
+        choices = [0, 0, 0, 0]
+        currentAccessories = (self.toon.getHat(), self.toon.getGlasses(), self.toon.getBackpack(), self.toon.getShoes())
 
         self.hats.append((0, 0, 0))
         self.glasses.append((0, 0, 0))
         self.backpacks.append((0, 0, 0))
         self.shoes.append((0, 0, 0))
 
-        self.hatChoice = 0
-        self.glassesChoice = 0
-        self.backpackChoice = 0
-        self.shoesChoice = 0
-
         i = 0
         while i < len(self.hatList):
             self.hats.append((self.hatList[i], self.hatList[i + 1], self.hatList[i + 2]))
@@ -272,7 +269,17 @@ class TrunkGUI(StateData.StateData):
         while i < len(self.shoesList):
             self.shoes.append((self.shoesList[i], self.shoesList[i + 1], self.shoesList[i + 2]))
             i = i + 3
+        
+        for i, list in enumerate((self.hats, self.glasses, self.backpacks, self.shoes)):
+            if len(list) >= 3:
+                index = list.index(currentAccessories[i])
+                list[index], list[1] = list[1], list[index]
+                choices[i] = 1
 
+        self.hatChoice = choices[0]
+        self.glassesChoice = choices[1]
+        self.backpackChoice = choices[2]
+        self.shoesChoice = choices[3]
         self.swapHat(0)
         self.swapGlasses(0)
         self.swapBackpack(0)

toontown/toonbase/TTLocalizerEnglish.py

@@ -5565,7 +5565,6 @@ CatalogRentText = 'Rent'
 CatalogGiftText = 'Gift'
 CatalogOnOrderText = 'On Order'
 CatalogPurchasedText = 'Already\nPurchased'
-CatalogCurrent = 'Current'
 CatalogGiftedText = 'Gifted\nTo You'
 CatalogPurchasedGiftText = 'Already\nOwned'
 CatalogMailboxFull = 'No Room'
@@ -5585,7 +5584,6 @@ CatalogVerifyRent = 'Rent %(item)s for %(price)s Jellybeans?'
 CatalogVerifyGift = 'Purchase %(item)s for %(price)s Jellybeans as a gift for %(friend)s?'
 CatalogOnlyOnePurchase = 'You may only have one of these items at a time.  If you purchase this one, it will replace %(old)s.\n\nAre you sure you want to purchase %(item)s for %(price)s Jellybeans?'
 CatalogExitButtonText = 'Hang Up'
-CatalogCurrentButtonText = 'To Current Items'
 CatalogPastButtonText = 'To Past Items'
 TutorialHQOfficerName = 'HQ Harry'
 NPCToonNames = {20000: 'Tutorial Tom',