Sneed-Group/Poodletooth-iLand
1
0
Fork 0
mirror of https://github.com/Sneed-Group/Poodletooth-iLand synced 2024-12-24 04:02:40 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

Re-add dual resources support.

Browse source
This commit is contained in:
Loudrob 2015-03-15 16:11:46 -04:00
parent 43550417a2
commit 07d342711e
1 changed files with 15 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
toontown/dna/DNAParser.py
View file

@ -17,20 +17,32 @@ class DNABulkLoader:
def loadDNABulk(dnaStorage, file): def loadDNABulk(dnaStorage, file):
dnaLoader = DNALoader() dnaLoader = DNALoader()
fileu = '../resources/' + file fileu = '../resources/' + file
dnaLoader.loadDNAFile(dnaStorage, fileu) fileo = 'resources/' + file
try:
dnaLoader.loadDNAFile(dnaStorage, fileu)
except:
dnaLoader.loadDNAFile(dnaStorage, fileo)
def loadDNAFile(dnaStorage, file): def loadDNAFile(dnaStorage, file):
print 'Reading DNA file...', file print 'Reading DNA file...', file
dnaLoader = DNALoader() dnaLoader = DNALoader()
fileu = '../resources/' + file fileu = '../resources/' + file
node = dnaLoader.loadDNAFile(dnaStorage, fileu) fileo = 'resources/' + file
try:
node = dnaLoader.loadDNAFile(dnaStorage, fileu)
except:
node = dnaLoader.loadDNAFile(dnaStorage, fileo
if node.node().getNumChildren() > 0: if node.node().getNumChildren() > 0:
return node.node() return node.node()
def loadDNAFileAI(dnaStorage, file): def loadDNAFileAI(dnaStorage, file):
dnaLoader = DNALoader() dnaLoader = DNALoader()
fileu = '../resources/' + file fileu = '../resources/' + file
data = dnaLoader.loadDNAFileAI(dnaStorage, fileu) fileo = 'resources/' + file
try:
data = dnaLoader.loadDNAFileAI(dnaStorage, fileu)
except:
data = dnaLoader.loadDNAFileAI(dnaStorage, fileo)
return data return data
def setupDoor(a, b, c, d, e, f): def setupDoor(a, b, c, d, e, f):