Sneed-Group/Poodletooth-iLand
2
0
Fork 0
mirror of https://github.com/Sneed-Group/Poodletooth-iLand synced 2025-01-09 17:53:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

merge fix and my bs devs fix

Browse source
This commit is contained in:
Zach 2015-05-24 18:42:26 -05:00
commit f25ad9caf8
4580 changed files with 2359 additions and 2364 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

0
.gitignore vendored Normal file → Executable file
View file

1
PPYTHON_PATH
View file

@ -1 +0,0 @@
"panda/python/ppython.exe"

2
README.md Normal file → Executable file
View file

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

3
all.bat
View file

@ -1,3 +0,0 @@
start astron
start ai
start ud

3
astron/.gitignore vendored Normal file → Executable file
View file

@ -1,4 +1,3 @@
*.dll # Exclude the debug builds of Astron.
astrond
astrond_debug astrond_debug
astrond_debug.exe astrond_debug.exe

0
astron/astrond.exe Normal file → Executable file
View file

4
astron/config/clientagent-0.yml Normal file → Executable file
View file

@ -20,7 +20,7 @@ uberdogs:
id: 4501 id: 4501
anonymous: false anonymous: false
- class: TTUFriendsManager - class: TTSFriendsManager
id: 4666 id: 4666
anonymous: false anonymous: false
@ -34,7 +34,7 @@ messagedirector:
roles: roles:
- type: clientagent - type: clientagent
bind: 0.0.0.0:7199 bind: 0.0.0.0:7199
version: "united-dev" version: "stride-dev"
client: client:
relocate: true relocate: true
add_interest: enabled add_interest: enabled

4
astron/config/clientagent-1.yml Normal file → Executable file
View file

@ -20,7 +20,7 @@ uberdogs:
id: 4501 id: 4501
anonymous: false anonymous: false
- class: TTUFriendsManager - class: TTSFriendsManager
id: 4666 id: 4666
anonymous: false anonymous: false
@ -34,7 +34,7 @@ messagedirector:
roles: roles:
- type: clientagent - type: clientagent
bind: 0.0.0.0:7299 bind: 0.0.0.0:7299
version: "united-dev" version: "stride-dev"
client: client:
relocate: true relocate: true
add_interest: enabled add_interest: enabled

4
astron/config/clientagent-2.yml Normal file → Executable file
View file

@ -20,7 +20,7 @@ uberdogs:
id: 4501 id: 4501
anonymous: false anonymous: false
- class: TTUFriendsManager - class: TTSFriendsManager
id: 4666 id: 4666
anonymous: false anonymous: false
@ -34,7 +34,7 @@ messagedirector:
roles: roles:
- type: clientagent - type: clientagent
bind: 0.0.0.0:7399 bind: 0.0.0.0:7399
version: "united-dev" version: "stride-dev"
client: client:
relocate: true relocate: true
add_interest: enabled add_interest: enabled

4
astron/config/clientagent-3.yml Normal file → Executable file
View file

@ -20,7 +20,7 @@ uberdogs:
id: 4501 id: 4501
anonymous: false anonymous: false
- class: TTUFriendsManager - class: TTSFriendsManager
id: 4666 id: 4666
anonymous: false anonymous: false
@ -34,7 +34,7 @@ messagedirector:
roles: roles:
- type: clientagent - type: clientagent
bind: 0.0.0.0:7499 bind: 0.0.0.0:7499
version: "united-dev" version: "stride-dev"
client: client:
relocate: true relocate: true
add_interest: enabled add_interest: enabled

4
astron/config/clientagent-4.yml Normal file → Executable file
View file

@ -20,7 +20,7 @@ uberdogs:
id: 4501 id: 4501
anonymous: false anonymous: false
- class: TTUFriendsManager - class: TTSFriendsManager
id: 4666 id: 4666
anonymous: false anonymous: false
@ -34,7 +34,7 @@ messagedirector:
roles: roles:
- type: clientagent - type: clientagent
bind: 0.0.0.0:7599 bind: 0.0.0.0:7599
version: "united-dev" version: "stride-dev"
client: client:
relocate: true relocate: true
add_interest: enabled add_interest: enabled

4
astron/config/clientagent-5.yml Normal file → Executable file
View file

@ -20,7 +20,7 @@ uberdogs:
id: 4501 id: 4501
anonymous: false anonymous: false
- class: TTUFriendsManager - class: TTSFriendsManager
id: 4666 id: 4666
anonymous: false anonymous: false
@ -34,7 +34,7 @@ messagedirector:
roles: roles:
- type: clientagent - type: clientagent
bind: 0.0.0.0:7699 bind: 0.0.0.0:7699
version: "united-dev" version: "stride-dev"
client: client:
relocate: true relocate: true
add_interest: enabled add_interest: enabled

4
astron/config/clientagent-6.yml Normal file → Executable file
View file

@ -20,7 +20,7 @@ uberdogs:
id: 4501 id: 4501
anonymous: false anonymous: false
- class: TTUFriendsManager - class: TTSFriendsManager
id: 4666 id: 4666
anonymous: false anonymous: false
@ -34,7 +34,7 @@ messagedirector:
roles: roles:
- type: clientagent - type: clientagent
bind: 0.0.0.0:7799 bind: 0.0.0.0:7799
version: "united-dev" version: "stride-dev"
client: client:
relocate: true relocate: true
add_interest: enabled add_interest: enabled

4
astron/config/clientagent-7.yml Normal file → Executable file
View file

@ -20,7 +20,7 @@ uberdogs:
id: 4501 id: 4501
anonymous: false anonymous: false
- class: TTUFriendsManager - class: TTSFriendsManager
id: 4666 id: 4666
anonymous: false anonymous: false
@ -34,7 +34,7 @@ messagedirector:
roles: roles:
- type: clientagent - type: clientagent
bind: 0.0.0.0:7899 bind: 0.0.0.0:7899
version: "united-dev" version: "stride-dev"
client: client:
relocate: true relocate: true
add_interest: enabled add_interest: enabled

6
astron/config/cluster.yml Normal file → Executable file
View file

@ -4,7 +4,7 @@ daemon:
general: general:
eventlogger: 127.0.0.1:7198 eventlogger: 127.0.0.1:7198
dc_files: dc_files:
- ../dclass/united.dc - ../dclass/stride.dc
messagedirector: messagedirector:
bind: 127.0.0.1:7100 bind: 127.0.0.1:7100
@ -22,7 +22,7 @@ uberdogs:
id: 4501 id: 4501
anonymous: false anonymous: false
- class: TTUFriendsManager - class: TTSFriendsManager
id: 4666 id: 4666
anonymous: false anonymous: false
@ -33,7 +33,7 @@ uberdogs:
roles: roles:
- type: clientagent - type: clientagent
bind: 0.0.0.0:7199 bind: 0.0.0.0:7199
version: "ttu-dev" version: "tts-dev"
client: client:
relocate: true relocate: true
add_interest: enabled add_interest: enabled

