Merge remote-tracking branch 'remotes/Alys/eyewear1' into develop

Conflicts:
	locales/en/gear.json

locales/en/gear.json

@@ -434,20 +434,25 @@
   "headAccessorySpecialSpringHealerText": "Yellow Dog Ears",
   "headAccessorySpecialSpringHealerNotes": "Floppy but cute. Wanna play? Confers no benefit. Limited Edition 2014 Spring Gear.",
 
-  "headAccessorySpecialSummerRogueText": "Roguish Eyepatch",
-  "headAccessorySpecialSummerRogueNotes": "It doesn't take a scallywag to see how stylish this is! Confers no benefit. Limited Edition 2014 Summer Gear.",
-  "headAccessorySpecialSummerWarriorText": "Dashing Eyepatch",
-  "headAccessorySpecialSummerWarriorNotes": "It doesn't take a rapscallion to see how stylish this is! Confers no benefit. Limited Edition 2014 Summer Gear.",
-
-  "headAccessorySpecialWonderconRedText": "Mighty Mask",
-  "headAccessorySpecialWonderconRedNotes": "What a powerful face accessory! Confers no benefit. Special Edition Convention Item.",
-  "headAccessorySpecialWonderconBlackText": "Sneaky Mask",
-  "headAccessorySpecialWonderconBlackNotes": "Your motives are definitely legitimate. Confers no benefit. Special Edition Convention Item.",
-
   "headAccessoryMystery201403Text": "Forest Walker Antlers",
   "headAccessoryMystery201403Notes": "These antlers shimmer with moss and lichen. Confers no benefit. March 2014 Subscriber Item.",
   "headAccessoryMystery201404Text": "Twilight Butterfly Antennae",
+  "headAccessoryMystery201404Notes": "These antennae help the wearer sense dangerous distractions!",
+
   "headAccessoryMystery201404Notes": "These antennae help the wearer sense dangerous distractions! Confers no benefit. April 2014 Subscriber Item.",
   "headAccessoryMystery201409Text": "Autumn Antlers",
-  "headAccessoryMystery201409Notes": "These powerful antlers change colors with the leaves. Confers no benefit. September 2014 Subscriber Item."
+  "headAccessoryMystery201409Notes": "These powerful antlers change colors with the leaves. Confers no benefit. September 2014 Subscriber Item.",
+
+  "eyewearBase0Text": "No Eyewear",
+  "eyewearBase0Notes": "No Eyewear.",
+
+  "eyewearSpecialSummerRogueText": "Roguish Eyepatch",
+  "eyewearSpecialSummerRogueNotes": "It doesn't take a scallywag to see how stylish this is! Confers no benefit. Limited Edition 2014 Summer Gear.",
+  "eyewearSpecialSummerWarriorText": "Dashing Eyepatch",
+  "eyewearSpecialSummerWarriorNotes": "It doesn't take a rapscallion to see how stylish this is! Confers no benefit. Limited Edition 2014 Summer Gear.",
+
+  "eyewearSpecialWonderconRedText": "Mighty Mask",
+  "eyewearSpecialWonderconRedNotes": "What a powerful face accessory! Confers no benefit. Special Edition Convention Item.",
+  "eyewearSpecialWonderconBlackText": "Sneaky Mask",
+  "eyewearSpecialWonderconBlackNotes": "Your motives are definitely legitimate. Confers no benefit. Special Edition Convention Item."
 }

script/content.coffee

@@ -17,7 +17,7 @@ t = (string, vars) ->
 ###
 
 classes = ['warrior', 'rogue', 'healer', 'wizard']
-gearTypes = [ 'weapon', 'armor', 'head', 'shield', 'body', 'back', 'headAccessory']
+gearTypes = [ 'weapon', 'armor', 'head', 'shield', 'body', 'back', 'headAccessory', 'eyewear']
 
 events =
   winter: {start:'2013-12-31',end:'2014-02-01'}
@@ -328,17 +328,22 @@ gear =
       springWarrior: event: events.spring, specialClass: 'warrior', text: t('headAccessorySpecialSpringWarriorText'), notes: t('headAccessorySpecialSpringWarriorNotes'), value: 20
       springMage:    event: events.spring, specialClass: 'wizard',  text: t('headAccessorySpecialSpringMageText'), notes: t('headAccessorySpecialSpringMageNotes'), value: 20
       springHealer:  event: events.spring, specialClass: 'healer',  text: t('headAccessorySpecialSpringHealerText'), notes: t('headAccessorySpecialSpringHealerNotes'), value: 20
-      wondercon_red: text: t('headAccessorySpecialWonderconRedText'), notes: t('headAccessorySpecialWonderconRedNotes'), value: 0,           mystery:mystery.wondercon
-      wondercon_black: text: t('headAccessorySpecialWonderconBlackText'), notes: t('headAccessorySpecialWonderconBlackNotes'), value: 0, mystery:mystery.wondercon
-      #Summer
-      summerRogue:   event: events.summer, specialClass: 'rogue',   text: t('headAccessorySpecialSummerRogueText'), notes: t('headAccessorySpecialSummerRogueNotes'), value: 20
-      summerWarrior: event: events.summer, specialClass: 'warrior', text: t('headAccessorySpecialSummerWarriorText'), notes: t('headAccessorySpecialSummerWarriorNotes'), value: 20
       
     mystery:
       201403: text: t('headAccessoryMystery201403Text'), notes: t('headAccessoryMystery201403Notes'), mystery:mystery['201403'], value: 0
       201404: text: t('headAccessoryMystery201404Text'), notes: t('headAccessoryMystery201404Notes'), mystery:mystery['201404'], value: 0
       201409: text: t('headAccessoryMystery201409Text'), notes: t('headAccessoryMystery201409Notes'), mystery:mystery['201409'], value: 0
 
+  eyewear:
+    base:
+      0: text: t('eyewearBase0Text'), notes: t('eyewearBase0Notes'), value: 0, last: true
+    special:
+      wondercon_red: text: t('eyewearSpecialWonderconRedText'), notes: t('eyewearSpecialWonderconRedNotes'), value: 0, mystery:mystery.wondercon
+      wondercon_black: text: t('eyewearSpecialWonderconBlackText'), notes: t('eyewearSpecialWonderconBlackNotes'), value: 0, mystery:mystery.wondercon
+      #Summer
+      summerRogue:   event: events.summer, specialClass: 'rogue',   text: t('eyewearSpecialSummerRogueText'), notes: t('eyewearSpecialSummerRogueNotes'), value: 20
+      summerWarrior: event: events.summer, specialClass: 'warrior', text: t('eyewearSpecialSummerWarriorText'), notes: t('eyewearSpecialSummerWarriorNotes'), value: 20
+
 ###
   The gear is exported as a tree (defined above), and a flat list (eg, {weapon_healer_1: .., shield_special_0: ...}) since
   they are needed in different froms at different points in the app