toontown/achievements cleanup

toontown/achievements/AchievementGui.py

@@ -5,17 +5,17 @@ from toontown.toonbase import ToontownGlobals
 from direct.gui.DirectGui import *
 from pandac.PandaModules import *
 
-class AchievementGui():
-    
+class AchievementGui:
+
     def __init__(self):
         self.queue = []
         self.currentShowingAward = 0
-    
+
     def earnAchievement(self, achievementId):
         if self.queue == []:
             applause = loader.loadSfx('phase_6/audio/sfx/KART_Applause_2.ogg')
             applause.play()
-            
+
             self.queue.append(achievementId)
             self.showAchievement()
         else:
@@ -27,50 +27,50 @@ class AchievementGui():
                 self.currentShowingAward = self.queue[0]
                 self.displayAchievement()
                 self.frameSequence()
-    
+
     def displayAchievement(self):
         currentAchievement = AchievementsGlobals.AchievementImages[self.currentShowingAward]
         image = loader.loadModel(currentAchievement[0])
         imageNode = image.find(currentAchievement[1])
         imageNode.setColor(currentAchievement[2])
         imageNode.setScale(currentAchievement[3])
-        
+
         self.frame = OnscreenGeom(geom='phase_3/models/gui/dialog_box_gui', scale=(0.8, 1, 0.55), parent=base.a2dTopRight,
                                   pos=(0.45, 0, -0.275))
-        
+
         self.image = OnscreenGeom(geom=imageNode, parent=self.frame)
 
         self.title = OnscreenText(text='You earned an Achievement!', scale=(0.06, 0.11), font=ToontownGlobals.getMinnieFont(),
                                   parent=self.frame, pos=(0, 0.33), align=TextNode.ACenter)
-        
+
         self.achievementName = OnscreenText(text=AchievementsGlobals.AchievementTitles[self.currentShowingAward], scale=(0.06, 0.09),
                                             font=ToontownGlobals.getMinnieFont(), parent=self.frame, align=TextNode.ACenter, pos=(0, 0.2))
-        
+
         self.details = OnscreenText(text=AchievementsGlobals.AchievementDesc[self.currentShowingAward], scale=(0.04, 0.07),
                                     font=ToontownGlobals.getMinnieFont(), parent=self.frame, align=TextNode.ACenter, pos=(0, -0.4))
-        
+
     def frameSequence(self):
         self.seq = Sequence()
         self.seq.append(LerpPosInterval(self.frame, 1, (-0.45, 0, -0.275)))
         self.seq.append(Wait(2))
         self.seq.append(LerpPosInterval(self.frame, 1, (0.45, 0, -0.275)))
         self.seq.append(Func(self.cleanupCurrentFrame))
-        
+
         self.seq.start()
-        
+
     def cleanupCurrentFrame(self):
         self.frame.destroy()
         del self.frame
-        
+
         self.title.destroy()
         del self.title
-        
+
         self.achievementName.destroy()
         del self.achievementName
-        
+
         self.details.destroy()
         del self.details
-        
+
         del self.queue[0]
         self.currentShowingAward = 0
-        self.showAchievement()
+        self.showAchievement()

toontown/achievements/Achievements.py

@@ -7,7 +7,7 @@ COG = 0
 V2COG = 1
 SKELECOG = 2
 
-class FriendAchievement():
+class FriendAchievement:
 
     def __init__(self, neededFriends=1):
         self.neededFriends = neededFriends
@@ -20,12 +20,12 @@ class FriendAchievement():
 
         return 0
 
-class TrolleyAchievement():
+class TrolleyAchievement:
 
     def hasComplete(self, av):
         return 1
 
-class SuitsAchievement():
+class SuitsAchievement:
 
     def __init__(self, neededSuits=1, neededType=ANY_TYPE, revive=0, skele=0):
         self.neededSuits = neededSuits
@@ -40,12 +40,12 @@ class SuitsAchievement():
 
         return 0
 
-class EstateAchievement():
+class EstateAchievement:
 
     def hasComplete(self, av):
         return 1
 
-class VPAchievement():
+class VPAchievement:
 
     def __init__(self, neededLaff=ANY_LAFF, solo=False):
         self.neededLaff = neededLaff
@@ -68,7 +68,7 @@ class VPAchievement():
 
         return complete
 
-class CFOAchievement():
+class CFOAchievement:
 
     def __init__(self, neededLaff=ANY_LAFF, solo=False):
         self.neededLaff = neededLaff
@@ -91,7 +91,7 @@ class CFOAchievement():
 
         return complete
 
-class CJAchievement():
+class CJAchievement:
 
     def __init__(self, neededLaff=ANY_LAFF, solo=False):
         self.neededLaff = neededLaff
@@ -114,7 +114,7 @@ class CJAchievement():
 
         return complete
 
-class CEOAchievement():
+class CEOAchievement:
 
     def __init__(self, neededLaff=ANY_LAFF, solo=False):
         self.neededLaff = neededLaff
@@ -165,4 +165,4 @@ type2AchievementIds = {FriendAchievement: [0, 1, 2],
                        VPAchievement: [5, 6, 7, 8]}
 
 def getAchievementsOfType(type):
-    return type2AchievementIds.get(type)
+    return type2AchievementIds.get(type)

toontown/achievements/AchievementsGlobals.py

@@ -22,4 +22,4 @@ AchievementImages = (('phase_3.5/models/gui/friendslist_gui', '**/FriendsBox_Rol
                      ('phase_3.5/models/gui/stickerbook_gui', '**/BossHead3Icon', (1, 1, 1, 1), 0.3),
                      ('phase_3.5/models/gui/stickerbook_gui', '**/BossHead3Icon', (1, 1, 1, 1), 0.3),
                      ('phase_3.5/models/gui/stickerbook_gui', '**/BossHead3Icon', (1, 1, 1, 1), 0.3),
-                     ('phase_3.5/models/gui/stickerbook_gui', '**/BossHead3Icon', (1, 1, 1, 1), 0.3))
+                     ('phase_3.5/models/gui/stickerbook_gui', '**/BossHead3Icon', (1, 1, 1, 1), 0.3))

toontown/ai/AchievementsManagerAI.py

@@ -1,6 +1,6 @@
 from toontown.achievements import Achievements
 
-class AchievementsManagerAI():
+class AchievementsManagerAI:
     def __init__(self, air):
         self.air = air