Sneed-Group/Poodletooth-iLand
2
0
Fork 0
mirror of https://github.com/Sneed-Group/Poodletooth-iLand synced 2025-01-09 17:53:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Added Zach's want-uplevel-res

Browse source
This commit is contained in:
Loudrob 2015-03-04 22:28:56 -05:00
parent 0498f15624
commit ee7dedcf46
4 changed files with 14 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
config/release/dev.prc
View file

@ -2,6 +2,7 @@
distribution dev distribution dev
# Art assets: # Art assets:
want-uplevel-res #t
model-path ../resources/ model-path ../resources/
# Server: # Server:

12
toontown/dna/DNAParser.py
View file

@ -21,14 +21,18 @@ class DNABulkLoader:
def loadDNABulk(dnaStorage, file): def loadDNABulk(dnaStorage, file):
dnaLoader = DNALoader.DNALoader() dnaLoader = DNALoader.DNALoader()
file = '../resources/' + file file = 'resources/' + file
if config.GetBool('want-uplevel-res', False):
file = '../resources/' + file
dnaLoader.loadDNAFile(dnaStorage, file) dnaLoader.loadDNAFile(dnaStorage, file)
dnaLoader.destroy() dnaLoader.destroy()
def loadDNAFile(dnaStorage, file): def loadDNAFile(dnaStorage, file):
print 'Reading DNA file...', file print 'Reading DNA file...', file
dnaLoader = DNALoader.DNALoader() dnaLoader = DNALoader.DNALoader()
file = '../resources/' + file file = 'resources/' + file
if config.GetBool('want-uplevel-res', False):
file = '../resources/' + file
node = dnaLoader.loadDNAFile(dnaStorage, file) node = dnaLoader.loadDNAFile(dnaStorage, file)
dnaLoader.destroy() dnaLoader.destroy()
if node.node().getNumChildren() > 0: if node.node().getNumChildren() > 0:
@ -37,7 +41,9 @@ def loadDNAFile(dnaStorage, file):
def loadDNAFileAI(dnaStorage, file): def loadDNAFileAI(dnaStorage, file):
dnaLoader = DNALoader.DNALoader() dnaLoader = DNALoader.DNALoader()
file = '../resources/' + file file = 'resources/' + file
if config.GetBool('want-uplevel-res', False):
file = '../resources/' + file
data = dnaLoader.loadDNAFileAI(dnaStorage, file) data = dnaLoader.loadDNAFileAI(dnaStorage, file)
dnaLoader.destroy() dnaLoader.destroy()
return data return data

2
toontown/makeatoon/NameGenerator.py
View file

@ -39,6 +39,8 @@ class NameGenerator:
self.nameDictionary = {} self.nameDictionary = {}
searchPath = DSearchPath() searchPath = DSearchPath()
if __debug__: if __debug__:
searchPath.appendDirectory(Filename('resources/phase_3/etc'))
if config.GetBool('want-uplevel-res', False):
searchPath.appendDirectory(Filename('../resources/phase_3/etc')) searchPath.appendDirectory(Filename('../resources/phase_3/etc'))
searchPath.appendDirectory(Filename('/phase_3/etc')) searchPath.appendDirectory(Filename('/phase_3/etc'))
filename = Filename(TTLocalizer.NameShopNameMaster) filename = Filename(TTLocalizer.NameShopNameMaster)

2
toontown/quest/QuestParser.py
View file

@ -1086,6 +1086,8 @@ class NPCMoviePlayer(DirectObject.DirectObject):
searchPath = DSearchPath() searchPath = DSearchPath()
if __debug__: if __debug__:
searchPath.appendDirectory(Filename('resources/phase_3/etc'))
if config.GetBool('want-uplevel-res', False):
searchPath.appendDirectory(Filename('../resources/phase_3/etc')) searchPath.appendDirectory(Filename('../resources/phase_3/etc'))
searchPath.appendDirectory(Filename('/phase_3/etc')) searchPath.appendDirectory(Filename('/phase_3/etc'))
scriptFile = Filename('QuestScripts.txt') scriptFile = Filename('QuestScripts.txt')