From a8fc4f513b6fde90b6b0dcb073b115babbc8bdae Mon Sep 17 00:00:00 2001 From: John Date: Sat, 20 Jun 2015 11:20:52 +0300 Subject: [PATCH] Remove ARGManagerAI/UD, add unused knockknock sfx, change otp.dc and toon.dc in the other astron configs to stride.dc --- dependencies/astron/config/clientagent-0.yml | 3 +-- dependencies/astron/config/clientagent-1.yml | 3 +-- dependencies/astron/config/clientagent-2.yml | 3 +-- dependencies/astron/config/clientagent-3.yml | 3 +-- dependencies/astron/config/clientagent-4.yml | 3 +-- dependencies/astron/config/clientagent-5.yml | 3 +-- dependencies/astron/config/clientagent-6.yml | 3 +-- dependencies/astron/config/clientagent-7.yml | 3 +-- dependencies/astron/config/production-cluster.yml | 3 +-- dependencies/astron/dclass/stride.dc | 2 +- otp/distributed/OtpDoGlobals.py | 1 - toontown/building/DistributedKnockKnockDoor.py | 4 ++-- toontown/distributed/ToontownClientRepository.py | 2 -- toontown/uberdog/ARGManagerAI.py | 4 ---- toontown/uberdog/ARGManagerUD.py | 4 ---- 15 files changed, 12 insertions(+), 32 deletions(-) delete mode 100755 toontown/uberdog/ARGManagerAI.py delete mode 100755 toontown/uberdog/ARGManagerUD.py diff --git a/dependencies/astron/config/clientagent-0.yml b/dependencies/astron/config/clientagent-0.yml index a2df499f..4ed7f76b 100644 --- a/dependencies/astron/config/clientagent-0.yml +++ b/dependencies/astron/config/clientagent-0.yml @@ -4,8 +4,7 @@ daemon: general: eventlogger: 127.0.0.1:7198 dc_files: - - ../dclass/otp.dc - - ../dclass/toon.dc + - ../dclass/stride.dc uberdogs: - class: ClientServicesManager diff --git a/dependencies/astron/config/clientagent-1.yml b/dependencies/astron/config/clientagent-1.yml index 66c70dd0..780f7175 100644 --- a/dependencies/astron/config/clientagent-1.yml +++ b/dependencies/astron/config/clientagent-1.yml @@ -4,8 +4,7 @@ daemon: general: eventlogger: 127.0.0.1:7198 dc_files: - - ../dclass/otp.dc - - ../dclass/toon.dc + - ../dclass/stride.dc uberdogs: - class: ClientServicesManager diff --git a/dependencies/astron/config/clientagent-2.yml b/dependencies/astron/config/clientagent-2.yml index fa09576f..277d3570 100644 --- a/dependencies/astron/config/clientagent-2.yml +++ b/dependencies/astron/config/clientagent-2.yml @@ -4,8 +4,7 @@ daemon: general: eventlogger: 127.0.0.1:7198 dc_files: - - ../dclass/otp.dc - - ../dclass/toon.dc + - ../dclass/stride.dc uberdogs: - class: ClientServicesManager diff --git a/dependencies/astron/config/clientagent-3.yml b/dependencies/astron/config/clientagent-3.yml index d4426e7f..40a03d12 100644 --- a/dependencies/astron/config/clientagent-3.yml +++ b/dependencies/astron/config/clientagent-3.yml @@ -4,8 +4,7 @@ daemon: general: eventlogger: 127.0.0.1:7198 dc_files: - - ../dclass/otp.dc - - ../dclass/toon.dc + - ../dclass/stride.dc uberdogs: - class: ClientServicesManager diff --git a/dependencies/astron/config/clientagent-4.yml b/dependencies/astron/config/clientagent-4.yml index 4dd14e09..795ad10a 100644 --- a/dependencies/astron/config/clientagent-4.yml +++ b/dependencies/astron/config/clientagent-4.yml @@ -4,8 +4,7 @@ daemon: general: eventlogger: 127.0.0.1:7198 dc_files: - - ../dclass/otp.dc - - ../dclass/toon.dc + - ../dclass/stride.dc uberdogs: - class: ClientServicesManager diff --git a/dependencies/astron/config/clientagent-5.yml b/dependencies/astron/config/clientagent-5.yml index 0d86b2bb..ea34c1c8 100644 --- a/dependencies/astron/config/clientagent-5.yml +++ b/dependencies/astron/config/clientagent-5.yml @@ -4,8 +4,7 @@ daemon: general: eventlogger: 127.0.0.1:7198 dc_files: - - ../dclass/otp.dc - - ../dclass/toon.dc + - ../dclass/stride.dc uberdogs: - class: ClientServicesManager diff --git a/dependencies/astron/config/clientagent-6.yml b/dependencies/astron/config/clientagent-6.yml index f5ed2029..b5044745 100644 --- a/dependencies/astron/config/clientagent-6.yml +++ b/dependencies/astron/config/clientagent-6.yml @@ -4,8 +4,7 @@ daemon: general: eventlogger: 127.0.0.1:7198 dc_files: - - ../dclass/otp.dc - - ../dclass/toon.dc + - ../dclass/stride.dc uberdogs: - class: ClientServicesManager diff --git a/dependencies/astron/config/clientagent-7.yml b/dependencies/astron/config/clientagent-7.yml index ff0244b2..1dcfbdeb 100644 --- a/dependencies/astron/config/clientagent-7.yml +++ b/dependencies/astron/config/clientagent-7.yml @@ -4,8 +4,7 @@ daemon: general: eventlogger: 127.0.0.1:7198 dc_files: - - ../dclass/otp.dc - - ../dclass/toon.dc + - ../dclass/stride.dc uberdogs: - class: ClientServicesManager diff --git a/dependencies/astron/config/production-cluster.yml b/dependencies/astron/config/production-cluster.yml index e06757d1..51d69611 100644 --- a/dependencies/astron/config/production-cluster.yml +++ b/dependencies/astron/config/production-cluster.yml @@ -4,8 +4,7 @@ daemon: general: eventlogger: 127.0.0.1:7198 dc_files: - - ../dclass/otp.dc - - ../dclass/toon.dc + - ../dclass/stride.dc messagedirector: bind: 127.0.0.1:7100 diff --git a/dependencies/astron/dclass/stride.dc b/dependencies/astron/dclass/stride.dc index 76731556..8523d3cf 100644 --- a/dependencies/astron/dclass/stride.dc +++ b/dependencies/astron/dclass/stride.dc @@ -450,7 +450,7 @@ from toontown.cogdominium import DistCogdoCraneMoneyBag/AI from toontown.cogdominium import DistCogdoCraneCog/AI from toontown.parties.GlobalPartyManager/AI/UD import GlobalPartyManager/AI/UD from toontown.uberdog.GlobalLobbyManager/AI/UD import GlobalLobbyManager/AI/UD -from toontown.uberdog.ARGManager/AI/UD import ARGManager/AI/UD +from toontown.uberdog.ARGManager import ARGManager struct GiftItem { blob Item; diff --git a/otp/distributed/OtpDoGlobals.py b/otp/distributed/OtpDoGlobals.py index 4d93d9e7..771bfcfa 100755 --- a/otp/distributed/OtpDoGlobals.py +++ b/otp/distributed/OtpDoGlobals.py @@ -4,7 +4,6 @@ OTP_DO_ID_TOONTOWN = 1337 OTP_DO_ID_CLIENT_SERVICES_MANAGER = 4665 OTP_DO_ID_TTS_FRIENDS_MANAGER = 4666 OPT_DO_ID_GROUP_MANAGER = 4667 -OTP_DO_ID_TTS_ARG_MANAGER = 4668 OTP_DO_ID_GLOBAL_PARTY_MANAGER = 4477 OTP_DO_ID_GLOBAL_LOBBY_MANAGER = 4478 OTP_DO_ID_CHAT_MANAGER = 4681 diff --git a/toontown/building/DistributedKnockKnockDoor.py b/toontown/building/DistributedKnockKnockDoor.py index 60b125ba..ff0667bf 100755 --- a/toontown/building/DistributedKnockKnockDoor.py +++ b/toontown/building/DistributedKnockKnockDoor.py @@ -11,7 +11,7 @@ from toontown.nametag.NametagGlobals import * from toontown.nametag.NametagGroup import NametagGroup from toontown.toonbase import TTLocalizer from toontown.toonbase import ToontownGlobals - +import random class DistributedKnockKnockDoor(DistributedAnimatedProp.DistributedAnimatedProp): def __init__(self, cr): @@ -64,7 +64,7 @@ class DistributedKnockKnockDoor(DistributedAnimatedProp.DistributedAnimatedProp) if avatar is None: return self.rimshot = base.loadSfx('phase_5/audio/sfx/AA_heal_telljoke.ogg') - self.knockSfx = base.loadSfx('phase_5/audio/sfx/GUI_knock_3.ogg') + self.knockSfx = base.loadSfx('phase_5/audio/sfx/GUI_knock_%s.ogg' % random.randint(1, 4)) joke = KnockKnockJokes[self.propId % len(KnockKnockJokes)] place = base.cr.playGame.getPlace() doorName = TTLocalizer.DoorNametag diff --git a/toontown/distributed/ToontownClientRepository.py b/toontown/distributed/ToontownClientRepository.py index 64101c72..f43f130b 100755 --- a/toontown/distributed/ToontownClientRepository.py +++ b/toontown/distributed/ToontownClientRepository.py @@ -84,8 +84,6 @@ class ToontownClientRepository(OTPClientRepository.OTPClientRepository): self.csm = self.generateGlobalObject(OtpDoGlobals.OTP_DO_ID_CLIENT_SERVICES_MANAGER, 'ClientServicesManager') self.ttsFriendsManager = self.generateGlobalObject(OtpDoGlobals.OTP_DO_ID_TTS_FRIENDS_MANAGER, 'TTSFriendsManager') - self.argManager = self.generateGlobalObject(OtpDoGlobals.OTP_DO_ID_TTS_ARG_MANAGER, 'ARGManager') - self.streetSign = None self.furnitureManager = None self.objectManager = None diff --git a/toontown/uberdog/ARGManagerAI.py b/toontown/uberdog/ARGManagerAI.py deleted file mode 100755 index 1b180a83..00000000 --- a/toontown/uberdog/ARGManagerAI.py +++ /dev/null @@ -1,4 +0,0 @@ -from direct.distributed.DistributedObjectGlobalAI import DistributedObjectGlobalAI - -class ARGManagerAI(DistributedObjectGlobalAI): - pass diff --git a/toontown/uberdog/ARGManagerUD.py b/toontown/uberdog/ARGManagerUD.py deleted file mode 100755 index 50ca2705..00000000 --- a/toontown/uberdog/ARGManagerUD.py +++ /dev/null @@ -1,4 +0,0 @@ -from direct.distributed.DistributedObjectGlobalUD import DistributedObjectGlobalUD - -class ARGManagerUD(DistributedObjectGlobalUD): - pass