minor code cleanups

Author: drewc5131

ott/ShaderRegistry.py

@@ -12,13 +12,14 @@
         from ott.ShaderRegistry import ShaderRegistry
         render.setShader(ShaderRegistry.get('render:black_and_white'))
 """
+from typing import Dict, Any
 
 from panda3d.core import Shader
 
 
 class ShaderRegistry:
     # Static shader dictionary
-    shaders = {}
+    shaders: Dict[str, Shader] = {}
 
     @staticmethod
     def register(identifier: str, frag: str, vert: str):

run.bat

@@ -1,5 +1,5 @@
-"C:/Panda3D-1.11.0-Py39-x64/python/python.exe" -m pip install -r requirements.txt
+"C:/Panda3D-1.11.0_off-x64/python/python.exe" -m pip install -r requirements.txt
 :top
-"C:/Panda3D-1.11.0-Py39-x64/python/python.exe" -m ttle --hoods TT
+"C:/Panda3D-1.11.0-py39-x64/python/python.exe" -m ttle --server clash --hoods OT
 pause
 goto top

toontown/leveleditor/LevelEditorPanel.py

@@ -1601,7 +1601,6 @@ def toggleDrive(self):
     def exportToBam(self):
         """
         Export level geometry as .bam
-        :return:
         """
         path = Filename.expandFrom(userfiles).toOsSpecific()
         if not os.path.isdir(path):

toontown/leveleditor/RadialMenu.py

@@ -1,4 +1,4 @@
-''' Camera Radial Menu - drewcification 091720 '''
+""" Camera Radial Menu - drewcification 091720 """
 from direct.directtools.DirectGeometry import *
 from direct.gui.DirectFrame import DirectFrame, OnscreenImage, OnscreenText
 from direct.showbase.DirectObject import DirectObject
@@ -15,19 +15,19 @@ def __init__(self, nodepath: NodePath, desc: str):
 
 class RadialMenu(DirectObject):
     def __init__(self, *items):
-        ''' 
+        """
             Initialize using the set of items specified
             Set of items should be passed as RadialItems
-        '''
+        """
         DirectObject.__init__(self)
         # Initialize variables
-        self.isActive = 0
-        self.selected = 0
+        self.isActive: bool = False
+        self.selected: int = 0
 
-        self.items = items
+        self.items: List[RadialItem] = items
 
         # Load the palletized gui model
-        gui = loader.loadModel("resources/camera_gui.bam")
+        gui: NodePath = loader.loadModel("resources/camera_gui.bam")
 
         # Create the frame
         self.frame = DirectFrame(geom = gui.find("**/radial_menu_bg"), parent = hidden, scale = 1.3, relief = None)
@@ -41,7 +41,7 @@ def __init__(self, *items):
 
         # Load all the and calculate their positions
         self.itemAngle = 360 / len(items)
-        self.itemImages = []
+        self.itemImages: List[OnscreenImage] = []
         for i in range(len(items)):
             x = .38 * math.cos(i * deg2Rad(self.itemAngle))
             z = .38 * math.sin(i * deg2Rad(self.itemAngle))
@@ -50,19 +50,19 @@ def __init__(self, *items):
             self.itemImages.append(img)
 
     def activate(self):
-        ''' Shows the menu and spawns the mouse reader task '''
+        """ Shows the menu and spawns the mouse reader task """
         self.frame.reparentTo(aspect2d)
         taskMgr.add(self.radialTask, 'cam-radialTask')
         self.isActive = 1
 
     def deactivate(self):
-        ''' Hides the menu and kills the mouse reader task '''
+        """ Hides the menu and kills the mouse reader task """
         taskMgr.remove('cam-radialTask')
         self.frame.reparentTo(hidden)
         self.isActive = 0
 
     def destroy(self):
-        ''' Destroy everything '''
+        """ Destroy everything """
         self.frame.destroy()
         self.selector.destroy()
         for item in self.itemImages:
@@ -74,12 +74,12 @@ def destroy(self):
         del self.frame
         del self.selector
 
-    def getChoice(self):
-        ''' Convenience Function Get the selected item '''
+    def getChoice(self) -> int:
+        """ Convenience Function Get the selected item """
         return self.selected
 
     def radialTask(self, task):
-        ''' Reads the mouse position and calculates which object it is looking at '''
+        """ Reads the mouse position and calculates which object it is looking at """
         # Initialize these as 0 incase we can't read the mouses position
         mouseX = 0
         mouseY = 0