diff --git a/package-lock.json b/package-lock.json index 30e57fa902..c75305ea29 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "habitica", - "version": "4.151.2", + "version": "4.151.3", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 2b62402e9f..963132caa5 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "habitica", "description": "A habit tracker app which treats your goals like a Role Playing Game.", - "version": "4.151.2", + "version": "4.151.3", "main": "./website/server/index.js", "dependencies": { "@babel/core": "^7.11.0", diff --git a/website/client/src/assets/css/sprites/spritesmith-largeSprites-0.css b/website/client/src/assets/css/sprites/spritesmith-largeSprites-0.css index 0b77ddcb71..802e01ad35 100644 --- a/website/client/src/assets/css/sprites/spritesmith-largeSprites-0.css +++ b/website/client/src/assets/css/sprites/spritesmith-largeSprites-0.css @@ -1,90 +1,24 @@ -.promo_aquatic_amigos_bundle { - background-image: url('~@/assets/images/sprites/spritesmith-largeSprites-0.png'); - background-position: 0px -622px; - width: 423px; - height: 147px; -} .promo_armoire_backgrounds_202007 { background-image: url('~@/assets/images/sprites/spritesmith-largeSprites-0.png'); - background-position: -812px 0px; + background-position: 0px 0px; width: 423px; height: 147px; } -.promo_mystery_202007 { - background-image: url('~@/assets/images/sprites/spritesmith-largeSprites-0.png'); - background-position: -812px -616px; - width: 282px; - height: 147px; -} .promo_mystery_202008 { background-image: url('~@/assets/images/sprites/spritesmith-largeSprites-0.png'); - background-position: -812px -459px; + background-position: 0px -148px; width: 294px; height: 156px; } -.promo_naming_day_2020 { - background-image: url('~@/assets/images/sprites/spritesmith-largeSprites-0.png'); - background-position: -812px -296px; - width: 285px; - height: 162px; -} -.promo_orcas { - background-image: url('~@/assets/images/sprites/spritesmith-largeSprites-0.png'); - background-position: -426px -473px; - width: 219px; - height: 147px; -} -.promo_sand_sculpture_potions { - background-image: url('~@/assets/images/sprites/spritesmith-largeSprites-0.png'); - background-position: -812px -148px; - width: 423px; - height: 147px; -} -.promo_seafoam { - background-image: url('~@/assets/images/sprites/spritesmith-largeSprites-0.png'); - background-position: 0px -473px; - width: 425px; - height: 148px; -} -.promo_splashy_skins { - background-image: url('~@/assets/images/sprites/spritesmith-largeSprites-0.png'); - background-position: -409px -286px; - width: 375px; - height: 186px; -} -.customize-option.promo_splashy_skins { - background-image: url('~@/assets/images/sprites/spritesmith-largeSprites-0.png'); - background-position: -434px -301px; - width: 60px; - height: 60px; -} -.promo_summer_splash_2019 { - background-image: url('~@/assets/images/sprites/spritesmith-largeSprites-0.png'); - background-position: 0px -286px; - width: 408px; - height: 186px; -} -.promo_summer_splash_2020 { - background-image: url('~@/assets/images/sprites/spritesmith-largeSprites-0.png'); - background-position: -367px 0px; - width: 444px; - height: 198px; -} .promo_take_this { background-image: url('~@/assets/images/sprites/spritesmith-largeSprites-0.png'); - background-position: -1098px -296px; + background-position: -424px -181px; width: 96px; height: 69px; } -.scene_cathb { +.scene_rewards { background-image: url('~@/assets/images/sprites/spritesmith-largeSprites-0.png'); - background-position: 0px -770px; - width: 141px; - height: 167px; -} -.scene_tools { - background-image: url('~@/assets/images/sprites/spritesmith-largeSprites-0.png'); - background-position: 0px 0px; - width: 366px; - height: 285px; + background-position: -424px 0px; + width: 207px; + height: 180px; } diff --git a/website/client/src/assets/images/sprites/spritesmith-largeSprites-0.png b/website/client/src/assets/images/sprites/spritesmith-largeSprites-0.png index 0f6995ef30..5defe7c8ae 100644 Binary files a/website/client/src/assets/images/sprites/spritesmith-largeSprites-0.png and b/website/client/src/assets/images/sprites/spritesmith-largeSprites-0.png differ diff --git a/website/common/script/content/shop-featuredItems.js b/website/common/script/content/shop-featuredItems.js index e3b34bb175..9a967e5e26 100644 --- a/website/common/script/content/shop-featuredItems.js +++ b/website/common/script/content/shop-featuredItems.js @@ -9,28 +9,28 @@ const featuredItems = { path: 'armoire', }, { - type: 'premiumHatchingPotion', - path: 'premiumHatchingPotions.SandSculpture', + type: 'hatchingPotions', + path: 'hatchingPotions.Shade', }, { type: 'eggs', - path: 'eggs.Dragon', + path: 'eggs.TigerCub', }, { type: 'food', - path: 'food.Chocolate', + path: 'food.Saddle', }, ]; }, quests () { return [ { - type: 'bundles', - path: 'bundles.aquaticAmigos', + type: 'quests', + path: 'quests.snail', }, { type: 'quests', - path: 'quests.peacock', + path: 'quests.alligator', }, { type: 'quests', diff --git a/website/common/script/libs/shops-seasonal.config.js b/website/common/script/libs/shops-seasonal.config.js index 5ccc6edff9..5bc36d8eee 100644 --- a/website/common/script/libs/shops-seasonal.config.js +++ b/website/common/script/libs/shops-seasonal.config.js @@ -1,25 +1,19 @@ -import { SEASONAL_SETS } from '../content/constants'; +// import { SEASONAL_SETS } from '../content/constants'; export default { - opened: true, + opened: false, - currentSeason: 'Summer', + currentSeason: 'Closed', dateRange: { start: '2020-06-17', end: '2020-07-31' }, availableSets: [ - ...SEASONAL_SETS.summer, ], pinnedSets: { - healer: 'summer2020SeaGlassHealerSet', - rogue: 'summer2020CrocodileRogueSet', - warrior: 'summer2020RainbowTroutWarriorSet', - wizard: 'summer2020OarfishMageSet', }, availableSpells: [ - 'seafoam', ], availableQuests: [ diff --git a/website/raw_sprites/spritesmith_large/promo_aquatic_amigos_bundle.png b/website/raw_sprites/spritesmith_large/promo_aquatic_amigos_bundle.png deleted file mode 100644 index b6d05815eb..0000000000 Binary files a/website/raw_sprites/spritesmith_large/promo_aquatic_amigos_bundle.png and /dev/null differ diff --git a/website/raw_sprites/spritesmith_large/promo_mystery_202007.png b/website/raw_sprites/spritesmith_large/promo_mystery_202007.png deleted file mode 100644 index 68f1f6a380..0000000000 Binary files a/website/raw_sprites/spritesmith_large/promo_mystery_202007.png and /dev/null differ diff --git a/website/raw_sprites/spritesmith_large/promo_naming_day_2020.png b/website/raw_sprites/spritesmith_large/promo_naming_day_2020.png deleted file mode 100644 index b4d6d7090e..0000000000 Binary files a/website/raw_sprites/spritesmith_large/promo_naming_day_2020.png and /dev/null differ diff --git a/website/raw_sprites/spritesmith_large/promo_orcas.png b/website/raw_sprites/spritesmith_large/promo_orcas.png deleted file mode 100644 index 83a809a654..0000000000 Binary files a/website/raw_sprites/spritesmith_large/promo_orcas.png and /dev/null differ diff --git a/website/raw_sprites/spritesmith_large/promo_sand_sculpture_potions.png b/website/raw_sprites/spritesmith_large/promo_sand_sculpture_potions.png deleted file mode 100644 index ef715e01bb..0000000000 Binary files a/website/raw_sprites/spritesmith_large/promo_sand_sculpture_potions.png and /dev/null differ diff --git a/website/raw_sprites/spritesmith_large/promo_seafoam.png b/website/raw_sprites/spritesmith_large/promo_seafoam.png deleted file mode 100644 index eac89bcd2f..0000000000 Binary files a/website/raw_sprites/spritesmith_large/promo_seafoam.png and /dev/null differ diff --git a/website/raw_sprites/spritesmith_large/promo_splashy_skins.png b/website/raw_sprites/spritesmith_large/promo_splashy_skins.png deleted file mode 100644 index 44ed12f1c9..0000000000 Binary files a/website/raw_sprites/spritesmith_large/promo_splashy_skins.png and /dev/null differ diff --git a/website/raw_sprites/spritesmith_large/promo_summer_splash_2019.png b/website/raw_sprites/spritesmith_large/promo_summer_splash_2019.png deleted file mode 100644 index 05bba0c2f7..0000000000 Binary files a/website/raw_sprites/spritesmith_large/promo_summer_splash_2019.png and /dev/null differ diff --git a/website/raw_sprites/spritesmith_large/promo_summer_splash_2020.png b/website/raw_sprites/spritesmith_large/promo_summer_splash_2020.png deleted file mode 100644 index bd8500af8e..0000000000 Binary files a/website/raw_sprites/spritesmith_large/promo_summer_splash_2020.png and /dev/null differ diff --git a/website/raw_sprites/spritesmith_large/scene_cathb.png b/website/raw_sprites/spritesmith_large/scene_cathb.png deleted file mode 100644 index c994b65a68..0000000000 Binary files a/website/raw_sprites/spritesmith_large/scene_cathb.png and /dev/null differ diff --git a/website/raw_sprites/spritesmith_large/scene_rewards.png b/website/raw_sprites/spritesmith_large/scene_rewards.png new file mode 100644 index 0000000000..61e6717fae Binary files /dev/null and b/website/raw_sprites/spritesmith_large/scene_rewards.png differ diff --git a/website/raw_sprites/spritesmith_large/scene_tools.png b/website/raw_sprites/spritesmith_large/scene_tools.png deleted file mode 100644 index fc30edbb05..0000000000 Binary files a/website/raw_sprites/spritesmith_large/scene_tools.png and /dev/null differ diff --git a/website/server/controllers/api-v3/news.js b/website/server/controllers/api-v3/news.js index 2a773ae11d..8f37859fc5 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 = 'HABITICA’S NAMING DAY!'; +const LAST_ANNOUNCEMENT_TITLE = 'AUGUST 2020 SUBSCRIBER ITEMS AND OFFICIAL CHALLENGES!'; const worldDmg = { // @TODO bailey: false, }; @@ -31,31 +31,65 @@ api.getNews = {
- Happy Habitica Naming day! In honor of the day when we changed the name of the app from - HabitRPG to Habitica, we've given everyone an achievement, as well as some delicious cake - for your pets and mounts. -
-- Speaking of pets and mounts, we've given all users Royal Purple Gryphon rewards! - Depending on how many Naming Days you've celebrated with us, you've received Melior (a - Purple Gryphon mount), his little sister Meliora (a Purple Gryphon pet), a Purple Gryphon - Helm, the Purple Gryphon Wing Cloak, or the latest addition, the Purple Gryphon Tail! + The August Subscriber Items been revealed: the Owlish Oracle Item Set! Subscribe to Habitica by August 30 to receive + this exciting set! If you're already an active subscriber, reload the site and then head + to Inventory > Items to claim your gear!
- Thanks for being a Habitica user -- you all mean so much to us. We hope that you enjoy - your presents! + Subscribers also receive the ability to buy Gems with Gold -- the longer you subscribe, + the more Gems you can buy per month! There are other perks as well, such as longer access + to uncompressed data and a cute Jackalope pet. Best of all, subscriptions let us keep + Habitica running. Thank you very much for your support -- it means a lot to us.
-+ The Habitica team has launched a special official Challenge series hosted in the Official New + Year's Resolution Guild. These Challenges are designed to help you build and maintain + goals that are destined for success and then stick with them as the year progresses. For + this month's Challenge, Count + Your Treasure, we're focusing on the importance of rewards! It has a 15 Gem prize, + which will be awarded to five lucky winners on September 1st. +
++ Congratulations to the winners of July's Challenge, @Jefferwocky, @Hyumi-chan, @stinawp, + @JumpingJill, and @GreaneWolf! +
++ The next Take This Challenge has also launched, "Achievement Unlocked: + Self-Care!", with a focus on being kind to ourselves. Be sure to check it out to earn + additional pieces of the Take This armor set! +
++ Take This is a nonprofit that + seeks to inform the gamer community about mental health issues, to provide education + about mental disorders and mental illness prevention, and to reduce the stigma of mental + illness. +
++ Congratulations to the winners of the last Take This Challenge, "+2 Intelligence Bonus!": + grand prize winner @Tetrakatus, and runners-up @spinelissad, @DKimmortal, + @ewaeaweaeaweaeaeae, @CaptainBobcat, and @Antrolana! Plus, all participants in that + Challenge have received a piece of the Take This item set if they hadn't completed it already. It is located + in your Rewards column. Enjoy! +
+