End Winter Wonderland (#8466)

* chore(event): end Winter Wonderland

* fix(test): update constant
This commit is contained in:
Sabe Jones
2017-02-02 09:08:51 -06:00
committed by GitHub
parent 248b64a43f
commit 8d148b4d69
18 changed files with 30 additions and 45 deletions

View File

@@ -11,7 +11,7 @@ import {
} from '../../helpers/common.helper'; } from '../../helpers/common.helper';
describe('shared.ops.purchase', () => { describe('shared.ops.purchase', () => {
const SEASONAL_FOOD = 'Cake_Base'; const SEASONAL_FOOD = 'Meat';
let user; let user;
let goldPoints = 40; let goldPoints = 40;
let gemsBought = 40; let gemsBought = 40;

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.8 KiB

View File

@@ -1,9 +1,9 @@
/* Comment out for holiday events */ /* Comment out for holiday events */
/* .npc_ian { .npc_ian {
background: url("/npc_ian.gif") no-repeat; background: url("/npc_ian.gif") no-repeat;
width: 78px; width: 78px;
height: 135px; height: 135px;
} */ }
.quest_burnout { .quest_burnout {
background: url("/quest_burnout.gif") no-repeat; background: url("/quest_burnout.gif") no-repeat;

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.5 KiB

After

Width:  |  Height:  |  Size: 4.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.0 KiB

After

Width:  |  Height:  |  Size: 3.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.2 KiB

After

Width:  |  Height:  |  Size: 5.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 19 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 8.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.4 KiB

After

Width:  |  Height:  |  Size: 4.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 7.1 KiB

After

Width:  |  Height:  |  Size: 5.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 7.2 KiB

After

Width:  |  Height:  |  Size: 5.8 KiB

View File

@@ -118,7 +118,7 @@ each(premium, (pot, key) => {
premium: true, premium: true,
limited: false, limited: false,
canBuy () { canBuy () {
return pot._season === 'winter'; return false;
}, },
}); });
}); });

View File

