zontreck/ToonTownRewritten
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

dna: Change all filename references from *.dna to *.xml.

Browse source
This commit is contained in:
Sam Edwards 2014-04-06 17:20:58 -06:00
parent ba385ffdcd
commit ebd6a8e7c8
39 changed files with 116 additions and 116 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
toontown/ai/ToontownAIRepository.py
View file

@ -182,7 +182,7 @@ class ToontownAIRepository(ToontownInternalRepository):
else:
phase = ToontownGlobals.streetPhaseMap[hoodId]
return 'phase_%s/dna/%s_%s.dna' % (phase, hood, zoneId)
return 'phase_%s/dna/%s_%s.xml' % (phase, hood, zoneId)
def loadDNA(self, filename):
with open('resources/' + filename) as f:

2
toontown/building/DistributedTutorialInterior.py
View file

@ -86,7 +86,7 @@ class DistributedTutorialInterior(DistributedObject.DistributedObject):
self.interior = loader.loadModel('phase_3.5/models/modules/toon_interior_tutorial')
self.interior.reparentTo(render)
dnaStore = DNAStorage()
node = loader.loadDNAFile(self.cr.playGame.hood.dnaStore, 'phase_3.5/dna/tutorial_street.dna')
node = loader.loadDNAFile(self.cr.playGame.hood.dnaStore, 'phase_3.5/dna/tutorial_street.xml')
self.street = render.attachNewNode(node)
self.street.flattenMedium()
self.street.setPosHpr(-17, 42, -0.5, 180, 0, 0)

8
toontown/distributed/PlayGame.py
View file

@ -142,17 +142,17 @@ class PlayGame(StateData.StateData):
def loadDnaStoreTutorial(self):
self.dnaStore = DNAStorage()
loadDNAFile(self.dnaStore, 'phase_3.5/dna/storage_tutorial.dna')
loadDNAFile(self.dnaStore, 'phase_3.5/dna/storage_interior.dna')
loadDNAFile(self.dnaStore, 'phase_3.5/dna/storage_tutorial.xml')
loadDNAFile(self.dnaStore, 'phase_3.5/dna/storage_interior.xml')
def loadDnaStore(self):
if not hasattr(self, 'dnaStore'):
self.dnaStore = DNAStorage()
loadDNAFile(self.dnaStore, 'phase_4/dna/storage.dna')
loadDNAFile(self.dnaStore, 'phase_4/dna/storage.xml')
self.dnaStore.storeFont('humanist', ToontownGlobals.getInterfaceFont())
self.dnaStore.storeFont('mickey', ToontownGlobals.getSignFont())
self.dnaStore.storeFont('suit', ToontownGlobals.getSuitFont())
loadDNAFile(self.dnaStore, 'phase_3.5/dna/storage_interior.dna')
loadDNAFile(self.dnaStore, 'phase_3.5/dna/storage_interior.xml')
def unloadDnaStore(self):
if hasattr(self, 'dnaStore'):

12
toontown/estate/DistributedHouseInteriorAI.py
View file

@ -8,12 +8,12 @@ from toontown.dna.DNAParser import *
# The house interior DNA files for each
houseInteriors = [
'phase_5.5/dna/house_interior3.dna',
'phase_5.5/dna/house_interior4.dna',
'phase_5.5/dna/house_interior5.dna',
'phase_5.5/dna/house_interior7.dna',
'phase_5.5/dna/house_interior8.dna',
'phase_5.5/dna/house_interior10.dna',
'phase_5.5/dna/house_interior3.xml',
'phase_5.5/dna/house_interior4.xml',
'phase_5.5/dna/house_interior5.xml',
'phase_5.5/dna/house_interior7.xml',
'phase_5.5/dna/house_interior8.xml',
'phase_5.5/dna/house_interior10.xml',
]
defaultWindows = [

2
toontown/estate/EstateLoader.py
View file

@ -26,7 +26,7 @@ class EstateLoader(SafeZoneLoader.SafeZoneLoader):
State.State('final', self.enterFinal, self.exitFinal, ['start'])], 'start', 'final')
self.musicFile = 'phase_4/audio/bgm/TC_nbrhood.ogg'
self.activityMusicFile = 'phase_3.5/audio/bgm/TC_SZ_activity.ogg'
self.dnaFile = 'phase_5.5/dna/estate_1.dna'
self.dnaFile = 'phase_5.5/dna/estate_1.xml'
self.safeZoneStorageDNAFile = None
self.cloudSwitch = 0
self.id = MyEstate

6
toontown/estate/HouseGlobals.py
View file

