Merge branch 'develop' into refactor-content

common/script/index.coffee

@@ -1517,8 +1517,6 @@ api.wrap = (user, main=true) ->
       return if (api.daysSince(user.items.lastDrop.date, user.preferences) is 0) and (user.items.lastDrop.count >= dropMultiplier * (5 + Math.floor(user._statsComputed.per / 25) + (user.contributor.level or 0)))
       if user.flags?.dropsEnabled and user.fns.predictableRandom(user.stats.exp) < chance
 
-        # current breakdown - 1% (adjustable) chance on drop
-        # If they got a drop: 50% chance of egg, 50% Hatching Potion. If hatchingPotion, broken down further even further
         rarity = user.fns.predictableRandom(user.stats.gp)
 
         # Food: 40% chance

common/script/src/content/events.js

@@ -11,7 +11,8 @@ let events = {
   fall: {start:'2014-09-21',end:'2014-11-01'},
   winter2015: {start:'2014-12-21',end:'2015-02-02'},
   spring2015: {start:'2015-03-20',end:'2015-05-02'},
-  summer2015: {start:'2015-06-20',end:'2015-08-02'}
+  summer2015: {start:'2015-06-20',end:'2015-08-02'},
+  fall2015: {start:'2015-09-21',end:'2015-11-01'},
 }
 
 export default events;

common/script/src/content/food/base.js

@@ -3,8 +3,8 @@ import {
   setFoodDefaults
 } from '../helpers';
 
