Merge branch 'release' into develop

2019-09-30 13:25:44 -05:00
parent bbbe0cca09 47e9278814
commit a715ec1a0f
69 changed files with 8012 additions and 7798 deletions
@@ -24,5 +24,7 @@
  "achievementDustDevilModalText": "You collected all the Desert Pets!",
  "achievementAridAuthority": "Arid Authority",
  "achievementAridAuthorityText": "Has tamed all Desert Mounts.",
-  "achievementAridAuthorityModalText": "You tamed all the Desert Mounts!"
+  "achievementAridAuthorityModalText": "You tamed all the Desert Mounts!",
+  "achievementKickstarter2019": "Pin Kickstarter Backer",
+  "achievementKickstarter2019Text": "Backed the 2019 Pin Kickstarter Project"
 }
@@ -122,6 +122,8 @@
  "weaponSpecialTachiNotes": "This light and curved sword will shred your tasks to ribbons! Increases Strength by <%= str %>.",
  "weaponSpecialAetherCrystalsText": "Aether Crystals",
  "weaponSpecialAetherCrystalsNotes": "These bracers and crystals once belonged to the Lost Masterclasser herself. Increases all Stats by <%= attrs %>.",
+  "weaponSpecialKS2019Text": "Mythic Gryphon Glaive",
+  "weaponSpecialKS2019Notes": "Curved as a gryphon's beak and talons, this ornate polearm reminds you to power through when the task ahead feels daunting. Increases Strength by <%= str %>.",

  "weaponSpecialYetiText": "Yeti-Tamer Spear",
  "weaponSpecialYetiNotes": "This spear allows its user to command any yeti. Increases Strength by <%= str %>. Limited Edition 2013-2014 Winter Gear.",
@@ -539,6 +541,8 @@
  "armorSpecialTurkeyArmorBaseNotes": "Keep your drumsticks warm and cozy in this feathery armor! Confers no benefit.",
  "armorSpecialTurkeyArmorGildedText": "Gilded Turkey Armor",
  "armorSpecialTurkeyArmorGildedNotes": "Strut your stuff in this seasonally shiny armor! Confers no benefit.",
+  "armorSpecialKS2019Text": "Mythic Gryphon Armor",
+  "armorSpecialKS2019Notes": "Glowing from within like a gryphon's noble heart, this resplendent armor encourages you to take pride in your accomplishments. Increases Constitution by <%= con %>.",

  "armorSpecialYetiText": "Yeti-Tamer Robe",
  "armorSpecialYetiNotes": "Fuzzy and fierce. Increases Constitution by <%= con %>. Limited Edition 2013-2014 Winter Gear.",
@@ -1067,6 +1071,8 @@
  "headSpecialTurkeyHelmGildedNotes": "Gobble gobble! Bling bling! Confers no benefit.",
  "headSpecialPiDayText": "Pi Hat",
  "headSpecialPiDayNotes": "Try to balance this slice of delicious pie on your head while walking in a circle. Or throw it at a red Daily! Or you could just eat it. Your choice! Confers no benefit.",
+  "headSpecialKS2019Text": "Mythic Gryphon Helm",
+  "headSpecialKS2019Notes": "Adorned with a gryphon's likeness and plumage, this glorious helmet symbolizes the way your skills and bearing stand as an example to others. Increases Intelligence by <%= int %>.",

  "headSpecialNyeText": "Absurd Party Hat",
  "headSpecialNyeNotes": "You've received an Absurd Party Hat! Wear it with pride while ringing in the New Year! Confers no benefit.",
@@ -1563,6 +1569,8 @@
  "shieldSpecialWakizashiNotes": "This short sword is perfect for close-quarters battles with your Dailies! Increases Constitution by <%= con %>.",
  "shieldSpecialPiDayText": "Pi Shield",
  "shieldSpecialPiDayNotes": "We dare you to calculate the ratio of this shield's circumference to its deliciousness! Confers no benefit.",
+  "shieldSpecialKS2019Text": "Mythic Gryphon Shield",
+  "shieldSpecialKS2019Notes": "Sparkling like the shell of a gryphon egg, this magnificent shield shows you how to stand ready to help when your own burdens are light. Increases Perception by <%= per %>.",

  "shieldSpecialYetiText": "Yeti-Tamer Shield",
  "shieldSpecialYetiNotes": "This shield reflects light from the snow. Increases Constitution by <%= con %>. Limited Edition 2013-2014 Winter Gear.",
@@ -2063,6 +2071,8 @@

  "eyewearSpecialAetherMaskText": "Aether Mask",
  "eyewearSpecialAetherMaskNotes": "This mask has a mysterious history. Increases Intelligence by <%= int %>.",
