Merge branch 'develop' into refactor-content

common/script/index.coffee

@@ -1834,6 +1834,11 @@ api.wrap = (user, main=true) ->
       user.stats.mp += _.max([10,.1 * user._statsComputed.maxMP]) * dailyChecked / (dailyDueUnchecked + dailyChecked)
       user.stats.mp = user._statsComputed.maxMP if user.stats.mp > user._statsComputed.maxMP
 
+      # After all is said and done, progress up user's effect on quest, return those values & reset the user's
+      progress = user.party.quest.progress; _progress = _.cloneDeep progress
+      _.merge progress, {down:0,up:0}
+      progress.collect = _.transform progress.collect, ((m,v,k)->m[k]=0)
+
       # Analytics
       user.flags.cronCount?=0
       user.flags.cronCount++
@@ -1845,14 +1850,12 @@ api.wrap = (user, main=true) ->
         uuid: user._id,
         user: user,
         resting: user.preferences.sleep,
-        cronCount: user.flags.cronCount
+        cronCount: user.flags.cronCount,
+        progressUp: _progress.up,
+        progressDown: _progress.down
       }
       options.analytics?.track('Cron', analyticsData)
 
-      # After all is said and done, progress up user's effect on quest, return those values & reset the user's
-      progress = user.party.quest.progress; _progress = _.cloneDeep progress
-      _.merge progress, {down:0,up:0}
-      progress.collect = _.transform progress.collect, ((m,v,k)->m[k]=0)
       _progress
 
     # Registered users with some history

common/script/src/content/gear/head.js

@@ -593,8 +593,13 @@ let head = {
       text: t('headMystery201508Text'),
       notes: t('headMystery201508Notes'),
       mystery: '201508',
-      value: 0,
-      int: 0
+      value: 0
+    },
+    201509: {
+      text: t('headMystery201509Text'),
+      notes: t('headMystery201509Notes'),
+      mystery:'201509',
+      value: 0
     },
     301404: {
       text: t('headMystery301404Text'),

common/script/src/content/gear/sets/mystery.js

@@ -84,8 +84,13 @@ export var armor = {
     text: t('armorMystery201508Text'),
     notes: t('armorMystery201508Notes'),
     mystery: '201508',
-    value: 0,
-    int: 0
+    value: 0
+  },
+  201509: {
+    text: t('armorMystery201509Text'),
+    notes: t('armorMystery201509Notes'),
+    mystery: '201509',
+    value: 0
   },
   301404: {
     text: t('armorMystery301404Text'),

common/script/src/content/mystery-sets.js

@@ -97,6 +97,11 @@ let mysterySets = {
     end: '2015-09-02',
     text: 'Cheetah Costume Set'
   },
+  201509: {
+    start:'2015-09-24',
+    end:'2015-10-02',
+    text:'Werewolf Set'
+  },
   301404: {
     start: '3014-03-24',
     end: '3014-04-02',