-const CAN_BUY = true;
-const CAN_DROP = true;
+const CAN_BUY = false;
+const CAN_DROP = false;
 
 let baseFood = {
   Meat: {

common/script/src/content/food/fall.js

@@ -3,8 +3,8 @@ import {
   setFoodDefaults
 } from '../helpers';
 
-const CAN_BUY = false;
-const CAN_DROP = false;
+const CAN_BUY = true;
+const CAN_DROP = true;
 
 let candy = {
   Candy_Skeleton: {

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

@@ -74,6 +74,7 @@ let eyewear = {
     plagueDoctorMask: {
       text: t('eyewearArmoirePlagueDoctorMaskText'),
       notes: t('eyewearArmoirePlagueDoctorMaskNotes'),
+      value: 100,
       set: 'plagueDoctor',
       canOwn: (function(u) {
         return u.items.gear.owned.eyewear_armoire_plagueDoctorMask != null;

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

@@ -487,6 +487,46 @@ let head = {
       value: 60,
       int: 7
     },
+    fall2015Rogue: {
+      event: events.fall2015,
+      specialClass: 'rogue',
+      text: t('headSpecialFall2015RogueText'),
+      notes: t('headSpecialFall2015RogueNotes', {
+        per: 9
+      }),
+      value: 60,
+      per: 9
+    },
+    fall2015Warrior: {
+      event: events.fall2015,
+      specialClass: 'warrior',
+      text: t('headSpecialFall2015WarriorText'),
+      notes: t('headSpecialFall2015WarriorNotes', {
+        str: 9
+      }),
+      value: 60,
+      str: 9
+    },
+    fall2015Mage: {
+      event: events.fall2015,
+      specialClass: 'wizard',
+      text: t('headSpecialFall2015MageText'),
+      notes: t('headSpecialFall2015MageNotes', {
+        per: 7
+      }),
+      value: 60,
+      per: 7
+    },
+    fall2015Healer: {
+      event: events.fall2015,
+      specialClass: 'healer',
+      text: t('headSpecialFall2015HealerText'),
+      notes: t('headSpecialFall2015HealerNotes', {
+        int: 7
+      }),
+      value: 60,
+      int: 7
+    },
     gaymerx: {
       event: events.gaymerx,
       text: t('headSpecialGaymerxText'),
@@ -702,6 +742,7 @@ let head = {
       notes: t('headArmoireYellowHairbowNotes', {
         attrs: 5
       }),
+      value: 100,
       int: 5,
       per: 5,
       str: 5,
@@ -714,6 +755,7 @@ let head = {
       notes: t('headArmoireRedFloppyHatNotes', {
         attrs: 6
       }),
+      value: 100,
       con: 6,
       int: 6,
       per: 6,
@@ -728,6 +770,7 @@ let head = {
         str: 6,
         con: 5
       }),
+      value: 100,
       int: 5,
       str: 6,
       con: 5,

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

@@ -80,6 +80,7 @@ export var armor = {
       str: 5,
       con: 6
     }),
+    value: 100,
     int: 6,
     str: 5,
     con: 6,

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

@@ -347,6 +347,46 @@ export var armor = {
     value: 90,
     con: 15
   },
+  fall2015Rogue: {
+    event: events.fall2015,
+    specialClass: 'rogue',
+    text: t('armorSpecialFall2015RogueText'),
+    notes: t('armorSpecialFall2015RogueNotes', {
+      per: 15
+    }),
+    value: 90,
+    per: 15
+  },
+  fall2015Warrior: {
+    event: events.fall2015,
+    specialClass: 'warrior',
+    text: t('armorSpecialFall2015WarriorText'),
+    notes: t('armorSpecialFall2015WarriorNotes', {
+      con: 9
+    }),
+    value: 90,
+    con: 9
+  },
+  fall2015Mage: {
+    event: events.fall2015,
+    specialClass: 'wizard',
+    text: t('armorSpecialFall2015MageText'),
+    notes: t('armorSpecialFall2015MageNotes', {
+      int: 9
+    }),
+    value: 90,
+    int: 9
+  },
+  fall2015Healer: {
+    event: events.fall2015,
+    specialClass: 'healer',
+    text: t('armorSpecialFall2015HealerText'),
+    notes: t('armorSpecialFall2015HealerNotes', {
+      con: 15
+    }),
+    value: 90,
+    con: 15
+  },
   gaymerx: {
     event: events.gaymerx,
     text: t('armorSpecialGaymerxText'),

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

@@ -373,6 +373,36 @@ let shield = {
       }),
       value: 70,
       con: 9
+    },
+    fall2015Rogue: {
+      event: events.fall2015,
+      specialClass: 'rogue',
+      text: t('shieldSpecialFall2015RogueText'),
+      notes: t('shieldSpecialFall2015RogueNotes', {
+        str: 8
+      }),
+      value: 80,
+      str: 8
+    },
+    fall2015Warrior: {
+      event: events.fall2015,
+      specialClass: 'warrior',
+      text: t('shieldSpecialFall2015WarriorText'),
+      notes: t('shieldSpecialFall2015WarriorNotes', {
+        con: 7
+      }),
+      value: 70,
+      con: 7
+    },
+    fall2015Healer: {
+      event: events.fall2015,
+      specialClass: 'healer',
+      text: t('shieldSpecialFall2015HealerText'),
+      notes: t('shieldSpecialFall2015HealerNotes', {
+        con: 9
+      }),
+      value: 70,
+      con: 9
     }
   },
   mystery: {

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

@@ -579,6 +579,49 @@ let weapon = {
       }),
       value: 90,
       int: 9
+    },
+    fall2015Rogue: {
+      event: events.fall2015,
+      specialClass: 'rogue',
+      text: t('weaponSpecialFall2015RogueText'),
+      notes: t('weaponSpecialFall2015RogueNotes', {
+        str: 8
+      }),
+      value: 80,
+      str: 8
+    },
+    fall2015Warrior: {
+      event: events.fall2015,
+      specialClass: 'warrior',
+      text: t('weaponSpecialFall2015WarriorText'),
+      notes: t('weaponSpecialFall2015WarriorNotes', {
+        str: 15
+      }),
+      value: 90,
+      str: 15
+    },
+    fall2015Mage: {
+      event: events.fall2015,
+      specialClass: 'wizard',
+      twoHanded: true,
+      text: t('weaponSpecialFall2015MageText'),
+      notes: t('weaponSpecialFall2015MageNotes', {
+        int: 15,
+        per: 7
+      }),
+      value: 160,
+      int: 15,
+      per: 7
+    },
+    fall2015Healer: {
+      event: events.fall2015,
+      specialClass: 'healer',
+      text: t('weaponSpecialFall2015HealerText'),
+      notes: t('weaponSpecialFall2015HealerNotes', {
+        int: 9
+      }),
+      value: 90,
+      int: 9
     }
   },
   mystery: {