Merge pull request #6955 from HabitRPG/wheelchair

Wheelchair

common/dist/sprites/spritesmith-largeSprites-0.css

@@ -130,12 +130,6 @@
   width: 100px;
   height: 137px;
 }
-.customize-option.promo_haunted_hair {
-  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1372px -209px;
-  width: 60px;
-  height: 60px;
-}
 .promo_item_notif {
   background-image: url(spritesmith-largeSprites-0.png);
   background-position: -1190px -91px;
@@ -334,12 +328,6 @@
   width: 330px;
   height: 83px;
 }
-.customize-option.promo_shimmer_hair {
-  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -356px -998px;
-  width: 60px;
-  height: 60px;
-}
 .promo_splashyskins {
   background-image: url(spritesmith-largeSprites-0.png);
   background-position: -1190px -823px;
@@ -412,12 +400,6 @@
   width: 152px;
   height: 75px;
 }
-.customize-option.promo_winteryhair {
-  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1215px -1021px;
-  width: 60px;
-  height: 60px;
-}
 .avatar_variety {
   background-image: url(spritesmith-largeSprites-0.png);
   background-position: 0px -525px;

common/locales/en/character.json

@@ -34,6 +34,7 @@
     "beard": "Beard",
     "mustache": "Mustache",
     "flower": "Flower",
+    "wheelchair": "Wheelchair",
     "basicSkins": "Basic Skins",
     "rainbowSkins": "Rainbow Skins",
     "pastelSkins": "Pastel Skins",

common/script/content/appearance/chair.js

@@ -0,0 +1,6 @@
+import prefill from './prefill.js';
+
+export default prefill({
+  none: {},
+  black: {},
+});

common/script/content/appearance/index.js

@@ -3,6 +3,7 @@ import shirts from './shirt.js';
 import skins from './skin.js';
 import sizes from './size.js';
 import backgrounds from './backgrounds.js';
+import chairs from './chair.js';
 import {forOwn, clone} from 'lodash';
 
 let reorderedBgs = {};
@@ -25,6 +26,7 @@ let appearances = {
   shirt: shirts,
   size: sizes,
   skin: skins,
+  chair: chairs,
   background: reorderedBgs,
 };
 

tasks/gulp-sprites.js

@@ -127,7 +127,7 @@ function calculateImgDimensions(img, addPadding) {
 }
 
 function checkForSpecialTreatment(name) {
-  let regex = /hair|skin|beard|mustach|shirt|flower|^headAccessory_special_\w+Ears/;
+  let regex = /^hair|skin|beard|mustach|shirt|flower|^headAccessory_special_\w+Ears/;
   return name.match(regex) || name === 'head_0';
 }
 

website/src/controllers/api-v2/user.js

@@ -309,6 +309,7 @@ let requiresPurchase = {
   'preferences.shirt': 'shirt',
   'preferences.size': 'size',
   'preferences.skin': 'skin',
+  'preferences.chair': 'chair',
   'preferences.hair.bangs': 'hair.bangs',
   'preferences.hair.base': 'hair.base',
   'preferences.hair.beard': 'hair.beard',

website/src/models/user.js

@@ -346,6 +346,7 @@ var UserSchema = new Schema({
       mustache: {type: Number, 'default': 0},
       flower: {type: Number, 'default': 1}
     },
+    chair: {type: String, 'default': 'none'},
     hideHeader: {type:Boolean, 'default':false},
     skin: {type:String, 'default':'915533'},
     shirt: {type: String, 'default': 'blue'},

website/views/options/profile.jade

@@ -68,6 +68,13 @@ mixin customizeProfile(mobile)
             popover-placement='right', popover-append-to-body='true',
             ng-click='user.items.gear.owned[item.key] ? equip(item.key) : purchase(item.type,item)')
 
+        // Wheelchair
+        li.customize-menu
+          menu(label=env.t('wheelchair'))
+            button.customize-option(ng-repeat='item in ::["black"]', class='button_chair_{{::item}}',
+              ng-class="{selectableInventory: user.preferences.chair == item}",
+              ng-click='user.preferences.chair != item ? set({"preferences.chair":item}) : set({"preferences.chair":"none"})')
+
     .col-md-4
         h3(class=mobile?'item item-divider':'')=env.t('bodyHead')
         menu(type='list')

website/views/shared/avatar/generated_avatar.jade

@@ -6,6 +6,7 @@ mixin costumeSetting(type, options)
 
 mixin generatedAvatar(options)
   - options = options || {}
+  span(class='chair_{{profile.preferences.chair}}')
   +costumeSetting('back')
   if options.sleep
     span(ng-class="'skin_' + profile.preferences.skin + '_sleep'")