-
{{ $t('yourBalance') }}
+
{{ $t('yourBalance') }}
@@ -187,6 +193,10 @@
#buy-modal {
@include centeredModal();
+ .modal-body {
+ padding-bottom: 0px;
+ }
+
.modal-dialog {
width: 330px;
}
@@ -274,6 +284,7 @@
button.btn.btn-primary {
margin-top: 24px;
margin-bottom: 24px;
+ min-width: 6rem;
}
.balance {
@@ -360,6 +371,21 @@
}
+
+
diff --git a/website/client/src/components/shops/quests/buyQuestModal.vue b/website/client/src/components/shops/quests/buyQuestModal.vue
index d3f75ad702..f55c55973a 100644
--- a/website/client/src/components/shops/quests/buyQuestModal.vue
+++ b/website/client/src/components/shops/quests/buyQuestModal.vue
@@ -160,7 +160,11 @@
}
&.gold {
- color: $yellow-10
+ color: $yellow-10;
+ }
+
+ &.hourglasses {
+ color: $hourglass-color;
}
}
diff --git a/website/client/src/components/shops/timeTravelers/index.vue b/website/client/src/components/shops/timeTravelers/index.vue
index b399ecbd65..dffc0f04b9 100644
--- a/website/client/src/components/shops/timeTravelers/index.vue
+++ b/website/client/src/components/shops/timeTravelers/index.vue
@@ -390,9 +390,9 @@ export default {
// force update for now until we restructure the data
let backgroundUpdate = this.backgroundUpdate; // eslint-disable-line
- const normalGroups = _filter(apiCategories, c => c.identifier === 'mounts' || c.identifier === 'pets' || c.identifier === 'quests');
+ const normalGroups = _filter(apiCategories, c => c.identifier === 'mounts' || c.identifier === 'pets' || c.identifier === 'quests' || c.identifier === 'backgrounds');
- const setGroups = _filter(apiCategories, c => c.identifier !== 'mounts' && c.identifier !== 'pets' && c.identifier !== 'quests');
+ const setGroups = _filter(apiCategories, c => c.identifier !== 'mounts' && c.identifier !== 'pets' && c.identifier !== 'quests' && c.identifier !== 'backgrounds');
const setCategory = {
identifier: 'sets',
diff --git a/website/client/src/store/actions/shops.js b/website/client/src/store/actions/shops.js
index c0ee965045..fea30216b8 100644
--- a/website/client/src/store/actions/shops.js
+++ b/website/client/src/store/actions/shops.js
@@ -163,6 +163,9 @@ export async function genericPurchase (store, params) {
// resetting type to pinType only here
return buyItem(store, { ...params, type: params.pinType });
case 'background':
+ if (params.currency === 'hourglasses') {
+ return purchaseHourglassItem(store, params);
+ }
return unlock(store, {
query: {
path: `background.${params.key}`,
diff --git a/website/common/locales/en/backgrounds.json b/website/common/locales/en/backgrounds.json
index 634767b4ab..dd3e34f934 100644
--- a/website/common/locales/en/backgrounds.json
+++ b/website/common/locales/en/backgrounds.json
@@ -561,5 +561,13 @@
"backgroundDesertWithSnowText": "Snowy Desert",
"backgroundDesertWithSnowNotes": "Witness the rare and quiet beauty of a Snowy Desert.",
"backgroundSnowglobeText": "Snowglobe",
- "backgroundSnowglobeNotes": "Shake up a Snowglobe and take your place in a microcosm of a winter landscape."
+ "backgroundSnowglobeNotes": "Shake up a Snowglobe and take your place in a microcosm of a winter landscape.",
+
+ "timeTravelBackgrounds": "Steampunk Backgrounds",
+ "backgroundAirshipText": "Airship",
+ "backgroundAirshipNotes": "Become a sky sailor on board your very own Airship.",
+ "backgroundSteamworksText": "Steamworks",
+ "backgroundSteamworksNotes": "Build mighty contraptions of vapor and steel in a Steamworks.",
+ "backgroundClocktowerText": "Clock Tower",
+ "backgroundClocktowerNotes": "Situate your secret lair behind the face of a Clock Tower."
}
diff --git a/website/common/locales/en/npc.json b/website/common/locales/en/npc.json
index b9e333188b..89ff25574d 100644
--- a/website/common/locales/en/npc.json
+++ b/website/common/locales/en/npc.json
@@ -48,7 +48,7 @@
"displayPotionForGold": "Do you want to sell a
<%= itemType %> Potion?",
"sellForGold": "Sell it for <%= gold %> Gold",
"howManyToSell": "How many would you like to sell?",
- "yourBalance": "Your balance",
+ "yourBalance": "Your balance:",
"sell": "Sell",
"buyNow": "Buy Now",
"sortByNumber": "Number",
diff --git a/website/common/locales/en/subscriber.json b/website/common/locales/en/subscriber.json
index bad5adb794..d707500cb1 100644
--- a/website/common/locales/en/subscriber.json
+++ b/website/common/locales/en/subscriber.json
@@ -1,6 +1,7 @@
{
"subscription": "Subscription",
"subscriptions": "Subscriptions",
+ "viewSubscriptions": "View Subscriptions",
"subDescription": "Buy Gems with gold, get monthly mystery items, retain progress history, double daily drop-caps, support the devs. Click for more info.",
"sendGems": "Send Gems",
"buyGemsGold": "Buy Gems with Gold",
@@ -91,6 +92,7 @@
"timeTravelersPopover": "Your Mystic Hourglass has opened our time portal! Choose what you’d like us to fetch from the past or future.",
"timeTravelersAlreadyOwned": "Congratulations! You already own everything the Time Travelers currently offer. Thanks for supporting the site!",
"mysticHourglassPopover": "A Mystic Hourglass allows you to purchase certain limited-time items, such as monthly Mystery Item Sets and awards from world bosses, from the past!",
+ "mysticHourglassNeededNoSub": "This item requires a Mystic Hourglass. You earn Mystic Hourglasses by being a Habitica subscriber.",
"mysterySetNotFound": "Mystery set not found, or set already owned.",
"mysteryItemIsEmpty": "Mystery items are empty",
"mysteryItemOpened": "Mystery item opened.",
@@ -180,6 +182,7 @@
"notEnoughHourglasses": "You don't have enough Mystic Hourglasses.",
"hourglassBuyEquipSetConfirm": "Buy this full set of items for 1 Mystic Hourglass?",
"hourglassBuyItemConfirm": "Buy this item for 1 Mystic Hourglass?",
+ "backgroundAlreadyOwned": "Background already owned.",
"petsAlreadyOwned": "Pet already owned.",
"mountsAlreadyOwned": "Mount already owned.",
"typeNotAllowedHourglass": "Item type not supported for purchase with Mystic Hourglass. Allowed types: <%= allowedTypes %>",
diff --git a/website/common/script/content/appearance/backgrounds.js b/website/common/script/content/appearance/backgrounds.js
index 9b0f31f16f..8b20db7a0a 100644
--- a/website/common/script/content/appearance/backgrounds.js
+++ b/website/common/script/content/appearance/backgrounds.js
@@ -955,6 +955,26 @@ const backgrounds = {
notes: t('backgroundSnowglobeNotes'),
},
},
+ timeTravelBackgrounds: {
+ airship: {
+ text: t('backgroundAirshipText'),
+ notes: t('backgroundAirshipNotes'),
+ price: 1,
+ currency: 'hourglasses',
+ },
+ clocktower: {
+ text: t('backgroundClocktowerText'),
+ notes: t('backgroundClocktowerNotes'),
+ price: 1,
+ currency: 'hourglasses',
+ },
+ steamworks: {
+ text: t('backgroundSteamworksText'),
+ notes: t('backgroundSteamworksNotes'),
+ price: 1,
+ currency: 'hourglasses',
+ },
+ },
incentiveBackgrounds: {
violet: {
text: t('backgroundVioletText'),
@@ -996,7 +1016,7 @@ forOwn(backgrounds, (backgroundsInSet, set) => {
forOwn(backgroundsInSet, (background, bgKey) => {
background.key = bgKey;
background.set = set;
- background.price = 7;
+ background.price = background.price || 7;
flat[bgKey] = background;
});
diff --git a/website/common/script/errors/commonErrorMessages.js b/website/common/script/errors/commonErrorMessages.js
index 7f0530f5ff..b71b37c5b4 100644
--- a/website/common/script/errors/commonErrorMessages.js
+++ b/website/common/script/errors/commonErrorMessages.js
@@ -13,6 +13,7 @@ export default {
invalidTypeEquip: '"type" must be one of "equipped", "pet", "mount", "costume"',
missingPetFoodFeed: '"pet" and "food" are required parameters.',
missingEggHatchingPotion: '"egg" and "hatchingPotion" are required parameters.',
+ useUnlockForCosmetics: 'Use the "unlock" route to purchase backgrounds and avatar customizations using Gems.',
invalidPetName: 'Invalid pet name supplied.',
invalidFoodName: 'Invalid food name supplied.',
diff --git a/website/common/script/libs/getItemInfo.js b/website/common/script/libs/getItemInfo.js
index c2c682175c..9976ada32f 100644
--- a/website/common/script/libs/getItemInfo.js
+++ b/website/common/script/libs/getItemInfo.js
@@ -243,6 +243,7 @@ export default function getItemInfo (user, type, item, officialPinnedItems, lang
purchaseType: 'backgrounds',
path: `backgrounds.${item.set}.${item.key}`,
pinType: 'background',
+ locked: false,
};
break;
case 'mystery_set':
diff --git a/website/common/script/libs/shops.js b/website/common/script/libs/shops.js
index 949044ca3e..abd6ea734d 100644
--- a/website/common/script/libs/shops.js
+++ b/website/common/script/libs/shops.js
@@ -326,6 +326,25 @@ shops.getTimeTravelersCategories = function getTimeTravelersCategories (user, la
}
categories.push(questCategory);
+ const backgroundCategory = {
+ identifier: 'backgrounds',
+ text: i18n.t('backgrounds', language),
+ items: [],
+ };
+ for (const bg in content.backgrounds.timeTravelBackgrounds) {
+ if (!user.purchased.background[bg]) {
+ const item = getItemInfo(
+ user,
+ 'background',
+ content.backgroundsFlat[bg],
+ officialPinnedItems,
+ language,
+ );
+ backgroundCategory.items.push(item);
+ }
+ }
+ categories.push(backgroundCategory);
+
for (const type of Object.keys(stable)) {
const category = {
identifier: type,
diff --git a/website/common/script/ops/buy/buy.js b/website/common/script/ops/buy/buy.js
index 7b9795986d..6394005927 100644
--- a/website/common/script/ops/buy/buy.js
+++ b/website/common/script/ops/buy/buy.js
@@ -43,6 +43,10 @@ export default function buy (
buyRes = buyOp.purchase();
break;
}
+ case 'backgrounds':
+ if (!hourglass) throw new BadRequest(errorMessage('useUnlockForCosmetics'));
+ buyRes = hourglassPurchase(user, req, analytics);
+ break;
case 'mystery':
buyRes = buyMysterySet(user, req, analytics);
break;
diff --git a/website/common/script/ops/buy/hourglassPurchase.js b/website/common/script/ops/buy/hourglassPurchase.js
index 3181bc49b4..18db922eca 100644
--- a/website/common/script/ops/buy/hourglassPurchase.js
+++ b/website/common/script/ops/buy/hourglassPurchase.js
@@ -8,6 +8,8 @@ import {
NotAuthorized,
} from '../../libs/errors';
import errorMessage from '../../libs/errorMessage';
+import getItemInfo from '../../libs/getItemInfo';
+import { removeItemByPath } from '../pinnedGearUtils';
export default function purchaseHourglass (user, req = {}, analytics, quantity = 1) {
const key = get(req, 'params.key');
@@ -16,7 +18,24 @@ export default function purchaseHourglass (user, req = {}, analytics, quantity =
const type = get(req, 'params.type');
if (!type) throw new BadRequest(errorMessage('missingTypeParam'));
- if (type === 'quests') {
+ if (type === 'backgrounds') {
+ if (!content.backgroundsFlat[key] || content.backgroundsFlat[key].currency !== 'hourglasses') {
+ throw new NotAuthorized(i18n.t('notAllowedHourglass', req.language));
+ }
+ if (user.purchased.background[key]) {
+ throw new NotAuthorized(i18n.t('backgroundAlreadyOwned', req.language));
+ }
+ if (user.purchased.plan.consecutive.trinkets <= 0) {
+ throw new NotAuthorized(i18n.t('notEnoughHourglasses', req.language));
+ }
+
+ user.purchased.background[key] = true;
+ user.purchased.plan.consecutive.trinkets -= 1;
+ const itemInfo = getItemInfo(user, 'background', content.backgroundsFlat[key]);
+ removeItemByPath(user, itemInfo.path);
+
+ if (user.markModified) user.markModified('purchased.background');
+ } else if (type === 'quests') {
if (!content.quests[key] || content.quests[key].category !== 'timeTravelers') throw new NotAuthorized(i18n.t('notAllowedHourglass', req.language));
if (user.purchased.plan.consecutive.trinkets < quantity) {
throw new NotAuthorized(i18n.t('notEnoughHourglasses', req.language));
diff --git a/website/raw_sprites/spritesmith/backgrounds/icons/icon_background_airship.png b/website/raw_sprites/spritesmith/backgrounds/icons/icon_background_airship.png
new file mode 100644
index 0000000000..5de5ee4220
Binary files /dev/null and b/website/raw_sprites/spritesmith/backgrounds/icons/icon_background_airship.png differ
diff --git a/website/raw_sprites/spritesmith/backgrounds/icons/icon_background_clocktower.png b/website/raw_sprites/spritesmith/backgrounds/icons/icon_background_clocktower.png
new file mode 100644
index 0000000000..0713083355
Binary files /dev/null and b/website/raw_sprites/spritesmith/backgrounds/icons/icon_background_clocktower.png differ
diff --git a/website/raw_sprites/spritesmith/backgrounds/icons/icon_background_steamworks.png b/website/raw_sprites/spritesmith/backgrounds/icons/icon_background_steamworks.png
new file mode 100644
index 0000000000..25b49fdb58
Binary files /dev/null and b/website/raw_sprites/spritesmith/backgrounds/icons/icon_background_steamworks.png differ
diff --git a/website/server/controllers/api-v3/news.js b/website/server/controllers/api-v3/news.js
index 26b5b4be7a..b932a09c79 100644
--- a/website/server/controllers/api-v3/news.js
+++ b/website/server/controllers/api-v3/news.js
@@ -4,7 +4,7 @@ const api = {};
// @TODO export this const, cannot export it from here because only routes are exported from
// controllers
-const LAST_ANNOUNCEMENT_TITLE = 'BLOG POST: SEASONAL SHOP';
+const LAST_ANNOUNCEMENT_TITLE = 'NEW STEAMPUNK BACKGROUNDS FROM THE TIME TRAVELERS!';
const worldDmg = { // @TODO
bailey: false,
};
@@ -31,21 +31,29 @@ api.getNews = {
${res.t('newStuff')}
- 1/16/2020 - ${LAST_ANNOUNCEMENT_TITLE}
+ 1/21/2020 - ${LAST_ANNOUNCEMENT_TITLE}
Thanks for supporting Habitica! We hope that you enjoy your new backgrounds.
+