diff --git a/README.md b/README.md index d986429a..c6afdb23 100644 --- a/README.md +++ b/README.md @@ -11,4 +11,6 @@ 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. \ No newline at end of file +And *only* push to **THIS** repository. + +Never **_ever_** force a git push. \ No newline at end of file diff --git a/config/release/dev.prc b/config/release/dev.prc index ea637aa7..19b6cdd8 100644 --- a/config/release/dev.prc +++ b/config/release/dev.prc @@ -2,6 +2,7 @@ distribution dev # Art assets: +want-uplevel-res #t model-path ../resources/ # Server: diff --git a/otp/distributed/DCClassImports.py b/otp/distributed/DCClassImports.py index e38b8f03..3f9638d0 100644 --- a/otp/distributed/DCClassImports.py +++ b/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 diff --git a/toontown/distributed/ToontownDistrict.py b/toontown/distributed/ToontownDistrict.py index f88b0e02..7d3b253b 100644 --- a/toontown/distributed/ToontownDistrict.py +++ b/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 diff --git a/toontown/dna/DNAParser.py b/toontown/dna/DNAParser.py index d31ff15d..ea338211 100644 --- a/toontown/dna/DNAParser.py +++ b/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 diff --git a/toontown/makeatoon/NameGenerator.py b/toontown/makeatoon/NameGenerator.py index 8bb36c7d..5a3666f6 100644 --- a/toontown/makeatoon/NameGenerator.py +++ b/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) diff --git a/toontown/quest/QuestParser.py b/toontown/quest/QuestParser.py index 59d064fd..4aec2ad6 100644 --- a/toontown/quest/QuestParser.py +++ b/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')