krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-17 14:47:53 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix(world-boss): add chat message, Bailey handling, animation

Browse Source
This commit is contained in:
Sabe Jones
2016-03-31 19:38:43 -04:00
parent def6b6cd5c
commit a07aed331c
6 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Gruntfile.js
View File

@@ -60,7 +60,7 @@ module.exports = function(grunt) {
{expand: true, cwd: '', src: 'common/dist/sprites/spritesmith*.png', dest: 'website/build/'},
{expand: true, cwd: '', src: 'common/img/sprites/backer-only/*.gif', dest: 'website/build/'},
{expand: true, cwd: '', src: 'common/img/sprites/npc_ian.gif', dest: 'website/build/'},
{expand: true, cwd: '', src: 'common/img/sprites/quest_burnout.gif', dest: 'website/build/'},
{expand: true, cwd: '', src: 'common/img/sprites/quest_*.gif', dest: 'website/build/'},
{expand: true, cwd: 'website/public/', src: 'bower_components/bootstrap/dist/fonts/*', dest: 'website/build/'}
]
}
@@ -80,7 +80,7 @@ module.exports = function(grunt) {
'website/build/common/dist/sprites/*.png',
'website/build/common/img/sprites/backer-only/*.gif',
'website/build/common/img/sprites/npc_ian.gif',
'website/build/common/img/sprites/quest_burnout.gif',
'website/build/common/img/sprites/quest_*.gif',
'website/build/bower_components/bootstrap/dist/fonts/*'
],
dest: 'website/build/*.css'

6
common/css/index.css
View File

@@ -11,6 +11,12 @@
height: 249px;
}
.quest_bewilder {
background: url("/common/img/sprites/quest_bewilder.gif") no-repeat;
width: 219px;
height: 219px;
}
.Gems {
display:inline-block;
margin-right:5px;

BIN
common/img/sprites/quest_bewilder.gif Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 55 KiB

BIN
common/img/sprites/spritesmith/quests/quest_bewilder.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 9.0 KiB

1
common/script/content/index.js
View File

@@ -2533,6 +2533,7 @@ api.quests = {
text: t("questBewilderText"),
notes: t("questBewilderNotes"),
completion: t("questBewilderCompletion"),
completionChat: t('questBewilderCompletionChat'),
value: 0,
canBuy: (function() {
return false;

2
website/views/shared/header/menu.jade
View File

@@ -280,4 +280,4 @@ nav.toolbar(ng-controller='MenuCtrl')
ul.toolbar-bailey(ng-class='{inactive: !_expandedMenu.menu}')
li.toolbar-bailey-container(ng-if='user.flags.newStuff')
.npc_bailey.npc_bailey_head(popover=env.t('psst'), popover-trigger='mouseenter', popover-placement='right', ng-click='openModal("newStuff",{size:"lg"})')
div(class="#{env.worldDmg.bailey ? 'npc_bailey_broken' : 'npc_bailey'}" popover=env.t('psst'), popover-trigger='mouseenter', popover-placement='right', ng-click='openModal("newStuff",{size:"lg"})').npc_bailey_head