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 http://gitlab.com/toontown-created/src

Browse source
This commit is contained in:
Daniel 2015-03-29 14:39:32 +03:00
commit 6726d7e589
5 changed files with 32 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
README.md
View file

@ -12,4 +12,6 @@ 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. Never **_ever_** force a git push.
Never change the gitignore files unless you are adding something to them.

9
astron/.gitignore vendored
View file

@ -1,5 +1,4 @@
*.dll *.dll
astrond astrond
astrond_debug astrond_debug
astrond.exe astrond_debug.exe
astrond_debug.exe

BIN
astron/astrond.exe Normal file
View file

Binary file not shown.

42
toontown/chat/ChatGlobals.py
View file

@ -17,39 +17,39 @@ WTToontownBoardingGroup = 5
# Foreground, background: # Foreground, background:
WhisperColors = { WhisperColors = {
WTNormal: ( WTNormal: (
((0.0, 0.0, 0.0, 1.0), (0.2, 0.6, 0.8, 0.6)), # Normal ((0.0, 0.0, 0.0, 1.0), (0.8, 0.1, 0.1, 0.6)), # Normal
((1.0, 0.5, 0.5, 1.0), (1.0, 1.0, 1.0, 0.8)), # Click ((1.0, 0.5, 0.5, 1.0), (0.8, 0.1, 0.1, 0.8)), # Click
((0.0, 0.0, 0.0, 1.0), (0.2, 0.7, 0.9, 0.6)), # Rollover ((0.0, 0.0, 0.0, 1.0), (0.9, 0.05, 0.05, 0.6)), # Rollover
((0.0, 0.0, 0.0, 1.0), (0.2, 0.7, 0.8, 0.6)) # Disabled ((0.0, 0.0, 0.0, 1.0), (0.2, 0.7, 0.8, 0.6)) # Disabled
), ),
WTQuickTalker: ( WTQuickTalker: (
((0.0, 0.0, 0.0, 1.0), (0.2, 0.6, 0.8, 0.6)), # Normal ((0.0, 0.0, 0.0, 1.0), (0.8, 0.1, 0.1, 0.6)), # Normal
((1.0, 0.5, 0.5, 1.0), (1.0, 1.0, 1.0, 0.8)), # Click ((1.0, 0.5, 0.5, 1.0), (0.8, 0.1, 0.1, 0.8)), # Click
((0.0, 0.0, 0.0, 1.0), (0.2, 0.7, 0.9, 0.6)), # Rollover ((0.0, 0.0, 0.0, 1.0), (0.9, 0.05, 0.05, 0.6)), # Rollover
((0.0, 0.0, 0.0, 1.0), (0.2, 0.7, 0.8, 0.6)) # Disabled ((0.0, 0.0, 0.0, 1.0), (0.2, 0.7, 0.8, 0.6)) # Disabled
), ),
WTSystem: ( WTSystem: (
((0.0, 0.0, 0.0, 1.0), (0.8, 0.3, 0.6, 0.6)), # Normal ((0.0, 0.0, 0.0, 1.0), (0.8, 0.1, 0.1, 0.6)), # Normal
((1.0, 0.5, 0.5, 1.0), (1.0, 1.0, 1.0, 0.8)), # Click ((1.0, 0.5, 0.5, 1.0), (0.8, 0.1, 0.1, 0.8)), # Click
((0.0, 0.0, 0.0, 1.0), (0.8, 0.4, 1.0, 0.8)), # Rollover ((0.0, 0.0, 0.0, 1.0), (0.9, 0.05, 0.05, 0.6)), # Rollover
((0.0, 0.0, 0.0, 1.0), (0.8, 0.3, 0.6, 0.6)) # Disabled ((0.0, 0.0, 0.0, 1.0), (0.2, 0.7, 0.8, 0.6)) # Disabled
), ),
WTBattleSOS: ( WTBattleSOS: (
((0.0, 0.0, 0.0, 1.0), (0.8, 0.3, 0.6, 0.6)), # Normal ((0.0, 0.0, 0.0, 1.0), (0.8, 0.1, 0.1, 0.6)), # Normal
((1.0, 0.5, 0.5, 1.0), (1.0, 1.0, 1.0, 0.8)), # Click ((1.0, 0.5, 0.5, 1.0), (0.8, 0.1, 0.1, 0.8)), # Click
((0.0, 0.0, 0.0, 1.0), (0.8, 0.4, 0.0, 0.8)), # Rollover ((0.0, 0.0, 0.0, 1.0), (0.9, 0.05, 0.05, 0.6)), # Rollover
((0.0, 0.0, 0.0, 1.0), (0.8, 0.3, 0.6, 0.6)) # Disabled ((0.0, 0.0, 0.0, 1.0), (0.2, 0.7, 0.8, 0.6)) # Disabled
), ),
WTEmote: ( WTEmote: (
((0.0, 0.0, 0.0, 1.0), (0.1, 0.7, 0.41, 0.6)), # Normal ((0.0, 0.0, 0.0, 1.0), (0.8, 0.1, 0.1, 0.6)), # Normal
((1.0, 0.5, 0.5, 1.0), (0.2, 0.7, 0.41, 0.8)), # Click ((1.0, 0.5, 0.5, 1.0), (0.8, 0.1, 0.1, 0.8)), # Click
((0.0, 0.0, 0.0, 1.0), (0.1, 0.6, 0.51, 0.6)), # Rollover ((0.0, 0.0, 0.0, 1.0), (0.9, 0.05, 0.05, 0.6)), # Rollover
((0.0, 0.0, 0.0, 1.0), (0.1, 0.6, 0.41, 0.6)) # Disabled ((0.0, 0.0, 0.0, 1.0), (0.2, 0.7, 0.8, 0.6)) # Disabled
), ),
WTToontownBoardingGroup: ( WTToontownBoardingGroup: (
((0.0, 0.0, 0.0, 1.0), (0.9, 0.5, 0.1, 0.6)), # Normal ((0.0, 0.0, 0.0, 1.0), (0.9, 0.4, 0.05, 0.6)), # Normal
((1.0, 0.5, 0.5, 1.0), (1.0, 1.0, 1.0, 0.8)), # Click ((1.0, 0.5, 0.5, 1.0), (1.0, 0.5, 0.2, 0.8)), # Click
((0.0, 0.0, 0.0, 1.0), (0.9, 0.6, 0.2, 0.6)), # Rollover ((0.0, 0.0, 0.0, 1.0), (1.0, 0.4, 0.0, 0.6)), # Rollover
((0.0, 0.0, 0.0, 1.0), (0.9, 0.6, 0.1, 0.6)) # Disabled ((0.0, 0.0, 0.0, 1.0), (0.9, 0.6, 0.1, 0.6)) # Disabled
), ),
} }

