classes: fixes to class-selection & reroll, remove show/hide gear since

we're using costumes

public/js/controllers/userCtrl.js

@@ -22,14 +22,13 @@ habitrpg.controller("UserCtrl", ['$rootScope', '$scope', '$location', 'User', '$
       if (!confirm("Are you sure you want to re-roll? This will reset your character's class and allocated points (you'll get them all back to re-allocate)"))
         return;
       User.setMultiple({
-        'stats.class': '',
+        'flags.classSelected': false,
         //'stats.points': this is handled on the server
         'stats.str': 0,
         'stats.def': 0,
         'stats.per': 0,
         'stats.int': 0
       })
-
     }
 
     $scope.save = function(){

src/models/user.js

@@ -94,7 +94,8 @@ var UserSchema = new Schema({
     rewrite: {type: Boolean, 'default': true},
     partyEnabled: Boolean, // FIXME do we need this?
     rest: {type: Boolean, 'default': false}, // fixme - change to preferences.resting once we're off derby
-    contributor: Boolean
+    contributor: Boolean,
+    classSelected: {type: Boolean, 'default': false}
   },
   history: {
     exp: Array, // [{date: Date, value: Number}], // big peformance issues if these are defined
@@ -205,13 +206,11 @@ var UserSchema = new Schema({
     hair: {
       color: {type: String, 'default': 'blond'},
       base: {type: Number, 'default': 0},
-      bangs: {type: Number, 'default': 0}
+      bangs: {type: Number, 'default': 0},
+      beard: {type: Number, 'default': 0},
+      mustach: {type: Number, 'default': 0},
     },
     hideHeader: {type:Boolean, 'default':false},
-    showHelm: {type:Boolean, 'default':true},
-    showWeapon: {type:Boolean, 'default':true},
-    showShield: {type:Boolean, 'default':true},
-    showArmor: {type:Boolean, 'default':true},
     skin: {type:String, 'default':'white'},
     timezoneOffset: Number,
     language: String,
@@ -231,8 +230,7 @@ var UserSchema = new Schema({
     lvl: Number,
 
     // Class System
-//    'class': {type: String, enum: ['warrior','rogue','wizard','rogue'], 'default': 'warrior'},
-    'class': {type: String, 'default': 'warrior'},
+    'class': {type: String, enum: ['warrior','rogue','wizard','rogue'], 'default': 'warrior'},
     points: {type: Number, 'default': 0},
     str: {type: Number, 'default': 0},
     def: {type: Number, 'default': 0},

views/options/profile.jade

@@ -8,27 +8,6 @@ script(id='partials/options.profile.avatar.html', type='text/ng-template')
           menu
             button.broad_armor_warrior_0.customize-option(type='button', ng-click='set("preferences.size","broad")')
             button.slim_armor_warrior_0.customize-option(type='button', ng-click='set("preferences.size","slim")')
-          label.checkbox
-            input(type='checkbox', ng-model='user.preferences.showHelm', ng-change='set("preferences.showHelm", user.preferences.showHelm?true: false)')
-            | Show Helm
-        menu(type='list')
-          //-li.customize-menu
-            menu(label='Clothing')
-              button.f_armor_0_v1.customize-option(ng-show='user.preferences.gender=="f"', type='button', ng-click='set("preferences.armorSet","v1")')
-              button.f_armor_0_v2.customize-option(ng-show='user.preferences.gender=="f"', type='button', ng-click='set("preferences.armorSet","v2")')
-          label.checkbox
-            input(type='checkbox', ng-model='user.preferences.showArmor', ng-change='set("preferences.showArmor", user.preferences.showArmor?true: false)')
-            | Show Armor
-        menu(type='list')
-          li.customize-menu
-            menu(label='Other')
-          label.checkbox
-            input(type='checkbox', ng-model='user.preferences.showWeapon', ng-change='set("preferences.showWeapon", user.preferences.showWeapon?true: false)')
-            | Show Weapon
-          label.checkbox
-            input(type='checkbox', ng-model='user.preferences.showShield', ng-change='set("preferences.showShield", user.preferences.showShield?true: false)')
-            | Show Shield
-
 
     .span4
         h3 Hair

views/shared/modals/classes.jade

@@ -1,4 +1,4 @@
-.modal(ng-if='user.stats.lvl >= 10 && !user.stats.class', data-backdrop=true)
+.modal(ng-if='!user.flags.classSelected && user.stats.lvl >= 5', data-backdrop=true)
   .modal-header
     h3 Class System Unlocked!
   .modal-body
@@ -58,4 +58,4 @@
             span(class='weapon_healer_6')
 
   .modal-footer
-    button.btn.btn-default.cancel(ng-click='set("stats.class", selectedClass)') Select
+    button.btn.btn-default.cancel(ng-click='User.setMultiple({"stats.class":selectedClass,"flags.classSelected":true});') Select

views/shared/tasks/lists.jade

@@ -46,7 +46,7 @@ script(id='templates/habitrpg-tasks.html', type="text/ng-template")
 
         // Static Rewards
         ul.items.rewards(bo-if='main && list.type=="reward" && user.flags.itemsEnabled')
-          li.task.reward-item(ng-hide='item.hide', ng-repeat='item in itemStore')
+          li.task.reward-item(ng-if='!item.hide', ng-repeat='item in itemStore')
             // right-hand side control buttons
             .task-meta-controls
               span.task-notes(popover-trigger='mouseenter', popover-placement='left', popover='{{item.notes}}', popover-title='{{item.text}}')
@@ -64,7 +64,7 @@ script(id='templates/habitrpg-tasks.html', type="text/ng-template")
 
         // Spells
         ul.items(ng-if='main && list.type=="reward" && user.stats.class')
-          li.task.reward-item(ng-repeat='(k,spell) in Items.spells[user.stats.class]')
+          li.task.reward-item(ng-repeat='(k,spell) in Items.spells[user.stats.class]', ng-show='user.stats.lvl >= spell.lvl')
             .task-meta-controls
               span.task-notes(popover-trigger='mouseenter', popover-placement='left', popover='{{spell.notes}}', popover-title='{{spell.text}}')
                 i.icon-comment