Merge remote-tracking branch 'origin/sabe/attributes' into develop

Conflicts: views/shared/footer.jade
2014-01-04 16:02:22 -07:00
parent 4777a693ba a9e57a8adf
commit 3a5eda1e98
4 changed files with 29 additions and 2 deletions
@@ -223,6 +223,7 @@ var UserSchema = new Schema({
    timezoneOffset: Number,
    language: String,
    automaticAllocation: Boolean,
+    allocationMode: {type:String, enum: ['flat','classbased','taskbased'], 'default': 'flat'},
    costume: Boolean,
    sleep: {type: Boolean, 'default': false},
    stickyHeader: {type: Boolean, 'default': true},
@@ -255,6 +256,12 @@ var UserSchema = new Schema({
      stealth: {type: Number, 'default': 0},
      streaks: {type: Boolean, 'default': false},
      snowball: {type: Boolean, 'default': false}
+    },
+    training: {
+      int: {type: Number, 'default': 0},
+      per: {type: Number, 'default': 0},
+      str: {type: Number, 'default': 0},
+      con: {type: Number, 'default': 0}
    }
  },
  tags: [