From c17cbffc4716e46aa51407bef5f4b7258cc55f31 Mon Sep 17 00:00:00 2001
From: Open Toontown <57279094+opentoontown@users.noreply.github.com>
Date: Sun, 16 Jan 2022 23:17:43 -0500
Subject: [PATCH] more catalog fixes

---
 toontown/catalog/CatalogFurnitureItem.py | 24 ++++++++++++------------
 toontown/catalog/CatalogScreen.py        |  8 ++++----
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/toontown/catalog/CatalogFurnitureItem.py b/toontown/catalog/CatalogFurnitureItem.py
index dd2f28a..8bebe19 100644
--- a/toontown/catalog/CatalogFurnitureItem.py
+++ b/toontown/catalog/CatalogFurnitureItem.py
@@ -1152,19 +1152,19 @@ def get50ItemCloset(avatar, duplicateItems):
 
 
 def getMaxClosets():
-    list = []
+    maxClosets = []
     for closetId in MaxClosetIds:
-        list.append(CatalogFurnitureItem(closetId))
+        maxClosets.append(CatalogFurnitureItem(closetId))
 
-    return list
+    return maxClosets
 
 
 def getAllClosets():
-    list = []
+    allClosets = []
     for closetId in list(ClosetToClothes.keys()):
-        list.append(CatalogFurnitureItem(closetId))
+        allClosets.append(CatalogFurnitureItem(closetId))
 
-    return list
+    return allClosets
 
 
 def get50ItemTrunk(avatar, duplicateItems):
@@ -1180,17 +1180,17 @@ def get50ItemTrunk(avatar, duplicateItems):
 
 
 def getMaxTrunks():
-    list = []
+    maxTrunks = []
     for trunkId in MaxTrunkIds:
-        list.append(CatalogFurnitureItem(trunkId))
+        maxTrunks.append(CatalogFurnitureItem(trunkId))
 
-    return list
+    return maxTrunks
 
 
 def getAllFurnitures(index):
-    list = []
+    allFurnitures = []
     colors = FurnitureTypes[index][FTColorOptions]
     for n in range(len(colors)):
-        list.append(CatalogFurnitureItem(index, n))
+        allFurnitures.append(CatalogFurnitureItem(index, n))
 
-    return list
+    return allFurnitures
diff --git a/toontown/catalog/CatalogScreen.py b/toontown/catalog/CatalogScreen.py
index 2f31d86..426e58e 100644
--- a/toontown/catalog/CatalogScreen.py
+++ b/toontown/catalog/CatalogScreen.py
@@ -646,17 +646,17 @@ class CatalogScreen(DirectFrame):
         self.setNumEmblemPages(numPages)
         currentWeek = base.localAvatar.catalogScheduleCurrentWeek - 1
         if currentWeek < 57:
-            seriesNumber = currentWeek / ToontownGlobals.CatalogNumWeeksPerSeries + 1
+            seriesNumber = currentWeek // ToontownGlobals.CatalogNumWeeksPerSeries + 1
             weekNumber = currentWeek % ToontownGlobals.CatalogNumWeeksPerSeries + 1
         elif currentWeek < 65:
             seriesNumber = 6
             weekNumber = currentWeek - 56
         else:
-            seriesNumber = currentWeek / ToontownGlobals.CatalogNumWeeksPerSeries + 2
+            seriesNumber = currentWeek // ToontownGlobals.CatalogNumWeeksPerSeries + 2
             weekNumber = currentWeek % ToontownGlobals.CatalogNumWeeksPerSeries + 1
         geom = NodePath('cover')
         cover = guiItems.find('**/cover')
-        maxSeries = ToontownGlobals.CatalogNumWeeks / ToontownGlobals.CatalogNumWeeksPerSeries + 1
+        maxSeries = ToontownGlobals.CatalogNumWeeks // ToontownGlobals.CatalogNumWeeksPerSeries + 1
         coverSeries = (seriesNumber - 1) % maxSeries + 1
         coverPicture = cover.find('**/cover_picture%s' % coverSeries)
         if not coverPicture.isEmpty():
@@ -786,7 +786,7 @@ class CatalogScreen(DirectFrame):
         self.setNumBackPages(numPages)
         numPages = self.packPages(self.loyaltyPanelList, self.loyaltyPageList, 'loyalty')
         self.setNumLoyaltyPages(numPages)
-        seriesNumber = (base.localAvatar.catalogScheduleCurrentWeek - 1) / ToontownGlobals.CatalogNumWeeksPerSeries + 1
+        seriesNumber = (base.localAvatar.catalogScheduleCurrentWeek - 1) // ToontownGlobals.CatalogNumWeeksPerSeries + 1
         self.catalogSeries['text'] = Localizer.CatalogSeriesLabel % seriesNumber
         weekNumber = (base.localAvatar.catalogScheduleCurrentWeek - 1) % ToontownGlobals.CatalogNumWeeksPerSeries + 1
         self.catalogNumber['text'] = '#%d' % weekNumber