From 44a89dd0bd649ab505d7cdd67612f12cf961e4d7 Mon Sep 17 00:00:00 2001
From: Blade Barringer <blade@crookedneighbor.com>
Date: Tue, 3 Feb 2015 19:29:22 -0600
Subject: [PATCH] Corrected sprite task

---
 .gitignore                   | 3 ++-
 gulpfile.js                  | 9 ++++-----
 website/public/manifest.json | 2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.gitignore b/.gitignore
index 3328c56457..3e4f9d29a1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,6 @@
 .DS_Store
 website/public/gen
+website/public/common
 node_modules
 *.swp
 .idea*
@@ -8,7 +9,7 @@ npm-debug.log
 lib
 website/public/bower_components
 common/dist
-build
+website/build
 newrelic_agent.log
 .bower-tmp
 .bower-registry
diff --git a/gulpfile.js b/gulpfile.js
index 4ab3651f1f..e4011f5e88 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -34,7 +34,7 @@ var paths = {
   sprites: {
     src: './common/img/sprites/spritesmith/**/*.png',
     dest: './common/dist/sprites/',
-    cssminSrc: './common/dist/sprites/*.css',
+    cssminSrc: './common/dist/sprites/spritesmith*.css',
     cssminDest: './common/dist/sprites/'
   },
   copy: {
@@ -95,9 +95,8 @@ gulp.task('sprite', function(cb) {
 
   var sprite = {};
   _.times(COUNT, function(i){
-    sliced = images.slice(i * (images.length/COUNT), (i+1) * images.length/COUNT)
     sprite[''+i] = {
-      src: sliced,
+      slice: images.slice(i * (images.length/COUNT), (i+1) * images.length/COUNT),
       imgName: 'spritesmith'+i+'.png',
       cssName: 'spritesmith'+i+'.css',
       engine: 'phantomjssmith',
@@ -131,7 +130,7 @@ gulp.task('sprite', function(cb) {
 
   _.forIn(sprite, function(value, key){
       console.log("Starting spritesmith" + key + ".png");
-      var spriteData = gulp.src(sliced).pipe(spritesmith(sprite[key]));
+      var spriteData = gulp.src(sprite[key].slice).pipe(spritesmith(sprite[key]));
 
       spriteData.img
         //.pipe(imagemin())
@@ -146,8 +145,8 @@ gulp.task('sprite', function(cb) {
           console.log("Finished spritesmith" + key + ".png");
           if(STEP >= COUNT) {
             gulp.src(paths.sprites.cssminSrc)
+              .pipe(concat('habitrpg-shared.css'))
               .pipe(cssmin())
-              .pipe(rename('habitrpg-shared.css'))
               .pipe(gulp.dest(paths.sprites.cssminDest))
               .on('end', function(){cb()});
           }
diff --git a/website/public/manifest.json b/website/public/manifest.json
index a5b122f57d..77941ff100 100644
--- a/website/public/manifest.json
+++ b/website/public/manifest.json
@@ -72,7 +72,7 @@
             "app.css",
             "bower_components/pnotify/jquery.pnotify.default.css",
             "bower_components/pnotify/jquery.pnotify.default.icons.css",
-            "sprites/habitrpg-shared.css",
+            "common/sprites/habitrpg-shared.css",
             "fontello/css/fontelico.css"
         ]
     },