Sneed-Group/Poodletooth-iLand
2
0
Fork 0
mirror of https://github.com/Sneed-Group/Poodletooth-iLand synced 2025-01-09 17:53:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Remove black, gray, white toons from the make a toon and random toon generation (Sorry, Sid Sonata!)

Browse source
This commit is contained in:
John 2015-08-14 17:43:59 +03:00
parent d686796023
commit 0154fb4453
2 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
toontown/makeatoon/ColorShop.py
View file

@ -18,7 +18,7 @@ class ColorShop(StateData.StateData):
self.colorAll = 1 self.colorAll = 1
def getColorList(self): def getColorList(self):
return ToonDNA.allColorsList return ToonDNA.matColorsList
def enter(self, toon, shopsVisited = []): def enter(self, toon, shopsVisited = []):
base.disableMouse() base.disableMouse()
@ -30,7 +30,7 @@ class ColorShop(StateData.StateData):
self.headChoice = colorList.index(self.dna.headColor) self.headChoice = colorList.index(self.dna.headColor)
self.allChoice = self.headChoice self.allChoice = self.headChoice
self.armChoice = colorList.index(self.dna.armColor) 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.legChoice = colorList.index(self.dna.legColor)
self.partChoice = 0 self.partChoice = 0

8
toontown/toon/ToonDNA.py
View file

@ -1932,6 +1932,12 @@ allColorsList = [(1.0, 1.0, 1.0, 1.0),
(0.86, 0.07, 0.23, 1.0), (0.86, 0.07, 0.23, 1.0),
(0.0, 0.63, 0.51, 1.0), (0.0, 0.63, 0.51, 1.0),
(0.8, 0.49, 0.19, 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, defaultColorList = [0,
1, 1,
32, 32,
@ -2662,7 +2668,7 @@ class ToonDNA:
self.head = generator.choice(toonHeadTypes[:22]) self.head = generator.choice(toonHeadTypes[:22])
top, topColor, sleeve, sleeveColor = getRandomTop(gender, generator=generator) top, topColor, sleeve, sleeveColor = getRandomTop(gender, generator=generator)
bottom, bottomColor = getRandomBottom(gender, generator=generator) bottom, bottomColor = getRandomBottom(gender, generator=generator)
color = generator.choice(allColorsList) color = generator.choice(matColorsList)
if gender == 'm': if gender == 'm':
self.torso = generator.choice(toonTorsoTypes[:3]) self.torso = generator.choice(toonTorsoTypes[:3])
self.topTex = top self.topTex = top