Merge branch 'master' into 'features/ttn'

Add Jumblespeed's prod commits into features/ttn.

See merge request !6

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

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

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

@@ -0,0 +1,32 @@
+#!/bin/sh
+cd ../../..
+
+# Define some constants for our AI server:
+MAX_CHANNELS=999999
+STATESERVER=4002
+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
+DISTRICT_NAME=${DISTRICT_NAME:-Nuttyboro}
+read -p "Base channel (DEFAULT: 401000000): " BASE_CHANNEL
+BASE_CHANNEL=${BASE_CHANNEL:-401000000}
+
+echo "==============================="
+echo "Starting Toontown Stride AI server..."
+echo "District name: $DISTRICT_NAME"
+echo "Base channel: $BASE_CHANNEL"
+echo "Max channels: $MAX_CHANNELS"
+echo "State Server: $STATESERVER"
+echo "Astron IP: $ASTRON_IP"
+echo "Event Logger IP: $EVENTLOGGER_IP"
+echo "==============================="
+
+while [ true ]
+do
+    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
+done

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

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

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

@@ -0,0 +1,28 @@
+#!/bin/sh
+cd ../../..
+
+# Define some constants for our AI server:
+MAX_CHANNELS=999999
+STATESERVER=4002
+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
+BASE_CHANNEL=${BASE_CHANNEL:-1000000}
+
+echo "==============================="
+echo "Starting Toontown Stride UberDOG server..."
+echo "Base channel: $BASE_CHANNEL"
+echo "Max channels: $MAX_CHANNELS"
+echo "State Server: $STATESERVER"
+echo "Astron IP: $ASTRON_IP"
+echo "Event Logger IP: $EVENTLOGGER_IP"
+echo "==============================="
+
+while [ true ]
+do
+python -m toontown.uberdog.ServiceStart --base-channel $BASE_CHANNEL \
+                 --max-channels $MAX_CHANNELS --stateserver $STATESERVER \
+                 --astron-ip $ASTRON_IP --eventlogger-ip $EVENTLOGGER_IP
+done

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')