From 65526aa1cd780686a34029599797d1c3044bfb32 Mon Sep 17 00:00:00 2001 From: "Erica M. (\"Loonatic\")" Date: Fri, 11 Feb 2022 13:26:25 -0600 Subject: [PATCH] convert: Convert all instances of jpg&rgb texture calls in codebase to png --- toontown/battle/BattleProps.py | 4 +- toontown/catalog/CatalogFlooringItem.py | 48 +- toontown/catalog/CatalogMouldingItem.py | 28 +- toontown/catalog/CatalogWainscotingItem.py | 10 +- toontown/catalog/CatalogWallpaperItem.py | 268 ++--- toontown/char/Char.py | 12 +- .../cogdominium/DistributedCogdoBarrel.py | 4 +- toontown/estate/DistributedToonStatuary.py | 10 +- toontown/hood/StreetSign.py | 2 +- toontown/minigame/DistributedTargetGame.py | 8 +- toontown/minigame/Purchase.py | 6 +- toontown/minigame/SwingVine.py | 2 +- .../DistributedPartyJukebox40Activity.py | 2 +- ...tributedPartyValentineJukebox40Activity.py | 2 +- ...istributedPartyValentineJukeboxActivity.py | 2 +- ...ributedPartyValentineTrampolineActivity.py | 2 +- ...stributedPartyVictoryTrampolineActivity.py | 2 +- ...istributedPartyWinterTrampolineActivity.py | 2 +- toontown/parties/PartyCogActivity.py | 3 +- toontown/pets/Pet.py | 8 +- toontown/pets/PetDNA.py | 38 +- toontown/racing/DistributedRace.py | 2 +- toontown/racing/Kart.py | 6 +- toontown/racing/KartShopGui.py | 20 +- toontown/shtiker/InGameNewsFrame.py | 2 +- toontown/shtiker/IssueFrame.py | 2 +- toontown/shtiker/KartPage.py | 14 +- toontown/shtiker/PhotoAlbumPage.py | 2 +- toontown/suit/Suit.py | 48 +- toontown/toon/Toon.py | 2 +- toontown/toon/ToonDNA.py | 976 +++++++++--------- toontown/toon/ToonHead.py | 18 +- toontown/town/Street.py | 4 +- 33 files changed, 778 insertions(+), 781 deletions(-) diff --git a/toontown/battle/BattleProps.py b/toontown/battle/BattleProps.py index d717b37..2e2b866 100644 --- a/toontown/battle/BattleProps.py +++ b/toontown/battle/BattleProps.py @@ -324,12 +324,12 @@ class PropPool: lips.setPos(0, 0, -3.04) lips.flattenMedium() elif name == '5dollar': - tex = loader.loadTexture('phase_5/maps/dollar_5.jpg') + tex = loader.loadTexture('phase_5/maps/dollar_5.png') tex.setMinfilter(Texture.FTLinearMipmapLinear) tex.setMagfilter(Texture.FTLinear) self.props[name].setTexture(tex, 1) elif name == '10dollar': - tex = loader.loadTexture('phase_5/maps/dollar_10.jpg') + tex = loader.loadTexture('phase_5/maps/dollar_10.png') tex.setMinfilter(Texture.FTLinearMipmapLinear) tex.setMagfilter(Texture.FTLinear) self.props[name].setTexture(tex, 1) diff --git a/toontown/catalog/CatalogFlooringItem.py b/toontown/catalog/CatalogFlooringItem.py index 984b135..d39c611 100644 --- a/toontown/catalog/CatalogFlooringItem.py +++ b/toontown/catalog/CatalogFlooringItem.py @@ -2,30 +2,30 @@ from .CatalogSurfaceItem import * FTTextureName = 0 FTColor = 1 FTBasePrice = 2 -FlooringTypes = {1000: ('phase_5.5/maps/floor_wood_neutral.jpg', CTBasicWoodColorOnWhite, 150), - 1010: ('phase_5.5/maps/flooring_carpetA_neutral.jpg', CTFlatColorDark, 150), - 1020: ('phase_4/maps/flooring_tile_neutral.jpg', CTFlatColorDark, 150), - 1030: ('phase_5.5/maps/flooring_tileB2.jpg', None, 150), - 1040: ('phase_4/maps/grass.jpg', None, 150), - 1050: ('phase_4/maps/floor_tile_brick_diagonal2.jpg', None, 150), - 1060: ('phase_4/maps/floor_tile_brick_diagonal.jpg', None, 150), - 1070: ('phase_4/maps/plazz_tile.jpg', None, 150), - 1080: ('phase_4/maps/sidewalk.jpg', CTFlatColorDark, 150), - 1090: ('phase_3.5/maps/boardwalk_floor.jpg', None, 150), - 1100: ('phase_3.5/maps/dustroad.jpg', None, 150), - 1110: ('phase_5.5/maps/floor_woodtile_neutral.jpg', CTBasicWoodColorOnWhite, 150), - 1120: ('phase_5.5/maps/floor_tile_neutral.jpg', CTBasicWoodColorOnWhite + CTFlatColorDark, 150), - 1130: ('phase_5.5/maps/floor_tile_honeycomb_neutral.jpg', CTBasicWoodColorOnWhite, 150), - 1140: ('phase_5.5/maps/UWwaterFloor1.jpg', None, 150), - 1150: ('phase_5.5/maps/UWtileFloor4.jpg', None, 150), - 1160: ('phase_5.5/maps/UWtileFloor3.jpg', None, 150), - 1170: ('phase_5.5/maps/UWtileFloor2.jpg', None, 150), - 1180: ('phase_5.5/maps/UWtileFloor1.jpg', None, 150), - 1190: ('phase_5.5/maps/UWsandyFloor1.jpg', None, 150), - 10000: ('phase_5.5/maps/floor_icecube.jpg', CTWhite, 225), - 10010: ('phase_5.5/maps/floor_snow.jpg', CTWhite, 225), - 11000: ('phase_5.5/maps/StPatsFloor1.jpg', CTWhite, 225), - 11010: ('phase_5.5/maps/StPatsFloor2.jpg', CTWhite, 225)} +FlooringTypes = {1000: ('phase_5.5/maps/floor_wood_neutral.png', CTBasicWoodColorOnWhite, 150), + 1010: ('phase_5.5/maps/flooring_carpetA_neutral.png', CTFlatColorDark, 150), + 1020: ('phase_4/maps/flooring_tile_neutral.png', CTFlatColorDark, 150), + 1030: ('phase_5.5/maps/flooring_tileB2.png', None, 150), + 1040: ('phase_4/maps/grass.png', None, 150), + 1050: ('phase_4/maps/floor_tile_brick_diagonal2.png', None, 150), + 1060: ('phase_4/maps/floor_tile_brick_diagonal.png', None, 150), + 1070: ('phase_4/maps/plazz_tile.png', None, 150), + 1080: ('phase_4/maps/sidewalk.png', CTFlatColorDark, 150), + 1090: ('phase_3.5/maps/boardwalk_floor.png', None, 150), + 1100: ('phase_3.5/maps/dustroad.png', None, 150), + 1110: ('phase_5.5/maps/floor_woodtile_neutral.png', CTBasicWoodColorOnWhite, 150), + 1120: ('phase_5.5/maps/floor_tile_neutral.png', CTBasicWoodColorOnWhite + CTFlatColorDark, 150), + 1130: ('phase_5.5/maps/floor_tile_honeycomb_neutral.png', CTBasicWoodColorOnWhite, 150), + 1140: ('phase_5.5/maps/UWwaterFloor1.png', None, 150), + 1150: ('phase_5.5/maps/UWtileFloor4.png', None, 150), + 1160: ('phase_5.5/maps/UWtileFloor3.png', None, 150), + 1170: ('phase_5.5/maps/UWtileFloor2.png', None, 150), + 1180: ('phase_5.5/maps/UWtileFloor1.png', None, 150), + 1190: ('phase_5.5/maps/UWsandyFloor1.png', None, 150), + 10000: ('phase_5.5/maps/floor_icecube.png', CTWhite, 225), + 10010: ('phase_5.5/maps/floor_snow.png', CTWhite, 225), + 11000: ('phase_5.5/maps/StPatsFloor1.png', CTWhite, 225), + 11010: ('phase_5.5/maps/StPatsFloor2.png', CTWhite, 225)} class CatalogFlooringItem(CatalogSurfaceItem): diff --git a/toontown/catalog/CatalogMouldingItem.py b/toontown/catalog/CatalogMouldingItem.py index ca976d0..e3e3349 100644 --- a/toontown/catalog/CatalogMouldingItem.py +++ b/toontown/catalog/CatalogMouldingItem.py @@ -2,20 +2,20 @@ from .CatalogSurfaceItem import * MTTextureName = 0 MTColor = 1 MTBasePrice = 2 -MouldingTypes = {1000: ('phase_3.5/maps/molding_wood1.jpg', CTBasicWoodColorOnWhite, 150), - 1010: ('phase_5.5/maps/bd_grey_border1.jpg', CTFlatColorDark, 150), - 1020: ('phase_5.5/maps/dental_Border_wood_neutral.jpg', CTFlatColorDark, 150), - 1030: ('phase_5.5/maps/littleFlowers_border.jpg', CTWhite, 150), - 1040: ('phase_5.5/maps/littleFlowers_border_neutral.jpg', CTFlatColorDark, 150), - 1050: ('phase_5.5/maps/ladybugs2_Border.jpg', CTFlatColorDark, 150), - 1060: ('phase_5.5/maps/bd_grey_border1.jpg', CTValentinesColors, 150), - 1070: ('phase_5.5/maps/bd_grey_border1.jpg', CTUnderwaterColors, 150), - 1080: ('phase_5.5/maps/tt_t_ara_int_border_winterLights1.jpg', CTWhite, 150), - 1085: ('phase_5.5/maps/tt_t_ara_int_border_winterLights2.jpg', CTWhite, 150), - 1090: ('phase_5.5/maps/tt_t_ara_int_border_winterLights3.jpg', CTWhite, 150), - 1100: ('phase_5.5/maps/tt_t_ara_int_border_valentine_cupid.jpg', CTWhite, 150), - 1110: ('phase_5.5/maps/tt_t_ara_int_border_valentine_heart1.jpg', CTWhite, 150), - 1120: ('phase_5.5/maps/tt_t_ara_int_border_valentine_heart2.jpg', CTWhite, 150)} +MouldingTypes = {1000: ('phase_3.5/maps/molding_wood1.png', CTBasicWoodColorOnWhite, 150), + 1010: ('phase_5.5/maps/bd_grey_border1.png', CTFlatColorDark, 150), + 1020: ('phase_5.5/maps/dental_Border_wood_neutral.png', CTFlatColorDark, 150), + 1030: ('phase_5.5/maps/littleFlowers_border.png', CTWhite, 150), + 1040: ('phase_5.5/maps/littleFlowers_border_neutral.png', CTFlatColorDark, 150), + 1050: ('phase_5.5/maps/ladybugs2_Border.png', CTFlatColorDark, 150), + 1060: ('phase_5.5/maps/bd_grey_border1.png', CTValentinesColors, 150), + 1070: ('phase_5.5/maps/bd_grey_border1.png', CTUnderwaterColors, 150), + 1080: ('phase_5.5/maps/tt_t_ara_int_border_winterLights1.png', CTWhite, 150), + 1085: ('phase_5.5/maps/tt_t_ara_int_border_winterLights2.png', CTWhite, 150), + 1090: ('phase_5.5/maps/tt_t_ara_int_border_winterLights3.png', CTWhite, 150), + 1100: ('phase_5.5/maps/tt_t_ara_int_border_valentine_cupid.png', CTWhite, 150), + 1110: ('phase_5.5/maps/tt_t_ara_int_border_valentine_heart1.png', CTWhite, 150), + 1120: ('phase_5.5/maps/tt_t_ara_int_border_valentine_heart2.png', CTWhite, 150)} class CatalogMouldingItem(CatalogSurfaceItem): diff --git a/toontown/catalog/CatalogWainscotingItem.py b/toontown/catalog/CatalogWainscotingItem.py index b6b9cad..e86b801 100644 --- a/toontown/catalog/CatalogWainscotingItem.py +++ b/toontown/catalog/CatalogWainscotingItem.py @@ -2,11 +2,11 @@ from .CatalogSurfaceItem import * WSTTextureName = 0 WSTColor = 1 WSTBasePrice = 2 -WainscotingTypes = {1000: ('phase_3.5/maps/wall_paper_b3.jpg', CTFlatColorDark, 200), - 1010: ('phase_5.5/maps/wall_paper_b4_greyscale.jpg', CTBasicWoodColorOnWhite, 200), - 1020: ('phase_5.5/maps/wainscotings_neutral.jpg', CTBasicWoodColorOnWhite, 200), - 1030: ('phase_3.5/maps/wall_paper_b3.jpg', CTValentinesColors, 200), - 1040: ('phase_3.5/maps/wall_paper_b3.jpg', CTUnderwaterColors, 200)} +WainscotingTypes = {1000: ('phase_3.5/maps/wall_paper_b3.png', CTFlatColorDark, 200), + 1010: ('phase_5.5/maps/wall_paper_b4_greyscale.png', CTBasicWoodColorOnWhite, 200), + 1020: ('phase_5.5/maps/wainscotings_neutral.png', CTBasicWoodColorOnWhite, 200), + 1030: ('phase_3.5/maps/wall_paper_b3.png', CTValentinesColors, 200), + 1040: ('phase_3.5/maps/wall_paper_b3.png', CTUnderwaterColors, 200)} class CatalogWainscotingItem(CatalogSurfaceItem): diff --git a/toontown/catalog/CatalogWallpaperItem.py b/toontown/catalog/CatalogWallpaperItem.py index fd0f107..1659e6e 100644 --- a/toontown/catalog/CatalogWallpaperItem.py +++ b/toontown/catalog/CatalogWallpaperItem.py @@ -13,242 +13,242 @@ All = (1000, 1050, 1060, 1070) -WallpaperTypes = {1000: ('phase_5.5/maps/flat_wallpaper1.jpg', +WallpaperTypes = {1000: ('phase_5.5/maps/flat_wallpaper1.png', CTFlatColor, (0, 1000), 180), - 1100: ('phase_5.5/maps/big_stripes1.jpg', + 1100: ('phase_5.5/maps/big_stripes1.png', CTWhite, (0, 1010), 180), - 1110: ('phase_5.5/maps/big_stripes2.jpg', + 1110: ('phase_5.5/maps/big_stripes2.png', CTWhite, (0, 1040), 180), - 1120: ('phase_5.5/maps/big_stripes3.jpg', + 1120: ('phase_5.5/maps/big_stripes3.png', CTWhite, (0, 1030), 180), - 1130: ('phase_5.5/maps/big_stripes4.jpg', + 1130: ('phase_5.5/maps/big_stripes4.png', CTWhite, (0, 1010), 180), - 1140: ('phase_5.5/maps/big_stripes5.jpg', + 1140: ('phase_5.5/maps/big_stripes5.png', CTWhite, (0, 1020), 180), - 1150: ('phase_5.5/maps/big_stripes6.jpg', + 1150: ('phase_5.5/maps/big_stripes6.png', CTWhite, (0, 1020), 180), - 1200: ('phase_5.5/maps/stripeB1.jpg', + 1200: ('phase_5.5/maps/stripeB1.png', CTWhite, (0, 1000), 180), - 1210: ('phase_5.5/maps/stripeB2.jpg', + 1210: ('phase_5.5/maps/stripeB2.png', CTWhite, (0, 1000), 180), - 1220: ('phase_5.5/maps/stripeB3.jpg', + 1220: ('phase_5.5/maps/stripeB3.png', CTWhite, (0, 1000), 180), - 1230: ('phase_5.5/maps/stripeB4.jpg', + 1230: ('phase_5.5/maps/stripeB4.png', CTWhite, (0, 1000), 180), - 1240: ('phase_3.5/maps/stripeB5.jpg', + 1240: ('phase_3.5/maps/stripeB5.png', CTWhite, (0, 1000), 180), - 1250: ('phase_5.5/maps/stripeB6.jpg', + 1250: ('phase_5.5/maps/stripeB6.png', CTWhite, (0, 1000), 180), - 1260: ('phase_5.5/maps/stripeB7.jpg', + 1260: ('phase_5.5/maps/stripeB7.png', CTWhite, (0, 1000), 180), - 1300: ('phase_5.5/maps/squiggle1.jpg', + 1300: ('phase_5.5/maps/squiggle1.png', CTWhite, (0,), 180), - 1310: ('phase_5.5/maps/squiggle2.jpg', + 1310: ('phase_5.5/maps/squiggle2.png', CTWhite, (0,), 180), - 1320: ('phase_5.5/maps/squiggle3.jpg', + 1320: ('phase_5.5/maps/squiggle3.png', CTWhite, (0,), 180), - 1330: ('phase_5.5/maps/squiggle4.jpg', + 1330: ('phase_5.5/maps/squiggle4.png', CTWhite, (0,), 180), - 1340: ('phase_5.5/maps/squiggle5.jpg', + 1340: ('phase_5.5/maps/squiggle5.png', CTWhite, (0,), 180), - 1350: ('phase_5.5/maps/squiggle6.jpg', + 1350: ('phase_5.5/maps/squiggle6.png', CTWhite, (0,), 180), - 1400: ('phase_5.5/maps/stripes_cyan.jpg', + 1400: ('phase_5.5/maps/stripes_cyan.png', CTWhite, (0, 1000), 180), - 1410: ('phase_5.5/maps/stripes_green.jpg', + 1410: ('phase_5.5/maps/stripes_green.png', CTWhite, (0, 1000), 180), - 1420: ('phase_5.5/maps/stripes_magenta.jpg', + 1420: ('phase_5.5/maps/stripes_magenta.png', CTWhite, (0, 1000), 180), - 1430: ('phase_5.5/maps/two_stripes1.jpg', + 1430: ('phase_5.5/maps/two_stripes1.png', CTWhite, (0, 1000), 180), - 1440: ('phase_5.5/maps/two_stripes2.jpg', + 1440: ('phase_5.5/maps/two_stripes2.png', CTWhite, (0, 1000), 180), - 1450: ('phase_5.5/maps/two_stripes3.jpg', + 1450: ('phase_5.5/maps/two_stripes3.png', CTWhite, (0, 1000), 180), - 1500: ('phase_5.5/maps/leaves1.jpg', + 1500: ('phase_5.5/maps/leaves1.png', CTWhite, (0,), 180), - 1510: ('phase_5.5/maps/leaves2.jpg', + 1510: ('phase_5.5/maps/leaves2.png', CTWhite, (0,), 180), - 1520: ('phase_5.5/maps/leaves3.jpg', + 1520: ('phase_5.5/maps/leaves3.png', CTWhite, (0,), 180), - 1600: ('phase_5.5/maps/diamonds2_cherries.jpg', + 1600: ('phase_5.5/maps/diamonds2_cherries.png', CTWhite, (0, 1000), 180), - 1610: ('phase_5.5/maps/diamonds3_cherries.jpg', + 1610: ('phase_5.5/maps/diamonds3_cherries.png', CTWhite, (0, 1000), 180), - 1620: ('phase_5.5/maps/diamonds3_cherry.jpg', + 1620: ('phase_5.5/maps/diamonds3_cherry.png', CTWhite, (0, 1000), 180), - 1630: ('phase_5.5/maps/diamonds4_cherries.jpg', + 1630: ('phase_5.5/maps/diamonds4_cherries.png', CTWhite, (0, 1000), 180), - 1640: ('phase_5.5/maps/diamonds4_cherry.jpg', + 1640: ('phase_5.5/maps/diamonds4_cherry.png', CTWhite, (0, 1000), 180), - 1650: ('phase_5.5/maps/diamonds5_cherries.jpg', + 1650: ('phase_5.5/maps/diamonds5_cherries.png', CTWhite, (0, 1000), 180), - 1660: ('phase_5.5/maps/diamonds6_cherry.jpg', + 1660: ('phase_5.5/maps/diamonds6_cherry.png', CTWhite, (0, 1000), 180), - 1700: ('phase_5.5/maps/moon1.jpg', + 1700: ('phase_5.5/maps/moon1.png', CTWhite, (0,), 180), - 1710: ('phase_5.5/maps/moon2.jpg', + 1710: ('phase_5.5/maps/moon2.png', CTWhite, (0,), 180), - 1720: ('phase_5.5/maps/moon3.jpg', + 1720: ('phase_5.5/maps/moon3.png', CTWhite, (0,), 180), - 1730: ('phase_5.5/maps/moon4.jpg', + 1730: ('phase_5.5/maps/moon4.png', CTWhite, (0,), 180), - 1740: ('phase_5.5/maps/moon5.jpg', + 1740: ('phase_5.5/maps/moon5.png', CTWhite, (0,), 180), - 1750: ('phase_5.5/maps/moon6.jpg', + 1750: ('phase_5.5/maps/moon6.png', CTWhite, (0,), 180), - 1760: ('phase_5.5/maps/moon7.jpg', + 1760: ('phase_5.5/maps/moon7.png', CTWhite, (0,), 180), - 1800: ('phase_5.5/maps/stars1.jpg', + 1800: ('phase_5.5/maps/stars1.png', CTWhite, (0,), 180), - 1810: ('phase_5.5/maps/stars2.jpg', + 1810: ('phase_5.5/maps/stars2.png', (CT_BLUE2, CT_PINK2, CT_RED), (0,), 180), - 1820: ('phase_5.5/maps/stars3.jpg', + 1820: ('phase_5.5/maps/stars3.png', (CT_BLUE2, CT_PINK2, CT_RED, CT_WHITE), (0,), 180), - 1830: ('phase_5.5/maps/stars4.jpg', + 1830: ('phase_5.5/maps/stars4.png', CTWhite, (0,), 180), - 1840: ('phase_5.5/maps/stars5.jpg', + 1840: ('phase_5.5/maps/stars5.png', CTWhite, (0,), 180), - 1850: ('phase_5.5/maps/stars6.jpg', + 1850: ('phase_5.5/maps/stars6.png', CTWhite, (0,), 180), - 1860: ('phase_5.5/maps/stars7.jpg', + 1860: ('phase_5.5/maps/stars7.png', (CT_BEIGE2, CT_WHITE), (0,), 180), - 1900: ('phase_5.5/maps/wall_paper_flower1.jpg', + 1900: ('phase_5.5/maps/wall_paper_flower1.png', CTWhite, (0, 1000), 180), - 1910: ('phase_5.5/maps/wall_paper_flower2.jpg', + 1910: ('phase_5.5/maps/wall_paper_flower2.png', CTWhite, (0, 1000), 180), - 1920: ('phase_5.5/maps/wall_paper_flower3.jpg', + 1920: ('phase_5.5/maps/wall_paper_flower3.png', CTWhite, (0, 1000), 180), - 1930: ('phase_5.5/maps/wall_paper_flower4.jpg', + 1930: ('phase_5.5/maps/wall_paper_flower4.png', CTWhite, (0, 1000), 180), - 1940: ('phase_5.5/maps/wall_paper_flower5.jpg', + 1940: ('phase_5.5/maps/wall_paper_flower5.png', CTWhite, (0, 1000), 180), - 1950: ('phase_5.5/maps/wall_paper_flower6.jpg', + 1950: ('phase_5.5/maps/wall_paper_flower6.png', CTWhite, (0, 1000), 180), - 2000: ('phase_5.5/maps/flat_wallpaper1.jpg', + 2000: ('phase_5.5/maps/flat_wallpaper1.png', (CT_BEIGE, CT_BEIGE2, CT_RED), (1050,), 180), - 2010: ('phase_5.5/maps/flat_wallpaper1.jpg', + 2010: ('phase_5.5/maps/flat_wallpaper1.png', (CT_BLUE2, CT_PINK2), (1060,), 180), - 2020: ('phase_5.5/maps/flat_wallpaper1.jpg', + 2020: ('phase_5.5/maps/flat_wallpaper1.png', (CT_BEIGE2, CT_BLUE2, CT_PINK2, @@ -256,207 +256,207 @@ WallpaperTypes = {1000: ('phase_5.5/maps/flat_wallpaper1.jpg', CT_RED), (1070,), 180), - 2100: ('phase_5.5/maps/big_stripes1.jpg', + 2100: ('phase_5.5/maps/big_stripes1.png', CTWhite, (1050,), 180), - 2110: ('phase_5.5/maps/big_stripes2.jpg', + 2110: ('phase_5.5/maps/big_stripes2.png', CTWhite, (1050,), 180), - 2120: ('phase_5.5/maps/big_stripes3.jpg', + 2120: ('phase_5.5/maps/big_stripes3.png', CTWhite, (1060,), 180), - 2130: ('phase_5.5/maps/big_stripes3.jpg', + 2130: ('phase_5.5/maps/big_stripes3.png', CTWhite, (1070,), 180), - 2140: ('phase_5.5/maps/big_stripes6.jpg', + 2140: ('phase_5.5/maps/big_stripes6.png', CTWhite, (1070,), 180), - 2200: ('phase_5.5/maps/wall_paper_car.jpg', + 2200: ('phase_5.5/maps/wall_paper_car.png', CTWhite, (0, 1000), 180), - 2210: ('phase_5.5/maps/wall_paper_car_neutral.jpg', + 2210: ('phase_5.5/maps/wall_paper_car_neutral.png', CTFlatColor, (0, 1000), 180), - 2300: ('phase_5.5/maps/wall_paper_football_neutral.jpg', + 2300: ('phase_5.5/maps/wall_paper_football_neutral.png', CTFlatColor, (0, 1080), 180), - 2400: ('phase_5.5/maps/wall_paper_clouds.jpg', + 2400: ('phase_5.5/maps/wall_paper_clouds.png', CTWhite, (0, 1000), 180), - 2500: ('phase_5.5/maps/wall_paper_vine_neutral.jpg', + 2500: ('phase_5.5/maps/wall_paper_vine_neutral.png', CTFlatColorAll, (0, 1090), 180), - 2600: ('phase_5.5/maps/basket.jpg', + 2600: ('phase_5.5/maps/basket.png', CTWhite, (0, 1000), 180), - 2610: ('phase_5.5/maps/basket_neutral.jpg', + 2610: ('phase_5.5/maps/basket_neutral.png', CTFlatColor, (0, 1000), 180), - 2700: ('phase_5.5/maps/doll.jpg', + 2700: ('phase_5.5/maps/doll.png', CTWhite, (0, 1000, 1110), 180), - 2710: ('phase_5.5/maps/doll_neutral.jpg', + 2710: ('phase_5.5/maps/doll_neutral.png', CTFlatColor, (0, 1100, 1110), 180), - 2800: ('phase_5.5/maps/littleFlowers.jpg', + 2800: ('phase_5.5/maps/littleFlowers.png', CTWhite, (0, 1000), 180), - 2810: ('phase_5.5/maps/littleFlowers_neutral.jpg', + 2810: ('phase_5.5/maps/littleFlowers_neutral.png', CTFlatColor, (0, 1000), 180), - 2900: ('phase_5.5/maps/UWwallPaperAngelFish.jpg', + 2900: ('phase_5.5/maps/UWwallPaperAngelFish.png', CTWhite, (0, 1120, 1160), 180), - 2910: ('phase_5.5/maps/UWwallPaperAngelFishColor.jpg', + 2910: ('phase_5.5/maps/UWwallPaperAngelFishColor.png', CTWhite, (0, 1120, 1160), 180), - 2920: ('phase_5.5/maps/UWwallPaperBubbles.jpg', + 2920: ('phase_5.5/maps/UWwallPaperBubbles.png', CTWhite, (0, 1120, 1160), 180), - 2930: ('phase_5.5/maps/UWwallPaperBubbles2.jpg', + 2930: ('phase_5.5/maps/UWwallPaperBubbles2.png', CTWhite, (0, 1120, 1160), 180), - 2940: ('phase_5.5/maps/UWwallPaperGreenFish.jpg', + 2940: ('phase_5.5/maps/UWwallPaperGreenFish.png', CTWhite, (0, 1120, 1160), 180), - 2950: ('phase_5.5/maps/UWwallPaperRedFish.jpg', + 2950: ('phase_5.5/maps/UWwallPaperRedFish.png', CTWhite, (0, 1120, 1160), 180), - 2960: ('phase_5.5/maps/UWwallPaperSea_horse.jpg', + 2960: ('phase_5.5/maps/UWwallPaperSea_horse.png', CTWhite, (0, 1120, 1160), 180), - 2970: ('phase_5.5/maps/UWwallPaperShells.jpg', + 2970: ('phase_5.5/maps/UWwallPaperShells.png', CTWhite, (0, 1140, 1150), 180), - 2980: ('phase_5.5/maps/UWwaterFloor1.jpg', + 2980: ('phase_5.5/maps/UWwaterFloor1.png', (CT_WHITE, CT_PALE_GREEN, CT_LIGHT_BLUE), (0,), 180), - 3000: ('phase_5.5/maps/UWwallPaperBubbles.jpg', + 3000: ('phase_5.5/maps/UWwallPaperBubbles.png', CTWhite, (0, 1120, 1160), 180), - 3100: ('phase_5.5/maps/UWwallPaperBubbles2.jpg', + 3100: ('phase_5.5/maps/UWwallPaperBubbles2.png', CTWhite, (0, 1120, 1160), 180), - 3200: ('phase_5.5/maps/UWwallPaperGreenFish.jpg', + 3200: ('phase_5.5/maps/UWwallPaperGreenFish.png', CTWhite, (0, 1120, 1160), 180), - 3300: ('phase_5.5/maps/UWwallPaperRedFish.jpg', + 3300: ('phase_5.5/maps/UWwallPaperRedFish.png', CTWhite, (0, 1120, 1160), 180), - 3400: ('phase_5.5/maps/UWwallPaperSea_horse.jpg', + 3400: ('phase_5.5/maps/UWwallPaperSea_horse.png', CTWhite, (0, 1120, 1160), 180), - 3500: ('phase_5.5/maps/UWwallPaperShells.jpg', + 3500: ('phase_5.5/maps/UWwallPaperShells.png', (CT_WHITE, CT_SEA_GREEN, CT_LIGHT_BLUE), (0, 1140, 1150), 180), - 3600: ('phase_5.5/maps/UWwaterFloor1.jpg', + 3600: ('phase_5.5/maps/UWwaterFloor1.png', (CT_WHITE, CT_PALE_GREEN, CT_LIGHT_BLUE), (0,), 180), - 3700: ('phase_5.5/maps/WesternBootWallpaper1.jpg', + 3700: ('phase_5.5/maps/WesternBootWallpaper1.png', CTWhite, (0, 1170, 1180), 180), - 3800: ('phase_5.5/maps/WesternCactusWallpaper1.jpg', + 3800: ('phase_5.5/maps/WesternCactusWallpaper1.png', CTWhite, (0, 1170, 1180), 180), - 3900: ('phase_5.5/maps/WesternHatWallpaper1.jpg', + 3900: ('phase_5.5/maps/WesternHatWallpaper1.png', CTWhite, (0, 1170, 1180), 180), - 10100: ('phase_5.5/maps/cats1.jpg', + 10100: ('phase_5.5/maps/cats1.png', CTWhite, (0, 10010, 10020), 400), - 10200: ('phase_5.5/maps/bats2.jpg', + 10200: ('phase_5.5/maps/bats2.png', CTWhite, (0, 10010, 10020), 400), - 11000: ('phase_5.5/maps/wall_paper_snowflakes.jpg', + 11000: ('phase_5.5/maps/wall_paper_snowflakes.png', CTWhite, (0, 11000, 11010), 400), - 11100: ('phase_5.5/maps/wall_paper_hollyleaf.jpg', + 11100: ('phase_5.5/maps/wall_paper_hollyleaf.png', CTWhite, (0, 11000, 11010), 400), - 11200: ('phase_5.5/maps/wall_paper_snowman.jpg', + 11200: ('phase_5.5/maps/wall_paper_snowman.png', CTWhite, (0, 11000, 11010), 400), - 12000: ('phase_5.5/maps/VdayWall1.jpg', + 12000: ('phase_5.5/maps/VdayWall1.png', CTWhite, (0, 12000, 12010, 12020), 400), - 12100: ('phase_5.5/maps/VdayWall2.jpg', + 12100: ('phase_5.5/maps/VdayWall2.png', CTWhite, (0, 12000, 12010, 12020), 400), - 12200: ('phase_5.5/maps/VdayWall3.jpg', + 12200: ('phase_5.5/maps/VdayWall3.png', CTWhite, (0, 12000, 12010, 12020), 400), - 12300: ('phase_5.5/maps/VdayWall4.jpg', + 12300: ('phase_5.5/maps/VdayWall4.png', CTWhite, (0, 12000, 12010, 12020), 400), - 13000: ('phase_5.5/maps/StPatWallpaper1.jpg', + 13000: ('phase_5.5/maps/StPatWallpaper1.png', CTWhite, (0, 13000), 400), - 13100: ('phase_5.5/maps/StPatWallpaper2.jpg', + 13100: ('phase_5.5/maps/StPatWallpaper2.png', CTWhite, (0, 13000), 400), - 13200: ('phase_5.5/maps/StPatWallpaper3.jpg', + 13200: ('phase_5.5/maps/StPatWallpaper3.png', CTWhite, (0, 13000), 400), - 13300: ('phase_5.5/maps/StPatWallpaper4.jpg', + 13300: ('phase_5.5/maps/StPatWallpaper4.png', CTWhite, (0, 13000), 400)} @@ -524,33 +524,33 @@ WallpaperGroups = {1100: (1100, 2700: (2700, 2710), 2800: (2800, 2810), 2900: (2900, 2910)} -BorderTypes = {1000: ('phase_5.5/maps/bd_grey_border1.jpg', CTFlatColorDark), - 1010: ('phase_5.5/maps/diamonds_border2.jpg', CTWhite), - 1020: ('phase_5.5/maps/diamonds_border2ch.jpg', CTWhite), - 1030: ('phase_5.5/maps/diamonds_border3ch.jpg', CTWhite), - 1040: ('phase_5.5/maps/diamonds_border4ch.jpg', CTWhite), - 1050: ('phase_5.5/maps/flower_border2.jpg', CTWhite), - 1060: ('phase_5.5/maps/flower_border5.jpg', CTWhite), - 1070: ('phase_5.5/maps/flower_border6.jpg', CTWhite), - 1080: ('phase_5.5/maps/football_border_neutral.jpg', CTFlatColorDark), - 1090: ('phase_5.5/maps/vine_border1.jpg', CTFlatColorDark), - 1100: ('phase_5.5/maps/doll_board.jpg', CTWhite), - 1110: ('phase_5.5/maps/doll_board_neutral.jpg', CTFlatColorDark), - 1120: ('phase_5.5/maps/UWwallPaperPlantBorder.jpg', CTWhite), - 1130: ('phase_5.5/maps/UWwallPaperSea_horseBorder.jpg', CTWhite), - 1140: ('phase_5.5/maps/UWwallPaperShellBorder1.jpg', CTWhite), - 1150: ('phase_5.5/maps/UWwallPaperShellBorder2.jpg', CTWhite), - 1160: ('phase_5.5/maps/UWwallPaperWaveBorder.jpg', CTWhite), - 1170: ('phase_5.5/maps/WesternSkullBorder.jpg', CTWhite), - 1180: ('phase_5.5/maps/WesternStarBorder.jpg', CTWhite), - 10010: ('phase_5.5/maps/border_ScarryMoon1.jpg', CTWhite), - 10020: ('phase_5.5/maps/border_candy1.jpg', CTWhite), - 11000: ('phase_5.5/maps/flakes_border.jpg', CTWhite), - 11010: ('phase_5.5/maps/hollyleaf_border.jpg', CTWhite), - 12000: ('phase_5.5/maps/Vborder1a.jpg', CTWhite), - 12010: ('phase_5.5/maps/Vborder1b.jpg', CTWhite), - 12020: ('phase_5.5/maps/Vborder2b.jpg', CTWhite), - 13000: ('phase_5.5/maps/StPatBorder1.jpg', CTWhite)} +BorderTypes = {1000: ('phase_5.5/maps/bd_grey_border1.png', CTFlatColorDark), + 1010: ('phase_5.5/maps/diamonds_border2.png', CTWhite), + 1020: ('phase_5.5/maps/diamonds_border2ch.png', CTWhite), + 1030: ('phase_5.5/maps/diamonds_border3ch.png', CTWhite), + 1040: ('phase_5.5/maps/diamonds_border4ch.png', CTWhite), + 1050: ('phase_5.5/maps/flower_border2.png', CTWhite), + 1060: ('phase_5.5/maps/flower_border5.png', CTWhite), + 1070: ('phase_5.5/maps/flower_border6.png', CTWhite), + 1080: ('phase_5.5/maps/football_border_neutral.png', CTFlatColorDark), + 1090: ('phase_5.5/maps/vine_border1.png', CTFlatColorDark), + 1100: ('phase_5.5/maps/doll_board.png', CTWhite), + 1110: ('phase_5.5/maps/doll_board_neutral.png', CTFlatColorDark), + 1120: ('phase_5.5/maps/UWwallPaperPlantBorder.png', CTWhite), + 1130: ('phase_5.5/maps/UWwallPaperSea_horseBorder.png', CTWhite), + 1140: ('phase_5.5/maps/UWwallPaperShellBorder1.png', CTWhite), + 1150: ('phase_5.5/maps/UWwallPaperShellBorder2.png', CTWhite), + 1160: ('phase_5.5/maps/UWwallPaperWaveBorder.png', CTWhite), + 1170: ('phase_5.5/maps/WesternSkullBorder.png', CTWhite), + 1180: ('phase_5.5/maps/WesternStarBorder.png', CTWhite), + 10010: ('phase_5.5/maps/border_ScarryMoon1.png', CTWhite), + 10020: ('phase_5.5/maps/border_candy1.png', CTWhite), + 11000: ('phase_5.5/maps/flakes_border.png', CTWhite), + 11010: ('phase_5.5/maps/hollyleaf_border.png', CTWhite), + 12000: ('phase_5.5/maps/Vborder1a.png', CTWhite), + 12010: ('phase_5.5/maps/Vborder1b.png', CTWhite), + 12020: ('phase_5.5/maps/Vborder2b.png', CTWhite), + 13000: ('phase_5.5/maps/StPatBorder1.png', CTWhite)} class CatalogWallpaperItem(CatalogSurfaceItem): diff --git a/toontown/char/Char.py b/toontown/char/Char.py index 1af94f2..7403948 100644 --- a/toontown/char/Char.py +++ b/toontown/char/Char.py @@ -252,8 +252,8 @@ class Char(Avatar.Avatar): self.eyesOpen = None self.eyesClosed = None if self._name == 'mickey' or self._name == 'minnie': - self.eyesOpen = loader.loadTexture('phase_3/maps/eyes1.jpg', 'phase_3/maps/eyes1_a.rgb') - self.eyesClosed = loader.loadTexture('phase_3/maps/mickey_eyes_closed.jpg', 'phase_3/maps/mickey_eyes_closed_a.rgb') + self.eyesOpen = loader.loadTexture('phase_3/maps/eyes1.png') + self.eyesClosed = loader.loadTexture('phase_3/maps/mickey_eyes_closed.png') self.eyes = self.find('**/1200/**/eyes') self.eyes.setBin('transparent', 0) self.lpupil = self.find('**/1200/**/joint_pupilL') @@ -285,8 +285,8 @@ class Char(Avatar.Avatar): part.hide() elif self._name == 'pluto': - self.eyesOpen = loader.loadTexture('phase_6/maps/plutoEyesOpen.jpg', 'phase_6/maps/plutoEyesOpen_a.rgb') - self.eyesClosed = loader.loadTexture('phase_6/maps/plutoEyesClosed.jpg', 'phase_6/maps/plutoEyesClosed_a.rgb') + self.eyesOpen = loader.loadTexture('phase_6/maps/plutoEyesOpen.png') + self.eyesClosed = loader.loadTexture('phase_6/maps/plutoEyesClosed.png') self.eyes = self.find('**/1000/**/eyes') self.lpupil = self.find('**/1000/**/joint_pupilL') self.rpupil = self.find('**/1000/**/joint_pupilR') @@ -317,8 +317,8 @@ class Char(Avatar.Avatar): self.rpupil = self.find('**/joint_pupilR') self.drawInFront('joint_pupil?', 'eyes*', -3) elif self._name == 'chip' or self._name == 'dale': - self.eyesOpen = loader.loadTexture('phase_6/maps/dale_eye1.jpg', 'phase_6/maps/dale_eye1_a.rgb') - self.eyesClosed = loader.loadTexture('phase_6/maps/chip_dale_eye1_blink.jpg', 'phase_6/maps/chip_dale_eye1_blink_a.rgb') + self.eyesOpen = loader.loadTexture('phase_6/maps/dale_eye1.png') + self.eyesClosed = loader.loadTexture('phase_6/maps/chip_dale_eye1_blink.png') self.eyes = self.find('**/eyes') self.lpupil = self.find('**/pupil_left') self.rpupil = self.find('**/pupil_right') diff --git a/toontown/cogdominium/DistributedCogdoBarrel.py b/toontown/cogdominium/DistributedCogdoBarrel.py index d6c5c20..f62cc59 100644 --- a/toontown/cogdominium/DistributedCogdoBarrel.py +++ b/toontown/cogdominium/DistributedCogdoBarrel.py @@ -34,8 +34,8 @@ class DistributedCogdoBarrel(DistributedObject.DistributedObject): cogdoBarrelsNode = render.attachNewNode('CogdoBarrels') cogdoBarrelsNode.stash() self.model.reparentTo(cogdoBarrelsNode) - self.availableTex = loader.loadTexture('phase_5/maps/tt_t_ara_cbr_Barrel_notUsed.jpg') - self.usedTex = loader.loadTexture('phase_5/maps/tt_t_ara_cbr_Barrel_Used.jpg') + self.availableTex = loader.loadTexture('phase_5/maps/tt_t_ara_cbr_Barrel_notUsed.png') + self.usedTex = loader.loadTexture('phase_5/maps/tt_t_ara_cbr_Barrel_Used.png') self.model.setTexture(self.availableTex, 100) def __addCollision(self): diff --git a/toontown/estate/DistributedToonStatuary.py b/toontown/estate/DistributedToonStatuary.py index c3e5264..8542b50 100644 --- a/toontown/estate/DistributedToonStatuary.py +++ b/toontown/estate/DistributedToonStatuary.py @@ -98,10 +98,10 @@ class DistributedToonStatuary(DistributedStatuary.DistributedStatuary): for node in self.toon.findAllMatches('**/*'): node.setState(RenderState.makeEmpty()) - desatShirtTex = loader.loadTexture('phase_3/maps/desat_shirt_1.jpg') - desatSleeveTex = loader.loadTexture('phase_3/maps/desat_sleeve_1.jpg') - desatShortsTex = loader.loadTexture('phase_3/maps/desat_shorts_1.jpg') - desatSkirtTex = loader.loadTexture('phase_3/maps/desat_skirt_1.jpg') + desatShirtTex = loader.loadTexture('phase_3/maps/desat_shirt_1.png') + desatSleeveTex = loader.loadTexture('phase_3/maps/desat_sleeve_1.png') + desatShortsTex = loader.loadTexture('phase_3/maps/desat_shorts_1.png') + desatSkirtTex = loader.loadTexture('phase_3/maps/desat_skirt_1.png') if self.toon.hasLOD(): for lodName in self.toon.getLODNames(): torso = self.toon.getPart('torso', lodName) @@ -123,7 +123,7 @@ class DistributedToonStatuary(DistributedStatuary.DistributedStatuary): def setStoneTexture(self): gray = VBase4(1.6, 1.6, 1.6, 1) self.toon.setColor(gray, 10) - stoneTex = loader.loadTexture('phase_5.5/maps/smoothwall_1.jpg') + stoneTex = loader.loadTexture('phase_5.5/maps/smoothwall_1.png') ts = TextureStage('ts') ts.setPriority(1) self.toon.setTexture(ts, stoneTex) diff --git a/toontown/hood/StreetSign.py b/toontown/hood/StreetSign.py index a0fec90..f92e2c8 100644 --- a/toontown/hood/StreetSign.py +++ b/toontown/hood/StreetSign.py @@ -9,7 +9,7 @@ from toontown.toonbase import TTLocalizer class StreetSign(DistributedObject.DistributedObject): RedownloadTaskName = 'RedownloadStreetSign' - StreetSignFileName = config.GetString('street-sign-filename', 'texture.jpg') + StreetSignFileName = config.GetString('street-sign-filename', 'texture.png') StreetSignBaseDir = config.GetString('street-sign-base-dir', 'sign') StreetSignUrl = base.config.GetString('street-sign-url', 'http://cdn.toontown.disney.go.com/toontown/en/street-signs/img/') notify = DirectNotifyGlobal.directNotify.newCategory('StreetSign') diff --git a/toontown/minigame/DistributedTargetGame.py b/toontown/minigame/DistributedTargetGame.py index 47046e2..0a07552 100644 --- a/toontown/minigame/DistributedTargetGame.py +++ b/toontown/minigame/DistributedTargetGame.py @@ -137,10 +137,10 @@ class DistributedTargetGame(DistributedMinigame): UPDATE_RUBBER_BAND_PRIORITY = 2 COLLISION_DETECTION_PRIORITY = 5 UPDATE_SHADOWS_PRIORITY = 47 - UMBRELLA_TEXTURE_LIST = ['phase_4/maps/mg_slingshot_umbrella_blue.jpg', - 'phase_4/maps/mg_slingshot_umbrella_purple.jpg', - 'phase_4/maps/mg_slingshot_umbrella_red.jpg', - 'phase_4/maps/mg_slingshot_umbrella_yellow.jpg'] + UMBRELLA_TEXTURE_LIST = ['phase_4/maps/mg_slingshot_umbrella_blue.png', + 'phase_4/maps/mg_slingshot_umbrella_purple.png', + 'phase_4/maps/mg_slingshot_umbrella_red.png', + 'phase_4/maps/mg_slingshot_umbrella_yellow.png'] RT_UNKNOWN = 0 RT_SUCCESS = 1 RT_GROUPSUCCESS = 2 diff --git a/toontown/minigame/Purchase.py b/toontown/minigame/Purchase.py index 1c7b987..d7147a9 100644 --- a/toontown/minigame/Purchase.py +++ b/toontown/minigame/Purchase.py @@ -51,15 +51,15 @@ class Purchase(PurchaseBase): self.bg = loader.loadModel('phase_%s/models/modules/toon_interior' % interiorPhase) self.bg.setPos(0.0, 5.0, -1.0) self.wt = self.bg.find('**/random_tc1_TI_wallpaper') - wallTex = loader.loadTexture('phase_%s/maps/wall_paper_a5.jpg' % interiorPhase) + wallTex = loader.loadTexture('phase_%s/maps/wall_paper_a5.png' % interiorPhase) self.wt.setTexture(wallTex, 100) self.wt.setColorScale(0.8, 0.67, 0.549, 1.0) self.bt = self.bg.find('**/random_tc1_TI_wallpaper_border') - wallTex = loader.loadTexture('phase_%s/maps/wall_paper_a5.jpg' % interiorPhase) + wallTex = loader.loadTexture('phase_%s/maps/wall_paper_a5.png' % interiorPhase) self.bt.setTexture(wallTex, 100) self.bt.setColorScale(0.8, 0.67, 0.549, 1.0) self.wb = self.bg.find('**/random_tc1_TI_wainscotting') - wainTex = loader.loadTexture('phase_%s/maps/wall_paper_b4.jpg' % interiorPhase) + wainTex = loader.loadTexture('phase_%s/maps/wall_paper_b4.png' % interiorPhase) self.wb.setTexture(wainTex, 100) self.wb.setColorScale(0.473, 0.675, 0.488, 1.0) self.playAgain = DirectButton(parent=self.frame, relief=None, scale=1.04, pos=(0.72, 0, -0.24), image=(purchaseModels.find('**/PurchScrn_BTN_UP'), diff --git a/toontown/minigame/SwingVine.py b/toontown/minigame/SwingVine.py index 5451f41..88448a1 100644 --- a/toontown/minigame/SwingVine.py +++ b/toontown/minigame/SwingVine.py @@ -111,7 +111,7 @@ class SwingVine(NodePath): self.link1 = self.links[-2][0] self.rope = self.makeSpline() self.rope.reparentTo(self.root) - myTexture = loader.loadTexture('phase_4/maps/swinging_vine.jpg') + myTexture = loader.loadTexture('phase_4/maps/swinging_vine.png') gameAssets = loader.loadModel('phase_4/models/minigames/vine_game') vine = gameAssets.find('**/vine1') self.cableTex = vine.findTexture('*') diff --git a/toontown/parties/DistributedPartyJukebox40Activity.py b/toontown/parties/DistributedPartyJukebox40Activity.py index 6358bed..8454aa2 100644 --- a/toontown/parties/DistributedPartyJukebox40Activity.py +++ b/toontown/parties/DistributedPartyJukebox40Activity.py @@ -9,7 +9,7 @@ class DistributedPartyJukebox40Activity(DistributedPartyJukeboxActivityBase): def load(self): DistributedPartyJukeboxActivityBase.load(self) - newTexture = loader.loadTexture('phase_13/maps/tt_t_ara_pty_jukeboxBlue.jpg', 'phase_13/maps/tt_t_ara_pty_jukeboxBlue_a.rgb') + newTexture = loader.loadTexture('phase_13/maps/tt_t_ara_pty_jukeboxBlue.png') case = self.jukebox.find('**/jukeboxGlass') if not case.isEmpty(): case.setTexture(newTexture, 1) diff --git a/toontown/parties/DistributedPartyValentineJukebox40Activity.py b/toontown/parties/DistributedPartyValentineJukebox40Activity.py index 7fc3f28..101db6b 100644 --- a/toontown/parties/DistributedPartyValentineJukebox40Activity.py +++ b/toontown/parties/DistributedPartyValentineJukebox40Activity.py @@ -9,7 +9,7 @@ class DistributedPartyValentineJukebox40Activity(DistributedPartyJukeboxActivity def load(self): DistributedPartyJukeboxActivityBase.load(self) - newTexture = loader.loadTexture('phase_13/maps/tt_t_ara_pty_jukeboxValentineB.jpg', 'phase_13/maps/tt_t_ara_pty_jukeboxValentineB_a.rgb') + newTexture = loader.loadTexture('phase_13/maps/tt_t_ara_pty_jukeboxValentineB.png') case = self.jukebox.find('**/jukeboxGlass') if not case.isEmpty(): case.setTexture(newTexture, 1) diff --git a/toontown/parties/DistributedPartyValentineJukeboxActivity.py b/toontown/parties/DistributedPartyValentineJukeboxActivity.py index f67cb5a..0b8f11d 100644 --- a/toontown/parties/DistributedPartyValentineJukeboxActivity.py +++ b/toontown/parties/DistributedPartyValentineJukeboxActivity.py @@ -9,7 +9,7 @@ class DistributedPartyValentineJukeboxActivity(DistributedPartyJukeboxActivityBa def load(self): DistributedPartyJukeboxActivityBase.load(self) - newTexture = loader.loadTexture('phase_13/maps/tt_t_ara_pty_jukeboxValentineA.jpg', 'phase_13/maps/tt_t_ara_pty_jukeboxValentineA_a.rgb') + newTexture = loader.loadTexture('phase_13/maps/tt_t_ara_pty_jukeboxValentineA.png') case = self.jukebox.find('**/jukeboxGlass') if not case.isEmpty(): case.setTexture(newTexture, 1) diff --git a/toontown/parties/DistributedPartyValentineTrampolineActivity.py b/toontown/parties/DistributedPartyValentineTrampolineActivity.py index a362d3c..bb665c2 100644 --- a/toontown/parties/DistributedPartyValentineTrampolineActivity.py +++ b/toontown/parties/DistributedPartyValentineTrampolineActivity.py @@ -3,4 +3,4 @@ from toontown.parties.DistributedPartyTrampolineActivity import DistributedParty class DistributedPartyValentineTrampolineActivity(DistributedPartyTrampolineActivity): def __init__(self, cr, doJellyBeans = True, doTricks = False, texture = None): - DistributedPartyTrampolineActivity.__init__(self, cr, doJellyBeans, doTricks, 'phase_13/maps/tt_t_ara_pty_trampolineValentine.jpg') + DistributedPartyTrampolineActivity.__init__(self, cr, doJellyBeans, doTricks, 'phase_13/maps/tt_t_ara_pty_trampolineValentine.png') diff --git a/toontown/parties/DistributedPartyVictoryTrampolineActivity.py b/toontown/parties/DistributedPartyVictoryTrampolineActivity.py index 99d156b..3659fc1 100644 --- a/toontown/parties/DistributedPartyVictoryTrampolineActivity.py +++ b/toontown/parties/DistributedPartyVictoryTrampolineActivity.py @@ -3,4 +3,4 @@ from toontown.parties.DistributedPartyTrampolineActivity import DistributedParty class DistributedPartyVictoryTrampolineActivity(DistributedPartyTrampolineActivity): def __init__(self, cr, doJellyBeans = True, doTricks = False, texture = None): - DistributedPartyTrampolineActivity.__init__(self, cr, doJellyBeans, doTricks, 'phase_13/maps/tt_t_ara_pty_trampolineVictory.jpg') + DistributedPartyTrampolineActivity.__init__(self, cr, doJellyBeans, doTricks, 'phase_13/maps/tt_t_ara_pty_trampolineVictory.png') diff --git a/toontown/parties/DistributedPartyWinterTrampolineActivity.py b/toontown/parties/DistributedPartyWinterTrampolineActivity.py index a0dcbfd..3db46be 100644 --- a/toontown/parties/DistributedPartyWinterTrampolineActivity.py +++ b/toontown/parties/DistributedPartyWinterTrampolineActivity.py @@ -3,4 +3,4 @@ from toontown.parties.DistributedPartyTrampolineActivity import DistributedParty class DistributedPartyWinterTrampolineActivity(DistributedPartyTrampolineActivity): def __init__(self, cr, doJellyBeans = True, doTricks = False, texture = None): - DistributedPartyTrampolineActivity.__init__(self, cr, doJellyBeans, doTricks, 'phase_13/maps/tt_t_ara_pty_trampolineWinter.jpg') + DistributedPartyTrampolineActivity.__init__(self, cr, doJellyBeans, doTricks, 'phase_13/maps/tt_t_ara_pty_trampolineWinter.png') diff --git a/toontown/parties/PartyCogActivity.py b/toontown/parties/PartyCogActivity.py index e08dd23..ec97ef6 100644 --- a/toontown/parties/PartyCogActivity.py +++ b/toontown/parties/PartyCogActivity.py @@ -97,8 +97,7 @@ class PartyCogActivity(DirectObject): signLocator = self.arena.find('**/eventSign_locator') self.activity.sign.setPos(signLocator.getPos(self.root)) if self.texture: - textureAlpha = self.texture[:-4] + '_a.rgb' - reskinTexture = loader.loadTexture(self.texture, textureAlpha) + reskinTexture = loader.loadTexture(self.texture) self.arena.find('**/center_grp').setTexture(reskinTexture, 100) self.arena.find('**/leftSide_grp').setTexture(reskinTexture, 100) self.arena.find('**/rightSide_grp').setTexture(reskinTexture, 100) diff --git a/toontown/pets/Pet.py b/toontown/pets/Pet.py index aec1233..e1e957a 100644 --- a/toontown/pets/Pet.py +++ b/toontown/pets/Pet.py @@ -247,11 +247,11 @@ class Pet(Avatar.Avatar): self.rightHighlight.hide() self.leftHighlight.hide() if self.style[8]: - self.eyesOpenTexture = loader.loadTexture('phase_4/maps/BeanEyeBoys2.jpg', 'phase_4/maps/BeanEyeBoys2_a.rgb') - self.eyesClosedTexture = loader.loadTexture('phase_4/maps/BeanEyeBoysBlink.jpg', 'phase_4/maps/BeanEyeBoysBlink_a.rgb') + self.eyesOpenTexture = loader.loadTexture('phase_4/maps/BeanEyeBoys2.png') + self.eyesClosedTexture = loader.loadTexture('phase_4/maps/BeanEyeBoysBlink.png') else: - self.eyesOpenTexture = loader.loadTexture('phase_4/maps/BeanEyeGirlsNew.jpg', 'phase_4/maps/BeanEyeGirlsNew_a.rgb') - self.eyesClosedTexture = loader.loadTexture('phase_4/maps/BeanEyeGirlsBlinkNew.jpg', 'phase_4/maps/BeanEyeGirlsBlinkNew_a.rgb') + self.eyesOpenTexture = loader.loadTexture('phase_4/maps/BeanEyeGirlsNew.png') + self.eyesClosedTexture = loader.loadTexture('phase_4/maps/BeanEyeGirlsBlinkNew.png') self.eyesOpenTexture.setMinfilter(Texture.FTLinear) self.eyesOpenTexture.setMagfilter(Texture.FTLinear) self.eyesClosedTexture.setMinfilter(Texture.FTLinear) diff --git a/toontown/pets/PetDNA.py b/toontown/pets/PetDNA.py index 3de514e..3a4b39c 100644 --- a/toontown/pets/PetDNA.py +++ b/toontown/pets/PetDNA.py @@ -21,13 +21,13 @@ EarParts = ['horns', EarTextures = {'horns': None, 'antennae': None, 'dogEars': None, - 'catEars': 'phase_4/maps/BeanCatEar6.jpg', - 'rabbitEars': 'phase_4/maps/BeanBunnyEar6.jpg'} + 'catEars': 'phase_4/maps/BeanCatEar6.png', + 'rabbitEars': 'phase_4/maps/BeanBunnyEar6.png'} ExoticEarTextures = {'horns': None, 'antennae': None, 'dogEars': None, - 'catEars': 'phase_4/maps/BeanCatEar3Yellow.jpg', - 'rabbitEars': 'phase_4/maps/BeanBunnyEar6.jpg'} + 'catEars': 'phase_4/maps/BeanCatEar3Yellow.png', + 'rabbitEars': 'phase_4/maps/BeanBunnyEar6.png'} NoseParts = ['clownNose', 'dogNose', 'ovalNose', @@ -36,12 +36,12 @@ TailParts = ['catTail', 'longTail', 'birdTail', 'bunnyTail'] -TailTextures = {'catTail': 'phase_4/maps/beanCatTail6.jpg', - 'longTail': 'phase_4/maps/BeanLongTail6.jpg', +TailTextures = {'catTail': 'phase_4/maps/beanCatTail6.png', + 'longTail': 'phase_4/maps/BeanLongTail6.png', 'birdTail': None, 'bunnyTail': None} -GiraffeTail = 'phase_4/maps/BeanLongTailGiraffe.jpg' -LeopardTail = 'phase_4/maps/BeanLongTailLepord.jpg' +GiraffeTail = 'phase_4/maps/BeanLongTailGiraffe.png' +LeopardTail = 'phase_4/maps/BeanLongTailLepord.png' GenericBodies = ['dots', 'threeStripe', 'tigerStripe', @@ -85,17 +85,17 @@ PetRarities = {'body': {ToontownGlobals.ToontownCentral: {'threeStripe': 50, 'turtle': 25, 'giraffe': 20, 'leopard': 10}}} -BodyTextures = {'dots': 'phase_4/maps/BeanbodyDots6.jpg', - 'threeStripe': 'phase_4/maps/Beanbody3stripes6.jpg', - 'tigerStripe': 'phase_4/maps/BeanbodyZebraStripes6.jpg', - 'turtle': 'phase_4/maps/BeanbodyTurtle.jpg', - 'giraffe': 'phase_4/maps/BeanbodyGiraffe1.jpg', - 'leopard': 'phase_4/maps/BeanbodyLepord2.jpg', - 'tummy': 'phase_4/maps/BeanbodyTummy6.jpg'} -FeetTextures = {'normal': 'phase_4/maps/BeanFoot6.jpg', - 'turtle': 'phase_4/maps/BeanFootTurttle.jpg', - 'giraffe': 'phase_4/maps/BeanFootYellow3.jpg', - 'leopard': 'phase_4/maps/BeanFootYellow3.jpg'} +BodyTextures = {'dots': 'phase_4/maps/BeanbodyDots6.png', + 'threeStripe': 'phase_4/maps/Beanbody3stripes6.png', + 'tigerStripe': 'phase_4/maps/BeanbodyZebraStripes6.png', + 'turtle': 'phase_4/maps/BeanbodyTurtle.png', + 'giraffe': 'phase_4/maps/BeanbodyGiraffe1.png', + 'leopard': 'phase_4/maps/BeanbodyLepord2.png', + 'tummy': 'phase_4/maps/BeanbodyTummy6.png'} +FeetTextures = {'normal': 'phase_4/maps/BeanFoot6.png', + 'turtle': 'phase_4/maps/BeanFootTurttle.png', + 'giraffe': 'phase_4/maps/BeanFootYellow3.png', + 'leopard': 'phase_4/maps/BeanFootYellow3.png'} AllPetColors = (VBase4(1.0, 1.0, 1.0, 1.0), VBase4(0.96875, 0.691406, 0.699219, 1.0), VBase4(0.933594, 0.265625, 0.28125, 1.0), diff --git a/toontown/racing/DistributedRace.py b/toontown/racing/DistributedRace.py index e62586d..0f0df9f 100644 --- a/toontown/racing/DistributedRace.py +++ b/toontown/racing/DistributedRace.py @@ -41,7 +41,7 @@ class DistributedRace(DistributedObject.DistributedObject): def __init__(self, cr): self.qbox = loader.loadModel('phase_6/models/karting/qbox') - self.boostArrowTexture = loader.loadTexture('phase_6/maps/boost_arrow.jpg', 'phase_6/maps/boost_arrow_a.rgb') + self.boostArrowTexture = loader.loadTexture('phase_6/maps/boost_arrow.png') self.boostArrowTexture.setMinfilter(Texture.FTLinear) DistributedObject.DistributedObject.__init__(self, cr) self.kartMap = {} diff --git a/toontown/racing/Kart.py b/toontown/racing/Kart.py index a4d551d..5481d26 100644 --- a/toontown/racing/Kart.py +++ b/toontown/racing/Kart.py @@ -315,7 +315,7 @@ class Kart(NodePath, ShadowCaster.ShadowCaster): rimTexPath = getAccessory(getDefaultRim()) else: rimTexPath = getAccessory(self.kartDNA[KartDNA.rimsType]) - rimTex = loader.loadTexture('%s.jpg' % rimTexPath, '%s_a.rgb' % rimTexPath) + rimTex = loader.loadTexture('%s.png' % rimTexPath) for kart in self.geom: leftFrontWheelRim = self.geom[kart].find('**/leftFrontWheelRim') rightFrontWheelRim = self.geom[kart].find('**/rightFrontWheelRim') @@ -397,8 +397,8 @@ class Kart(NodePath, ShadowCaster.ShadowCaster): if self.kartDNA[KartDNA.decalType] != InvalidEntry: decalId = getAccessory(self.kartDNA[KartDNA.decalType]) kartDecal = getDecalId(self.kartDNA[KartDNA.bodyType]) - hoodDecalTex = loader.loadTexture('phase_6/maps/%s_HoodDecal_%s.jpg' % (kartDecal, decalId), 'phase_6/maps/%s_HoodDecal_%s_a.rgb' % (kartDecal, decalId)) - sideDecalTex = loader.loadTexture('phase_6/maps/%s_SideDecal_%s.jpg' % (kartDecal, decalId), 'phase_6/maps/%s_SideDecal_%s_a.rgb' % (kartDecal, decalId)) + hoodDecalTex = loader.loadTexture('phase_6/maps/%s_HoodDecal_%s.png' % (kartDecal, decalId)) + sideDecalTex = loader.loadTexture('phase_6/maps/%s_SideDecal_%s.png' % (kartDecal, decalId)) hoodDecalTex.setMinfilter(Texture.FTLinearMipmapLinear) sideDecalTex.setMinfilter(Texture.FTLinearMipmapLinear) for kart in self.geom: diff --git a/toontown/racing/KartShopGui.py b/toontown/racing/KartShopGui.py index 42642a6..f0ab23c 100644 --- a/toontown/racing/KartShopGui.py +++ b/toontown/racing/KartShopGui.py @@ -687,15 +687,15 @@ class KartShopGuiMgr(DirectObject.DirectObject, object): KartDNA.fwwType, KartDNA.bwwType]: texNodePath = getTexCardNode(accID) - tex = loader.loadTexture('phase_6/maps/%s.jpg' % texNodePath, 'phase_6/maps/%s_a.rgb' % texNodePath) + tex = loader.loadTexture('phase_6/maps/%s.png' % texNodePath) elif accType == KartDNA.rimsType: if accID == InvalidEntry: texNodePath = getTexCardNode(getDefaultRim()) else: texNodePath = getTexCardNode(accID) - tex = loader.loadTexture('phase_6/maps/%s.jpg' % texNodePath, 'phase_6/maps/%s_a.rgb' % texNodePath) + tex = loader.loadTexture('phase_6/maps/%s.png' % texNodePath) elif accType in [KartDNA.bodyColor, KartDNA.accColor]: - tex = loader.loadTexture('phase_6/maps/Kartmenu_paintbucket.jpg', 'phase_6/maps/Kartmenu_paintbucket_a.rgb') + tex = loader.loadTexture('phase_6/maps/Kartmenu_paintbucket.png') if accID == InvalidEntry: self.kartView.component('geom0').setColorScale(getDefaultColor()) else: @@ -703,9 +703,9 @@ class KartShopGuiMgr(DirectObject.DirectObject, object): elif accType == KartDNA.decalType: kartDecal = getDecalId(base.localAvatar.getKartBodyType()) texNodePath = getTexCardNode(accID) - tex = loader.loadTexture('phase_6/maps/%s.jpg' % texNodePath % kartDecal, 'phase_6/maps/%s_a.rgb' % texNodePath % kartDecal) + tex = loader.loadTexture('phase_6/maps/%s.png' % texNodePath % kartDecal) else: - tex = loader.loadTexture('phase_6/maps/NoAccessoryIcon3.jpg', 'phase_6/maps/NoAccessoryIcon3_a.rgb') + tex = loader.loadTexture('phase_6/maps/NoAccessoryIcon3.png') tex.setMinfilter(Texture.FTLinearMipmapLinear) self.kartView.component('geom0').setTexture(tex, 1) self.initialize = True @@ -747,15 +747,15 @@ class KartShopGuiMgr(DirectObject.DirectObject, object): KartDNA.fwwType, KartDNA.bwwType]: texNodePath = getTexCardNode(accID) - tex = loader.loadTexture('phase_6/maps/%s.jpg' % texNodePath, 'phase_6/maps/%s_a.rgb' % texNodePath) + tex = loader.loadTexture('phase_6/maps/%s.png' % texNodePath) elif accType == KartDNA.rimsType: if accID == InvalidEntry: texNodePath = getTexCardNode(getDefaultRim()) else: texNodePath = getTexCardNode(accID) - tex = loader.loadTexture('phase_6/maps/%s.jpg' % texNodePath, 'phase_6/maps/%s_a.rgb' % texNodePath) + tex = loader.loadTexture('phase_6/maps/%s.png' % texNodePath) elif accType in [KartDNA.bodyColor, KartDNA.accColor]: - tex = loader.loadTexture('phase_6/maps/Kartmenu_paintbucket.jpg', 'phase_6/maps/Kartmenu_paintbucket_a.rgb') + tex = loader.loadTexture('phase_6/maps/Kartmenu_paintbucket.png') if accID == InvalidEntry: self.kartView.component('geom0').setColorScale(getDefaultColor()) else: @@ -763,9 +763,9 @@ class KartShopGuiMgr(DirectObject.DirectObject, object): elif accType == KartDNA.decalType: kartDecal = getDecalId(base.localAvatar.getKartBodyType()) texNodePath = getTexCardNode(accID) - tex = loader.loadTexture('phase_6/maps/%s.jpg' % texNodePath % kartDecal, 'phase_6/maps/%s_a.rgb' % texNodePath % kartDecal) + tex = loader.loadTexture('phase_6/maps/%s.png' % texNodePath % kartDecal) else: - tex = loader.loadTexture('phase_6/maps/NoAccessoryIcon3.jpg', 'phase_6/maps/NoAccessoryIcon3_a.rgb') + tex = loader.loadTexture('phase_6/maps/NoAccessoryIcon3.png') tex.setMinfilter(Texture.FTLinearMipmapLinear) self.kartView.component('geom0').setTexture(tex, 1) self.initialize = True diff --git a/toontown/shtiker/InGameNewsFrame.py b/toontown/shtiker/InGameNewsFrame.py index 44166d9..154d1af 100644 --- a/toontown/shtiker/InGameNewsFrame.py +++ b/toontown/shtiker/InGameNewsFrame.py @@ -34,6 +34,6 @@ class InGameNewsFrame(HtmlView.HtmlView): filename = filename.replace('.', '-') pngfilename = filename + '.png' self.writeTex(pngfilename) - jpgfilename = filename + '.jpg' + jpgfilename = filename + '.png' self.writeTex(jpgfilename) return jpgfilename diff --git a/toontown/shtiker/IssueFrame.py b/toontown/shtiker/IssueFrame.py index 11eee88..a4aa403 100644 --- a/toontown/shtiker/IssueFrame.py +++ b/toontown/shtiker/IssueFrame.py @@ -23,7 +23,7 @@ class IssueFrame(DirectFrame): -0.751666665077, 0.751666665077) notify = DirectNotifyGlobal.directNotify.newCategory('IssueFrame') - ContentPattern = 'tt_i_art_%s_%s%d.jpg' + ContentPattern = 'tt_i_art_%s_%s%d.png' SectionIdents = ['hom', 'new', 'evt', diff --git a/toontown/shtiker/KartPage.py b/toontown/shtiker/KartPage.py index 15b473d..49221d4 100644 --- a/toontown/shtiker/KartPage.py +++ b/toontown/shtiker/KartPage.py @@ -366,7 +366,7 @@ class ItemSelector(DirectFrame): self.locator2 = self.attachNewNode('locator2') self.locator1.setPos(0, 0, 0.035) self.locator2.setPos(0.0, 0.0, 0.0) - tex = loader.loadTexture('phase_6/maps/NoAccessoryIcon3.jpg', 'phase_6/maps/NoAccessoryIcon3_a.rgb') + tex = loader.loadTexture('phase_6/maps/NoAccessoryIcon3.png') self.uiImagePlane.component('geom0').setTexture(tex, self.texCount) self.texCount += 1 self.uiTextBox = DirectFrame(parent=self, relief=None, scale=1.0, text='', text_font=ToontownGlobals.getInterfaceFont(), text_fg=(0.5, 0, 0, 1), text_shadow=(0, 0, 0, 1), text_scale=0.0715, text_pos=(0.0, -0.23, 0.0)) @@ -526,15 +526,15 @@ class ItemSelector(DirectFrame): KartDNA.fwwType, KartDNA.bwwType]: texNodePath = getTexCardNode(self.currItem) - tex = loader.loadTexture('phase_6/maps/%s.jpg' % texNodePath, 'phase_6/maps/%s_a.rgb' % texNodePath) + tex = loader.loadTexture('phase_6/maps/%s.png' % texNodePath) elif self.currAccessoryType == KartDNA.rimsType: if self.currItem == InvalidEntry: texNodePath = getTexCardNode(getDefaultRim()) else: texNodePath = getTexCardNode(self.currItem) - tex = loader.loadTexture('phase_6/maps/%s.jpg' % texNodePath, 'phase_6/maps/%s_a.rgb' % texNodePath) + tex = loader.loadTexture('phase_6/maps/%s.png' % texNodePath) elif self.currAccessoryType in [KartDNA.bodyColor, KartDNA.accColor]: - tex = loader.loadTexture('phase_6/maps/Kartmenu_paintbucket.jpg', 'phase_6/maps/Kartmenu_paintbucket_a.rgb') + tex = loader.loadTexture('phase_6/maps/Kartmenu_paintbucket.png') if self.currItem == InvalidEntry: self.uiImagePlane.component('geom0').setColorScale(getDefaultColor()) else: @@ -543,9 +543,9 @@ class ItemSelector(DirectFrame): kart = self._parent._parent.getKartViewer().getKart() kartDecal = getDecalId(kart.kartDNA[KartDNA.bodyType]) texNodePath = getTexCardNode(self.currItem) - tex = loader.loadTexture('phase_6/maps/%s.jpg' % texNodePath % kartDecal, 'phase_6/maps/%s_a.rgb' % texNodePath % kartDecal) + tex = loader.loadTexture('phase_6/maps/%s.png' % texNodePath % kartDecal) else: - tex = loader.loadTexture('phase_6/maps/NoAccessoryIcon3.jpg', 'phase_6/maps/NoAccessoryIcon3_a.rgb') + tex = loader.loadTexture('phase_6/maps/NoAccessoryIcon3.png') colorTypeList = [KartDNA.bodyColor, KartDNA.accColor] if self.currItem == InvalidEntry: if self.currAccessoryType == KartDNA.rimsType: @@ -561,7 +561,7 @@ class ItemSelector(DirectFrame): def __handleHideItem(self): self.uiImagePlane.component('geom0').setColorScale(1.0, 1.0, 1.0, 1.0) - self.uiImagePlane.component('geom0').setTexture(loader.loadTexture('phase_6/maps/NoAccessoryIcon3.jpg', 'phase_6/maps/NoAccessoryIcon3_a.rgb'), self.texCount) + self.uiImagePlane.component('geom0').setTexture(loader.loadTexture('phase_6/maps/NoAccessoryIcon3.png'), self.texCount) self.texCount += 1 def __handleItemDeleteConfirm(self): diff --git a/toontown/shtiker/PhotoAlbumPage.py b/toontown/shtiker/PhotoAlbumPage.py index 24cf619..16b1ae9 100644 --- a/toontown/shtiker/PhotoAlbumPage.py +++ b/toontown/shtiker/PhotoAlbumPage.py @@ -182,7 +182,7 @@ class PhotoAlbumPage(ShtikerPage.ShtikerPage): files = os.listdir('.') photos = [] for fileName in files: - if fileName[0:10] == 'screenshot' and fileName[-4:] == '.jpg': + if fileName[0:10] == 'screenshot' and fileName[-4:] == '.png': photos.append(fileName) return photos diff --git a/toontown/suit/Suit.py b/toontown/suit/Suit.py index 644b2b3..8cac5af 100644 --- a/toontown/suit/Suit.py +++ b/toontown/suit/Suit.py @@ -448,7 +448,7 @@ class Suit(Avatar.Avatar): self.scale = 6.75 / cSize self.handColor = VBase4(0.85, 0.55, 0.55, 1.0) self.generateBody() - self.headTexture = 'corporate-raider.jpg' + self.headTexture = 'corporate-raider.png' self.generateHead('flunky') self.setHeight(8.23) elif dna.name == 'tbc': @@ -461,21 +461,21 @@ class Suit(Avatar.Avatar): self.scale = 4.0 / cSize self.handColor = SuitDNA.legalPolyColor self.generateBody() - self.headTexture = 'bottom-feeder.jpg' + self.headTexture = 'bottom-feeder.png' self.generateHead('tightwad') self.setHeight(4.81) elif dna.name == 'b': self.scale = 4.375 / bSize self.handColor = VBase4(0.95, 0.95, 1.0, 1.0) self.generateBody() - self.headTexture = 'blood-sucker.jpg' + self.headTexture = 'blood-sucker.png' self.generateHead('movershaker') self.setHeight(6.17) elif dna.name == 'dt': self.scale = 4.25 / aSize self.handColor = SuitDNA.legalPolyColor self.generateBody() - self.headTexture = 'double-talker.jpg' + self.headTexture = 'double-talker.png' self.generateHead('twoface') self.setHeight(5.63) elif dna.name == 'ac': @@ -494,7 +494,7 @@ class Suit(Avatar.Avatar): self.scale = 5.65 / bSize self.handColor = VBase4(0.5, 0.8, 0.75, 1.0) self.generateBody() - self.headTexture = 'spin-doctor.jpg' + self.headTexture = 'spin-doctor.png' self.generateHead('telemarketer') self.setHeight(7.9) elif dna.name == 'le': @@ -555,7 +555,7 @@ class Suit(Avatar.Avatar): self.scale = 7.0 / aSize self.handColor = SuitDNA.moneyPolyColor self.generateBody() - self.headTexture = 'robber-baron.jpg' + self.headTexture = 'robber-baron.png' self.generateHead('yesman') self.setHeight(8.95) elif dna.name == 'cc': @@ -575,7 +575,7 @@ class Suit(Avatar.Avatar): self.scale = 4.35 / aSize self.handColor = SuitDNA.salesPolyColor self.generateBody() - self.headTexture = 'name-dropper.jpg' + self.headTexture = 'name-dropper.png' self.generateHead('numbercruncher') self.setHeight(5.98) elif dna.name == 'gh': @@ -600,7 +600,7 @@ class Suit(Avatar.Avatar): self.scale = 5.75 / aSize self.handColor = SuitDNA.salesPolyColor self.generateBody() - self.headTexture = 'mingler.jpg' + self.headTexture = 'mingler.png' self.generateHead('twoface') self.setHeight(7.61) elif dna.name == 'mh': @@ -683,13 +683,13 @@ class Suit(Avatar.Avatar): phase = 3.5 def __doItTheOldWay__(): - torsoTex = loader.loadTexture('phase_%s/maps/%s_blazer.jpg' % (phase, dept)) + torsoTex = loader.loadTexture('phase_%s/maps/%s_blazer.png' % (phase, dept)) torsoTex.setMinfilter(Texture.FTLinearMipmapLinear) torsoTex.setMagfilter(Texture.FTLinear) - legTex = loader.loadTexture('phase_%s/maps/%s_leg.jpg' % (phase, dept)) + legTex = loader.loadTexture('phase_%s/maps/%s_leg.png' % (phase, dept)) legTex.setMinfilter(Texture.FTLinearMipmapLinear) legTex.setMagfilter(Texture.FTLinear) - armTex = loader.loadTexture('phase_%s/maps/%s_sleeve.jpg' % (phase, dept)) + armTex = loader.loadTexture('phase_%s/maps/%s_sleeve.png' % (phase, dept)) armTex.setMinfilter(Texture.FTLinearMipmapLinear) armTex.setMagfilter(Texture.FTLinear) modelRoot.find('**/torso').setTexture(torsoTex, 1) @@ -713,8 +713,8 @@ class Suit(Avatar.Avatar): if self.find('**/body').isEmpty(): __doItTheOldWay__() else: - filepath = 'phase_3.5/maps/tt_t_ene_' + texType + '.jpg' - if cogExists('/maps/tt_t_ene_' + texType + '.jpg'): + filepath = 'phase_3.5/maps/tt_t_ene_' + texType + '.png' + if cogExists('/maps/tt_t_ene_' + texType + '.png'): bodyTex = loader.loadTexture(filepath) self.find('**/body').setTexture(bodyTex, 1) self.leftHand = self.find('**/def_joint_left_hold') @@ -728,13 +728,13 @@ class Suit(Avatar.Avatar): if not modelRoot: modelRoot = self self.isWaiter = 1 - torsoTex = loader.loadTexture('phase_3.5/maps/waiter_m_blazer.jpg') + torsoTex = loader.loadTexture('phase_3.5/maps/waiter_m_blazer.png') torsoTex.setMinfilter(Texture.FTLinearMipmapLinear) torsoTex.setMagfilter(Texture.FTLinear) - legTex = loader.loadTexture('phase_3.5/maps/waiter_m_leg.jpg') + legTex = loader.loadTexture('phase_3.5/maps/waiter_m_leg.png') legTex.setMinfilter(Texture.FTLinearMipmapLinear) legTex.setMagfilter(Texture.FTLinear) - armTex = loader.loadTexture('phase_3.5/maps/waiter_m_sleeve.jpg') + armTex = loader.loadTexture('phase_3.5/maps/waiter_m_sleeve.png') armTex.setMinfilter(Texture.FTLinearMipmapLinear) armTex.setMagfilter(Texture.FTLinear) modelRoot.find('**/torso').setTexture(torsoTex, 1) @@ -745,10 +745,10 @@ class Suit(Avatar.Avatar): if not modelRoot: modelRoot = self.getGeomNode() if suitType == 's': - torsoTex = loader.loadTexture('phase_3.5/maps/tt_t_ene_sellbotRental_blazer.jpg') - legTex = loader.loadTexture('phase_3.5/maps/tt_t_ene_sellbotRental_leg.jpg') - armTex = loader.loadTexture('phase_3.5/maps/tt_t_ene_sellbotRental_sleeve.jpg') - handTex = loader.loadTexture('phase_3.5/maps/tt_t_ene_sellbotRental_hand.jpg') + torsoTex = loader.loadTexture('phase_3.5/maps/tt_t_ene_sellbotRental_blazer.png') + legTex = loader.loadTexture('phase_3.5/maps/tt_t_ene_sellbotRental_leg.png') + armTex = loader.loadTexture('phase_3.5/maps/tt_t_ene_sellbotRental_sleeve.png') + handTex = loader.loadTexture('phase_3.5/maps/tt_t_ene_sellbotRental_hand.png') else: self.notify.warning('No rental suit for cog type %s' % suitType) return @@ -792,13 +792,13 @@ class Suit(Avatar.Avatar): self.notify.warning('skelecog has no tie model!!!') return if dept == 'c': - tieTex = loader.loadTexture('phase_5/maps/cog_robot_tie_boss.jpg') + tieTex = loader.loadTexture('phase_5/maps/cog_robot_tie_boss.png') elif dept == 's': - tieTex = loader.loadTexture('phase_5/maps/cog_robot_tie_sales.jpg') + tieTex = loader.loadTexture('phase_5/maps/cog_robot_tie_sales.png') elif dept == 'l': - tieTex = loader.loadTexture('phase_5/maps/cog_robot_tie_legal.jpg') + tieTex = loader.loadTexture('phase_5/maps/cog_robot_tie_legal.png') elif dept == 'm': - tieTex = loader.loadTexture('phase_5/maps/cog_robot_tie_money.jpg') + tieTex = loader.loadTexture('phase_5/maps/cog_robot_tie_money.png') tieTex.setMinfilter(Texture.FTLinearMipmapLinear) tieTex.setMagfilter(Texture.FTLinear) tie.setTexture(tieTex, 1) diff --git a/toontown/toon/Toon.py b/toontown/toon/Toon.py index ea017e2..8dc436c 100644 --- a/toontown/toon/Toon.py +++ b/toontown/toon/Toon.py @@ -1168,7 +1168,7 @@ class Toon(Avatar.Avatar, ToonHead): for geom in geoms: texName = ToonDNA.ShoesTextures[shoes[1]] if self.style.legs == 'l' and shoes[0] == 3: - texName = texName[:-4] + 'LL.jpg' + texName = texName[:-4] + 'LL.png' tex = loader.loadTexture(texName, okMissing=True) if tex is None: self.sendLogSuspiciousEvent('failed to load texture %s' % texName) diff --git a/toontown/toon/ToonDNA.py b/toontown/toon/ToonDNA.py index 4507efc..f75a9cd 100644 --- a/toontown/toon/ToonDNA.py +++ b/toontown/toon/ToonDNA.py @@ -175,157 +175,157 @@ toonTorsoTypes = ['ss', 'm', 'l'] toonLegTypes = ['s', 'm', 'l'] -Shirts = ['phase_3/maps/desat_shirt_1.jpg', - 'phase_3/maps/desat_shirt_2.jpg', - 'phase_3/maps/desat_shirt_3.jpg', - 'phase_3/maps/desat_shirt_4.jpg', - 'phase_3/maps/desat_shirt_5.jpg', - 'phase_3/maps/desat_shirt_6.jpg', - 'phase_3/maps/desat_shirt_7.jpg', - 'phase_3/maps/desat_shirt_8.jpg', - 'phase_3/maps/desat_shirt_9.jpg', - 'phase_3/maps/desat_shirt_10.jpg', - 'phase_3/maps/desat_shirt_11.jpg', - 'phase_3/maps/desat_shirt_12.jpg', - 'phase_3/maps/desat_shirt_13.jpg', - 'phase_3/maps/desat_shirt_14.jpg', - 'phase_3/maps/desat_shirt_15.jpg', - 'phase_3/maps/desat_shirt_16.jpg', - 'phase_3/maps/desat_shirt_17.jpg', - 'phase_3/maps/desat_shirt_18.jpg', - 'phase_3/maps/desat_shirt_19.jpg', - 'phase_3/maps/desat_shirt_20.jpg', - 'phase_3/maps/desat_shirt_21.jpg', - 'phase_3/maps/desat_shirt_22.jpg', - 'phase_3/maps/desat_shirt_23.jpg', - 'phase_4/maps/female_shirt1b.jpg', - 'phase_4/maps/female_shirt2.jpg', - 'phase_4/maps/female_shirt3.jpg', - 'phase_4/maps/male_shirt1.jpg', - 'phase_4/maps/male_shirt2_palm.jpg', - 'phase_4/maps/male_shirt3c.jpg', - 'phase_4/maps/shirt_ghost.jpg', - 'phase_4/maps/shirt_pumkin.jpg', - 'phase_4/maps/holiday_shirt1.jpg', - 'phase_4/maps/holiday_shirt2b.jpg', - 'phase_4/maps/holidayShirt3b.jpg', - 'phase_4/maps/holidayShirt4.jpg', - 'phase_4/maps/female_shirt1b.jpg', - 'phase_4/maps/female_shirt5New.jpg', - 'phase_4/maps/shirtMale4B.jpg', - 'phase_4/maps/shirt6New.jpg', - 'phase_4/maps/shirtMaleNew7.jpg', - 'phase_4/maps/femaleShirtNew6.jpg', - 'phase_4/maps/Vday1Shirt5.jpg', - 'phase_4/maps/Vday1Shirt6SHD.jpg', - 'phase_4/maps/Vday1Shirt4.jpg', - 'phase_4/maps/Vday_shirt2c.jpg', - 'phase_4/maps/shirtTieDyeNew.jpg', - 'phase_4/maps/male_shirt1.jpg', - 'phase_4/maps/StPats_shirt1.jpg', - 'phase_4/maps/StPats_shirt2.jpg', - 'phase_4/maps/ContestfishingVestShirt2.jpg', - 'phase_4/maps/ContestFishtankShirt1.jpg', - 'phase_4/maps/ContestPawShirt1.jpg', - 'phase_4/maps/CowboyShirt1.jpg', - 'phase_4/maps/CowboyShirt2.jpg', - 'phase_4/maps/CowboyShirt3.jpg', - 'phase_4/maps/CowboyShirt4.jpg', - 'phase_4/maps/CowboyShirt5.jpg', - 'phase_4/maps/CowboyShirt6.jpg', - 'phase_4/maps/4thJulyShirt1.jpg', - 'phase_4/maps/4thJulyShirt2.jpg', - 'phase_4/maps/shirt_Cat7_01.jpg', - 'phase_4/maps/shirt_Cat7_02.jpg', - 'phase_4/maps/contest_backpack3.jpg', - 'phase_4/maps/contest_leder.jpg', - 'phase_4/maps/contest_mellon2.jpg', - 'phase_4/maps/contest_race2.jpg', - 'phase_4/maps/PJBlueBanana2.jpg', - 'phase_4/maps/PJRedHorn2.jpg', - 'phase_4/maps/PJGlasses2.jpg', - 'phase_4/maps/tt_t_chr_avt_shirt_valentine1.jpg', - 'phase_4/maps/tt_t_chr_avt_shirt_valentine2.jpg', - 'phase_4/maps/tt_t_chr_avt_shirt_desat4.jpg', - 'phase_4/maps/tt_t_chr_avt_shirt_fishing1.jpg', - 'phase_4/maps/tt_t_chr_avt_shirt_fishing2.jpg', - 'phase_4/maps/tt_t_chr_avt_shirt_gardening1.jpg', - 'phase_4/maps/tt_t_chr_avt_shirt_gardening2.jpg', - 'phase_4/maps/tt_t_chr_avt_shirt_party1.jpg', - 'phase_4/maps/tt_t_chr_avt_shirt_party2.jpg', - 'phase_4/maps/tt_t_chr_avt_shirt_racing1.jpg', - 'phase_4/maps/tt_t_chr_avt_shirt_racing2.jpg', - 'phase_4/maps/tt_t_chr_avt_shirt_summer1.jpg', - 'phase_4/maps/tt_t_chr_avt_shirt_summer2.jpg', - 'phase_4/maps/tt_t_chr_avt_shirt_golf1.jpg', - 'phase_4/maps/tt_t_chr_avt_shirt_golf2.jpg', - 'phase_4/maps/tt_t_chr_avt_shirt_halloween1.jpg', - 'phase_4/maps/tt_t_chr_avt_shirt_halloween2.jpg', - 'phase_4/maps/tt_t_chr_avt_shirt_marathon1.jpg', - 'phase_4/maps/tt_t_chr_avt_shirt_saveBuilding1.jpg', - 'phase_4/maps/tt_t_chr_avt_shirt_saveBuilding2.jpg', - 'phase_4/maps/tt_t_chr_avt_shirt_toonTask1.jpg', - 'phase_4/maps/tt_t_chr_avt_shirt_toonTask2.jpg', - 'phase_4/maps/tt_t_chr_avt_shirt_trolley1.jpg', - 'phase_4/maps/tt_t_chr_avt_shirt_trolley2.jpg', - 'phase_4/maps/tt_t_chr_avt_shirt_winter1.jpg', - 'phase_4/maps/tt_t_chr_avt_shirt_halloween3.jpg', - 'phase_4/maps/tt_t_chr_avt_shirt_halloween4.jpg', - 'phase_4/maps/tt_t_chr_avt_shirt_valentine3.jpg', - 'phase_4/maps/tt_t_chr_shirt_scientistC.jpg', - 'phase_4/maps/tt_t_chr_shirt_scientistA.jpg', - 'phase_4/maps/tt_t_chr_shirt_scientistB.jpg', - 'phase_4/maps/tt_t_chr_avt_shirt_mailbox.jpg', - 'phase_4/maps/tt_t_chr_avt_shirt_trashcan.jpg', - 'phase_4/maps/tt_t_chr_avt_shirt_loonyLabs.jpg', - 'phase_4/maps/tt_t_chr_avt_shirt_hydrant.jpg', - 'phase_4/maps/tt_t_chr_avt_shirt_whistle.jpg', - 'phase_4/maps/tt_t_chr_avt_shirt_cogbuster.jpg', - 'phase_4/maps/tt_t_chr_avt_shirt_mostCogsDefeated01.jpg', - 'phase_4/maps/tt_t_chr_avt_shirt_victoryParty01.jpg', - 'phase_4/maps/tt_t_chr_avt_shirt_victoryParty02.jpg', - 'phase_4/maps/tt_t_chr_avt_shirt_sellbotIcon.jpg', - 'phase_4/maps/tt_t_chr_avt_shirt_sellbotVPIcon.jpg', - 'phase_4/maps/tt_t_chr_avt_shirt_sellbotCrusher.jpg', - 'phase_4/maps/tt_t_chr_avt_shirt_jellyBeans.jpg', - 'phase_4/maps/tt_t_chr_avt_shirt_doodle.jpg', - 'phase_4/maps/tt_t_chr_avt_shirt_halloween5.jpg', - 'phase_4/maps/tt_t_chr_avt_shirt_halloweenTurtle.jpg', - 'phase_4/maps/tt_t_chr_avt_shirt_greentoon1.jpg', - 'phase_4/maps/tt_t_chr_avt_shirt_getConnectedMoverShaker.jpg', - 'phase_4/maps/tt_t_chr_avt_shirt_racingGrandPrix.jpg', - 'phase_4/maps/tt_t_chr_avt_shirt_lawbotIcon.jpg', - 'phase_4/maps/tt_t_chr_avt_shirt_lawbotVPIcon.jpg', - 'phase_4/maps/tt_t_chr_avt_shirt_lawbotCrusher.jpg', - 'phase_4/maps/tt_t_chr_avt_shirt_bee.jpg', - 'phase_4/maps/tt_t_chr_avt_shirt_pirate.jpg', - 'phase_4/maps/tt_t_chr_avt_shirt_supertoon.jpg', - 'phase_4/maps/tt_t_chr_avt_shirt_vampire.jpg', - 'phase_4/maps/tt_t_chr_avt_shirt_dinosaur.jpg', - 'phase_4/maps/tt_t_chr_avt_shirt_fishing04.jpg', - 'phase_4/maps/tt_t_chr_avt_shirt_golf03.jpg', - 'phase_4/maps/tt_t_chr_avt_shirt_mostCogsDefeated02.jpg', - 'phase_4/maps/tt_t_chr_avt_shirt_racing03.jpg', - 'phase_4/maps/tt_t_chr_avt_shirt_saveBuilding3.jpg', - 'phase_4/maps/tt_t_chr_avt_shirt_trolley03.jpg', - 'phase_4/maps/tt_t_chr_avt_shirt_fishing05.jpg', - 'phase_4/maps/tt_t_chr_avt_shirt_golf04.jpg', - 'phase_4/maps/tt_t_chr_avt_shirt_halloween06.jpg', - 'phase_4/maps/tt_t_chr_avt_shirt_winter03.jpg', - 'phase_4/maps/tt_t_chr_avt_shirt_halloween07.jpg', - 'phase_4/maps/tt_t_chr_avt_shirt_winter02.jpg', - 'phase_4/maps/tt_t_chr_avt_shirt_fishing06.jpg', - 'phase_4/maps/tt_t_chr_avt_shirt_fishing07.jpg', - 'phase_4/maps/tt_t_chr_avt_shirt_golf05.jpg', - 'phase_4/maps/tt_t_chr_avt_shirt_racing04.jpg', - 'phase_4/maps/tt_t_chr_avt_shirt_racing05.jpg', - 'phase_4/maps/tt_t_chr_avt_shirt_mostCogsDefeated03.jpg', - 'phase_4/maps/tt_t_chr_avt_shirt_mostCogsDefeated04.jpg', - 'phase_4/maps/tt_t_chr_avt_shirt_trolley04.jpg', - 'phase_4/maps/tt_t_chr_avt_shirt_trolley05.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'] +Shirts = ['phase_3/maps/desat_shirt_1.png', + 'phase_3/maps/desat_shirt_2.png', + 'phase_3/maps/desat_shirt_3.png', + 'phase_3/maps/desat_shirt_4.png', + 'phase_3/maps/desat_shirt_5.png', + 'phase_3/maps/desat_shirt_6.png', + 'phase_3/maps/desat_shirt_7.png', + 'phase_3/maps/desat_shirt_8.png', + 'phase_3/maps/desat_shirt_9.png', + 'phase_3/maps/desat_shirt_10.png', + 'phase_3/maps/desat_shirt_11.png', + 'phase_3/maps/desat_shirt_12.png', + 'phase_3/maps/desat_shirt_13.png', + 'phase_3/maps/desat_shirt_14.png', + 'phase_3/maps/desat_shirt_15.png', + 'phase_3/maps/desat_shirt_16.png', + 'phase_3/maps/desat_shirt_17.png', + 'phase_3/maps/desat_shirt_18.png', + 'phase_3/maps/desat_shirt_19.png', + 'phase_3/maps/desat_shirt_20.png', + 'phase_3/maps/desat_shirt_21.png', + 'phase_3/maps/desat_shirt_22.png', + 'phase_3/maps/desat_shirt_23.png', + 'phase_4/maps/female_shirt1b.png', + 'phase_4/maps/female_shirt2.png', + 'phase_4/maps/female_shirt3.png', + 'phase_4/maps/male_shirt1.png', + 'phase_4/maps/male_shirt2_palm.png', + 'phase_4/maps/male_shirt3c.png', + 'phase_4/maps/shirt_ghost.png', + 'phase_4/maps/shirt_pumkin.png', + 'phase_4/maps/holiday_shirt1.png', + 'phase_4/maps/holiday_shirt2b.png', + 'phase_4/maps/holidayShirt3b.png', + 'phase_4/maps/holidayShirt4.png', + 'phase_4/maps/female_shirt1b.png', + 'phase_4/maps/female_shirt5New.png', + 'phase_4/maps/shirtMale4B.png', + 'phase_4/maps/shirt6New.png', + 'phase_4/maps/shirtMaleNew7.png', + 'phase_4/maps/femaleShirtNew6.png', + 'phase_4/maps/Vday1Shirt5.png', + 'phase_4/maps/Vday1Shirt6SHD.png', + 'phase_4/maps/Vday1Shirt4.png', + 'phase_4/maps/Vday_shirt2c.png', + 'phase_4/maps/shirtTieDyeNew.png', + 'phase_4/maps/male_shirt1.png', + 'phase_4/maps/StPats_shirt1.png', + 'phase_4/maps/StPats_shirt2.png', + 'phase_4/maps/ContestfishingVestShirt2.png', + 'phase_4/maps/ContestFishtankShirt1.png', + 'phase_4/maps/ContestPawShirt1.png', + 'phase_4/maps/CowboyShirt1.png', + 'phase_4/maps/CowboyShirt2.png', + 'phase_4/maps/CowboyShirt3.png', + 'phase_4/maps/CowboyShirt4.png', + 'phase_4/maps/CowboyShirt5.png', + 'phase_4/maps/CowboyShirt6.png', + 'phase_4/maps/4thJulyShirt1.png', + 'phase_4/maps/4thJulyShirt2.png', + 'phase_4/maps/shirt_Cat7_01.png', + 'phase_4/maps/shirt_Cat7_02.png', + 'phase_4/maps/contest_backpack3.png', + 'phase_4/maps/contest_leder.png', + 'phase_4/maps/contest_mellon2.png', + 'phase_4/maps/contest_race2.png', + 'phase_4/maps/PJBlueBanana2.png', + 'phase_4/maps/PJRedHorn2.png', + 'phase_4/maps/PJGlasses2.png', + 'phase_4/maps/tt_t_chr_avt_shirt_valentine1.png', + 'phase_4/maps/tt_t_chr_avt_shirt_valentine2.png', + 'phase_4/maps/tt_t_chr_avt_shirt_desat4.png', + 'phase_4/maps/tt_t_chr_avt_shirt_fishing1.png', + 'phase_4/maps/tt_t_chr_avt_shirt_fishing2.png', + 'phase_4/maps/tt_t_chr_avt_shirt_gardening1.png', + 'phase_4/maps/tt_t_chr_avt_shirt_gardening2.png', + 'phase_4/maps/tt_t_chr_avt_shirt_party1.png', + 'phase_4/maps/tt_t_chr_avt_shirt_party2.png', + 'phase_4/maps/tt_t_chr_avt_shirt_racing1.png', + 'phase_4/maps/tt_t_chr_avt_shirt_racing2.png', + 'phase_4/maps/tt_t_chr_avt_shirt_summer1.png', + 'phase_4/maps/tt_t_chr_avt_shirt_summer2.png', + 'phase_4/maps/tt_t_chr_avt_shirt_golf1.png', + 'phase_4/maps/tt_t_chr_avt_shirt_golf2.png', + 'phase_4/maps/tt_t_chr_avt_shirt_halloween1.png', + 'phase_4/maps/tt_t_chr_avt_shirt_halloween2.png', + 'phase_4/maps/tt_t_chr_avt_shirt_marathon1.png', + 'phase_4/maps/tt_t_chr_avt_shirt_saveBuilding1.png', + 'phase_4/maps/tt_t_chr_avt_shirt_saveBuilding2.png', + 'phase_4/maps/tt_t_chr_avt_shirt_toonTask1.png', + 'phase_4/maps/tt_t_chr_avt_shirt_toonTask2.png', + 'phase_4/maps/tt_t_chr_avt_shirt_trolley1.png', + 'phase_4/maps/tt_t_chr_avt_shirt_trolley2.png', + 'phase_4/maps/tt_t_chr_avt_shirt_winter1.png', + 'phase_4/maps/tt_t_chr_avt_shirt_halloween3.png', + 'phase_4/maps/tt_t_chr_avt_shirt_halloween4.png', + 'phase_4/maps/tt_t_chr_avt_shirt_valentine3.png', + 'phase_4/maps/tt_t_chr_shirt_scientistC.png', + 'phase_4/maps/tt_t_chr_shirt_scientistA.png', + 'phase_4/maps/tt_t_chr_shirt_scientistB.png', + 'phase_4/maps/tt_t_chr_avt_shirt_mailbox.png', + 'phase_4/maps/tt_t_chr_avt_shirt_trashcan.png', + 'phase_4/maps/tt_t_chr_avt_shirt_loonyLabs.png', + 'phase_4/maps/tt_t_chr_avt_shirt_hydrant.png', + 'phase_4/maps/tt_t_chr_avt_shirt_whistle.png', + 'phase_4/maps/tt_t_chr_avt_shirt_cogbuster.png', + 'phase_4/maps/tt_t_chr_avt_shirt_mostCogsDefeated01.png', + 'phase_4/maps/tt_t_chr_avt_shirt_victoryParty01.png', + 'phase_4/maps/tt_t_chr_avt_shirt_victoryParty02.png', + 'phase_4/maps/tt_t_chr_avt_shirt_sellbotIcon.png', + 'phase_4/maps/tt_t_chr_avt_shirt_sellbotVPIcon.png', + 'phase_4/maps/tt_t_chr_avt_shirt_sellbotCrusher.png', + 'phase_4/maps/tt_t_chr_avt_shirt_jellyBeans.png', + 'phase_4/maps/tt_t_chr_avt_shirt_doodle.png', + 'phase_4/maps/tt_t_chr_avt_shirt_halloween5.png', + 'phase_4/maps/tt_t_chr_avt_shirt_halloweenTurtle.png', + 'phase_4/maps/tt_t_chr_avt_shirt_greentoon1.png', + 'phase_4/maps/tt_t_chr_avt_shirt_getConnectedMoverShaker.png', + 'phase_4/maps/tt_t_chr_avt_shirt_racingGrandPrix.png', + 'phase_4/maps/tt_t_chr_avt_shirt_lawbotIcon.png', + 'phase_4/maps/tt_t_chr_avt_shirt_lawbotVPIcon.png', + 'phase_4/maps/tt_t_chr_avt_shirt_lawbotCrusher.png', + 'phase_4/maps/tt_t_chr_avt_shirt_bee.png', + 'phase_4/maps/tt_t_chr_avt_shirt_pirate.png', + 'phase_4/maps/tt_t_chr_avt_shirt_supertoon.png', + 'phase_4/maps/tt_t_chr_avt_shirt_vampire.png', + 'phase_4/maps/tt_t_chr_avt_shirt_dinosaur.png', + 'phase_4/maps/tt_t_chr_avt_shirt_fishing04.png', + 'phase_4/maps/tt_t_chr_avt_shirt_golf03.png', + 'phase_4/maps/tt_t_chr_avt_shirt_mostCogsDefeated02.png', + 'phase_4/maps/tt_t_chr_avt_shirt_racing03.png', + 'phase_4/maps/tt_t_chr_avt_shirt_saveBuilding3.png', + 'phase_4/maps/tt_t_chr_avt_shirt_trolley03.png', + 'phase_4/maps/tt_t_chr_avt_shirt_fishing05.png', + 'phase_4/maps/tt_t_chr_avt_shirt_golf04.png', + 'phase_4/maps/tt_t_chr_avt_shirt_halloween06.png', + 'phase_4/maps/tt_t_chr_avt_shirt_winter03.png', + 'phase_4/maps/tt_t_chr_avt_shirt_halloween07.png', + 'phase_4/maps/tt_t_chr_avt_shirt_winter02.png', + 'phase_4/maps/tt_t_chr_avt_shirt_fishing06.png', + 'phase_4/maps/tt_t_chr_avt_shirt_fishing07.png', + 'phase_4/maps/tt_t_chr_avt_shirt_golf05.png', + 'phase_4/maps/tt_t_chr_avt_shirt_racing04.png', + 'phase_4/maps/tt_t_chr_avt_shirt_racing05.png', + 'phase_4/maps/tt_t_chr_avt_shirt_mostCogsDefeated03.png', + 'phase_4/maps/tt_t_chr_avt_shirt_mostCogsDefeated04.png', + 'phase_4/maps/tt_t_chr_avt_shirt_trolley04.png', + 'phase_4/maps/tt_t_chr_avt_shirt_trolley05.png', + 'phase_4/maps/tt_t_chr_avt_shirt_saveBuilding4.png', + 'phase_4/maps/tt_t_chr_avt_shirt_saveBuilding05.png', + 'phase_4/maps/tt_t_chr_avt_shirt_anniversary.png'] BoyShirts = [(0, 0), (1, 1), (2, 2), @@ -373,267 +373,267 @@ def isValidGirlShirt(index): return 0 -Sleeves = ['phase_3/maps/desat_sleeve_1.jpg', - 'phase_3/maps/desat_sleeve_2.jpg', - 'phase_3/maps/desat_sleeve_3.jpg', - 'phase_3/maps/desat_sleeve_4.jpg', - 'phase_3/maps/desat_sleeve_5.jpg', - 'phase_3/maps/desat_sleeve_6.jpg', - 'phase_3/maps/desat_sleeve_7.jpg', - 'phase_3/maps/desat_sleeve_8.jpg', - 'phase_3/maps/desat_sleeve_9.jpg', - 'phase_3/maps/desat_sleeve_10.jpg', - 'phase_3/maps/desat_sleeve_15.jpg', - 'phase_3/maps/desat_sleeve_16.jpg', - 'phase_3/maps/desat_sleeve_19.jpg', - 'phase_3/maps/desat_sleeve_20.jpg', - 'phase_4/maps/female_sleeve1b.jpg', - 'phase_4/maps/female_sleeve2.jpg', - 'phase_4/maps/female_sleeve3.jpg', - 'phase_4/maps/male_sleeve1.jpg', - 'phase_4/maps/male_sleeve2_palm.jpg', - 'phase_4/maps/male_sleeve3c.jpg', - 'phase_4/maps/shirt_Sleeve_ghost.jpg', - 'phase_4/maps/shirt_Sleeve_pumkin.jpg', - 'phase_4/maps/holidaySleeve1.jpg', - 'phase_4/maps/holidaySleeve3.jpg', - 'phase_4/maps/female_sleeve1b.jpg', - 'phase_4/maps/female_sleeve5New.jpg', - 'phase_4/maps/male_sleeve4New.jpg', - 'phase_4/maps/sleeve6New.jpg', - 'phase_4/maps/SleeveMaleNew7.jpg', - 'phase_4/maps/female_sleeveNew6.jpg', - 'phase_4/maps/Vday5Sleeve.jpg', - 'phase_4/maps/Vda6Sleeve.jpg', - 'phase_4/maps/Vday_shirt4sleeve.jpg', - 'phase_4/maps/Vday2cSleeve.jpg', - 'phase_4/maps/sleeveTieDye.jpg', - 'phase_4/maps/male_sleeve1.jpg', - 'phase_4/maps/StPats_sleeve.jpg', - 'phase_4/maps/StPats_sleeve2.jpg', - 'phase_4/maps/ContestfishingVestSleeve1.jpg', - 'phase_4/maps/ContestFishtankSleeve1.jpg', - 'phase_4/maps/ContestPawSleeve1.jpg', - 'phase_4/maps/CowboySleeve1.jpg', - 'phase_4/maps/CowboySleeve2.jpg', - 'phase_4/maps/CowboySleeve3.jpg', - 'phase_4/maps/CowboySleeve4.jpg', - 'phase_4/maps/CowboySleeve5.jpg', - 'phase_4/maps/CowboySleeve6.jpg', - 'phase_4/maps/4thJulySleeve1.jpg', - 'phase_4/maps/4thJulySleeve2.jpg', - 'phase_4/maps/shirt_sleeveCat7_01.jpg', - 'phase_4/maps/shirt_sleeveCat7_02.jpg', - 'phase_4/maps/contest_backpack_sleeve.jpg', - 'phase_4/maps/Contest_leder_sleeve.jpg', - 'phase_4/maps/contest_mellon_sleeve2.jpg', - 'phase_4/maps/contest_race_sleeve.jpg', - 'phase_4/maps/PJSleeveBlue.jpg', - 'phase_4/maps/PJSleeveRed.jpg', - 'phase_4/maps/PJSleevePurple.jpg', - 'phase_4/maps/tt_t_chr_avt_shirtSleeve_valentine1.jpg', - 'phase_4/maps/tt_t_chr_avt_shirtSleeve_valentine2.jpg', - 'phase_4/maps/tt_t_chr_avt_shirtSleeve_desat4.jpg', - 'phase_4/maps/tt_t_chr_avt_shirtSleeve_fishing1.jpg', - 'phase_4/maps/tt_t_chr_avt_shirtSleeve_fishing2.jpg', - 'phase_4/maps/tt_t_chr_avt_shirtSleeve_gardening1.jpg', - 'phase_4/maps/tt_t_chr_avt_shirtSleeve_gardening2.jpg', - 'phase_4/maps/tt_t_chr_avt_shirtSleeve_party1.jpg', - 'phase_4/maps/tt_t_chr_avt_shirtSleeve_party2.jpg', - 'phase_4/maps/tt_t_chr_avt_shirtSleeve_racing1.jpg', - 'phase_4/maps/tt_t_chr_avt_shirtSleeve_racing2.jpg', - 'phase_4/maps/tt_t_chr_avt_shirtSleeve_summer1.jpg', - 'phase_4/maps/tt_t_chr_avt_shirtSleeve_summer2.jpg', - 'phase_4/maps/tt_t_chr_avt_shirtSleeve_golf1.jpg', - 'phase_4/maps/tt_t_chr_avt_shirtSleeve_golf2.jpg', - 'phase_4/maps/tt_t_chr_avt_shirtSleeve_halloween1.jpg', - 'phase_4/maps/tt_t_chr_avt_shirtSleeve_halloween2.jpg', - 'phase_4/maps/tt_t_chr_avt_shirtSleeve_marathon1.jpg', - 'phase_4/maps/tt_t_chr_avt_shirtSleeve_saveBuilding1.jpg', - 'phase_4/maps/tt_t_chr_avt_shirtSleeve_saveBuilding2.jpg', - 'phase_4/maps/tt_t_chr_avt_shirtSleeve_toonTask1.jpg', - 'phase_4/maps/tt_t_chr_avt_shirtSleeve_toonTask2.jpg', - 'phase_4/maps/tt_t_chr_avt_shirtSleeve_trolley1.jpg', - 'phase_4/maps/tt_t_chr_avt_shirtSleeve_trolley2.jpg', - 'phase_4/maps/tt_t_chr_avt_shirtSleeve_winter1.jpg', - 'phase_4/maps/tt_t_chr_avt_shirtSleeve_halloween3.jpg', - 'phase_4/maps/tt_t_chr_avt_shirtSleeve_halloween4.jpg', - 'phase_4/maps/tt_t_chr_avt_shirtSleeve_valentine3.jpg', - 'phase_4/maps/tt_t_chr_shirtSleeve_scientist.jpg', - 'phase_4/maps/tt_t_chr_avt_shirtSleeve_mailbox.jpg', - 'phase_4/maps/tt_t_chr_avt_shirtSleeve_trashcan.jpg', - 'phase_4/maps/tt_t_chr_avt_shirtSleeve_loonyLabs.jpg', - 'phase_4/maps/tt_t_chr_avt_shirtSleeve_hydrant.jpg', - 'phase_4/maps/tt_t_chr_avt_shirtSleeve_whistle.jpg', - 'phase_4/maps/tt_t_chr_avt_shirtSleeve_cogbuster.jpg', - 'phase_4/maps/tt_t_chr_avt_shirtSleeve_mostCogsDefeated01.jpg', - 'phase_4/maps/tt_t_chr_avt_shirtSleeve_victoryParty01.jpg', - 'phase_4/maps/tt_t_chr_avt_shirtSleeve_victoryParty02.jpg', - 'phase_4/maps/tt_t_chr_avt_shirtSleeve_sellbotIcon.jpg', - 'phase_4/maps/tt_t_chr_avt_shirtSleeve_sellbotVPIcon.jpg', - 'phase_4/maps/tt_t_chr_avt_shirtSleeve_sellbotCrusher.jpg', - 'phase_4/maps/tt_t_chr_avt_shirtSleeve_jellyBeans.jpg', - 'phase_4/maps/tt_t_chr_avt_shirtSleeve_doodle.jpg', - 'phase_4/maps/tt_t_chr_avt_shirtSleeve_halloween5.jpg', - 'phase_4/maps/tt_t_chr_avt_shirtSleeve_halloweenTurtle.jpg', - 'phase_4/maps/tt_t_chr_avt_shirtSleeve_greentoon1.jpg', - 'phase_4/maps/tt_t_chr_avt_shirtSleeve_getConnectedMoverShaker.jpg', - 'phase_4/maps/tt_t_chr_avt_shirtSleeve_racingGrandPrix.jpg', - 'phase_4/maps/tt_t_chr_avt_shirtSleeve_lawbotIcon.jpg', - 'phase_4/maps/tt_t_chr_avt_shirtSleeve_lawbotVPIcon.jpg', - 'phase_4/maps/tt_t_chr_avt_shirtSleeve_lawbotCrusher.jpg', - 'phase_4/maps/tt_t_chr_avt_shirtSleeve_bee.jpg', - 'phase_4/maps/tt_t_chr_avt_shirtSleeve_pirate.jpg', - 'phase_4/maps/tt_t_chr_avt_shirtSleeve_supertoon.jpg', - 'phase_4/maps/tt_t_chr_avt_shirtSleeve_vampire.jpg', - 'phase_4/maps/tt_t_chr_avt_shirtSleeve_dinosaur.jpg', - 'phase_4/maps/tt_t_chr_avt_shirtSleeve_fishing04.jpg', - 'phase_4/maps/tt_t_chr_avt_shirtSleeve_golf03.jpg', - 'phase_4/maps/tt_t_chr_avt_shirtSleeve_mostCogsDefeated02.jpg', - 'phase_4/maps/tt_t_chr_avt_shirtSleeve_racing03.jpg', - 'phase_4/maps/tt_t_chr_avt_shirtSleeve_saveBuilding3.jpg', - 'phase_4/maps/tt_t_chr_avt_shirtSleeve_trolley03.jpg', - 'phase_4/maps/tt_t_chr_avt_shirtSleeve_fishing05.jpg', - 'phase_4/maps/tt_t_chr_avt_shirtSleeve_golf04.jpg', - 'phase_4/maps/tt_t_chr_avt_shirtSleeve_halloween06.jpg', - 'phase_4/maps/tt_t_chr_avt_shirtSleeve_winter03.jpg', - 'phase_4/maps/tt_t_chr_avt_shirtSleeve_halloween07.jpg', - 'phase_4/maps/tt_t_chr_avt_shirtSleeve_winter02.jpg', - 'phase_4/maps/tt_t_chr_avt_shirtSleeve_fishing06.jpg', - 'phase_4/maps/tt_t_chr_avt_shirtSleeve_fishing07.jpg', - 'phase_4/maps/tt_t_chr_avt_shirtSleeve_golf05.jpg', - 'phase_4/maps/tt_t_chr_avt_shirtSleeve_racing04.jpg', - 'phase_4/maps/tt_t_chr_avt_shirtSleeve_racing05.jpg', - 'phase_4/maps/tt_t_chr_avt_shirtSleeve_mostCogsDefeated03.jpg', - 'phase_4/maps/tt_t_chr_avt_shirtSleeve_mostCogsDefeated04.jpg', - 'phase_4/maps/tt_t_chr_avt_shirtSleeve_trolley04.jpg', - 'phase_4/maps/tt_t_chr_avt_shirtSleeve_trolley05.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'] -BoyShorts = ['phase_3/maps/desat_shorts_1.jpg', - 'phase_3/maps/desat_shorts_2.jpg', - 'phase_3/maps/desat_shorts_4.jpg', - 'phase_3/maps/desat_shorts_6.jpg', - 'phase_3/maps/desat_shorts_7.jpg', - 'phase_3/maps/desat_shorts_8.jpg', - 'phase_3/maps/desat_shorts_9.jpg', - 'phase_3/maps/desat_shorts_10.jpg', - 'phase_4/maps/VdayShorts2.jpg', - 'phase_4/maps/shorts4.jpg', - 'phase_4/maps/shorts1.jpg', - 'phase_4/maps/shorts5.jpg', - 'phase_4/maps/CowboyShorts1.jpg', - 'phase_4/maps/CowboyShorts2.jpg', - 'phase_4/maps/4thJulyShorts1.jpg', - 'phase_4/maps/shortsCat7_01.jpg', - 'phase_4/maps/Blue_shorts_1.jpg', - 'phase_4/maps/Red_shorts_1.jpg', - 'phase_4/maps/Purple_shorts_1.jpg', - 'phase_4/maps/tt_t_chr_avt_shorts_winter1.jpg', - 'phase_4/maps/tt_t_chr_avt_shorts_winter2.jpg', - 'phase_4/maps/tt_t_chr_avt_shorts_winter3.jpg', - 'phase_4/maps/tt_t_chr_avt_shorts_winter4.jpg', - 'phase_4/maps/tt_t_chr_avt_shorts_valentine1.jpg', - 'phase_4/maps/tt_t_chr_avt_shorts_valentine2.jpg', - 'phase_4/maps/tt_t_chr_avt_shorts_fishing1.jpg', - 'phase_4/maps/tt_t_chr_avt_shorts_gardening1.jpg', - 'phase_4/maps/tt_t_chr_avt_shorts_party1.jpg', - 'phase_4/maps/tt_t_chr_avt_shorts_racing1.jpg', - 'phase_4/maps/tt_t_chr_avt_shorts_summer1.jpg', - 'phase_4/maps/tt_t_chr_avt_shorts_golf1.jpg', - 'phase_4/maps/tt_t_chr_avt_shorts_halloween1.jpg', - 'phase_4/maps/tt_t_chr_avt_shorts_halloween2.jpg', - 'phase_4/maps/tt_t_chr_avt_shorts_saveBuilding1.jpg', - 'phase_4/maps/tt_t_chr_avt_shorts_trolley1.jpg', - 'phase_4/maps/tt_t_chr_avt_shorts_halloween4.jpg', - 'phase_4/maps/tt_t_chr_avt_shorts_halloween3.jpg', - 'phase_4/maps/tt_t_chr_shorts_scientistA.jpg', - 'phase_4/maps/tt_t_chr_shorts_scientistB.jpg', - 'phase_4/maps/tt_t_chr_shorts_scientistC.jpg', - 'phase_4/maps/tt_t_chr_avt_shorts_cogbuster.jpg', - 'phase_4/maps/tt_t_chr_avt_shorts_sellbotCrusher.jpg', - 'phase_4/maps/tt_t_chr_avt_shorts_halloween5.jpg', - 'phase_4/maps/tt_t_chr_avt_shorts_halloweenTurtle.jpg', - 'phase_4/maps/tt_t_chr_avt_shorts_greentoon1.jpg', - 'phase_4/maps/tt_t_chr_avt_shorts_racingGrandPrix.jpg', - 'phase_4/maps/tt_t_chr_avt_shorts_lawbotCrusher.jpg', - 'phase_4/maps/tt_t_chr_avt_shorts_bee.jpg', - 'phase_4/maps/tt_t_chr_avt_shorts_pirate.jpg', - 'phase_4/maps/tt_t_chr_avt_shorts_supertoon.jpg', - 'phase_4/maps/tt_t_chr_avt_shorts_vampire.jpg', - 'phase_4/maps/tt_t_chr_avt_shorts_dinosaur.jpg', - 'phase_4/maps/tt_t_chr_avt_shorts_golf03.jpg', - 'phase_4/maps/tt_t_chr_avt_shorts_racing03.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'] +Sleeves = ['phase_3/maps/desat_sleeve_1.png', + 'phase_3/maps/desat_sleeve_2.png', + 'phase_3/maps/desat_sleeve_3.png', + 'phase_3/maps/desat_sleeve_4.png', + 'phase_3/maps/desat_sleeve_5.png', + 'phase_3/maps/desat_sleeve_6.png', + 'phase_3/maps/desat_sleeve_7.png', + 'phase_3/maps/desat_sleeve_8.png', + 'phase_3/maps/desat_sleeve_9.png', + 'phase_3/maps/desat_sleeve_10.png', + 'phase_3/maps/desat_sleeve_15.png', + 'phase_3/maps/desat_sleeve_16.png', + 'phase_3/maps/desat_sleeve_19.png', + 'phase_3/maps/desat_sleeve_20.png', + 'phase_4/maps/female_sleeve1b.png', + 'phase_4/maps/female_sleeve2.png', + 'phase_4/maps/female_sleeve3.png', + 'phase_4/maps/male_sleeve1.png', + 'phase_4/maps/male_sleeve2_palm.png', + 'phase_4/maps/male_sleeve3c.png', + 'phase_4/maps/shirt_Sleeve_ghost.png', + 'phase_4/maps/shirt_Sleeve_pumkin.png', + 'phase_4/maps/holidaySleeve1.png', + 'phase_4/maps/holidaySleeve3.png', + 'phase_4/maps/female_sleeve1b.png', + 'phase_4/maps/female_sleeve5New.png', + 'phase_4/maps/male_sleeve4New.png', + 'phase_4/maps/sleeve6New.png', + 'phase_4/maps/SleeveMaleNew7.png', + 'phase_4/maps/female_sleeveNew6.png', + 'phase_4/maps/Vday5Sleeve.png', + 'phase_4/maps/Vda6Sleeve.png', + 'phase_4/maps/Vday_shirt4sleeve.png', + 'phase_4/maps/Vday2cSleeve.png', + 'phase_4/maps/sleeveTieDye.png', + 'phase_4/maps/male_sleeve1.png', + 'phase_4/maps/StPats_sleeve.png', + 'phase_4/maps/StPats_sleeve2.png', + 'phase_4/maps/ContestfishingVestSleeve1.png', + 'phase_4/maps/ContestFishtankSleeve1.png', + 'phase_4/maps/ContestPawSleeve1.png', + 'phase_4/maps/CowboySleeve1.png', + 'phase_4/maps/CowboySleeve2.png', + 'phase_4/maps/CowboySleeve3.png', + 'phase_4/maps/CowboySleeve4.png', + 'phase_4/maps/CowboySleeve5.png', + 'phase_4/maps/CowboySleeve6.png', + 'phase_4/maps/4thJulySleeve1.png', + 'phase_4/maps/4thJulySleeve2.png', + 'phase_4/maps/shirt_sleeveCat7_01.png', + 'phase_4/maps/shirt_sleeveCat7_02.png', + 'phase_4/maps/contest_backpack_sleeve.png', + 'phase_4/maps/Contest_leder_sleeve.png', + 'phase_4/maps/contest_mellon_sleeve2.png', + 'phase_4/maps/contest_race_sleeve.png', + 'phase_4/maps/PJSleeveBlue.png', + 'phase_4/maps/PJSleeveRed.png', + 'phase_4/maps/PJSleevePurple.png', + 'phase_4/maps/tt_t_chr_avt_shirtSleeve_valentine1.png', + 'phase_4/maps/tt_t_chr_avt_shirtSleeve_valentine2.png', + 'phase_4/maps/tt_t_chr_avt_shirtSleeve_desat4.png', + 'phase_4/maps/tt_t_chr_avt_shirtSleeve_fishing1.png', + 'phase_4/maps/tt_t_chr_avt_shirtSleeve_fishing2.png', + 'phase_4/maps/tt_t_chr_avt_shirtSleeve_gardening1.png', + 'phase_4/maps/tt_t_chr_avt_shirtSleeve_gardening2.png', + 'phase_4/maps/tt_t_chr_avt_shirtSleeve_party1.png', + 'phase_4/maps/tt_t_chr_avt_shirtSleeve_party2.png', + 'phase_4/maps/tt_t_chr_avt_shirtSleeve_racing1.png', + 'phase_4/maps/tt_t_chr_avt_shirtSleeve_racing2.png', + 'phase_4/maps/tt_t_chr_avt_shirtSleeve_summer1.png', + 'phase_4/maps/tt_t_chr_avt_shirtSleeve_summer2.png', + 'phase_4/maps/tt_t_chr_avt_shirtSleeve_golf1.png', + 'phase_4/maps/tt_t_chr_avt_shirtSleeve_golf2.png', + 'phase_4/maps/tt_t_chr_avt_shirtSleeve_halloween1.png', + 'phase_4/maps/tt_t_chr_avt_shirtSleeve_halloween2.png', + 'phase_4/maps/tt_t_chr_avt_shirtSleeve_marathon1.png', + 'phase_4/maps/tt_t_chr_avt_shirtSleeve_saveBuilding1.png', + 'phase_4/maps/tt_t_chr_avt_shirtSleeve_saveBuilding2.png', + 'phase_4/maps/tt_t_chr_avt_shirtSleeve_toonTask1.png', + 'phase_4/maps/tt_t_chr_avt_shirtSleeve_toonTask2.png', + 'phase_4/maps/tt_t_chr_avt_shirtSleeve_trolley1.png', + 'phase_4/maps/tt_t_chr_avt_shirtSleeve_trolley2.png', + 'phase_4/maps/tt_t_chr_avt_shirtSleeve_winter1.png', + 'phase_4/maps/tt_t_chr_avt_shirtSleeve_halloween3.png', + 'phase_4/maps/tt_t_chr_avt_shirtSleeve_halloween4.png', + 'phase_4/maps/tt_t_chr_avt_shirtSleeve_valentine3.png', + 'phase_4/maps/tt_t_chr_shirtSleeve_scientist.png', + 'phase_4/maps/tt_t_chr_avt_shirtSleeve_mailbox.png', + 'phase_4/maps/tt_t_chr_avt_shirtSleeve_trashcan.png', + 'phase_4/maps/tt_t_chr_avt_shirtSleeve_loonyLabs.png', + 'phase_4/maps/tt_t_chr_avt_shirtSleeve_hydrant.png', + 'phase_4/maps/tt_t_chr_avt_shirtSleeve_whistle.png', + 'phase_4/maps/tt_t_chr_avt_shirtSleeve_cogbuster.png', + 'phase_4/maps/tt_t_chr_avt_shirtSleeve_mostCogsDefeated01.png', + 'phase_4/maps/tt_t_chr_avt_shirtSleeve_victoryParty01.png', + 'phase_4/maps/tt_t_chr_avt_shirtSleeve_victoryParty02.png', + 'phase_4/maps/tt_t_chr_avt_shirtSleeve_sellbotIcon.png', + 'phase_4/maps/tt_t_chr_avt_shirtSleeve_sellbotVPIcon.png', + 'phase_4/maps/tt_t_chr_avt_shirtSleeve_sellbotCrusher.png', + 'phase_4/maps/tt_t_chr_avt_shirtSleeve_jellyBeans.png', + 'phase_4/maps/tt_t_chr_avt_shirtSleeve_doodle.png', + 'phase_4/maps/tt_t_chr_avt_shirtSleeve_halloween5.png', + 'phase_4/maps/tt_t_chr_avt_shirtSleeve_halloweenTurtle.png', + 'phase_4/maps/tt_t_chr_avt_shirtSleeve_greentoon1.png', + 'phase_4/maps/tt_t_chr_avt_shirtSleeve_getConnectedMoverShaker.png', + 'phase_4/maps/tt_t_chr_avt_shirtSleeve_racingGrandPrix.png', + 'phase_4/maps/tt_t_chr_avt_shirtSleeve_lawbotIcon.png', + 'phase_4/maps/tt_t_chr_avt_shirtSleeve_lawbotVPIcon.png', + 'phase_4/maps/tt_t_chr_avt_shirtSleeve_lawbotCrusher.png', + 'phase_4/maps/tt_t_chr_avt_shirtSleeve_bee.png', + 'phase_4/maps/tt_t_chr_avt_shirtSleeve_pirate.png', + 'phase_4/maps/tt_t_chr_avt_shirtSleeve_supertoon.png', + 'phase_4/maps/tt_t_chr_avt_shirtSleeve_vampire.png', + 'phase_4/maps/tt_t_chr_avt_shirtSleeve_dinosaur.png', + 'phase_4/maps/tt_t_chr_avt_shirtSleeve_fishing04.png', + 'phase_4/maps/tt_t_chr_avt_shirtSleeve_golf03.png', + 'phase_4/maps/tt_t_chr_avt_shirtSleeve_mostCogsDefeated02.png', + 'phase_4/maps/tt_t_chr_avt_shirtSleeve_racing03.png', + 'phase_4/maps/tt_t_chr_avt_shirtSleeve_saveBuilding3.png', + 'phase_4/maps/tt_t_chr_avt_shirtSleeve_trolley03.png', + 'phase_4/maps/tt_t_chr_avt_shirtSleeve_fishing05.png', + 'phase_4/maps/tt_t_chr_avt_shirtSleeve_golf04.png', + 'phase_4/maps/tt_t_chr_avt_shirtSleeve_halloween06.png', + 'phase_4/maps/tt_t_chr_avt_shirtSleeve_winter03.png', + 'phase_4/maps/tt_t_chr_avt_shirtSleeve_halloween07.png', + 'phase_4/maps/tt_t_chr_avt_shirtSleeve_winter02.png', + 'phase_4/maps/tt_t_chr_avt_shirtSleeve_fishing06.png', + 'phase_4/maps/tt_t_chr_avt_shirtSleeve_fishing07.png', + 'phase_4/maps/tt_t_chr_avt_shirtSleeve_golf05.png', + 'phase_4/maps/tt_t_chr_avt_shirtSleeve_racing04.png', + 'phase_4/maps/tt_t_chr_avt_shirtSleeve_racing05.png', + 'phase_4/maps/tt_t_chr_avt_shirtSleeve_mostCogsDefeated03.png', + 'phase_4/maps/tt_t_chr_avt_shirtSleeve_mostCogsDefeated04.png', + 'phase_4/maps/tt_t_chr_avt_shirtSleeve_trolley04.png', + 'phase_4/maps/tt_t_chr_avt_shirtSleeve_trolley05.png', + 'phase_4/maps/tt_t_chr_avt_shirtSleeve_saveBuilding4.png', + 'phase_4/maps/tt_t_chr_avt_shirtSleeve_saveBuilding05.png', + 'phase_4/maps/tt_t_chr_avt_shirtSleeve_anniversary.png'] +BoyShorts = ['phase_3/maps/desat_shorts_1.png', + 'phase_3/maps/desat_shorts_2.png', + 'phase_3/maps/desat_shorts_4.png', + 'phase_3/maps/desat_shorts_6.png', + 'phase_3/maps/desat_shorts_7.png', + 'phase_3/maps/desat_shorts_8.png', + 'phase_3/maps/desat_shorts_9.png', + 'phase_3/maps/desat_shorts_10.png', + 'phase_4/maps/VdayShorts2.png', + 'phase_4/maps/shorts4.png', + 'phase_4/maps/shorts1.png', + 'phase_4/maps/shorts5.png', + 'phase_4/maps/CowboyShorts1.png', + 'phase_4/maps/CowboyShorts2.png', + 'phase_4/maps/4thJulyShorts1.png', + 'phase_4/maps/shortsCat7_01.png', + 'phase_4/maps/Blue_shorts_1.png', + 'phase_4/maps/Red_shorts_1.png', + 'phase_4/maps/Purple_shorts_1.png', + 'phase_4/maps/tt_t_chr_avt_shorts_winter1.png', + 'phase_4/maps/tt_t_chr_avt_shorts_winter2.png', + 'phase_4/maps/tt_t_chr_avt_shorts_winter3.png', + 'phase_4/maps/tt_t_chr_avt_shorts_winter4.png', + 'phase_4/maps/tt_t_chr_avt_shorts_valentine1.png', + 'phase_4/maps/tt_t_chr_avt_shorts_valentine2.png', + 'phase_4/maps/tt_t_chr_avt_shorts_fishing1.png', + 'phase_4/maps/tt_t_chr_avt_shorts_gardening1.png', + 'phase_4/maps/tt_t_chr_avt_shorts_party1.png', + 'phase_4/maps/tt_t_chr_avt_shorts_racing1.png', + 'phase_4/maps/tt_t_chr_avt_shorts_summer1.png', + 'phase_4/maps/tt_t_chr_avt_shorts_golf1.png', + 'phase_4/maps/tt_t_chr_avt_shorts_halloween1.png', + 'phase_4/maps/tt_t_chr_avt_shorts_halloween2.png', + 'phase_4/maps/tt_t_chr_avt_shorts_saveBuilding1.png', + 'phase_4/maps/tt_t_chr_avt_shorts_trolley1.png', + 'phase_4/maps/tt_t_chr_avt_shorts_halloween4.png', + 'phase_4/maps/tt_t_chr_avt_shorts_halloween3.png', + 'phase_4/maps/tt_t_chr_shorts_scientistA.png', + 'phase_4/maps/tt_t_chr_shorts_scientistB.png', + 'phase_4/maps/tt_t_chr_shorts_scientistC.png', + 'phase_4/maps/tt_t_chr_avt_shorts_cogbuster.png', + 'phase_4/maps/tt_t_chr_avt_shorts_sellbotCrusher.png', + 'phase_4/maps/tt_t_chr_avt_shorts_halloween5.png', + 'phase_4/maps/tt_t_chr_avt_shorts_halloweenTurtle.png', + 'phase_4/maps/tt_t_chr_avt_shorts_greentoon1.png', + 'phase_4/maps/tt_t_chr_avt_shorts_racingGrandPrix.png', + 'phase_4/maps/tt_t_chr_avt_shorts_lawbotCrusher.png', + 'phase_4/maps/tt_t_chr_avt_shorts_bee.png', + 'phase_4/maps/tt_t_chr_avt_shorts_pirate.png', + 'phase_4/maps/tt_t_chr_avt_shorts_supertoon.png', + 'phase_4/maps/tt_t_chr_avt_shorts_vampire.png', + 'phase_4/maps/tt_t_chr_avt_shorts_dinosaur.png', + 'phase_4/maps/tt_t_chr_avt_shorts_golf03.png', + 'phase_4/maps/tt_t_chr_avt_shorts_racing03.png', + 'phase_4/maps/tt_t_chr_avt_shorts_golf04.png', + 'phase_4/maps/tt_t_chr_avt_shorts_golf05.png', + 'phase_4/maps/tt_t_chr_avt_shorts_racing04.png', + 'phase_4/maps/tt_t_chr_avt_shorts_racing05.png'] SHORTS = 0 SKIRT = 1 -GirlBottoms = [('phase_3/maps/desat_skirt_1.jpg', SKIRT), - ('phase_3/maps/desat_skirt_2.jpg', SKIRT), - ('phase_3/maps/desat_skirt_3.jpg', SKIRT), - ('phase_3/maps/desat_skirt_4.jpg', SKIRT), - ('phase_3/maps/desat_skirt_5.jpg', SKIRT), - ('phase_3/maps/desat_shorts_1.jpg', SHORTS), - ('phase_3/maps/desat_shorts_5.jpg', SHORTS), - ('phase_3/maps/desat_skirt_6.jpg', SKIRT), - ('phase_3/maps/desat_skirt_7.jpg', SKIRT), - ('phase_3/maps/desat_shorts_10.jpg', SHORTS), - ('phase_4/maps/female_skirt1.jpg', SKIRT), - ('phase_4/maps/female_skirt2.jpg', SKIRT), - ('phase_4/maps/female_skirt3.jpg', SKIRT), - ('phase_4/maps/VdaySkirt1.jpg', SKIRT), - ('phase_4/maps/skirtNew5.jpg', SKIRT), - ('phase_4/maps/shorts5.jpg', SHORTS), - ('phase_4/maps/CowboySkirt1.jpg', SKIRT), - ('phase_4/maps/CowboySkirt2.jpg', SKIRT), - ('phase_4/maps/4thJulySkirt1.jpg', SKIRT), - ('phase_4/maps/skirtCat7_01.jpg', SKIRT), - ('phase_4/maps/Blue_shorts_1.jpg', SHORTS), - ('phase_4/maps/Red_shorts_1.jpg', SHORTS), - ('phase_4/maps/Purple_shorts_1.jpg', SHORTS), - ('phase_4/maps/tt_t_chr_avt_skirt_winter1.jpg', SKIRT), - ('phase_4/maps/tt_t_chr_avt_skirt_winter2.jpg', SKIRT), - ('phase_4/maps/tt_t_chr_avt_skirt_winter3.jpg', SKIRT), - ('phase_4/maps/tt_t_chr_avt_skirt_winter4.jpg', SKIRT), - ('phase_4/maps/tt_t_chr_avt_skirt_valentine1.jpg', SKIRT), - ('phase_4/maps/tt_t_chr_avt_skirt_valentine2.jpg', SKIRT), - ('phase_4/maps/tt_t_chr_avt_skirt_fishing1.jpg', SKIRT), - ('phase_4/maps/tt_t_chr_avt_skirt_gardening1.jpg', SKIRT), - ('phase_4/maps/tt_t_chr_avt_skirt_party1.jpg', SKIRT), - ('phase_4/maps/tt_t_chr_avt_skirt_racing1.jpg', SKIRT), - ('phase_4/maps/tt_t_chr_avt_skirt_summer1.jpg', SKIRT), - ('phase_4/maps/tt_t_chr_avt_skirt_golf1.jpg', SKIRT), - ('phase_4/maps/tt_t_chr_avt_skirt_halloween1.jpg', SKIRT), - ('phase_4/maps/tt_t_chr_avt_skirt_halloween2.jpg', SKIRT), - ('phase_4/maps/tt_t_chr_avt_skirt_saveBuilding1.jpg', SKIRT), - ('phase_4/maps/tt_t_chr_avt_skirt_trolley1.jpg', SKIRT), - ('phase_4/maps/tt_t_chr_avt_skirt_halloween3.jpg', SKIRT), - ('phase_4/maps/tt_t_chr_avt_skirt_halloween4.jpg', SKIRT), - ('phase_4/maps/tt_t_chr_shorts_scientistA.jpg', SHORTS), - ('phase_4/maps/tt_t_chr_shorts_scientistB.jpg', SHORTS), - ('phase_4/maps/tt_t_chr_shorts_scientistC.jpg', SHORTS), - ('phase_4/maps/tt_t_chr_avt_shorts_cogbuster.jpg', SHORTS), - ('phase_4/maps/tt_t_chr_avt_shorts_sellbotCrusher.jpg', SHORTS), - ('phase_4/maps/tt_t_chr_avt_shorts_halloween5.jpg', SHORTS), - ('phase_4/maps/tt_t_chr_avt_shorts_halloweenTurtle.jpg', SHORTS), - ('phase_4/maps/tt_t_chr_avt_skirt_greentoon1.jpg', SKIRT), - ('phase_4/maps/tt_t_chr_avt_skirt_racingGrandPrix.jpg', SKIRT), - ('phase_4/maps/tt_t_chr_avt_shorts_lawbotCrusher.jpg', SHORTS), - ('phase_4/maps/tt_t_chr_avt_shorts_bee.jpg', SHORTS), - ('phase_4/maps/tt_t_chr_avt_shorts_pirate.jpg', SHORTS), - ('phase_4/maps/tt_t_chr_avt_skirt_pirate.jpg', SKIRT), - ('phase_4/maps/tt_t_chr_avt_shorts_supertoon.jpg', SHORTS), - ('phase_4/maps/tt_t_chr_avt_shorts_vampire.jpg', SHORTS), - ('phase_4/maps/tt_t_chr_avt_shorts_dinosaur.jpg', SHORTS), - ('phase_4/maps/tt_t_chr_avt_skirt_golf02.jpg', SKIRT), - ('phase_4/maps/tt_t_chr_avt_skirt_racing03.jpg', SKIRT), - ('phase_4/maps/tt_t_chr_avt_skirt_golf03.jpg', SKIRT), - ('phase_4/maps/tt_t_chr_avt_skirt_golf04.jpg', SKIRT), - ('phase_4/maps/tt_t_chr_avt_skirt_racing04.jpg', SKIRT), - ('phase_4/maps/tt_t_chr_avt_skirt_racing05.jpg', SKIRT)] +GirlBottoms = [('phase_3/maps/desat_skirt_1.png', SKIRT), + ('phase_3/maps/desat_skirt_2.png', SKIRT), + ('phase_3/maps/desat_skirt_3.png', SKIRT), + ('phase_3/maps/desat_skirt_4.png', SKIRT), + ('phase_3/maps/desat_skirt_5.png', SKIRT), + ('phase_3/maps/desat_shorts_1.png', SHORTS), + ('phase_3/maps/desat_shorts_5.png', SHORTS), + ('phase_3/maps/desat_skirt_6.png', SKIRT), + ('phase_3/maps/desat_skirt_7.png', SKIRT), + ('phase_3/maps/desat_shorts_10.png', SHORTS), + ('phase_4/maps/female_skirt1.png', SKIRT), + ('phase_4/maps/female_skirt2.png', SKIRT), + ('phase_4/maps/female_skirt3.png', SKIRT), + ('phase_4/maps/VdaySkirt1.png', SKIRT), + ('phase_4/maps/skirtNew5.png', SKIRT), + ('phase_4/maps/shorts5.png', SHORTS), + ('phase_4/maps/CowboySkirt1.png', SKIRT), + ('phase_4/maps/CowboySkirt2.png', SKIRT), + ('phase_4/maps/4thJulySkirt1.png', SKIRT), + ('phase_4/maps/skirtCat7_01.png', SKIRT), + ('phase_4/maps/Blue_shorts_1.png', SHORTS), + ('phase_4/maps/Red_shorts_1.png', SHORTS), + ('phase_4/maps/Purple_shorts_1.png', SHORTS), + ('phase_4/maps/tt_t_chr_avt_skirt_winter1.png', SKIRT), + ('phase_4/maps/tt_t_chr_avt_skirt_winter2.png', SKIRT), + ('phase_4/maps/tt_t_chr_avt_skirt_winter3.png', SKIRT), + ('phase_4/maps/tt_t_chr_avt_skirt_winter4.png', SKIRT), + ('phase_4/maps/tt_t_chr_avt_skirt_valentine1.png', SKIRT), + ('phase_4/maps/tt_t_chr_avt_skirt_valentine2.png', SKIRT), + ('phase_4/maps/tt_t_chr_avt_skirt_fishing1.png', SKIRT), + ('phase_4/maps/tt_t_chr_avt_skirt_gardening1.png', SKIRT), + ('phase_4/maps/tt_t_chr_avt_skirt_party1.png', SKIRT), + ('phase_4/maps/tt_t_chr_avt_skirt_racing1.png', SKIRT), + ('phase_4/maps/tt_t_chr_avt_skirt_summer1.png', SKIRT), + ('phase_4/maps/tt_t_chr_avt_skirt_golf1.png', SKIRT), + ('phase_4/maps/tt_t_chr_avt_skirt_halloween1.png', SKIRT), + ('phase_4/maps/tt_t_chr_avt_skirt_halloween2.png', SKIRT), + ('phase_4/maps/tt_t_chr_avt_skirt_saveBuilding1.png', SKIRT), + ('phase_4/maps/tt_t_chr_avt_skirt_trolley1.png', SKIRT), + ('phase_4/maps/tt_t_chr_avt_skirt_halloween3.png', SKIRT), + ('phase_4/maps/tt_t_chr_avt_skirt_halloween4.png', SKIRT), + ('phase_4/maps/tt_t_chr_shorts_scientistA.png', SHORTS), + ('phase_4/maps/tt_t_chr_shorts_scientistB.png', SHORTS), + ('phase_4/maps/tt_t_chr_shorts_scientistC.png', SHORTS), + ('phase_4/maps/tt_t_chr_avt_shorts_cogbuster.png', SHORTS), + ('phase_4/maps/tt_t_chr_avt_shorts_sellbotCrusher.png', SHORTS), + ('phase_4/maps/tt_t_chr_avt_shorts_halloween5.png', SHORTS), + ('phase_4/maps/tt_t_chr_avt_shorts_halloweenTurtle.png', SHORTS), + ('phase_4/maps/tt_t_chr_avt_skirt_greentoon1.png', SKIRT), + ('phase_4/maps/tt_t_chr_avt_skirt_racingGrandPrix.png', SKIRT), + ('phase_4/maps/tt_t_chr_avt_shorts_lawbotCrusher.png', SHORTS), + ('phase_4/maps/tt_t_chr_avt_shorts_bee.png', SHORTS), + ('phase_4/maps/tt_t_chr_avt_shorts_pirate.png', SHORTS), + ('phase_4/maps/tt_t_chr_avt_skirt_pirate.png', SKIRT), + ('phase_4/maps/tt_t_chr_avt_shorts_supertoon.png', SHORTS), + ('phase_4/maps/tt_t_chr_avt_shorts_vampire.png', SHORTS), + ('phase_4/maps/tt_t_chr_avt_shorts_dinosaur.png', SHORTS), + ('phase_4/maps/tt_t_chr_avt_skirt_golf02.png', SKIRT), + ('phase_4/maps/tt_t_chr_avt_skirt_racing03.png', SKIRT), + ('phase_4/maps/tt_t_chr_avt_skirt_golf03.png', SKIRT), + ('phase_4/maps/tt_t_chr_avt_skirt_golf04.png', SKIRT), + ('phase_4/maps/tt_t_chr_avt_skirt_racing04.png', SKIRT), + ('phase_4/maps/tt_t_chr_avt_skirt_racing05.png', SKIRT)] ClothesColors = [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), @@ -2037,25 +2037,25 @@ HatModels = [None, 'phase_4/models/accessories/tt_m_chr_avt_acc_hat_band', 'phase_4/models/accessories/tt_m_chr_avt_acc_hat_birdNest'] HatTextures = [None, - 'phase_4/maps/tt_t_chr_avt_acc_hat_ribbonRed.jpg', - 'phase_4/maps/tt_t_chr_avt_acc_hat_ribbonPurple.jpg', - 'phase_4/maps/tt_t_chr_avt_acc_hat_heartYellow.jpg', - 'phase_4/maps/tt_t_chr_avt_acc_hat_topHatBlue.jpg', - 'phase_4/maps/tt_t_chr_avt_acc_hat_safariBrown.jpg', - 'phase_4/maps/tt_t_chr_avt_acc_hat_safariGreen.jpg', - 'phase_4/maps/tt_t_chr_avt_acc_hat_baseballBlue.jpg', - 'phase_4/maps/tt_t_chr_avt_acc_hat_baseballOrange.jpg', - 'phase_4/maps/tt_t_chr_avt_acc_hat_ribbonYellow.jpg', - 'phase_4/maps/tt_t_chr_avt_acc_hat_ribbonChecker.jpg', - 'phase_4/maps/tt_t_chr_avt_acc_hat_ribbonLtRed.jpg', - 'phase_4/maps/tt_t_chr_avt_acc_hat_ribbonRainbow.jpg', - 'phase_4/maps/tt_t_chr_avt_acc_hat_baseballYellow.jpg', - 'phase_4/maps/tt_t_chr_avt_acc_hat_baseballRed.jpg', - 'phase_4/maps/tt_t_chr_avt_acc_hat_baseballTeal.jpg', - 'phase_4/maps/tt_t_chr_avt_acc_hat_ribbonPinkDots.jpg', - 'phase_4/maps/tt_t_chr_avt_acc_hat_baseballPurple.jpg', - 'phase_4/maps/tt_t_chr_avt_acc_hat_ribbonCheckerGreen.jpg', - 'phase_4/maps/tt_t_chr_avt_acc_hat_partyToon.jpg'] + 'phase_4/maps/tt_t_chr_avt_acc_hat_ribbonRed.png', + 'phase_4/maps/tt_t_chr_avt_acc_hat_ribbonPurple.png', + 'phase_4/maps/tt_t_chr_avt_acc_hat_heartYellow.png', + 'phase_4/maps/tt_t_chr_avt_acc_hat_topHatBlue.png', + 'phase_4/maps/tt_t_chr_avt_acc_hat_safariBrown.png', + 'phase_4/maps/tt_t_chr_avt_acc_hat_safariGreen.png', + 'phase_4/maps/tt_t_chr_avt_acc_hat_baseballBlue.png', + 'phase_4/maps/tt_t_chr_avt_acc_hat_baseballOrange.png', + 'phase_4/maps/tt_t_chr_avt_acc_hat_ribbonYellow.png', + 'phase_4/maps/tt_t_chr_avt_acc_hat_ribbonChecker.png', + 'phase_4/maps/tt_t_chr_avt_acc_hat_ribbonLtRed.png', + 'phase_4/maps/tt_t_chr_avt_acc_hat_ribbonRainbow.png', + 'phase_4/maps/tt_t_chr_avt_acc_hat_baseballYellow.png', + 'phase_4/maps/tt_t_chr_avt_acc_hat_baseballRed.png', + 'phase_4/maps/tt_t_chr_avt_acc_hat_baseballTeal.png', + 'phase_4/maps/tt_t_chr_avt_acc_hat_ribbonPinkDots.png', + 'phase_4/maps/tt_t_chr_avt_acc_hat_baseballPurple.png', + 'phase_4/maps/tt_t_chr_avt_acc_hat_ribbonCheckerGreen.png', + 'phase_4/maps/tt_t_chr_avt_acc_hat_partyToon.png'] GlassesModels = [None, 'phase_4/models/accessories/tt_m_chr_avt_acc_msk_roundGlasses', 'phase_4/models/accessories/tt_m_chr_avt_acc_msk_miniblinds', @@ -2079,10 +2079,10 @@ GlassesModels = [None, 'phase_4/models/accessories/tt_m_chr_avt_acc_msk_eyepatch', 'phase_4/models/accessories/tt_m_chr_avt_acc_msk_alienGlasses'] GlassesTextures = [None, - '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_masqueradeTypeMask5.jpg', - 'phase_4/maps/tt_t_chr_avt_acc_msk_eyepatchGems.jpg'] + 'phase_4/maps/tt_t_chr_avt_acc_msk_masqueradeTypeMask2.png', + 'phase_4/maps/tt_t_chr_avt_acc_msk_masqueradeTypeMask4.png', + 'phase_4/maps/tt_t_chr_avt_acc_msk_masqueradeTypeMask5.png', + 'phase_4/maps/tt_t_chr_avt_acc_msk_eyepatchGems.png'] BackpackModels = [None, 'phase_4/models/accessories/tt_m_chr_avt_acc_pac_backpack', 'phase_4/models/accessories/tt_m_chr_avt_acc_pac_batWings', @@ -2109,65 +2109,65 @@ BackpackModels = [None, 'phase_4/models/accessories/tt_m_chr_avt_acc_pac_gags', 'phase_4/models/accessories/tt_m_chr_avt_acc_pac_flunky'] BackpackTextures = [None, - 'phase_4/maps/tt_t_chr_avt_acc_pac_backpackOrange.jpg', - 'phase_4/maps/tt_t_chr_avt_acc_pac_backpackPurple.jpg', - 'phase_4/maps/tt_t_chr_avt_acc_pac_backpackPolkaDotRed.jpg', - 'phase_4/maps/tt_t_chr_avt_acc_pac_backpackPolkaDotYellow.jpg', - 'phase_4/maps/tt_t_chr_avt_acc_pac_angelWingsMultiColor.jpg', - 'phase_4/maps/tt_t_chr_avt_acc_pac_butterflyWingsStyle2.jpg'] + 'phase_4/maps/tt_t_chr_avt_acc_pac_backpackOrange.png', + 'phase_4/maps/tt_t_chr_avt_acc_pac_backpackPurple.png', + 'phase_4/maps/tt_t_chr_avt_acc_pac_backpackPolkaDotRed.png', + 'phase_4/maps/tt_t_chr_avt_acc_pac_backpackPolkaDotYellow.png', + 'phase_4/maps/tt_t_chr_avt_acc_pac_angelWingsMultiColor.png', + 'phase_4/maps/tt_t_chr_avt_acc_pac_butterflyWingsStyle2.png'] ShoesModels = ['feet', 'shoes', 'boots_short', 'boots_long'] -ShoesTextures = ['phase_3/maps/tt_t_chr_avt_acc_sho_athleticGreen.jpg', - 'phase_4/maps/tt_t_chr_avt_acc_sho_athleticRed.jpg', - 'phase_3/maps/tt_t_chr_avt_acc_sho_docMartinBootsGreen.jpg', - 'phase_4/maps/tt_t_chr_avt_acc_sho_converseStyleGreen.jpg', - 'phase_4/maps/tt_t_chr_avt_acc_sho_wingtips.jpg', - 'phase_4/maps/tt_t_chr_avt_acc_sho_maryJaneShoes.jpg', - 'phase_4/maps/tt_t_chr_avt_acc_sho_deckShoes.jpg', - 'phase_4/maps/tt_t_chr_avt_acc_sho_athleticYellow.jpg', - 'phase_4/maps/tt_t_chr_avt_acc_sho_converseStyleBlack.jpg', - 'phase_4/maps/tt_t_chr_avt_acc_sho_converseStyleWhite.jpg', - 'phase_4/maps/tt_t_chr_avt_acc_sho_converseStylePink.jpg', - 'phase_4/maps/tt_t_chr_avt_acc_sho_cowboyBoots.jpg', - 'phase_4/maps/tt_t_chr_avt_acc_sho_fashionBootsPurple.jpg', - 'phase_4/maps/tt_t_chr_avt_acc_sho_hiTopSneakers.jpg', - 'phase_4/maps/tt_t_chr_avt_acc_sho_maryJaneShoesBrown.jpg', - 'phase_4/maps/tt_t_chr_avt_acc_sho_maryJaneShoesRed.jpg', - 'phase_4/maps/tt_t_chr_avt_acc_sho_superToonRedBoots.jpg', - 'phase_4/maps/tt_t_chr_avt_acc_sho_tennisShoesGreen.jpg', - 'phase_4/maps/tt_t_chr_avt_acc_sho_tennisShoesPink.jpg', - 'phase_4/maps/tt_t_chr_avt_acc_sho_converseStyleRed.jpg', - 'phase_4/maps/tt_t_chr_avt_acc_sho_docMartinBootsAqua.jpg', - 'phase_4/maps/tt_t_chr_avt_acc_sho_docMartinBootsBrown.jpg', - 'phase_4/maps/tt_t_chr_avt_acc_sho_docMartinBootsYellow.jpg', - 'phase_4/maps/tt_t_chr_avt_acc_sho_fashionBootsBlueSquares.jpg', - 'phase_4/maps/tt_t_chr_avt_acc_sho_fashionBootsGreenHearts.jpg', - 'phase_4/maps/tt_t_chr_avt_acc_sho_fashionBootsGreyDots.jpg', - 'phase_4/maps/tt_t_chr_avt_acc_sho_fashionBootsOrangeStars.jpg', - 'phase_4/maps/tt_t_chr_avt_acc_sho_fashionBootsPinkStars.jpg', - 'phase_4/maps/tt_t_chr_avt_acc_sho_loafers.jpg', - 'phase_4/maps/tt_t_chr_avt_acc_sho_maryJaneShoesPurple.jpg', - 'phase_4/maps/tt_t_chr_avt_acc_sho_motorcycleBoots.jpg', - 'phase_4/maps/tt_t_chr_avt_acc_sho_oxfords.jpg', - 'phase_4/maps/tt_t_chr_avt_acc_sho_rainBootsPink.jpg', - 'phase_4/maps/tt_t_chr_avt_acc_sho_santaBoots.jpg', - 'phase_4/maps/tt_t_chr_avt_acc_sho_winterBootsBeige.jpg', - 'phase_4/maps/tt_t_chr_avt_acc_sho_winterBootsPink.jpg', - 'phase_4/maps/tt_t_chr_avt_acc_sho_workBoots.jpg', - 'phase_4/maps/tt_t_chr_avt_acc_sho_converseStyleYellow.jpg', - 'phase_4/maps/tt_t_chr_avt_acc_sho_docMartinBootsPink.jpg', - 'phase_4/maps/tt_t_chr_avt_acc_sho_hiTopSneakersPink.jpg', - 'phase_4/maps/tt_t_chr_avt_acc_sho_rainBootsRedDots.jpg', - 'phase_4/maps/tt_t_chr_avt_acc_sho_tennisShoesPurple.jpg', - 'phase_4/maps/tt_t_chr_avt_acc_sho_tennisShoesViolet.jpg', - 'phase_4/maps/tt_t_chr_avt_acc_sho_tennisShoesYellow.jpg', - 'phase_4/maps/tt_t_chr_avt_acc_sho_rainBootsBlue.jpg', - 'phase_4/maps/tt_t_chr_avt_acc_sho_rainBootsYellow.jpg', - 'phase_4/maps/tt_t_chr_avt_acc_sho_athleticBlack.jpg', - 'phase_4/maps/tt_t_chr_avt_acc_sho_pirate.jpg', - 'phase_4/maps/tt_t_chr_avt_acc_sho_dinosaur.jpg'] +ShoesTextures = ['phase_3/maps/tt_t_chr_avt_acc_sho_athleticGreen.png', + 'phase_4/maps/tt_t_chr_avt_acc_sho_athleticRed.png', + 'phase_3/maps/tt_t_chr_avt_acc_sho_docMartinBootsGreen.png', + 'phase_4/maps/tt_t_chr_avt_acc_sho_converseStyleGreen.png', + 'phase_4/maps/tt_t_chr_avt_acc_sho_wingtips.png', + 'phase_4/maps/tt_t_chr_avt_acc_sho_maryJaneShoes.png', + 'phase_4/maps/tt_t_chr_avt_acc_sho_deckShoes.png', + 'phase_4/maps/tt_t_chr_avt_acc_sho_athleticYellow.png', + 'phase_4/maps/tt_t_chr_avt_acc_sho_converseStyleBlack.png', + 'phase_4/maps/tt_t_chr_avt_acc_sho_converseStyleWhite.png', + 'phase_4/maps/tt_t_chr_avt_acc_sho_converseStylePink.png', + 'phase_4/maps/tt_t_chr_avt_acc_sho_cowboyBoots.png', + 'phase_4/maps/tt_t_chr_avt_acc_sho_fashionBootsPurple.png', + 'phase_4/maps/tt_t_chr_avt_acc_sho_hiTopSneakers.png', + 'phase_4/maps/tt_t_chr_avt_acc_sho_maryJaneShoesBrown.png', + 'phase_4/maps/tt_t_chr_avt_acc_sho_maryJaneShoesRed.png', + 'phase_4/maps/tt_t_chr_avt_acc_sho_superToonRedBoots.png', + 'phase_4/maps/tt_t_chr_avt_acc_sho_tennisShoesGreen.png', + 'phase_4/maps/tt_t_chr_avt_acc_sho_tennisShoesPink.png', + 'phase_4/maps/tt_t_chr_avt_acc_sho_converseStyleRed.png', + 'phase_4/maps/tt_t_chr_avt_acc_sho_docMartinBootsAqua.png', + 'phase_4/maps/tt_t_chr_avt_acc_sho_docMartinBootsBrown.png', + 'phase_4/maps/tt_t_chr_avt_acc_sho_docMartinBootsYellow.png', + 'phase_4/maps/tt_t_chr_avt_acc_sho_fashionBootsBlueSquares.png', + 'phase_4/maps/tt_t_chr_avt_acc_sho_fashionBootsGreenHearts.png', + 'phase_4/maps/tt_t_chr_avt_acc_sho_fashionBootsGreyDots.png', + 'phase_4/maps/tt_t_chr_avt_acc_sho_fashionBootsOrangeStars.png', + 'phase_4/maps/tt_t_chr_avt_acc_sho_fashionBootsPinkStars.png', + 'phase_4/maps/tt_t_chr_avt_acc_sho_loafers.png', + 'phase_4/maps/tt_t_chr_avt_acc_sho_maryJaneShoesPurple.png', + 'phase_4/maps/tt_t_chr_avt_acc_sho_motorcycleBoots.png', + 'phase_4/maps/tt_t_chr_avt_acc_sho_oxfords.png', + 'phase_4/maps/tt_t_chr_avt_acc_sho_rainBootsPink.png', + 'phase_4/maps/tt_t_chr_avt_acc_sho_santaBoots.png', + 'phase_4/maps/tt_t_chr_avt_acc_sho_winterBootsBeige.png', + 'phase_4/maps/tt_t_chr_avt_acc_sho_winterBootsPink.png', + 'phase_4/maps/tt_t_chr_avt_acc_sho_workBoots.png', + 'phase_4/maps/tt_t_chr_avt_acc_sho_converseStyleYellow.png', + 'phase_4/maps/tt_t_chr_avt_acc_sho_docMartinBootsPink.png', + 'phase_4/maps/tt_t_chr_avt_acc_sho_hiTopSneakersPink.png', + 'phase_4/maps/tt_t_chr_avt_acc_sho_rainBootsRedDots.png', + 'phase_4/maps/tt_t_chr_avt_acc_sho_tennisShoesPurple.png', + 'phase_4/maps/tt_t_chr_avt_acc_sho_tennisShoesViolet.png', + 'phase_4/maps/tt_t_chr_avt_acc_sho_tennisShoesYellow.png', + 'phase_4/maps/tt_t_chr_avt_acc_sho_rainBootsBlue.png', + 'phase_4/maps/tt_t_chr_avt_acc_sho_rainBootsYellow.png', + 'phase_4/maps/tt_t_chr_avt_acc_sho_athleticBlack.png', + 'phase_4/maps/tt_t_chr_avt_acc_sho_pirate.png', + 'phase_4/maps/tt_t_chr_avt_acc_sho_dinosaur.png'] HatStyles = {'none': [0, 0, 0], 'hbb1': [1, 0, 0], 'hsf1': [2, 0, 0], diff --git a/toontown/toon/ToonHead.py b/toontown/toon/ToonHead.py index 7a0769b..84b82ae 100644 --- a/toontown/toon/ToonHead.py +++ b/toontown/toon/ToonHead.py @@ -50,31 +50,31 @@ DogMuzzleDict = {'dls': '/models/char/dogMM_Shorts-headMuzzles-', class ToonHead(Actor.Actor): notify = DirectNotifyGlobal.directNotify.newCategory('ToonHead') - EyesOpen = loader.loadTexture('phase_3/maps/eyes.jpg', 'phase_3/maps/eyes_a.rgb') + EyesOpen = loader.loadTexture('phase_3/maps/eyes.png') EyesOpen.setMinfilter(Texture.FTLinear) EyesOpen.setMagfilter(Texture.FTLinear) - EyesClosed = loader.loadTexture('phase_3/maps/eyesClosed.jpg', 'phase_3/maps/eyesClosed_a.rgb') + EyesClosed = loader.loadTexture('phase_3/maps/eyesClosed.png') EyesClosed.setMinfilter(Texture.FTLinear) EyesClosed.setMagfilter(Texture.FTLinear) - EyesSadOpen = loader.loadTexture('phase_3/maps/eyesSad.jpg', 'phase_3/maps/eyesSad_a.rgb') + EyesSadOpen = loader.loadTexture('phase_3/maps/eyesSad.png') EyesSadOpen.setMinfilter(Texture.FTLinear) EyesSadOpen.setMagfilter(Texture.FTLinear) - EyesSadClosed = loader.loadTexture('phase_3/maps/eyesSadClosed.jpg', 'phase_3/maps/eyesSadClosed_a.rgb') + EyesSadClosed = loader.loadTexture('phase_3/maps/eyesSadClosed.png') EyesSadClosed.setMinfilter(Texture.FTLinear) EyesSadClosed.setMagfilter(Texture.FTLinear) - EyesAngryOpen = loader.loadTexture('phase_3/maps/eyesAngry.jpg', 'phase_3/maps/eyesAngry_a.rgb') + EyesAngryOpen = loader.loadTexture('phase_3/maps/eyesAngry.png') EyesAngryOpen.setMinfilter(Texture.FTLinear) EyesAngryOpen.setMagfilter(Texture.FTLinear) - EyesAngryClosed = loader.loadTexture('phase_3/maps/eyesAngryClosed.jpg', 'phase_3/maps/eyesAngryClosed_a.rgb') + EyesAngryClosed = loader.loadTexture('phase_3/maps/eyesAngryClosed.png') EyesAngryClosed.setMinfilter(Texture.FTLinear) EyesAngryClosed.setMagfilter(Texture.FTLinear) - EyesSurprised = loader.loadTexture('phase_3/maps/eyesSurprised.jpg', 'phase_3/maps/eyesSurprised_a.rgb') + EyesSurprised = loader.loadTexture('phase_3/maps/eyesSurprised.png') EyesSurprised.setMinfilter(Texture.FTLinear) EyesSurprised.setMagfilter(Texture.FTLinear) - Muzzle = loader.loadTexture('phase_3/maps/muzzleShrtGeneric.jpg') + Muzzle = loader.loadTexture('phase_3/maps/muzzleShrtGeneric.png') Muzzle.setMinfilter(Texture.FTLinear) Muzzle.setMagfilter(Texture.FTLinear) - MuzzleSurprised = loader.loadTexture('phase_3/maps/muzzleShortSurprised.jpg') + MuzzleSurprised = loader.loadTexture('phase_3/maps/muzzleShortSurprised.png') MuzzleSurprised.setMinfilter(Texture.FTLinear) MuzzleSurprised.setMagfilter(Texture.FTLinear) LeftA = Point3(0.06, 0.0, 0.14) diff --git a/toontown/town/Street.py b/toontown/town/Street.py index 975b65f..ead20cd 100644 --- a/toontown/town/Street.py +++ b/toontown/town/Street.py @@ -386,13 +386,11 @@ class Street(BattlePlace.BattlePlace): streetSign = base.cr.streetSign signTexturePath = streetSign.StreetSignBaseDir + '/' + streetSign.StreetSignFileName loaderTexturePath = Filename(str(signTexturePath)) - alphaPath = 'phase_4/maps/tt_t_ara_gen_tunnelAheadSign_a.rgb' inDreamland = False if place.zoneId and ZoneUtil.getCanonicalHoodId(place.zoneId) == ToontownGlobals.DonaldsDreamland: inDreamland = True - alphaPath = 'phase_4/maps/tt_t_ara_gen_tunnelAheadSign_a.rgb' if Filename(signTexturePath).exists(): - signTexture = loader.loadTexture(loaderTexturePath, alphaPath) + signTexture = loader.loadTexture(loaderTexturePath) for sign in signs: if Filename(signTexturePath).exists(): sign.setTexture(signTexture, 1)