Fix some TTI cancer

config/release/test.prc

@@ -18,15 +18,10 @@ boarding-group-merges #t
 
 # Sellbot boss:
 disable-sos-card 91917
-disable-sos-card 91918
 
 # Optional:
-want-chestnut-park-construction #f
 cogdo-pop-factor 1.5
 cogdo-ratio 0.4
 
-# Temporary:
-want-phone-quest #t
-
 # Staff events:
 cfo-staff-event #f

toontown/friends/TTPlayerFriendsManager.py

@@ -9,4 +9,4 @@ class TTPlayerFriendsManager(PlayerFriendsManager):
         PlayerFriendsManager.__init__(self, cr)
 
     def sendRequestInvite(self, playerId):
-        self.sendUpdate('requestInvite', [0, playerId, False])
+        self.sendUpdate('requestInvite', [0, playerId, False])

toontown/quest/Quests.py

@@ -2427,7 +2427,7 @@ QuestDict = {
     3260: (DG_TIER, Cont, (RecoverItemQuest, ToontownGlobals.SellbotHQ, 1, 5016, Easy, 's', 'track'), Same, Same, NA, 3261, TTLocalizer.QuestDialogDict[3260]),
     3261: (DG_TIER, Cont, (RecoverItemQuest, ToontownGlobals.SellbotHQ, 1, 5017, Medium, 's', 'track'), Same, Same, 102, NA, TTLocalizer.QuestDialogDict[3261]),
     3262: (DG_TIER, Start, (VisitQuest,), Any, 5313, NA, 3263, TTLocalizer.QuestDialogDict[3262]),
-    3263: (DG_TIER, Start, (CogQuest, ToontownGlobals.SellbotHQ, 20, Any), 5313, 5313, 702, NA, TTLocalizer.QuestDialogDict[3263]),
+    3263: (DG_TIER, Start, (FactoryQuest, ToontownGlobals.SellbotHQ, 1), 5313, 5313, 702, NA, TTLocalizer.QuestDialogDict[3263]),
     3500: (DG_TIER, Start, (CogQuest, ToontownGlobals.DaisyGardens, 25, Any), Any, ToonHQ, NA, 3501, DefaultDialog),
     3501: (DG_TIER, Cont, (DeliverItemQuest, 1000), Any, 5007, 1000, NA, DefaultDialog),
     4001: (MM_TIER, Start, (TrackChoiceQuest,), Any, ToonHQ, 400, NA, TTLocalizer.QuestDialogDict[4001]),
@@ -3508,10 +3508,6 @@ QuestDict = {
     12032: (BOSSBOT_HQ_TIER + 16, Start, (VisitQuest,), Any, 2001, 4216, NA, TTLocalizer.QuestDialogDict[12032]),
     10207: (ELDER_TIER, Cont, (DeliverItemQuest, 1000), Any, ToonTailor, 1000, NA, DefaultDialog)}
 
-if not config.GetBool('want-phone-quest', 1):
-    QuestDict[150] = (TT_TIER, Cont, (FriendQuest,), Same, ToonHQ, 100, NA, DefaultDialog)
-    QuestDict[175] = (TT_TIER, OBSOLETE, (PhoneQuest,), Same, ToonHQ, 100, NA, TTLocalizer.QuestDialogDict[175])
-
 Tier2QuestsDict = {}
 
 for questId, questDesc in QuestDict.items():

toontown/safezone/OZSafeZoneLoader.py

@@ -103,79 +103,6 @@ class OZSafeZoneLoader(SafeZoneLoader):
         self.waterfallActor.setPos(waterfallPlacer.getPos())
         self.accept('clientLogout', self._handleLogout)
 
-        # If Chestnut Park is under construction, create the construction site:
-        if base.config.GetBool('want-chestnut-park-construction', False):
-            self.constructionSite = render.attachNewNode('constructionSite')
-
-            self.constructionSiteBlocker = self.constructionSite.attachNewNode(CollisionNode('constructionSiteBlocker'))
-            self.constructionSiteBlocker.setPos(-48, -154.5, 0)
-            self.constructionSiteBlocker.node().addSolid(CollisionSphere(0, 0, 0, 35))
-
-            self.coneModel = loader.loadModel('phase_3.5/models/props/unpainted_barrier_cone.bam')
-
-            self.cone0 = Actor.Actor(self.coneModel)
-            self.cone0.loadAnims({'jumptwist': 'phase_3.5/models/props/barrier_cone_chan_jumptwist.bam'})
-            self.cone0.reparentTo(self.constructionSite)
-            self.cone0.loop('jumptwist')
-            self.cone0.setPos(-43, -142, 0.025)
-
-            self.cone1 = Actor.Actor(self.coneModel)
-            self.cone1.loadAnims({'walktrip': 'phase_3.5/models/props/barrier_cone_chan_walktrip.bam'})
-            self.cone1.reparentTo(self.constructionSite)
-            self.cone1.loop('walktrip')
-            self.cone1.setPos(-52, -145, 0.025)
-
-            self.ladder = loader.loadModel('phase_5/models/props/ladder2.bam')
-            self.ladder.reparentTo(self.constructionSite)
-            self.ladder.setPosHpr(-36.460, -130.828, 0.30, 61, -90, 0)
-            self.ladder.find('**/shadow').removeNode()
-
-            self.paintersWantedSign = loader.loadModel('phase_6/models/props/tti_painters_wanted_sign.bam')
-            self.paintersWantedSign.reparentTo(self.constructionSite)
-            self.paintersWantedSign.setPosHpr(-57, -129.613, 0.025, 160, 0, 0)
-
-            self.constructionSign = loader.loadModel('phase_4/models/props/construction_sign.bam')
-            self.constructionSign.reparentTo(self.constructionSite)
-            self.constructionSign.setPosHpr(-47.941, -138.724, 0.122, 181, 0, 0)
-
-            if base.config.GetBool('want-oz-painter-pete', False):
-                self.painterPete = Toon.Toon()
-
-                self.painterPete.setName('Painter Pete')
-                self.painterPete.setPickable(0)
-                self.painterPete.setPlayerType(NametagGlobals.CCNonPlayer)
-
-                dna = ToonDNA.ToonDNA()
-                dna.newToonFromProperties('hls', 'ss', 'm', 'm', 18, 0, 13, 9, 0, 0, 0, 0, 2, 15, 0)
-                self.painterPete.setDNA(dna)
-
-                self.painterPete.setHat(43, 0, 0)
-
-                self.painterPete.animFSM.request('neutral')
-                self.painterPete.reparentTo(self.constructionSite)
-                self.painterPete.setPosHpr(-52.5, -133.5, 0.025, 338, 0, 0)
-
-                self.painterPete.sadEyes()
-                self.painterPete.blinkEyes()
-
-                speechTextList = (
-                    "Oh, brother. How am I going to clean up all of this? Those painters left a big mess here, and I can't finish the job without them!",
-                    "I'm beginning to feel nervous about where all of my painters went off to. Construction can't continue without them!",
-                    "These cones are out of my control. They're disobedient, and they will not listen to what I say.",
-                    "What's a playground without color, anyway? Walking into something like that would be surreal for you all. As a painter, though, I'm pretty used to it.",
-                    "The Cogs couldn't have done this... could they?",
-                    "If anyone sees my painters anywhere, please let me know. Then maybe we'll get this playground done!",
-                    "Looks like I'll have to finish this sign myself.",
-                    'The documents for this project were just sitting right by this tunnel... Where could they have gone?'
-                )
-                self.painterPeteSpeech = Sequence()
-                for speechText in speechTextList:
-                    self.painterPeteSpeech.append(Func(self.painterPete.setChatAbsolute, speechText, CFSpeech))
-                    self.painterPeteSpeech.append(Wait(0.55 * len(speechText.split(' '))))
-                    self.painterPeteSpeech.append(Func(self.painterPete.clearChat))
-                    self.painterPeteSpeech.append(Wait(6))
-                self.painterPeteSpeech.loop(0)
-
     def exit(self):
         self.clearToonTracks()
         SafeZoneLoader.exit(self)
@@ -368,25 +295,6 @@ class OZSafeZoneLoader(SafeZoneLoader):
         self.geyserSoundNoToonInterval = None
         self.geyserSoundNoToon = None
 
-        if hasattr(self, 'constructionSite'):
-            if hasattr(self, 'painterPete'):
-                self.painterPeteSpeech.pause()
-                self.painterPete.delete()
-            self.paintersWantedSign.removeNode()
-            self.ladder.removeNode()
-            self.cone0.cleanup()
-            self.cone1.cleanup()
-            self.coneModel.removeNode()
-            self.constructionSiteBlocker.removeNode()
-            self.constructionSite.removeNode()
-            del self.paintersWantedSign
-            del self.ladder
-            del self.cone0
-            del self.cone1
-            del self.coneModel
-            del self.constructionSiteBlocker
-            del self.constructionSite
-
     def enterPlayground(self, requestStatus):
         self.playgroundClass = OZPlayground
         SafeZoneLoader.enterPlayground(self, requestStatus)

toontown/toonbase/TTLocalizerEnglish.py

@@ -8934,7 +8934,7 @@ CatalogPurchaseHouseType = "When you buy a new house type, the current one is re
 buffIdStrings = {
   0: ('Your movement speed will be slightly increased for the next %d %s.',
       'Reward: Increased movement speed'),
-  1: ('Your gag accuracy will be slight increased for the next %d %s.',
+  1: ('Your gag accuracy will be slightly increased for the next %d %s.',
       'Reward: Increased gag accuracy')
 }