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

This commit is contained in:
tts 2015-07-24 16:54:50 -04:00
parent ad680a934c
commit dc81ce6331
12 changed files with 90 additions and 20 deletions

BIN
dependencies/astron/astrond vendored Executable file

Binary file not shown.

View file

@ -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

View file

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

12
dependencies/astron/darwin/start-ai-server.sh vendored Normal file → Executable file
View file

@ -1,14 +1,14 @@
#!/bin/sh #!/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: # Define some constants for our AI server:
MAX_CHANNELS=999999 MAX_CHANNELS=999999
STATESERVER=4002 STATESERVER=4002
ASTRON_IP="127.0.0.1:7100" ASTRON_IP="158.69.28.83:7100"
EVENTLOGGER_IP="127.0.0.1:7198" EVENTLOGGER_IP="158.69.28.83:7198"
# Get the user input: # Get the user input:
read -p "District name (DEFAULT: Nuttyboro): " DISTRICT_NAME read -p "District name (DEFAULT: Nuttyboro): " DISTRICT_NAME
@ -28,7 +28,7 @@ echo "==============================="
while [ true ] while [ true ]
do 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 \ --max-channels $MAX_CHANNELS --stateserver $STATESERVER \
--astron-ip $ASTRON_IP --eventlogger-ip $EVENTLOGGER_IP \ --astron-ip $ASTRON_IP --eventlogger-ip $EVENTLOGGER_IP \
--district-name $DISTRICT_NAME --district-name $DISTRICT_NAME

2
dependencies/astron/darwin/start-astron-cluster.sh vendored Normal file → Executable file
View file

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

12
dependencies/astron/darwin/start-uberdog-server.sh vendored Normal file → Executable file
View file

@ -1,14 +1,14 @@
#!/bin/sh #!/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: # Define some constants for our AI server:
MAX_CHANNELS=999999 MAX_CHANNELS=999999
STATESERVER=4002 STATESERVER=4002
ASTRON_IP="127.0.0.1:7100" ASTRON_IP="158.69.28.83:7100"
EVENTLOGGER_IP="127.0.0.1:7198" EVENTLOGGER_IP="158.69.28.83:7198"
# Get the user input: # Get the user input:
read -p "Base channel (DEFAULT: 1000000): " BASE_CHANNEL read -p "Base channel (DEFAULT: 1000000): " BASE_CHANNEL
@ -25,7 +25,7 @@ echo "==============================="
while [ true ] while [ true ]
do 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 \ --max-channels $MAX_CHANNELS --stateserver $STATESERVER \
--astron-ip $ASTRON_IP --eventlogger-ip $EVENTLOGGER_IP --astron-ip $ASTRON_IP --eventlogger-ip $EVENTLOGGER_IP
done done

View file

@ -27,11 +27,11 @@ dclass Account {
uint32 ACCOUNT_AV_SET[] required db; uint32 ACCOUNT_AV_SET[] required db;
uint32 ESTATE_ID db; uint32 ESTATE_ID db;
AvatarPendingDel ACCOUNT_AV_SET_DEL[] db; AvatarPendingDel ACCOUNT_AV_SET_DEL[] db;
uint64 CREATED db; string CREATED db;
string LAST_LOGIN db; string LAST_LOGIN db;
string ACCOUNT_ID db; string ACCOUNT_ID db;
uint16 ACCESS_LEVEL db; uint16 ACCESS_LEVEL db;
uint64 LAST_LOGIN_TS db; uint32 LAST_LOGIN_TS db;
}; };
struct BarrierData { struct BarrierData {

0
dependencies/libpandadna.pyd vendored Normal file → Executable file
View file

BIN
dependencies/libpandadna.so vendored Executable file

Binary file not shown.

0
dev/win32/start-game.bat Normal file → Executable file
View file

View file

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

View file

@ -325,17 +325,18 @@ class LoginAccountFSM(OperationFSM):
self.demand('SetAccount') self.demand('SetAccount')
def enterCreateAccount(self): def enterCreateAccount(self):
self.notify.debug('We are trying to create the account')
self.account = { self.account = {
'ACCOUNT_AV_SET': [0] * 6, 'ACCOUNT_AV_SET': [0] * 6,
'ESTATE_ID': 0, 'ESTATE_ID': 0,
'ACCOUNT_AV_SET_DEL': [], 'ACCOUNT_AV_SET_DEL': [],
'CREATED': time.time(), 'CREATED': time.ctime(),
'LAST_LOGIN': time.ctime(), 'LAST_LOGIN': time.ctime(),
'LAST_LOGIN_TS': time.time(), 'LAST_LOGIN_TS': time.time(),
'ACCOUNT_ID': str(self.userId), 'ACCOUNT_ID': str(self.userId),
'ACCESS_LEVEL': self.accessLevel 'ACCESS_LEVEL': self.accessLevel
} }
self.csm.air.dbInterface.createObject( res = self.csm.air.dbInterface.createObject(
self.csm.air.dbId, self.csm.air.dbId,
self.csm.air.dclassesByName['AccountUD'], self.csm.air.dclassesByName['AccountUD'],
self.account, self.account,