@ -56,7 +56,7 @@ atticWood = (0.49, 0.314, 0.224)
stairWood = (0.651, 0.376, 0.31)
doorWood = (0.647, 0.392, 0.353)
windowWood = (0.557, 0.388, 0.2)
interiors = [['phase_5.5/dna/house_interior3.dna',
interiors = [['phase_5.5/dna/house_interior3.xml',
[-19.45,
24.7018,
0,
@ -69,7 +69,7 @@ interiors = [['phase_5.5/dna/house_interior3.dna',
120,
0,
0],
[]], ['phase_5.5/dna/house_interior7.dna',
[]], ['phase_5.5/dna/house_interior7.xml',
[-19.45,
24.7018,
0,
@ -82,7 +82,7 @@ interiors = [['phase_5.5/dna/house_interior3.dna',
120,
0,
0],
[]], ['phase_5.5/dna/house_interior10.dna',
[]], ['phase_5.5/dna/house_interior10.xml',
[-22.5835,
21.8784,
0,

10
toontown/hood/BRHood.py
View file

@ -11,11 +11,11 @@ class BRHood(ToonHood.ToonHood):
self.id = TheBrrrgh
self.townLoaderClass = BRTownLoader.BRTownLoader
self.safeZoneLoaderClass = BRSafeZoneLoader.BRSafeZoneLoader
self.storageDNAFile = 'phase_8/dna/storage_BR.dna'
self.holidayStorageDNADict = {WINTER_DECORATIONS: ['phase_8/dna/winter_storage_BR.dna'],
WACKY_WINTER_DECORATIONS: ['phase_8/dna/winter_storage_BR.dna'],
HALLOWEEN_PROPS: ['phase_8/dna/halloween_props_storage_BR.dna'],
SPOOKY_PROPS: ['phase_8/dna/halloween_props_storage_BR.dna']}
self.storageDNAFile = 'phase_8/dna/storage_BR.xml'
self.holidayStorageDNADict = {WINTER_DECORATIONS: ['phase_8/dna/winter_storage_BR.xml'],
WACKY_WINTER_DECORATIONS: ['phase_8/dna/winter_storage_BR.xml'],
HALLOWEEN_PROPS: ['phase_8/dna/halloween_props_storage_BR.xml'],
SPOOKY_PROPS: ['phase_8/dna/halloween_props_storage_BR.xml']}
self.skyFile = 'phase_3.5/models/props/BR_sky'
self.spookySkyFile = 'phase_3.5/models/props/BR_sky'
self.titleColor = (0.3, 0.6, 1.0, 1.0)

10
toontown/hood/DDHood.py
View file

@ -11,11 +11,11 @@ class DDHood(ToonHood.ToonHood):
self.id = DonaldsDock
self.townLoaderClass = DDTownLoader.DDTownLoader
self.safeZoneLoaderClass = DDSafeZoneLoader.DDSafeZoneLoader
self.storageDNAFile = 'phase_6/dna/storage_DD.dna'
self.holidayStorageDNADict = {WINTER_DECORATIONS: ['phase_6/dna/winter_storage_DD.dna'],
WACKY_WINTER_DECORATIONS: ['phase_6/dna/winter_storage_DD.dna'],
HALLOWEEN_PROPS: ['phase_6/dna/halloween_props_storage_DD.dna'],
SPOOKY_PROPS: ['phase_6/dna/halloween_props_storage_DD.dna']}
self.storageDNAFile = 'phase_6/dna/storage_DD.xml'
self.holidayStorageDNADict = {WINTER_DECORATIONS: ['phase_6/dna/winter_storage_DD.xml'],
WACKY_WINTER_DECORATIONS: ['phase_6/dna/winter_storage_DD.xml'],
HALLOWEEN_PROPS: ['phase_6/dna/halloween_props_storage_DD.xml'],
SPOOKY_PROPS: ['phase_6/dna/halloween_props_storage_DD.xml']}
self.skyFile = 'phase_3.5/models/props/BR_sky'
self.titleColor = (0.8, 0.6, 0.5, 1.0)
self.whiteFogColor = Vec4(0.8, 0.8, 0.8, 1)

10
toontown/hood/DGHood.py
View file

@ -12,11 +12,11 @@ class DGHood(ToonHood.ToonHood):
self.id = DaisyGardens
self.townLoaderClass = DGTownLoader.DGTownLoader
self.safeZoneLoaderClass = DGSafeZoneLoader.DGSafeZoneLoader
self.storageDNAFile = 'phase_8/dna/storage_DG.dna'
self.holidayStorageDNADict = {WINTER_DECORATIONS: ['phase_8/dna/winter_storage_DG.dna'],
WACKY_WINTER_DECORATIONS: ['phase_8/dna/winter_storage_DG.dna'],
HALLOWEEN_PROPS: ['phase_8/dna/halloween_props_storage_DG.dna'],
SPOOKY_PROPS: ['phase_8/dna/halloween_props_storage_DG.dna']}
self.storageDNAFile = 'phase_8/dna/storage_DG.xml'
self.holidayStorageDNADict = {WINTER_DECORATIONS: ['phase_8/dna/winter_storage_DG.xml'],
WACKY_WINTER_DECORATIONS: ['phase_8/dna/winter_storage_DG.xml'],
HALLOWEEN_PROPS: ['phase_8/dna/halloween_props_storage_DG.xml'],
SPOOKY_PROPS: ['phase_8/dna/halloween_props_storage_DG.xml']}
self.skyFile = 'phase_3.5/models/props/TT_sky'
self.spookySkyFile = 'phase_3.5/models/props/BR_sky'
self.titleColor = (0.8, 0.6, 1.0, 1.0)

10
toontown/hood/DLHood.py
View file

@ -11,11 +11,11 @@ class DLHood(ToonHood.ToonHood):
self.id = DonaldsDreamland
self.townLoaderClass = DLTownLoader.DLTownLoader
self.safeZoneLoaderClass = DLSafeZoneLoader.DLSafeZoneLoader
self.storageDNAFile = 'phase_8/dna/storage_DL.dna'
self.holidayStorageDNADict = {WINTER_DECORATIONS: ['phase_8/dna/winter_storage_DL.dna'],
WACKY_WINTER_DECORATIONS: ['phase_8/dna/winter_storage_DL.dna'],
HALLOWEEN_PROPS: ['phase_8/dna/halloween_props_storage_DL.dna'],
SPOOKY_PROPS: ['phase_8/dna/halloween_props_storage_DL.dna']}
self.storageDNAFile = 'phase_8/dna/storage_DL.xml'
self.holidayStorageDNADict = {WINTER_DECORATIONS: ['phase_8/dna/winter_storage_DL.xml'],
WACKY_WINTER_DECORATIONS: ['phase_8/dna/winter_storage_DL.xml'],
HALLOWEEN_PROPS: ['phase_8/dna/halloween_props_storage_DL.xml'],
SPOOKY_PROPS: ['phase_8/dna/halloween_props_storage_DL.xml']}
self.skyFile = 'phase_8/models/props/DL_sky'
self.titleColor = (1.0, 0.9, 0.5, 1.0)

10
toontown/hood/EstateHood.py
View file

@ -26,11 +26,11 @@ class EstateHood(Hood.Hood):
self.fsm.enterInitialState()
self.id = MyEstate
self.safeZoneLoaderClass = EstateLoader.EstateLoader
self.storageDNAFile = 'phase_5.5/dna/storage_estate.dna'
self.holidayStorageDNADict = {WINTER_DECORATIONS: ['phase_5.5/dna/winter_storage_estate.dna'],
WACKY_WINTER_DECORATIONS: ['phase_5.5/dna/winter_storage_estate.dna'],
HALLOWEEN_PROPS: ['phase_5.5/dna/halloween_props_storage_estate.dna'],
SPOOKY_PROPS: ['phase_5.5/dna/halloween_props_storage_estate.dna']}
self.storageDNAFile = 'phase_5.5/dna/storage_estate.xml'
self.holidayStorageDNADict = {WINTER_DECORATIONS: ['phase_5.5/dna/winter_storage_estate.xml'],
WACKY_WINTER_DECORATIONS: ['phase_5.5/dna/winter_storage_estate.xml'],
HALLOWEEN_PROPS: ['phase_5.5/dna/halloween_props_storage_estate.xml'],
SPOOKY_PROPS: ['phase_5.5/dna/halloween_props_storage_estate.xml']}
self.skyFile = 'phase_3.5/models/props/TT_sky'
self.spookySkyFile = 'phase_3.5/models/props/BR_sky'
self.popupInfo = None

8
toontown/hood/GSHood.py
View file

@ -11,10 +11,10 @@ class GSHood(ToonHood.ToonHood):
ToonHood.ToonHood.__init__(self, parentFSM, doneEvent, dnaStore, hoodId)
self.id = GoofySpeedway
self.safeZoneLoaderClass = GSSafeZoneLoader.GSSafeZoneLoader
self.storageDNAFile = 'phase_6/dna/storage_GS.dna'
self.holidayStorageDNADict = {HALLOWEEN_PROPS: ['phase_6/dna/halloween_props_storage_GS.dna'],
SPOOKY_PROPS: ['phase_6/dna/halloween_props_storage_GS.dna'],
CRASHED_LEADERBOARD: ['phase_6/dna/crashed_leaderboard_storage_GS.dna']}
self.storageDNAFile = 'phase_6/dna/storage_GS.xml'
self.holidayStorageDNADict = {HALLOWEEN_PROPS: ['phase_6/dna/halloween_props_storage_GS.xml'],
SPOOKY_PROPS: ['phase_6/dna/halloween_props_storage_GS.xml'],
CRASHED_LEADERBOARD: ['phase_6/dna/crashed_leaderboard_storage_GS.xml']}
self.skyFile = 'phase_3.5/models/props/TT_sky'
self.spookySkyFile = 'phase_3.5/models/props/BR_sky'
self.titleColor = (1.0, 0.5, 0.4, 1.0)

6
toontown/hood/GZHood.py
View file

@ -11,9 +11,9 @@ class GZHood(ToonHood.ToonHood):
ToonHood.ToonHood.__init__(self, parentFSM, doneEvent, dnaStore, hoodId)
self.id = GolfZone
self.safeZoneLoaderClass = GZSafeZoneLoader.GZSafeZoneLoader
self.storageDNAFile = 'phase_6/dna/storage_GZ.dna'
self.holidayStorageDNADict = {HALLOWEEN_PROPS: ['phase_6/dna/halloween_props_storage_GZ.dna'],
SPOOKY_PROPS: ['phase_6/dna/halloween_props_storage_GZ.dna']}
self.storageDNAFile = 'phase_6/dna/storage_GZ.xml'
self.holidayStorageDNADict = {HALLOWEEN_PROPS: ['phase_6/dna/halloween_props_storage_GZ.xml'],
SPOOKY_PROPS: ['phase_6/dna/halloween_props_storage_GZ.xml']}
self.skyFile = 'phase_3.5/models/props/TT_sky'
self.spookySkyFile = 'phase_3.5/models/props/BR_sky'
self.titleColor = (1.0, 0.5, 0.4, 1.0)

10
toontown/hood/MMHood.py
View file

@ -11,11 +11,11 @@ class MMHood(ToonHood.ToonHood):
self.id = MinniesMelodyland
self.townLoaderClass = MMTownLoader.MMTownLoader
self.safeZoneLoaderClass = MMSafeZoneLoader.MMSafeZoneLoader
self.storageDNAFile = 'phase_6/dna/storage_MM.dna'
self.holidayStorageDNADict = {WINTER_DECORATIONS: ['phase_6/dna/winter_storage_MM.dna'],
WACKY_WINTER_DECORATIONS: ['phase_6/dna/winter_storage_MM.dna'],
HALLOWEEN_PROPS: ['phase_6/dna/halloween_props_storage_MM.dna'],
SPOOKY_PROPS: ['phase_6/dna/halloween_props_storage_MM.dna']}
self.storageDNAFile = 'phase_6/dna/storage_MM.xml'
self.holidayStorageDNADict = {WINTER_DECORATIONS: ['phase_6/dna/winter_storage_MM.xml'],
WACKY_WINTER_DECORATIONS: ['phase_6/dna/winter_storage_MM.xml'],
HALLOWEEN_PROPS: ['phase_6/dna/halloween_props_storage_MM.xml'],
SPOOKY_PROPS: ['phase_6/dna/halloween_props_storage_MM.xml']}
self.skyFile = 'phase_6/models/props/MM_sky'
self.spookySkyFile = 'phase_6/models/props/MM_sky'
self.titleColor = (1.0, 0.5, 0.5, 1.0)

6
toontown/hood/OZHood.py
View file

@ -11,9 +11,9 @@ class OZHood(ToonHood.ToonHood):
ToonHood.ToonHood.__init__(self, parentFSM, doneEvent, dnaStore, hoodId)
self.id = OutdoorZone
self.safeZoneLoaderClass = OZSafeZoneLoader.OZSafeZoneLoader
self.storageDNAFile = 'phase_6/dna/storage_OZ.dna'
self.holidayStorageDNADict = {HALLOWEEN_PROPS: ['phase_6/dna/halloween_props_storage_OZ.dna'],
SPOOKY_PROPS: ['phase_6/dna/halloween_props_storage_OZ.dna']}
self.storageDNAFile = 'phase_6/dna/storage_OZ.xml'
self.holidayStorageDNADict = {HALLOWEEN_PROPS: ['phase_6/dna/halloween_props_storage_OZ.xml'],
SPOOKY_PROPS: ['phase_6/dna/halloween_props_storage_OZ.xml']}
self.skyFile = 'phase_3.5/models/props/TT_sky'
self.spookySkyFile = 'phase_3.5/models/props/BR_sky'
self.titleColor = (1.0, 0.5, 0.4, 1.0)

6
toontown/hood/PartyHood.py
View file

@ -26,9 +26,9 @@ class PartyHood(Hood.Hood):
self.id = PartyHood
self.safeZoneLoaderClass = PartyLoader.PartyLoader
self.partyActivityDoneEvent = 'partyActivityDone'
self.storageDNAFile = 'phase_13/dna/storage_party_sz.dna'
self.holidayStorageDNADict = {WINTER_DECORATIONS: ['phase_5.5/dna/winter_storage_estate.dna'],
WACKY_WINTER_DECORATIONS: ['phase_5.5/dna/winter_storage_estate.dna']}
self.storageDNAFile = 'phase_13/dna/storage_party_sz.xml'
self.holidayStorageDNADict = {WINTER_DECORATIONS: ['phase_5.5/dna/winter_storage_estate.xml'],
WACKY_WINTER_DECORATIONS: ['phase_5.5/dna/winter_storage_estate.xml']}
self.skyFile = 'phase_3.5/models/props/TT_sky'
self.popupInfo = None
return

10
toontown/hood/TTHood.py
View file

@ -15,11 +15,11 @@ class TTHood(ToonHood.ToonHood):
self.id = ToontownCentral
self.townLoaderClass = TTTownLoader.TTTownLoader
self.safeZoneLoaderClass = TTSafeZoneLoader.TTSafeZoneLoader
self.storageDNAFile = 'phase_4/dna/storage_TT.dna'
self.holidayStorageDNADict = {WINTER_DECORATIONS: ['phase_4/dna/winter_storage_TT.dna', 'phase_4/dna/winter_storage_TT_sz.dna'],
WACKY_WINTER_DECORATIONS: ['phase_4/dna/winter_storage_TT.dna', 'phase_4/dna/winter_storage_TT_sz.dna'],
HALLOWEEN_PROPS: ['phase_4/dna/halloween_props_storage_TT.dna', 'phase_4/dna/halloween_props_storage_TT_sz.dna'],
SPOOKY_PROPS: ['phase_4/dna/halloween_props_storage_TT.dna', 'phase_4/dna/halloween_props_storage_TT_sz.dna']}
self.storageDNAFile = 'phase_4/dna/storage_TT.xml'
self.holidayStorageDNADict = {WINTER_DECORATIONS: ['phase_4/dna/winter_storage_TT.xml', 'phase_4/dna/winter_storage_TT_sz.xml'],
WACKY_WINTER_DECORATIONS: ['phase_4/dna/winter_storage_TT.xml', 'phase_4/dna/winter_storage_TT_sz.xml'],
HALLOWEEN_PROPS: ['phase_4/dna/halloween_props_storage_TT.xml', 'phase_4/dna/halloween_props_storage_TT_sz.xml'],
SPOOKY_PROPS: ['phase_4/dna/halloween_props_storage_TT.xml', 'phase_4/dna/halloween_props_storage_TT_sz.xml']}
self.skyFile = 'phase_3.5/models/props/TT_sky'
self.spookySkyFile = 'phase_3.5/models/props/BR_sky'
self.titleColor = (1.0, 0.5, 0.4, 1.0)

2
toontown/minigame/DistributedPhotoGame.py
View file

@ -122,7 +122,7 @@ class DistributedPhotoGame(DistributedMinigame, PhotoGameBase.PhotoGameBase):
self.storageDNAFile = self.data['DNA_TRIO'][1]
self.dnaFile = self.data['DNA_TRIO'][2]
self.dnaStore = DNAStorage()
loader.loadDNAFile(self.dnaStore, 'phase_4/dna/storage.dna')
loader.loadDNAFile(self.dnaStore, 'phase_4/dna/storage.xml')
loader.loadDNAFile(self.dnaStore, self.storageDNAFile)
loader.loadDNAFile(self.dnaStore, self.safeZoneStorageDNAFile)
node = loader.loadDNAFile(self.dnaStore, self.dnaFile)

12
toontown/minigame/PhotoGameGlobals.py
View file

@ -24,7 +24,7 @@ AREA_DATA[ToontownGlobals.ToontownCentral] = {}
AREA_DATA[ToontownGlobals.ToontownCentral]['FILMCOUNT'] = 32
AREA_DATA[ToontownGlobals.ToontownCentral]['TIME'] = 120
AREA_DATA[ToontownGlobals.ToontownCentral]['CAMERA_INTIAL_POSTION'] = Point3(0, 50, 20)
AREA_DATA[ToontownGlobals.ToontownCentral]['DNA_TRIO'] = ('phase_4/dna/storage_TT_sz.dna', 'phase_4/dna/storage_TT.dna', 'phase_4/dna/toontown_central_sz.dna')
AREA_DATA[ToontownGlobals.ToontownCentral]['DNA_TRIO'] = ('phase_4/dna/storage_TT_sz.xml', 'phase_4/dna/storage_TT.xml', 'phase_4/dna/toontown_central_sz.xml')
AREA_DATA[ToontownGlobals.ToontownCentral]['TRIPOD_OFFSET'] = Point3(0, 0, 7.0)
AREA_DATA[ToontownGlobals.ToontownCentral]['START_HPR'] = Point3(-87.8752, -0.378549, 0)
AREA_DATA[ToontownGlobals.ToontownCentral]['PATHS'] = ([Point3(10, 20, 4.025),
@ -64,7 +64,7 @@ AREA_DATA[ToontownGlobals.DonaldsDock] = {}
AREA_DATA[ToontownGlobals.DonaldsDock]['FILMCOUNT'] = 28
AREA_DATA[ToontownGlobals.DonaldsDock]['TIME'] = 110
AREA_DATA[ToontownGlobals.DonaldsDock]['CAMERA_INTIAL_POSTION'] = Point3(0, 50, 20)
AREA_DATA[ToontownGlobals.DonaldsDock]['DNA_TRIO'] = ('phase_6/dna/storage_DD_sz.dna', 'phase_6/dna/storage_DD.dna', 'phase_6/dna/donalds_dock_sz.dna')
AREA_DATA[ToontownGlobals.DonaldsDock]['DNA_TRIO'] = ('phase_6/dna/storage_DD_sz.xml', 'phase_6/dna/storage_DD.xml', 'phase_6/dna/donalds_dock_sz.xml')
AREA_DATA[ToontownGlobals.DonaldsDock]['TRIPOD_OFFSET'] = Point3(0, -4.0, 9.0)
AREA_DATA[ToontownGlobals.DonaldsDock]['START_HPR'] = Point3(218.211, -6.7879, 0)
AREA_DATA[ToontownGlobals.DonaldsDock]['PATHS'] = ([Point3(-115.6, 39.4, 5.692),
@ -117,7 +117,7 @@ AREA_DATA[ToontownGlobals.DaisyGardens] = {}
AREA_DATA[ToontownGlobals.DaisyGardens]['FILMCOUNT'] = 26
AREA_DATA[ToontownGlobals.DaisyGardens]['TIME'] = 100
AREA_DATA[ToontownGlobals.DaisyGardens]['CAMERA_INTIAL_POSTION'] = Point3(0, 50, 20)
AREA_DATA[ToontownGlobals.DaisyGardens]['DNA_TRIO'] = ('phase_8/dna/storage_DG_sz.dna', 'phase_8/dna/storage_DG.dna', 'phase_8/dna/daisys_garden_sz.dna')
AREA_DATA[ToontownGlobals.DaisyGardens]['DNA_TRIO'] = ('phase_8/dna/storage_DG_sz.xml', 'phase_8/dna/storage_DG.xml', 'phase_8/dna/daisys_garden_sz.xml')
AREA_DATA[ToontownGlobals.DaisyGardens]['TRIPOD_OFFSET'] = Point3(0, 0, 6.0)
AREA_DATA[ToontownGlobals.DaisyGardens]['START_HPR'] = Point3(0.0, 0.0, 0.0)
AREA_DATA[ToontownGlobals.DaisyGardens]['PATHS'] = ([Point3(-37.252, 25.513, 0.025),
@ -156,7 +156,7 @@ AREA_DATA[ToontownGlobals.MinniesMelodyland] = {}
AREA_DATA[ToontownGlobals.MinniesMelodyland]['FILMCOUNT'] = 23
AREA_DATA[ToontownGlobals.MinniesMelodyland]['TIME'] = 95
AREA_DATA[ToontownGlobals.MinniesMelodyland]['CAMERA_INTIAL_POSTION'] = Point3(0, -50, 20)
AREA_DATA[ToontownGlobals.MinniesMelodyland]['DNA_TRIO'] = ('phase_6/dna/storage_MM_sz.dna', 'phase_6/dna/storage_MM.dna', 'phase_6/dna/minnies_melody_land_sz.dna')
AREA_DATA[ToontownGlobals.MinniesMelodyland]['DNA_TRIO'] = ('phase_6/dna/storage_MM_sz.xml', 'phase_6/dna/storage_MM.xml', 'phase_6/dna/minnies_melody_land_sz.xml')
AREA_DATA[ToontownGlobals.MinniesMelodyland]['TRIPOD_OFFSET'] = Point3(0, 0, 6.0)
AREA_DATA[ToontownGlobals.MinniesMelodyland]['START_HPR'] = Point3(71.3028, -3.12932, 0)
AREA_DATA[ToontownGlobals.MinniesMelodyland]['PATHS'] = ([Point3(-42.35, -16.0, -12.476),
@ -198,7 +198,7 @@ AREA_DATA[ToontownGlobals.TheBrrrgh] = {}
AREA_DATA[ToontownGlobals.TheBrrrgh]['FILMCOUNT'] = 21
AREA_DATA[ToontownGlobals.TheBrrrgh]['TIME'] = 90
AREA_DATA[ToontownGlobals.TheBrrrgh]['CAMERA_INTIAL_POSTION'] = Point3(0, 50, 20)
AREA_DATA[ToontownGlobals.TheBrrrgh]['DNA_TRIO'] = ('phase_8/dna/storage_BR_sz.dna', 'phase_8/dna/storage_BR.dna', 'phase_8/dna/the_burrrgh_sz.dna')
AREA_DATA[ToontownGlobals.TheBrrrgh]['DNA_TRIO'] = ('phase_8/dna/storage_BR_sz.xml', 'phase_8/dna/storage_BR.xml', 'phase_8/dna/the_burrrgh_sz.xml')
AREA_DATA[ToontownGlobals.TheBrrrgh]['TRIPOD_OFFSET'] = Point3(0, 0, 6.0)
AREA_DATA[ToontownGlobals.TheBrrrgh]['START_HPR'] = Point3(-49.401, -11.6266, 0)
AREA_DATA[ToontownGlobals.TheBrrrgh]['PATHS'] = ([Point3(-82.52, -28.727, 3.009),
@ -238,7 +238,7 @@ AREA_DATA[ToontownGlobals.DonaldsDreamland] = {}
AREA_DATA[ToontownGlobals.DonaldsDreamland]['FILMCOUNT'] = 18
AREA_DATA[ToontownGlobals.DonaldsDreamland]['TIME'] = 85
AREA_DATA[ToontownGlobals.DonaldsDreamland]['CAMERA_INTIAL_POSTION'] = Point3(0, 50, 20)
AREA_DATA[ToontownGlobals.DonaldsDreamland]['DNA_TRIO'] = ('phase_8/dna/storage_DL_sz.dna', 'phase_8/dna/storage_DL.dna', 'phase_8/dna/donalds_dreamland_sz.dna')
AREA_DATA[ToontownGlobals.DonaldsDreamland]['DNA_TRIO'] = ('phase_8/dna/storage_DL_sz.xml', 'phase_8/dna/storage_DL.xml', 'phase_8/dna/donalds_dreamland_sz.xml')
AREA_DATA[ToontownGlobals.DonaldsDreamland]['TRIPOD_OFFSET'] = Point3(0, 0, 6.0)
AREA_DATA[ToontownGlobals.DonaldsDreamland]['START_HPR'] = Point3(-137.183, -9.06236, 0)
AREA_DATA[ToontownGlobals.DonaldsDreamland]['PATHS'] = ([Point3(-51.222, 90.874, 0.025),

2
toontown/parties/PartyLoader.py
View file

@ -22,7 +22,7 @@ class PartyLoader(SafeZoneLoader.SafeZoneLoader):
State.State('final', self.enterFinal, self.exitFinal, ['start'])], 'start', 'final')
self.musicFile = 'phase_13/audio/bgm/party_original_theme.ogg'
self.activityMusicFile = 'phase_13/audio/bgm/party_waltz_dance.ogg'
self.dnaFile = 'phase_13/dna/party_sz.dna'
self.dnaFile = 'phase_13/dna/party_sz.xml'
self.safeZoneStorageDNAFile = None
self.cloudSwitch = 0
self.id = PartyHood

20
toontown/racing/DistributedRace.py
View file

@ -716,17 +716,17 @@ class DistributedRace(DistributedObject.DistributedObject):
def loadUrbanTrack(self):
self.dnaStore = DNAStorage()
loader.loadDNAFile(self.dnaStore, 'phase_4/dna/storage.dna')
loader.loadDNAFile(self.dnaStore, 'phase_5/dna/storage_town.dna')
loader.loadDNAFile(self.dnaStore, 'phase_4/dna/storage_TT.dna')
loader.loadDNAFile(self.dnaStore, 'phase_5/dna/storage_TT_town.dna')
loader.loadDNAFile(self.dnaStore, 'phase_8/dna/storage_BR.dna')
loader.loadDNAFile(self.dnaStore, 'phase_8/dna/storage_BR_town.dna')
loader.loadDNAFile(self.dnaStore, 'phase_8/dna/storage_DL.dna')
loader.loadDNAFile(self.dnaStore, 'phase_8/dna/storage_DL_town.dna')
dnaFile = 'phase_6/dna/urban_track_town.dna'
loader.loadDNAFile(self.dnaStore, 'phase_4/dna/storage.xml')
loader.loadDNAFile(self.dnaStore, 'phase_5/dna/storage_town.xml')
loader.loadDNAFile(self.dnaStore, 'phase_4/dna/storage_TT.xml')
loader.loadDNAFile(self.dnaStore, 'phase_5/dna/storage_TT_town.xml')
loader.loadDNAFile(self.dnaStore, 'phase_8/dna/storage_BR.xml')
loader.loadDNAFile(self.dnaStore, 'phase_8/dna/storage_BR_town.xml')
loader.loadDNAFile(self.dnaStore, 'phase_8/dna/storage_DL.xml')
loader.loadDNAFile(self.dnaStore, 'phase_8/dna/storage_DL_town.xml')
dnaFile = 'phase_6/dna/urban_track_town.xml'
if self.trackId in (RaceGlobals.RT_Urban_2, RaceGlobals.RT_Urban_2_rev):
dnaFile = 'phase_6/dna/urban_track_town_B.dna'
dnaFile = 'phase_6/dna/urban_track_town_B.xml'
node = loader.loadDNAFile(self.dnaStore, dnaFile)
self.townGeom = self.geom.attachNewNode(node)
self.townGeom.findAllMatches('**/+CollisionNode').stash()

4
toontown/safezone/BRSafeZoneLoader.py
View file

@ -12,8 +12,8 @@ class BRSafeZoneLoader(SafeZoneLoader.SafeZoneLoader):
self.playgroundClass = BRPlayground.BRPlayground
self.musicFile = 'phase_8/audio/bgm/TB_nbrhood.ogg'
self.activityMusicFile = 'phase_8/audio/bgm/TB_SZ_activity.ogg'
self.dnaFile = 'phase_8/dna/the_burrrgh_sz.dna'
self.safeZoneStorageDNAFile = 'phase_8/dna/storage_BR_sz.dna'
self.dnaFile = 'phase_8/dna/the_burrrgh_sz.xml'
self.safeZoneStorageDNAFile = 'phase_8/dna/storage_BR_sz.xml'
def load(self):
SafeZoneLoader.SafeZoneLoader.load(self)

4
toontown/safezone/DDSafeZoneLoader.py
View file

@ -13,8 +13,8 @@ class DDSafeZoneLoader(SafeZoneLoader.SafeZoneLoader):
self.playgroundClass = DDPlayground.DDPlayground
self.musicFile = 'phase_6/audio/bgm/DD_nbrhood.ogg'
self.activityMusicFile = 'phase_6/audio/bgm/DD_SZ_activity.ogg'
self.dnaFile = 'phase_6/dna/donalds_dock_sz.dna'
self.safeZoneStorageDNAFile = 'phase_6/dna/storage_DD_sz.dna'
self.dnaFile = 'phase_6/dna/donalds_dock_sz.xml'
self.safeZoneStorageDNAFile = 'phase_6/dna/storage_DD_sz.xml'
def load(self):
SafeZoneLoader.SafeZoneLoader.load(self)

4
toontown/safezone/DGSafeZoneLoader.py
View file

@ -9,8 +9,8 @@ class DGSafeZoneLoader(SafeZoneLoader.SafeZoneLoader):
self.playgroundClass = DGPlayground.DGPlayground
self.musicFile = 'phase_8/audio/bgm/DG_nbrhood.ogg'
self.activityMusicFile = 'phase_8/audio/bgm/DG_SZ.ogg'
self.dnaFile = 'phase_8/dna/daisys_garden_sz.dna'
self.safeZoneStorageDNAFile = 'phase_8/dna/storage_DG_sz.dna'
self.dnaFile = 'phase_8/dna/daisys_garden_sz.xml'
self.safeZoneStorageDNAFile = 'phase_8/dna/storage_DG_sz.xml'
def load(self):
SafeZoneLoader.SafeZoneLoader.load(self)

4
toontown/safezone/DLSafeZoneLoader.py
View file

@ -9,5 +9,5 @@ class DLSafeZoneLoader(SafeZoneLoader.SafeZoneLoader):
self.playgroundClass = DLPlayground.DLPlayground
self.musicFile = 'phase_8/audio/bgm/DL_nbrhood.ogg'
self.activityMusicFile = 'phase_8/audio/bgm/DL_SZ_activity.ogg'
self.dnaFile = 'phase_8/dna/donalds_dreamland_sz.dna'
self.safeZoneStorageDNAFile = 'phase_8/dna/storage_DL_sz.dna'
self.dnaFile = 'phase_8/dna/donalds_dreamland_sz.xml'
self.safeZoneStorageDNAFile = 'phase_8/dna/storage_DL_sz.xml'

4
toontown/safezone/GSSafeZoneLoader.py
View file

@ -18,8 +18,8 @@ class GSSafeZoneLoader(SafeZoneLoader):
SafeZoneLoader.__init__(self, hood, parentFSM, doneEvent)
self.musicFile = 'phase_6/audio/bgm/GS_SZ.ogg'
self.activityMusicFile = 'phase_6/audio/bgm/GS_KartShop.ogg'
self.dnaFile = 'phase_6/dna/goofy_speedway_sz.dna'
self.safeZoneStorageDNAFile = 'phase_6/dna/storage_GS_sz.dna'
self.dnaFile = 'phase_6/dna/goofy_speedway_sz.xml'
self.safeZoneStorageDNAFile = 'phase_6/dna/storage_GS_sz.xml'
del self.fsm
self.fsm = ClassicFSM.ClassicFSM('SafeZoneLoader', [State.State('start', self.enterStart, self.exitStart, ['quietZone', 'playground', 'toonInterior']),
State.State('playground', self.enterPlayground, self.exitPlayground, ['quietZone', 'racetrack']),

4
toontown/safezone/GZSafeZoneLoader.py
View file

@ -19,8 +19,8 @@ class GZSafeZoneLoader(SafeZoneLoader):
SafeZoneLoader.__init__(self, hood, parentFSM, doneEvent)
self.musicFile = 'phase_6/audio/bgm/GZ_SZ.ogg'
self.activityMusicFile = 'phase_6/audio/bgm/GS_KartShop.ogg'
self.dnaFile = 'phase_6/dna/golf_zone_sz.dna'
self.safeZoneStorageDNAFile = 'phase_6/dna/storage_GZ_sz.dna'
self.dnaFile = 'phase_6/dna/golf_zone_sz.xml'
self.safeZoneStorageDNAFile = 'phase_6/dna/storage_GZ_sz.xml'
del self.fsm
self.fsm = ClassicFSM.ClassicFSM('SafeZoneLoader', [State.State('start', self.enterStart, self.exitStart, ['quietZone', 'playground', 'toonInterior']),
State.State('playground', self.enterPlayground, self.exitPlayground, ['quietZone', 'golfcourse']),

4
toontown/safezone/MMSafeZoneLoader.py
View file

@ -10,8 +10,8 @@ class MMSafeZoneLoader(SafeZoneLoader.SafeZoneLoader):
self.playgroundClass = MMPlayground.MMPlayground
self.musicFile = 'phase_6/audio/bgm/MM_nbrhood.ogg'
self.activityMusicFile = 'phase_6/audio/bgm/MM_SZ_activity.ogg'
self.dnaFile = 'phase_6/dna/minnies_melody_land_sz.dna'
self.safeZoneStorageDNAFile = 'phase_6/dna/storage_MM_sz.dna'
self.dnaFile = 'phase_6/dna/minnies_melody_land_sz.xml'
self.safeZoneStorageDNAFile = 'phase_6/dna/storage_MM_sz.xml'
def load(self):
print 'loading MM safezone'

4
toontown/safezone/OZSafeZoneLoader.py
View file

@ -25,8 +25,8 @@ class OZSafeZoneLoader(SafeZoneLoader):
SafeZoneLoader.__init__(self, hood, parentFSM, doneEvent)
self.musicFile = 'phase_6/audio/bgm/OZ_SZ.ogg'
self.activityMusicFile = 'phase_6/audio/bgm/GS_KartShop.ogg'
self.dnaFile = 'phase_6/dna/outdoor_zone_sz.dna'
self.safeZoneStorageDNAFile = 'phase_6/dna/storage_OZ_sz.dna'
self.dnaFile = 'phase_6/dna/outdoor_zone_sz.xml'
self.safeZoneStorageDNAFile = 'phase_6/dna/storage_OZ_sz.xml'
self.__toonTracks = {}
del self.fsm
self.fsm = ClassicFSM.ClassicFSM('SafeZoneLoader', [State.State('start', self.enterStart, self.exitStart, ['quietZone', 'playground', 'toonInterior']),

4
toontown/safezone/TTSafeZoneLoader.py
View file

@ -12,8 +12,8 @@ class TTSafeZoneLoader(SafeZoneLoader.SafeZoneLoader):
self.playgroundClass = TTPlayground.TTPlayground
self.musicFile = 'phase_4/audio/bgm/TC_nbrhood.ogg'
self.activityMusicFile = 'phase_3.5/audio/bgm/TC_SZ_activity.ogg'
self.dnaFile = 'phase_4/dna/toontown_central_sz.dna'
self.safeZoneStorageDNAFile = 'phase_4/dna/storage_TT_sz.dna'
self.dnaFile = 'phase_4/dna/toontown_central_sz.xml'
self.safeZoneStorageDNAFile = 'phase_4/dna/storage_TT_sz.xml'
def load(self):
SafeZoneLoader.SafeZoneLoader.load(self)

2
toontown/suit/SuitPlannerBase.py
View file

@ -509,7 +509,7 @@ class SuitPlannerBase:
phase = ToontownGlobals.streetPhaseMap[hoodId]
if hoodId == zoneId:
zoneId = 'sz'
return 'phase_%s/dna/%s_%s.dna' % (phase, hood, zoneId)
return 'phase_%s/dna/%s_%s.xml' % (phase, hood, zoneId)
def getZoneId(self):
return self.zoneId

4
toontown/town/BRTownLoader.py
View file

@ -9,12 +9,12 @@ class BRTownLoader(TownLoader.TownLoader):
self.streetClass = BRStreet.BRStreet
self.musicFile = 'phase_8/audio/bgm/TB_SZ.ogg'
self.activityMusicFile = 'phase_8/audio/bgm/TB_SZ_activity.ogg'
self.townStorageDNAFile = 'phase_8/dna/storage_BR_town.dna'
self.townStorageDNAFile = 'phase_8/dna/storage_BR_town.xml'
def load(self, zoneId):
TownLoader.TownLoader.load(self, zoneId)
Suit.loadSuits(3)
dnaFile = 'phase_8/dna/the_burrrgh_' + str(self.canonicalBranchZone) + '.dna'
dnaFile = 'phase_8/dna/the_burrrgh_' + str(self.canonicalBranchZone) + '.xml'
self.createHood(dnaFile)
def unload(self):

4
toontown/town/DDTownLoader.py
View file

@ -9,12 +9,12 @@ class DDTownLoader(TownLoader.TownLoader):
self.streetClass = DDStreet.DDStreet
self.musicFile = 'phase_6/audio/bgm/DD_SZ.ogg'
self.activityMusicFile = 'phase_6/audio/bgm/DD_SZ_activity.ogg'
self.townStorageDNAFile = 'phase_6/dna/storage_DD_town.dna'
self.townStorageDNAFile = 'phase_6/dna/storage_DD_town.xml'
def load(self, zoneId):
TownLoader.TownLoader.load(self, zoneId)
Suit.loadSuits(2)
dnaFile = 'phase_6/dna/donalds_dock_' + str(self.canonicalBranchZone) + '.dna'
dnaFile = 'phase_6/dna/donalds_dock_' + str(self.canonicalBranchZone) + '.xml'
self.createHood(dnaFile)
def unload(self):

4
toontown/town/DGTownLoader.py
View file

@ -9,12 +9,12 @@ class DGTownLoader(TownLoader.TownLoader):
self.streetClass = DGStreet.DGStreet
self.musicFile = 'phase_8/audio/bgm/DG_SZ.ogg'
self.activityMusicFile = 'phase_8/audio/bgm/DG_SZ.ogg'
self.townStorageDNAFile = 'phase_8/dna/storage_DG_town.dna'
self.townStorageDNAFile = 'phase_8/dna/storage_DG_town.xml'
def load(self, zoneId):
TownLoader.TownLoader.load(self, zoneId)
Suit.loadSuits(3)
dnaFile = 'phase_8/dna/daisys_garden_' + str(self.canonicalBranchZone) + '.dna'
dnaFile = 'phase_8/dna/daisys_garden_' + str(self.canonicalBranchZone) + '.xml'
self.createHood(dnaFile)
def unload(self):

4
toontown/town/DLTownLoader.py
View file

@ -9,12 +9,12 @@ class DLTownLoader(TownLoader.TownLoader):
self.streetClass = DLStreet.DLStreet
self.musicFile = 'phase_8/audio/bgm/DL_SZ.ogg'
self.activityMusicFile = 'phase_8/audio/bgm/DL_SZ_activity.ogg'
self.townStorageDNAFile = 'phase_8/dna/storage_DL_town.dna'
self.townStorageDNAFile = 'phase_8/dna/storage_DL_town.xml'
def load(self, zoneId):
TownLoader.TownLoader.load(self, zoneId)
Suit.loadSuits(3)
dnaFile = 'phase_8/dna/donalds_dreamland_' + str(self.canonicalBranchZone) + '.dna'
dnaFile = 'phase_8/dna/donalds_dreamland_' + str(self.canonicalBranchZone) + '.xml'
self.createHood(dnaFile)
def unload(self):

4
toontown/town/MMTownLoader.py
View file

@ -9,12 +9,12 @@ class MMTownLoader(TownLoader.TownLoader):
self.streetClass = MMStreet.MMStreet
self.musicFile = 'phase_6/audio/bgm/MM_SZ.ogg'
self.activityMusicFile = 'phase_6/audio/bgm/MM_SZ_activity.ogg'
self.townStorageDNAFile = 'phase_6/dna/storage_MM_town.dna'
self.townStorageDNAFile = 'phase_6/dna/storage_MM_town.xml'
def load(self, zoneId):
TownLoader.TownLoader.load(self, zoneId)
Suit.loadSuits(2)
dnaFile = 'phase_6/dna/minnies_melody_land_' + str(self.canonicalBranchZone) + '.dna'
dnaFile = 'phase_6/dna/minnies_melody_land_' + str(self.canonicalBranchZone) + '.xml'
self.createHood(dnaFile)
def unload(self):

4
toontown/town/TTTownLoader.py
View file

@ -9,12 +9,12 @@ class TTTownLoader(TownLoader.TownLoader):
self.streetClass = TTStreet.TTStreet
self.musicFile = 'phase_3.5/audio/bgm/TC_SZ.ogg'
self.activityMusicFile = 'phase_3.5/audio/bgm/TC_SZ_activity.ogg'
self.townStorageDNAFile = 'phase_5/dna/storage_TT_town.dna'
self.townStorageDNAFile = 'phase_5/dna/storage_TT_town.xml'
def load(self, zoneId):
TownLoader.TownLoader.load(self, zoneId)
Suit.loadSuits(1)
dnaFile = 'phase_5/dna/toontown_central_' + str(self.canonicalBranchZone) + '.dna'
dnaFile = 'phase_5/dna/toontown_central_' + str(self.canonicalBranchZone) + '.xml'
self.createHood(dnaFile)
def unload(self):

4
toontown/town/TownLoader.py
View file

@ -230,8 +230,8 @@ class TownLoader(StateData.StateData):
def createHood(self, dnaFile, loadStorage = 1):
if loadStorage:
loader.loadDNAFile(self.hood.dnaStore, 'phase_5/dna/storage_town.dna')
self.notify.debug('done loading %s' % 'phase_5/dna/storage_town.dna')
loader.loadDNAFile(self.hood.dnaStore, 'phase_5/dna/storage_town.xml')
self.notify.debug('done loading %s' % 'phase_5/dna/storage_town.xml')
loader.loadDNAFile(self.hood.dnaStore, self.townStorageDNAFile)
self.notify.debug('done loading %s' % self.townStorageDNAFile)
node = loader.loadDNAFile(self.hood.dnaStore, dnaFile)

2
toontown/town/TutorialTownLoader.py
View file

@ -14,7 +14,7 @@ class TutorialTownLoader(TTTownLoader.TTTownLoader):
def load(self, zoneId):
TownLoader.TownLoader.load(self, zoneId)
Suit.loadTutorialSuit()
dnaFile = 'phase_3.5/dna/tutorial_street.dna'
dnaFile = 'phase_3.5/dna/tutorial_street.xml'
self.createHood(dnaFile, loadStorage=0)
self.alterDictionaries()