diff --git a/Gruntfile.js b/Gruntfile.js index 8b3d213614..b5f507c50a 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -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' diff --git a/common/css/index.css b/common/css/index.css index c5c00de4a2..9f8b87eec9 100644 --- a/common/css/index.css +++ b/common/css/index.css @@ -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; diff --git a/common/img/sprites/quest_bewilder.gif b/common/img/sprites/quest_bewilder.gif new file mode 100644 index 0000000000..ebf2677bf1 Binary files /dev/null and b/common/img/sprites/quest_bewilder.gif differ diff --git a/common/img/sprites/spritesmith/quests/quest_bewilder.png b/common/img/sprites/spritesmith/quests/quest_bewilder.png deleted file mode 100644 index 34014eb0ea..0000000000 Binary files a/common/img/sprites/spritesmith/quests/quest_bewilder.png and /dev/null differ diff --git a/common/script/content/index.js b/common/script/content/index.js index 5dd63b8413..fc283e9442 100644 --- a/common/script/content/index.js +++ b/common/script/content/index.js @@ -2533,6 +2533,7 @@ api.quests = { text: t("questBewilderText"), notes: t("questBewilderNotes"), completion: t("questBewilderCompletion"), + completionChat: t('questBewilderCompletionChat'), value: 0, canBuy: (function() { return false; diff --git a/website/views/shared/header/menu.jade b/website/views/shared/header/menu.jade index 95c2c79cad..78f60557ca 100644 --- a/website/views/shared/header/menu.jade +++ b/website/views/shared/header/menu.jade @@ -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