From 95b16f869020a7dcb39488275fe2dc42bb5b2b00 Mon Sep 17 00:00:00 2001 From: Alice Harris Date: Fri, 29 Aug 2014 18:45:02 +1000 Subject: [PATCH] change headAccessory to eyewear --- database_reports/count_users_who_own_specified_gear.js | 10 +++++----- src/models/coupon.js | 4 ++-- src/models/user.js | 2 ++ views/shared/header/avatar.jade | 6 ++++++ 4 files changed, 15 insertions(+), 7 deletions(-) diff --git a/database_reports/count_users_who_own_specified_gear.js b/database_reports/count_users_who_own_specified_gear.js index 7da478bfe8..6721069981 100644 --- a/database_reports/count_users_who_own_specified_gear.js +++ b/database_reports/count_users_who_own_specified_gear.js @@ -1,6 +1,6 @@ var itemsOfInterest = [ - 'headAccessory_special_wondercon_red', - 'headAccessory_special_wondercon_black', + 'eyewear_special_wondercon_red', + 'eyewear_special_wondercon_black', 'back_special_wondercon_black', 'back_special_wondercon_red', 'body_special_wondercon_red', @@ -55,15 +55,15 @@ print("\n"); CSV DATA: -"date","headAccessory_special_wondercon_red","headAccessory_special_wondercon_black","back_special_wondercon_black","back_special_wondercon_red","body_special_wondercon_red","body_special_wondercon_black","body_special_wondercon_gold" +"date","eyewear_special_wondercon_red","eyewear_special_wondercon_black","back_special_wondercon_black","back_special_wondercon_red","body_special_wondercon_red","body_special_wondercon_black","body_special_wondercon_gold" "2014-08-17","5","4","3","3","3","3","3" READABLE DATA: 2014-08-17 { - "headAccessory_special_wondercon_red": 5, - "headAccessory_special_wondercon_black": 4, + "eyewear_special_wondercon_red": 5, + "eyewear_special_wondercon_black": 4, "back_special_wondercon_black": 3, "back_special_wondercon_red": 3, "body_special_wondercon_red": 3, diff --git a/src/models/coupon.js b/src/models/coupon.js index 692cb91be9..38982fa6ca 100644 --- a/src/models/coupon.js +++ b/src/models/coupon.js @@ -29,8 +29,8 @@ CouponSchema.statics.apply = function(user, code, next){ if (coupon.user) return cb("Coupon already used"); switch (coupon.event) { case 'wondercon': - user.items.gear.owned.headAccessory_special_wondercon_red = true; - user.items.gear.owned.headAccessory_special_wondercon_black = true; + user.items.gear.owned.eyewear_special_wondercon_red = true; + user.items.gear.owned.eyewear_special_wondercon_black = true; user.items.gear.owned.back_special_wondercon_black = true; user.items.gear.owned.back_special_wondercon_red = true; user.items.gear.owned.body_special_wondercon_red = true; diff --git a/src/models/user.js b/src/models/user.js index a9e981b420..8990d10a96 100644 --- a/src/models/user.js +++ b/src/models/user.js @@ -139,6 +139,7 @@ var UserSchema = new Schema({ shield: {type: String, 'default': 'shield_base_0'}, back: String, headAccessory: String, + eyewear: String, body: String }, costume: { @@ -148,6 +149,7 @@ var UserSchema = new Schema({ shield: {type: String, 'default': 'shield_base_0'}, back: String, headAccessory: String, + eyewear: String, body: String }, }, diff --git a/views/shared/header/avatar.jade b/views/shared/header/avatar.jade index b0afded30d..afee0d95da 100644 --- a/views/shared/header/avatar.jade +++ b/views/shared/header/avatar.jade @@ -21,6 +21,7 @@ mixin avatar(opts) // Avatar span(class='skin_{{profile.preferences.skin}}', ng-if='!profile.preferences.sleep') span(class='skin_{{profile.preferences.skin}}_sleep', ng-if='profile.preferences.sleep') + // Shirt span(class='{{profile.preferences.size}}_shirt_{{profile.preferences.shirt}}') @@ -32,6 +33,7 @@ mixin avatar(opts) span(class='{{profile.items.gear.equipped.back}}_collar', ng-if='!profile.preferences.costume') span(class='{{profile.items.gear.costume.back}}_collar', ng-if='profile.preferences.costume') + // Body span(class='{{profile.items.gear.equipped.body}}', ng-if='!profile.preferences.costume') span(class='{{profile.items.gear.costume.body}}', ng-if='profile.preferences.costume') @@ -42,6 +44,10 @@ mixin avatar(opts) span(class='hair_mustache_{{profile.preferences.hair.mustache}}_{{profile.preferences.hair.color}}') span(class='hair_beard_{{profile.preferences.hair.beard}}_{{profile.preferences.hair.color}}') + // Eyewear + span(class='{{profile.items.gear.equipped.eyewear}}', ng-if='!profile.preferences.costume') + span(class='{{profile.items.gear.costume.eyewear}}', ng-if='profile.preferences.costume') + // Helm span(class='{{profile.items.gear.equipped.head}}', ng-if='!profile.preferences.costume') span(class='{{profile.items.gear.costume.head}}', ng-if='profile.preferences.costume')