Shuffle button fix

This commit is contained in:
John 2015-08-04 23:17:48 +03:00
parent b036e788e8
commit c609a44980

View file

@ -289,19 +289,15 @@ class ColorShop(StateData.StateData):
newArmColorIndex = colorList.index(newChoice[1]) newArmColorIndex = colorList.index(newChoice[1])
newGloveColorIndex = colorList.index(newChoice[2]) newGloveColorIndex = colorList.index(newChoice[2])
newLegColorIndex = colorList.index(newChoice[3]) newLegColorIndex = colorList.index(newChoice[3])
oldHeadColorIndex = colorList.index(self.toon.style.headColor) self.__swapHeadColor(newHeadColorIndex - self.headChoice)
oldArmColorIndex = colorList.index(self.toon.style.armColor)
oldGloveColorIndex = colorList.index(self.toon.style.gloveColor)
oldLegColorIndex = colorList.index(self.toon.style.legColor)
self.__swapHeadColor(newHeadColorIndex - oldHeadColorIndex)
if self.colorAll: if self.colorAll:
self.__swapArmColor(newHeadColorIndex - oldArmColorIndex) self.__swapArmColor(newHeadColorIndex - self.armChoice)
self.__swapGloveColor(newHeadColorIndex - oldGloveColorIndex) self.__swapGloveColor(newHeadColorIndex - self.gloveChoice)
self.__swapLegColor(newHeadColorIndex - oldLegColorIndex) self.__swapLegColor(newHeadColorIndex - self.legChoice)
else: else:
self.__swapArmColor(newArmColorIndex - oldArmColorIndex) self.__swapArmColor(newArmColorIndex - self.armChoice)
self.__swapGloveColor(newGloveColorIndex - oldGloveColorIndex) self.__swapGloveColor(newGloveColorIndex - self.gloveChoice)
self.__swapLegColor(newLegColorIndex - oldLegColorIndex) self.__swapLegColor(newLegColorIndex - self.legChoice)
def getCurrToonSetting(self): def getCurrToonSetting(self):
return [self.dna.headColor, self.dna.armColor, self.dna.gloveColor, self.dna.legColor] return [self.dna.headColor, self.dna.armColor, self.dna.gloveColor, self.dna.legColor]