diff --git a/gulp/gulp-sprites.js b/gulp/gulp-sprites.js index e12e7c5fbe..58a43f6d35 100644 --- a/gulp/gulp-sprites.js +++ b/gulp/gulp-sprites.js @@ -148,4 +148,6 @@ function cssVarMap (sprite) { } if (~sprite.name.indexOf('shirt')) sprite.custom.px.offset_y = `-${ sprite.y + 30 }px`; // even more for shirts + if (~sprite.name.indexOf('topHair')) + sprite.custom.px.offset_y = `-${ sprite.y }px`; // don't crop updos } diff --git a/website/assets/sprites/dist/spritesmith-main-1.png b/website/assets/sprites/dist/spritesmith-main-1.png index 90a966be70..12361cba4b 100644 Binary files a/website/assets/sprites/dist/spritesmith-main-1.png and b/website/assets/sprites/dist/spritesmith-main-1.png differ diff --git a/website/assets/sprites/dist/spritesmith-main-3.css b/website/assets/sprites/dist/spritesmith-main-3.css index d4e24429e2..d28fbec44e 100644 --- a/website/assets/sprites/dist/spritesmith-main-3.css +++ b/website/assets/sprites/dist/spritesmith-main-3.css @@ -1938,7 +1938,7 @@ } .customize-option.hair_topHair_1_TRUred { background-image: url(/spritesmith-main-3.png); - background-position: -1117px -1198px; + background-position: -1117px -1183px; width: 60px; height: 60px; } @@ -1950,7 +1950,7 @@ } .customize-option.hair_topHair_1_aurora { background-image: url(/spritesmith-main-3.png); - background-position: -480px -1107px; + background-position: -480px -1092px; width: 60px; height: 60px; } @@ -1962,7 +1962,7 @@ } .customize-option.hair_topHair_1_black { background-image: url(/spritesmith-main-3.png); - background-position: -571px -1107px; + background-position: -571px -1092px; width: 60px; height: 60px; } @@ -1974,7 +1974,7 @@ } .customize-option.hair_topHair_1_blond { background-image: url(/spritesmith-main-3.png); - background-position: -662px -1107px; + background-position: -662px -1092px; width: 60px; height: 60px; } @@ -1986,7 +1986,7 @@ } .customize-option.hair_topHair_1_blue { background-image: url(/spritesmith-main-3.png); - background-position: -25px -15px; + background-position: -25px -0px; width: 60px; height: 60px; } @@ -1998,7 +1998,7 @@ } .customize-option.hair_topHair_1_brown { background-image: url(/spritesmith-main-3.png); - background-position: -844px -1107px; + background-position: -844px -1092px; width: 60px; height: 60px; } @@ -2010,7 +2010,7 @@ } .customize-option.hair_topHair_1_candycane { background-image: url(/spritesmith-main-3.png); - background-position: -935px -1107px; + background-position: -935px -1092px; width: 60px; height: 60px; } @@ -2022,7 +2022,7 @@ } .customize-option.hair_topHair_1_candycorn { background-image: url(/spritesmith-main-3.png); - background-position: -1026px -1107px; + background-position: -1026px -1092px; width: 60px; height: 60px; } @@ -2034,7 +2034,7 @@ } .customize-option.hair_topHair_1_festive { background-image: url(/spritesmith-main-3.png); - background-position: -1117px -1107px; + background-position: -1117px -1092px; width: 60px; height: 60px; } @@ -2046,7 +2046,7 @@ } .customize-option.hair_topHair_1_frost { background-image: url(/spritesmith-main-3.png); - background-position: -1208px -15px; + background-position: -1208px -0px; width: 60px; height: 60px; } @@ -2058,7 +2058,7 @@ } .customize-option.hair_topHair_1_ghostwhite { background-image: url(/spritesmith-main-3.png); - background-position: -1208px -106px; + background-position: -1208px -91px; width: 60px; height: 60px; } @@ -2070,7 +2070,7 @@ } .customize-option.hair_topHair_1_green { background-image: url(/spritesmith-main-3.png); - background-position: -1208px -197px; + background-position: -1208px -182px; width: 60px; height: 60px; } @@ -2082,7 +2082,7 @@ } .customize-option.hair_topHair_1_halloween { background-image: url(/spritesmith-main-3.png); - background-position: -1208px -288px; + background-position: -1208px -273px; width: 60px; height: 60px; } @@ -2094,7 +2094,7 @@ } .customize-option.hair_topHair_1_holly { background-image: url(/spritesmith-main-3.png); - background-position: -1208px -379px; + background-position: -1208px -364px; width: 60px; height: 60px; } @@ -2106,7 +2106,7 @@ } .customize-option.hair_topHair_1_hollygreen { background-image: url(/spritesmith-main-3.png); - background-position: -1208px -470px; + background-position: -1208px -455px; width: 60px; height: 60px; } @@ -2118,7 +2118,7 @@ } .customize-option.hair_topHair_1_midnight { background-image: url(/spritesmith-main-3.png); - background-position: -1208px -561px; + background-position: -1208px -546px; width: 60px; height: 60px; } @@ -2130,7 +2130,7 @@ } .customize-option.hair_topHair_1_pblue { background-image: url(/spritesmith-main-3.png); - background-position: -1208px -652px; + background-position: -1208px -637px; width: 60px; height: 60px; } @@ -2142,7 +2142,7 @@ } .customize-option.hair_topHair_1_pblue2 { background-image: url(/spritesmith-main-3.png); - background-position: -1208px -743px; + background-position: -1208px -728px; width: 60px; height: 60px; } @@ -2154,7 +2154,7 @@ } .customize-option.hair_topHair_1_peppermint { background-image: url(/spritesmith-main-3.png); - background-position: -1208px -834px; + background-position: -1208px -819px; width: 60px; height: 60px; } @@ -2166,7 +2166,7 @@ } .customize-option.hair_topHair_1_pgreen { background-image: url(/spritesmith-main-3.png); - background-position: -1208px -925px; + background-position: -1208px -910px; width: 60px; height: 60px; } @@ -2178,7 +2178,7 @@ } .customize-option.hair_topHair_1_pgreen2 { background-image: url(/spritesmith-main-3.png); - background-position: -1208px -1016px; + background-position: -1208px -1001px; width: 60px; height: 60px; } @@ -2190,7 +2190,7 @@ } .customize-option.hair_topHair_1_porange { background-image: url(/spritesmith-main-3.png); - background-position: -1208px -1107px; + background-position: -1208px -1092px; width: 60px; height: 60px; } @@ -2202,7 +2202,7 @@ } .customize-option.hair_topHair_1_porange2 { background-image: url(/spritesmith-main-3.png); - background-position: -25px -1198px; + background-position: -25px -1183px; width: 60px; height: 60px; } @@ -2214,7 +2214,7 @@ } .customize-option.hair_topHair_1_ppink { background-image: url(/spritesmith-main-3.png); - background-position: -116px -1198px; + background-position: -116px -1183px; width: 60px; height: 60px; } @@ -2226,7 +2226,7 @@ } .customize-option.hair_topHair_1_ppink2 { background-image: url(/spritesmith-main-3.png); - background-position: -207px -1198px; + background-position: -207px -1183px; width: 60px; height: 60px; } @@ -2238,7 +2238,7 @@ } .customize-option.hair_topHair_1_ppurple { background-image: url(/spritesmith-main-3.png); - background-position: -298px -1198px; + background-position: -298px -1183px; width: 60px; height: 60px; } @@ -2250,7 +2250,7 @@ } .customize-option.hair_topHair_1_ppurple2 { background-image: url(/spritesmith-main-3.png); - background-position: -389px -1198px; + background-position: -389px -1183px; width: 60px; height: 60px; } @@ -2262,7 +2262,7 @@ } .customize-option.hair_topHair_1_pumpkin { background-image: url(/spritesmith-main-3.png); - background-position: -480px -1198px; + background-position: -480px -1183px; width: 60px; height: 60px; } @@ -2274,7 +2274,7 @@ } .customize-option.hair_topHair_1_purple { background-image: url(/spritesmith-main-3.png); - background-position: -571px -1198px; + background-position: -571px -1183px; width: 60px; height: 60px; } @@ -2286,7 +2286,7 @@ } .customize-option.hair_topHair_1_pyellow { background-image: url(/spritesmith-main-3.png); - background-position: -662px -1198px; + background-position: -662px -1183px; width: 60px; height: 60px; } @@ -2298,7 +2298,7 @@ } .customize-option.hair_topHair_1_pyellow2 { background-image: url(/spritesmith-main-3.png); - background-position: -753px -1198px; + background-position: -753px -1183px; width: 60px; height: 60px; } @@ -2310,7 +2310,7 @@ } .customize-option.hair_topHair_1_rainbow { background-image: url(/spritesmith-main-3.png); - background-position: -844px -1198px; + background-position: -844px -1183px; width: 60px; height: 60px; } @@ -2322,7 +2322,7 @@ } .customize-option.hair_topHair_1_red { background-image: url(/spritesmith-main-3.png); - background-position: -935px -1198px; + background-position: -935px -1183px; width: 60px; height: 60px; } @@ -2334,7 +2334,7 @@ } .customize-option.hair_topHair_1_snowy { background-image: url(/spritesmith-main-3.png); - background-position: -1026px -1198px; + background-position: -1026px -1183px; width: 60px; height: 60px; } @@ -2346,7 +2346,7 @@ } .customize-option.hair_topHair_1_white { background-image: url(/spritesmith-main-3.png); - background-position: -1208px -1198px; + background-position: -1208px -1183px; width: 60px; height: 60px; } @@ -2358,7 +2358,7 @@ } .customize-option.hair_topHair_1_winternight { background-image: url(/spritesmith-main-3.png); - background-position: -1299px -15px; + background-position: -1299px -0px; width: 60px; height: 60px; } @@ -2370,7 +2370,7 @@ } .customize-option.hair_topHair_1_winterstar { background-image: url(/spritesmith-main-3.png); - background-position: -1299px -106px; + background-position: -1299px -91px; width: 60px; height: 60px; } @@ -2382,7 +2382,7 @@ } .customize-option.hair_topHair_1_yellow { background-image: url(/spritesmith-main-3.png); - background-position: -1299px -197px; + background-position: -1299px -182px; width: 60px; height: 60px; } @@ -2394,7 +2394,7 @@ } .customize-option.hair_topHair_1_zombie { background-image: url(/spritesmith-main-3.png); - background-position: -1299px -288px; + background-position: -1299px -273px; width: 60px; height: 60px; } @@ -2406,7 +2406,7 @@ } .customize-option.hair_topHair_2_TRUred { background-image: url(/spritesmith-main-3.png); - background-position: -1390px -743px; + background-position: -1390px -728px; width: 60px; height: 60px; } @@ -2418,7 +2418,7 @@ } .customize-option.hair_topHair_2_aurora { background-image: url(/spritesmith-main-3.png); - background-position: -1299px -379px; + background-position: -1299px -364px; width: 60px; height: 60px; } @@ -2430,7 +2430,7 @@ } .customize-option.hair_topHair_2_black { background-image: url(/spritesmith-main-3.png); - background-position: -1299px -470px; + background-position: -1299px -455px; width: 60px; height: 60px; } @@ -2442,7 +2442,7 @@ } .customize-option.hair_topHair_2_blond { background-image: url(/spritesmith-main-3.png); - background-position: -1299px -561px; + background-position: -1299px -546px; width: 60px; height: 60px; } @@ -2454,7 +2454,7 @@ } .customize-option.hair_topHair_2_blue { background-image: url(/spritesmith-main-3.png); - background-position: -1299px -652px; + background-position: -1299px -637px; width: 60px; height: 60px; } @@ -2466,7 +2466,7 @@ } .customize-option.hair_topHair_2_brown { background-image: url(/spritesmith-main-3.png); - background-position: -1299px -743px; + background-position: -1299px -728px; width: 60px; height: 60px; } @@ -2478,7 +2478,7 @@ } .customize-option.hair_topHair_2_candycane { background-image: url(/spritesmith-main-3.png); - background-position: -1299px -834px; + background-position: -1299px -819px; width: 60px; height: 60px; } @@ -2490,7 +2490,7 @@ } .customize-option.hair_topHair_2_candycorn { background-image: url(/spritesmith-main-3.png); - background-position: -1299px -925px; + background-position: -1299px -910px; width: 60px; height: 60px; } @@ -2502,7 +2502,7 @@ } .customize-option.hair_topHair_2_festive { background-image: url(/spritesmith-main-3.png); - background-position: -1299px -1016px; + background-position: -1299px -1001px; width: 60px; height: 60px; } @@ -2514,7 +2514,7 @@ } .customize-option.hair_topHair_2_frost { background-image: url(/spritesmith-main-3.png); - background-position: -1299px -1107px; + background-position: -1299px -1092px; width: 60px; height: 60px; } @@ -2526,7 +2526,7 @@ } .customize-option.hair_topHair_2_ghostwhite { background-image: url(/spritesmith-main-3.png); - background-position: -1299px -1198px; + background-position: -1299px -1183px; width: 60px; height: 60px; } @@ -2538,7 +2538,7 @@ } .customize-option.hair_topHair_2_green { background-image: url(/spritesmith-main-3.png); - background-position: -25px -1289px; + background-position: -25px -1274px; width: 60px; height: 60px; } @@ -2550,7 +2550,7 @@ } .customize-option.hair_topHair_2_halloween { background-image: url(/spritesmith-main-3.png); - background-position: -116px -1289px; + background-position: -116px -1274px; width: 60px; height: 60px; } @@ -2562,7 +2562,7 @@ } .customize-option.hair_topHair_2_holly { background-image: url(/spritesmith-main-3.png); - background-position: -207px -1289px; + background-position: -207px -1274px; width: 60px; height: 60px; } @@ -2574,7 +2574,7 @@ } .customize-option.hair_topHair_2_hollygreen { background-image: url(/spritesmith-main-3.png); - background-position: -298px -1289px; + background-position: -298px -1274px; width: 60px; height: 60px; } @@ -2586,7 +2586,7 @@ } .customize-option.hair_topHair_2_midnight { background-image: url(/spritesmith-main-3.png); - background-position: -389px -1289px; + background-position: -389px -1274px; width: 60px; height: 60px; } @@ -2598,7 +2598,7 @@ } .customize-option.hair_topHair_2_pblue { background-image: url(/spritesmith-main-3.png); - background-position: -480px -1289px; + background-position: -480px -1274px; width: 60px; height: 60px; } @@ -2610,7 +2610,7 @@ } .customize-option.hair_topHair_2_pblue2 { background-image: url(/spritesmith-main-3.png); - background-position: -571px -1289px; + background-position: -571px -1274px; width: 60px; height: 60px; } @@ -2622,7 +2622,7 @@ } .customize-option.hair_topHair_2_peppermint { background-image: url(/spritesmith-main-3.png); - background-position: -662px -1289px; + background-position: -662px -1274px; width: 60px; height: 60px; } @@ -2634,7 +2634,7 @@ } .customize-option.hair_topHair_2_pgreen { background-image: url(/spritesmith-main-3.png); - background-position: -753px -1289px; + background-position: -753px -1274px; width: 60px; height: 60px; } @@ -2646,7 +2646,7 @@ } .customize-option.hair_topHair_2_pgreen2 { background-image: url(/spritesmith-main-3.png); - background-position: -844px -1289px; + background-position: -844px -1274px; width: 60px; height: 60px; } @@ -2658,7 +2658,7 @@ } .customize-option.hair_topHair_2_porange { background-image: url(/spritesmith-main-3.png); - background-position: -935px -1289px; + background-position: -935px -1274px; width: 60px; height: 60px; } @@ -2670,7 +2670,7 @@ } .customize-option.hair_topHair_2_porange2 { background-image: url(/spritesmith-main-3.png); - background-position: -1026px -1289px; + background-position: -1026px -1274px; width: 60px; height: 60px; } @@ -2682,7 +2682,7 @@ } .customize-option.hair_topHair_2_ppink { background-image: url(/spritesmith-main-3.png); - background-position: -1117px -1289px; + background-position: -1117px -1274px; width: 60px; height: 60px; } @@ -2694,7 +2694,7 @@ } .customize-option.hair_topHair_2_ppink2 { background-image: url(/spritesmith-main-3.png); - background-position: -1208px -1289px; + background-position: -1208px -1274px; width: 60px; height: 60px; } @@ -2706,7 +2706,7 @@ } .customize-option.hair_topHair_2_ppurple { background-image: url(/spritesmith-main-3.png); - background-position: -1299px -1289px; + background-position: -1299px -1274px; width: 60px; height: 60px; } @@ -2718,7 +2718,7 @@ } .customize-option.hair_topHair_2_ppurple2 { background-image: url(/spritesmith-main-3.png); - background-position: -1390px -15px; + background-position: -1390px -0px; width: 60px; height: 60px; } @@ -2730,7 +2730,7 @@ } .customize-option.hair_topHair_2_pumpkin { background-image: url(/spritesmith-main-3.png); - background-position: -1390px -106px; + background-position: -1390px -91px; width: 60px; height: 60px; } @@ -2742,7 +2742,7 @@ } .customize-option.hair_topHair_2_purple { background-image: url(/spritesmith-main-3.png); - background-position: -1390px -197px; + background-position: -1390px -182px; width: 60px; height: 60px; } @@ -2754,7 +2754,7 @@ } .customize-option.hair_topHair_2_pyellow { background-image: url(/spritesmith-main-3.png); - background-position: -1390px -288px; + background-position: -1390px -273px; width: 60px; height: 60px; } @@ -2766,7 +2766,7 @@ } .customize-option.hair_topHair_2_pyellow2 { background-image: url(/spritesmith-main-3.png); - background-position: -1390px -379px; + background-position: -1390px -364px; width: 60px; height: 60px; } @@ -2778,7 +2778,7 @@ } .customize-option.hair_topHair_2_rainbow { background-image: url(/spritesmith-main-3.png); - background-position: -1390px -470px; + background-position: -1390px -455px; width: 60px; height: 60px; } @@ -2790,7 +2790,7 @@ } .customize-option.hair_topHair_2_red { background-image: url(/spritesmith-main-3.png); - background-position: -1390px -561px; + background-position: -1390px -546px; width: 60px; height: 60px; } @@ -2802,7 +2802,7 @@ } .customize-option.hair_topHair_2_snowy { background-image: url(/spritesmith-main-3.png); - background-position: -1390px -652px; + background-position: -1390px -637px; width: 60px; height: 60px; } @@ -2814,7 +2814,7 @@ } .customize-option.hair_topHair_2_white { background-image: url(/spritesmith-main-3.png); - background-position: -1390px -834px; + background-position: -1390px -819px; width: 60px; height: 60px; } @@ -2826,7 +2826,7 @@ } .customize-option.hair_topHair_2_winternight { background-image: url(/spritesmith-main-3.png); - background-position: -1390px -925px; + background-position: -1390px -910px; width: 60px; height: 60px; } @@ -2838,7 +2838,7 @@ } .customize-option.hair_topHair_2_winterstar { background-image: url(/spritesmith-main-3.png); - background-position: -1390px -1016px; + background-position: -1390px -1001px; width: 60px; height: 60px; } @@ -2850,7 +2850,7 @@ } .customize-option.hair_topHair_2_yellow { background-image: url(/spritesmith-main-3.png); - background-position: -1390px -1107px; + background-position: -1390px -1092px; width: 60px; height: 60px; } @@ -2862,7 +2862,7 @@ } .customize-option.hair_topHair_2_zombie { background-image: url(/spritesmith-main-3.png); - background-position: -1390px -1198px; + background-position: -1390px -1183px; width: 60px; height: 60px; } @@ -2874,7 +2874,7 @@ } .customize-option.hair_topHair_3_TRUred { background-image: url(/spritesmith-main-3.png); - background-position: -25px -1471px; + background-position: -25px -1456px; width: 60px; height: 60px; } @@ -2886,7 +2886,7 @@ } .customize-option.hair_topHair_3_aurora { background-image: url(/spritesmith-main-3.png); - background-position: -1390px -1289px; + background-position: -1390px -1274px; width: 60px; height: 60px; } @@ -2898,7 +2898,7 @@ } .customize-option.hair_topHair_3_black { background-image: url(/spritesmith-main-3.png); - background-position: -25px -1380px; + background-position: -25px -1365px; width: 60px; height: 60px; } @@ -2910,7 +2910,7 @@ } .customize-option.hair_topHair_3_blond { background-image: url(/spritesmith-main-3.png); - background-position: -116px -1380px; + background-position: -116px -1365px; width: 60px; height: 60px; } @@ -2922,7 +2922,7 @@ } .customize-option.hair_topHair_3_blue { background-image: url(/spritesmith-main-3.png); - background-position: -207px -1380px; + background-position: -207px -1365px; width: 60px; height: 60px; } @@ -2934,7 +2934,7 @@ } .customize-option.hair_topHair_3_brown { background-image: url(/spritesmith-main-3.png); - background-position: -298px -1380px; + background-position: -298px -1365px; width: 60px; height: 60px; } @@ -2946,7 +2946,7 @@ } .customize-option.hair_topHair_3_candycane { background-image: url(/spritesmith-main-3.png); - background-position: -389px -1380px; + background-position: -389px -1365px; width: 60px; height: 60px; } @@ -2958,7 +2958,7 @@ } .customize-option.hair_topHair_3_candycorn { background-image: url(/spritesmith-main-3.png); - background-position: -480px -1380px; + background-position: -480px -1365px; width: 60px; height: 60px; } @@ -2970,7 +2970,7 @@ } .customize-option.hair_topHair_3_festive { background-image: url(/spritesmith-main-3.png); - background-position: -571px -1380px; + background-position: -571px -1365px; width: 60px; height: 60px; } @@ -2982,7 +2982,7 @@ } .customize-option.hair_topHair_3_frost { background-image: url(/spritesmith-main-3.png); - background-position: -662px -1380px; + background-position: -662px -1365px; width: 60px; height: 60px; } @@ -2994,7 +2994,7 @@ } .customize-option.hair_topHair_3_ghostwhite { background-image: url(/spritesmith-main-3.png); - background-position: -753px -1380px; + background-position: -753px -1365px; width: 60px; height: 60px; } @@ -3006,7 +3006,7 @@ } .customize-option.hair_topHair_3_green { background-image: url(/spritesmith-main-3.png); - background-position: -844px -1380px; + background-position: -844px -1365px; width: 60px; height: 60px; } @@ -3018,7 +3018,7 @@ } .customize-option.hair_topHair_3_halloween { background-image: url(/spritesmith-main-3.png); - background-position: -935px -1380px; + background-position: -935px -1365px; width: 60px; height: 60px; } @@ -3030,7 +3030,7 @@ } .customize-option.hair_topHair_3_holly { background-image: url(/spritesmith-main-3.png); - background-position: -1026px -1380px; + background-position: -1026px -1365px; width: 60px; height: 60px; } @@ -3042,7 +3042,7 @@ } .customize-option.hair_topHair_3_hollygreen { background-image: url(/spritesmith-main-3.png); - background-position: -1117px -1380px; + background-position: -1117px -1365px; width: 60px; height: 60px; } @@ -3054,7 +3054,7 @@ } .customize-option.hair_topHair_3_midnight { background-image: url(/spritesmith-main-3.png); - background-position: -1208px -1380px; + background-position: -1208px -1365px; width: 60px; height: 60px; } @@ -3066,7 +3066,7 @@ } .customize-option.hair_topHair_3_pblue { background-image: url(/spritesmith-main-3.png); - background-position: -1299px -1380px; + background-position: -1299px -1365px; width: 60px; height: 60px; } @@ -3078,7 +3078,7 @@ } .customize-option.hair_topHair_3_pblue2 { background-image: url(/spritesmith-main-3.png); - background-position: -1390px -1380px; + background-position: -1390px -1365px; width: 60px; height: 60px; } @@ -3090,7 +3090,7 @@ } .customize-option.hair_topHair_3_peppermint { background-image: url(/spritesmith-main-3.png); - background-position: -1481px -15px; + background-position: -1481px -0px; width: 60px; height: 60px; } @@ -3102,7 +3102,7 @@ } .customize-option.hair_topHair_3_pgreen { background-image: url(/spritesmith-main-3.png); - background-position: -1481px -106px; + background-position: -1481px -91px; width: 60px; height: 60px; } @@ -3114,7 +3114,7 @@ } .customize-option.hair_topHair_3_pgreen2 { background-image: url(/spritesmith-main-3.png); - background-position: -1481px -197px; + background-position: -1481px -182px; width: 60px; height: 60px; } @@ -3126,7 +3126,7 @@ } .customize-option.hair_topHair_3_porange { background-image: url(/spritesmith-main-3.png); - background-position: -1481px -288px; + background-position: -1481px -273px; width: 60px; height: 60px; } @@ -3138,7 +3138,7 @@ } .customize-option.hair_topHair_3_porange2 { background-image: url(/spritesmith-main-3.png); - background-position: -1481px -379px; + background-position: -1481px -364px; width: 60px; height: 60px; } @@ -3150,7 +3150,7 @@ } .customize-option.hair_topHair_3_ppink { background-image: url(/spritesmith-main-3.png); - background-position: -1481px -470px; + background-position: -1481px -455px; width: 60px; height: 60px; } @@ -3162,7 +3162,7 @@ } .customize-option.hair_topHair_3_ppink2 { background-image: url(/spritesmith-main-3.png); - background-position: -1481px -561px; + background-position: -1481px -546px; width: 60px; height: 60px; } @@ -3174,7 +3174,7 @@ } .customize-option.hair_topHair_3_ppurple { background-image: url(/spritesmith-main-3.png); - background-position: -1481px -652px; + background-position: -1481px -637px; width: 60px; height: 60px; } @@ -3186,7 +3186,7 @@ } .customize-option.hair_topHair_3_ppurple2 { background-image: url(/spritesmith-main-3.png); - background-position: -1481px -743px; + background-position: -1481px -728px; width: 60px; height: 60px; } @@ -3198,7 +3198,7 @@ } .customize-option.hair_topHair_3_pumpkin { background-image: url(/spritesmith-main-3.png); - background-position: -1481px -834px; + background-position: -1481px -819px; width: 60px; height: 60px; } @@ -3210,7 +3210,7 @@ } .customize-option.hair_topHair_3_purple { background-image: url(/spritesmith-main-3.png); - background-position: -1481px -925px; + background-position: -1481px -910px; width: 60px; height: 60px; } @@ -3222,7 +3222,7 @@ } .customize-option.hair_topHair_3_pyellow { background-image: url(/spritesmith-main-3.png); - background-position: -1481px -1016px; + background-position: -1481px -1001px; width: 60px; height: 60px; } @@ -3234,7 +3234,7 @@ } .customize-option.hair_topHair_3_pyellow2 { background-image: url(/spritesmith-main-3.png); - background-position: -1481px -1107px; + background-position: -1481px -1092px; width: 60px; height: 60px; } @@ -3246,7 +3246,7 @@ } .customize-option.hair_topHair_3_rainbow { background-image: url(/spritesmith-main-3.png); - background-position: -1481px -1198px; + background-position: -1481px -1183px; width: 60px; height: 60px; } @@ -3258,7 +3258,7 @@ } .customize-option.hair_topHair_3_red { background-image: url(/spritesmith-main-3.png); - background-position: -1481px -1289px; + background-position: -1481px -1274px; width: 60px; height: 60px; } @@ -3270,7 +3270,7 @@ } .customize-option.hair_topHair_3_snowy { background-image: url(/spritesmith-main-3.png); - background-position: -1481px -1380px; + background-position: -1481px -1365px; width: 60px; height: 60px; } @@ -3282,7 +3282,7 @@ } .customize-option.hair_topHair_3_white { background-image: url(/spritesmith-main-3.png); - background-position: -116px -1471px; + background-position: -116px -1456px; width: 60px; height: 60px; } @@ -3294,7 +3294,7 @@ } .customize-option.hair_topHair_3_winternight { background-image: url(/spritesmith-main-3.png); - background-position: -207px -1471px; + background-position: -207px -1456px; width: 60px; height: 60px; } @@ -3306,7 +3306,7 @@ } .customize-option.hair_topHair_3_winterstar { background-image: url(/spritesmith-main-3.png); - background-position: -298px -1471px; + background-position: -298px -1456px; width: 60px; height: 60px; } @@ -3318,7 +3318,7 @@ } .customize-option.hair_topHair_3_yellow { background-image: url(/spritesmith-main-3.png); - background-position: -389px -1471px; + background-position: -389px -1456px; width: 60px; height: 60px; } @@ -3330,7 +3330,7 @@ } .customize-option.hair_topHair_3_zombie { background-image: url(/spritesmith-main-3.png); - background-position: -480px -1471px; + background-position: -480px -1456px; width: 60px; height: 60px; } @@ -3342,7 +3342,7 @@ } .customize-option.hair_topHair_4_TRUred { background-image: url(/spritesmith-main-3.png); - background-position: -480px -1562px; + background-position: -480px -1547px; width: 60px; height: 60px; } @@ -3354,7 +3354,7 @@ } .customize-option.hair_topHair_4_aurora { background-image: url(/spritesmith-main-3.png); - background-position: -571px -1471px; + background-position: -571px -1456px; width: 60px; height: 60px; } @@ -3366,7 +3366,7 @@ } .customize-option.hair_topHair_4_black { background-image: url(/spritesmith-main-3.png); - background-position: -662px -1471px; + background-position: -662px -1456px; width: 60px; height: 60px; } @@ -3378,7 +3378,7 @@ } .customize-option.hair_topHair_4_blond { background-image: url(/spritesmith-main-3.png); - background-position: -753px -1471px; + background-position: -753px -1456px; width: 60px; height: 60px; } @@ -3390,7 +3390,7 @@ } .customize-option.hair_topHair_4_blue { background-image: url(/spritesmith-main-3.png); - background-position: -844px -1471px; + background-position: -844px -1456px; width: 60px; height: 60px; } @@ -3402,7 +3402,7 @@ } .customize-option.hair_topHair_4_brown { background-image: url(/spritesmith-main-3.png); - background-position: -935px -1471px; + background-position: -935px -1456px; width: 60px; height: 60px; } @@ -3414,7 +3414,7 @@ } .customize-option.hair_topHair_4_candycane { background-image: url(/spritesmith-main-3.png); - background-position: -1026px -1471px; + background-position: -1026px -1456px; width: 60px; height: 60px; } @@ -3426,7 +3426,7 @@ } .customize-option.hair_topHair_4_candycorn { background-image: url(/spritesmith-main-3.png); - background-position: -1117px -1471px; + background-position: -1117px -1456px; width: 60px; height: 60px; } @@ -3438,7 +3438,7 @@ } .customize-option.hair_topHair_4_festive { background-image: url(/spritesmith-main-3.png); - background-position: -1208px -1471px; + background-position: -1208px -1456px; width: 60px; height: 60px; } @@ -3450,7 +3450,7 @@ } .customize-option.hair_topHair_4_frost { background-image: url(/spritesmith-main-3.png); - background-position: -1299px -1471px; + background-position: -1299px -1456px; width: 60px; height: 60px; } @@ -3462,7 +3462,7 @@ } .customize-option.hair_topHair_4_ghostwhite { background-image: url(/spritesmith-main-3.png); - background-position: -1390px -1471px; + background-position: -1390px -1456px; width: 60px; height: 60px; } @@ -3474,7 +3474,7 @@ } .customize-option.hair_topHair_4_green { background-image: url(/spritesmith-main-3.png); - background-position: -1481px -1471px; + background-position: -1481px -1456px; width: 60px; height: 60px; } @@ -3486,7 +3486,7 @@ } .customize-option.hair_topHair_4_halloween { background-image: url(/spritesmith-main-3.png); - background-position: -1572px -15px; + background-position: -1572px -0px; width: 60px; height: 60px; } @@ -3498,7 +3498,7 @@ } .customize-option.hair_topHair_4_holly { background-image: url(/spritesmith-main-3.png); - background-position: -1572px -106px; + background-position: -1572px -91px; width: 60px; height: 60px; } @@ -3510,7 +3510,7 @@ } .customize-option.hair_topHair_4_hollygreen { background-image: url(/spritesmith-main-3.png); - background-position: -1572px -197px; + background-position: -1572px -182px; width: 60px; height: 60px; } @@ -3522,7 +3522,7 @@ } .customize-option.hair_topHair_4_midnight { background-image: url(/spritesmith-main-3.png); - background-position: -1572px -288px; + background-position: -1572px -273px; width: 60px; height: 60px; } @@ -3534,7 +3534,7 @@ } .customize-option.hair_topHair_4_pblue { background-image: url(/spritesmith-main-3.png); - background-position: -1572px -379px; + background-position: -1572px -364px; width: 60px; height: 60px; } @@ -3546,7 +3546,7 @@ } .customize-option.hair_topHair_4_pblue2 { background-image: url(/spritesmith-main-3.png); - background-position: -1572px -470px; + background-position: -1572px -455px; width: 60px; height: 60px; } @@ -3558,7 +3558,7 @@ } .customize-option.hair_topHair_4_peppermint { background-image: url(/spritesmith-main-3.png); - background-position: -1572px -561px; + background-position: -1572px -546px; width: 60px; height: 60px; } @@ -3570,7 +3570,7 @@ } .customize-option.hair_topHair_4_pgreen { background-image: url(/spritesmith-main-3.png); - background-position: -1572px -652px; + background-position: -1572px -637px; width: 60px; height: 60px; } @@ -3582,7 +3582,7 @@ } .customize-option.hair_topHair_4_pgreen2 { background-image: url(/spritesmith-main-3.png); - background-position: -1572px -743px; + background-position: -1572px -728px; width: 60px; height: 60px; } @@ -3594,7 +3594,7 @@ } .customize-option.hair_topHair_4_porange { background-image: url(/spritesmith-main-3.png); - background-position: -1572px -834px; + background-position: -1572px -819px; width: 60px; height: 60px; } @@ -3606,7 +3606,7 @@ } .customize-option.hair_topHair_4_porange2 { background-image: url(/spritesmith-main-3.png); - background-position: -1572px -925px; + background-position: -1572px -910px; width: 60px; height: 60px; } @@ -3618,7 +3618,7 @@ } .customize-option.hair_topHair_4_ppink { background-image: url(/spritesmith-main-3.png); - background-position: -1572px -1016px; + background-position: -1572px -1001px; width: 60px; height: 60px; } @@ -3630,7 +3630,7 @@ } .customize-option.hair_topHair_4_ppink2 { background-image: url(/spritesmith-main-3.png); - background-position: -1572px -1107px; + background-position: -1572px -1092px; width: 60px; height: 60px; } @@ -3642,7 +3642,7 @@ } .customize-option.hair_topHair_4_ppurple { background-image: url(/spritesmith-main-3.png); - background-position: -1572px -1198px; + background-position: -1572px -1183px; width: 60px; height: 60px; } @@ -3654,7 +3654,7 @@ } .customize-option.hair_topHair_4_ppurple2 { background-image: url(/spritesmith-main-3.png); - background-position: -1572px -1289px; + background-position: -1572px -1274px; width: 60px; height: 60px; } @@ -3666,7 +3666,7 @@ } .customize-option.hair_topHair_4_pumpkin { background-image: url(/spritesmith-main-3.png); - background-position: -1572px -1380px; + background-position: -1572px -1365px; width: 60px; height: 60px; } @@ -3678,7 +3678,7 @@ } .customize-option.hair_topHair_4_purple { background-image: url(/spritesmith-main-3.png); - background-position: -1572px -1471px; + background-position: -1572px -1456px; width: 60px; height: 60px; } @@ -3690,7 +3690,7 @@ } .customize-option.hair_topHair_4_pyellow { background-image: url(/spritesmith-main-3.png); - background-position: -25px -1562px; + background-position: -25px -1547px; width: 60px; height: 60px; } @@ -3702,7 +3702,7 @@ } .customize-option.hair_topHair_4_pyellow2 { background-image: url(/spritesmith-main-3.png); - background-position: -116px -1562px; + background-position: -116px -1547px; width: 60px; height: 60px; } @@ -3714,7 +3714,7 @@ } .customize-option.hair_topHair_4_rainbow { background-image: url(/spritesmith-main-3.png); - background-position: -207px -1562px; + background-position: -207px -1547px; width: 60px; height: 60px; } @@ -3726,7 +3726,7 @@ } .customize-option.hair_topHair_4_red { background-image: url(/spritesmith-main-3.png); - background-position: -298px -1562px; + background-position: -298px -1547px; width: 60px; height: 60px; } @@ -3738,7 +3738,7 @@ } .customize-option.hair_topHair_4_snowy { background-image: url(/spritesmith-main-3.png); - background-position: -389px -1562px; + background-position: -389px -1547px; width: 60px; height: 60px; } @@ -3750,7 +3750,7 @@ } .customize-option.hair_topHair_4_white { background-image: url(/spritesmith-main-3.png); - background-position: -571px -1562px; + background-position: -571px -1547px; width: 60px; height: 60px; } @@ -3762,7 +3762,7 @@ } .customize-option.hair_topHair_4_winternight { background-image: url(/spritesmith-main-3.png); - background-position: -662px -1562px; + background-position: -662px -1547px; width: 60px; height: 60px; } @@ -3774,7 +3774,7 @@ } .customize-option.hair_topHair_4_winterstar { background-image: url(/spritesmith-main-3.png); - background-position: -753px -1562px; + background-position: -753px -1547px; width: 60px; height: 60px; } @@ -3786,7 +3786,7 @@ } .customize-option.hair_topHair_4_yellow { background-image: url(/spritesmith-main-3.png); - background-position: -844px -1562px; + background-position: -844px -1547px; width: 60px; height: 60px; } @@ -3798,7 +3798,7 @@ } .customize-option.hair_topHair_4_zombie { background-image: url(/spritesmith-main-3.png); - background-position: -935px -1562px; + background-position: -935px -1547px; width: 60px; height: 60px; } @@ -3810,7 +3810,7 @@ } .customize-option.hair_topHair_5_aurora { background-image: url(/spritesmith-main-3.png); - background-position: -1026px -1562px; + background-position: -1026px -1547px; width: 60px; height: 60px; } @@ -3822,7 +3822,7 @@ } .customize-option.hair_topHair_5_black { background-image: url(/spritesmith-main-3.png); - background-position: -1117px -1562px; + background-position: -1117px -1547px; width: 60px; height: 60px; } @@ -3834,7 +3834,7 @@ } .customize-option.hair_topHair_5_blond { background-image: url(/spritesmith-main-3.png); - background-position: -1208px -1562px; + background-position: -1208px -1547px; width: 60px; height: 60px; } @@ -3846,7 +3846,7 @@ } .customize-option.hair_topHair_5_blue { background-image: url(/spritesmith-main-3.png); - background-position: -1299px -1562px; + background-position: -1299px -1547px; width: 60px; height: 60px; } @@ -3858,7 +3858,7 @@ } .customize-option.hair_topHair_5_brown { background-image: url(/spritesmith-main-3.png); - background-position: -1390px -1562px; + background-position: -1390px -1547px; width: 60px; height: 60px; } @@ -3870,7 +3870,7 @@ } .customize-option.hair_topHair_5_candycane { background-image: url(/spritesmith-main-3.png); - background-position: -1481px -1562px; + background-position: -1481px -1547px; width: 60px; height: 60px; } @@ -3882,7 +3882,7 @@ } .customize-option.hair_topHair_5_candycorn { background-image: url(/spritesmith-main-3.png); - background-position: -1572px -1562px; + background-position: -1572px -1547px; width: 60px; height: 60px; } @@ -3894,7 +3894,7 @@ } .customize-option.hair_topHair_5_festive { background-image: url(/spritesmith-main-3.png); - background-position: -1663px -15px; + background-position: -1663px -0px; width: 60px; height: 60px; } @@ -3906,7 +3906,7 @@ } .customize-option.hair_topHair_5_frost { background-image: url(/spritesmith-main-3.png); - background-position: -1663px -106px; + background-position: -1663px -91px; width: 60px; height: 60px; } @@ -3918,7 +3918,7 @@ } .customize-option.hair_topHair_5_ghostwhite { background-image: url(/spritesmith-main-3.png); - background-position: -1663px -197px; + background-position: -1663px -182px; width: 60px; height: 60px; } @@ -3930,7 +3930,7 @@ } .customize-option.hair_topHair_5_green { background-image: url(/spritesmith-main-3.png); - background-position: -1663px -288px; + background-position: -1663px -273px; width: 60px; height: 60px; } @@ -3942,7 +3942,7 @@ } .customize-option.hair_topHair_5_halloween { background-image: url(/spritesmith-main-3.png); - background-position: -1663px -379px; + background-position: -1663px -364px; width: 60px; height: 60px; } diff --git a/website/assets/sprites/dist/spritesmith-main-4.css b/website/assets/sprites/dist/spritesmith-main-4.css index 487f2162bb..330c9f987a 100644 --- a/website/assets/sprites/dist/spritesmith-main-4.css +++ b/website/assets/sprites/dist/spritesmith-main-4.css @@ -6,7 +6,7 @@ } .customize-option.hair_topHair_5_TRUred { background-image: url(/spritesmith-main-4.png); - background-position: -116px -379px; + background-position: -116px -364px; width: 60px; height: 60px; } @@ -18,7 +18,7 @@ } .customize-option.hair_topHair_5_holly { background-image: url(/spritesmith-main-4.png); - background-position: -116px -15px; + background-position: -116px -0px; width: 60px; height: 60px; } @@ -30,7 +30,7 @@ } .customize-option.hair_topHair_5_hollygreen { background-image: url(/spritesmith-main-4.png); - background-position: -1208px -1198px; + background-position: -1208px -1183px; width: 60px; height: 60px; } @@ -42,7 +42,7 @@ } .customize-option.hair_topHair_5_midnight { background-image: url(/spritesmith-main-4.png); - background-position: -25px -106px; + background-position: -25px -91px; width: 60px; height: 60px; } @@ -54,7 +54,7 @@ } .customize-option.hair_topHair_5_pblue { background-image: url(/spritesmith-main-4.png); - background-position: -116px -106px; + background-position: -116px -91px; width: 60px; height: 60px; } @@ -66,7 +66,7 @@ } .customize-option.hair_topHair_5_pblue2 { background-image: url(/spritesmith-main-4.png); - background-position: -207px -15px; + background-position: -207px -0px; width: 60px; height: 60px; } @@ -78,7 +78,7 @@ } .customize-option.hair_topHair_5_peppermint { background-image: url(/spritesmith-main-4.png); - background-position: -207px -106px; + background-position: -207px -91px; width: 60px; height: 60px; } @@ -90,7 +90,7 @@ } .customize-option.hair_topHair_5_pgreen { background-image: url(/spritesmith-main-4.png); - background-position: -25px -197px; + background-position: -25px -182px; width: 60px; height: 60px; } @@ -102,7 +102,7 @@ } .customize-option.hair_topHair_5_pgreen2 { background-image: url(/spritesmith-main-4.png); - background-position: -116px -197px; + background-position: -116px -182px; width: 60px; height: 60px; } @@ -114,7 +114,7 @@ } .customize-option.hair_topHair_5_porange { background-image: url(/spritesmith-main-4.png); - background-position: -207px -197px; + background-position: -207px -182px; width: 60px; height: 60px; } @@ -126,7 +126,7 @@ } .customize-option.hair_topHair_5_porange2 { background-image: url(/spritesmith-main-4.png); - background-position: -298px -15px; + background-position: -298px -0px; width: 60px; height: 60px; } @@ -138,7 +138,7 @@ } .customize-option.hair_topHair_5_ppink { background-image: url(/spritesmith-main-4.png); - background-position: -298px -106px; + background-position: -298px -91px; width: 60px; height: 60px; } @@ -150,7 +150,7 @@ } .customize-option.hair_topHair_5_ppink2 { background-image: url(/spritesmith-main-4.png); - background-position: -298px -197px; + background-position: -298px -182px; width: 60px; height: 60px; } @@ -162,7 +162,7 @@ } .customize-option.hair_topHair_5_ppurple { background-image: url(/spritesmith-main-4.png); - background-position: -25px -288px; + background-position: -25px -273px; width: 60px; height: 60px; } @@ -174,7 +174,7 @@ } .customize-option.hair_topHair_5_ppurple2 { background-image: url(/spritesmith-main-4.png); - background-position: -116px -288px; + background-position: -116px -273px; width: 60px; height: 60px; } @@ -186,7 +186,7 @@ } .customize-option.hair_topHair_5_pumpkin { background-image: url(/spritesmith-main-4.png); - background-position: -207px -288px; + background-position: -207px -273px; width: 60px; height: 60px; } @@ -198,7 +198,7 @@ } .customize-option.hair_topHair_5_purple { background-image: url(/spritesmith-main-4.png); - background-position: -298px -288px; + background-position: -298px -273px; width: 60px; height: 60px; } @@ -210,7 +210,7 @@ } .customize-option.hair_topHair_5_pyellow { background-image: url(/spritesmith-main-4.png); - background-position: -389px -15px; + background-position: -389px -0px; width: 60px; height: 60px; } @@ -222,7 +222,7 @@ } .customize-option.hair_topHair_5_pyellow2 { background-image: url(/spritesmith-main-4.png); - background-position: -389px -106px; + background-position: -389px -91px; width: 60px; height: 60px; } @@ -234,7 +234,7 @@ } .customize-option.hair_topHair_5_rainbow { background-image: url(/spritesmith-main-4.png); - background-position: -389px -197px; + background-position: -389px -182px; width: 60px; height: 60px; } @@ -246,7 +246,7 @@ } .customize-option.hair_topHair_5_red { background-image: url(/spritesmith-main-4.png); - background-position: -389px -288px; + background-position: -389px -273px; width: 60px; height: 60px; } @@ -258,7 +258,7 @@ } .customize-option.hair_topHair_5_snowy { background-image: url(/spritesmith-main-4.png); - background-position: -25px -379px; + background-position: -25px -364px; width: 60px; height: 60px; } @@ -270,7 +270,7 @@ } .customize-option.hair_topHair_5_white { background-image: url(/spritesmith-main-4.png); - background-position: -207px -379px; + background-position: -207px -364px; width: 60px; height: 60px; } @@ -282,7 +282,7 @@ } .customize-option.hair_topHair_5_winternight { background-image: url(/spritesmith-main-4.png); - background-position: -298px -379px; + background-position: -298px -364px; width: 60px; height: 60px; } @@ -294,7 +294,7 @@ } .customize-option.hair_topHair_5_winterstar { background-image: url(/spritesmith-main-4.png); - background-position: -389px -379px; + background-position: -389px -364px; width: 60px; height: 60px; } @@ -306,7 +306,7 @@ } .customize-option.hair_topHair_5_yellow { background-image: url(/spritesmith-main-4.png); - background-position: -480px -15px; + background-position: -480px -0px; width: 60px; height: 60px; } @@ -318,7 +318,7 @@ } .customize-option.hair_topHair_5_zombie { background-image: url(/spritesmith-main-4.png); - background-position: -480px -106px; + background-position: -480px -91px; width: 60px; height: 60px; } @@ -330,7 +330,7 @@ } .customize-option.hair_topHair_6_TRUred { background-image: url(/spritesmith-main-4.png); - background-position: -389px -652px; + background-position: -389px -637px; width: 60px; height: 60px; } @@ -342,7 +342,7 @@ } .customize-option.hair_topHair_6_aurora { background-image: url(/spritesmith-main-4.png); - background-position: -480px -197px; + background-position: -480px -182px; width: 60px; height: 60px; } @@ -354,7 +354,7 @@ } .customize-option.hair_topHair_6_black { background-image: url(/spritesmith-main-4.png); - background-position: -480px -288px; + background-position: -480px -273px; width: 60px; height: 60px; } @@ -366,7 +366,7 @@ } .customize-option.hair_topHair_6_blond { background-image: url(/spritesmith-main-4.png); - background-position: -480px -379px; + background-position: -480px -364px; width: 60px; height: 60px; } @@ -378,7 +378,7 @@ } .customize-option.hair_topHair_6_blue { background-image: url(/spritesmith-main-4.png); - background-position: -25px -470px; + background-position: -25px -455px; width: 60px; height: 60px; } @@ -390,7 +390,7 @@ } .customize-option.hair_topHair_6_brown { background-image: url(/spritesmith-main-4.png); - background-position: -116px -470px; + background-position: -116px -455px; width: 60px; height: 60px; } @@ -402,7 +402,7 @@ } .customize-option.hair_topHair_6_candycane { background-image: url(/spritesmith-main-4.png); - background-position: -207px -470px; + background-position: -207px -455px; width: 60px; height: 60px; } @@ -414,7 +414,7 @@ } .customize-option.hair_topHair_6_candycorn { background-image: url(/spritesmith-main-4.png); - background-position: -298px -470px; + background-position: -298px -455px; width: 60px; height: 60px; } @@ -426,7 +426,7 @@ } .customize-option.hair_topHair_6_festive { background-image: url(/spritesmith-main-4.png); - background-position: -389px -470px; + background-position: -389px -455px; width: 60px; height: 60px; } @@ -438,7 +438,7 @@ } .customize-option.hair_topHair_6_frost { background-image: url(/spritesmith-main-4.png); - background-position: -480px -470px; + background-position: -480px -455px; width: 60px; height: 60px; } @@ -450,7 +450,7 @@ } .customize-option.hair_topHair_6_ghostwhite { background-image: url(/spritesmith-main-4.png); - background-position: -571px -15px; + background-position: -571px -0px; width: 60px; height: 60px; } @@ -462,7 +462,7 @@ } .customize-option.hair_topHair_6_green { background-image: url(/spritesmith-main-4.png); - background-position: -571px -106px; + background-position: -571px -91px; width: 60px; height: 60px; } @@ -474,7 +474,7 @@ } .customize-option.hair_topHair_6_halloween { background-image: url(/spritesmith-main-4.png); - background-position: -571px -197px; + background-position: -571px -182px; width: 60px; height: 60px; } @@ -486,7 +486,7 @@ } .customize-option.hair_topHair_6_holly { background-image: url(/spritesmith-main-4.png); - background-position: -571px -288px; + background-position: -571px -273px; width: 60px; height: 60px; } @@ -498,7 +498,7 @@ } .customize-option.hair_topHair_6_hollygreen { background-image: url(/spritesmith-main-4.png); - background-position: -571px -379px; + background-position: -571px -364px; width: 60px; height: 60px; } @@ -510,7 +510,7 @@ } .customize-option.hair_topHair_6_midnight { background-image: url(/spritesmith-main-4.png); - background-position: -571px -470px; + background-position: -571px -455px; width: 60px; height: 60px; } @@ -522,7 +522,7 @@ } .customize-option.hair_topHair_6_pblue { background-image: url(/spritesmith-main-4.png); - background-position: -25px -561px; + background-position: -25px -546px; width: 60px; height: 60px; } @@ -534,7 +534,7 @@ } .customize-option.hair_topHair_6_pblue2 { background-image: url(/spritesmith-main-4.png); - background-position: -116px -561px; + background-position: -116px -546px; width: 60px; height: 60px; } @@ -546,7 +546,7 @@ } .customize-option.hair_topHair_6_peppermint { background-image: url(/spritesmith-main-4.png); - background-position: -207px -561px; + background-position: -207px -546px; width: 60px; height: 60px; } @@ -558,7 +558,7 @@ } .customize-option.hair_topHair_6_pgreen { background-image: url(/spritesmith-main-4.png); - background-position: -298px -561px; + background-position: -298px -546px; width: 60px; height: 60px; } @@ -570,7 +570,7 @@ } .customize-option.hair_topHair_6_pgreen2 { background-image: url(/spritesmith-main-4.png); - background-position: -389px -561px; + background-position: -389px -546px; width: 60px; height: 60px; } @@ -582,7 +582,7 @@ } .customize-option.hair_topHair_6_porange { background-image: url(/spritesmith-main-4.png); - background-position: -480px -561px; + background-position: -480px -546px; width: 60px; height: 60px; } @@ -594,7 +594,7 @@ } .customize-option.hair_topHair_6_porange2 { background-image: url(/spritesmith-main-4.png); - background-position: -571px -561px; + background-position: -571px -546px; width: 60px; height: 60px; } @@ -606,7 +606,7 @@ } .customize-option.hair_topHair_6_ppink { background-image: url(/spritesmith-main-4.png); - background-position: -662px -15px; + background-position: -662px -0px; width: 60px; height: 60px; } @@ -618,7 +618,7 @@ } .customize-option.hair_topHair_6_ppink2 { background-image: url(/spritesmith-main-4.png); - background-position: -662px -106px; + background-position: -662px -91px; width: 60px; height: 60px; } @@ -630,7 +630,7 @@ } .customize-option.hair_topHair_6_ppurple { background-image: url(/spritesmith-main-4.png); - background-position: -662px -197px; + background-position: -662px -182px; width: 60px; height: 60px; } @@ -642,7 +642,7 @@ } .customize-option.hair_topHair_6_ppurple2 { background-image: url(/spritesmith-main-4.png); - background-position: -662px -288px; + background-position: -662px -273px; width: 60px; height: 60px; } @@ -654,7 +654,7 @@ } .customize-option.hair_topHair_6_pumpkin { background-image: url(/spritesmith-main-4.png); - background-position: -662px -379px; + background-position: -662px -364px; width: 60px; height: 60px; } @@ -666,7 +666,7 @@ } .customize-option.hair_topHair_6_purple { background-image: url(/spritesmith-main-4.png); - background-position: -662px -470px; + background-position: -662px -455px; width: 60px; height: 60px; } @@ -678,7 +678,7 @@ } .customize-option.hair_topHair_6_pyellow { background-image: url(/spritesmith-main-4.png); - background-position: -662px -561px; + background-position: -662px -546px; width: 60px; height: 60px; } @@ -690,7 +690,7 @@ } .customize-option.hair_topHair_6_pyellow2 { background-image: url(/spritesmith-main-4.png); - background-position: -25px -652px; + background-position: -25px -637px; width: 60px; height: 60px; } @@ -702,7 +702,7 @@ } .customize-option.hair_topHair_6_rainbow { background-image: url(/spritesmith-main-4.png); - background-position: -116px -652px; + background-position: -116px -637px; width: 60px; height: 60px; } @@ -714,7 +714,7 @@ } .customize-option.hair_topHair_6_red { background-image: url(/spritesmith-main-4.png); - background-position: -207px -652px; + background-position: -207px -637px; width: 60px; height: 60px; } @@ -726,7 +726,7 @@ } .customize-option.hair_topHair_6_snowy { background-image: url(/spritesmith-main-4.png); - background-position: -298px -652px; + background-position: -298px -637px; width: 60px; height: 60px; } @@ -738,7 +738,7 @@ } .customize-option.hair_topHair_6_white { background-image: url(/spritesmith-main-4.png); - background-position: -480px -652px; + background-position: -480px -637px; width: 60px; height: 60px; } @@ -750,7 +750,7 @@ } .customize-option.hair_topHair_6_winternight { background-image: url(/spritesmith-main-4.png); - background-position: -571px -652px; + background-position: -571px -637px; width: 60px; height: 60px; } @@ -762,7 +762,7 @@ } .customize-option.hair_topHair_6_winterstar { background-image: url(/spritesmith-main-4.png); - background-position: -662px -652px; + background-position: -662px -637px; width: 60px; height: 60px; } @@ -774,7 +774,7 @@ } .customize-option.hair_topHair_6_yellow { background-image: url(/spritesmith-main-4.png); - background-position: -753px -15px; + background-position: -753px -0px; width: 60px; height: 60px; } @@ -786,7 +786,7 @@ } .customize-option.hair_topHair_6_zombie { background-image: url(/spritesmith-main-4.png); - background-position: -753px -106px; + background-position: -753px -91px; width: 60px; height: 60px; } diff --git a/website/client-old/js/controllers/userCtrl.js b/website/client-old/js/controllers/userCtrl.js index b2bb641c15..c251a02820 100644 --- a/website/client-old/js/controllers/userCtrl.js +++ b/website/client-old/js/controllers/userCtrl.js @@ -66,8 +66,10 @@ habitrpg.controller("UserCtrl", ['$rootScope', '$scope', '$location', 'User', '$ if (confirm(window.env.t('purchaseFor',{cost:cost*4})) !== true) return; if (User.user.balance < cost) return $rootScope.openModal('buyGems'); } else if (!_.get(User.user, 'purchased.' + path)) { - if (confirm(window.env.t('purchaseFor',{cost:cost*4})) !== true) return; - if (User.user.balance < cost) return $rootScope.openModal('buyGems'); + if (path.indexOf('hair.base') === -1 || !_.includes(['0', '1', '3'], path.split('.').pop())) { + if (confirm(window.env.t('purchaseFor',{cost:cost*4})) !== true) return; + if (User.user.balance < cost) return $rootScope.openModal('buyGems'); + } } User.unlock({query:{path:path}}) } diff --git a/website/common/script/ops/unlock.js b/website/common/script/ops/unlock.js index 1afe2623fe..d47d06d75f 100644 --- a/website/common/script/ops/unlock.js +++ b/website/common/script/ops/unlock.js @@ -52,6 +52,10 @@ module.exports = function unlock (user, req = {}, analytics) { } */ } else { alreadyOwns = _.get(user, `purchased.${path}`) === true; + + if (!alreadyOwns && path.indexOf('hair.base') !== -1) { + alreadyOwns = _.includes(['0', '1', '3'], path.split('.').pop()); + } } if ((!user.balance || user.balance < cost) && !alreadyOwns) { @@ -79,6 +83,12 @@ module.exports = function unlock (user, req = {}, analytics) { // Using Object so path[1] won't create an array but an object {path: {1: value}} setWith(user, `preferences.${key}`, value, Object); + if (path.indexOf('hair.base') !== -1) { + _.set(user, 'preferences.hair.topHair', 0); + } + if (path.indexOf('hair.topHair') !== -1) { + _.set(user, 'preferences.hair.base', 0); + } } else { // Using Object so path[1] won't create an array but an object {path: {1: value}} setWith(user, `purchased.${path}`, true, Object); diff --git a/website/views/options/profile.jade b/website/views/options/profile.jade index eac91aa92e..2c4f28564b 100644 --- a/website/views/options/profile.jade +++ b/website/views/options/profile.jade @@ -114,9 +114,9 @@ mixin customizeProfile(mobile) // Base hairstyles (free) menu(label=env.t('hairBase')) - button(class='head_0 customize-option', type='button', ng-click='set({"preferences.hair.base":0})', ng-class='{selectableInventory: user.preferences.hair.base == 0}') + button(class='head_0 customize-option', type='button', ng-click='unlock("hair.base.0")', ng-class='{selectableInventory: user.preferences.hair.base === 0 && user.preferences.hair.topHair === 0}') each num in [1,3] - button(class='hair_base_#{num}_{{user.preferences.hair.color}} customize-option', type='button', ng-click='set({"preferences.hair.base":#{num}})', ng-class='{selectableInventory: user.preferences.hair.base == "#{num}"}') + button(class='hair_base_#{num}_{{user.preferences.hair.color}} customize-option', type='button', ng-click='unlock("hair.base.#{num}")', ng-class='{selectableInventory: user.preferences.hair.base == "#{num}"}') // Purchasable hairstyles menu(label=env.t('hairSet1')) @@ -138,7 +138,6 @@ mixin customizeProfile(mobile) span(ng-hide='#{showPath("user.purchased.hair.topHair", styles, "&&")}') +gemCost(2) button.btn.btn-xs(ng-click='#{unlockPath("hair.topHair", styles)}')!= env.t('unlockSet', {cost: 5}) + ' ' - button(class='head_0 customize-option', type='button', ng-click='set({"preferences.hair.topHair":0})', ng-class='{selectableInventory: user.preferences.hair.topHair == 0}') each num in styles button(class='hair_topHair_#{num}_{{user.preferences.hair.color}} customize-option', type='button', ng-class='{locked: !user.purchased.hair.topHair["#{num}"], selectableInventory: user.preferences.hair.topHair == "#{num}"}', ng-click='unlock("hair.topHair.#{num}")')