0
astron/config/eventlogger.yml Normal file → Executable file
View file

0
astron/config/production-cluster.yml Normal file → Executable file
View file

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

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

0
astron/darwin/start-astron-cluster.sh Normal file → Executable file
View file

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

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

0
astron/databases/.gitignore vendored Normal file → Executable file
View file

1
astron/databases/air_cache/.gitignore vendored
View file

@ -1 +0,0 @@
*.pets

47
astron/databases/air_cache/pets_401000001.pets Normal file
View file

@ -0,0 +1,47 @@
(dp1
I4000
(lp2
I236
aI34
aI250
aI67
aI13
asI1000
(lp3
I17
aI118
aI99
aI16
aI29
asI9000
(lp4
I222
aI104
aI121
aI59
aI93
asI2000
(lp5
I86
aI139
aI161
aI64
aI194
asI5000
(lp6
I41
aI130
aI85
aI100
aI251
asI3000
(lp7
I157
aI215
aI208
aI242
aI207
asS'day'
p8
I16579
s.

0
astron/databases/astrondb/.gitignore vendored Normal file → Executable file
View file

36
astron/dclass/united.dc → astron/dclass/stride.dc Normal file → Executable file
View file

@ -210,10 +210,6 @@ dclass FriendManager : DistributedObject {
friendResponse(int8, int32); friendResponse(int8, int32);
inviteeFriendQuery(int32, string, blob, int32); inviteeFriendQuery(int32, string, blob, int32);
inviteeCancelFriendQuery(int32); inviteeCancelFriendQuery(int32);
requestSecret() airecv clsend;
requestSecretResponse(int8, string);
submitSecret(string(0-256)) airecv clsend;
submitSecretResponse(int8, int32);
}; };
struct leaderBoardRecordResponces { struct leaderBoardRecordResponces {
@ -416,7 +412,7 @@ from toontown.coghq import DistributedMintBattle/AI
from toontown.coghq import DistributedStage/AI from toontown.coghq import DistributedStage/AI
from toontown.coghq import DistributedStageRoom/AI from toontown.coghq import DistributedStageRoom/AI
from toontown.coghq import DistributedStageBattle/AI from toontown.coghq import DistributedStageBattle/AI
from toontown.pets.PetDCImports/AI import * from toontown.pets.DistributedPet/AI import *
from toontown.pets import DistributedPetProxy/AI from toontown.pets import DistributedPetProxy/AI
from toontown.distributed import ToontownDistrict/AI from toontown.distributed import ToontownDistrict/AI
from toontown.distributed import ToontownDistrictStats/AI from toontown.distributed import ToontownDistrictStats/AI
@ -477,7 +473,7 @@ from toontown.parties import DistributedPartyJukeboxActivity/AI
from toontown.parties import DistributedPartyJukebox40Activity/AI from toontown.parties import DistributedPartyJukebox40Activity/AI
from toontown.parties import DistributedPartyValentineJukeboxActivity/AI from toontown.parties import DistributedPartyValentineJukeboxActivity/AI
from toontown.parties import DistributedPartyValentineJukebox40Activity/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 DistributedGolfKart/AI
from toontown.safezone import DistributedPicnicBasket/AI from toontown.safezone import DistributedPicnicBasket/AI
from toontown.distributed import DistributedTimer/AI from toontown.distributed import DistributedTimer/AI
@ -503,7 +499,6 @@ from toontown.safezone import DistributedCheckers/AI
from toontown.safezone import DistributedFindFour/AI from toontown.safezone import DistributedFindFour/AI
from toontown.uberdog.DistributedPartyManager/AI/UD import DistributedPartyManager/AI/UD from toontown.uberdog.DistributedPartyManager/AI/UD import DistributedPartyManager/AI/UD
from toontown.coderedemption.TTCodeRedemptionMgr/AI import TTCodeRedemptionMgr/AI from toontown.coderedemption.TTCodeRedemptionMgr/AI import TTCodeRedemptionMgr/AI
from toontown.friends.TrueFriendsMgr/AI import TrueFriendsMgr/AI
from toontown.cogdominium import DistributedCogdoInterior/AI from toontown.cogdominium import DistributedCogdoInterior/AI
from toontown.cogdominium import DistributedCogdoBattleBldg/AI from toontown.cogdominium import DistributedCogdoBattleBldg/AI
from toontown.cogdominium import DistributedCogdoElevatorExt/AI from toontown.cogdominium import DistributedCogdoElevatorExt/AI
@ -654,17 +649,16 @@ typedef int16 pair16[2];
dclass DistributedToon : DistributedPlayer { dclass DistributedToon : DistributedPlayer {
setDNAString(blob) required broadcast ownrecv db; setDNAString(blob) required broadcast ownrecv db;
setGM(uint16 = 0) required broadcast ownrecv db; setGM(uint16 = 0) required broadcast ownrecv db;
setMoney(int16 = 0) required ownrecv db; setMaxBankMoney(int16 maxMoney = 10000) required broadcast ownrecv db;
setBankMoney(int32 = 0) required ownrecv; setBankMoney(int16 money = 0) required broadcast ownrecv db;
setMaxMoney(int16 = 40) required broadcast ownrecv db; setMaxMoney(int16 maxMoney = 40) required broadcast ownrecv db;
setMaxBankMoney(int32 = 10000) required broadcast ownrecv db; setMoney(int16 money = 0) required broadcast ownrecv db;
setMaxHp(int16 = 15) required broadcast ownrecv db; setMaxHp(int16 = 15) required broadcast ownrecv db;
setHp(int16 = 15) required broadcast ownrecv db; setHp(int16 = 15) required broadcast ownrecv db;
toonUp(uint16) broadcast ownrecv; toonUp(uint16) broadcast ownrecv;
takeDamage(uint16) broadcast ownrecv; takeDamage(uint16) broadcast ownrecv;
setBattleId(uint32 = 0) required broadcast ram; setBattleId(uint32 = 0) required broadcast ram;
setExperience(blob = [0*14]) required broadcast db; setExperience(blob = [0*14]) required broadcast db;
setTrueFriends(uint32[]) required ownrecv db;
setIgnored(uint32[]) required clsend airecv ownrecv db; setIgnored(uint32[]) required clsend airecv ownrecv db;
setReported(uint32[]) required ownrecv db; setReported(uint32[]) required ownrecv db;
setMaxCarry(uint8 = 20) required ownrecv db; setMaxCarry(uint8 = 20) required ownrecv db;
@ -739,8 +733,6 @@ dclass DistributedToon : DistributedPlayer {
setCogTypes(uint8[] = [0 * 4]) required broadcast ownrecv db; setCogTypes(uint8[] = [0 * 4]) required broadcast ownrecv db;
setCogParts(uint32[] = [0 * 4]) required broadcast ownrecv db; setCogParts(uint32[] = [0 * 4]) required broadcast ownrecv db;
setCogMerits(uint16[] = [0 * 4]) required ownrecv db; setCogMerits(uint16[] = [0 * 4]) required ownrecv db;
setPromotionStatus(uint8[] = [0 * 4]) required broadcast ownrecv db;
requestPromotion(uint8) ownsend airecv;
setCogIndex(int8) broadcast ram; setCogIndex(int8) broadcast ram;
setDisguisePageFlag(int8) ownrecv; setDisguisePageFlag(int8) ownrecv;
setSosPageFlag(int8) ownrecv; setSosPageFlag(int8) ownrecv;
@ -836,7 +828,6 @@ dclass DistributedToon : DistributedPlayer {
setNeverStartedPartyRefunded(uint64, int8, uint16) ownrecv; setNeverStartedPartyRefunded(uint64, int8, uint16) ownrecv;
setDISLname(string) ram; setDISLname(string) ram;
setDISLid(uint32) ram db airecv; setDISLid(uint32) ram db airecv;
flagAv(uint32, uint16, string []) airecv ownsend;
setAnimalSound(uint8 index) ram broadcast ownrecv; setAnimalSound(uint8 index) ram broadcast ownrecv;
setBuffs(uint32[] = []) required ownrecv db; setBuffs(uint32[] = []) required ownrecv db;
setRedeemedCodes(string [] = []) required ownrecv db; setRedeemedCodes(string [] = []) required ownrecv db;
@ -3307,13 +3298,6 @@ dclass TTCodeRedemptionMgr : DistributedObject {
redeemCodeResult(uint32); redeemCodeResult(uint32);
}; };
dclass TrueFriendsMgr : DistributedObject {
requestId() airecv clsend;
requestIdResult(uint32, string, string);
redeemId(string) airecv clsend;
redeemIdResult(uint32, string);
};
struct Friend struct Friend
{ {
uint32 doId; uint32 doId;
@ -3322,7 +3306,7 @@ blob dna;
uint32 petId; uint32 petId;
}; };
dclass TTUFriendsManager : DistributedObjectGlobal { dclass TTSFriendsManager : DistributedObjectGlobal {
removeFriend(uint32) clsend; removeFriend(uint32) clsend;
requestAvatarInfo(uint32[]) clsend; requestAvatarInfo(uint32[]) clsend;
@ -3357,12 +3341,6 @@ dclass TTUFriendsManager : DistributedObjectGlobal {
whisperSCEmoteTo(uint32 toId, uint16 emoteId) clsend; whisperSCEmoteTo(uint32 toId, uint16 emoteId) clsend;
setWhisperSCEmoteFrom(uint32 fromId, uint16 emoteId); setWhisperSCEmoteFrom(uint32 fromId, uint16 emoteId);
requestSecret() clsend;
requestSecretResponse(int8 status, string secret);
submitSecret(string(0-256) secret) clsend;
submitSecretResponse(int8 status, int32 avId);
sendTalkWhisper(uint32 toId, string message) clsend; sendTalkWhisper(uint32 toId, string message) clsend;
receiveTalkWhisper(uint32 fromId, string message); receiveTalkWhisper(uint32 fromId, string message);

0
astron/libeay32.dll Normal file → Executable file
View file

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

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

0
astron/linux/start-astron-cluster.sh Normal file → Executable file
View file

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

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

BIN
astron/msvcp120.dll Normal file
View file

Binary file not shown.

BIN
astron/msvcr120.dll Normal file
View file

Binary file not shown.

0
astron/ssleay32.dll Normal file → Executable file
View file

5
astron/win32/start-all.bat Executable file
View file

@ -0,0 +1,5 @@
rem Starts a Localhost server. This is meant for Windows. To connect to the developer server, use the option in start-game for your OS.
start start-astron-cluster
start start-uberdog-server
start start-ai-server

32
client.bat
View file

@ -1,32 +0,0 @@
@echo off
title TTU Game Launcher
set /P PPYTHON_PATH=<PPYTHON_PATH
echo Choose your game server!
echo #1 - Localhost
echo #2 - Custom
echo #3 - Loudrob
echo.
set /P INPUT=
set server=unset
if %INPUT%==1 set server=127.0.0.1
if %INPUT%==3 set server=71.200.196.180
if %server%==unset (
echo.
set /P server=Gameserver:
)
echo.
set /P user=Username:
echo ===============================
echo Starting Toontown United...
echo ppython: %PPYTHON_PATH%
echo Username: %user%
echo Gameserver: %server%
echo ===============================
%PPYTHON_PATH% -m toontown.toonbase.ClientStart %user% %server%
pause

0
config/events/grand-opening.prc Normal file → Executable file
View file

10
config/general.prc Normal file → Executable file
View file

@ -1,5 +1,5 @@
# Window settings: # Window settings:
window-title Toontown United window-title Toontown Stride
win-origin -1 -1 win-origin -1 -1
icon-filename phase_3/etc/icon.ico icon-filename phase_3/etc/icon.ico
cursor-filename phase_3/etc/toonmono.cur cursor-filename phase_3/etc/toonmono.cur
@ -92,7 +92,7 @@ base-xp-multiplier 1.0
# SOS toons: # SOS toons:
sos-card-reward 2 sos-card-reward 2
# Cog Dominiums # CogDominiums (Field Offices):
want-emblems #t want-emblems #t
cogdo-want-barrel-room #t cogdo-want-barrel-room #t
want-lawbot-cogdo #t want-lawbot-cogdo #t
@ -104,6 +104,9 @@ want-cogbuildings #t
show-total-population #t show-total-population #t
want-mat-all-tailors #t want-mat-all-tailors #t
want-talkative-tyler #f want-talkative-tyler #f
estate-day-night #t
want-language-selection #t
active-holidays 64, 65, 66
# Developer options: # Developer options:
want-dev #f want-dev #f
@ -112,6 +115,3 @@ want-pstats 0
# Temporary: # Temporary:
smooth-lag 0.4 smooth-lag 0.4
want-old-fireworks #t want-old-fireworks #t
# Live updates:
estate-day-night #t

0
config/guieditor.prc Normal file → Executable file
View file

0
config/holidays/christmas.prc Normal file → Executable file
View file

0
config/holidays/halloween.prc Normal file → Executable file
View file

21
config/release/dev.prc Normal file → Executable file
View file

@ -5,8 +5,8 @@ distribution dev
model-path ../resources/ model-path ../resources/
# Server: # Server:
server-version ttu-dev server-version tts-dev
min-access-level 600 min-access-level 700
accountdb-type developer accountdb-type developer
shard-low-pop 50 shard-low-pop 50
shard-mid-pop 100 shard-mid-pop 100
@ -15,31 +15,25 @@ shard-mid-pop 100
want-rpc-server #f want-rpc-server #f
rpc-server-endpoint http://localhost:8080/ rpc-server-endpoint http://localhost:8080/
# DClass files (in reverse order): # DClass file:
dc-file astron/dclass/united.dc dc-file astron/dclass/stride.dc
# Core features: # Core features:
want-pets #t want-pets #t
want-parties #t want-parties #t
want-cogdominiums #t want-cogdominiums #t
want-lawbot-cogdo #t want-lawbot-cogdo #t
want-achievements #f
want-anim-props #t want-anim-props #t
want-game-tables #t want-game-tables #t
want-find-four #f want-find-four #t
want-chinese-checkers #t want-chinese-checkers #t
want-checkers #f want-checkers #t
want-house-types #t
# Chat: # Chat:
want-whitelist #f want-whitelist #f
# Cashbot boss:
want-resistance-toonup #t
want-resistance-restock #t
want-resistance-dance #t
# Optional: # Optional:
want-glove-npc #t
want-jor-el-cam #f want-jor-el-cam #f
# Developer options: # Developer options:
@ -47,3 +41,4 @@ show-population #t
want-instant-parties #t want-instant-parties #t
cogdo-pop-factor 1.5 cogdo-pop-factor 1.5
cogdo-ratio 0.5 cogdo-ratio 0.5
default-directnotify-level info

0
config/release/en.prc Normal file → Executable file
View file

0
config/release/test.prc Normal file → Executable file
View file

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

@ -5,18 +5,18 @@ export DYLD_LIBRARY_PATH=`pwd`/Libraries.bundle
export DYLD_FRAMEWORK_PATH="Frameworks" export DYLD_FRAMEWORK_PATH="Frameworks"
# Get the user input: # Get the user input:
read -p "Username: " ttuUsername read -p "Username: " ttsUsername
# Export the environment variables: # Export the environment variables:
export ttuUsername=$ttuUsername export ttsUsername=$ttsUsername
export ttuPassword="password" export ttsPassword="password"
export TTU_PLAYCOOKIE=$ttuUsername export TTS_PLAYCOOKIE=$ttsUsername
export TTU_GAMESERVER="127.0.0.1" export TTS_GAMESERVER="127.0.0.1"
echo "===============================" echo "==============================="
echo "Starting Toontown United..." echo "Starting Toontown Stride..."
echo "Username: $ttuUsername" echo "Username: $ttsUsername"
echo "Gameserver: $TTU_GAMESERVER" echo "Gameserver: $TTS_GAMESERVER"
echo "===============================" echo "==============================="
ppython -m toontown.toonbase.ClientStart ppython -m toontown.toonbase.ClientStart

22
darwin/start-game-remotedb.sh Normal file → Executable file
View file

@ -5,22 +5,22 @@ export DYLD_LIBRARY_PATH=`pwd`/Libraries.bundle
export DYLD_FRAMEWORK_PATH="Frameworks" export DYLD_FRAMEWORK_PATH="Frameworks"
# Get the user input: # Get the user input:
read -p "Username: " ttuUsername read -p "Username: " ttsUsername
read -s -p "Password: " ttuPassword read -s -p "Password: " ttsPassword
echo echo
read -p "Gameserver (DEFAULT: 167.114.28.238): " TTU_GAMESERVER read -p "Gameserver (DEFAULT: 167.114.28.238): " TTS_GAMESERVER
TTU_GAMESERVER=${TTU_GAMESERVER:-"167.114.28.238"} TTS_GAMESERVER=${TTS_GAMESERVER:-"167.114.28.238"}
# Export the environment variables: # Export the environment variables:
export ttuUsername=$ttuUsername export ttsUsername=$ttsUsername
export ttuPassword=$ttuPassword export ttsPassword=$ttsPassword
export TTU_PLAYCOOKIE=$ttuUsername export TTS_PLAYCOOKIE=$ttsUsername
export TTU_GAMESERVER=$TTU_GAMESERVER export TTS_GAMESERVER=$TTS_GAMESERVER
echo "===============================" echo "==============================="
echo "Starting Toontown United..." echo "Starting Toontown Stride..."
echo "Username: $ttuUsername" echo "Username: $ttsUsername"
echo "Gameserver: $TTU_GAMESERVER" echo "Gameserver: $TTS_GAMESERVER"
echo "===============================" echo "==============================="
ppython -m toontown.toonbase.ClientStartRemoteDB ppython -m toontown.toonbase.ClientStartRemoteDB

20
darwin/start-game.sh Normal file → Executable file
View file

@ -5,20 +5,20 @@ export DYLD_LIBRARY_PATH=`pwd`/Libraries.bundle
export DYLD_FRAMEWORK_PATH="Frameworks" export DYLD_FRAMEWORK_PATH="Frameworks"
# Get the user input: # Get the user input:
read -p "Username: " ttuUsername read -p "Username: " ttsUsername
read -p "Gameserver (DEFAULT: 167.114.28.238): " TTU_GAMESERVER read -p "Gameserver (DEFAULT: 167.114.28.238): " TTS_GAMESERVER
TTU_GAMESERVER=${TTU_GAMESERVER:-"167.114.28.238"} TTS_GAMESERVER=${TTS_GAMESERVER:-"167.114.28.238"}
# Export the environment variables: # Export the environment variables:
export ttuUsername=$ttuUsername export ttsUsername=$ttsUsername
export ttuPassword="password" export ttsPassword="password"
export TTU_PLAYCOOKIE=$ttuUsername export TTS_PLAYCOOKIE=$ttsUsername
export TTU_GAMESERVER=$TTU_GAMESERVER export TTS_GAMESERVER=$TTS_GAMESERVER
echo "===============================" echo "==============================="
echo "Starting Toontown United..." echo "Starting Toontown Stride..."
echo "Username: $ttuUsername" echo "Username: $ttsUsername"
echo "Gameserver: $TTU_GAMESERVER" echo "Gameserver: $TTS_GAMESERVER"
echo "===============================" echo "==============================="
ppython -m toontown.toonbase.ClientStart ppython -m toontown.toonbase.ClientStart

8
deployment/.gitignore vendored Normal file → Executable file
View file

@ -1,7 +1,7 @@
unitedcipher stridecipher
unitedcipher.exe stridecipher.exe
united stride
united.exe stride.exe
upx.exe upx.exe
src src
build build

0
deployment/FreezeTool.patch Normal file → Executable file
View file

8
deployment/deploy.py Normal file → Executable file
View file

@ -26,7 +26,7 @@ print 'Starting the deployment process...'
# Stop the user if they are missing vital files: # Stop the user if they are missing vital files:
missingFiles = [] missingFiles = []
for filename in ('deploy.json', 'unitedcipher'): for filename in ('deploy.json', 'stridecipher'):
if sys.platform == 'win32': if sys.platform == 'win32':
# On the Windows platform, if there is no extension, we must infer that # On the Windows platform, if there is no extension, we must infer that
# this is an executable file. Therefore, let's append '.exe': # this is an executable file. Therefore, let's append '.exe':
@ -229,9 +229,9 @@ os.system(cmd)
# ...and encrypt the product: # ...and encrypt the product:
os.chdir('build') os.chdir('build')
if sys.platform == 'win32': if sys.platform == 'win32':
os.system('..\\unitedcipher.exe %s GameData.bin' % output) os.system('..\\stridecipher.exe %s GameData.bin' % output)
else: else:
os.system('../unitedcipher %s GameData.bin' % output) os.system('../stridecipher %s GameData.bin' % output)
# Copy the necessary patcher includes: # Copy the necessary patcher includes:
for include in patcherIncludes: for include in patcherIncludes:
@ -346,7 +346,7 @@ for filepath in updatedFiles:
print 'Compressing %s...' % filepath print 'Compressing %s...' % filepath
compressFile(os.path.join('build', filepath)) compressFile(os.path.join('build', filepath))
print 'Uploading files to download.toontownunited.com...' print 'Uploading files to download.toontownstride.com...'
ftp = ftplib.FTP(ftpAddress, ftpUsername, ftpPassword) ftp = ftplib.FTP(ftpAddress, ftpUsername, ftpPassword)
ftp.cwd(deployToken) ftp.cwd(deployToken)

2
doc/building/README.md Normal file → Executable file
View file

@ -1,6 +1,6 @@
Building Building
======== ========
These documents outline everything you need to know for building a Toontown United client. These documents outline everything you need to know for building a Toontown Stride client.
- - - - - -

4
doc/style-guide/README.md Normal file → Executable file
View file

@ -1,6 +1,6 @@
Toontown United Style Guidelines Toontown Stride Style Guidelines
================================== ==================================
Code and documentation in the master and release branches of the Toontown United repositories must conform to these guidelines. Any code submitted that is not properly formated will be rejected, as it is best to keep a readable, and consistent style for future contributors to read, and understand the code. Don't, however, blindly follow these guidelines into writing unreadable code. Sometimes it is best to use your own judgement. Code and documentation in the master and release branches of the Toontown Stride repositories must conform to these guidelines. Any code submitted that is not properly formated will be rejected, as it is best to keep a readable, and consistent style for future contributors to read, and understand the code. Don't, however, blindly follow these guidelines into writing unreadable code. Sometimes it is best to use your own judgement.
- - - - - -

0
doc/style-guide/cxx-style.md Normal file → Executable file
View file

0
doc/style-guide/git-style.md Normal file → Executable file
View file

0
doc/style-guide/python-style.md Normal file → Executable file
View file

0
guieditor/EditorStart.py Normal file → Executable file
View file

0
guieditor/__init__.py Normal file → Executable file
View file

0
libpandadna.pyd Normal file → Executable file
View file

16
linux/start-game-localhost.sh Normal file → Executable file
View file

@ -2,18 +2,18 @@
cd .. cd ..
# Get the user input: # Get the user input:
read -p "Username: " ttuUsername read -p "Username: " ttsUsername
# Export the environment variables: # Export the environment variables:
export ttuUsername=$ttuUsername export ttsUsername=$ttsUsername
export ttuPassword="password" export ttsPassword="password"
export TTU_PLAYCOOKIE=$ttuUsername export TTS_PLAYCOOKIE=$ttsUsername
export TTU_GAMESERVER="127.0.0.1" export TTS_GAMESERVER="127.0.0.1"
echo "===============================" echo "==============================="
echo "Starting Toontown United..." echo "Starting Toontown Stride..."
echo "Username: $ttuUsername" echo "Username: $ttsUsername"
echo "Gameserver: $TTU_GAMESERVER" echo "Gameserver: $TTS_GAMESERVER"
echo "===============================" echo "==============================="
/usr/bin/python2 -m toontown.toonbase.ClientStart /usr/bin/python2 -m toontown.toonbase.ClientStart

22
linux/start-game-remotedb.sh Normal file → Executable file
View file

@ -2,22 +2,22 @@
cd .. cd ..
# Get the user input: # Get the user input:
read -p "Username: " ttuUsername read -p "Username: " ttsUsername
read -s -p "Password: " ttuPassword read -s -p "Password: " ttsPassword
echo echo
read -p "Gameserver (DEFAULT: 167.114.28.238): " TTU_GAMESERVER read -p "Gameserver (DEFAULT: 167.114.28.238): " TTS_GAMESERVER
TTU_GAMESERVER=${TTU_GAMESERVER:-"167.114.28.238"} TTS_GAMESERVER=${TTS_GAMESERVER:-"167.114.28.238"}
# Export the environment variables: # Export the environment variables:
export ttuUsername=$ttuUsername export ttsUsername=$ttsUsername
export ttuPassword=$ttuPassword export ttsPassword=$ttsPassword
export TTU_PLAYCOOKIE=$ttuUsername export TTS_PLAYCOOKIE=$ttsUsername
export TTU_GAMESERVER=$TTU_GAMESERVER export TTS_GAMESERVER=$TTS_GAMESERVER
echo "===============================" echo "==============================="
echo "Starting Toontown United..." echo "Starting Toontown Stride..."
echo "Username: $ttuUsername" echo "Username: $ttsUsername"
echo "Gameserver: $TTU_GAMESERVER" echo "Gameserver: $TTS_GAMESERVER"
echo "===============================" echo "==============================="
/usr/bin/python2 -m toontown.toonbase.ClientStartRemoteDB /usr/bin/python2 -m toontown.toonbase.ClientStartRemoteDB

20
linux/start-game.sh Normal file → Executable file
View file

@ -2,20 +2,20 @@
cd .. cd ..
# Get the user input: # Get the user input:
read -p "Username: " ttuUsername read -p "Username: " ttsUsername
read -p "Gameserver (DEFAULT: 167.114.28.238): " TTU_GAMESERVER read -p "Gameserver (DEFAULT: 167.114.28.238): " TTS_GAMESERVER
TTU_GAMESERVER=${TTU_GAMESERVER:-"167.114.28.238"} TTS_GAMESERVER=${TTS_GAMESERVER:-"167.114.28.238"}
# Export the environment variables: # Export the environment variables:
export ttuUsername=$ttuUsername export ttsUsername=$ttsUsername
export ttuPassword="password" export ttsPassword="password"
export TTU_PLAYCOOKIE=$ttuUsername export TTS_PLAYCOOKIE=$ttsUsername
export TTU_GAMESERVER=$TTU_GAMESERVER export TTS_GAMESERVER=$TTS_GAMESERVER
echo "===============================" echo "==============================="
echo "Starting Toontown United..." echo "Starting Toontown Stride..."
echo "Username: $ttuUsername" echo "Username: $ttsUsername"
echo "Gameserver: $TTU_GAMESERVER" echo "Gameserver: $TTS_GAMESERVER"
echo "===============================" echo "==============================="
/usr/bin/python2 -m toontown.toonbase.ClientStart /usr/bin/python2 -m toontown.toonbase.ClientStart

0
otp/__init__.py Normal file → Executable file
View file

0
otp/ai/AIBase.py Normal file → Executable file
View file

0
otp/ai/AIBaseGlobal.py Normal file → Executable file
View file

4
otp/ai/AIMsgTypes.py Normal file → Executable file
View file

@ -57,10 +57,6 @@ AIMsgName2Id = {'STATESERVER_OBJECT_GENERATE_WITH_REQUIRED': 2001,
'CHANNEL_PUPPET_ACTION': 4004, 'CHANNEL_PUPPET_ACTION': 4004,
'DBSERVER_MAKE_FRIENDS': 1017, 'DBSERVER_MAKE_FRIENDS': 1017,
'DBSERVER_MAKE_FRIENDS_RESP': 1031, 'DBSERVER_MAKE_FRIENDS_RESP': 1031,
'DBSERVER_REQUEST_SECRET': 1025,
'DBSERVER_REQUEST_SECRET_RESP': 1026,
'DBSERVER_SUBMIT_SECRET': 1027,
'DBSERVER_SUBMIT_SECRET_RESP': 1028,
'DBSERVER_CREATE_STORED_OBJECT': 1003, 'DBSERVER_CREATE_STORED_OBJECT': 1003,
'DBSERVER_CREATE_STORED_OBJECT_RESP': 1004, 'DBSERVER_CREATE_STORED_OBJECT_RESP': 1004,
'DBSERVER_DELETE_STORED_OBJECT': 1008, 'DBSERVER_DELETE_STORED_OBJECT': 1008,

0
otp/ai/AIZoneData.py Normal file → Executable file
View file

0
otp/ai/BanManagerAI.py Normal file → Executable file
View file

0
otp/ai/Barrier.py Normal file → Executable file
View file

0
otp/ai/MagicWordGlobal.py Normal file → Executable file
View file

0
otp/ai/MagicWordManager.py Normal file → Executable file
View file

0
otp/ai/MagicWordManagerAI.py Normal file → Executable file
View file

0
otp/ai/TimeManager.py Normal file → Executable file
View file

0
otp/ai/TimeManagerAI.py Normal file → Executable file
View file

0
otp/ai/__init__.py Normal file → Executable file
View file

0
otp/avatar/Avatar.py Normal file → Executable file
View file

0
otp/avatar/AvatarDNA.py Normal file → Executable file
View file

0
otp/avatar/AvatarDetail.py Normal file → Executable file
View file

0
otp/avatar/AvatarHandle.py Normal file → Executable file
View file

0
otp/avatar/AvatarPanel.py Normal file → Executable file
View file

0
otp/avatar/DistributedAvatar.py Normal file → Executable file
View file

0
otp/avatar/DistributedAvatarAI.py Normal file → Executable file
View file

0
otp/avatar/DistributedAvatarUD.py Normal file → Executable file
View file

12
otp/avatar/DistributedPlayer.py Normal file → Executable file
View file

@ -135,7 +135,7 @@ class DistributedPlayer(DistributedAvatar.DistributedAvatar, PlayerBase.PlayerBa
def whisperSCTo(self, msgIndex, sendToId): def whisperSCTo(self, msgIndex, sendToId):
messenger.send('wakeup') messenger.send('wakeup')
base.cr.ttuFriendsManager.d_whisperSCTo(sendToId, msgIndex) base.cr.ttsFriendsManager.d_whisperSCTo(sendToId, msgIndex)
def setWhisperSCFrom(self, fromId, msgIndex): def setWhisperSCFrom(self, fromId, msgIndex):
handle = base.cr.identifyAvatar(fromId) handle = base.cr.identifyAvatar(fromId)
@ -149,7 +149,7 @@ class DistributedPlayer(DistributedAvatar.DistributedAvatar, PlayerBase.PlayerBa
def whisperSCCustomTo(self, msgIndex, sendToId): def whisperSCCustomTo(self, msgIndex, sendToId):
messenger.send('wakeup') messenger.send('wakeup')
base.cr.ttuFriendsManager.d_whisperSCCustomTo(sendToId, msgIndex) base.cr.ttsFriendsManager.d_whisperSCCustomTo(sendToId, msgIndex)
def _isValidWhisperSource(self, source): def _isValidWhisperSource(self, source):
return True return True
@ -171,7 +171,7 @@ class DistributedPlayer(DistributedAvatar.DistributedAvatar, PlayerBase.PlayerBa
def whisperSCEmoteTo(self, emoteId, sendToId): def whisperSCEmoteTo(self, emoteId, sendToId):
messenger.send('wakeup') messenger.send('wakeup')
base.cr.ttuFriendsManager.d_whisperSCEmoteTo(sendToId, emoteId) base.cr.ttsFriendsManager.d_whisperSCEmoteTo(sendToId, emoteId)
def setWhisperSCEmoteFrom(self, fromId, emoteId): def setWhisperSCEmoteFrom(self, fromId, emoteId):
handle = base.cr.identifyAvatar(fromId) handle = base.cr.identifyAvatar(fromId)
@ -302,7 +302,7 @@ class DistributedPlayer(DistributedAvatar.DistributedAvatar, PlayerBase.PlayerBa
self.lastTeleportQuery = time.time() self.lastTeleportQuery = time.time()
base.cr.ttuFriendsManager.d_teleportQuery(sendToId) base.cr.ttsFriendsManager.d_teleportQuery(sendToId)
def teleportQuery(self, requesterId): def teleportQuery(self, requesterId):
avatar = base.cr.identifyFriend(requesterId) avatar = base.cr.identifyFriend(requesterId)
@ -337,7 +337,7 @@ class DistributedPlayer(DistributedAvatar.DistributedAvatar, PlayerBase.PlayerBa
shardId, hoodId, zoneId, sendToId),) shardId, hoodId, zoneId, sendToId),)
) )
base.cr.ttuFriendsManager.d_teleportResponse(sendToId, available, base.cr.ttsFriendsManager.d_teleportResponse(sendToId, available,
shardId, hoodId, zoneId shardId, hoodId, zoneId
) )
@ -351,7 +351,7 @@ class DistributedPlayer(DistributedAvatar.DistributedAvatar, PlayerBase.PlayerBa
def d_teleportGiveup(self, requesterId, sendToId): def d_teleportGiveup(self, requesterId, sendToId):
teleportNotify.debug('sending teleportGiveup(%s) to %s' % (requesterId, sendToId)) teleportNotify.debug('sending teleportGiveup(%s) to %s' % (requesterId, sendToId))
base.cr.ttuFriendsManager.d_teleportGiveup(sendToId) base.cr.ttsFriendsManager.d_teleportGiveup(sendToId)
def teleportGiveup(self, requesterId): def teleportGiveup(self, requesterId):
teleportNotify.debug('received teleportGiveup(%s)' % (requesterId,)) teleportNotify.debug('received teleportGiveup(%s)' % (requesterId,))

2
otp/avatar/DistributedPlayerAI.py Normal file → Executable file
View file

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

0
otp/avatar/Emote.py Normal file → Executable file
View file

0
otp/avatar/LocalAvatar.py Normal file → Executable file
View file

0
otp/avatar/PlayerBase.py Normal file → Executable file
View file

0
otp/avatar/PositionExaminer.py Normal file → Executable file
View file

0
otp/avatar/ShadowCaster.py Normal file → Executable file
View file

0
otp/avatar/__init__.py Normal file → Executable file
View file

0
otp/chat/ChatAgent.py Normal file → Executable file
View file

0
otp/chat/ChatAgentAI.py Normal file → Executable file
View file

0
otp/chat/ChatAgentUD.py Normal file → Executable file
View file

0
otp/chat/ChatGarbler.py Normal file → Executable file
View file

0
otp/chat/ChatGlobals.py Normal file → Executable file
View file

0
otp/chat/ChatInputNormal.py Normal file → Executable file
View file

0
otp/chat/ChatInputTyped.py Normal file → Executable file
View file

0
otp/chat/ChatInputWhiteListFrame.py Normal file → Executable file
View file

36
otp/chat/ChatManager.py Normal file → Executable file
View file

@ -43,8 +43,8 @@ class ChatManager(DirectObject.DirectObject):
self.wantBackgroundFocus = 1 self.wantBackgroundFocus = 1
self.__scObscured = 0 self.__scObscured = 0
self.__normalObscured = 0 self.__normalObscured = 0
self.noSecretChatAtAll = None self.noTrueFriendsAtAll = None
self.noSecretChatAtAllAndNoWhitelist = None self.noTrueFriendsAtAllAndNoWhitelist = None
self.fsm = ClassicFSM.ClassicFSM('chatManager', [State.State('off', self.enterOff, self.exitOff), self.fsm = ClassicFSM.ClassicFSM('chatManager', [State.State('off', self.enterOff, self.exitOff),
State.State('mainMenu', self.enterMainMenu, self.exitMainMenu), State.State('mainMenu', self.enterMainMenu, self.exitMainMenu),
State.State('speedChat', self.enterSpeedChat, self.exitSpeedChat), State.State('speedChat', self.enterSpeedChat, self.exitSpeedChat),
@ -52,8 +52,8 @@ class ChatManager(DirectObject.DirectObject):
State.State('whisper', self.enterWhisper, self.exitWhisper), State.State('whisper', self.enterWhisper, self.exitWhisper),
State.State('whisperChat', self.enterWhisperChat, self.exitWhisperChat), State.State('whisperChat', self.enterWhisperChat, self.exitWhisperChat),
State.State('whisperSpeedChat', self.enterWhisperSpeedChat, self.exitWhisperSpeedChat), State.State('whisperSpeedChat', self.enterWhisperSpeedChat, self.exitWhisperSpeedChat),
State.State('noSecretChatAtAll', self.enterNoSecretChatAtAll, self.exitNoSecretChatAtAll), State.State('noTrueFriendsAtAll', self.enterNoTrueFriendsAtAll, self.exitNoTrueFriendsAtAll),
State.State('noSecretChatAtAllAndNoWhitelist', self.enterNoSecretChatAtAllAndNoWhitelist, self.exitNoSecretChatAtAllAndNoWhitelist), State.State('noTrueFriendsAtAllAndNoWhitelist', self.enterNoTrueFriendsAtAllAndNoWhitelist, self.exitNoTrueFriendsAtAllAndNoWhitelist),
State.State('otherDialog', self.enterOtherDialog, self.exitOtherDialog), State.State('otherDialog', self.enterOtherDialog, self.exitOtherDialog),
State.State('whiteListOpenChat', self.enterWhiteListOpenChat, self.exitWhiteListOpenChat), State.State('whiteListOpenChat', self.enterWhiteListOpenChat, self.exitWhiteListOpenChat),
State.State('whiteListAvatarChat', self.enterWhiteListAvatarChat, self.exitWhiteListAvatarChat)], 'off', 'off') State.State('whiteListAvatarChat', self.enterWhiteListAvatarChat, self.exitWhiteListAvatarChat)], 'off', 'off')
@ -69,12 +69,12 @@ class ChatManager(DirectObject.DirectObject):
del self.chatInputNormal del self.chatInputNormal
self.chatInputSpeedChat.delete() self.chatInputSpeedChat.delete()
del self.chatInputSpeedChat del self.chatInputSpeedChat
if self.noSecretChatAtAll: if self.noTrueFriendsAtAll:
self.noSecretChatAtAll.destroy() self.noTrueFriendsAtAll.destroy()
self.noSecretChatAtAll = None self.noTrueFriendsAtAll = None
if self.noSecretChatAtAllAndNoWhitelist: if self.noTrueFriendsAtAllAndNoWhitelist:
self.noSecretChatAtAllAndNoWhitelist.destroy() self.noTrueFriendsAtAllAndNoWhitelist.destroy()
self.noSecretChatAtAllAndNoWhitelist = None self.noTrueFriendsAtAllAndNoWhitelist = None
del self.localAvatar del self.localAvatar
del self.cr del self.cr
return return
@ -280,17 +280,17 @@ class ChatManager(DirectObject.DirectObject):
def exitNormalChat(self): def exitNormalChat(self):
self.chatInputNormal.deactivate() self.chatInputNormal.deactivate()
def enterNoSecretChatAtAll(self): def enterNoTrueFriendsAtAll(self):
self.notify.error('called enterNoSecretChatAtAll() on parent class') self.notify.error('called enterNoTrueFriendsAtAll() on parent class')
def exitNoSecretChatAtAll(self): def exitNoTrueFriendsAtAll(self):
self.notify.error('called exitNoSecretChatAtAll() on parent class') self.notify.error('called exitNoTrueFriendsAtAll() on parent class')
def enterNoSecretChatAtAllAndNoWhitelist(self): def enterNoTrueFriendsAtAllAndNoWhitelist(self):
self.notify.error('called enterNoSecretChatAtAllAndNoWhitelist() on parent class') self.notify.error('called enterNoTrueFriendsAtAllAndNoWhitelist() on parent class')
def exitNoSecretChatAtAllAndNoWhitelist(self): def exitNoTrueFriendsAtAllAndNoWhitelist(self):
self.notify.error('called exitNoSecretChatAtAllAndNoWhitelist() on parent class') self.notify.error('called exitNoTrueFriendsAtAllAndNoWhitelist() on parent class')
def enterOtherDialog(self): def enterOtherDialog(self):
pass pass

10
otp/chat/SequenceList.py Normal file → Executable file
View file

@ -29,7 +29,8 @@ a,ah,ahh,ahhh,ahhhhh,ahhhhhh:zzz,sees,$,'s
ace,as,ash,ask,asp,ashton:hole,whole,ole,ooo le,holes,zzz,'s ace,as,ash,ask,asp,ashton:hole,whole,ole,ooo le,holes,zzz,'s
ack:ools ack:ools
ai,ay,ayy,ayyy,ayyyy:ds ai,ay,ayy,ayyy,ayyyy:ds
al:coco ol,cool al:coco ol,cool,a ack bar,ah ack bar,ah ache bar,ah snack bar
all:a ack bar,ah ack bar,ah ache bar,ah snack bar
an:a hon,a honda,a con,a cone,ail,ails,ailed,ailing,al,ale,ales,all,awl,us,u.s.,u.s.a.,u si,usa,use,used,using,uses,uss an:a hon,a honda,a con,a cone,ail,ails,ailed,ailing,al,ale,ales,all,awl,us,u.s.,u.s.a.,u si,usa,use,used,using,uses,uss
ann:a hon,a honda,a con,a cone,al,ails,ailed,ailing,ale,ales,all,awl,us,u.s.,u.s.a.,u si,usa,use,used,using,uses,uss ann:a hon,a honda,a con,a cone,al,ails,ailed,ailing,ale,ales,all,awl,us,u.s.,u.s.a.,u si,usa,use,used,using,uses,uss
anna:hon,honda,con da,con duh,cone da,cone duh anna:hon,honda,con da,con duh,cone da,cone duh
@ -40,6 +41,7 @@ apes:me,you,him,his,their,him,them,your,yourself,ur self
ate:me out,you out,u out,her out ate:me out,you out,u out,her out
ball:it more ball:it more
ban:gg ban:gg
bangs:me,her,him,it,them
bass:hole,whole,ole,stir,stir ed,stair,stair ed,tar,star,stared,tt a r ed,holes bass:hole,whole,ole,stir,stir ed,stair,stair ed,tar,star,stared,tt a r ed,holes
bat:star,stair,stair ed,star,stared bat:star,stair,stair ed,star,stared
bay:be maker bay:be maker
@ -321,8 +323,8 @@ tea:bag,bagged,bagging,bags
test:i cools,i cool,tickle,tickles test:i cools,i cool,tickle,tickles
the:di,hello,flunk the:di,hello,flunk
tho:tt,tea,tee,ty tho:tt,tea,tee,ty
to:he'll to:he'll,bangs
too:he'll too:he'll,bangs
truck:eh ru,ing,eng,you,u,up,ed,her,or truck:eh ru,ing,eng,you,u,up,ed,her,or
tt:its,its,it tt:its,its,it
two:he'll two:he'll
@ -334,7 +336,7 @@ vague:in a,i nah
vern:gen vern:gen
vet:china vet:china
via:grape via:grape
wanna:duck wanna:duck,bangs
wat:the hello,the fork,the duck,the freaky,the yuck,your sky,ur sky,the fire truck,the truck,the he'll wat:the hello,the fork,the duck,the freaky,the yuck,your sky,ur sky,the fire truck,the truck,the he'll
we,whee:ed,neigh is,knees we,whee:ed,neigh is,knees
what:the hello,the fork,the duck,the freaky,the yuck,your sky,ur sky,the truck,the fire truck,the he'll what:the hello,the fork,the duck,the freaky,the yuck,your sky,ur sky,the truck,the fire truck,the he'll

2
otp/chat/TalkAssistant.py Normal file → Executable file
View file

@ -418,7 +418,7 @@ class TalkAssistant(DirectObject.DirectObject):
message, scrubbed = base.localAvatar.scrubTalk(cleanMessage, modifications) message, scrubbed = base.localAvatar.scrubTalk(cleanMessage, modifications)
base.cr.ttuFriendsManager.sendUpdate('sendTalkWhisper', [receiverAvId, message]) base.cr.ttsFriendsManager.sendUpdate('sendTalkWhisper', [receiverAvId, message])
def sendOpenSpeedChat(self, type, messageIndex): def sendOpenSpeedChat(self, type, messageIndex):
error = None error = None

0
otp/chat/TalkGlobals.py Normal file → Executable file
View file

Some files were not shown because too many files have changed in this diff Show more