chore(grunt): grunt full

This commit is contained in:
Sabe Jones 2014-12-25 17:43:31 -06:00
parent 9471393776
commit 9d279b7a77
14 changed files with 2151 additions and 2082 deletions

File diff suppressed because one or more lines are too long

View file

@ -9911,6 +9911,11 @@ api.mystery = {
end: '2014-12-02',
text: 'Feast and Fun Set'
},
201412: {
start: '2014-12-25',
end: '2015-01-02',
text: 'Penguin Set'
},
301404: {
start: '3014-03-24',
end: '3014-04-02',
@ -10966,6 +10971,12 @@ gear = {
mystery: '201410',
value: 0
},
201411: {
text: t('armorMystery201412Text'),
notes: t('armorMystery201412Notes'),
mystery: '201412',
value: 0
},
301404: {
text: t('armorMystery301404Text'),
notes: t('armorMystery301404Notes'),
@ -11445,6 +11456,12 @@ gear = {
mystery: '201411',
value: 0
},
201412: {
text: t('headMystery201412Text'),
notes: t('headMystery201412Notes'),
mystery: '201412',
value: 0
},
301404: {
text: t('headMystery301404Text'),
notes: t('headMystery301404Notes'),
@ -15257,7 +15274,7 @@ api.wrap = function(user, main) {
return typeof cb === "function" ? cb(null, _.pick(user, $w('items stats'))) : void 0;
},
purchase: function(req, cb, ga) {
var convCap, convRate, item, key, type, _ref, _ref1, _ref2, _ref3;
var convCap, convRate, item, key, price, type, _ref, _ref1, _ref2, _ref3;
_ref = req.params, type = _ref.type, key = _ref.key;
if (type === 'gems' && key === 'gem') {
_ref1 = api.planGemLimits, convRate = _ref1.convRate, convCap = _ref1.convCap;
@ -15288,30 +15305,46 @@ api.wrap = function(user, main) {
message: "+1 Gems"
}, _.pick(user, $w('stats balance'))) : void 0;
}
if (type !== 'eggs' && type !== 'hatchingPotions' && type !== 'food' && type !== 'quests' && type !== 'special') {
if (type !== 'eggs' && type !== 'hatchingPotions' && type !== 'food' && type !== 'quests' && type !== 'gear') {
return typeof cb === "function" ? cb({
code: 404,
message: ":type must be in [hatchingPotions,eggs,food,quests,special]"
message: ":type must be in [eggs,hatchingPotions,food,quests,gear]"
}, req) : void 0;
}
item = content[type][key];
if (type === 'gear') {
item = content.gear.flat[key];
if (user.items.gear.owned[key]) {
return typeof cb === "function" ? cb({
code: 401,
message: i18n.t('alreadyHave', req.language)
}) : void 0;
}
price = (item.twoHanded ? 2 : 1) / 4;
} else {
item = content[type][key];
price = item.value / 4;
}
if (!item) {
return typeof cb === "function" ? cb({
code: 404,
message: ":key not found for Content." + type
}, req) : void 0;
}
if (user.balance < (item.value / 4)) {
if (user.balance < price) {
return typeof cb === "function" ? cb({
code: 401,
message: i18n.t('notEnoughGems', req.language)
}) : void 0;
}
if (!(user.items[type][key] > 0)) {
user.items[type][key] = 0;
user.balance -= price;
if (type === 'gear') {
user.items.gear.owned[key] = true;
} else {
if (!(user.items[type][key] > 0)) {
user.items[type][key] = 0;
}
user.items[type][key]++;
}
user.items[type][key]++;
user.balance -= item.value / 4;
if (typeof cb === "function") {
cb(null, _.pick(user, $w('items balance')));
}

126
dist/spritesmith0.css vendored
View file

@ -1644,25 +1644,25 @@
}
.hair_mustache_1_holly {
background-image: url(spritesmith0.png);
background-position: -706px -296px;
background-position: -1303px -728px;
width: 90px;
height: 90px;
}
.customize-option.hair_mustache_1_holly {
background-image: url(spritesmith0.png);
background-position: -731px -311px;
background-position: -1328px -743px;
width: 60px;
height: 60px;
}
.hair_mustache_1_hollygreen {
background-image: url(spritesmith0.png);
background-position: -1303px -819px;
background-position: -706px -296px;
width: 90px;
height: 90px;
}
.customize-option.hair_mustache_1_hollygreen {
background-image: url(spritesmith0.png);
background-position: -1328px -834px;
background-position: -731px -311px;
width: 60px;
height: 60px;
}
@ -3264,323 +3264,335 @@
}
.hair_bangs_3_ghostwhite {
background-image: url(spritesmith0.png);
background-position: -1303px -728px;
background-position: -182px -1593px;
width: 90px;
height: 90px;
}
.customize-option.hair_bangs_3_ghostwhite {
background-image: url(spritesmith0.png);
background-position: -1328px -743px;
background-position: -207px -1608px;
width: 60px;
height: 60px;
}
.hair_bangs_3_green {
background-image: url(spritesmith0.png);
background-position: -91px -592px;
background-position: -1303px -819px;
width: 90px;
height: 90px;
}
.customize-option.hair_bangs_3_green {
background-image: url(spritesmith0.png);
background-position: -116px -607px;
background-position: -1328px -834px;
width: 60px;
height: 60px;
}
.hair_bangs_3_halloween {
background-image: url(spritesmith0.png);
background-position: 0px -592px;
background-position: -91px -592px;
width: 90px;
height: 90px;
}
.customize-option.hair_bangs_3_halloween {
background-image: url(spritesmith0.png);
background-position: -25px -607px;
background-position: -116px -607px;
width: 60px;
height: 60px;
}
.hair_bangs_3_holly {
background-image: url(spritesmith0.png);
background-position: -565px -444px;
background-position: 0px -592px;
width: 90px;
height: 90px;
}
.customize-option.hair_bangs_3_holly {
background-image: url(spritesmith0.png);
background-position: -590px -459px;
background-position: -25px -607px;
width: 60px;
height: 60px;
}
.hair_bangs_3_hollygreen {
background-image: url(spritesmith0.png);
background-position: -706px -478px;
background-position: -565px -444px;
width: 90px;
height: 90px;
}
.customize-option.hair_bangs_3_hollygreen {
background-image: url(spritesmith0.png);
background-position: -731px -493px;
background-position: -590px -459px;
width: 60px;
height: 60px;
}
.hair_bangs_3_midnight {
background-image: url(spritesmith0.png);
background-position: -706px -387px;
background-position: -706px -478px;
width: 90px;
height: 90px;
}
.customize-option.hair_bangs_3_midnight {
background-image: url(spritesmith0.png);
background-position: -731px -402px;
background-position: -731px -493px;
width: 60px;
height: 60px;
}
.hair_bangs_3_pblue {
background-image: url(spritesmith0.png);
background-position: -848px -364px;
background-position: -706px -387px;
width: 90px;
height: 90px;
}
.customize-option.hair_bangs_3_pblue {
background-image: url(spritesmith0.png);
background-position: -873px -379px;
background-position: -731px -402px;
width: 60px;
height: 60px;
}
.hair_bangs_3_peppermint {
background-image: url(spritesmith0.png);
background-position: -848px -273px;
background-position: -848px -364px;
width: 90px;
height: 90px;
}
.customize-option.hair_bangs_3_peppermint {
background-image: url(spritesmith0.png);
background-position: -873px -288px;
background-position: -873px -379px;
width: 60px;
height: 60px;
}
.hair_bangs_3_pgreen {
background-image: url(spritesmith0.png);
background-position: -848px -182px;
background-position: -848px -273px;
width: 90px;
height: 90px;
}
.customize-option.hair_bangs_3_pgreen {
background-image: url(spritesmith0.png);
background-position: -873px -197px;
background-position: -873px -288px;
width: 60px;
height: 60px;
}
.hair_bangs_3_porange {
background-image: url(spritesmith0.png);
background-position: -848px -91px;
background-position: -848px -182px;
width: 90px;
height: 90px;
}
.customize-option.hair_bangs_3_porange {
background-image: url(spritesmith0.png);
background-position: -873px -106px;
background-position: -873px -197px;
width: 60px;
height: 60px;
}
.hair_bangs_3_ppink {
background-image: url(spritesmith0.png);
background-position: -848px 0px;
background-position: -848px -91px;
width: 90px;
height: 90px;
}
.customize-option.hair_bangs_3_ppink {
background-image: url(spritesmith0.png);
background-position: -873px -15px;
background-position: -873px -106px;
width: 60px;
height: 60px;
}
.hair_bangs_3_ppurple {
background-image: url(spritesmith0.png);
background-position: -728px -683px;
background-position: -848px 0px;
width: 90px;
height: 90px;
}
.customize-option.hair_bangs_3_ppurple {
background-image: url(spritesmith0.png);
background-position: -753px -698px;
background-position: -873px -15px;
width: 60px;
height: 60px;
}
.hair_bangs_3_pumpkin {
background-image: url(spritesmith0.png);
background-position: -637px -683px;
background-position: -728px -683px;
width: 90px;
height: 90px;
}
.customize-option.hair_bangs_3_pumpkin {
background-image: url(spritesmith0.png);
background-position: -662px -698px;
background-position: -753px -698px;
width: 60px;
height: 60px;
}
.hair_bangs_3_purple {
background-image: url(spritesmith0.png);
background-position: -546px -683px;
background-position: -637px -683px;
width: 90px;
height: 90px;
}
.customize-option.hair_bangs_3_purple {
background-image: url(spritesmith0.png);
background-position: -571px -698px;
background-position: -662px -698px;
width: 60px;
height: 60px;
}
.hair_bangs_3_pyellow {
background-image: url(spritesmith0.png);
background-position: -455px -683px;
background-position: -546px -683px;
width: 90px;
height: 90px;
}
.customize-option.hair_bangs_3_pyellow {
background-image: url(spritesmith0.png);
background-position: -480px -698px;
background-position: -571px -698px;
width: 60px;
height: 60px;
}
.hair_bangs_3_rainbow {
background-image: url(spritesmith0.png);
background-position: -364px -683px;
background-position: -455px -683px;
width: 90px;
height: 90px;
}
.customize-option.hair_bangs_3_rainbow {
background-image: url(spritesmith0.png);
background-position: -389px -698px;
background-position: -480px -698px;
width: 60px;
height: 60px;
}
.hair_bangs_3_red {
background-image: url(spritesmith0.png);
background-position: -273px -683px;
background-position: -364px -683px;
width: 90px;
height: 90px;
}
.customize-option.hair_bangs_3_red {
background-image: url(spritesmith0.png);
background-position: -298px -698px;
background-position: -389px -698px;
width: 60px;
height: 60px;
}
.hair_bangs_3_snowy {
background-image: url(spritesmith0.png);
background-position: -182px -683px;
background-position: -273px -683px;
width: 90px;
height: 90px;
}
.customize-option.hair_bangs_3_snowy {
background-image: url(spritesmith0.png);
background-position: -207px -698px;
background-position: -298px -698px;
width: 60px;
height: 60px;
}
.hair_bangs_3_white {
background-image: url(spritesmith0.png);
background-position: -91px -683px;
background-position: -182px -683px;
width: 90px;
height: 90px;
}
.customize-option.hair_bangs_3_white {
background-image: url(spritesmith0.png);
background-position: -116px -698px;
background-position: -207px -698px;
width: 60px;
height: 60px;
}
.hair_bangs_3_winternight {
background-image: url(spritesmith0.png);
background-position: 0px -683px;
background-position: -91px -683px;
width: 90px;
height: 90px;
}
.customize-option.hair_bangs_3_winternight {
background-image: url(spritesmith0.png);
background-position: -25px -698px;
background-position: -116px -698px;
width: 60px;
height: 60px;
}
.hair_bangs_3_winterstar {
background-image: url(spritesmith0.png);
background-position: -728px -592px;
background-position: 0px -683px;
width: 90px;
height: 90px;
}
.customize-option.hair_bangs_3_winterstar {
background-image: url(spritesmith0.png);
background-position: -753px -607px;
background-position: -25px -698px;
width: 60px;
height: 60px;
}
.hair_bangs_3_yellow {
background-image: url(spritesmith0.png);
background-position: -637px -592px;
background-position: -728px -592px;
width: 90px;
height: 90px;
}
.customize-option.hair_bangs_3_yellow {
background-image: url(spritesmith0.png);
background-position: -662px -607px;
background-position: -753px -607px;
width: 60px;
height: 60px;
}
.hair_bangs_3_zombie {
background-image: url(spritesmith0.png);
background-position: -546px -592px;
background-position: -637px -592px;
width: 90px;
height: 90px;
}
.customize-option.hair_bangs_3_zombie {
background-image: url(spritesmith0.png);
background-position: -571px -607px;
background-position: -662px -607px;
width: 60px;
height: 60px;
}
.hair_base_1_TRUred {
background-image: url(spritesmith0.png);
background-position: -455px -592px;
background-position: -546px -592px;
width: 90px;
height: 90px;
}
.customize-option.hair_base_1_TRUred {
background-image: url(spritesmith0.png);
background-position: -480px -607px;
background-position: -571px -607px;
width: 60px;
height: 60px;
}
.hair_base_1_aurora {
background-image: url(spritesmith0.png);
background-position: -364px -592px;
background-position: -455px -592px;
width: 90px;
height: 90px;
}
.customize-option.hair_base_1_aurora {
background-image: url(spritesmith0.png);
background-position: -389px -607px;
background-position: -480px -607px;
width: 60px;
height: 60px;
}
.hair_base_1_black {
background-image: url(spritesmith0.png);
background-position: -273px -592px;
background-position: -364px -592px;
width: 90px;
height: 90px;
}
.customize-option.hair_base_1_black {
background-image: url(spritesmith0.png);
background-position: -298px -607px;
background-position: -389px -607px;
width: 60px;
height: 60px;
}
.hair_base_1_blond {
background-image: url(spritesmith0.png);
background-position: -182px -592px;
background-position: -273px -592px;
width: 90px;
height: 90px;
}
.customize-option.hair_base_1_blond {
background-image: url(spritesmith0.png);
background-position: -298px -607px;
width: 60px;
height: 60px;
}
.hair_base_1_blue {
background-image: url(spritesmith0.png);
background-position: -182px -592px;
width: 90px;
height: 90px;
}
.customize-option.hair_base_1_blue {
background-image: url(spritesmith0.png);
background-position: -207px -607px;
width: 60px;

BIN
dist/spritesmith0.png vendored

Binary file not shown.

Before

Width:  |  Height:  |  Size: 186 KiB

After

Width:  |  Height:  |  Size: 187 KiB

1326
dist/spritesmith1.css vendored

File diff suppressed because it is too large Load diff

BIN
dist/spritesmith1.png vendored

Binary file not shown.

Before

Width:  |  Height:  |  Size: 87 KiB

After

Width:  |  Height:  |  Size: 90 KiB

750
dist/spritesmith2.css vendored

File diff suppressed because it is too large Load diff

BIN
dist/spritesmith2.png vendored

Binary file not shown.

Before

Width:  |  Height:  |  Size: 172 KiB

After

Width:  |  Height:  |  Size: 169 KiB

664
dist/spritesmith3.css vendored

File diff suppressed because it is too large Load diff

BIN
dist/spritesmith3.png vendored

Binary file not shown.

Before

Width:  |  Height:  |  Size: 365 KiB

After

Width:  |  Height:  |  Size: 361 KiB

660
dist/spritesmith4.css vendored

File diff suppressed because it is too large Load diff

BIN
dist/spritesmith4.png vendored

Binary file not shown.

Before

Width:  |  Height:  |  Size: 286 KiB

After

Width:  |  Height:  |  Size: 287 KiB

654
dist/spritesmith5.css vendored

File diff suppressed because it is too large Load diff

BIN
dist/spritesmith5.png vendored

Binary file not shown.

Before

Width:  |  Height:  |  Size: 238 KiB

After

Width:  |  Height:  |  Size: 239 KiB