sneedgroup-holder/oldschool-toontown
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #43 from NathanX-S/nathan-dev

Browse source 
general: "server-data-folder" config fixed
This commit is contained in:
John Cote 2021-08-01 20:13:15 -04:00 committed by GitHub
commit ed9ce47304
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 14 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
etc/Configrc.prc
View file

@ -96,3 +96,4 @@ early-event-sphere 1
accept-clock-skew 1 accept-clock-skew 1
text-minfilter linear_mipmap_linear text-minfilter linear_mipmap_linear
gc-save-all 0 gc-save-all 0
server-data-folder data

11
toontown/ai/ToontownAIRepository.py
View file

@ -49,6 +49,7 @@ from toontown.suit.SuitInvasionManagerAI import SuitInvasionManagerAI
from toontown.toon import NPCToons from toontown.toon import NPCToons
from toontown.toonbase import ToontownGlobals from toontown.toonbase import ToontownGlobals
from toontown.uberdog.DistributedInGameNewsMgrAI import DistributedInGameNewsMgrAI from toontown.uberdog.DistributedInGameNewsMgrAI import DistributedInGameNewsMgrAI
import os
class ToontownAIRepository(ToontownInternalRepository): class ToontownAIRepository(ToontownInternalRepository):
@ -60,6 +61,9 @@ class ToontownAIRepository(ToontownInternalRepository):
self.doLiveUpdates = config.GetBool('want-live-updates', True) self.doLiveUpdates = config.GetBool('want-live-updates', True)
self.wantCogdominiums = config.GetBool('want-cogdominiums', True) self.wantCogdominiums = config.GetBool('want-cogdominiums', True)
self.useAllMinigames = config.GetBool('want-all-minigames', True) self.useAllMinigames = config.GetBool('want-all-minigames', True)
self.dataFolder = config.GetString('server-data-folder', '')
if self.dataFolder:
self.dataFolder = self.dataFolder + '/'
self.districtId = None self.districtId = None
self.district = None self.district = None
self.districtStats = None self.districtStats = None
@ -107,6 +111,9 @@ class ToontownAIRepository(ToontownInternalRepository):
self.notify.info('Declaring ownership...') self.notify.info('Declaring ownership...')
self.district.setAI(self.ourChannel) self.district.setAI(self.ourChannel)
# Setup necessary files and things.
self.setupFiles()
# Create our local objects. # Create our local objects.
self.notify.info('Creating local objects...') self.notify.info('Creating local objects...')
self.createLocals() self.createLocals()
@ -461,3 +468,7 @@ class ToontownAIRepository(ToontownInternalRepository):
def trueUniqueName(self, idString): def trueUniqueName(self, idString):
return self.uniqueName(idString) return self.uniqueName(idString)
def setupFiles(self):
if not os.path.exists(self.dataFolder):
os.mkdir(self.dataFolder)

3
toontown/building/DistributedBuildingMgrAI.py
View file

@ -11,7 +11,6 @@ import time, random
class DistributedBuildingMgrAI: class DistributedBuildingMgrAI:
notify = DirectNotifyGlobal.directNotify.newCategory('DistributedBuildingMgrAI') notify = DirectNotifyGlobal.directNotify.newCategory('DistributedBuildingMgrAI')
serverDatafolder = simbase.config.GetString('server-data-folder', '')
def __init__(self, air, branchID, dnaStore, trophyMgr): def __init__(self, air, branchID, dnaStore, trophyMgr):
self.branchID = branchID self.branchID = branchID
@ -231,7 +230,7 @@ class DistributedBuildingMgrAI:
return building return building
def getFileName(self): def getFileName(self):
f = '%s%s_%d_buildings.json' % (self.serverDatafolder, self.shard, self.branchID) f = '%s%s_%d_buildings.json' % (self.air.dataFolder, self.shard, self.branchID)
return f return f
def saveTo(self, file): def saveTo(self, file):

3
toontown/racing/RaceManagerAI.py
View file

@ -9,7 +9,6 @@ import os, pickle
class RaceManagerAI(DirectObject.DirectObject): class RaceManagerAI(DirectObject.DirectObject):
notify = DirectNotifyGlobal.directNotify.newCategory('RaceManagerAI') notify = DirectNotifyGlobal.directNotify.newCategory('RaceManagerAI')
serverDataFolder = simbase.config.GetString('server-data-folder', '')
def __init__(self, air): def __init__(self, air):
DirectObject.DirectObject.__init__(self) DirectObject.DirectObject.__init__(self)
@ -620,7 +619,7 @@ class RaceManagerAI(DirectObject.DirectObject):
self.notify.warning(str(sys.exc_info()[1])) self.notify.warning(str(sys.exc_info()[1]))
def getFilename(self): def getFilename(self):
return '%s%s.trackRecords' % (self.serverDataFolder, self.shard) return '%s%s.trackRecords' % (self.air.dataFolder, self.shard)
def loadRecords(self): def loadRecords(self):
try: try: