sneedgroup-holder/oldschool-toontown
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'custom/png-conversion' into feature/png-conversion

Browse source
This commit is contained in:
Erica M. ("Loonatic") 2023-01-12 19:31:25 -06:00
commit 80b3414b72
33 changed files with 778 additions and 781 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
toontown/battle/BattleProps.py
View file

@ -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)

48
toontown/catalog/CatalogFlooringItem.py
View file

@ -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):

28
toontown/catalog/CatalogMouldingItem.py
View file

@ -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):

10
toontown/catalog/CatalogWainscotingItem.py
View file

@ -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):

268
toontown/catalog/CatalogWallpaperItem.py
View file

@ -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):

12
toontown/char/Char.py
View file

@ -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')

4
toontown/cogdominium/DistributedCogdoBarrel.py
View file

@ -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):

10
toontown/estate/DistributedToonStatuary.py
View file

@ -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)

2
toontown/hood/StreetSign.py
View file

@ -5,7 +5,7 @@ from direct.distributed import DistributedObject
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')

8
toontown/minigame/DistributedTargetGame.py
View file

@ -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

6
toontown/minigame/Purchase.py
View file

@ -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'),

2
toontown/minigame/SwingVine.py
View file

@ -112,7 +112,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('*')

2
toontown/parties/DistributedPartyJukebox40Activity.py
View file

@ -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)

2
toontown/parties/DistributedPartyValentineJukebox40Activity.py
View file

@ -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)

2
toontown/parties/DistributedPartyValentineJukeboxActivity.py
View file

@ -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)

2
toontown/parties/DistributedPartyValentineTrampolineActivity.py
View file

@ -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')

2
toontown/parties/DistributedPartyVictoryTrampolineActivity.py
View file

@ -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')

2
toontown/parties/DistributedPartyWinterTrampolineActivity.py
View file

@ -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')

3
toontown/parties/PartyCogActivity.py
View file

@ -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)

8
toontown/pets/Pet.py
View file

@ -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)

38
toontown/pets/PetDNA.py
View file

@ -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),

2
toontown/racing/DistributedRace.py
View file

@ -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 = {}

6
toontown/racing/Kart.py
View file

@ -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:

20
toontown/racing/KartShopGui.py
View file

@ -688,15 +688,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:
@ -704,9 +704,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
@ -748,15 +748,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:
@ -764,9 +764,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

2
toontown/shtiker/InGameNewsFrame.py
View file

@ -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

2
toontown/shtiker/IssueFrame.py
View file

@ -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',

14
toontown/shtiker/KartPage.py
View file

@ -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):

2
toontown/shtiker/PhotoAlbumPage.py
View file

@ -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

48
toontown/suit/Suit.py
View file

@ -442,7 +442,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':
@ -455,21 +455,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':
@ -488,7 +488,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':
@ -549,7 +549,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':
@ -569,7 +569,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':
@ -594,7 +594,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':
@ -677,13 +677,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)
@ -707,8 +707,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')
@ -722,13 +722,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)
@ -739,10 +739,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
@ -786,13 +786,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)

2
toontown/toon/Toon.py
View file

@ -1165,7 +1165,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)

976
toontown/toon/ToonDNA.py
View file

File diff suppressed because it is too large Load diff

18
toontown/toon/ToonHead.py
View file

@ -49,31 +49,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)

4
toontown/town/Street.py
View file

@ -381,13 +381,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)