NPC Flavors (#9066)

* use scss variables to chose the seasonal images instead of replacing them + added fall festival npc images

* hide spooky sparkles until needed
This commit is contained in:
negue 2017-09-24 22:10:54 +02:00 committed by GitHub
parent 5aea8def3b
commit 4759764e61
29 changed files with 28 additions and 14 deletions

Binary file not shown.

After

Width:  |  Height:  |  Size: 10 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 11 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.9 KiB

View file

Before

Width:  |  Height:  |  Size: 8.2 KiB

After

Width:  |  Height:  |  Size: 8.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 11 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 21 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 9.8 KiB

View file

Before

Width:  |  Height:  |  Size: 6.5 KiB

After

Width:  |  Height:  |  Size: 6.5 KiB

View file

Before

Width:  |  Height:  |  Size: 6.2 KiB

After

Width:  |  Height:  |  Size: 6.2 KiB

View file

Before

Width:  |  Height:  |  Size: 13 KiB

After

Width:  |  Height:  |  Size: 13 KiB

View file

Before

Width:  |  Height:  |  Size: 4.9 KiB

After

Width:  |  Height:  |  Size: 4.9 KiB

View file

Before

Width:  |  Height:  |  Size: 6.9 KiB

After

Width:  |  Height:  |  Size: 6.9 KiB

View file

Before

Width:  |  Height:  |  Size: 7.1 KiB

After

Width:  |  Height:  |  Size: 7.1 KiB

View file

Before

Width:  |  Height:  |  Size: 8.6 KiB

After

Width:  |  Height:  |  Size: 8.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.5 KiB

View file

Before

Width:  |  Height:  |  Size: 6.5 KiB

After

Width:  |  Height:  |  Size: 6.5 KiB

View file

Before

Width:  |  Height:  |  Size: 7.8 KiB

After

Width:  |  Height:  |  Size: 7.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 14 KiB

View file

@ -0,0 +1,9 @@
// this variables are used to determine which shop npc/backgrounds should be loaded
// possible values are: normal, fall
// more to be added on future seasons
$npc_market_flavor: "fall";
$npc_quests_flavor: "fall";
$npc_seasonal_flavor: "fall";
$npc_timetravelers_flavor: "fall";
$npc_tavern_flavor: "fall";

View file

@ -138,6 +138,7 @@
<style lang='scss' scoped>
@import '~client/assets/scss/colors.scss';
@import '~client/assets/scss/variables.scss';
.chat-row {
position: relative;
@ -227,14 +228,14 @@
}
.grassy-meadow-backdrop {
background-image: url('~assets/images/tavern_backdrop_web_backgroundtile.png');
background-image: url('~assets/images/npc/#{$npc_tavern_flavor}/tavern_background.png');
background-repeat: repeat-x;
width: 100%;
height: 246px;
}
.daniel_front {
background-image: url('~assets/images/tavern_backdrop_web_daniel_and_props.png');
background-image: url('~assets/images/npc/#{$npc_tavern_flavor}/tavern_npc.png');
height: 246px;
width: 471px;
background-repeat: no-repeat;

View file

@ -229,6 +229,7 @@
<style lang="scss">
@import '~client/assets/scss/colors.scss';
@import '~client/assets/scss/variables.scss';
.fill-height {
height: 38px; // button + margin + padding
@ -300,7 +301,7 @@
height: 216px;
.background {
background: url('~assets/images/shops/shop_background.png');
background: url('~assets/images/npc/#{$npc_market_flavor}/market_background.png');
background-repeat: repeat-x;
@ -328,7 +329,7 @@
top: 0;
width: 100%;
height: 216px;
background: url('~assets/images/shops/market_banner_web_alexnpc.png');
background: url('~assets/images/npc/#{$npc_market_flavor}/market_banner_npc.png');
background-repeat: no-repeat;
.featured-label {

View file

@ -194,6 +194,7 @@
<style lang="scss">
@import '~client/assets/scss/colors.scss';
@import '~client/assets/scss/variables.scss';
.badge-svg {
left: calc((100% - 18px) / 2);
@ -274,7 +275,7 @@
height: 216px;
.background {
background: url('~assets/images/shops/quest_shop_banner_background.png');
background: url('~assets/images/npc/#{$npc_quests_flavor}/quest_shop_background.png');
background-repeat: repeat-x;
@ -302,7 +303,7 @@
left: 0;
top: 0;
height: 100%;
background: url('~assets/images/shops/quest_shop__banner_web_iannpc.png');
background: url('~assets/images/npc/#{$npc_quests_flavor}/quest_shop_npc.png');
background-repeat: no-repeat;

View file

@ -103,6 +103,7 @@
<style lang="scss">
@import '~client/assets/scss/colors.scss';
@import '~client/assets/scss/variables.scss';
.badge-svg {
left: calc((100% - 18px) / 2);
@ -211,7 +212,7 @@
height: 216px;
.background {
background: url('~assets/images/shops/seasonal_shop_closed_background.png');
background: url('~assets/images/npc/normal/seasonal_shop_closed_background.png');
background-repeat: repeat-x;
@ -228,7 +229,7 @@
align-items: center;
}
.background.opened {
background: url('~assets/images/shops/seasonal_shop_opened_background.png');
background: url('~assets/images/npc/#{$npc_seasonal_flavor}/seasonal_shop_opened_background.png');
background-repeat: repeat-x;
}
@ -244,7 +245,7 @@
top: 0;
width: 100%;
height: 216px;
background: url('~assets/images/shops/seasonal_shop_closed_npc.png');
background: url('~assets/images/npc/normal/seasonal_shop_closed_npc.png');
background-repeat: no-repeat;
.featured-label {
@ -256,7 +257,7 @@
}
.opened .npc{
background: url('~assets/images/shops/seasonal_shop_opened_npc.png');
background: url('~assets/images/npc/#{$npc_seasonal_flavor}/seasonal_shop_opened_npc.png');
background-repeat: no-repeat;
}
}

View file

@ -88,6 +88,7 @@
<style lang="scss">
@import '~client/assets/scss/colors.scss';
@import '~client/assets/scss/variables.scss';
.badge-svg {
left: calc((100% - 18px) / 2);
@ -173,7 +174,7 @@
height: 216px;
.background {
background: url('~assets/images/shops/shop_background.png');
background: url('~assets/images/npc/#{$npc_timetravelers_flavor}/time_travelers_background.png');
background-repeat: repeat-x;
@ -201,11 +202,11 @@
top: 0;
width: 100%;
height: 216px;
background: url('~assets/images/shops/time_travelers_open_banner.png');
background: url('~assets/images/npc/#{$npc_timetravelers_flavor}/time_travelers_open_banner.png');
background-repeat: no-repeat;
&.closed {
background: url('~assets/images/shops/time_travelers_closed_banner.png');
background: url('~assets/images/npc/normal/time_travelers_closed_banner.png');
background-repeat: no-repeat;
}

View file

@ -22,7 +22,7 @@ module.exports = {
},
availableSpells: [
'spookySparkles',
// 'spookySparkles',
],
availableQuests: [