diff --git a/README.md b/README.md index 299d72d7..94eb378b 100644 --- a/README.md +++ b/README.md @@ -12,4 +12,6 @@ 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. \ No newline at end of file +Never **_ever_** force a git push. + +Never change the gitignore files unless you are adding something to them. \ No newline at end of file diff --git a/astron/.gitignore b/astron/.gitignore index 813f039b..e099404e 100644 --- a/astron/.gitignore +++ b/astron/.gitignore @@ -1,5 +1,4 @@ -*.dll -astrond -astrond_debug -astrond.exe -astrond_debug.exe +*.dll +astrond +astrond_debug +astrond_debug.exe diff --git a/astron/astrond.exe b/astron/astrond.exe new file mode 100644 index 00000000..3e98eeeb Binary files /dev/null and b/astron/astrond.exe differ diff --git a/toontown/chat/ChatGlobals.py b/toontown/chat/ChatGlobals.py index 6669cb67..c3ff9f98 100644 --- a/toontown/chat/ChatGlobals.py +++ b/toontown/chat/ChatGlobals.py @@ -17,39 +17,39 @@ WTToontownBoardingGroup = 5 # Foreground, background: WhisperColors = { WTNormal: ( - ((0.0, 0.0, 0.0, 1.0), (0.2, 0.6, 0.8, 0.6)), # Normal - ((1.0, 0.5, 0.5, 1.0), (1.0, 1.0, 1.0, 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.8, 0.1, 0.1, 0.6)), # Normal + ((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.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 ), WTQuickTalker: ( - ((0.0, 0.0, 0.0, 1.0), (0.2, 0.6, 0.8, 0.6)), # Normal - ((1.0, 0.5, 0.5, 1.0), (1.0, 1.0, 1.0, 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.8, 0.1, 0.1, 0.6)), # Normal + ((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.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 ), WTSystem: ( - ((0.0, 0.0, 0.0, 1.0), (0.8, 0.3, 0.6, 0.6)), # Normal - ((1.0, 0.5, 0.5, 1.0), (1.0, 1.0, 1.0, 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.8, 0.3, 0.6, 0.6)) # Disabled + ((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.8, 0.1, 0.1, 0.8)), # Click + ((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 ), WTBattleSOS: ( - ((0.0, 0.0, 0.0, 1.0), (0.8, 0.3, 0.6, 0.6)), # Normal - ((1.0, 0.5, 0.5, 1.0), (1.0, 1.0, 1.0, 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.8, 0.3, 0.6, 0.6)) # Disabled + ((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.8, 0.1, 0.1, 0.8)), # Click + ((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 ), WTEmote: ( - ((0.0, 0.0, 0.0, 1.0), (0.1, 0.7, 0.41, 0.6)), # Normal - ((1.0, 0.5, 0.5, 1.0), (0.2, 0.7, 0.41, 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.1, 0.6, 0.41, 0.6)) # Disabled + ((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.8, 0.1, 0.1, 0.8)), # Click + ((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 ), WTToontownBoardingGroup: ( - ((0.0, 0.0, 0.0, 1.0), (0.9, 0.5, 0.1, 0.6)), # Normal - ((1.0, 0.5, 0.5, 1.0), (1.0, 1.0, 1.0, 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), (0.9, 0.4, 0.05, 0.6)), # Normal + ((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), (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 ), } diff --git a/toontown/minigame/DistributedTagGame.py b/toontown/minigame/DistributedTagGame.py index 60929477..8ec567ca 100644 --- a/toontown/minigame/DistributedTagGame.py +++ b/toontown/minigame/DistributedTagGame.py @@ -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.hide() 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.tagSfx = base.loadSfx('phase_4/audio/sfx/MG_Tag_C.ogg') self.itPointer = loader.loadModel('phase_4/models/minigames/bboard-pointer') @@ -283,4 +285,4 @@ class DistributedTagGame(DistributedMinigame): return self.notify.debug('setTreasureScore: %s' % scores) for i in xrange(len(self.scorePanels)): - self.scorePanels[i].setScore(scores[i]) + self.scorePanels[i].setScore(scores[i]) \ No newline at end of file