diff --git a/website/client/assets/css/sprites.css b/website/client/assets/css/sprites.css
index 07036ce43f..906e3bc5a2 100755
--- a/website/client/assets/css/sprites.css
+++ b/website/client/assets/css/sprites.css
@@ -1,18 +1,5 @@
-/* Comment out for holiday events */
-/* .npc_ian {
- background: url("/npc_ian.gif") no-repeat;
- width: 78px;
- height: 135px;
-} */
-
-.quest_burnout {
- background: url("~assets/images/quest_burnout.gif") no-repeat;
- width: 219px;
- height: 249px;
-}
-
-.quest_bewilder {
- background: url("~assets/images/quest_bewilder.gif") no-repeat;
+.quest_dysheartener {
+ background: url("~assets/images/quest_dysheartener.gif") no-repeat;
width: 219px;
height: 219px;
}
diff --git a/website/client/assets/images/quest_dysheartener.gif b/website/client/assets/images/quest_dysheartener.gif
new file mode 100644
index 0000000000..f387490d69
Binary files /dev/null and b/website/client/assets/images/quest_dysheartener.gif differ
diff --git a/website/client/assets/images/rage_strike2x.png b/website/client/assets/images/rage_strike2x.png
new file mode 100644
index 0000000000..7200927ee6
Binary files /dev/null and b/website/client/assets/images/rage_strike2x.png differ
diff --git a/website/client/assets/images/world-boss/heart-translucent-shadow@3x.png b/website/client/assets/images/world-boss/heart-translucent-shadow@3x.png
new file mode 100755
index 0000000000..c6eac6924c
Binary files /dev/null and b/website/client/assets/images/world-boss/heart-translucent-shadow@3x.png differ
diff --git a/website/client/assets/images/world-boss/left-hearts@3x.png b/website/client/assets/images/world-boss/left-hearts@3x.png
new file mode 100755
index 0000000000..e060e73328
Binary files /dev/null and b/website/client/assets/images/world-boss/left-hearts@3x.png differ
diff --git a/website/client/assets/images/world-boss/mantis-static@3x.png b/website/client/assets/images/world-boss/mantis-static@3x.png
new file mode 100755
index 0000000000..393f85c125
Binary files /dev/null and b/website/client/assets/images/world-boss/mantis-static@3x.png differ
diff --git a/website/client/assets/images/world-boss/right-hearts@3x.png b/website/client/assets/images/world-boss/right-hearts@3x.png
new file mode 100755
index 0000000000..fa74a96495
Binary files /dev/null and b/website/client/assets/images/world-boss/right-hearts@3x.png differ
diff --git a/website/client/assets/svg/check-red.svg b/website/client/assets/svg/check-red.svg
new file mode 100644
index 0000000000..de992ee7c7
--- /dev/null
+++ b/website/client/assets/svg/check-red.svg
@@ -0,0 +1,3 @@
+
diff --git a/website/client/assets/svg/chevron-red.svg b/website/client/assets/svg/chevron-red.svg
new file mode 100644
index 0000000000..3e293c5c4c
--- /dev/null
+++ b/website/client/assets/svg/chevron-red.svg
@@ -0,0 +1,3 @@
+
diff --git a/website/client/assets/svg/information-red.svg b/website/client/assets/svg/information-red.svg
new file mode 100644
index 0000000000..150bf8ce16
--- /dev/null
+++ b/website/client/assets/svg/information-red.svg
@@ -0,0 +1,3 @@
+
diff --git a/website/client/assets/svg/rage.svg b/website/client/assets/svg/rage.svg
new file mode 100644
index 0000000000..d215fe223c
--- /dev/null
+++ b/website/client/assets/svg/rage.svg
@@ -0,0 +1,18 @@
+
diff --git a/website/client/assets/svg/sword.svg b/website/client/assets/svg/sword.svg
new file mode 100644
index 0000000000..03bef0bd6b
--- /dev/null
+++ b/website/client/assets/svg/sword.svg
@@ -0,0 +1,30 @@
+
diff --git a/website/client/components/groups/questSidebarSection.vue b/website/client/components/groups/questSidebarSection.vue
index b318a95b3a..2113bb2144 100644
--- a/website/client/components/groups/questSidebarSection.vue
+++ b/website/client/components/groups/questSidebarSection.vue
@@ -53,12 +53,12 @@ div
.grey-progress-bar
.boss-health-bar(:style="{width: (group.quest.progress.hp / questData.boss.hp) * 100 + '%'}")
.row.boss-details
- .col-6
- span.float-left
- | {{parseFloat(group.quest.progress.hp).toFixed(2)}} / {{parseFloat(questData.boss.hp).toFixed(2)}}
- .col-6(v-if='userIsOnQuest')
- // @TODO: Why do we not sync quset progress on the group doc? Each user could have different progress
- span.float-right {{parseFloat(user.party.quest.progress.up).toFixed(1) || 0}} pending damage
+ .col-6
+ span.float-left
+ | {{parseFloat(group.quest.progress.hp).toFixed(2)}} / {{parseFloat(questData.boss.hp).toFixed(2)}}
+ .col-6(v-if='userIsOnQuest')
+ // @TODO: Why do we not sync quset progress on the group doc? Each user could have different progress
+ span.float-right {{parseFloat(user.party.quest.progress.up).toFixed(1) || 0}} pending damage
.row.rage-bar-row(v-if='questData.boss.rage')
.col-12
.grey-progress-bar
diff --git a/website/client/components/groups/tavern.vue b/website/client/components/groups/tavern.vue
index 93a04a6a02..e81dcb8daf 100644
--- a/website/client/components/groups/tavern.vue
+++ b/website/client/components/groups/tavern.vue
@@ -1,5 +1,6 @@
.row
+ world-boss-info-modal
.col-12.col-sm-8.clearfix.standard-page
.row
.col-6.title-details
@@ -25,12 +26,65 @@
.row
.hr.col-12
chat-message(:chat.sync='group.chat', :group-id='group._id', :group-name='group.name')
-
.col-12.col-sm-4.sidebar
.section
.grassy-meadow-backdrop
.daniel_front
+ .boss-section
+ .world-boss(v-if='group && group.quest && group.quest.active', :style="{background: questData.colors.dark, 'border-color': questData.colors.extralight, 'outline-color': questData.colors.light}")
+ .corner-decoration(:style="{top: '-2px', right: '-2px'}")
+ .corner-decoration(:style="{top: '-2px', left: '-2px'}")
+ .corner-decoration(:style="{bottom: '-2px', right: '-2px'}")
+ .corner-decoration(:style="{bottom: '-2px', left: '-2px'}")
+ .text-center.float-bar
+ strong.reduce.boss-event(:style="{background: questData.colors.dark}") {{ $t('worldBossEvent') }}
+ .boss-gradient.pb-3.pt-3
+ p.text-center.reduce(:style="{color: questData.colors.extralight}") {{ $t(`${questData.key}ArtCredit`) }}
+ .quest-boss(:class="'background_' + questData.key")
+ .quest-boss(:class="'quest_' + questData.key")
+ .p-3
+ .row.d-flex.align-items-center.mb-2
+ .col-sm-6
+ strong.float-left {{ questData.boss.name() }}
+ .col-sm-6
+ span.d-flex.float-right
+ .svg-icon.boss-icon(v-html="icons.swordIcon")
+ span.ml-1.reduce(:style="{color: questData.colors.extralight}") {{ $t('pendingDamage', {damage: pendingDamage()}) }}
+ .grey-progress-bar.mb-1
+ .boss-health-bar(:style="{width: (group.quest.progress.hp / questData.boss.hp) * 100 + '%'}")
+ span.d-flex.align-items-center
+ .svg-icon.boss-icon(v-html="icons.healthIcon")
+ span.reduce.ml-1.pt-1 {{ $t('bossHealth', {currentHealth: bossCurrentHealth(), maxHealth: questData.boss.hp.toLocaleString()}) }}
+ .mt-3.mb-2
+ strong.mr-1 {{ $t('rageAttack') }}
+ span {{ questData.boss.rage.title() }}
+ .grey-progress-bar.mb-1
+ .boss-health-bar.rage-bar(:style="{width: (group.quest.progress.rage / questData.boss.rage.value) * 100 + '%'}")
+ span.d-flex.align-items-center
+ .svg-icon.boss-icon(v-html="icons.rageIcon")
+ span.reduce.ml-1.pt-1 {{ $t('bossRage', {currentRage: bossCurrentRage(), maxRage: questData.boss.rage.value.toLocaleString()}) }}
+ .row.d-flex.align-items-center.mb-2.mt-2
+ .col-sm-5.d-flex
+ strong {{ $t('rageStrikes') }}
+ .svg-icon.boss-icon.information-icon.ml-2(v-html="icons.informationIcon", v-b-tooltip.hover.top="questData.boss.rage.description()")
+ .col-sm-2
+ img.rage-strike(src="~assets/images/rage_strike2x.png")
+ .col-sm-2
+ img.rage-strike(src="~assets/images/rage_strike2x.png")
+ .col-sm-2
+ img.rage-strike(src="~assets/images/rage_strike2x.png")
+ .boss-description.p-3(:style="{'border-color': questData.colors.extralight}", @click="sections.worldBoss = !sections.worldBoss")
+ strong.float-left {{ $t('worldBossDescription') }}
+ .float-right
+ .toggle-down(v-if="!sections.worldBoss")
+ .svg-icon.boss-icon(v-html="icons.chevronIcon")
+ .toggle-up(v-if="sections.worldBoss")
+ .svg-icon.boss-icon.reverse(v-html="icons.chevronIcon")
+ .mt-3(v-if="sections.worldBoss", v-html="questData.notes()")
+ .text-center.mt-4
+ .world-boss-info-button(@click="showWorldBossInfo()") {{$t('whatIsWorldBoss') }}
+
.sleep.below-header-sections
strong(v-once) {{ $t('sleepDescription') }}
ul
@@ -194,7 +248,7 @@
padding: 0em;
.below-header-sections {
- padding: 1em;
+ padding: 1em 1.75em 1em 1.75em;
}
}
@@ -223,10 +277,6 @@
margin: 0 auto;
}
- .sleep {
- margin-top: 1em;
- }
-
.svg-icon {
width: 10px;
display: inline-block;
@@ -253,6 +303,16 @@
width: 8px;
}
+ .boss-icon {
+ width: 16px;
+ margin-top: .1em;
+ margin-left: 0;
+ }
+
+ .boss-icon-large {
+ width: 48px;
+ }
+
.staff {
margin-bottom: 1em;
@@ -335,6 +395,97 @@
color: $black;
}
+ .boss-section {
+ padding: 1.75em;
+ }
+
+ .world-boss {
+ color: $white;
+ border-style: solid;
+ border-width: 2px;
+ outline-style: solid;
+ outline-width: 2px;
+ margin: 2px;
+ position: relative;
+ }
+
+ .quest-boss {
+ margin: 1em auto;
+ }
+
+ .grey-progress-bar {
+ width: 100%;
+ height: 15px;
+ background-color: rgba(255, 255, 255, 0.24);
+ border-radius: 2px;
+ }
+
+ .boss-health-bar {
+ width: 80%;
+ height: 15px;
+ margin-bottom: .5em;
+ border-top-left-radius: 2px;
+ border-bottom-left-radius: 2px;
+ background-color: #f74e52;
+ }
+
+ .boss-health-bar.rage-bar {
+ background-color: #ff944c;
+ }
+
+ .boss-gradient {
+ background-image: linear-gradient(to bottom, #401f2a, #931f4d);
+ margin-top: -1.4em;
+ }
+
+ .boss-description {
+ border-top: 1px solid;
+ margin-left: -16px;
+ margin-right: -16px;
+ padding: .25em 0 0 .25em;
+ }
+
+ .float-bar {
+ position: relative;
+ top: -.75em;
+ }
+
+ .boss-event {
+ padding: .5em 3em .5em 3em;
+ border-radius: 2px;
+ }
+
+ .corner-decoration {
+ position: absolute;
+ width: 6px;
+ height: 6px;
+ background-color: inherit;
+ border: inherit;
+ outline: inherit;
+ }
+
+ .reverse {
+ transform: rotate(180deg);
+ }
+
+ .reduce {
+ font-size: 12px;
+ }
+
+ .rage-strike {
+ max-width: 50px;
+ height: auto;
+ }
+
+ .world-boss-info-button {
+ width: 100%;
+ background-color: $gray-500;
+ border-radius: 2px;
+ font-size: 14px;
+ color: $blue-10;
+ padding: 1em;
+ }
+
diff --git a/website/client/components/worldBossInfoModal.vue b/website/client/components/worldBossInfoModal.vue
new file mode 100644
index 0000000000..3bb8c96ef7
--- /dev/null
+++ b/website/client/components/worldBossInfoModal.vue
@@ -0,0 +1,135 @@
+
+ b-modal#world-boss-info(title="", size='md', :hide-footer="true", :hide-header="true")
+ .modal-header.d-flex
+ .left-hearts
+ .quest_dysheartener_modal
+ .right-hearts
+ .modal-body
+ .row
+ .col-12.text-center
+ h2 {{ $t('whatIsWorldBoss') }}
+ p.text-center {{ $t('worldBossDesc') }}
+ .row
+ .col-12
+ .bullet-point.d-flex.align-items-center.justify-content-left(v-for='bullet in bullets')
+ .check-icon
+ .svg-icon.red-check(v-html="icons.redCheck")
+ .info {{ $t(bullet) }}
+ .row
+ .col-12.text-center
+ a(href='http://habitica.wikia.com/wiki/World_Bosses' target='_blank').footer-link {{ $t('worldBossLink') }}
+
+
+
+
+
+
+
diff --git a/website/common/locales/en/groups.json b/website/common/locales/en/groups.json
index 779516d708..a7fcfe9532 100644
--- a/website/common/locales/en/groups.json
+++ b/website/common/locales/en/groups.json
@@ -421,5 +421,13 @@
"wouldYouParticipate": "Would you like to participate?",
"managerAdded": "Manager added successfully",
"managerRemoved": "Manager removed successfully",
- "leaderChanged": "Leader has been changed"
+ "leaderChanged": "Leader has been changed",
+
+ "whatIsWorldBoss": "What is a World Boss?",
+ "worldBossDesc": "A World Boss is a special event that brings the Habitica community together to take down a powerful monster with their tasks! All Habitica users are rewarded upon its defeat, even those who have been resting in the Inn or have not used Habitica for the entirety of the quest.",
+ "worldBossLink": "Read more about the previous World Bosses of Habitica on the Wiki.",
+ "worldBossBullet1": "Complete tasks to damage the World Boss",
+ "worldBossBullet2": "The World Boss won’t damage you for missed tasks, but its Rage meter will go up. If the bar fills up, the Boss will attack one of Habitica’s shopkeepers!",
+ "worldBossBullet3": "You can continue with normal Quest Bosses, damage will apply to both",
+ "worldBossBullet4": "Check the Tavern regularly to see World Boss progress and Rage attacks"
}
diff --git a/website/common/locales/en/npc.json b/website/common/locales/en/npc.json
index bdfd160535..4b49e2ab65 100644
--- a/website/common/locales/en/npc.json
+++ b/website/common/locales/en/npc.json
@@ -35,6 +35,9 @@
"danielTextBroken": "Welcome to the Tavern... I guess... If you need to rest, I'll set you up at the Inn... While checked-in, your Dailies won't hurt you at the day's end, but you can still check them off... if you have the energy...",
"danielText2Broken": "Oh... If you are participating in a boss quest, the boss will still damage you for your party mates' missed Dailies... Also, your own damage to the Boss (or items collected) will not be applied until you check out of the Inn...",
+ "worldBossEvent": "World Boss Event",
+ "worldBossDescription": "World Boss Description",
+
"alexander": "Alexander the Merchant",
"welcomeMarket": "Welcome to the Market! Buy hard-to-find eggs and potions! Sell your extras! Commission useful services! Come see what we have to offer.",
"welcomeMarketMobile": "Welcome to the Market! Buy hard-to-find eggs and potions! Come see what we have to offer.",
diff --git a/website/common/locales/en/quests.json b/website/common/locales/en/quests.json
index a32d9b91bc..c6671cf74e 100644
--- a/website/common/locales/en/quests.json
+++ b/website/common/locales/en/quests.json
@@ -121,5 +121,10 @@
"createAccountQuest": "You received this quest when you joined Habitica! If a friend joins, they'll get one too.",
"questBundles": "Discounted Quest Bundles",
"buyQuestBundle": "Buy Quest Bundle",
- "noQuestToStart": "Can’t find a quest to start? Try checking out the Quest Shop in the Market for new releases!"
+ "noQuestToStart": "Can’t find a quest to start? Try checking out the Quest Shop in the Market for new releases!",
+ "pendingDamage": "<%= damage %> pending damage",
+ "bossHealth": "<%= currentHealth %> / <%= maxHealth %> Health",
+ "rageAttack": "Rage Attack:",
+ "bossRage": "<%= currentRage %> / <%= maxRage %> Rage",
+ "rageStrikes": "Rage Strikes"
}
diff --git a/website/common/locales/en/questsContent.json b/website/common/locales/en/questsContent.json
index 9a5d5ca37b..74354df408 100644
--- a/website/common/locales/en/questsContent.json
+++ b/website/common/locales/en/questsContent.json
@@ -661,10 +661,11 @@
"questDysheartenerCompletion": "The Dysheartener is DEFEATED!
Together, everyone in Habitica strikes a final blow to their tasks, and the Dysheartener rears back, shrieking with dismay. “What's wrong, Dysheartener?” AnnDeLune calls, eyes sparkling. “Feeling discouraged?”
Glowing pink fractures crack across the Dysheartener's carapace, and it shatters in a puff of pink smoke. As a renewed sense of vigor and determination sweeps across the land, a flurry of delightful sweets rains down upon everyone.
The crowd cheers wildly, hugging each other as their pets happily chew on the belated Valentine's treats. Suddenly, a joyful chorus of song cascades through the air, and gleaming silhouettes soar across the sky.
Our newly-invigorated optimism has attracted a flock of Hopeful Hippogriffs! The graceful creatures alight upon the ground, ruffling their feathers with interest and prancing about. “It looks like we've made some new friends to help keep our spirits high, even when our tasks are daunting,” Lemoness says.
Beffymaroo already has her arms full with feathered fluffballs. “Maybe they'll help us rebuild the damaged areas of Habitica!”
Crooning and singing, the Hippogriffs lead the way as all the Habitcans work together to restore our beloved home.",
"questDysheartenerCompletionChat": "`The Dysheartener is DEFEATED!`\n\nTogether, everyone in Habitica strikes a final blow to their tasks, and the Dysheartener rears back, shrieking with dismay. “What's wrong, Dysheartener?” AnnDeLune calls, eyes sparkling. “Feeling discouraged?”\n\nGlowing pink fractures crack across the Dysheartener's carapace, and it shatters in a puff of pink smoke. As a renewed sense of vigor and determination sweeps across the land, a flurry of delightful sweets rains down upon everyone.\n\nThe crowd cheers wildly, hugging each other as their pets happily chew on the belated Valentine's treats. Suddenly, a joyful chorus of song cascades through the air, and gleaming silhouettes soar across the sky.\n\nOur newly-invigorated optimism has attracted a flock of Hopeful Hippogriffs! The graceful creatures alight upon the ground, ruffling their feathers with interest and prancing about. “It looks like we've made some new friends to help keep our spirits high, even when our tasks are daunting,” Lemoness says.\n\nBeffymaroo already has her arms full with feathered fluffballs. “Maybe they'll help us rebuild the damaged areas of Habitica!”\n\nCrooning and singing, the Hippogriffs lead the way as all the Habitcans work together to restore our beloved home.",
"questDysheartenerBossRageTitle": "Shattering Heartbreak",
- "questDysheartenerBossRageDescription": "When this gauge fills, the Dysheartener will unleash its Shattering Heartbreak on Habitica!",
+ "questDysheartenerBossRageDescription": "The Rage Attack gauge fills when Habiticans miss their Dailies. If it fills up, the Dysheartener will unleash its Shattering Heartbreak attack on one of Habitica's shopkeepers, so be sure to do your tasks!",
"questDysheartenerBossRageSeasonal": "`The Dysheartener uses SHATTERING HEARTBREAK!`\n\nOh, no! After feasting on our undone Dailies, the Dysheartener has gained the strength to unleash its Shattering Heartbreak attack. With a shrill shriek, it brings its spiny forelegs down upon the gazebo that houses the Seasonal Shop! The concussive blast of magic shreds the wood, and the Seasonal Sorceress is overcome by sorrow at the sight.\n\nQuickly, let's keep doing our Dailies so that the beast won't strike again!",
"questDysheartenerBossRageMarket": "`The Dysheartener uses SHATTERING HEARTBREAK!`\n\nHelp! After feasting on our incomplete Dailies, the Dysheartener lets out another Shattering Heartbreak attack, smashing the walls and floor of the Market! As stone rains down, Alex the Merchant weeps at his crushed merchandise, stricken by the destruction.\n\nWe can't let this happen again! Be sure to do all our your Dailies to prevent the Dysheartener from using its final strike.",
"questDysheartenerBossRageQuests": "`The Dysheartener uses SHATTERING HEARTBREAK!`\n\nAaaah! We've left our Dailies undone again, and the Dysheartener has mustered the energy for one final blow against our beloved shopkeepers. The countryside around Ian the Quest Master is ripped apart by its Shattering Heartbreak attack, and Ian is struck to the core by the horrific vision. We're so close to defeating this monster.... Hurry! Don't stop now!",
"questDysheartenerDropHippogriffPet": "Hopeful Hippogriff (Pet)",
- "questDysheartenerDropHippogriffMount": "Hopeful Hippogriff (Mount)"
+ "questDysheartenerDropHippogriffMount": "Hopeful Hippogriff (Mount)",
+ "dysheartenerArtCredit": "Artwork by @AnnDeLune"
}
diff --git a/website/raw_sprites/spritesmith/quests/bosses/background_dysheartener.png b/website/raw_sprites/spritesmith/quests/bosses/background_dysheartener.png
new file mode 100644
index 0000000000..a77ddbc8d7
Binary files /dev/null and b/website/raw_sprites/spritesmith/quests/bosses/background_dysheartener.png differ
diff --git a/website/raw_sprites/spritesmith/quests/bosses/phobia_dysheartener.png b/website/raw_sprites/spritesmith/quests/bosses/phobia_dysheartener.png
new file mode 100644
index 0000000000..ac998d9e60
Binary files /dev/null and b/website/raw_sprites/spritesmith/quests/bosses/phobia_dysheartener.png differ