@@ -149,12 +149,12 @@ api.specialMounts = stable.specialMounts;
api.mountInfo = stable.mountInfo; api.mountInfo = stable.mountInfo;
// For seasonal events, change these booleans: // For seasonal events, change these booleans:
let canBuyNormalFood = false; let canBuyNormalFood = true;
let canDropNormalFood = false; let canDropNormalFood = true;
let canBuyCandyFood = false; let canBuyCandyFood = false;
let canDropCandyFood = false; let canDropCandyFood = false;
let canBuyCakeFood = true; let canBuyCakeFood = false;
let canDropCakeFood = true; let canDropCakeFood = false;
api.food = { api.food = {
Meat: { Meat: {

View File

@@ -218,27 +218,12 @@ shops.getTimeTravelersCategories = function getTimeTravelersCategories (user, la
// }; // };
shops.getSeasonalShopCategories = function getSeasonalShopCategories (user, language) { shops.getSeasonalShopCategories = function getSeasonalShopCategories (user, language) {
const AVAILABLE_SETS = { const AVAILABLE_SETS = {
yeti: i18n.t('yetiSet', language),
ski: i18n.t('skiSet', language),
candycane: i18n.t('candycaneSet', language),
snowflake: i18n.t('snowflakeSet', language),
winter2015Healer: i18n.t('soothingSkaterSet', language),
winter2015Mage: i18n.t('northMageSet', language),
winter2015Rogue: i18n.t('icicleDrakeSet', language),
winter2015Warrior: i18n.t('gingerbreadSet', language),
winter2016Healer: i18n.t('festiveFairySet', language),
winter2016Mage: i18n.t('snowboardingSet', language),
winter2016Rogue: i18n.t('cocoaSet', language),
winter2016Warrior: i18n.t('snowDaySet', language),
}; };
const AVAILABLE_SPELLS = [ const AVAILABLE_SPELLS = [
'snowball',
]; ];
const AVAILABLE_QUESTS = [ const AVAILABLE_QUESTS = [
'evilsanta',
'evilsanta2',
]; ];
let categories = []; let categories = [];

View File

@@ -107,8 +107,8 @@ api.getSeasonalShopItems = {
let resObject = { let resObject = {
identifier: 'seasonalShop', identifier: 'seasonalShop',
text: res.t('seasonalShop'), text: res.t('seasonalShop'),
notes: res.t('seasonalShopWinterText'), notes: res.t('seasonalShopClosedText'),
imageName: 'seasonalshop_open', imageName: 'seasonalshop_closed',
categories: shops.getSeasonalShopCategories(user, req.language), categories: shops.getSeasonalShopCategories(user, req.language),
}; };

View File

@@ -1,12 +1,12 @@
.container-fluid .container-fluid
.stable.row: .col-xs-12 .stable.row: .col-xs-12
div(class="#{env.worldDmg.seasonalShop ? 'seasonalshop_broken' : 'seasonalshop_open'}").pull-left-sm.col-centered div(class="#{env.worldDmg.seasonalShop ? 'seasonalshop_broken' : 'seasonalshop_closed'}").pull-left-sm.col-centered
.popover.static-popover.fade.right.in.pull-left-sm.col-centered .popover.static-popover.fade.right.in.pull-left-sm.col-centered
.arrow.hidden-xs .arrow.hidden-xs
h3.popover-title!=env.t('seasonalShopTitle', {linkStart:"<a href='http://blog.habitrpg.com/who' target='_blank'>", linkEnd: "</a>"}) h3.popover-title!=env.t('seasonalShopClosedTitle', {linkStart:"<a href='http://blog.habitrpg.com/who' target='_blank'>", linkEnd: "</a>"})
.popover-content .popover-content
p(ng-if='!env.worldDmg.seasonalShop')!=env.t('seasonalShopWinterText') p(ng-if='!env.worldDmg.seasonalShop')!=env.t('seasonalShopClosedText')
p(ng-if='env.worldDmg.seasonalShop')!=env.t('seasonalShopWinterText') p(ng-if='env.worldDmg.seasonalShop')!=env.t('seasonalShopClosedText')
li.customize-menu.inventory-gear li.customize-menu.inventory-gear
menu.pets-menu(label='{{category.text}}', ng-repeat='category in seasonalShopCategories') menu.pets-menu(label='{{category.text}}', ng-repeat='category in seasonalShopCategories')

View File

@@ -9,57 +9,57 @@ script(type='text/ng-template', id='modals/chooseClass.html')
figure.herobox(ng-class='{"selected-class": selectedClass=="warrior"}') figure.herobox(ng-class='{"selected-class": selectedClass=="warrior"}')
.character-sprites .character-sprites
span(class='skin_{{user.preferences.skin}}') span(class='skin_{{user.preferences.skin}}')
span(class='{{user.preferences.size}}_armor_special_winter2017Warrior') span(class='{{user.preferences.size}}_armor_warrior_5')
span(class='head_0') span(class='head_0')
span(class='hair_base_{{user.preferences.hair.base}}_{{user.preferences.hair.color}}') span(class='hair_base_{{user.preferences.hair.base}}_{{user.preferences.hair.color}}')
span(class='hair_bangs_{{user.preferences.hair.bangs}}_{{user.preferences.hair.color}}') span(class='hair_bangs_{{user.preferences.hair.bangs}}_{{user.preferences.hair.color}}')
span(class='hair_beard_{{user.preferences.hair.beard}}_{{user.preferences.hair.color}}') span(class='hair_beard_{{user.preferences.hair.beard}}_{{user.preferences.hair.color}}')
span(class='hair_mustache_{{user.preferences.hair.mustache}}_{{user.preferences.hair.color}}') span(class='hair_mustache_{{user.preferences.hair.mustache}}_{{user.preferences.hair.color}}')
span(class='head_special_winter2017Warrior') span(class='head_warrior_5')
span(class='shield_special_winter2017Warrior') span(class='shield_warrior_5')
span(class='weapon_special_winter2017Warrior') span(class='weapon_warrior_6')
.col-md-3(ng-click='selectedClass = "wizard"') .col-md-3(ng-click='selectedClass = "wizard"')
h5!=env.t('mageWiki') h5!=env.t('mageWiki')
figure.herobox(ng-class='{"selected-class": selectedClass=="wizard"}') figure.herobox(ng-class='{"selected-class": selectedClass=="wizard"}')
.character-sprites .character-sprites
span(class='skin_{{user.preferences.skin}}') span(class='skin_{{user.preferences.skin}}')
span(class='{{user.preferences.size}}_armor_special_winter2017Mage') span(class='{{user.preferences.size}}_armor_wizard_5')
span(class='head_0') span(class='head_0')
span(class='hair_base_{{user.preferences.hair.base}}_{{user.preferences.hair.color}}') span(class='hair_base_{{user.preferences.hair.base}}_{{user.preferences.hair.color}}')
span(class='hair_bangs_{{user.preferences.hair.bangs}}_{{user.preferences.hair.color}}') span(class='hair_bangs_{{user.preferences.hair.bangs}}_{{user.preferences.hair.color}}')
span(class='hair_beard_{{user.preferences.hair.beard}}_{{user.preferences.hair.color}}') span(class='hair_beard_{{user.preferences.hair.beard}}_{{user.preferences.hair.color}}')
span(class='hair_mustache_{{user.preferences.hair.mustache}}_{{user.preferences.hair.color}}') span(class='hair_mustache_{{user.preferences.hair.mustache}}_{{user.preferences.hair.color}}')
span(class='head_special_winter2017Mage') span(class='head_wizard_5')
span(class='shield_special_winter2017Mage') span(class='shield_wizard_5')
span(class='weapon_special_winter2017Mage') span(class='weapon_wizard_6')
.col-md-3(ng-click='selectedClass = "rogue"') .col-md-3(ng-click='selectedClass = "rogue"')
h5!=env.t('rogueWiki') h5!=env.t('rogueWiki')
figure.herobox(ng-class='{"selected-class": selectedClass=="rogue"}') figure.herobox(ng-class='{"selected-class": selectedClass=="rogue"}')
.character-sprites .character-sprites
span(class='skin_{{user.preferences.skin}}') span(class='skin_{{user.preferences.skin}}')
span(class='{{user.preferences.size}}_armor_special_winter2017Rogue') span(class='{{user.preferences.size}}_armor_rogue_5')
span(class='head_0') span(class='head_0')
span(class='hair_base_{{user.preferences.hair.base}}_{{user.preferences.hair.color}}') span(class='hair_base_{{user.preferences.hair.base}}_{{user.preferences.hair.color}}')
span(class='hair_bangs_{{user.preferences.hair.bangs}}_{{user.preferences.hair.color}}') span(class='hair_bangs_{{user.preferences.hair.bangs}}_{{user.preferences.hair.color}}')
span(class='hair_beard_{{user.preferences.hair.beard}}_{{user.preferences.hair.color}}') span(class='hair_beard_{{user.preferences.hair.beard}}_{{user.preferences.hair.color}}')
span(class='hair_mustache_{{user.preferences.hair.mustache}}_{{user.preferences.hair.color}}') span(class='hair_mustache_{{user.preferences.hair.mustache}}_{{user.preferences.hair.color}}')
span(class='head_special_winter2017Rogue') span(class='head_rogue_5')
span(class='shield_special_winter2017Rogue') span(class='shield_rogue_6')
span(class='weapon_special_winter2017Rogue') span(class='weapon_rogue_6')
.col-md-3(ng-click='selectedClass = "healer"') .col-md-3(ng-click='selectedClass = "healer"')
h5!=env.t('healerWiki') h5!=env.t('healerWiki')
figure.herobox(ng-class='{"selected-class": selectedClass=="healer"}') figure.herobox(ng-class='{"selected-class": selectedClass=="healer"}')
.character-sprites .character-sprites
span(class='skin_{{user.preferences.skin}}') span(class='skin_{{user.preferences.skin}}')
span(class='{{user.preferences.size}}_armor_special_winter2017Healer') span(class='{{user.preferences.size}}_armor_healer_5')
span(class='head_0') span(class='head_0')
span(class='hair_base_{{user.preferences.hair.base}}_{{user.preferences.hair.color}}') span(class='hair_base_{{user.preferences.hair.base}}_{{user.preferences.hair.color}}')
span(class='hair_bangs_{{user.preferences.hair.bangs}}_{{user.preferences.hair.color}}') span(class='hair_bangs_{{user.preferences.hair.bangs}}_{{user.preferences.hair.color}}')
span(class='hair_beard_{{user.preferences.hair.beard}}_{{user.preferences.hair.color}}') span(class='hair_beard_{{user.preferences.hair.beard}}_{{user.preferences.hair.color}}')
span(class='hair_mustache_{{user.preferences.hair.mustache}}_{{user.preferences.hair.color}}') span(class='hair_mustache_{{user.preferences.hair.mustache}}_{{user.preferences.hair.color}}')
span(class='head_special_winter2017Healer') span(class='head_healer_5')
span(class='shield_special_winter2017Healer') span(class='shield_healer_5')
span(class='weapon_special_winter2017Healer') span(class='weapon_healer_6')
br br
.well(ng-show='selectedClass=="warrior"')=env.t('warriorText') .well(ng-show='selectedClass=="warrior"')=env.t('warriorText')
.well(ng-show='selectedClass=="wizard"')=env.t('mageText') .well(ng-show='selectedClass=="wizard"')=env.t('mageText')