Merge branch 'develop' of github.com:HabitRPG/habitrpg into Wrong-max-level-messages

common/locales/en/npc.json

@@ -16,6 +16,7 @@
     "justin": "Justin",
     "ian": "Ian",
     "ianText": "Welcome to the Quest Shop! Here you can use Quest Scrolls to battle monsters with your friends. Be sure to check out our fine array of Quest Scrolls for purchase on the right!",
+    "ianBrokenText": "Welcome to the Quest Shop... Here you can use Quest Scrolls to battle monsters with your friends... Be sure to check out our fine array of Quest Scrolls for purchase on the right...",
     "USD": "USD",
     "newStuff": "New Stuff",
     "cool": "Tell Me Later",

common/locales/en/quests.json

@@ -13,6 +13,7 @@
     "youReceived": "You've Received",
     "dropQuestCongrats": "Congratulations on earning this quest scroll! You can invite your party to begin the quest now, or come back to it any time in your Inventory > Quests.",
     "questSend": "Clicking \"Invite\" will send an invitation to your party members. When all members have accepted or denied, the quest begins. See status under Social > Party.",
+    "questSendBroken": "Clicking \"Invite\" will send an invitation to your party members... When all members have accepted or denied, the quest begins... See status under Social > Party...",
     "inviteParty": "Invite Party to Quest",
     "questInvitation": "Quest Invitation: ",
     "questInvitationTitle": "Quest Invitation",
@@ -24,6 +25,7 @@
     "rejected": "Rejected",
     "pending": "Pending",
     "questStart": "Once all members have either accepted or rejected, the quest begins. Only those that clicked \"accept\" will be able to participate in the quest and receive the drops. If members are pending too long (inactive?), the quest owner can start the quest without them by clicking \"Begin\". The quest owner can also cancel the quest and regain the quest scroll by clicking \"Cancel\".",
+    "questStartBroken": "Once all members have either accepted or rejected, the quest begins... Only those that clicked \"accept\" will be able to participate in the quest and receive the drops... If members are pending too long (inactive?), the quest owner can start the quest without them by clicking \"Begin\"... The quest owner can also cancel the quest and regain the quest scroll by clicking \"Cancel\"...",
     "begin": "Begin",
     "bossHP": "Boss Health",
     "bossStrength": "Boss Strength",
@@ -34,9 +36,14 @@
     "itemsToCollect": "Items to Collect",
     "bossDmg1": "Each completed Daily and To-Do and each positive Habit hurts the boss. Hurt it more with redder tasks or Brutal Smash and Burst of Flames. The boss will deal damage to every quest participant for every Daily you've missed (multiplied by the boss's Strength) in addition to your regular damage, so keep your party healthy by completing your Dailies! <strong>All damage to and from a boss is tallied on cron (your day roll-over).</strong>",
     "bossDmg2": "Only participants will fight the boss and share in the quest loot.",
+    "bossDmg1Broken": "Each completed Daily and To-Do and each positive Habit hurts the boss... Hurt it more with redder tasks or Brutal Smash and Burst of Flames... The boss will deal damage to every quest participant for every Daily you've missed (multiplied by the boss's Strength) in addition to your regular damage, so keep your party healthy by completing your Dailies... <strong>All damage to and from a boss is tallied on cron (your day roll-over)...</strong>",
+    "bossDmg2Broken": "Only participants will fight the boss and share in the quest loot...",
     "tavernBossInfo": "Complete Dailies and To-Dos and score positive Habits to damage the World Boss! Incomplete Dailies fill the Exhaust Strike Bar. When the Exhaust Strike bar is full, the World Boss will attack an NPC. A World Boss will never damage individual players or accounts in any way. Only active accounts not resting in the Inn will have their tasks tallied.",
+    "tavernBossInfoBroken": "Complete Dailies and To-Dos and score positive Habits to damage the World Boss... Incomplete Dailies fill the Exhaust Strike Bar... When the Exhaust Strike bar is full, the World Boss will attack an NPC... A World Boss will never damage individual players or accounts in any way... Only active accounts not resting in the Inn will have their tasks tallied...",
     "bossColl1": "To collect items, do your positive tasks. Quest items drop just like normal items; however, you won't see the drops until the next day, then everything you've found will be tallied up and contributed to the pile.",
     "bossColl2": "Only participants can collect items and share in the quest loot.",
