Revert "stride: add some files for running astron on centos & gameserver on ubuntu (we'll need to switch astron when server chanegs"

This reverts commit dc81ce6331.

dependencies/astron/config/prod-test.yml

@@ -1,64 +0,0 @@
-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

dependencies/astron/config/production-cluster.yml

@@ -20,7 +20,8 @@ roles:
         max: 399999999
       backend:
         type: mongodb
-        server: mongodb://127.0.0.1:27017/stride
+        server: 127.0.0.1:21021
+        database: test
 
     - type: dbss
       database: 4003

dependencies/astron/darwin/start-ai-server.sh

@@ -1,14 +1,14 @@
 #!/bin/sh
-cd ../../..
+cd ../..
 
-#export DYLD_LIBRARY_PATH=`pwd`/Libraries.bundle
+export DYLD_LIBRARY_PATH=`pwd`/Libraries.bundle
-#export DYLD_FRAMEWORK_PATH="Frameworks"
+export DYLD_FRAMEWORK_PATH="Frameworks"
 
 # Define some constants for our AI server:
 MAX_CHANNELS=999999
 STATESERVER=4002
-ASTRON_IP="158.69.28.83:7100"
+ASTRON_IP="127.0.0.1:7100"
-EVENTLOGGER_IP="158.69.28.83:7198"
+EVENTLOGGER_IP="127.0.0.1:7198"
 
 # Get the user input:
 read -p "District name (DEFAULT: Nuttyboro): " DISTRICT_NAME
@@ -28,7 +28,7 @@ echo "==============================="
 
 while [ true ]
 do
-    python -m toontown.ai.ServiceStart --base-channel $BASE_CHANNEL \
+    ppython -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

dependencies/astron/darwin/start-astron-cluster.sh

@@ -1,3 +1,3 @@
 #!/bin/sh
 cd ..
-./astrond --loglevel info config/prod-test.yml
+./astrond --loglevel info config/cluster.yml

dependencies/astron/darwin/start-uberdog-server.sh

@@ -1,14 +1,14 @@
 #!/bin/sh
-cd ../../..
+cd ../..
 
-#export DYLD_LIBRARY_PATH=`pwd`/Libraries.bundle
+export DYLD_LIBRARY_PATH=`pwd`/Libraries.bundle
-#export DYLD_FRAMEWORK_PATH="Frameworks"
+export DYLD_FRAMEWORK_PATH="Frameworks"
 
 # Define some constants for our AI server:
 MAX_CHANNELS=999999
 STATESERVER=4002
-ASTRON_IP="158.69.28.83:7100"
+ASTRON_IP="127.0.0.1:7100"
-EVENTLOGGER_IP="158.69.28.83:7198"
+EVENTLOGGER_IP="127.0.0.1:7198"
 
 # Get the user input:
 read -p "Base channel (DEFAULT: 1000000): " BASE_CHANNEL
@@ -25,7 +25,7 @@ echo "==============================="
 
 while [ true ]
 do
-python -m toontown.uberdog.ServiceStart --base-channel $BASE_CHANNEL \
+ppython -m toontown.uberdog.ServiceStart --base-channel $BASE_CHANNEL \
                  --max-channels $MAX_CHANNELS --stateserver $STATESERVER \
                  --astron-ip $ASTRON_IP --eventlogger-ip $EVENTLOGGER_IP
 done

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;
-  string CREATED db;
+  uint64 CREATED db;
   string LAST_LOGIN db;
   string ACCOUNT_ID db;
   uint16 ACCESS_LEVEL db;
-  uint32 LAST_LOGIN_TS db;
+  uint64 LAST_LOGIN_TS db;
 };
 
 struct BarrierData {

toontown/toonbase/ToontownStart.py

@@ -26,13 +26,7 @@ from panda3d.core import loadPrcFile
 
 
 if __debug__:
-    try:
+    import wx, sys
-        import wx
-    except:
-        import wxversion
-        wxversion.select('3.0')
-        import wx
-    import sys
     from direct.stdpy import threading
 
     loadPrcFile('dependencies/config/general.prc')

toontown/uberdog/ClientServicesManagerUD.py

@@ -325,18 +325,17 @@ 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.ctime(),
+            'CREATED': time.time(),
             'LAST_LOGIN': time.ctime(),
             'LAST_LOGIN_TS': time.time(),
             'ACCOUNT_ID': str(self.userId),
             'ACCESS_LEVEL': self.accessLevel
         }
-        res = self.csm.air.dbInterface.createObject(
+        self.csm.air.dbInterface.createObject(
             self.csm.air.dbId,
             self.csm.air.dclassesByName['AccountUD'],
             self.account,