I can't believe how many times I removed trolley holiday/weekend

dependencies/astron/dclass/stride.dc

@@ -1536,12 +1536,6 @@ dclass NewsManager : DistributedObject {
   setBingoEnd() broadcast;
   setCircuitRaceStart() broadcast;
   setCircuitRaceEnd() broadcast;
-  setTrolleyHolidayStart() broadcast;
-  setTrolleyHolidayEnd() broadcast;
-  setTrolleyWeekendStart() broadcast;
-  setTrolleyWeekendEnd() broadcast;
-  setRoamingTrialerWeekendStart() broadcast;
-  setRoamingTrialerWeekendEnd() broadcast;
   setInvasionStatus(uint8, string, uint32, uint8) broadcast;
   setHolidayIdList(uint32[]) broadcast ram;
   holidayNotify() broadcast;

toontown/ai/DistributedPolarPlaceEffectMgrAI.py

@@ -18,6 +18,9 @@ class DistributedPolarPlaceEffectMgrAI(DistributedObjectAI, FSM):
     def addPolarPlaceEffect(self):
         avId = self.air.getAvatarIdFromSender()
         av = self.air.doId2do.get(avId)
-        if not av: return
+
+        if not av:
+            return
+
         expireTime = int((time.time()/60) + 0.5) + 60
-        av.b_setCheesyEffect(13, 3000, expireTime)
+        av.b_setCheesyEffect(13, 3000, expireTime)

toontown/ai/HolidayBaseAI.py

@@ -1,13 +0,0 @@
-from direct.directnotify.DirectNotifyGlobal import *
-
-
-class HolidayBaseAI:
-    def __init__(self, air, holidayId):
-        self.air = air
-        self.holidayId = holidayId
-
-    def start(self):
-        pass
-
-    def stop(self):
-        pass

toontown/ai/NewsManager.py

@@ -414,21 +414,6 @@ class NewsManager(DistributedObject.DistributedObject):
     def setCircuitRaceEnd(self):
         base.localAvatar.setSystemMessage(0, TTLocalizer.CircuitRaceEnd)
 
-    def setTrolleyHolidayStart(self):
-        base.localAvatar.setSystemMessage(0, TTLocalizer.TrolleyHolidayStart)
-
-    def setTrolleyHolidayOngoing(self):
-        base.localAvatar.setSystemMessage(0, TTLocalizer.TrolleyHolidayOngoing)
-
-    def setTrolleyHolidayEnd(self):
-        base.localAvatar.setSystemMessage(0, TTLocalizer.TrolleyHolidayEnd)
-
-    def setTrolleyWeekendStart(self):
-        base.localAvatar.setSystemMessage(0, TTLocalizer.TrolleyWeekendStart)
-
-    def setTrolleyWeekendEnd(self):
-        base.localAvatar.setSystemMessage(0, TTLocalizer.TrolleyWeekendEnd)
-
     def setMoreXpHolidayStart(self):
         base.localAvatar.setSystemMessage(0, TTLocalizer.MoreXpHolidayStart)
 
@@ -544,8 +529,6 @@ class NewsManager(DistributedObject.DistributedObject):
         for id in self.holidayIdList:
             if id == 20:
                 self.setCircuitRaceOngoing()
-            elif id == 21:
-                self.setTrolleyHolidayOngoing()
 
     def setWeeklyCalendarHolidays(self, weeklyCalendarHolidays):
         self.weeklyCalendarHolidays = weeklyCalendarHolidays

toontown/ai/NewsManagerAI.py

@@ -1,7 +1,6 @@
 from direct.directnotify.DirectNotifyGlobal import directNotify
 from direct.distributed.DistributedObjectAI import DistributedObjectAI
 
-
 class NewsManagerAI(DistributedObjectAI):
     notify = directNotify.newCategory('NewsManagerAI')
 
@@ -32,18 +31,6 @@ class NewsManagerAI(DistributedObjectAI):
     def setCircuitRaceEnd(self):
         pass
 
-    def setTrolleyHolidayStart(self):
-        pass
-
-    def setTrolleyHolidayEnd(self):
-        pass
-
-    def setTrolleyWeekendStart(self):
-        pass
-
-    def setTrolleyWeekendEnd(self):
-        pass
-
     def setInvasionStatus(self, msgType, cogType, numRemaining, skeleton):
         self.sendUpdate('setInvasionStatus', args=[msgType, cogType, numRemaining, skeleton])
 
@@ -84,4 +71,4 @@ class NewsManagerAI(DistributedObjectAI):
         return []
 
     def sendSystemMessage(self, todo0, todo1):
-        pass
+        pass

toontown/minigame/TrolleyHolidayMgrAI.py

@@ -1,23 +0,0 @@
-from direct.directnotify.DirectNotifyGlobal import *
-from toontown.ai import HolidayBaseAI
-
-
-class TrolleyHolidayMgrAI(HolidayBaseAI.HolidayBaseAI):
-    notify = directNotify.newCategory('TrolleyHolidayMgrAI')
-
-    PostName = 'TrolleyHoliday'
-    StartStopMsg = 'TrolleyHolidayStartStop'
-
-    def start(self):
-        HolidayBaseAI.HolidayBaseAI.start(self)
-
-        bboard.post(TrolleyHolidayMgrAI.PostName, True)
-        simbase.air.newsManager.trolleyHolidayStart()
-        messenger.send(TrolleyHolidayMgrAI.StartStopMsg)
-
-    def stop(self):
-        HolidayBaseAI.HolidayBaseAI.stop(self)
-
-        bboard.remove(TrolleyHolidayMgrAI.PostName)
-        simbase.air.newsManager.trolleyHolidayEnd()
-        messenger.send(TrolleyHolidayMgrAI.StartStopMsg)

toontown/minigame/TrolleyWeekendMgrAI.py

@@ -1,24 +0,0 @@
-from direct.directnotify.DirectNotifyGlobal import *
-from toontown.ai import HolidayBaseAI
-
-
-class TrolleyWeekendMgrAI(HolidayBaseAI.HolidayBaseAI):
-    notify = directNotify.newCategory('TrolleyWeekendMgrAI')
-
-    PostName = 'TrolleyWeekend'
-    StartStopMsg = 'TrolleyWeekendStartStop'
-
-    def start(self):
-        HolidayBaseAI.HolidayBaseAI.start(self)
-
-        bboard.post(TrolleyWeekendMgrAI.PostName, True)
-        simbase.air.newsManager.trolleyWeekendStart()
-        messenger.send(TrolleyWeekendMgrAI.StartStopMsg)
-
-
-    def stop(self):
-        HolidayBaseAI.HolidayBaseAI.stop(self)
-
-        bboard.remove(TrolleyWeekendMgrAI.PostName)
-        simbase.air.newsManager.trolleyWeekendEnd()
-        messenger.send(TrolleyWeekendMgrAI.StartStopMsg)

toontown/safezone/DistributedTrolleyAI.py

@@ -7,8 +7,6 @@ from direct.fsm import State
 from direct.task import Task
 from otp.ai.AIBase import *
 from toontown.minigame import MinigameCreatorAI
-from toontown.minigame import TrolleyHolidayMgrAI
-from toontown.minigame import TrolleyWeekendMgrAI
 from toontown.quest import Quests
 from toontown.toonbase.ToontownGlobals import *
 

toontown/toonbase/TTLocalizerEnglish.py

@@ -7793,11 +7793,6 @@ def getResultPlantedSomethingSentence(flowerName):
         retval = ResultPlantedSomething % flowerName
     return retval
 
-TrolleyHolidayStart = 'Trolley Tracks is about to begin!  Board any trolley with 2 or more toons to play.'
-TrolleyHolidayOngoing = 'Welcome! Trolley Tracks is currently in progress.'
-TrolleyHolidayEnd = "That's all for today's Trolley Tracks.  See you next week!"
-TrolleyWeekendStart = 'Trolley Tracks Weekend is about to begin!  Board any trolley with 2 or more toons to play.'
-TrolleyWeekendEnd = "That's all for Trolley Tracks Weekend."
 VineGameTitle = 'Jungle Vines'
 VineGameInstructions = 'Get to the rightmost vine in time. Press Up or Down to climb the vine.  Press Left or Right to change facing and jump.  The lower you are on the vine, the faster you jump off.  Collect the bananas if you can, but avoid the bats and spiders.'
 ValentinesDayStart = "Happy ValenToon's Day!"
@@ -8228,7 +8223,6 @@ HolidayNamesInCalendar = {1: ('Summer Fireworks', 'Celebrate Summer with a firew
  13: ('Trick or Treat', 'Happy Halloween! Trick or treat throughout Toontown to get a nifty Halloween pumpkin head reward!'),
  14: ('Grand Prix', 'Grand Prix Monday at Goofy Speedway! To win, collect the most points in three consecutive races!'),
  16: ('Grand Prix Weekend', 'Toons compete in circuit races at Goofy Speedway!'),
- 17: ('Trolley Tracks', 'Trolley Tracks Thursday! Board any Trolley with two or more Toons to play.'),
  19: ('Silly Saturdays', 'Saturdays are silly with Fish Bingo and Grand Prix throughout the day!'),
  24: ('Ides of March', 'Beware the Ides of March! Stop the Backstabber Cogs from invading Toontown!'),
  26: ('Halloween Decor', 'Celebrate Halloween as spooky trees and streetlights transform Toontown!'),

toontown/toonbase/ToontownGlobals.py

@@ -840,11 +840,8 @@ TRICK_OR_TREAT = 13
 CIRCUIT_RACING = 14
 POLAR_PLACE_EVENT = 15
 CIRCUIT_RACING_EVENT = 16
-TROLLEY_HOLIDAY = 17
-TROLLEY_WEEKEND = 18
 SILLY_SATURDAY_BINGO = 19
 SILLY_SATURDAY_CIRCUIT = 20
-SILLY_SATURDAY_TROLLEY = 21
 BOSSCOG_INVASION = 23
 MARCH_INVASION = 24
 MORE_XP_HOLIDAY = 25