diff --git a/toontown/battle/HealJokes.py b/toontown/battle/HealJokes.py deleted file mode 100755 index 3c081bb8..00000000 --- a/toontown/battle/HealJokes.py +++ /dev/null @@ -1,2 +0,0 @@ -from toontown.toonbase import TTLocalizer -toonHealJokes = TTLocalizer.ToonHealJokes diff --git a/toontown/battle/MovieHeal.py b/toontown/battle/MovieHeal.py index 72e9615d..1ba0f9ca 100755 --- a/toontown/battle/MovieHeal.py +++ b/toontown/battle/MovieHeal.py @@ -7,7 +7,6 @@ from BattleBase import * import BattleParticles from BattleProps import * from BattleSounds import * -import HealJokes import MovieCamera import MovieNPCSOS import MovieUtil @@ -180,7 +179,7 @@ def __healJoke(heal, hasInteractivePropHealBonus): targets = heal['target'] ineffective = heal['sidestep'] level = heal['level'] - jokeIndex = heal['hpbonus'] % len(HealJokes.toonHealJokes) + jokeIndex = heal['hpbonus'] % len(TTLocalizer.ToonHealJokes) if npcId != 0: track = Sequence(MovieNPCSOS.teleportIn(heal, toon)) else: @@ -203,7 +202,7 @@ def __healJoke(heal, hasInteractivePropHealBonus): tracks.append(Sequence(Wait(tDoSoundAnimation), ActorInterval(toon, 'sound'))) soundTrack = __getSoundTrack(level, 2.0, node=toon) tracks.append(soundTrack) - joke = HealJokes.toonHealJokes[jokeIndex] + joke = TTLocalizer.ToonHealJokes[jokeIndex] tracks.append(Sequence(Wait(tSpeakSetup), Func(toon.setChatAbsolute, joke[0], CFSpeech | CFTimeout))) tracks.append(Sequence(Wait(tSpeakPunchline), Func(toon.setChatAbsolute, joke[1], CFSpeech | CFTimeout))) reactTrack = Sequence(Wait(tTargetReact)) diff --git a/toontown/battle/MovieNPCSOS.py b/toontown/battle/MovieNPCSOS.py index 932838ae..7f994dc4 100755 --- a/toontown/battle/MovieNPCSOS.py +++ b/toontown/battle/MovieNPCSOS.py @@ -5,7 +5,6 @@ import random import BattleParticles from BattleProps import * from BattleSounds import * -import HealJokes import MovieCamera import MovieUtil from toontown.chat.ChatGlobals import * diff --git a/toontown/battle/MoviePetSOS.py b/toontown/battle/MoviePetSOS.py index aebe706e..6822113c 100755 --- a/toontown/battle/MoviePetSOS.py +++ b/toontown/battle/MoviePetSOS.py @@ -5,7 +5,6 @@ import random import BattleParticles from BattleProps import * from BattleSounds import * -import HealJokes import MovieCamera import MovieUtil from toontown.chat.ChatGlobals import * diff --git a/toontown/battle/PlayByPlayText.py b/toontown/battle/PlayByPlayText.py index 00fe9e58..7e36e399 100755 --- a/toontown/battle/PlayByPlayText.py +++ b/toontown/battle/PlayByPlayText.py @@ -29,4 +29,4 @@ class PlayByPlayText(OnscreenText.OnscreenText): track += newList track.append(Wait(duration * 0.1)) - return track + return track \ No newline at end of file diff --git a/toontown/coghq/DistributedLawOfficeElevatorIntAI.py b/toontown/coghq/DistributedLawOfficeElevatorIntAI.py index 1f1ae9bc..269539f8 100755 --- a/toontown/coghq/DistributedLawOfficeElevatorIntAI.py +++ b/toontown/coghq/DistributedLawOfficeElevatorIntAI.py @@ -3,7 +3,6 @@ from direct.fsm import ClassicFSM from direct.fsm import State from direct.task import Task from otp.ai.AIBase import * -from toontown.building import DistributedElevatorAI from toontown.building import DistributedElevatorFloorAI from toontown.building.ElevatorConstants import * from toontown.toonbase import ToontownGlobals diff --git a/toontown/toon/DistributedToon.py b/toontown/toon/DistributedToon.py index fa399bd2..31987787 100755 --- a/toontown/toon/DistributedToon.py +++ b/toontown/toon/DistributedToon.py @@ -99,6 +99,7 @@ class DistributedToon(DistributedPlayer.DistributedPlayer, Toon.Toon, Distribute self.disguisePage = None self.sosPage = None self.gardenPage = None + self.emoteAccess = [0] * 27 self.cogTypes = [0, 0, 0, 0] self.cogLevels = [0, 0, 0, 0] self.cogParts = [0, 0, 0, 0] diff --git a/toontown/toonbase/TTLocalizerEnglish.py b/toontown/toonbase/TTLocalizerEnglish.py index 8ff67028..632a081b 100755 --- a/toontown/toonbase/TTLocalizerEnglish.py +++ b/toontown/toonbase/TTLocalizerEnglish.py @@ -164,7 +164,6 @@ lNo = 'No' SleepAutoReply = '%s is sleeping right now.' lHQOfficerF = 'HQ Officer' lHQOfficerM = 'HQ Officer' -AIStartDefaultDistrict = 'Sillyville' Cog = 'Cog' Cogs = 'Cogs' ACog = 'a Cog' @@ -1885,10 +1884,7 @@ ChatGarblerDog = ['woof', 'arf', 'rruff'] ChatGarblerCat = ['meow', 'mew'] ChatGarblerMouse = ['squeak', 'squeaky', 'squeakity'] ChatGarblerHorse = ['neigh', 'brrr'] -ChatGarblerRabbit = ['eek', - 'eepr', - 'eepy', - 'eeky'] +ChatGarblerRabbit = ['eek', 'eepr', 'eepy', 'eeky'] ChatGarblerDuck = ['quack', 'quackity', 'quacky'] ChatGarblerMonkey = ['ooh', 'ooo', 'ahh'] ChatGarblerBear = ['growl', 'grrr'] diff --git a/toontown/toonbase/ToontownGlobals.py b/toontown/toonbase/ToontownGlobals.py index 482630a2..e6fff528 100755 --- a/toontown/toonbase/ToontownGlobals.py +++ b/toontown/toonbase/ToontownGlobals.py @@ -510,7 +510,6 @@ PieCodeBossInsides = 4 PieCodeDefensePan = 5 PieCodeProsecutionPan = 6 PieCodeLawyer = 7 -PieCodeInvasionSuit = 8 PieCodeColors = {PieCodeBossCog: None, PieCodeNotBossCog: (0.8, 0.8, @@ -1402,30 +1401,6 @@ GlitchKillerZones = [13300, 13400, 13500, 13600] -ColorPlayer = (0.3, - 0.7, - 0.3, - 1) -ColorAvatar = (0.3, - 0.3, - 0.7, - 1) -ColorPet = (0.6, - 0.4, - 0.2, - 1) -ColorFreeChat = (0.3, - 0.3, - 0.8, - 1) -ColorSpeedChat = (0.2, - 0.6, - 0.4, - 1) -ColorNoChat = (0.8, - 0.5, - 0.1, - 1) FactoryLaffMinimums = [(0, 31, 0), (0, 66, 71), (0, @@ -1628,3 +1603,4 @@ CostPerLaffRestock = 3 FISHSALE_NONE = 0 FISHSALE_COMPLETE = 1 FISHSALE_TROPHY = 2 +NPCCollisionDelay = 2.5 diff --git a/toontown/uberdog/ARGManager.py b/toontown/uberdog/ARGManager.py index 121fb288..994a1183 100755 --- a/toontown/uberdog/ARGManager.py +++ b/toontown/uberdog/ARGManager.py @@ -1,18 +1,14 @@ from direct.distributed.DistributedObjectGlobal import DistributedObjectGlobal -from toontown.toonbase import ToontownGlobals from otp.speedchat import SpeedChatGlobals from direct.directnotify.DirectNotifyGlobal import directNotify -from toontown.hood import ZoneUtil -from pandac.PandaModules import Vec3 # Portable Hole settings Hood2Details = { - # hood : [pos, speedchatIndex, destination] - 2514: [(6, 7, 9), 109, 2514] # TTC, Hello? + # hood : [speedchatIndex, destination] + 2514: [109, 2514] # TTC, Hello? } Interior2Messages = { 2514: ["Banker Bob: I have a very important message for you. Do not forget it.", "Banker Bob: Li0uLiAuLSAuLS0gLS4uLiAtLS0gLSAuLi4gLyAuLS4uIC0tLSAuLi4gLg=="] - } class ARGManager(DistributedObjectGlobal): @@ -20,7 +16,6 @@ class ARGManager(DistributedObjectGlobal): This is a client-view of the manager that handles everything to do with the portable hole ARG event. """ - notify = directNotify.newCategory('ARGManager') def __init__(self, cr): @@ -39,8 +34,8 @@ class ARGManager(DistributedObjectGlobal): def phraseSaid(phraseId): if not hasattr(base.cr.playGame, 'place') or not base.cr.playGame.getPlace(): return - position, speedchatIndex, destination = Hood2Details.get(base.cr.playGame.getPlace().getZoneId(), [None, None, None]) - if not position or not speedchatIndex or not destination: + speedchatIndex, destination = Hood2Details.get(base.cr.playGame.getPlace().getZoneId(), [None, None]) + if not speedchatIndex or not destination: return if speedchatIndex != phraseId: return @@ -50,8 +45,6 @@ class ARGManager(DistributedObjectGlobal): return taskMgr.doMethodLater(2, base.localAvatar.setSystemMessage, self.uniqueName("arg-before-msg"), extraArgs=[0, msgBefore]) taskMgr.doMethodLater(7, base.localAvatar.setSystemMessage, self.uniqueName("arg-after-msg"), extraArgs=[0, msgAfter]) - if destination == 3823: - taskMgr.doMethodLater(15, base.localAvatar.setSystemMessage, self.uniqueName("arg-after-after-msg"), extraArgs=[0, "'ttr://assets/LL-memo-607630003555.txt'. Keep it safe. I have no idea what it means, but Surlee certainly will."]) self.accept(SpeedChatGlobals.SCStaticTextMsgEvent, phraseSaid) def cleanupPortableHoleEvent(self):