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

Renamed to Toontown United

Browse source
This commit is contained in:
Daniel 2015-03-11 00:36:03 +02:00
parent 697d56a7f4
commit c2d2a68364
37 changed files with 85 additions and 85 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
README.md
View file

@ -1,6 +1,6 @@
# src #
The source code for Toontown Unlimited.
The source code for Toontown United.
### What is this repository for? ###

2
astron/config/clientagent-0.yml
View file

@ -54,7 +54,7 @@ messagedirector:
roles:
- type: clientagent
bind: 0.0.0.0:7199
version: "unlimited-dev"
version: "united-dev"
client:
relocate: true
add_interest: enabled

2
astron/config/clientagent-1.yml
View file

@ -54,7 +54,7 @@ messagedirector:
roles:
- type: clientagent
bind: 0.0.0.0:7299
version: "unlimited-dev"
version: "united-dev"
client:
relocate: true
add_interest: enabled

2
astron/config/clientagent-2.yml
View file

@ -54,7 +54,7 @@ messagedirector:
roles:
- type: clientagent
bind: 0.0.0.0:7399
version: "unlimited-dev"
version: "united-dev"
client:
relocate: true
add_interest: enabled

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

@ -54,7 +54,7 @@ messagedirector:
roles:
- type: clientagent
bind: 0.0.0.0:7499
version: "unlimited-dev"
version: "united-dev"
client:
relocate: true
add_interest: enabled

2
astron/config/clientagent-4.yml
View file

@ -54,7 +54,7 @@ messagedirector:
roles:
- type: clientagent
bind: 0.0.0.0:7599
version: "unlimited-dev"
version: "united-dev"
client:
relocate: true
add_interest: enabled

2
astron/config/clientagent-5.yml
View file

@ -54,7 +54,7 @@ messagedirector:
roles:
- type: clientagent
bind: 0.0.0.0:7699
version: "unlimited-dev"
version: "united-dev"
client:
relocate: true
add_interest: enabled

2
astron/config/clientagent-6.yml
View file

@ -54,7 +54,7 @@ messagedirector:
roles:
- type: clientagent
bind: 0.0.0.0:7799
version: "unlimited-dev"
version: "united-dev"
client:
relocate: true
add_interest: enabled

2
astron/config/clientagent-7.yml
View file

@ -54,7 +54,7 @@ messagedirector:
roles:
- type: clientagent
bind: 0.0.0.0:7899
version: "unlimited-dev"
version: "united-dev"
client:
relocate: true
add_interest: enabled

2
astron/darwin/start-ai-server.sh
View file

@ -17,7 +17,7 @@ read -p "Base channel (DEFAULT: 401000000): " BASE_CHANNEL
BASE_CHANNEL=${BASE_CHANNEL:-401000000}
echo "==============================="
echo "Starting Toontown Unlimited AI server..."
echo "Starting Toontown United AI server..."
echo "District name: $DISTRICT_NAME"
echo "Base channel: $BASE_CHANNEL"
echo "Max channels: $MAX_CHANNELS"

2
astron/darwin/start-uberdog-server.sh
View file

@ -15,7 +15,7 @@ read -p "Base channel (DEFAULT: 1000000): " BASE_CHANNEL
BASE_CHANNEL=${BASE_CHANNEL:-1000000}
echo "==============================="
echo "Starting Toontown Unlimited UberDOG server..."
echo "Starting Toontown United UberDOG server..."
echo "Base channel: $BASE_CHANNEL"
echo "Max channels: $MAX_CHANNELS"
echo "State Server: $STATESERVER"

2
astron/linux/start-ai-server.sh
View file

@ -14,7 +14,7 @@ read -p "Base channel (DEFAULT: 401000000): " BASE_CHANNEL
BASE_CHANNEL=${BASE_CHANNEL:-401000000}
echo "==============================="
echo "Starting Toontown Unlimited AI server..."
echo "Starting Toontown United AI server..."
echo "District name: $DISTRICT_NAME"
echo "Base channel: $BASE_CHANNEL"
echo "Max channels: $MAX_CHANNELS"

2
astron/linux/start-uberdog-server.sh
View file

@ -12,7 +12,7 @@ read -p "Base channel (DEFAULT: 1000000): " BASE_CHANNEL
BASE_CHANNEL=${BASE_CHANNEL:-1000000}
echo "==============================="
echo "Starting Toontown Unlimited UberDOG server..."
echo "Starting Toontown United UberDOG server..."
echo "Base channel: $BASE_CHANNEL"
echo "Max channels: $MAX_CHANNELS"
echo "State Server: $STATESERVER"

4
config/general.prc
View file

@ -1,5 +1,5 @@
# Window settings:
window-title Toontown Unlimited
window-title Toontown United
win-origin -1 -1
icon-filename phase_3/etc/icon.ico
cursor-filename phase_3/etc/toonmono.cur
@ -34,7 +34,7 @@ backups-extension .json
# Server:
server-timezone EST/EDT/-5
server-port 7199
account-server-endpoint https://toontownunlimited.com/api/
account-server-endpoint https://toontownunited.com/api/
account-bridge-filename astron/databases/account-bridge.db
# Performance:

