Sneed-Group/Poodletooth-iLand
1
0
Fork 0
mirror of https://github.com/Sneed-Group/Poodletooth-iLand synced 2024-12-23 11:42:39 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Loudrob 2015-03-05 07:02:30 -05:00
commit 7ca72d45e2
7 changed files with 19 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
README.md
View file

@ -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.
And *only* push to **THIS** repository.
Never **_ever_** force a git push.

1
config/release/dev.prc
View file

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

2
otp/distributed/DCClassImports.py
View file

@ -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

1
toontown/distributed/ToontownDistrict.py
View file

@ -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

12
toontown/dna/DNAParser.py
View file

@ -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

2
toontown/makeatoon/NameGenerator.py
View file

@ -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)

2
toontown/quest/QuestParser.py
View file

@ -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')