Merge branch 'master' of https://gitlab.com/toontown-unlimited/src

README.md

@@ -12,3 +12,5 @@ It is recommended that you make all of your changes in a fork before committing.
 Do **NOT** erase or revert another person's commit without first consulting them.
 
 And *only* push to **THIS** repository.
+
+Never **_ever_** force a git push.

config/release/dev.prc

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

otp/distributed/DCClassImports.py

@@ -2,7 +2,7 @@
 from pandac.PandaModules import *
 
 
-hashVal = 1516203465
+hashVal = 3181838135L
 
 
 from toontown.coghq import DistributedCashbotBossSafe, DistributedCashbotBossCrane, DistributedBattleFactory, DistributedCashbotBossTreasure, DistributedCogHQDoor, DistributedSellbotHQDoor, DistributedFactoryElevatorExt, DistributedMintElevatorExt, DistributedLawOfficeElevatorExt, DistributedLawOfficeElevatorInt, LobbyManager, DistributedMegaCorp, DistributedFactory, DistributedLawOffice, DistributedLawOfficeFloor, DistributedLift, DistributedDoorEntity, DistributedSwitch, DistributedButton, DistributedTrigger, DistributedCrushableEntity, DistributedCrusherEntity, DistributedStomper, DistributedStomperPair, DistributedLaserField, DistributedGolfGreenGame, DistributedSecurityCamera, DistributedMover, DistributedElevatorMarker, DistributedBarrelBase, DistributedGagBarrel, DistributedBeanBarrel, DistributedHealBarrel, DistributedGrid, ActiveCell, DirectionalCell, CrusherCell, DistributedCrate, DistributedSinkingPlatform, BattleBlocker, DistributedMint, DistributedMintRoom, DistributedMintBattle, DistributedStage, DistributedStageRoom, DistributedStageBattle, DistributedLawbotBossGavel, DistributedLawbotCannon, DistributedLawbotChair, DistributedCogKart, DistributedCountryClub, DistributedCountryClubRoom, DistributedMoleField, DistributedCountryClubBattle, DistributedMaze, DistributedFoodBelt, DistributedBanquetTable, DistributedGolfSpot

toontown/distributed/ToontownDistrict.py

@@ -10,6 +10,7 @@ class ToontownDistrict(DistributedDistrict.DistributedDistrict):
         self.avatarCount = 0
         self.newAvatarCount = 0
         self.invasionStatus = 0
+        self.suitStatus = ''
 
     def allowAHNNLog(self, allow):
         self.allowAHNN = allow

toontown/dna/DNAParser.py

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

toontown/makeatoon/NameGenerator.py

@@ -39,6 +39,8 @@ class NameGenerator:
         self.nameDictionary = {}
         searchPath = DSearchPath()
         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('/phase_3/etc'))
         filename = Filename(TTLocalizer.NameShopNameMaster)

toontown/quest/QuestParser.py

@@ -1086,6 +1086,8 @@ class NPCMoviePlayer(DirectObject.DirectObject):
 
 searchPath = DSearchPath()
 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('/phase_3/etc'))
 scriptFile = Filename('QuestScripts.txt')