+    "bossColl1Broken": "To collect items, do your positive tasks... Quest items drop just like normal items; however, you won't see the drops until the next day, then everything you've found will be tallied up and contributed to the pile...",
+    "bossColl2Broken": "Only participants can collect items and share in the quest loot...",
     "abort": "Abort",
     "leaveQuest": "Leave Quest",
     "sureLeave": "Are you sure you want to leave the active quest? All your quest progress will be lost.",
@@ -63,6 +70,7 @@
     "sureAbort": "Are you sure you want to abort this mission? It will abort it for everyone in your party and all progress will be lost. The quest scroll will be returned to the quest owner.",
     "doubleSureAbort": "Are you double sure? Make sure they won't hate you forever!",
     "questWarning": "If new players join the party before the quest starts, they will also receive an invitation. However once the quest has started, no new party members can join the quest.",
+    "questWarningBroken": "If new players join the party before the quest starts, they will also receive an invitation... However once the quest has started, no new party members can join the quest...",
     "bossRageTitle": "Rage",
     "bossRageDescription": "When this bar fills, the boss will unleash a special attack!",
     "startAQuest": "START A QUEST",

common/locales/en/settings.json

@@ -119,5 +119,26 @@
     "promoCodeApplied": "Promo Code Applied! Check your inventory",
     "promoPlaceholder": "Enter Promotion Code",
     "couponText": "We sometimes have events and give out coupon codes for special gear. (eg, those who stop by our Wondercon booth)",
-    "displayInviteToPartyWhenPartyIs1": "Display Invite To Party button when party has 1 member."
+    "displayInviteToPartyWhenPartyIs1": "Display Invite To Party button when party has 1 member.",
+    "saveCustomDayStart": "Save Custom Day Start",
+    "registration": "Registration",
+    "addLocalAuth": "Add local authentication:",
+    "generateCodes": "Generate Codes",
+    "generate": "Generate",
+    "getCodes": "Get Codes",
+    "webhooks": "Webhooks",
+    "enabled": "Enabled",
+    "webhookURL": "Webhook URL",
+    "add": "Add",
+    "buyGemsGoldCap": "Cap raised to <%= amount %>",
+    "mysticHourglass": "<%= amount %> Mystic Hourglass",
+    "mysticHourglassText": "Mystic Hourglasses allow purchasing a previous month's Mystery Item set.",
+    "purchasedPlanId": "Recurring $<%= price %> each <%= months %> Month(s) (<%= plan %>)",
+    "purchasedPlanExtraMonths": "You have <%= months %> months of subscription credit.",
+    "consecutiveSubscription": "Consecutive Subscription",
+    "consecutiveMonths": "Consecutive Months:",
+    "gemCapExtra": "Gem Cap Extra:",
+    "mysticHourglasses": "Mystic Hourglasses:",
+    "paypal": "PayPal",
+    "amazonPayments": "Amazon Payments"
 }

common/script/content/index.coffee

@@ -1154,6 +1154,7 @@ api.specialMounts =
   'Orca-Base':           'orca'
   'Gryphon-RoyalPurple': 'royalPurpleGryphon'
   'Phoenix-Base':        'phoenix'
+  'JackOLantern-Base':   'jackolantern'
 
 api.timeTravelStable =
   pets:

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

@@ -27,7 +27,7 @@ import moment from 'moment';
 //  mystery: <mystery_set_key>
 // }
 //
-//  <gear_type> - What type of euqipment it is (armor, head, weapon, etc)
+//  <gear_type> - What type of equipment it is (armor, head, weapon, etc)
 //  <set_name> - What set this gear is a part of (special, mystery, warrior, etc)
 //  <index> - The order in this particular set
 //  <formatted_equipment_key> - CamelCased version of key

common/script/src/content/pets-mounts/special-mounts.js

@@ -6,7 +6,8 @@ let specialMounts = {
   'Mammoth-Base':        'mammoth',
   'Orca-Base':           'orca',
   'Gryphon-RoyalPurple': 'royalPurpleGryphon',
-  'Phoenix-Base':        'phoenix'
+  'Phoenix-Base':        'phoenix',
+  'JackOLantern-Base':   'jackolantern'
 }
 
 export default specialMounts;