diff --git a/toontown/makeatoon/ColorShop.py b/toontown/makeatoon/ColorShop.py index f000a3ac..3a217837 100755 --- a/toontown/makeatoon/ColorShop.py +++ b/toontown/makeatoon/ColorShop.py @@ -18,7 +18,7 @@ class ColorShop(StateData.StateData): self.colorAll = 1 def getColorList(self): - return ToonDNA.allColorsList + return ToonDNA.matColorsList def enter(self, toon, shopsVisited = []): base.disableMouse() @@ -30,7 +30,7 @@ class ColorShop(StateData.StateData): self.headChoice = colorList.index(self.dna.headColor) self.allChoice = self.headChoice self.armChoice = colorList.index(self.dna.armColor) - self.gloveChoice = colorList.index(self.dna.gloveColor) + self.gloveChoice = 0 self.legChoice = colorList.index(self.dna.legColor) self.partChoice = 0 diff --git a/toontown/toon/ToonDNA.py b/toontown/toon/ToonDNA.py index cdf58fdd..38798263 100755 --- a/toontown/toon/ToonDNA.py +++ b/toontown/toon/ToonDNA.py @@ -1932,6 +1932,12 @@ allColorsList = [(1.0, 1.0, 1.0, 1.0), (0.86, 0.07, 0.23, 1.0), (0.0, 0.63, 0.51, 1.0), (0.8, 0.49, 0.19, 1.0)] +disallowedColorsList = [(1.0, 1.0, 1.0, 1.0), + (0.7, 0.7, 0.8, 1.0), + (0.3, 0.3, 0.35, 1.0), + (0.47, 0.44, 0.44, 1.0), + (0.74, 0.75, 0.76, 1.0)] +matColorsList = [x for x in allColorsList if x not in disallowedColorsList] defaultColorList = [0, 1, 32, @@ -2662,7 +2668,7 @@ class ToonDNA: self.head = generator.choice(toonHeadTypes[:22]) top, topColor, sleeve, sleeveColor = getRandomTop(gender, generator=generator) bottom, bottomColor = getRandomBottom(gender, generator=generator) - color = generator.choice(allColorsList) + color = generator.choice(matColorsList) if gender == 'm': self.torso = generator.choice(toonTorsoTypes[:3]) self.topTex = top