From d7464ec7617a46447615be3e9925ce6962229d40 Mon Sep 17 00:00:00 2001 From: g0dfrey Date: Fri, 13 Mar 2015 13:02:47 -0500 Subject: [PATCH] gf --- toontown/catalog/CatalogClothingItem.py | 3 ++- toontown/coderedemption/TTCodeRedemptionMgrAI.py | 9 +++++++-- toontown/toon/ToonDNA.py | 12 ++++++++---- toontown/toonbase/TTLocalizerEnglish.py | 3 ++- 4 files changed, 19 insertions(+), 8 deletions(-) diff --git a/toontown/catalog/CatalogClothingItem.py b/toontown/catalog/CatalogClothingItem.py index 7ad4b8e0..ad49ecb6 100644 --- a/toontown/catalog/CatalogClothingItem.py +++ b/toontown/catalog/CatalogClothingItem.py @@ -291,7 +291,8 @@ ClothingTypes = {101: (ABoysShirt, 'bss1', 40), 1818: (AGirlsSkirt, 'sa_gs20', 5000), 1819: (AGirlsSkirt, 'sa_gs21', 5000), 1820: (AShirt, 'sa_ss55', 5000), - 1821: (AShirt, 'weed', 5000)} + 1821: (AShirt, 'weed', 5000), + 1822: (AShirt, 'RabbitJew', 5000)} LoyaltyClothingItems = (1600, 1601, 1602, diff --git a/toontown/coderedemption/TTCodeRedemptionMgrAI.py b/toontown/coderedemption/TTCodeRedemptionMgrAI.py index 2932658b..574043b2 100644 --- a/toontown/coderedemption/TTCodeRedemptionMgrAI.py +++ b/toontown/coderedemption/TTCodeRedemptionMgrAI.py @@ -48,8 +48,13 @@ class TTCodeRedemptionMgrAI(DistributedObjectAI): 'gardening': { 'items': [ CatalogGardenStarterItem.CatalogGardenStarterItem() - ] - } + ], + }, + 'xXx_WeedRab_420': { + 'items': [ + CatalogClothingItem.CatalogClothingItem(1822, 0) + ], + }, } def announceGenerate(self): diff --git a/toontown/toon/ToonDNA.py b/toontown/toon/ToonDNA.py index 869f0524..52d1a2ad 100644 --- a/toontown/toon/ToonDNA.py +++ b/toontown/toon/ToonDNA.py @@ -323,7 +323,8 @@ Shirts = ['phase_3/maps/desat_shirt_1.jpg', 'phase_4/maps/tt_t_chr_avt_shirt_saveBuilding4.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/WeedShirt.jpg', + 'phase_4/maps/RabbitJewShirt.jpg'] BoyShirts = [(0, 0), (1, 1), (2, 2), @@ -506,7 +507,8 @@ Sleeves = ['phase_3/maps/desat_sleeve_1.jpg', 'phase_4/maps/tt_t_chr_avt_shirtSleeve_saveBuilding4.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/WeedSleeve.jpg', + 'phase_4/maps/RabbitJewSleeve.jpg'] BoyShorts = ['phase_3/maps/desat_shorts_1.jpg', 'phase_3/maps/desat_shorts_2.jpg', 'phase_3/maps/desat_shorts_4.jpg', @@ -660,7 +662,8 @@ ClothesColors = [VBase4(0.933594, 0.265625, 0.28125, 1.0), VBase4(0.972549, 0.094117, 0.094117, 1.0), VBase4(0.447058, 0.0, 0.90196, 1.0), VBase4(0.3, 0.3, 0.35, 1.0), - VBase4(0.196078, 0.803921, 0.196078, 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), @@ -1229,7 +1232,8 @@ ShirtStyles = {'bss1': [0, 0, [(0, 0), 'jb_2': [113, 100, [(27, 27)]], 'ugcms': [117, 104, [(27, 27)]], 'lb_1': [119, 106, [(27, 27)]], - 'weed': [148, 135, [(27, 27)]]} + 'weed': [148, 135, [(27, 27)]], + 'RabbitJew': [149, 136, [(27, 27)]]} BottomStyles = {'bbs1': [0, [0, 1, 2, diff --git a/toontown/toonbase/TTLocalizerEnglish.py b/toontown/toonbase/TTLocalizerEnglish.py index 9642cebb..d164b4af 100644 --- a/toontown/toonbase/TTLocalizerEnglish.py +++ b/toontown/toonbase/TTLocalizerEnglish.py @@ -6079,7 +6079,8 @@ ShirtStylesDescriptions = {'bss1': 'solid', 'jb_1': 'Jellybean Shirt', 'jb_2': 'Doodle Shirt', 'ugcms': 'Get Connected Mover & Shaker', - 'weed': '420 BlazeIt Shirt'} + 'weed': '420 blaze it', + 'RabbitJew': 'The Pussy Slayer'} BottomStylesDescriptions = {'bbs1': 'plain w/ pockets', 'bbs2': 'belt', 'bbs3': 'cargo',