+  "eyewearSpecialKS2019Text": "Mythic Gryphon Visor",
+  "eyewearSpecialKS2019Notes": "Bold as a gryphon's... hmm, gryphons don't have visors. It reminds you to... oh, who are we kidding, it just looks cool! Confers no benefit.",

  "eyewearSpecialSummerRogueText": "Roguish Eyepatch",
  "eyewearSpecialSummerRogueNotes": "It doesn't take a scallywag to see how stylish this is! Confers no benefit. Limited Edition 2014 Summer Gear.",
@@ -33,6 +33,7 @@
  "hopefulHippogriffMount": "Hopeful Hippogriff",
  "royalPurpleJackalope": "Royal Purple Jackalope",
  "invisibleAether": "Invisible Aether",
+  "gryphatrice": "Gryphatrice",
  "rarePetPop1": "Click the gold paw to learn more about how you can obtain this rare pet through contributing to Habitica!",
  "rarePetPop2": "How to Get this Pet!",
  "potion": "<%= potionType %> Potion",
@@ -193,6 +193,11 @@ let specialAchievs = {
    pluralTitleKey: 'helped',
    pluralTextKey: 'surveysMultiple',
  },
+  kickstarter2019: {
+    icon: 'achievement-kickstarter2019',
+    titleKey: 'achievementKickstarter2019',
+    textKey: 'achievementKickstarter2019Text',
+  },
 };
 Object.assign(achievementsData, specialAchievs);

@@ -1257,6 +1257,13 @@ let armor = {
    value: 90,
    con: 15,
  },
+  ks2019: {
+    text: t('armorSpecialKS2019Text'),
+    notes: t('armorSpecialKS2019Notes', { con: 20 }),
+    value: 0,
+    con: 20,
+    canOwn: ownsItem('armor_special_ks2019'),
+  },
 };

 let back = {
@@ -1602,6 +1609,12 @@ let eyewear = {
    notes: t('eyewearSpecialFall2019HealerNotes'),
    value: 20,
  },
+  ks2019: {
+    text: t('eyewearSpecialKS2019Text'),
+    notes: t('eyewearSpecialKS2019Notes'),
+    value: 0,
+    canOwn: ownsItem('eyewear_special_ks2019'),
+  },
 };

 let head = {
@@ -2865,6 +2878,13 @@ let head = {
    value: 60,
    int: 7,
  },
+  ks2019: {
+    text: t('headSpecialKS2019Text'),
+    notes: t('headSpecialKS2019Notes', { int: 20 }),
+    value: 0,
+    int: 20,
+    canOwn: ownsItem('head_special_ks2019'),
+  },
 };

 let headAccessory = {
@@ -4079,6 +4099,13 @@ let shield = {
    value: 70,
    con: 9,
  },
+  ks2019: {
+    text: t('shieldSpecialKS2019Text'),
+    notes: t('shieldSpecialKS2019Notes', { per: 20 }),
+    value: 0,
+    per: 20,
+    canOwn: ownsItem('shield_special_ks2019'),
+  },
 };

 let weapon = {
@@ -5332,6 +5359,13 @@ let weapon = {
    value: 90,
    int: 9,
  },
+  ks2019: {
+    text: t('weaponSpecialKS2019Text'),
+    notes: t('weaponSpecialKS2019Notes', { str: 20 }),
+    value: 0,
+    str: 20,
+    canOwn: ownsItem('weapon_special_ks2019'),
+  },
 };

 let specialSet = {
@@ -257,7 +257,7 @@ let quests = {
  },
  evilsanta: {
    canBuy () {
-      return true;
+      return false;
    },
    text: t('questEvilSantaText'),
    notes: t('questEvilSantaNotes'),
@@ -283,7 +283,7 @@ let quests = {
  },
  evilsanta2: {
    canBuy () {
-      return true;
+      return false;
    },
    text: t('questEvilSanta2Text'),
    notes: t('questEvilSanta2Notes'),
@@ -103,6 +103,7 @@ let specialPets = {
  'Hippogriff-Hopeful': 'hopefulHippogriffPet',
  'Fox-Veteran': 'veteranFox',
  'JackOLantern-Glow': 'glowJackolantern',
+  'Gryphon-Gryphatrice': 'gryphatrice',
 };

 let specialMounts = {
@@ -121,6 +122,7 @@ let specialMounts = {
  'Aether-Invisible': 'invisibleAether',
  'JackOLantern-Ghost': 'ghostJackolantern',
  'Hippogriff-Hopeful': 'hopefulHippogriffMount',
+  'Gryphon-Gryphatrice': 'gryphatrice',
 };

 each(specialPets, (translationString, key) => {
@@ -300,6 +300,10 @@ function _getSpecialAchievements (user, language) {
    _addSimple(result, user, {path: 'originalUser', language});
  }

+  if (user.achievements.kickstarter2019) {
+    _addSimple(result, user, {path: 'kickstarter2019', language});
+  }
+
  return result;
 }