2
darwin/start-game-localhost.sh
View file

@ -14,7 +14,7 @@ export TTU_PLAYCOOKIE=$ttuUsername
export TTU_GAMESERVER="127.0.0.1"
echo "==============================="
echo "Starting Toontown Unlimited..."
echo "Starting Toontown United..."
echo "Username: $ttuUsername"
echo "Gameserver: $TTU_GAMESERVER"
echo "==============================="

2
darwin/start-game-remotedb.sh
View file

@ -18,7 +18,7 @@ export TTU_PLAYCOOKIE=$ttuUsername
export TTU_GAMESERVER=$TTU_GAMESERVER
echo "==============================="
echo "Starting Toontown Unlimited..."
echo "Starting Toontown United..."
echo "Username: $ttuUsername"
echo "Gameserver: $TTU_GAMESERVER"
echo "==============================="

2
darwin/start-game.sh
View file

@ -16,7 +16,7 @@ export TTU_PLAYCOOKIE=$ttuUsername
export TTU_GAMESERVER=$TTU_GAMESERVER
echo "==============================="
echo "Starting Toontown Unlimited..."
echo "Starting Toontown United..."
echo "Username: $ttuUsername"
echo "Gameserver: $TTU_GAMESERVER"
echo "==============================="

6
deployment/deploy.py
View file

@ -26,7 +26,7 @@ print 'Starting the deployment process...'
# Stop the user if they are missing vital files:
missingFiles = []
for filename in ('deploy.json', 'unlimitedcipher'):
for filename in ('deploy.json', 'unitedcipher'):
if sys.platform == 'win32':
# On the Windows platform, if there is no extension, we must infer that
# this is an executable file. Therefore, let's append '.exe':
@ -231,9 +231,9 @@ os.system(cmd)
# ...and encrypt the product:
os.chdir('build')
if sys.platform == 'win32':
os.system('..\\unlimitedcipher.exe %s GameData.bin' % output)
os.system('..\\unitedcipher.exe %s GameData.bin' % output)
else:
os.system('../unlimitedcipher %s GameData.bin' % output)
os.system('../unitedcipher %s GameData.bin' % output)
# Copy the necessary patcher includes:
for include in patcherIncludes:

2
linux/start-game-localhost.sh
View file

@ -11,7 +11,7 @@ export TTU_PLAYCOOKIE=$ttuUsername
export TTU_GAMESERVER="127.0.0.1"
echo "==============================="
echo "Starting Toontown Unlimited..."
echo "Starting Toontown United..."
echo "Username: $ttuUsername"
echo "Gameserver: $TTU_GAMESERVER"
echo "==============================="

2
linux/start-game-remotedb.sh
View file

@ -15,7 +15,7 @@ export TTU_PLAYCOOKIE=$ttuUsername
export TTU_GAMESERVER=$TTU_GAMESERVER
echo "==============================="
echo "Starting Toontown Unlimited..."
echo "Starting Toontown United..."
echo "Username: $ttuUsername"
echo "Gameserver: $TTU_GAMESERVER"
echo "==============================="

2
linux/start-game.sh
View file

@ -13,7 +13,7 @@ export TTU_PLAYCOOKIE=$ttuUsername
export TTU_GAMESERVER=$TTU_GAMESERVER
echo "==============================="
echo "Starting Toontown Unlimited..."
echo "Starting Toontown United..."
echo "Username: $ttuUsername"
echo "Gameserver: $TTU_GAMESERVER"
echo "==============================="

2
otp/avatar/DistributedPlayerAI.py
View file

@ -173,7 +173,7 @@ def maintenance(minutes):
dg = PyDatagram()
dg.addServerHeader(10, simbase.air.ourChannel, CLIENTAGENT_EJECT)
dg.addUint16(154)
dg.addString('Toontown Unlimited is now closed for maintenance.')
dg.addString('Toontown United is now closed for maintenance.')
simbase.air.send(dg)
return Task.done

22
otp/otpbase/OTPLocalizerEnglish.py
View file

