sudoxreboot/habitica
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica.git synced 2026-08-05 12:02:13 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #4494 from SabreCat/stressbeast

Browse source 
World boss for Winter Wonderland 2015
This commit is contained in:
Sabe Jones 2015-01-08 15:51:04 -06:00
commit cda16d5bc0
8 changed files with 71 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
public/css/npcs.styl
View file

@ -12,6 +12,8 @@
margin-right:0px
.npc_bailey
float:left
.npc_bailey_broken
float:left
.npc_bailey_head
position: absolute
top: -17px
@ -22,6 +24,10 @@
float: left
margin-right: 5px
margin-bottom: 5px
.npc_justin_broken.float-left
float: left
margin-right: 5px
margin-bottom: 5px
.static-popover
z-index 0

18
public/js/services/guideServices.js
View file

@ -74,7 +74,11 @@ angular.module('guideServices', []).
}
];
_.each(tourSteps, function(step){
step.content = "<div><div class='npc_justin float-left'></div>" + step.content + "</div>"; // add Justin NPC img
if (env.worldDmg.guide) {
step.content = "<div><div class='npc_justin_broken float-left'></div>" + step.content + "</div>";
} else {
step.content = "<div><div class='npc_justin float-left'></div>" + step.content + "</div>";
}
});
$('.main-herobox').popover('destroy');
var tour = new Tour({
@ -104,7 +108,11 @@ angular.module('guideServices', []).
if (!placement) placement = 'bottom';
$(selector).popover('destroy');
var button = "<button class='btn btn-sm btn-default' onClick=\"$('" + selector + "').popover('hide');return false;\">" + window.env.t('close') + "</button>";
html = "<div><div class='npc_justin float-left'></div>" + html + '<br/>' + button + '</div>';
if (env.worldDmg.guide) {
html = "<div><div class='npc_justin_broken float-left'></div>" + html + '<br/>' + button + '</div>';
} else {
html = "<div><div class='npc_justin float-left'></div>" + html + '<br/>' + button + '</div>';
}
$(selector).popover({
title: title,
placement: placement,
@ -186,7 +194,11 @@ angular.module('guideServices', []).
}
];
_.each(tourSteps, function(step){
step.content = "<div><div class='npc_justin float-left'></div>" + step.content + "</div>"; // add Justin NPC img
if (env.worldDmg.guide) {
step.content = "<div><div class='npc_justin_broken float-left'></div>" + step.content + "</div>";
} else {
step.content = "<div><div class='npc_justin_broken float-left'></div>" + step.content + "</div>";
}
});
$('.allocate-stats').popover('destroy');
var tour = new Tour({

6
src/models/group.js
View file

@ -256,7 +256,7 @@ GroupSchema.statics.tavernBoss = function(user,progress) {
var quest = shared.content.quests[tavern.quest.key];
if (tavern.quest.progress.hp <= 0) {
tavern.sendChat(quest.completion('en'));
tavern.sendChat(quest.completionChat('en'));
tavern.finishQuest(quest, function(){});
tavern.save(cb);
module.exports.tavern = undefined;
@ -269,13 +269,15 @@ GroupSchema.statics.tavernBoss = function(user,progress) {
if (tavern.quest.progress.rage >= quest.boss.rage.value) {
if (!tavern.quest.extra.worldDmg) tavern.quest.extra.worldDmg = {};
var wd = tavern.quest.extra.worldDmg;
var scene = wd.tavern ? wd.stables ? wd.market ? false : 'market' : 'stables' : 'tavern';
// var scene = wd.tavern ? wd.stables ? wd.market ? false : 'market' : 'stables' : 'tavern'; // Dilatory attacks tavern, stables, market
var scene = wd.stables ? wd.bailey ? wd.guide ? false : 'guide' : 'bailey' : 'stables'; // Stressbeast attacks stables, Bailey, Justin
if (!scene) {
tavern.sendChat('`'+quest.boss.name('en')+' tries to unleash '+quest.boss.rage.title('en')+', but is too tired.`');
tavern.quest.progress.rage = 0 //quest.boss.rage.value;
} else {
tavern.sendChat(quest.boss.rage[scene]('en'));
tavern.quest.extra.worldDmg[scene] = true;
tavern.quest.extra.worldDmg.recent = scene;
tavern.markModified('quest.extra.worldDmg');
tavern.quest.progress.rage = 0;
}

9
views/options/social/boss.jade
View file

@ -36,7 +36,10 @@ mixin boss(tavern, mobile)
div(ng-if='group.quest.active==true')
div(ng-if='::Content.quests[group.quest.key].boss',ng-init='boss=Content.quests[group.quest.key].boss;progress=group.quest.progress')
div(class="quest_{{::group.quest.key}}")
if tavern
div(class="quest_{{group.quest.key}} quest_{{group.quest.key}}_#{env.worldDmg.recent}")
else
div(class="quest_{{::group.quest.key}}")
//-
.progress
.bar(style='width: {{Shared.percent(group.quest.hp, Content.quests[group.quest.key].hp)}}%;')
@ -85,8 +88,8 @@ mixin boss(tavern, mobile)
// =env.t('questOwnerNotInRunningQuest')
// span(ng-if=':: ! group.quest.leader || ! isMemberOfGroup(group.quest.leader,group)')
// =env.t('questOwnerNotInRunningQuestParty')
quest-rewards(key='{{::group.quest.key}}')
unless tavern
quest-rewards(key='{{::group.quest.key}}')
div(ng-if='::Content.quests[group.quest.key].boss')
.npc_ian.pull-left

2
views/shared/modals/achievements.jade
View file

@ -35,7 +35,7 @@ script(id='modals/achievements/contributor.html', type='text/ng-template')
.modal-header
h4=env.t('modalContribAchievement')
.modal-body
.npc_justin.float-left
div(class="#{env.worldDmg.guide ? 'npc_justin_broken.float-left' : 'npc_justin.float-left'}")
p
!=env.t('contribModal', {name: "{{user.profile.name}}", level: "{{user.contributor.level}}"}) + ' '
a(href='http://habitrpg.wikia.com/wiki/Contributor_Rewards' target='_blank')=env.t('contribLink')

2
views/shared/modals/new-stuff.jade
View file

@ -3,7 +3,7 @@ script(type='text/ng-template', id='modals/newStuff.html')
| #{env.t('newStuff')} by&nbsp;
a(target='_blank', href='https://twitter.com/Mihakuu') Bailey
.modal-body.new-stuff-modal.modal-fixed-height
.npc_bailey
div(class="#{env.worldDmg.bailey ? 'npc_bailey_broken' : 'npc_bailey'}")
br
br
include ../new-stuff

45
views/shared/new-stuff.jade
View file

@ -1,24 +1,41 @@
h5 JANUARY BACKGROUNDS, TESTING CRON BUG FIX, AND DATE FORMAT ADJUSTMENT!
h5 WORLD BOSS BATTLE BEGINS!
tr
td
h5 January Backgrounds
p There are three new avatar backgrounds in the <a href='https://habitrpg.com/#/options/profile/backgrounds' target='_blank'>Background Shop</a>! Now your avatar can summit a Frigid Peak, shiver in an Ice Cave, or wander through the Snowy Pines!
p.small.muted by Kiwibot, Sunstroke, and Rattify
h5 World Boss: The Abominable Stressbeast!
.quest_stressbeast.pull-right
p A new World Boss has appeared in the <a href='https://habitrpg.com/#/options/groups/tavern' target='_blank'>Tavern</a>! All of the completed Dailies and To-Dos of Habiticans damage the World Boss. Incomplete Dailies fill the Stress Strike Bar. When the Stress Strike bar is full, the World Boss will attack an NPC.
p 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. Read on for the details!
tr
td
h5 Testing Fix for Cron Bug
p Today we will be testing a possible fix for a bug that sometimes causes Dailies to not reset correctly on the following day. It's a big change, so we will be keeping a close watch on the site to make sure that it doesn't break anything. If you experience any problems with day start or Dailies reseting in the next few days, please let us know immediately on <a href='https://github.com/HabitRPG/habitrpg/issues/1057' target='_blank'>GitHub</a>. Thanks!
tr
td
h5 Date Format Adjustment
p There's a new option under <a href='https://habitrpg.com/#/options/settings/settings' target='_blank'>Settings</a> that lets you adjust the date format. Now you can list dates as MM/DD/YYYY, DD/MM/YYYY, or YYYY/MM/DD.
p.small.muted by Verabird
h5 Winter Plot-Line: The Abominable Stressbeast Attacks!
p The first thing we hear are the footsteps, slower and more thundering than the stampede. One by one, Habiticans look outside their doors, and words fail us.
p We've all seen Stressbeasts before, of course - tiny vicious creatures that attack during difficult times. But this? This towers taller than the buildings, with paws that could crush a dragon with ease. Frost swings from its stinking fur, and as it roars, the icy blast rips the roofs off our houses. A monster of this magnitude has never been mentioned outside of distant legend.
p "Beware, Habiticans!" SabreCat cries. "Barricade yourselves indoors - this is the Abominable Stressbeast itself!"
p "That thing must be made of centuries of stress!" Kiwibot says, locking the Tavern door tightly and shuttering the windows.
p "The Stoïkalm Steppes," Lemoness says, face grim. "All this time, we thought they were placid and untroubled, but they must have been secretly hiding their stress somewhere. Over generations, it grew into this, and now it's broken free and attacked them - and us!"
p There's only one way to drive away a Stressbeast, Abominable or otherwise, and that's to attack it with completed Dailies and To-Dos! Let's all band together and fight off this fearsome foe - but be sure not to slack on your tasks, or our undone Dailies may enrage it so much that it lashes out...
p.small.muted by Lemoness, Kiwibot, and SabreCat
hr
a(href='/static/old-news', target='_blank') Read older news
mixin oldNews
h5 1/3/2015 - January Mystery Items, Spread the Word Challenge, Winter Plot-Line Continued
h5 1/5/2015
tr
td
h5 January Backgrounds
p There are three new avatar backgrounds in the <a href='https://habitrpg.com/#/options/profile/backgrounds' target='_blank'>Background Shop</a>! Now your avatar can summit a Frigid Peak, shiver in an Ice Cave, or wander through the Snowy Pines!
p.small.muted by Kiwibot, Sunstroke, and Rattify
tr
td
h5 Testing Fix for Cron Bug
p Today we will be testing a possible fix for a bug that sometimes causes Dailies to not reset correctly on the following day. It's a big change, so we will be keeping a close watch on the site to make sure that it doesn't break anything. If you experience any problems with day start or Dailies reseting in the next few days, please let us know immediately on <a href='https://github.com/HabitRPG/habitrpg/issues/1057' target='_blank'>GitHub</a>. Thanks!
tr
td
h5 Date Format Adjustment
p There's a new option under <a href='https://habitrpg.com/#/options/settings/settings' target='_blank'>Settings</a> that lets you adjust the date format. Now you can list dates as MM/DD/YYYY, DD/MM/YYYY, or YYYY/MM/DD.
p.small.muted by Verabird
h5 1/3/2015
tr
td
h5 January Mystery Item Set
@ -36,7 +53,7 @@ mixin oldNews
p A thundering herd of mammoths charges past, sabertooths roar, and dinosaurs both feathery and scaly slither by at top speed. Habiticans stare open-mouthed, but before anyone can react, the stampede has swept through Habit City and is gone into the distance, leaving only pawprints in the snow, the howling wind, and some trampled New Year's cards.
p Habiticans are advised to keep calm and not give in to stress during this confusing and difficult time. We've sent SabreCat after the frightened animals from the Stoïkalm Steppes, and he is working to calm them down so that we can bring them back to the safety of the Stables. We hope to have an explanation for this strangeness soon. In the meantime, keep all of your own pets and mounts indoors.
p.small.muted Read the previous installments of the Winter Plot-Line <a href='http://habitrpg.wikia.com/wiki/Winter_Wonderland#Winter_Mystery_Plot' target='_blank'>here</a>!
h5 12/31/2014 - New Year's Eve Celebration
h5 12/31/2014
tr
td
h5 Party Hats
@ -55,7 +72,7 @@ mixin oldNews
.inventory_special_snowball.pull-right
p The <a href='https://habitrpg.com/#/options/inventory/seasonalshop' target='_blank'>Seasonal Shop</a> is also stocking Snowballs for gold! Throw them at your friends to have an exciting effect. Anyone hit with a snowball earns the Annoying Friends badge. The results of being hit with a Snowball will last until the end of your day, but you can also reverse them early by buying Salt from the Rewards column. Snowballs are available until January 31st.
p.small.muted by Shaner, Lemoness, and SabreCat
h5 12/25/2014 - December Subscriber Item Set and Seasonal Shop! Plus, Flagging Posts and Winter Plot-Line Continues
h5 12/25/2014
tr
td
h5 December Subscriber Item Set

8
views/shared/profiles/achievements.jade
View file

@ -171,7 +171,6 @@ div(ng-if='::profile.achievements.quests.dilatory')
=env.t('achievementDilatoryText')
hr
//- FIXME add these strings to locales
div(ng-if='::profile.achievements.costumeContest')
.achievement.achievement-costumeContest
h5=env.t('costumeContest')
@ -185,3 +184,10 @@ div(ng-if='::profile.achievements.nye')
small
=env.t('auldAcquaintanceText', {cards: "{{::profile.achievements.nye}}"})
hr
div(ng-if='::profile.achievements.quests.stressbeast')
.achievement.achievement-stoikalm
h5=env.t('achievementStressbeast')
small
=env.t('achievementStressbeastText')
hr