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

Merge branch 'master' of https://github.com/stevetts/tts_src

Browse source
This commit is contained in:
John Cote 2015-07-09 17:39:15 -04:00
commit 68c2369e8d
3 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
toontown/catalog/CatalogAccessoryItemGlobals.py
View file

@ -424,6 +424,10 @@ AccessoryTypes = {101: (AHat,
'gag1', 'gag1',
APriceAwesome, APriceAwesome,
8), 8),
226: (AGlasses,
'ghy1',
APriceAwesome,
8),
301: (ABackpack, 301: (ABackpack,
'bpb1', 'bpb1',
APriceBasic, APriceBasic,

4
toontown/toon/ToonDNA.py
View file

@ -2114,7 +2114,8 @@ GlassesModels = [None,
'phase_4/models/accessories/tt_m_chr_avt_acc_msk_mouthGlasses', 'phase_4/models/accessories/tt_m_chr_avt_acc_msk_mouthGlasses',
'phase_4/models/accessories/tt_m_chr_avt_acc_msk_squareRims', 'phase_4/models/accessories/tt_m_chr_avt_acc_msk_squareRims',
'phase_4/models/accessories/tt_m_chr_avt_acc_msk_eyepatch', 'phase_4/models/accessories/tt_m_chr_avt_acc_msk_eyepatch',
'phase_4/models/accessories/tt_m_chr_avt_acc_msk_alienGlasses'] 'phase_4/models/accessories/tt_m_chr_avt_acc_msk_alienGlasses',
'phase_4/models/accessories/tt_m_chr_avt_acc_msk_hypno_goggles17']
GlassesTextures = [None, GlassesTextures = [None,
'phase_4/maps/tt_t_chr_avt_acc_msk_masqueradeTypeMask2.jpg', 'phase_4/maps/tt_t_chr_avt_acc_msk_masqueradeTypeMask2.jpg',
'phase_4/maps/tt_t_chr_avt_acc_msk_masqueradeTypeMask4.jpg', 'phase_4/maps/tt_t_chr_avt_acc_msk_masqueradeTypeMask4.jpg',
@ -2306,6 +2307,7 @@ GlassesStyles = {'none': [0, 0, 0],
'gce1': [7, 0, 0], 'gce1': [7, 0, 0],
'gdk1': [8, 0, 0], 'gdk1': [8, 0, 0],
'gag1': [21, 0, 0], 'gag1': [21, 0, 0],
'ghy1': [22, 0, 0],
'ghw1': [20, 0, 0], 'ghw1': [20, 0, 0],
'ghw2': [20, 4, 0]} 'ghw2': [20, 4, 0]}
BackpackStyles = {'none': [0, 0, 0], BackpackStyles = {'none': [0, 0, 0],

7
toontown/toonbase/TTLocalizerEnglish.py
View file

@ -4872,7 +4872,7 @@ HatStylesDescriptions = {'hbb1': 'Green Baseball Cap',
'hhw1': 'Bandana', 'hhw1': 'Bandana',
'hhw2': 'Toonosaur Hat', 'hhw2': 'Toonosaur Hat',
'hob1': 'Jamboree Hat', 'hob1': 'Jamboree Hat',
'hbn1': 'Bird Hat by Brianna'} 'hbn1': 'Bird Hat'}
GlassesStylesDescriptions = {'grd1': 'Round Glasses', GlassesStylesDescriptions = {'grd1': 'Round Glasses',
'gmb1': 'White Mini Blinds', 'gmb1': 'White Mini Blinds',
'gnr1': 'Purple Narrow Glasses', 'gnr1': 'Purple Narrow Glasses',
@ -4897,7 +4897,8 @@ GlassesStylesDescriptions = {'grd1': 'Round Glasses',
'gsr1': 'Square Frame Glasses', 'gsr1': 'Square Frame Glasses',
'ghw1': 'Skull Eyepatch', 'ghw1': 'Skull Eyepatch',
'ghw2': 'Gem Eyepatch', 'ghw2': 'Gem Eyepatch',
'gag1': 'Alien Eyes by Alexandra'} 'gag1': 'Alien Eyes',
'ghy1': 'Hypno Lure Look'}
BackpackStylesDescriptions = {'bpb1': 'Blue Backpack', BackpackStylesDescriptions = {'bpb1': 'Blue Backpack',
'bpb2': 'Orange Backpack', 'bpb2': 'Orange Backpack',
'bpb3': 'Purple BackPack', 'bpb3': 'Purple BackPack',
@ -4927,7 +4928,7 @@ BackpackStylesDescriptions = {'bpb1': 'Blue Backpack',
'bhw4': 'Toonosaur Backpack', 'bhw4': 'Toonosaur Backpack',
'bob1': 'Jamboree Pack', 'bob1': 'Jamboree Pack',
'bfg1': 'Gag Attack Pack', 'bfg1': 'Gag Attack Pack',
'bfl1': 'Cog Pack by Savanah'} 'bfl1': 'Cog Pack'}
ShoesStylesDescriptions = {'sat1': 'Green Athletic Shoes', ShoesStylesDescriptions = {'sat1': 'Green Athletic Shoes',
'sat2': 'Red Athletic Shoes', 'sat2': 'Red Athletic Shoes',
'smb1': 'Green Toon Boots', 'smb1': 'Green Toon Boots',