Sneed-Group/Poodletooth-iLand
1
0
Fork 0
mirror of https://github.com/Sneed-Group/Poodletooth-iLand synced 2024-12-23 11:42:39 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

Remove ARGManagerAI/UD, add unused knockknock sfx, change otp.dc and toon.dc in the other astron configs to stride.dc

Browse source
This commit is contained in:
John 2015-06-20 11:20:52 +03:00
parent 49764e5163
commit a8fc4f513b
15 changed files with 12 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
dependencies/astron/config/clientagent-0.yml vendored
View file

@ -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

3
dependencies/astron/config/clientagent-1.yml vendored
View file

@ -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

3
dependencies/astron/config/clientagent-2.yml vendored
View file

@ -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

3
dependencies/astron/config/clientagent-3.yml vendored
View file

@ -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

3
dependencies/astron/config/clientagent-4.yml vendored
View file

@ -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

3
dependencies/astron/config/clientagent-5.yml vendored
View file

@ -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

3
dependencies/astron/config/clientagent-6.yml vendored
View file

@ -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

3
dependencies/astron/config/clientagent-7.yml vendored
View file

@ -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

3
dependencies/astron/config/production-cluster.yml vendored
View file

@ -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

2
dependencies/astron/dclass/stride.dc vendored
View file

@ -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;

1
otp/distributed/OtpDoGlobals.py
View file

@ -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

4
toontown/building/DistributedKnockKnockDoor.py
View file

@ -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

2
toontown/distributed/ToontownClientRepository.py
View file

@ -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

4
toontown/uberdog/ARGManagerAI.py
View file

@ -1,4 +0,0 @@
from direct.distributed.DistributedObjectGlobalAI import DistributedObjectGlobalAI
class ARGManagerAI(DistributedObjectGlobalAI):
pass

4
toontown/uberdog/ARGManagerUD.py
View file

@ -1,4 +0,0 @@
from direct.distributed.DistributedObjectGlobalUD import DistributedObjectGlobalUD
class ARGManagerUD(DistributedObjectGlobalUD):
pass