6
toontown/minigame/DistributedTagGame.py
View file

@ -49,7 +49,9 @@ class DistributedTagGame(DistributedMinigame):
self.itText = OnscreenText.OnscreenText('itText', fg=(0.95, 0.95, 0.65, 1), scale=0.14, font=ToontownGlobals.getSignFont(), pos=(0.0, -0.8), wordwrap=15, mayChange=1) self.itText = OnscreenText.OnscreenText('itText', fg=(0.95, 0.95, 0.65, 1), scale=0.14, font=ToontownGlobals.getSignFont(), pos=(0.0, -0.8), wordwrap=15, mayChange=1)
self.itText.hide() self.itText.hide()
self.sky = loader.loadModel('phase_3.5/models/props/TT_sky') self.sky = loader.loadModel('phase_3.5/models/props/TT_sky')
self.ground = loader.loadModel('phase_4/models/minigames/tag_arena') self.groundList = ['phase_4/models/minigames/tag_arena', 'phase_6/models/neighborhoods/minnies_melody_land', 'phase_8/models/neighborhoods/the_burrrgh' 'phase_8/models/neighborhoods/daisys_garden']
self.groundRandom = random.choice(self.groundList)
self.ground = self.groundRandom
self.music = base.loadMusic('phase_4/audio/bgm/MG_toontag.ogg') self.music = base.loadMusic('phase_4/audio/bgm/MG_toontag.ogg')
self.tagSfx = base.loadSfx('phase_4/audio/sfx/MG_Tag_C.ogg') self.tagSfx = base.loadSfx('phase_4/audio/sfx/MG_Tag_C.ogg')
self.itPointer = loader.loadModel('phase_4/models/minigames/bboard-pointer') self.itPointer = loader.loadModel('phase_4/models/minigames/bboard-pointer')
@ -283,4 +285,4 @@ class DistributedTagGame(DistributedMinigame):
return return
self.notify.debug('setTreasureScore: %s' % scores) self.notify.debug('setTreasureScore: %s' % scores)
for i in xrange(len(self.scorePanels)): for i in xrange(len(self.scorePanels)):
self.scorePanels[i].setScore(scores[i]) self.scorePanels[i].setScore(scores[i])