@ -131,10 +131,10 @@ PrivacyPolicyText_Intro = [' ']
PrivacyPolicyClose = lClose
SecretFriendsInfoPanelOk = lOK
SecretFriendsInfoPanelClose = lClose
SecretFriendsInfoPanelText = ['\nThe Open Chat with True Friends Feature\n\nThe Open Chat with True Friends feature enables a member to chat directly with another member within Toontown Unlimited (the "Service") once the members establish a True Friends connection. When your child attempts to use the Open Chat with True Friends feature, we will require that you indicate your consent to your child\'s use of this feature by entering your Parent Account Password. Here is a detailed description of the process of creating an Open Chat with True Friends connection between members whom we will call "Sally" and "Mike."\n1. Sally\'s parent and Mike\'s parent each enable the Open Chat with True Friends feature by entering their respective Parent Account Passwords either (a) in the Account Options areas within the Service, or (b) when prompted within the game by a Parental Controls pop-up.\n2. Sally requests a True Friend Code (described below) from within the Service.\n',
SecretFriendsInfoPanelText = ['\nThe Open Chat with True Friends Feature\n\nThe Open Chat with True Friends feature enables a member to chat directly with another member within Toontown United (the "Service") once the members establish a True Friends connection. When your child attempts to use the Open Chat with True Friends feature, we will require that you indicate your consent to your child\'s use of this feature by entering your Parent Account Password. Here is a detailed description of the process of creating an Open Chat with True Friends connection between members whom we will call "Sally" and "Mike."\n1. Sally\'s parent and Mike\'s parent each enable the Open Chat with True Friends feature by entering their respective Parent Account Passwords either (a) in the Account Options areas within the Service, or (b) when prompted within the game by a Parental Controls pop-up.\n2. Sally requests a True Friend Code (described below) from within the Service.\n',
"\n3. Sally's True Friend Code is communicated to Mike outside of the Service. (Sally's True Friend Code may be communicated to Mike either directly by Sally, or indirectly through Sally's disclosure of the True Friend Code to another person.)\n4. Mike submits Sally's True Friend Code to the Service within 48 hours of the time that Sally requested the True Friend Code from the Service.\n5. The Service then notifies Mike that Sally has become Mike's True Friend. The Service similarly notifies Sally that Mike has become Sally's True Friend.\n6. Sally and Mike can now open chat directly with each other until either one chooses to terminate the other as a True Friend, or until the Open Chat with True Friends feature is disabled for either Sally or Mike by their respective parent. The True Friends connection can thus be disabled anytime by either: (a) a member removing the True Friend from his or her friends list (as described in the Service); or, (b) the parent of that member disabling the Open Chat with ",
"\nTrue Friends feature by going to the Account Options area within the Service and following the steps set forth there.\n\nA True Friend Code is a computer-generated random code assigned to a particular member. The True Friend Code must be used to activate a True Friend connection within 48 hours of the time that the member requests the True Friend Code; otherwise, the True Friend Code expires and cannot be used. Moreover, a single True Friend Code can only be used to establish one True Friend connection. To make additional True Friend connections, a member must request an additional True Friend Code for each additional True Friend.\n\nTrue Friendships do not transfer. For example, if Sally becomes a True Friend of Mike, and Mike becomes a True Friend of Jessica, Sally does not automatically become Jessica's True Friend. In order for Sally and Jessica to\n",
'\nbecome True Friends, one of them must request a new True Friend Code from the Service and communicate it to the other.\n\nTrue Friends communicate with one another in a free-form interactive open chat. The content of this chat is directly entered by the participating member and is processed through the Service, which is monitored by the Toontown Unlimited team. While we advise members not to exchange personal information such as first and last names, e-mail addresses, postal addresses, or phone numbers while using Open Chat with True Friends, we cannot guarantee that such exchanges of personal information will not happen. Although the True Friends chat is automatically filtered for most bad words, Open Chat with True Friends may be moderated, and we reserve the right to moderate any part of the Service that we,\n',
'\nbecome True Friends, one of them must request a new True Friend Code from the Service and communicate it to the other.\n\nTrue Friends communicate with one another in a free-form interactive open chat. The content of this chat is directly entered by the participating member and is processed through the Service, which is monitored by the Toontown United team. While we advise members not to exchange personal information such as first and last names, e-mail addresses, postal addresses, or phone numbers while using Open Chat with True Friends, we cannot guarantee that such exchanges of personal information will not happen. Although the True Friends chat is automatically filtered for most bad words, Open Chat with True Friends may be moderated, and we reserve the right to moderate any part of the Service that we,\n',
"\nin our sole and absolute discretion, deems necessary. However, because Open Chat with True Friends will not always be moderated, if the Parent Account allows a child to use his or her account with the Open Chat with True Friends feature enabled, we strongly encourage parents to supervise their child or children while they play in the Service. By enabling the Open Chat with True Friends feature, the Parent Account acknowledges that there are some risks inherent in the Open Chat with True Friends feature and that the Parent Account has been informed of, and agrees to accept, any such risks, whether foreseeable or otherwise. \n\nWDIG does not use the content of True Friends chat for any purpose other than communicating that content to the member's true friend, and does not disclose that content to any third party except: (1) if required by law, for example, to comply with a court order or subpoena; (2) to enforce the Terms of Use\n",
"\napplicable to the Service (which may be accessed on the home page of the Service); or, (3) to protect the safety and security of Members of the Service and the Service itself. In accordance with the Children's Online Privacy Protection Act, we are prohibited from conditioning, and do not condition, a child's participation in any activity (including Open Chat with True Friends) on the child's disclosing more personal information than is reasonably necessary to participate in such activity.\n\nIn addition, as noted above, we recognize the right of a parent to refuse to permit us to continue to allow a child to use the True Friends feature. By enabling the Open Chat with True Friends feature, you acknowledge that there are some risks inherent in the ability of members to open chat with one another through the Open Chat with True Friends feature, and that you have been informed of, and agree to accept, any such risks, whether foreseeable or otherwise.\n"]
LeaveToSetParentPassword = 'In order to set parent account password, the game will exit to the Toontown website.'
@ -187,7 +187,7 @@ CRBootedReasons = {1: 'An unexpected problem has occurred. Your connection has
151: 'You have been logged out by an administrator working on the servers.',
152: "There has been a reported violation of our Terms of Use connected to '%(name)s'. For more details, please review the message sent to the e-mail address associated with '%(name)s'.",
153: 'The district you were playing on has been reset. Everyone who was playing on that district has been disconnected. However, you should be able to connect again and go right back into the game.',
154: 'Toontown Unlimited is now temporarily closed for maintenance. Everyone who was playing has been disconnected from the game.\n\nFor more information, please visit the Toontown Unlimited website.',
154: 'Toontown United is now temporarily closed for maintenance. Everyone who was playing has been disconnected from the game.\n\nFor more information, please visit the Toontown United website.',
288: 'Sorry, you have used up all of your available minutes this month.',
349: 'Sorry, you have used up all of your available minutes this month.'}
CRBootedReasonUnknownCode = 'An unexpected problem has occurred (error code %s). Your connection has been lost, but you should be able to connect again and go right back into the game.'
@ -200,8 +200,8 @@ CRServerConstantsProxyNoPort = 'Unable to contact %s.\n\nYou are communicating t
CRServerConstantsProxyNoCONNECT = 'Unable to contact %s.\n\nYou are communicating to the internet via a proxy, but your proxy does not support the CONNECT method.\n\nYou must enable this capability, or disable your proxy, in order to play. If your proxy has been provided by your ISP, you must contact your ISP to request them to enable this capability.'
CRServerConstantsTryAgain = 'Unable to contact %s.\n\nThe account server might be temporarily down, or there might be some problem with your internet connection.\n\nTry again?'
CRServerDateTryAgain = 'Could not get server date from %s. Try again?'
CRMaintenanceCountdownMessage = 'Attention Toons! Toontown Unlimited will be going down for maintenance in %d minutes.'
CRMaintenanceMessage = 'Attention Toons! Toontown Unlimited is now going down for maintenance.'
CRMaintenanceCountdownMessage = 'Attention Toons! Toontown United will be going down for maintenance in %d minutes.'
CRMaintenanceMessage = 'Attention Toons! Toontown United is now going down for maintenance.'
AfkForceAcknowledgeMessage = 'Your toon got sleepy and went to bed.'
PeriodTimerWarning = 'Your available time is almost over!'
PeriodForceAcknowledgeMessage = 'Sorry, you have used up all of your available time. Please exit to purchase more.'
@ -304,7 +304,7 @@ FriendSecretNeedsPasswordWarningOK = lOK
FriendSecretNeedsPasswordWarningCancel = lCancel
FriendSecretNeedsPasswordWarningWrongUsername = "That's not the correct username. Please enter the username of the parental account. This is not the same username used to play the game."
FriendSecretNeedsPasswordWarningWrongPassword = "That's not the correct password. Please enter the password of the parental account. This is not the same password used to play the game."
FriendSecretIntro = "If you are playing Toontown Unlimited with someone you know in the real world, you can become True Friends. You can chat using the keyboard with your True Friends. Other Toons won't understand what you're saying.\n\nYou do this by getting a True Friend Code. Tell the True Friend Code to your friend, but not to anyone else. When your friend types in your True Friend Code on his or her screen, you'll be True Friends in Toontown!"
FriendSecretIntro = "If you are playing Toontown United with someone you know in the real world, you can become True Friends. You can chat using the keyboard with your True Friends. Other Toons won't understand what you're saying.\n\nYou do this by getting a True Friend Code. Tell the True Friend Code to your friend, but not to anyone else. When your friend types in your True Friend Code on his or her screen, you'll be True Friends in Toontown!"
FriendSecretGetSecret = 'Get a True Friend Code'
FriendSecretEnterSecret = 'If you have a True Friend Code from someone you know, type it here.'
FriendSecretOK = lOK
@ -328,7 +328,7 @@ FriendSecretDetermineSecret = 'What type of True Friend would you like to make?'
FriendSecretDetermineSecretAvatar = 'Avatar'
FriendSecretDetermineSecretAvatarRollover = 'A friend only in this game'
FriendSecretDetermineSecretAccount = 'Account'
FriendSecretDetermineSecretAccountRollover = 'A friend across the Toontown Unlimited network'
FriendSecretDetermineSecretAccountRollover = 'A friend across the Toontown United network'
GuildMemberTitle = 'Member Options'
GuildMemberPromote = 'Make Officer'
GuildMemberPromoteInvite = 'Make Veteran'
@ -890,7 +890,7 @@ SpeedChatStaticTextToontown = {100: 'Hi!',
103: 'Hey!',
104: 'Howdy!',
105: 'Hi everybody!',
106: 'Welcome to Toontown Unlimited!',
106: 'Welcome to Toontown United!',
107: "What's up?",
108: 'How are you doing?',
109: 'Hello?',
@ -1934,18 +1934,18 @@ SpeedChatStaticTextToontown = {100: 'Hi!',
30450: "It's easy to be green!",
30451: 'Visit Green Bean Jeans and you can be green too!',
30452: "It's on Oak Street in Daisy Gardens.",
30500: "Welcome to Toontown Unlimited!",
30500: "Welcome to Toontown United!",
30501: "I like ponies!",
30502: "Are you livestreaming?",
30503: "I'm livestreaming right now!",
30504: "I can't wait until the next Toontown Unlimited update!",
30504: "I can't wait until the next Toontown United update!",
30505: "Did you know the TTU team works overtime to make the experience the best it can be?",
30506: "I can't stand that bug!",
30507: "Have you found any bugs yet?",
30508: "I hope that bug gets fixed soon.",
30509: "What types of bugs have you ran into so far?",
30510: "Those bugs can get more obnoxious than the Cogs sometimes.",
30511: "You can report bugs by clicking the Report a Bug button on the Toontown Unlimited launcher."}
30511: "You can report bugs by clicking the Report a Bug button on the Toontown United launcher."}
SpeedChatStaticTextPirates = {50001: 'Aye',
50002: 'Nay',
50003: 'Yes',

2
start_ai_server.bat
View file

@ -16,7 +16,7 @@ set /P BASE_CHANNEL="Base channel (DEFAULT: 401000000): " || ^
set BASE_CHANNEL=401000000
echo ===============================
echo Starting Toontown Unlimited AI server...
echo Starting Toontown United AI server...
echo ppython: %PPYTHON_PATH%
echo District name: %DISTRICT_NAME%
echo Base channel: %BASE_CHANNEL%

2
start_game.bat
View file

@ -31,7 +31,7 @@ if %INPUT%==5 (
set TTU_PLAYCOOKIE=%ttuUsername%
echo ===============================
echo Starting Toontown Unlimited...
echo Starting Toontown United...
echo ppython: %PPYTHON_PATH%
echo Username: %ttuUsername%
echo Password: %ttuPassword%

2
start_uberdog_server.bat
View file

@ -14,7 +14,7 @@ set /P BASE_CHANNEL="Base channel (DEFAULT: 1000000): " || ^
set BASE_CHANNEL=1000000
echo ===============================
echo Starting Toontown Unlimited UberDOG server...
echo Starting Toontown United UberDOG server...
echo ppython: %PPYTHON_PATH%
echo Base channel: %BASE_CHANNEL%
echo Max channels: %MAX_CHANNELS%

6
tools/build_client.py
View file

@ -10,10 +10,10 @@ parser.add_argument('--build-dir', default='build',
help='The directory of which the build was prepared.')
parser.add_argument('--output', default='GameData.pyd',
help='The built file.')
parser.add_argument('--main-module', default='unlimited.base.ClientStart',
parser.add_argument('--main-module', default='united.base.ClientStart',
help='The module to load at the start of the game.')
parser.add_argument('modules', nargs='*', default=['shared', 'unlimited'],
help='The Toontown Unlimited modules to be included in the build.')
parser.add_argument('modules', nargs='*', default=['shared', 'united'],
help='The Toontown United modules to be included in the build.')
args = parser.parse_args()
print 'Building the client...'

12
tools/prepare_client.py
View file

@ -12,15 +12,15 @@ parser.add_argument('--distribution', default='en',
parser.add_argument('--build-dir', default='build',
help='The directory in which to store the build files.')
parser.add_argument('--src-dir', default='..',
help='The directory of the Toontown Unlimited source code.')
parser.add_argument('--server-ver', default='unlimited-dev',
help='The directory of the Toontown United source code.')
parser.add_argument('--server-ver', default='united-dev',
help='The server version of this build.')
parser.add_argument('--build-mfs', action='store_true',
help='When present, the resource multifiles will be built.')
parser.add_argument('--resources-dir', default='../resources',
help='The directory of the Toontown Unlimited resources.')
help='The directory of the Toontown United resources.')
parser.add_argument('--config-dir', default='../config/release',
help='The directory of the Toontown Unlimited configuration files.')
help='The directory of the Toontown United configuration files.')
parser.add_argument('--include', '-i', action='append',
help='Explicitly include this file in the build.')
parser.add_argument('--exclude', '-x', action='append',
@ -28,7 +28,7 @@ parser.add_argument('--exclude', '-x', action='append',
parser.add_argument('--vfs', action='append',
help='Add this file to the virtual file system at runtime.')
parser.add_argument('modules', nargs='*', default=['otp', 'toontown'],
help='The Toontown Unlimited modules to be included in the build.')
help='The Toontown United modules to be included in the build.')
args = parser.parse_args()
print 'Preparing the client...'
@ -39,7 +39,7 @@ if os.path.exists(args.build_dir):
os.mkdir(args.build_dir)
print 'Build directory = ' + args.build_dir
# Copy the provided Toontown Unlimited modules:
# Copy the provided Toontown United modules:
def minify(f):

2
tools/whitelist_tool.py
View file

@ -54,7 +54,7 @@ def saveChanges():
LOCAL_LIST = WhiteListData.WHITELIST
print 'Welcome to the Toontown Unlimited Whitelist Tool!'
print 'Welcome to the Toontown United Whitelist Tool!'
print 'Type any word you want to add to the whitelist.'
print 'If you wish to remove a word, type "r <word>".'
print 'When you are done and want to save your changes, type "exit()".'

16
tools/write_patcher.py
View file

@ -8,19 +8,19 @@ import xml.etree.ElementTree as ET
parser = argparse.ArgumentParser()
parser.add_argument('--build-dir', default='build',
help='The directory of the Toontown Unlimited build.')
help='The directory of the Toontown United build.')
parser.add_argument('--dest-dir', default='.',
help='The directory in which to store the patcher.')
parser.add_argument('--output', default='patcher.xml',
help='The name of the output file.')
parser.add_argument('--launcher-version', default='unlimited-dev',
help='The current version of the Toontown Unlimited launcher.')
parser.add_argument('--account-server', default='toontownunlimited.com',
help='The address of the Toontown Unlimited account server.')
parser.add_argument('--launcher-version', default='united-dev',
help='The current version of the Toontown United launcher.')
parser.add_argument('--account-server', default='toontownunited.com',
help='The address of the Toontown United account server.')
parser.add_argument('--client-agent', default='192.99.200.107',
help='The IP address of the Client Agent to connect to.')
parser.add_argument('--server-version', default='unlimited-dev',
help='The current version of the Toontown Unlimited game.')
parser.add_argument('--server-version', default='united-dev',
help='The current version of the Toontown United game.')
parser.add_argument('--resources-revision', default='',
help='The current revision of the resources repository.')
parser.add_argument('includes', nargs='*', default=['GameData.bin'],
@ -71,7 +71,7 @@ print 'Writing %s...' % args.output
# First, add the element:
patcher = ET.Element('patcher')
# Next, add the Toontown Unlimited launcher version:
# Next, add the Toontown United launcher version:
launcher_version = ET.SubElement(patcher, 'launcher-version')
launcher_version.text = args.launcher_version

6
toontown/chat/WhiteListData.py
View file

@ -33170,8 +33170,8 @@ WHITELIST = [
'toonter',
'toontorial',
'toontown',
'toontownunlimited',
'toontownunlimited.net',
'toontownunited',
'toontownunited.com',
'toontrooper',
'toontroopers',
'toonup',
@ -33732,7 +33732,7 @@ WHITELIST = [
'tto',
'ttr',
'ttu',
'ttunlimited',
'ttunited',
'ttyl',
'tub',
'tuba',

2
toontown/launcher/TTULauncher.py
View file

@ -26,7 +26,7 @@ class TTULauncher(LauncherBase):
def __init__(self):
self.http = HTTPClient()
self.logPrefix = 'unlimited-'
self.logPrefix = 'united-'
ltime = 1 and time.localtime()
logSuffix = '%02d%02d%02d_%02d%02d%02d' % (ltime[0] - 2000, ltime[1], ltime[2],

2
toontown/shtiker/PhotoAlbumPage.py
View file

@ -232,7 +232,7 @@ class PhotoAlbumPage(ShtikerPage.ShtikerPage):
files = os.listdir(self.photoPath)
photos = []
for fileName in files:
if fileName[0:20] == 'unlimited-screenshot' and fileName[-4:] == '.jpg':
if fileName[0:20] == 'united-screenshot' and fileName[-4:] == '.jpg':
photos.append(fileName)
return photos

4
toontown/toonbase/ClientStartDist.py
View file

@ -1,9 +1,9 @@
#!/usr/bin/env python2
# This is the "main" module that will start a production copy of
# Toontown Unlimited.
# Toontown United.
# This is a temp patch.
# It should really be done by the runtime (e.g. unlimited.exe):
# It should really be done by the runtime (e.g. united.exe):
import sys
sys.path = ['.']

2
toontown/toonbase/ClientStartRemoteDB.py
View file

@ -11,7 +11,7 @@ distribution = ConfigVariableString('distribution', 'dev').getValue()
accountServerEndpoint = ConfigVariableString(
'account-server-endpoint',
'https://toontownunlimited.com/api/').getValue()
'https://toontownunited.com/api/').getValue()
request = requests.post(
accountServerEndpoint + 'login/',
data={'n': username, 'p': password, 'dist': distribution})

36
toontown/toonbase/TTLocalizerEnglish.py
View file

@ -1956,12 +1956,12 @@ ReportPanelCategoryHacking = 'Hacking'
ReportPanelConfirmations = ('You are about to report that %s has used obscene, bigoted or sexually explicit language.',
'You are about to report that %s is being unsafe by giving out or requesting a phone number, address, last name, email address, password or account name.',
'You are about to report that %s is bullying, harassing, or using extreme behavior to disrupt the game.',
"You are about to report that %s has created a name that does not follow the Toontown Unlimited rules.",
"You are about to report that %s has created a name that does not follow the Toontown United rules.",
'You are about to report that %s has hacked/tampered with the game or used third party software.')
ReportPanelWarning = "We take reporting very seriously. Your report will be viewed by a Moderator who will take appropriate action for anyone breaking our rules. If your account is found to have participated in breaking the rules, or if you make false reports or abuse the 'Report a Player' system, a Moderator may take action against your account. Are you absolutely sure you want to report this player?"
ReportPanelThanks = 'Thank you! Your report has been sent to a Moderator for review. There is no need to contact us again about the issue. The moderation team will take appropriate action for a player found breaking our rules.'
ReportPanelRemovedFriend = 'We have automatically removed %s from your Toon Friends List.'
ReportPanelRemovedPlayerFriend = 'We have automatically removed %s as a Player friend so as such you will not see them as your friend in any Toontown Unlimited product.'
ReportPanelRemovedPlayerFriend = 'We have automatically removed %s as a Player friend so as such you will not see them as your friend in any Toontown United product.'
ReportPanelAlreadyReported = 'You have already reported %s during this session. A Moderator will review your previous report.'
IgnorePanelTitle = 'Ignore A Player'
IgnorePanelAddIgnore = 'Would you like to ignore %s for the rest of this session?'
@ -2739,7 +2739,7 @@ SuitAttackTaunts = {'Audit': ["I believe your books don't balance.",
"You aren't above the law!",
'There should be a law against you.',
"There's no ex post facto with me!",
"The opinions expressed in this attack are not those of Toontown Unlimited.",
"The opinions expressed in this attack are not those of Toontown United.",
'We cannot be held responsible for damages suffered in this attack.',
'Your results for this attack may vary.',
'This attack is void where prohibited.',
@ -4022,7 +4022,7 @@ FriendInviterPlayer = 'Player'
FriendInviterThatPlayer = 'That player'
FriendInviterBegin = 'What type of friend would you like to make?'
FriendInviterToonFriendInfo = 'A friend only in Toontown'
FriendInviterPlayerFriendInfo = 'A friend across the Toontown Unlimited network'
FriendInviterPlayerFriendInfo = 'A friend across the Toontown United network'
FriendInviterToonTooMany = 'You have too many toon friends to add another one now. You will have to remove some toon friends if you want to make friends with %s. You could also try making player friends them.'
FriendInviterPlayerTooMany = 'You have too many player friends to add another one now. You will have to remove some player friends if you want to make friends with %s. You could also try making toon friends with them.'
FriendInviterToonAlready = '%s is already your toon friend.'
@ -4057,7 +4057,7 @@ LauncherPhaseNames = {0: 'Initialization',
12: Bossbot + ' HQ',
13: 'Parties'}
LauncherProgress = '%(name)s (%(current)s of %(total)s)'
LauncherStartingMessage = "Starting Toontown Unlimited... "
LauncherStartingMessage = "Starting Toontown United... "
LauncherDownloadFile = 'Downloading update for ' + LauncherProgress + '...'
LauncherDownloadFileBytes = 'Downloading update for ' + LauncherProgress + ': %(bytes)s'
LauncherDownloadFilePercent = 'Downloading update for ' + LauncherProgress + ': %(percent)s%%'
@ -4067,16 +4067,16 @@ LauncherExtractingFile = 'Extracting update for ' + LauncherProgress + '...'
LauncherExtractingPercent = 'Extracting update for ' + LauncherProgress + ': %(percent)s%%'
LauncherPatchingFile = 'Applying update for ' + LauncherProgress + '...'
LauncherPatchingPercent = 'Applying update for ' + LauncherProgress + ': %(percent)s%%'
LauncherConnectProxyAttempt = 'Connecting to Toontown Unlimited: %s (proxy: %s) attempt: %s'
LauncherConnectAttempt = 'Connecting to Toontown Unlimited: %s attempt %s'
LauncherDownloadServerFileList = 'Updating Toontown Unlimited...'
LauncherCreatingDownloadDb = 'Updating Toontown Unlimited...'
LauncherDownloadClientFileList = 'Updating Toontown Unlimited...'
LauncherFinishedDownloadDb = 'Updating Toontown Unlimited... '
LauncherStartingGame = 'Starting Toontown Unlimited...'
LauncherRecoverFiles = 'Updating Toontown Unlimited. Recovering files...'
LauncherConnectProxyAttempt = 'Connecting to Toontown United: %s (proxy: %s) attempt: %s'
LauncherConnectAttempt = 'Connecting to Toontown United: %s attempt %s'
LauncherDownloadServerFileList = 'Updating Toontown United...'
LauncherCreatingDownloadDb = 'Updating Toontown United...'
LauncherDownloadClientFileList = 'Updating Toontown United...'
LauncherFinishedDownloadDb = 'Updating Toontown United... '
LauncherStartingGame = 'Starting Toontown United...'
LauncherRecoverFiles = 'Updating Toontown United. Recovering files...'
LauncherCheckUpdates = 'Checking for updates for ' + LauncherProgress
LauncherVerifyPhase = 'Updating Toontown Unlimited...'
LauncherVerifyPhase = 'Updating Toontown United...'
AvatarChoiceMakeAToon = 'Make A\nToon'
AvatarChoicePlayThisToon = 'Play\nThis Toon'
AvatarChoiceSubscribersOnly = 'Subscribe'
@ -4250,7 +4250,7 @@ MusicEncntrGeneralBg = 'Encounter With Cogs'
MusicTcSzActivity = 'Toontorial Medley'
MusicTcSz = 'Strolling Along'
MusicCreateAToon = 'The New Toon in Town'
MusicTtuTheme = 'The Toontown Unlimited Theme'
MusicTtuTheme = 'The Toontown United Theme'
MusicTtTheme = 'The Toontown Theme'
MusicMinigameRace = 'Slow and Steady'
MusicMgPairing = 'Remember Me?'
@ -5571,7 +5571,7 @@ QuestScriptTutorialBlocker_3 = "Oh! You don't know how to use SpeedChat!"
QuestScriptTutorialBlocker_4 = 'Click on the button to say something.'
QuestScriptTutorialBlocker_5 = 'Very good!\x07Where you are going there are many Toons to talk to.'
QuestScriptTutorialBlocker_6 = "If you want to chat with other Toons using the keyboard, there's another button you can use."
QuestScriptTutorialBlocker_7 = "It's called the SpeedChat Plus button. You need to turn on Speedchat Plus in your Account Manager on the Toontown Unlimited Website to use it."
QuestScriptTutorialBlocker_7 = "It's called the SpeedChat Plus button. You need to turn on Speedchat Plus in your Account Manager on the Toontown United Website to use it."
QuestScriptTutorialBlocker_8 = 'Good luck! See you later!'
QuestScriptGagShop_1 = 'Welcome to the Gag Shop!'
QuestScriptGagShop_1a = 'This is where Toons come to buy gags to use against the Cogs.'
@ -8253,7 +8253,7 @@ TipDict = {TIP_NONE: ('',),
'Open or close your Shticker Book by pressing the "F8" key.',
'You can look up by pressing the "Page Up" key and look down by pressing the "Page Down" key.',
'Press the "Control" key to jump.',
'Press the "F9" key to take a screenshot, which will be saved in your Toontown Unlimited folder on your computer.',
'Press the "F9" key to take a screenshot, which will be saved in your Toontown United folder on your computer.',
'You can change your screen resolution, adjust audio, and control other options on the Options Page in the Shticker Book.',
"Try on your friend's clothing at the closet in their house.",
'You can go to your house using the "Go Home" button on your map.',
@ -8267,7 +8267,7 @@ TipDict = {TIP_NONE: ('',),
'Change to different views of your Toon by pressing the Tab Key.',
'Sometimes you can find several different ToonTasks offered for the same reward. Shop around!',
'Finding friends with similar ToonTasks is a fun way to progress through the game.',
'You never need to save your Toontown progress. The Toontown Unlimited servers continually save all the necessary information.',
'You never need to save your Toontown progress. The Toontown United servers continually save all the necessary information.',
'You can whisper to other Toons either by clicking on them or by selecting them from your Friends List.',
'Some SpeedChat phrases play emotion animations on your Toon.',
'If the area you are in is crowded, try changing Districts. Go to the District Page in the Shticker Book and select a different one.',

4
toontown/uberdog/ClientServicesManagerUD.py
View file

@ -29,7 +29,7 @@ if accountDBType == 'remote':
minAccessLevel = simbase.config.GetInt('min-access-level', 100)
accountServerEndpoint = simbase.config.GetString(
'account-server-endpoint', 'https://toontownunlimited.com/api/')
'account-server-endpoint', 'https://toontownunited.com/api/')
accountServerSecret = simbase.config.GetString(
'account-server-secret', '6163636f756e7473')
@ -73,7 +73,7 @@ def judgeName(name):
# --- ACCOUNT DATABASES ---
# These classes make up the available account databases for Toontown Unlimited.
# These classes make up the available account databases for Toontown United.
# Databases with login tokens use the PyCrypto module for decrypting them.
# DeveloperAccountDB is a special database that accepts a username, and assigns
# each user with 600 access automatically upon login.