From c1e0e8bf6187252e51a631c43d8dc0c8a7ac5ed9 Mon Sep 17 00:00:00 2001 From: g0dfrey Date: Sun, 15 Mar 2015 04:44:38 -0500 Subject: [PATCH] blak stuff --- toontown/catalog/CatalogClothingItem.py | 4 +++- toontown/coderedemption/TTCodeRedemptionMgrAI.py | 11 +++++++++++ toontown/toon/ToonDNA.py | 16 +++++++++++----- toontown/toonbase/TTLocalizerEnglish.py | 6 ++++-- 4 files changed, 29 insertions(+), 8 deletions(-) diff --git a/toontown/catalog/CatalogClothingItem.py b/toontown/catalog/CatalogClothingItem.py index ad49ecb6..c49a9b87 100644 --- a/toontown/catalog/CatalogClothingItem.py +++ b/toontown/catalog/CatalogClothingItem.py @@ -292,7 +292,9 @@ ClothingTypes = {101: (ABoysShirt, 'bss1', 40), 1819: (AGirlsSkirt, 'sa_gs21', 5000), 1820: (AShirt, 'sa_ss55', 5000), 1821: (AShirt, 'weed', 5000), - 1822: (AShirt, 'RabbitJew', 5000)} + 1822: (AShirt, 'RabbitJew', 5000), + 1823: (AShirt, 'nig', 5000), + 1824: (AShorts, 'nig2', 300)} LoyaltyClothingItems = (1600, 1601, 1602, diff --git a/toontown/coderedemption/TTCodeRedemptionMgrAI.py b/toontown/coderedemption/TTCodeRedemptionMgrAI.py index 1e057d46..9152d8ca 100644 --- a/toontown/coderedemption/TTCodeRedemptionMgrAI.py +++ b/toontown/coderedemption/TTCodeRedemptionMgrAI.py @@ -53,10 +53,21 @@ class TTCodeRedemptionMgrAI(DistributedObjectAI): CatalogGardenStarterItem.CatalogGardenStarterItem() ] }, + 'regulatenigs': { + 'items': [ + CatalogClothingItem.CatalogClothingItem(1821, 0) + ] + }, 'xXx_WeedRab_420': { 'items': [ CatalogClothingItem.CatalogClothingItem(1822, 0) ] + }, + 'turncold': { + 'items': [ + CatalogClothingItem.CatalogClothingItem(1823, 0), + CatalogClothingItem.CatalogClothingItem(1824, 0) + ] } } diff --git a/toontown/toon/ToonDNA.py b/toontown/toon/ToonDNA.py index 52d1a2ad..1a641e4a 100644 --- a/toontown/toon/ToonDNA.py +++ b/toontown/toon/ToonDNA.py @@ -324,7 +324,8 @@ Shirts = ['phase_3/maps/desat_shirt_1.jpg', 'phase_4/maps/tt_t_chr_avt_shirt_saveBuilding05.jpg', 'phase_4/maps/tt_t_chr_avt_shirt_anniversary.jpg', 'phase_4/maps/WeedShirt.jpg', - 'phase_4/maps/RabbitJewShirt.jpg'] + 'phase_4/maps/RabbitJewShirt.jpg', + 'phase_4/maps/black2.jpg'] BoyShirts = [(0, 0), (1, 1), (2, 2), @@ -508,7 +509,8 @@ Sleeves = ['phase_3/maps/desat_sleeve_1.jpg', 'phase_4/maps/tt_t_chr_avt_shirtSleeve_saveBuilding05.jpg', 'phase_4/maps/tt_t_chr_avt_shirtSleeve_anniversary.jpg', 'phase_4/maps/WeedSleeve.jpg', - 'phase_4/maps/RabbitJewSleeve.jpg'] + 'phase_4/maps/RabbitJewSleeve.jpg', + 'phase_4/maps/black.jpg'] BoyShorts = ['phase_3/maps/desat_shorts_1.jpg', 'phase_3/maps/desat_shorts_2.jpg', 'phase_3/maps/desat_shorts_4.jpg', @@ -565,7 +567,8 @@ BoyShorts = ['phase_3/maps/desat_shorts_1.jpg', 'phase_4/maps/tt_t_chr_avt_shorts_golf04.jpg', 'phase_4/maps/tt_t_chr_avt_shorts_golf05.jpg', 'phase_4/maps/tt_t_chr_avt_shorts_racing04.jpg', - 'phase_4/maps/tt_t_chr_avt_shorts_racing05.jpg'] + 'phase_4/maps/tt_t_chr_avt_shorts_racing05.jpg', + 'phase_4/maps/black3.jpg'] SHORTS = 0 SKIRT = 1 GirlBottoms = [('phase_3/maps/desat_skirt_1.jpg', SKIRT), @@ -664,6 +667,7 @@ ClothesColors = [VBase4(0.933594, 0.265625, 0.28125, 1.0), VBase4(0.3, 0.3, 0.35, 1.0), VBase4(0.196078, 0.803921, 0.196078, 1.0), VBase4(0.462745098039216, 0.0901960784313725, 0.0901960784313725, 1.0)] + ShirtStyles = {'bss1': [0, 0, [(0, 0), (1, 1), (2, 2), @@ -1233,7 +1237,8 @@ ShirtStyles = {'bss1': [0, 0, [(0, 0), 'ugcms': [117, 104, [(27, 27)]], 'lb_1': [119, 106, [(27, 27)]], 'weed': [148, 135, [(27, 27)]], - 'RabbitJew': [149, 136, [(27, 27)]]} + 'RabbitJew': [149, 136, [(27, 27)]], + 'nig': [150, 137, [(27, 27)]]} BottomStyles = {'bbs1': [0, [0, 1, 2, @@ -1659,7 +1664,8 @@ BottomStyles = {'bbs1': [0, [0, 'hw_gs5': [54, [27]], 'hw_gs6': [55, [27]], 'hw_gs7': [56, [27]], - 'hw_gsk1': [53, [27]]} + 'hw_gsk1': [53, [27]], + 'nig2': [57, [27]]} MAKE_A_TOON = 1 TAMMY_TAILOR = 2004 LONGJOHN_LEROY = 1007 diff --git a/toontown/toonbase/TTLocalizerEnglish.py b/toontown/toonbase/TTLocalizerEnglish.py index d164b4af..44624226 100644 --- a/toontown/toonbase/TTLocalizerEnglish.py +++ b/toontown/toonbase/TTLocalizerEnglish.py @@ -6080,7 +6080,8 @@ ShirtStylesDescriptions = {'bss1': 'solid', 'jb_2': 'Doodle Shirt', 'ugcms': 'Get Connected Mover & Shaker', 'weed': '420 blaze it', - 'RabbitJew': 'The Pussy Slayer'} + 'RabbitJew': 'The Pussy Slayer', + 'nig': 'The N Shirt'} BottomStylesDescriptions = {'bbs1': 'plain w/ pockets', 'bbs2': 'belt', 'bbs3': 'cargo', @@ -6202,7 +6203,8 @@ BottomStylesDescriptions = {'bbs1': 'plain w/ pockets', 'hw_gs5': 'Halloween SuperToon Shorts female', 'hw_gs6': 'Halloween Vampire NoCape Shorts female', 'hw_gs7': 'Halloween Dinosaur Shorts female', - 'hw_gsk1': 'Halloween Pirate Skirt'} + 'hw_gsk1': 'Halloween Pirate Skirt', + 'nig2': 'The N Shorts'} AwardMgrBoy = 'boy' AwardMgrGirl = 'girl' AwardMgrUnisex = 'unisex'