diff --git a/toontown/estate/Estate.py b/toontown/estate/Estate.py index 3e22431c..062a2801 100755 --- a/toontown/estate/Estate.py +++ b/toontown/estate/Estate.py @@ -354,7 +354,6 @@ class Estate(Place.Place): def __setUnderwaterFog(self): if base.wantFog: - self.fog.setColor(Vec4(0.0, 0.0, 0.6, 1.0)) self.fog.setLinearRange(0.1, 100.0) render.setFog(self.fog) self.loader.hood.sky.setFog(self.fog) diff --git a/toontown/hood/DDHood.py b/toontown/hood/DDHood.py index bb9b569a..6d36922f 100755 --- a/toontown/hood/DDHood.py +++ b/toontown/hood/DDHood.py @@ -14,7 +14,6 @@ class DDHood(ToonHood): SKY_FILE = 'phase_3.5/models/props/BR_sky' SPOOKY_SKY_FILE = 'phase_3.5/models/props/BR_sky' TITLE_COLOR = (0.8, 0.6, 0.5, 1.0) - underwaterColor = Vec4(0.0, 0.0, 0.6, 1.0) HOLIDAY_DNA = { ToontownGlobals.CHRISTMAS: ['phase_6/dna/winter_storage_DD.pdna'], diff --git a/toontown/hood/OZHood.py b/toontown/hood/OZHood.py index 5ddbedbd..49cedff2 100755 --- a/toontown/hood/OZHood.py +++ b/toontown/hood/OZHood.py @@ -12,7 +12,6 @@ class OZHood(ToonHood): SKY_FILE = 'phase_3.5/models/props/TT_sky' SPOOKY_SKY_FILE = 'phase_3.5/models/props/BR_sky' TITLE_COLOR = (1.0, 0.5, 0.4, 1.0) - underwaterColor = Vec4(0.0, 0.0, 0.6, 1.0) def __init__(self, parentFSM, doneEvent, dnaStore, hoodId): ToonHood.__init__(self, parentFSM, doneEvent, dnaStore, hoodId) diff --git a/toontown/hood/ToonHood.py b/toontown/hood/ToonHood.py index 1d8106e0..f7bafee5 100755 --- a/toontown/hood/ToonHood.py +++ b/toontown/hood/ToonHood.py @@ -237,7 +237,6 @@ class ToonHood(Hood): def setUnderwaterFog(self): if base.wantFog: - self.fog.setColor(self.underwaterColor) self.fog.setLinearRange(0.1, 100.0) render.setFog(self.fog) self.sky.setFog(self.fog) diff --git a/toontown/safezone/Walk.py b/toontown/safezone/Walk.py index 4d42db52..d00831c6 100755 --- a/toontown/safezone/Walk.py +++ b/toontown/safezone/Walk.py @@ -3,7 +3,7 @@ from direct.task.Task import Task from direct.directnotify import DirectNotifyGlobal from direct.fsm import StateData from direct.fsm import ClassicFSM, State -from direct.fsm import State +import colorsys class Walk(StateData.StateData): notify = DirectNotifyGlobal.directNotify.newCategory('Walk')