diff --git a/src/models/group.js b/src/models/group.js
index 5a9acd8100..3de65fcda3 100644
--- a/src/models/group.js
+++ b/src/models/group.js
@@ -317,6 +317,7 @@ GroupSchema.statics.bossQuest = function(user, progress, cb) {
group.sendChat(quest.boss.rage.effect('en'));
group.quest.progress.rage = 0;
if (quest.boss.rage.healing) group.quest.progress.hp += (group.quest.progress.hp * quest.boss.rage.healing); //TODO To make Rage effects more expandable, let's turn these into functions in quest.boss.rage
+ if (group.quest.progress.hp > quest.boss.hp) group.quest.progress.hp = quest.boss.hp;
}
}
// Everyone takes damage
diff --git a/views/shared/new-stuff.jade b/views/shared/new-stuff.jade
index d08ef4d245..2d26c740aa 100644
--- a/views/shared/new-stuff.jade
+++ b/views/shared/new-stuff.jade
@@ -1,18 +1,31 @@
-h5
+h5 VICTORY!
hr
tr
td
- h5 1/21/2015 - THIRD STRESS STRIKE!
- .npc_justin_broken.pull-right
- p The World Boss in the Tavern has used a third Stress Strike!
- p Justin the Guide is trying to distract the Stressbeast by running around its ankles, yelling productivity tips! The Abominable Stressbeast is stomping madly, but it seems like we're really wearing this beast down. I doubt it has enough energy for another strike. Don't give up... we're so close to finishing it off!
- p Complete Dailies and To-Dos to damage the World Boss! A World Boss will never damage individual players or accounts in any way. Only active accounts who are not resting in the inn will have their incomplete Dailies tallied.
- p.small.muted by Lemoness, Kiwibot, and SabreCat
+ h5 The Abominable Stressbeast is DEFEATED!
+ p We've done it! With a final bellow, the Abominable Stressbeast dissipates into a cloud of snow. The flakes twinkle down through the air as cheering Habiticans embrace their pets and mounts. Our animals and our NPCs are safe once more!
+ tr
+ td
+ h5 Stoïkalm is Saved!
+ p SabreCat speaks gently to a small sabertooth. "Please find the citizens of the Stoïkalm Steppes and bring them to us," he says. Several hours later, the sabertooth returns, with a herd of mammoth riders following slowly behind. You recognize the head rider as Lady Glaciate, the leader of Stoïkalm.
+ p "Mighty Habiticans," she says, "My citizens and I owe you the deepest thanks, and the deepest apologies. In an effort to protect our Steppes from turmoil, we began to secretly banish all of our stress into the icy mountains. We had no idea that it would build up over generations into the Stressbeast that you saw! When it broke loose, it trapped all of us in the mountains in its stead and went on a rampage against our beloved animals." Her sad gaze follows the falling snow. "We put everyone at risk with our foolishness. Rest assured that in the future, we will come to you with our problems before our problems come to you."
+ .Pet-Mammoth-Base.pull-right
+ p She turns to where @Baconsaur is snuggling with some of the baby mammoths. "We have brought your animals an offering of food to apologize for frightening them, and as a symbol of trust, we will leave some of our pets and mounts with you. We know that you will all take care good care of them."
+ p.small.muted by everyone who completed a Daily or a To-Do during the battle!
hr
a(href='/static/old-news', target='_blank') Read older news
mixin oldNews
+ h5 1/21/2015
+ tr
+ td
+ h5 THIRD STRESS STRIKE!
+ .npc_justin_broken.pull-right
+ p The World Boss in the Tavern has used a third Stress Strike!
+ p Justin the Guide is trying to distract the Stressbeast by running around its ankles, yelling productivity tips! The Abominable Stressbeast is stomping madly, but it seems like we're really wearing this beast down. I doubt it has enough energy for another strike. Don't give up... we're so close to finishing it off!
+ p Complete Dailies and To-Dos to damage the World Boss! A World Boss will never damage individual players or accounts in any way. Only active accounts who are not resting in the inn will have their incomplete Dailies tallied.
+ p.small.muted by Lemoness, Kiwibot, and SabreCat
h5 1/20/2015
tr
td