diff --git a/dependencies/astron/astrond b/dependencies/astron/astrond new file mode 100755 index 00000000..3ea7dc90 Binary files /dev/null and b/dependencies/astron/astrond differ diff --git a/dependencies/astron/config/prod-test.yml b/dependencies/astron/config/prod-test.yml new file mode 100644 index 00000000..9102559d --- /dev/null +++ b/dependencies/astron/config/prod-test.yml @@ -0,0 +1,64 @@ +daemon: + name: Developer Cluster + +general: + eventlogger: 0.0.0.0:7198 + dc_files: + - ../dclass/stride.dc + +messagedirector: + bind: 0.0.0.0:7100 + +uberdogs: + - class: ClientServicesManager + id: 4665 + anonymous: true + + - class: ChatAgent + id: 4681 + anonymous: false + + - class: FriendManager + id: 4501 + anonymous: false + + - class: TTSFriendsManager + id: 4666 + anonymous: false + + - class: GlobalPartyManager + id: 4477 + anonymous: false + +roles: + - type: clientagent + bind: 0.0.0.0:7199 + version: "tts-dev" + client: + relocate: true + add_interest: enabled + channels: + min: 1000000000 + max: 1000001000 + + - type: stateserver + control: 4002 + + - type: database + control: 4003 + generate: + min: 100000000 + max: 399999999 + backend: + type: mongodb + server: mongodb://127.0.0.1:27017/stride + + - type: dbss + database: 4003 + ranges: + - min: 100000000 + max: 399999999 + + - type: eventlogger + bind: 0.0.0.0:7198 + output: ../logs/events-%y%m%d_%H%M%S.log diff --git a/dependencies/astron/config/production-cluster.yml b/dependencies/astron/config/production-cluster.yml index 51d69611..33256c09 100644 --- a/dependencies/astron/config/production-cluster.yml +++ b/dependencies/astron/config/production-cluster.yml @@ -20,8 +20,7 @@ roles: max: 399999999 backend: type: mongodb - server: 127.0.0.1:21021 - database: test + server: mongodb://127.0.0.1:27017/stride - type: dbss database: 4003 diff --git a/dependencies/astron/darwin/start-ai-server.sh b/dependencies/astron/darwin/start-ai-server.sh old mode 100644 new mode 100755 index d49b8dcf..fee93150 --- a/dependencies/astron/darwin/start-ai-server.sh +++ b/dependencies/astron/darwin/start-ai-server.sh @@ -1,14 +1,14 @@ #!/bin/sh -cd ../.. +cd ../../.. -export DYLD_LIBRARY_PATH=`pwd`/Libraries.bundle -export DYLD_FRAMEWORK_PATH="Frameworks" +#export DYLD_LIBRARY_PATH=`pwd`/Libraries.bundle +#export DYLD_FRAMEWORK_PATH="Frameworks" # Define some constants for our AI server: MAX_CHANNELS=999999 STATESERVER=4002 -ASTRON_IP="127.0.0.1:7100" -EVENTLOGGER_IP="127.0.0.1:7198" +ASTRON_IP="158.69.28.83:7100" +EVENTLOGGER_IP="158.69.28.83:7198" # Get the user input: read -p "District name (DEFAULT: Nuttyboro): " DISTRICT_NAME @@ -28,7 +28,7 @@ echo "===============================" while [ true ] do - ppython -m toontown.ai.ServiceStart --base-channel $BASE_CHANNEL \ + python -m toontown.ai.ServiceStart --base-channel $BASE_CHANNEL \ --max-channels $MAX_CHANNELS --stateserver $STATESERVER \ --astron-ip $ASTRON_IP --eventlogger-ip $EVENTLOGGER_IP \ --district-name $DISTRICT_NAME diff --git a/dependencies/astron/darwin/start-astron-cluster.sh b/dependencies/astron/darwin/start-astron-cluster.sh old mode 100644 new mode 100755 index eaef6aea..cfa4bdf9 --- a/dependencies/astron/darwin/start-astron-cluster.sh +++ b/dependencies/astron/darwin/start-astron-cluster.sh @@ -1,3 +1,3 @@ #!/bin/sh cd .. -./astrond --loglevel info config/cluster.yml +./astrond --loglevel info config/prod-test.yml diff --git a/dependencies/astron/darwin/start-uberdog-server.sh b/dependencies/astron/darwin/start-uberdog-server.sh old mode 100644 new mode 100755 index 175a636b..f0adba73 --- a/dependencies/astron/darwin/start-uberdog-server.sh +++ b/dependencies/astron/darwin/start-uberdog-server.sh @@ -1,14 +1,14 @@ #!/bin/sh -cd ../.. +cd ../../.. -export DYLD_LIBRARY_PATH=`pwd`/Libraries.bundle -export DYLD_FRAMEWORK_PATH="Frameworks" +#export DYLD_LIBRARY_PATH=`pwd`/Libraries.bundle +#export DYLD_FRAMEWORK_PATH="Frameworks" # Define some constants for our AI server: MAX_CHANNELS=999999 STATESERVER=4002 -ASTRON_IP="127.0.0.1:7100" -EVENTLOGGER_IP="127.0.0.1:7198" +ASTRON_IP="158.69.28.83:7100" +EVENTLOGGER_IP="158.69.28.83:7198" # Get the user input: read -p "Base channel (DEFAULT: 1000000): " BASE_CHANNEL @@ -25,7 +25,7 @@ echo "===============================" while [ true ] do -ppython -m toontown.uberdog.ServiceStart --base-channel $BASE_CHANNEL \ +python -m toontown.uberdog.ServiceStart --base-channel $BASE_CHANNEL \ --max-channels $MAX_CHANNELS --stateserver $STATESERVER \ --astron-ip $ASTRON_IP --eventlogger-ip $EVENTLOGGER_IP done diff --git a/dependencies/astron/dclass/stride.dc b/dependencies/astron/dclass/stride.dc index e30e0294..18b72fea 100644 --- a/dependencies/astron/dclass/stride.dc +++ b/dependencies/astron/dclass/stride.dc @@ -27,11 +27,11 @@ dclass Account { uint32 ACCOUNT_AV_SET[] required db; uint32 ESTATE_ID db; AvatarPendingDel ACCOUNT_AV_SET_DEL[] db; - uint64 CREATED db; + string CREATED db; string LAST_LOGIN db; string ACCOUNT_ID db; uint16 ACCESS_LEVEL db; - uint64 LAST_LOGIN_TS db; + uint32 LAST_LOGIN_TS db; }; struct BarrierData { diff --git a/dependencies/libpandadna.pyd b/dependencies/libpandadna.pyd old mode 100644 new mode 100755 diff --git a/dependencies/libpandadna.so b/dependencies/libpandadna.so new file mode 100755 index 00000000..467dfe5f Binary files /dev/null and b/dependencies/libpandadna.so differ diff --git a/dev/win32/start-game.bat b/dev/win32/start-game.bat old mode 100644 new mode 100755 diff --git a/toontown/toonbase/ToontownStart.py b/toontown/toonbase/ToontownStart.py index 9941f1bb..54403947 100644 --- a/toontown/toonbase/ToontownStart.py +++ b/toontown/toonbase/ToontownStart.py @@ -26,7 +26,13 @@ from panda3d.core import loadPrcFile if __debug__: - import wx, sys + try: + import wx + except: + import wxversion + wxversion.select('3.0') + import wx + import sys from direct.stdpy import threading loadPrcFile('dependencies/config/general.prc') diff --git a/toontown/uberdog/ClientServicesManagerUD.py b/toontown/uberdog/ClientServicesManagerUD.py index 8dd1c5f0..bb7ef1d6 100755 --- a/toontown/uberdog/ClientServicesManagerUD.py +++ b/toontown/uberdog/ClientServicesManagerUD.py @@ -325,17 +325,18 @@ class LoginAccountFSM(OperationFSM): self.demand('SetAccount') def enterCreateAccount(self): + self.notify.debug('We are trying to create the account') self.account = { 'ACCOUNT_AV_SET': [0] * 6, 'ESTATE_ID': 0, 'ACCOUNT_AV_SET_DEL': [], - 'CREATED': time.time(), + 'CREATED': time.ctime(), 'LAST_LOGIN': time.ctime(), 'LAST_LOGIN_TS': time.time(), 'ACCOUNT_ID': str(self.userId), 'ACCESS_LEVEL': self.accessLevel } - self.csm.air.dbInterface.createObject( + res = self.csm.air.dbInterface.createObject( self.csm.air.dbId, self.csm.air.dclassesByName['AccountUD'], self.account,