From 260d5d1ae649864dbeab45ca727f0a5f83726313 Mon Sep 17 00:00:00 2001
From: Blurryface <blrrfcx@protonmail.ch>
Date: Tue, 28 Jul 2015 20:10:08 +0200
Subject: [PATCH] Revert "Added new colors."

This reverts commit 1bf949cfb029e133f8cb0232e1247bc6a15ea96c.
---
 toontown/toon/ToonDNA.py                | 82 +++++++++++++------------
 toontown/toonbase/TTLocalizerEnglish.py | 34 +++++-----
 2 files changed, 62 insertions(+), 54 deletions(-)

diff --git a/toontown/toon/ToonDNA.py b/toontown/toon/ToonDNA.py
index d2192b5d..55ed726b 100755
--- a/toontown/toon/ToonDNA.py
+++ b/toontown/toon/ToonDNA.py
@@ -1892,119 +1892,125 @@ def getAllBottoms(gender, output = 'both'):
 
 
 allColorsList = [VBase4(1.0, 1.0, 1.0, 1.0),
- VBase4(0.988235, 0.894117, 0.745098, 1.0),
  VBase4(0.96875, 0.691406, 0.699219, 1.0),
  VBase4(0.933594, 0.265625, 0.28125, 1.0),
  VBase4(0.863281, 0.40625, 0.417969, 1.0),
  VBase4(0.710938, 0.234375, 0.4375, 1.0),
- VBase4(0.45, 0.25, 0.31, 1.0),
  VBase4(0.570312, 0.449219, 0.164062, 1.0),
  VBase4(0.640625, 0.355469, 0.269531, 1.0),
- VBase4(0.41, 0.34, 0.26, 1.0),
  VBase4(0.996094, 0.695312, 0.511719, 1.0),
  VBase4(0.832031, 0.5, 0.296875, 1.0),
  VBase4(0.992188, 0.480469, 0.167969, 1.0),
  VBase4(0.996094, 0.898438, 0.320312, 1.0),
  VBase4(0.996094, 0.957031, 0.597656, 1.0),
- VBase4(0.80, 1.0, 0.80, 1.0),
  VBase4(0.855469, 0.933594, 0.492188, 1.0),
- VBase4(0.304688, 0.96875, 0.402344, 1.0),
  VBase4(0.550781, 0.824219, 0.324219, 1.0),
- VBase4(0.53, 0.58, 0.16, 1.0),
  VBase4(0.242188, 0.742188, 0.515625, 1.0),
- VBase4(0.32, 0.86, 0.69, 1.0),
- VBase4(0.0, 0.53, 0.59, 1.0),
+ VBase4(0.304688, 0.96875, 0.402344, 1.0),
  VBase4(0.433594, 0.90625, 0.835938, 1.0),
- VBase4(0.60, 0.80, 1.0, 1.0),
  VBase4(0.347656, 0.820312, 0.953125, 1.0),
  VBase4(0.191406, 0.5625, 0.773438, 1.0),
- VBase4(0.460938, 0.378906, 0.824219, 1.0),
- VBase4(0.285156, 0.328125, 0.726562, 1.0),
- VBase4(0.40, 0.20, 0.60,1.0),
- VBase4(0.546875, 0.28125, 0.75, 1.0),
  VBase4(0.558594, 0.589844, 0.875, 1.0),
+ VBase4(0.285156, 0.328125, 0.726562, 1.0),
+ VBase4(0.460938, 0.378906, 0.824219, 1.0),
+ VBase4(0.546875, 0.28125, 0.75, 1.0),
  VBase4(0.726562, 0.472656, 0.859375, 1.0),
  VBase4(0.898438, 0.617188, 0.90625, 1.0),
- VBase4(0.95, 0.70, 0.88, 1.0),
- VBase4(0.74, 0.68, 0.78, 1.0),
+ VBase4(0.7, 0.7, 0.8, 1.0),
+ VBase4(0.3, 0.3, 0.35, 1.0),
+ VBase4(0.0, 0.635294, 0.258823, 1.0),
+ VBase4(0.674509, 0.925490, 1.0, 1.0),
+ VBase4(0.988235, 0.894117, 0.745098, 1.0),
+ VBase4(0.749019, 1.0, 0.847058, 1.0),
  VBase4(0.470588, 0.443137, 0.447058, 1.0),
- VBase4(0.3, 0.3, 0.35, 1.0)]
+ VBase4(0.996078, 0.254901, 0.392156, 1.0),
+ VBase4(0.811764, 0.709803, 0.231372, 1.0),
+ VBase4(0.749019, 0.756862, 0.760784, 1.0),
+ VBase4(1.0, 0.639215, 0.262745, 1.0),
+ VBase4(0.0, 0.403921, 0.647058, 1.0),
+ VBase4(0.862745, 0.078431, 0.235294, 1.0),
+ VBase4(0.0, 0.635294, 0.513725, 1.0),
+ VBase4(0.803921, 0.498039, 0.196078, 1.0)]
 defaultBoyColorList = [0,
  1,
+ 32,
  2,
  3,
  4,
  5,
  6,
  7,
+ 29,
  8,
+ 37,
+ 35,
  9,
  10,
+ 33,
  11,
  12,
+ 30,
  13,
  14,
  15,
+ 39,
+ 27,
+ 28,
  16,
  17,
  18,
  19,
  20,
  21,
+ 38,
+ 36,
  22,
  23,
  24,
  25,
- 26,
- 27,
- 28,
- 29,
- 30,
- 31,
- 32,
- 33,
  34,
- 35,
- 36,
- 37]
+ 31,
+ 26]
 defaultGirlColorList = [0,
  1,
+ 32,
  2,
  3,
  4,
  5,
  6,
  7,
+ 29,
  8,
+ 37,
+ 35,
  9,
  10,
+ 33,
  11,
  12,
+ 30,
  13,
  14,
  15,
+ 39,
+ 27,
+ 28,
  16,
  17,
  18,
  19,
  20,
  21,
+ 38,
+ 36,
  22,
  23,
  24,
  25,
- 26,
- 27,
- 28,
- 29,
- 30,
- 31,
- 32,
- 33,
  34,
- 35,
- 36,
- 37]
+ 31,
+ 26]
 allColorsListApproximations = map(lambda x: VBase4(round(x[0], 3), round(x[1], 3), round(x[2], 3), round(x[3], 3)), allColorsList)
 allowedColors = set(map(lambda x: allColorsListApproximations[x], set([0] + defaultBoyColorList + defaultGirlColorList + [26])))
 HatModels = [None,
diff --git a/toontown/toonbase/TTLocalizerEnglish.py b/toontown/toonbase/TTLocalizerEnglish.py
index f27d8626..b5e6266e 100755
--- a/toontown/toonbase/TTLocalizerEnglish.py
+++ b/toontown/toonbase/TTLocalizerEnglish.py
@@ -4502,43 +4502,45 @@ ApostropheOnlyAfterLetter = 'You can use an apostrophe in your name, but only af
 NoNumbersInTheMiddle = 'Numeric digits may not appear in the middle of a word.'
 ThreeWordsOrLess = 'Your name must be three words or fewer.'
 NumToColor = ['White',
- 'Beige',
  'Peach',
  'Bright Red',
  'Red',
  'Maroon',
- 'Cosmic Red',
  'Sienna',
  'Brown',
- 'Ice Brown',
  'Tan',
  'Coral',
  'Orange',
  'Yellow',
  'Cream',
- 'Mint Green',
  'Citrine',
- 'Green',
  'Lime',
- 'Olive',
  'Sea Green',
- 'Turqoise',
- 'Lagoon Blue',
+ 'Green',
  'Light Blue',
- 'Sky Blue',
  'Aqua',
  'Blue',
- 'Slate Blue',
- 'Royal Blue',
- 'Aubergine',
- 'Purple',
  'Periwinkle',
+ 'Royal Blue',
+ 'Slate Blue',
+ 'Purple',
  'Lavender',
  'Pink',
- 'Bubblegum Pink',
- 'Gray',
+ 'Plum',
+ 'Black',
+ 'Mountain Green',
+ 'Icy Blue',
+ 'Desert Sand',
+ 'Mint',
  'Charcoal',
- 'Black',]
+ 'Hot Pink',
+ 'Honey Mustard',
+ 'Gray',
+ 'Neon Orange',
+ 'Sapphire',
+ 'Crimson',
+ 'Emerald',
+ 'Bronze']
 AnimalToSpecies = {'dog': 'Dog',
  'cat': 'Cat',
  'mouse': 'Mouse',