Merge branch 'develop' into checkin-complete-msg

website/common/script/content/appearance/backgrounds.js

@@ -479,7 +479,26 @@ let backgrounds = {
       notes: t('backgroundMistiflyingCircusNotes'),
     },
   },
+  backgrounds042017: {
+    bug_covered_log: {
+      text: t('backgroundBugCoveredLogText'),
+      notes: t('backgroundBugCoveredLogNotes'),
+    },
+    giant_birdhouse: {
+      text: t('backgroundGiantBirdhouseText'),
+      notes: t('backgroundGiantBirdhouseNotes'),
+    },
+    mist_shrouded_mountain: {
+      text: t('backgroundMistShroudedMountainText'),
+      notes: t('backgroundMistShroudedMountainNotes'),
+    },
+  },
   incentiveBackgrounds: {
+    violet: {
+      text: t('backgroundVioletText'),
+      notes: t('backgroundVioletNotes'),
+      currency: 'loginIncentive',
+    },
     blue: {
       text: t('backgroundBlueText'),
       notes: t('backgroundBlueNotes'),

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

@@ -226,6 +226,15 @@ let armor = {
     set: 'mushroomDruid',
     canOwn: ownsItem('armor_armoire_mushroomDruidArmor'),
   },
+  greenFestivalYukata: {
+    text: t('armorArmoireGreenFestivalYukataText'),
+    notes: t('armorArmoireGreenFestivalYukataNotes', { attrs: 8 }),
+    value: 100,
+    con: 8,
+    per: 8,
+    set: 'festivalAttire',
+    canOwn: ownsItem('armor_armoire_greenFestivalYukata'),
+  },
 };
 
 let eyewear = {
@@ -617,6 +626,14 @@ let shield = {
     set: 'mushroomDruid',
     canOwn: ownsItem('shield_armoire_mushroomDruidShield'),
   },
+  festivalParasol: {
+    text: t('shieldArmoireFestivalParasolText'),
+    notes: t('shieldArmoireFestivalParasolNotes', { con: 8 }),
+    value: 100,
+    con: 8,
+    set: 'festivalAttire',
+    canOwn: ownsItem('shield_armoire_festivalParasol'),
+  },
 };
 
 let headAccessory = {
@@ -829,6 +846,14 @@ let weapon = {
     per: 9,
     canOwn: ownsItem('weapon_armoire_forestFungusStaff'),
   },
+  festivalFirecracker: {
+    text: t('weaponArmoireFestivalFirecrackerText'),
+    notes: t('weaponArmoireFestivalFirecrackerNotes', { per: 8 }),
+    value: 100,
+    per: 8,
+    set: 'festivalAttire',
+    canOwn: ownsItem('weapon_armoire_festivalFirecracker'),
+  },
 };
 
 let armoireSet = {

website/common/script/content/subscriptionBlocks.js

@@ -3,35 +3,47 @@ import each from 'lodash/each';
 
 let subscriptionBlocks = {
   basic_earned: {
+    target: 'user',
+    canSubscribe: true,
     months: 1,
     price: 5,
   },
   basic_3mo: {
+    target: 'user',
+    canSubscribe: true,
     months: 3,
     price: 15,
   },
   basic_6mo: {
+    target: 'user',
+    canSubscribe: true,
     months: 6,
     price: 30,
   },
   google_6mo: {
+    target: 'user',
+    canSubscribe: true,
     months: 6,
     price: 24,
     discount: true,
     original: 30,
   },
   basic_12mo: {
+    target: 'user',
+    canSubscribe: true,
     months: 12,
     price: 48,
   },
   group_monthly: {
-    type: 'group',
+    target: 'group',
+    canSubscribe: true,
     months: 1,
     price: 9,
     quantity: 3, // Default quantity for Stripe - The same as having 3 user subscriptions
   },
   group_plan_auto: {
-    type: 'group',
+    target: 'user',
+    canSubscribe: false,
     months: 0,
     price: 0,
     quantity: 1,