diff --git a/website/client/assets/css/sprites/spritesmith-largeSprites-0.css b/website/client/assets/css/sprites/spritesmith-largeSprites-0.css index 6fba8f31d9..2510246741 100644 --- a/website/client/assets/css/sprites/spritesmith-largeSprites-0.css +++ b/website/client/assets/css/sprites/spritesmith-largeSprites-0.css @@ -1,42 +1,30 @@ .promo_armoire_backgrounds_201908 { background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png'); - background-position: 0px 0px; + background-position: -313px 0px; width: 423px; height: 147px; } .promo_farm_friends_bundle { background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png'); - background-position: 0px -148px; + background-position: 0px -223px; width: 420px; height: 147px; } -.promo_mystery_201907 { - background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png'); - background-position: 0px -296px; - width: 282px; - height: 144px; -} -.promo_naming_day_2018 { - background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png'); - background-position: -424px 0px; - width: 285px; - height: 162px; -} .promo_take_this { background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png'); - background-position: -424px -163px; + background-position: -313px -148px; width: 96px; height: 69px; } -.scene_reading { +.promo_unconventional_armor { background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png'); - background-position: -283px -296px; - width: 171px; - height: 144px; -} -.scene_rewards { - background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png'); - background-position: 0px -441px; - width: 207px; + background-position: 0px -371px; + width: 180px; height: 180px; } +.scene_casting_spells { + background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png'); + background-position: 0px 0px; + width: 312px; + height: 222px; +} diff --git a/website/client/assets/images/sprites/spritesmith-largeSprites-0.png b/website/client/assets/images/sprites/spritesmith-largeSprites-0.png index 2204a1ff72..201b73bddd 100644 Binary files a/website/client/assets/images/sprites/spritesmith-largeSprites-0.png and b/website/client/assets/images/sprites/spritesmith-largeSprites-0.png differ diff --git a/website/client/components/groups/tavern.vue b/website/client/components/groups/tavern.vue index 4cf6a7e6df..86776fb7d9 100644 --- a/website/client/components/groups/tavern.vue +++ b/website/client/components/groups/tavern.vue @@ -112,13 +112,13 @@ li a(href='', v-html="$t('glossary')") li - a(href='http://habitica.fandom.com/wiki/Habitica_Wiki', v-once) {{ $t('wiki') }} + a(href='http://habitica.fandom.com/wiki/Habitica_Wiki' target='_blank', v-once) {{ $t('wiki') }} li - a(href='https://oldgods.net/habitrpg/habitrpg_user_data_display.html', v-once) {{ $t('dataDisplayTool') }} + a(href='https://oldgods.net/habitrpg/habitrpg_user_data_display.html', target='_blank', v-once) {{ $t('dataDisplayTool') }} li router-link(to="/groups/guild/a29da26b-37de-4a71-b0c6-48e72a900dac") {{ $t('reportProblem') }} li - a(href='https://trello.com/c/odmhIqyW/440-read-first-table-of-contents', v-once) {{ $t('requestFeature') }} + a(href='https://trello.com/c/odmhIqyW/440-read-first-table-of-contents', target='_blank', v-once) {{ $t('requestFeature') }} li a(href='', v-html="$t('communityForum')") li diff --git a/website/raw_sprites/spritesmith_large/promo_mystery_201907.png b/website/raw_sprites/spritesmith_large/promo_mystery_201907.png deleted file mode 100644 index 6cda6f8c60..0000000000 Binary files a/website/raw_sprites/spritesmith_large/promo_mystery_201907.png and /dev/null differ diff --git a/website/raw_sprites/spritesmith_large/promo_naming_day_2018.png b/website/raw_sprites/spritesmith_large/promo_naming_day_2018.png deleted file mode 100644 index 61440313fa..0000000000 Binary files a/website/raw_sprites/spritesmith_large/promo_naming_day_2018.png and /dev/null differ diff --git a/website/raw_sprites/spritesmith_large/promo_unconventional_armor.png b/website/raw_sprites/spritesmith_large/promo_unconventional_armor.png new file mode 100644 index 0000000000..3343520c9a Binary files /dev/null and b/website/raw_sprites/spritesmith_large/promo_unconventional_armor.png differ diff --git a/website/raw_sprites/spritesmith_large/scene_casting_spells.png b/website/raw_sprites/spritesmith_large/scene_casting_spells.png new file mode 100644 index 0000000000..ecdf7f70de Binary files /dev/null and b/website/raw_sprites/spritesmith_large/scene_casting_spells.png differ diff --git a/website/raw_sprites/spritesmith_large/scene_reading.png b/website/raw_sprites/spritesmith_large/scene_reading.png deleted file mode 100644 index 5b708b2c8b..0000000000 Binary files a/website/raw_sprites/spritesmith_large/scene_reading.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 deleted file mode 100644 index 61e6717fae..0000000000 Binary files a/website/raw_sprites/spritesmith_large/scene_rewards.png and /dev/null differ diff --git a/website/server/controllers/api-v3/news.js b/website/server/controllers/api-v3/news.js index 8dc073b7f5..1218805210 100644 --- a/website/server/controllers/api-v3/news.js +++ b/website/server/controllers/api-v3/news.js @@ -3,7 +3,7 @@ import { authWithHeaders } from '../../middlewares/auth'; let api = {}; // @TODO export this const, cannot export it from here because only routes are exported from controllers -const LAST_ANNOUNCEMENT_TITLE = 'NEW MAGIC HATCHING POTION QUEST! AND SOMETHING SPECIAL ON THE WAY...'; +const LAST_ANNOUNCEMENT_TITLE = 'WORLDCON HABITICA MEETUP AND BLOG POST ON ROGUES'; const worldDmg = { // @TODO bailey: false, }; @@ -30,17 +30,18 @@ api.getNews = {
Have you been looking to add more Habitican magic to your IRL world? Something exciting is coming to help you do just that! Keep your eyes peeled for a special announcement from Bailey soon!
-Where there's Bronze, there must be Silver... right? Get the latest Magic Hatching Potion quest, "The Silver Solution," and collect Silver Ingots and Runes to earn Silver Magic Hatching Potions by completing your real-life tasks!
-shanaqui and Dewines will be representing Habitica at Worldcon this year. If you’d like to meet them along with other fellow Habiticans, join us at the Habitica Worldcon Meetup! They'll be handing out promo codes for the special Unconventional Armor set and Habitica stickers (note quantities may be limited). Look for shanaqui's Habitica t-shirt!
+You can find the meetup on Saturday, August 17, at ground floor foyer of Convention Centre Dublin from 5:00-6:00 PM local time! Can’t wait to meet you :)
+ +This month's featured Wiki article is about the Rogue class! We hope that it will help you as you choose the best class for your Habitica play style. Be sure to check it out, and let us know what you think by reaching out on Twitter, Tumblr, and Facebook.
+