mirror of
https://github.com/Sneed-Group/Poodletooth-iLand
synced 2024-12-24 04:02:40 -06:00
Merge branch 'master' of https://gitlab.com/toontown-unlimited/src
This commit is contained in:
commit
7ca72d45e2
7 changed files with 19 additions and 5 deletions
|
@ -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.
|
Do **NOT** erase or revert another person's commit without first consulting them.
|
||||||
|
|
||||||
And *only* push to **THIS** repository.
|
And *only* push to **THIS** repository.
|
||||||
|
|
||||||
|
Never **_ever_** force a git push.
|
|
@ -2,6 +2,7 @@
|
||||||
distribution dev
|
distribution dev
|
||||||
|
|
||||||
# Art assets:
|
# Art assets:
|
||||||
|
want-uplevel-res #t
|
||||||
model-path ../resources/
|
model-path ../resources/
|
||||||
|
|
||||||
# Server:
|
# Server:
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
from pandac.PandaModules import *
|
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
|
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
|
||||||
|
|
|
@ -10,6 +10,7 @@ class ToontownDistrict(DistributedDistrict.DistributedDistrict):
|
||||||
self.avatarCount = 0
|
self.avatarCount = 0
|
||||||
self.newAvatarCount = 0
|
self.newAvatarCount = 0
|
||||||
self.invasionStatus = 0
|
self.invasionStatus = 0
|
||||||
|
self.suitStatus = ''
|
||||||
|
|
||||||
def allowAHNNLog(self, allow):
|
def allowAHNNLog(self, allow):
|
||||||
self.allowAHNN = allow
|
self.allowAHNN = allow
|
||||||
|
|
|
@ -21,6 +21,8 @@ class DNABulkLoader:
|
||||||
|
|
||||||
def loadDNABulk(dnaStorage, file):
|
def loadDNABulk(dnaStorage, file):
|
||||||
dnaLoader = DNALoader.DNALoader()
|
dnaLoader = DNALoader.DNALoader()
|
||||||
|
file = 'resources/' + file
|
||||||
|
if config.GetBool('want-uplevel-res', False):
|
||||||
file = '../resources/' + file
|
file = '../resources/' + file
|
||||||
dnaLoader.loadDNAFile(dnaStorage, file)
|
dnaLoader.loadDNAFile(dnaStorage, file)
|
||||||
dnaLoader.destroy()
|
dnaLoader.destroy()
|
||||||
|
@ -28,6 +30,8 @@ def loadDNABulk(dnaStorage, file):
|
||||||
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
|
||||||
|
if config.GetBool('want-uplevel-res', False):
|
||||||
file = '../resources/' + file
|
file = '../resources/' + file
|
||||||
node = dnaLoader.loadDNAFile(dnaStorage, file)
|
node = dnaLoader.loadDNAFile(dnaStorage, file)
|
||||||
dnaLoader.destroy()
|
dnaLoader.destroy()
|
||||||
|
@ -37,6 +41,8 @@ def loadDNAFile(dnaStorage, file):
|
||||||
|
|
||||||
def loadDNAFileAI(dnaStorage, file):
|
def loadDNAFileAI(dnaStorage, file):
|
||||||
dnaLoader = DNALoader.DNALoader()
|
dnaLoader = DNALoader.DNALoader()
|
||||||
|
file = 'resources/' + file
|
||||||
|
if config.GetBool('want-uplevel-res', False):
|
||||||
file = '../resources/' + file
|
file = '../resources/' + file
|
||||||
data = dnaLoader.loadDNAFileAI(dnaStorage, file)
|
data = dnaLoader.loadDNAFileAI(dnaStorage, file)
|
||||||
dnaLoader.destroy()
|
dnaLoader.destroy()
|
||||||
|
|
|
@ -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)
|
||||||
|
|
|
@ -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')
|
||||||
|
|
Loading…
Reference in a new issue