mirror of
https://github.com/Sneed-Group/Poodletooth-iLand
synced 2024-12-23 19:52:37 -06:00
i committed them rename edits k
This commit is contained in:
parent
1d0d5fc2fe
commit
b23c33c957
30 changed files with 99 additions and 97 deletions
2
ai.bat
2
ai.bat
|
@ -16,7 +16,7 @@ set /P BASE_CHANNEL="Base channel (DEFAULT: 401000000): " || ^
|
|||
set BASE_CHANNEL=401000000
|
||||
|
||||
echo ===============================
|
||||
echo Starting Toontown United AI server...
|
||||
echo Starting Toontown Stride AI server...
|
||||
echo ppython: %PPYTHON_PATH%
|
||||
echo District name: %DISTRICT_NAME%
|
||||
echo Base channel: %BASE_CHANNEL%
|
||||
|
|
|
@ -20,7 +20,7 @@ uberdogs:
|
|||
id: 4501
|
||||
anonymous: false
|
||||
|
||||
- class: TTUFriendsManager
|
||||
- class: TTSFriendsManager
|
||||
id: 4666
|
||||
anonymous: false
|
||||
|
||||
|
@ -34,7 +34,7 @@ messagedirector:
|
|||
roles:
|
||||
- type: clientagent
|
||||
bind: 0.0.0.0:7199
|
||||
version: "united-dev"
|
||||
version: "stride-dev"
|
||||
client:
|
||||
relocate: true
|
||||
add_interest: enabled
|
||||
|
|
|
@ -20,7 +20,7 @@ uberdogs:
|
|||
id: 4501
|
||||
anonymous: false
|
||||
|
||||
- class: TTUFriendsManager
|
||||
- class: TTSFriendsManager
|
||||
id: 4666
|
||||
anonymous: false
|
||||
|
||||
|
@ -34,7 +34,7 @@ messagedirector:
|
|||
roles:
|
||||
- type: clientagent
|
||||
bind: 0.0.0.0:7299
|
||||
version: "united-dev"
|
||||
version: "stride-dev"
|
||||
client:
|
||||
relocate: true
|
||||
add_interest: enabled
|
||||
|
|
|
@ -20,7 +20,7 @@ uberdogs:
|
|||
id: 4501
|
||||
anonymous: false
|
||||
|
||||
- class: TTUFriendsManager
|
||||
- class: TTSFriendsManager
|
||||
id: 4666
|
||||
anonymous: false
|
||||
|
||||
|
@ -34,7 +34,7 @@ messagedirector:
|
|||
roles:
|
||||
- type: clientagent
|
||||
bind: 0.0.0.0:7399
|
||||
version: "united-dev"
|
||||
version: "stride-dev"
|
||||
client:
|
||||
relocate: true
|
||||
add_interest: enabled
|
||||
|
|
|
@ -20,7 +20,7 @@ uberdogs:
|
|||
id: 4501
|
||||
anonymous: false
|
||||
|
||||
- class: TTUFriendsManager
|
||||
- class: TTSFriendsManager
|
||||
id: 4666
|
||||
anonymous: false
|
||||
|
||||
|
@ -34,7 +34,7 @@ messagedirector:
|
|||
roles:
|
||||
- type: clientagent
|
||||
bind: 0.0.0.0:7499
|
||||
version: "united-dev"
|
||||
version: "stride-dev"
|
||||
client:
|
||||
relocate: true
|
||||
add_interest: enabled
|
||||
|
|
|
@ -20,7 +20,7 @@ uberdogs:
|
|||
id: 4501
|
||||
anonymous: false
|
||||
|
||||
- class: TTUFriendsManager
|
||||
- class: TTSFriendsManager
|
||||
id: 4666
|
||||
anonymous: false
|
||||
|
||||
|
@ -34,7 +34,7 @@ messagedirector:
|
|||
roles:
|
||||
- type: clientagent
|
||||
bind: 0.0.0.0:7599
|
||||
version: "united-dev"
|
||||
version: "stride-dev"
|
||||
client:
|
||||
relocate: true
|
||||
add_interest: enabled
|
||||
|
|
|
@ -20,7 +20,7 @@ uberdogs:
|
|||
id: 4501
|
||||
anonymous: false
|
||||
|
||||
- class: TTUFriendsManager
|
||||
- class: TTSFriendsManager
|
||||
id: 4666
|
||||
anonymous: false
|
||||
|
||||
|
@ -34,7 +34,7 @@ messagedirector:
|
|||
roles:
|
||||
- type: clientagent
|
||||
bind: 0.0.0.0:7699
|
||||
version: "united-dev"
|
||||
version: "stride-dev"
|
||||
client:
|
||||
relocate: true
|
||||
add_interest: enabled
|
||||
|
|
|
@ -20,7 +20,7 @@ uberdogs:
|
|||
id: 4501
|
||||
anonymous: false
|
||||
|
||||
- class: TTUFriendsManager
|
||||
- class: TTSFriendsManager
|
||||
id: 4666
|
||||
anonymous: false
|
||||
|
||||
|
@ -34,7 +34,7 @@ messagedirector:
|
|||
roles:
|
||||
- type: clientagent
|
||||
bind: 0.0.0.0:7799
|
||||
version: "united-dev"
|
||||
version: "stride-dev"
|
||||
client:
|
||||
relocate: true
|
||||
add_interest: enabled
|
||||
|
|
|
@ -20,7 +20,7 @@ uberdogs:
|
|||
id: 4501
|
||||
anonymous: false
|
||||
|
||||
- class: TTUFriendsManager
|
||||
- class: TTSFriendsManager
|
||||
id: 4666
|
||||
anonymous: false
|
||||
|
||||
|
@ -34,7 +34,7 @@ messagedirector:
|
|||
roles:
|
||||
- type: clientagent
|
||||
bind: 0.0.0.0:7899
|
||||
version: "united-dev"
|
||||
version: "stride-dev"
|
||||
client:
|
||||
relocate: true
|
||||
add_interest: enabled
|
||||
|
|
|
@ -4,7 +4,7 @@ daemon:
|
|||
general:
|
||||
eventlogger: 127.0.0.1:7198
|
||||
dc_files:
|
||||
- ../dclass/united.dc
|
||||
- ../dclass/stride.dc
|
||||
|
||||
messagedirector:
|
||||
bind: 127.0.0.1:7100
|
||||
|
@ -22,7 +22,7 @@ uberdogs:
|
|||
id: 4501
|
||||
anonymous: false
|
||||
|
||||
- class: TTUFriendsManager
|
||||
- class: TTSFriendsManager
|
||||
id: 4666
|
||||
anonymous: false
|
||||
|
||||
|
@ -33,7 +33,7 @@ uberdogs:
|
|||
roles:
|
||||
- type: clientagent
|
||||
bind: 0.0.0.0:7199
|
||||
version: "ttu-dev"
|
||||
version: "tts-dev"
|
||||
client:
|
||||
relocate: true
|
||||
add_interest: enabled
|
||||
|
|
|
@ -17,7 +17,7 @@ read -p "Base channel (DEFAULT: 401000000): " BASE_CHANNEL
|
|||
BASE_CHANNEL=${BASE_CHANNEL:-401000000}
|
||||
|
||||
echo "==============================="
|
||||
echo "Starting Toontown United AI server..."
|
||||
echo "Starting Toontown Stride AI server..."
|
||||
echo "District name: $DISTRICT_NAME"
|
||||
echo "Base channel: $BASE_CHANNEL"
|
||||
echo "Max channels: $MAX_CHANNELS"
|
||||
|
|
|
@ -15,7 +15,7 @@ read -p "Base channel (DEFAULT: 1000000): " BASE_CHANNEL
|
|||
BASE_CHANNEL=${BASE_CHANNEL:-1000000}
|
||||
|
||||
echo "==============================="
|
||||
echo "Starting Toontown United UberDOG server..."
|
||||
echo "Starting Toontown Stride UberDOG server..."
|
||||
echo "Base channel: $BASE_CHANNEL"
|
||||
echo "Max channels: $MAX_CHANNELS"
|
||||
echo "State Server: $STATESERVER"
|
||||
|
|
|
@ -471,7 +471,7 @@ from toontown.parties import DistributedPartyJukeboxActivity/AI
|
|||
from toontown.parties import DistributedPartyJukebox40Activity/AI
|
||||
from toontown.parties import DistributedPartyValentineJukeboxActivity/AI
|
||||
from toontown.parties import DistributedPartyValentineJukebox40Activity/AI
|
||||
from toontown.friends import TTUFriendsManager/UD
|
||||
from toontown.friends import TTSFriendsManager/UD
|
||||
from toontown.safezone import DistributedGolfKart/AI
|
||||
from toontown.safezone import DistributedPicnicBasket/AI
|
||||
from toontown.distributed import DistributedTimer/AI
|
||||
|
@ -3285,7 +3285,7 @@ blob dna;
|
|||
uint32 petId;
|
||||
};
|
||||
|
||||
dclass TTUFriendsManager : DistributedObjectGlobal {
|
||||
dclass TTSFriendsManager : DistributedObjectGlobal {
|
||||
removeFriend(uint32) clsend;
|
||||
requestAvatarInfo(uint32[]) clsend;
|
||||
|
18
client.bat
18
client.bat
|
@ -1,5 +1,5 @@
|
|||
@echo off
|
||||
title TTU Game Launcher
|
||||
title TTS Game Launcher
|
||||
set /P PPYTHON_PATH=<PPYTHON_PATH
|
||||
|
||||
echo Choose your game server!
|
||||
|
@ -10,22 +10,22 @@ echo.
|
|||
set /P INPUT=
|
||||
set server=unset
|
||||
|
||||
if %INPUT%==1 set TTU_GAMESERVER=127.0.0.1
|
||||
if %INPUT%==3 set TTU_GAMESERVER=71.200.196.180
|
||||
if %INPUT%==1 set TTS_GAMESERVER=127.0.0.1
|
||||
if %INPUT%==3 set TTS_GAMESERVER=71.200.196.180
|
||||
|
||||
if %TTU_GAMESERVER%==unset (
|
||||
if %TTS_GAMESERVER%==unset (
|
||||
echo.
|
||||
set /P TTU_GAMESERVER=Gameserver:
|
||||
set /P TTS_GAMESERVER=Gameserver:
|
||||
)
|
||||
|
||||
echo.
|
||||
set /P TTU_PLAYCOOKIE=Username:
|
||||
set /P TTS_PLAYCOOKIE=Username:
|
||||
|
||||
echo ===============================
|
||||
echo Starting Toontown United...
|
||||
echo Starting Toontown Stride...
|
||||
echo ppython: %PPYTHON_PATH%
|
||||
echo Username: %TTU_PLAYCOOKIE%
|
||||
echo Gameserver: %TTU_GAMESERVER%
|
||||
echo Username: %TTS_PLAYCOOKIE%
|
||||
echo Gameserver: %TTS_GAMESERVER%
|
||||
echo ===============================
|
||||
|
||||
%PPYTHON_PATH% -m toontown.toonbase.ClientStart
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
# Window settings:
|
||||
window-title Toontown United
|
||||
window-title Toontown Stride
|
||||
win-origin -1 -1
|
||||
icon-filename phase_3/etc/icon.ico
|
||||
cursor-filename phase_3/etc/toonmono.cur
|
||||
|
|
|
@ -5,7 +5,7 @@ distribution dev
|
|||
model-path ../resources/
|
||||
|
||||
# Server:
|
||||
server-version ttu-dev
|
||||
server-version tts-dev
|
||||
min-access-level 600
|
||||
accountdb-type developer
|
||||
shard-low-pop 50
|
||||
|
@ -16,7 +16,7 @@ want-rpc-server #f
|
|||
rpc-server-endpoint http://localhost:8080/
|
||||
|
||||
# DClass files (in reverse order):
|
||||
dc-file astron/dclass/united.dc
|
||||
dc-file astron/dclass/stride.dc
|
||||
|
||||
# Core features:
|
||||
want-pets #t
|
||||
|
|
|
@ -2,18 +2,18 @@
|
|||
cd ..
|
||||
|
||||
# Get the user input:
|
||||
read -p "Username: " ttuUsername
|
||||
read -p "Username: " ttsUsername
|
||||
|
||||
# Export the environment variables:
|
||||
export ttuUsername=$ttuUsername
|
||||
export ttuPassword="password"
|
||||
export TTU_PLAYCOOKIE=$ttuUsername
|
||||
export TTU_GAMESERVER="127.0.0.1"
|
||||
export ttsUsername=$ttsUsername
|
||||
export ttsPassword="password"
|
||||
export TTS_PLAYCOOKIE=$ttsUsername
|
||||
export TTS_GAMESERVER="127.0.0.1"
|
||||
|
||||
echo "==============================="
|
||||
echo "Starting Toontown United..."
|
||||
echo "Username: $ttuUsername"
|
||||
echo "Gameserver: $TTU_GAMESERVER"
|
||||
echo "Starting Toontown Stride..."
|
||||
echo "Username: $ttsUsername"
|
||||
echo "Gameserver: $TTS_GAMESERVER"
|
||||
echo "==============================="
|
||||
|
||||
/usr/bin/python2 -m toontown.toonbase.ClientStart
|
||||
|
|
|
@ -2,22 +2,22 @@
|
|||
cd ..
|
||||
|
||||
# Get the user input:
|
||||
read -p "Username: " ttuUsername
|
||||
read -s -p "Password: " ttuPassword
|
||||
read -p "Username: " ttsUsername
|
||||
read -s -p "Password: " ttsPassword
|
||||
echo
|
||||
read -p "Gameserver (DEFAULT: 167.114.28.238): " TTU_GAMESERVER
|
||||
TTU_GAMESERVER=${TTU_GAMESERVER:-"167.114.28.238"}
|
||||
read -p "Gameserver (DEFAULT: 167.114.28.238): " TTS_GAMESERVER
|
||||
TTS_GAMESERVER=${TTS_GAMESERVER:-"167.114.28.238"}
|
||||
|
||||
# Export the environment variables:
|
||||
export ttuUsername=$ttuUsername
|
||||
export ttuPassword=$ttuPassword
|
||||
export TTU_PLAYCOOKIE=$ttuUsername
|
||||
export TTU_GAMESERVER=$TTU_GAMESERVER
|
||||
export ttsUsername=$ttsUsername
|
||||
export ttsPassword=$ttsPassword
|
||||
export TTS_PLAYCOOKIE=$ttsUsername
|
||||
export TTS_GAMESERVER=$TTS_GAMESERVER
|
||||
|
||||
echo "==============================="
|
||||
echo "Starting Toontown United..."
|
||||
echo "Username: $ttuUsername"
|
||||
echo "Gameserver: $TTU_GAMESERVER"
|
||||
echo "Starting Toontown Stride..."
|
||||
echo "Username: $ttsUsername"
|
||||
echo "Gameserver: $TTS_GAMESERVER"
|
||||
echo "==============================="
|
||||
|
||||
/usr/bin/python2 -m toontown.toonbase.ClientStartRemoteDB
|
||||
|
|
|
@ -2,20 +2,20 @@
|
|||
cd ..
|
||||
|
||||
# Get the user input:
|
||||
read -p "Username: " ttuUsername
|
||||
read -p "Gameserver (DEFAULT: 167.114.28.238): " TTU_GAMESERVER
|
||||
TTU_GAMESERVER=${TTU_GAMESERVER:-"167.114.28.238"}
|
||||
read -p "Username: " ttsUsername
|
||||
read -p "Gameserver (DEFAULT: 167.114.28.238): " TTS_GAMESERVER
|
||||
TTS_GAMESERVER=${TTS_GAMESERVER:-"167.114.28.238"}
|
||||
|
||||
# Export the environment variables:
|
||||
export ttuUsername=$ttuUsername
|
||||
export ttuPassword="password"
|
||||
export TTU_PLAYCOOKIE=$ttuUsername
|
||||
export TTU_GAMESERVER=$TTU_GAMESERVER
|
||||
export ttsUsername=$ttsUsername
|
||||
export ttsPassword="password"
|
||||
export TTS_PLAYCOOKIE=$ttsUsername
|
||||
export TTS_GAMESERVER=$TTS_GAMESERVER
|
||||
|
||||
echo "==============================="
|
||||
echo "Starting Toontown United..."
|
||||
echo "Username: $ttuUsername"
|
||||
echo "Gameserver: $TTU_GAMESERVER"
|
||||
echo "Starting Toontown Stride..."
|
||||
echo "Username: $ttsUsername"
|
||||
echo "Gameserver: $TTS_GAMESERVER"
|
||||
echo "==============================="
|
||||
|
||||
/usr/bin/python2 -m toontown.toonbase.ClientStart
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
from pandac.PandaModules import *
|
||||
|
||||
|
||||
hashVal = 4040865593L
|
||||
hashVal = 4040859151L
|
||||
|
||||
|
||||
from toontown.coghq import DistributedCashbotBossSafe, DistributedCashbotBossCrane, DistributedBattleFactory, DistributedCashbotBossTreasure, DistributedCogHQDoor, DistributedSellbotHQDoor, DistributedFactoryElevatorExt, DistributedMintElevatorExt, DistributedLawOfficeElevatorExt, DistributedLawOfficeElevatorInt, LobbyManager, DistributedMegaCorp, DistributedFactory, DistributedLawOffice, DistributedLawOfficeFloor, DistributedLift, DistributedDoorEntity, DistributedSwitch, DistributedButton, DistributedTrigger, DistributedCrushableEntity, DistributedCrusherEntity, DistributedStomper, DistributedStomperPair, DistributedLaserField, DistributedGolfGreenGame, DistributedSecurityCamera, DistributedMover, DistributedElevatorMarker, DistributedBarrelBase, DistributedGagBarrel, DistributedBeanBarrel, DistributedHealBarrel, DistributedGrid, ActiveCell, DirectionalCell, CrusherCell, DistributedCrate, DistributedSinkingPlatform, BattleBlocker, DistributedMint, DistributedMintRoom, DistributedMintBattle, DistributedStage, DistributedStageRoom, DistributedStageBattle, DistributedLawbotBossGavel, DistributedLawbotCannon, DistributedLawbotChair, DistributedCogKart, DistributedCountryClub, DistributedCountryClubRoom, DistributedMoleField, DistributedCountryClubBattle, DistributedMaze, DistributedFoodBelt, DistributedBanquetTable, DistributedGolfSpot
|
||||
|
@ -28,7 +28,7 @@ from toontown.racing import DistributedVehicle, DistributedStartingBlock, Distri
|
|||
from toontown.catalog import CatalogManager
|
||||
from toontown.parties import DistributedParty, DistributedPartyActivity, DistributedPartyTeamActivity, DistributedPartyCannon, DistributedPartyCannonActivity, DistributedPartyCatchActivity, DistributedPartyWinterCatchActivity, DistributedPartyCogActivity, DistributedPartyWinterCogActivity, DistributedPartyFireworksActivity, DistributedPartyDanceActivityBase, DistributedPartyDanceActivity, DistributedPartyDance20Activity, DistributedPartyValentineDanceActivity, DistributedPartyValentineDance20Activity, DistributedPartyTrampolineActivity, DistributedPartyValentineTrampolineActivity, DistributedPartyVictoryTrampolineActivity, DistributedPartyWinterTrampolineActivity, DistributedPartyTugOfWarActivity, DistributedPartyJukeboxActivityBase, DistributedPartyJukeboxActivity, DistributedPartyJukebox40Activity, DistributedPartyValentineJukeboxActivity, DistributedPartyValentineJukebox40Activity
|
||||
from toontown.pets.DistributedPet import *
|
||||
from toontown.friends import TTUFriendsManager
|
||||
from toontown.friends import TTSFriendsManager
|
||||
from toontown.cogdominium import DistributedCogdoInterior, DistributedCogdoBattleBldg, DistributedCogdoElevatorExt, DistributedCogdoElevatorInt, DistributedCogdoBarrel, DistCogdoGame, DistCogdoLevelGame, DistCogdoBoardroomGame, DistCogdoCraneGame, DistCogdoMazeGame, DistCogdoFlyingGame, DistCogdoCrane, DistCogdoCraneMoneyBag, DistCogdoCraneCog
|
||||
from toontown.uberdog.ARGManager import ARGManager
|
||||
from otp.distributed import Account, DistributedDistrict, DistributedDirectory
|
||||
|
|
|
@ -2,9 +2,9 @@ from direct.distributed.MsgTypes import *
|
|||
OTP_DO_ID_FRIEND_MANAGER = 4501
|
||||
OTP_DO_ID_TOONTOWN = 1337
|
||||
OTP_DO_ID_CLIENT_SERVICES_MANAGER = 4665
|
||||
OTP_DO_ID_TTU_FRIENDS_MANAGER = 4666
|
||||
OTP_DO_ID_TTS_FRIENDS_MANAGER = 4666
|
||||
OPT_DO_ID_GROUP_MANAGER = 4667
|
||||
OTP_DO_ID_TTU_ARG_MANAGER = 4668
|
||||
OTP_DO_ID_TTS_ARG_MANAGER = 4668
|
||||
OTP_DO_ID_GLOBAL_PARTY_MANAGER = 4477
|
||||
OTP_DO_ID_CHAT_MANAGER = 4681
|
||||
OTP_ZONE_ID_MANAGEMENT = 2
|
||||
|
|
|
@ -50,7 +50,7 @@ class FriendManager(DistributedObject.DistributedObject):
|
|||
|
||||
def up_inviteeFriendResponse(self, yesNoMaybe, context):
|
||||
if yesNoMaybe == 1:
|
||||
base.cr.ttuFriendsManager.friendOnline(self.otherToon, 0, 0)
|
||||
base.cr.ttsFriendsManager.friendOnline(self.otherToon, 0, 0)
|
||||
self.sendUpdate('inviteeFriendResponse', [yesNoMaybe, context])
|
||||
self.notify.debug('Client: inviteeFriendResponse(%d, %d)' % (yesNoMaybe, context))
|
||||
|
||||
|
@ -64,7 +64,7 @@ class FriendManager(DistributedObject.DistributedObject):
|
|||
|
||||
def friendResponse(self, yesNoMaybe, context):
|
||||
if yesNoMaybe == 1:
|
||||
base.cr.ttuFriendsManager.friendOnline(self.otherToon, 0, 0)
|
||||
base.cr.ttsFriendsManager.friendOnline(self.otherToon, 0, 0)
|
||||
self.notify.debug('Client: friendResponse(%d, %d)' % (yesNoMaybe, context))
|
||||
messenger.send('friendResponse', [yesNoMaybe, context])
|
||||
|
||||
|
|
|
@ -2,4 +2,6 @@ set /P PPYTHON_PATH=<../PPYTHON_PATH
|
|||
|
||||
cd..
|
||||
|
||||
%PPYTHON_PATH% tools\parse_dcimports.py -o "otp/distributed/DCClassImports.py" "astron/dclass/united.dc"
|
||||
%PPYTHON_PATH% tools\parse_dcimports.py -o "otp/distributed/DCClassImports.py" "astron/dclass/stride.dc"
|
||||
|
||||
pause
|
|
@ -75,9 +75,9 @@ class ToontownClientRepository(OTPClientRepository.OTPClientRepository):
|
|||
self.toontownTimeManager = ToontownTimeManager.ToontownTimeManager()
|
||||
|
||||
self.csm = self.generateGlobalObject(OtpDoGlobals.OTP_DO_ID_CLIENT_SERVICES_MANAGER, 'ClientServicesManager')
|
||||
self.ttuFriendsManager = self.generateGlobalObject(OtpDoGlobals.OTP_DO_ID_TTU_FRIENDS_MANAGER, 'TTUFriendsManager')
|
||||
self.ttsFriendsManager = self.generateGlobalObject(OtpDoGlobals.OTP_DO_ID_TTS_FRIENDS_MANAGER, 'TTSFriendsManager')
|
||||
|
||||
self.argManager = self.generateGlobalObject(OtpDoGlobals.OTP_DO_ID_TTU_ARG_MANAGER, 'ARGManager')
|
||||
self.argManager = self.generateGlobalObject(OtpDoGlobals.OTP_DO_ID_TTS_ARG_MANAGER, 'ARGManager')
|
||||
|
||||
self.furnitureManager = None
|
||||
self.objectManager = None
|
||||
|
@ -330,9 +330,9 @@ class ToontownClientRepository(OTPClientRepository.OTPClientRepository):
|
|||
|
||||
def __sendGetAvatarDetails(self, avId, pet=0):
|
||||
if pet:
|
||||
self.ttuFriendsManager.d_getPetDetails(avId)
|
||||
self.ttsFriendsManager.d_getPetDetails(avId)
|
||||
else:
|
||||
self.ttuFriendsManager.d_getAvatarDetails(avId)
|
||||
self.ttsFriendsManager.d_getAvatarDetails(avId)
|
||||
|
||||
def n_handleGetAvatarDetailsResp(self, avId, fields):
|
||||
self.notify.info('Query reponse for avId %d' % avId)
|
||||
|
@ -695,7 +695,7 @@ class ToontownClientRepository(OTPClientRepository.OTPClientRepository):
|
|||
return 1
|
||||
|
||||
def removeFriend(self, avatarId):
|
||||
self.ttuFriendsManager.d_removeFriend(avatarId)
|
||||
self.ttsFriendsManager.d_removeFriend(avatarId)
|
||||
|
||||
def clearFriendState(self):
|
||||
self.friendsMap = {}
|
||||
|
@ -706,7 +706,7 @@ class ToontownClientRepository(OTPClientRepository.OTPClientRepository):
|
|||
def sendGetFriendsListRequest(self):
|
||||
self.friendsMapPending = 1
|
||||
self.friendsListError = 0
|
||||
self.ttuFriendsManager.d_requestFriendsList()
|
||||
self.ttsFriendsManager.d_requestFriendsList()
|
||||
|
||||
def cleanPetsFromFriendsMap(self):
|
||||
for objId, obj in self.friendsMap.items():
|
||||
|
@ -988,7 +988,7 @@ class ToontownClientRepository(OTPClientRepository.OTPClientRepository):
|
|||
def requestAvatarInfo(self, avId):
|
||||
if avId == 0:
|
||||
return
|
||||
self.ttuFriendsManager.d_requestAvatarInfo([avId])
|
||||
self.ttsFriendsManager.d_requestAvatarInfo([avId])
|
||||
|
||||
def queueRequestAvatarInfo(self, avId):
|
||||
removeTask = 0
|
||||
|
@ -1005,4 +1005,4 @@ class ToontownClientRepository(OTPClientRepository.OTPClientRepository):
|
|||
return
|
||||
if len(self.avatarInfoRequests) == 0:
|
||||
return
|
||||
self.ttuFriendsManager.d_requestAvatarInfo(self.avatarInfoRequests)
|
||||
self.ttsFriendsManager.d_requestAvatarInfo(self.avatarInfoRequests)
|
||||
|
|
|
@ -2,7 +2,7 @@ from direct.distributed.DistributedObjectGlobal import DistributedObjectGlobal
|
|||
from otp.otpbase import OTPLocalizer
|
||||
from toontown.hood import ZoneUtil
|
||||
|
||||
class TTUFriendsManager(DistributedObjectGlobal):
|
||||
class TTSFriendsManager(DistributedObjectGlobal):
|
||||
def d_removeFriend(self, friendId):
|
||||
self.sendUpdate('removeFriend', [friendId])
|
||||
|
|
@ -185,8 +185,8 @@ class ClearListOperation(OperationFSM):
|
|||
|
||||
# -- FriendsManager --
|
||||
|
||||
class TTUFriendsManagerUD(DistributedObjectGlobalUD):
|
||||
notify = directNotify.newCategory('TTUFriendsManagerUD')
|
||||
class TTSFriendsManagerUD(DistributedObjectGlobalUD):
|
||||
notify = directNotify.newCategory('TTSFriendsManagerUD')
|
||||
|
||||
def announceGenerate(self):
|
||||
DistributedObjectGlobalUD.announceGenerate(self)
|
|
@ -19,13 +19,13 @@ class LogAndOutput:
|
|||
self.log.flush()
|
||||
self.orig.flush()
|
||||
|
||||
class TTULauncher:
|
||||
notify = DirectNotifyGlobal.directNotify.newCategory('TTULauncher')
|
||||
class TTSLauncher:
|
||||
notify = DirectNotifyGlobal.directNotify.newCategory('TTSLauncher')
|
||||
|
||||
def __init__(self):
|
||||
self.http = HTTPClient()
|
||||
|
||||
self.logPrefix = 'united-'
|
||||
self.logPrefix = 'stride-'
|
||||
|
||||
ltime = 1 and time.localtime()
|
||||
logSuffix = '%02d%02d%02d_%02d%02d%02d' % (ltime[0] - 2000, ltime[1], ltime[2], ltime[3], ltime[4], ltime[5])
|
||||
|
@ -43,10 +43,10 @@ class TTULauncher:
|
|||
sys.stderr = logErr
|
||||
|
||||
def getPlayToken(self):
|
||||
return self.getValue('TTU_PLAYCOOKIE')
|
||||
return self.getValue('TTS_PLAYCOOKIE')
|
||||
|
||||
def getGameServer(self):
|
||||
return self.getValue('TTU_GAMESERVER')
|
||||
return self.getValue('TTS_GAMESERVER')
|
||||
|
||||
def getValue(self, key, default = None):
|
||||
return os.environ.get(key, default)
|
|
@ -113,9 +113,9 @@ import time
|
|||
import sys
|
||||
import random
|
||||
import __builtin__
|
||||
from toontown.launcher.TTULauncher import TTULauncher
|
||||
from toontown.launcher.TTSLauncher import TTSLauncher
|
||||
|
||||
__builtin__.launcher = TTULauncher()
|
||||
__builtin__.launcher = TTSLauncher()
|
||||
|
||||
notify.info('Starting the game...')
|
||||
tempLoader = Loader()
|
||||
|
|
|
@ -50,6 +50,6 @@ class ToontownUberRepository(ToontownInternalRepository):
|
|||
|
||||
self.csm = simbase.air.generateGlobalObject(OTP_DO_ID_CLIENT_SERVICES_MANAGER, 'ClientServicesManager')
|
||||
self.chatAgent = simbase.air.generateGlobalObject(OTP_DO_ID_CHAT_MANAGER, 'ChatAgent')
|
||||
self.friendsManager = simbase.air.generateGlobalObject(OTP_DO_ID_TTU_FRIENDS_MANAGER, 'TTUFriendsManager')
|
||||
self.friendsManager = simbase.air.generateGlobalObject(OTP_DO_ID_TTS_FRIENDS_MANAGER, 'TTSFriendsManager')
|
||||
self.globalPartyMgr = simbase.air.generateGlobalObject(OTP_DO_ID_GLOBAL_PARTY_MANAGER, 'GlobalPartyManager')
|
||||
self.groupManager = simbase.air.generateGlobalObject(OPT_DO_ID_GROUP_MANAGER, 'GroupManager')
|
||||
|
|
2
ud.bat
2
ud.bat
|
@ -14,7 +14,7 @@ set /P BASE_CHANNEL="Base channel (DEFAULT: 1000000): " || ^
|
|||
set BASE_CHANNEL=1000000
|
||||
|
||||
echo ===============================
|
||||
echo Starting Toontown United UberDOG server...
|
||||
echo Starting Toontown Stride UberDOG server...
|
||||
echo ppython: %PPYTHON_PATH%
|
||||
echo Base channel: %BASE_CHANNEL%
|
||||
echo Max channels: %MAX_CHANNELS%
|
||||
|
|
Loading…
Reference in a new issue