sudoxreboot/habitica
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica.git synced 2026-07-12 15:05:30 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #5288 from SabreCat/develop

Browse source 
May Mystery Items
This commit is contained in:
Sabe Jones 2015-05-25 19:21:07 -07:00
commit 844c1ed178
24 changed files with 3025 additions and 2981 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
common/dist/sprites/habitrpg-shared.css vendored
View file

File diff suppressed because one or more lines are too long

150
common/dist/sprites/spritesmith0.css vendored
View file

@ -1854,25 +1854,25 @@
}
.hair_mustache_1_ppurple {
background-image: url(spritesmith0.png);
background-position: -848px -592px;
background-position: -1444px -910px;
width: 90px;
height: 90px;
}
.customize-option.hair_mustache_1_ppurple {
background-image: url(spritesmith0.png);
background-position: -873px -607px;
background-position: -1469px -925px;
width: 60px;
height: 60px;
}
.hair_mustache_1_pumpkin {
background-image: url(spritesmith0.png);
background-position: -1444px -1001px;
background-position: -848px -592px;
width: 90px;
height: 90px;
}
.customize-option.hair_mustache_1_pumpkin {
background-image: url(spritesmith0.png);
background-position: -1469px -1016px;
background-position: -873px -607px;
width: 60px;
height: 60px;
}
@ -3738,395 +3738,407 @@
}
.hair_bangs_3_purple {
background-image: url(spritesmith0.png);
background-position: -1444px -910px;
background-position: -1092px -1798px;
width: 90px;
height: 90px;
}
.customize-option.hair_bangs_3_purple {
background-image: url(spritesmith0.png);
background-position: -1469px -925px;
background-position: -1117px -1813px;
width: 60px;
height: 60px;
}
.hair_bangs_3_pyellow {
background-image: url(spritesmith0.png);
background-position: 0px -979px;
background-position: -1444px -1001px;
width: 90px;
height: 90px;
}
.customize-option.hair_bangs_3_pyellow {
background-image: url(spritesmith0.png);
background-position: -25px -994px;
background-position: -1469px -1016px;
width: 60px;
height: 60px;
}
.hair_bangs_3_pyellow2 {
background-image: url(spritesmith0.png);
background-position: -989px -819px;
background-position: 0px -979px;
width: 90px;
height: 90px;
}
.customize-option.hair_bangs_3_pyellow2 {
background-image: url(spritesmith0.png);
background-position: -1014px -834px;
background-position: -25px -994px;
width: 60px;
height: 60px;
}
.hair_bangs_3_rainbow {
background-image: url(spritesmith0.png);
background-position: -989px -728px;
background-position: -989px -819px;
width: 90px;
height: 90px;
}
.customize-option.hair_bangs_3_rainbow {
background-image: url(spritesmith0.png);
background-position: -1014px -743px;
background-position: -1014px -834px;
width: 60px;
height: 60px;
}
.hair_bangs_3_red {
background-image: url(spritesmith0.png);
background-position: -989px -637px;
background-position: -989px -728px;
width: 90px;
height: 90px;
}
.customize-option.hair_bangs_3_red {
background-image: url(spritesmith0.png);
background-position: -1014px -652px;
background-position: -1014px -743px;
width: 60px;
height: 60px;
}
.hair_bangs_3_snowy {
background-image: url(spritesmith0.png);
background-position: -989px -546px;
background-position: -989px -637px;
width: 90px;
height: 90px;
}
.customize-option.hair_bangs_3_snowy {
background-image: url(spritesmith0.png);
background-position: -1014px -561px;
background-position: -1014px -652px;
width: 60px;
height: 60px;
}
.hair_bangs_3_white {
background-image: url(spritesmith0.png);
background-position: -989px -455px;
background-position: -989px -546px;
width: 90px;
height: 90px;
}
.customize-option.hair_bangs_3_white {
background-image: url(spritesmith0.png);
background-position: -1014px -470px;
background-position: -1014px -561px;
width: 60px;
height: 60px;
}
.hair_bangs_3_winternight {
background-image: url(spritesmith0.png);
background-position: -989px -364px;
background-position: -989px -455px;
width: 90px;
height: 90px;
}
.customize-option.hair_bangs_3_winternight {
background-image: url(spritesmith0.png);
background-position: -1014px -379px;
background-position: -1014px -470px;
width: 60px;
height: 60px;
}
.hair_bangs_3_winterstar {
background-image: url(spritesmith0.png);
background-position: -989px -273px;
background-position: -989px -364px;
width: 90px;
height: 90px;
}
.customize-option.hair_bangs_3_winterstar {
background-image: url(spritesmith0.png);
background-position: -1014px -288px;
background-position: -1014px -379px;
width: 60px;
height: 60px;
}
.hair_bangs_3_yellow {
background-image: url(spritesmith0.png);
background-position: -989px -182px;
background-position: -989px -273px;
width: 90px;
height: 90px;
}
.customize-option.hair_bangs_3_yellow {
background-image: url(spritesmith0.png);
background-position: -1014px -197px;
background-position: -1014px -288px;
width: 60px;
height: 60px;
}
.hair_bangs_3_zombie {
background-image: url(spritesmith0.png);
background-position: -989px -91px;
background-position: -989px -182px;
width: 90px;
height: 90px;
}
.customize-option.hair_bangs_3_zombie {
background-image: url(spritesmith0.png);
background-position: -1014px -106px;
background-position: -1014px -197px;
width: 60px;
height: 60px;
}
.hair_base_10_TRUred {
background-image: url(spritesmith0.png);
background-position: -989px 0px;
background-position: -989px -91px;
width: 90px;
height: 90px;
}
.customize-option.hair_base_10_TRUred {
background-image: url(spritesmith0.png);
background-position: -1014px -15px;
background-position: -1014px -106px;
width: 60px;
height: 60px;
}
.hair_base_10_aurora {
background-image: url(spritesmith0.png);
background-position: -819px -888px;
background-position: -989px 0px;
width: 90px;
height: 90px;
}
.customize-option.hair_base_10_aurora {
background-image: url(spritesmith0.png);
background-position: -844px -903px;
background-position: -1014px -15px;
width: 60px;
height: 60px;
}
.hair_base_10_black {
background-image: url(spritesmith0.png);
background-position: -728px -888px;
background-position: -819px -888px;
width: 90px;
height: 90px;
}
.customize-option.hair_base_10_black {
background-image: url(spritesmith0.png);
background-position: -753px -903px;
background-position: -844px -903px;
width: 60px;
height: 60px;
}
.hair_base_10_blond {
background-image: url(spritesmith0.png);
background-position: -637px -888px;
background-position: -728px -888px;
width: 90px;
height: 90px;
}
.customize-option.hair_base_10_blond {
background-image: url(spritesmith0.png);
background-position: -662px -903px;
background-position: -753px -903px;
width: 60px;
height: 60px;
}
.hair_base_10_blue {
background-image: url(spritesmith0.png);
background-position: -546px -888px;
background-position: -637px -888px;
width: 90px;
height: 90px;
}
.customize-option.hair_base_10_blue {
background-image: url(spritesmith0.png);
background-position: -571px -903px;
background-position: -662px -903px;
width: 60px;
height: 60px;
}
.hair_base_10_brown {
background-image: url(spritesmith0.png);
background-position: -455px -888px;
background-position: -546px -888px;
width: 90px;
height: 90px;
}
.customize-option.hair_base_10_brown {
background-image: url(spritesmith0.png);
background-position: -480px -903px;
background-position: -571px -903px;
width: 60px;
height: 60px;
}
.hair_base_10_candycane {
background-image: url(spritesmith0.png);
background-position: -364px -888px;
background-position: -455px -888px;
width: 90px;
height: 90px;
}
.customize-option.hair_base_10_candycane {
background-image: url(spritesmith0.png);
background-position: -389px -903px;
background-position: -480px -903px;
width: 60px;
height: 60px;
}
.hair_base_10_candycorn {
background-image: url(spritesmith0.png);
background-position: -273px -888px;
background-position: -364px -888px;
width: 90px;
height: 90px;
}
.customize-option.hair_base_10_candycorn {
background-image: url(spritesmith0.png);
background-position: -298px -903px;
background-position: -389px -903px;
width: 60px;
height: 60px;
}
.hair_base_10_festive {
background-image: url(spritesmith0.png);
background-position: -182px -888px;
background-position: -273px -888px;
width: 90px;
height: 90px;
}
.customize-option.hair_base_10_festive {
background-image: url(spritesmith0.png);
background-position: -207px -903px;
background-position: -298px -903px;
width: 60px;
height: 60px;
}
.hair_base_10_frost {
background-image: url(spritesmith0.png);
background-position: -91px -888px;
background-position: -182px -888px;
width: 90px;
height: 90px;
}
.customize-option.hair_base_10_frost {
background-image: url(spritesmith0.png);
background-position: -116px -903px;
background-position: -207px -903px;
width: 60px;
height: 60px;
}
.hair_base_10_ghostwhite {
background-image: url(spritesmith0.png);
background-position: 0px -888px;
background-position: -91px -888px;
width: 90px;
height: 90px;
}
.customize-option.hair_base_10_ghostwhite {
background-image: url(spritesmith0.png);
background-position: -25px -903px;
background-position: -116px -903px;
width: 60px;
height: 60px;
}
.hair_base_10_green {
background-image: url(spritesmith0.png);
background-position: -830px -740px;
background-position: 0px -888px;
width: 90px;
height: 90px;
}
.customize-option.hair_base_10_green {
background-image: url(spritesmith0.png);
background-position: -855px -755px;
background-position: -25px -903px;
width: 60px;
height: 60px;
}
.hair_base_10_halloween {
background-image: url(spritesmith0.png);
background-position: -739px -740px;
background-position: -830px -740px;
width: 90px;
height: 90px;
}
.customize-option.hair_base_10_halloween {
background-image: url(spritesmith0.png);
background-position: -764px -755px;
background-position: -855px -755px;
width: 60px;
height: 60px;
}
.hair_base_10_holly {
background-image: url(spritesmith0.png);
background-position: -648px -740px;
background-position: -739px -740px;
width: 90px;
height: 90px;
}
.customize-option.hair_base_10_holly {
background-image: url(spritesmith0.png);
background-position: -673px -755px;
background-position: -764px -755px;
width: 60px;
height: 60px;
}
.hair_base_10_hollygreen {
background-image: url(spritesmith0.png);
background-position: -557px -740px;
background-position: -648px -740px;
width: 90px;
height: 90px;
}
.customize-option.hair_base_10_hollygreen {
background-image: url(spritesmith0.png);
background-position: -582px -755px;
background-position: -673px -755px;
width: 60px;
height: 60px;
}
.hair_base_10_midnight {
background-image: url(spritesmith0.png);
background-position: -466px -740px;
background-position: -557px -740px;
width: 90px;
height: 90px;
}
.customize-option.hair_base_10_midnight {
background-image: url(spritesmith0.png);
background-position: -491px -755px;
background-position: -582px -755px;
width: 60px;
height: 60px;
}
.hair_base_10_pblue {
background-image: url(spritesmith0.png);
background-position: -375px -740px;
background-position: -466px -740px;
width: 90px;
height: 90px;
}
.customize-option.hair_base_10_pblue {
background-image: url(spritesmith0.png);
background-position: -400px -755px;
background-position: -491px -755px;
width: 60px;
height: 60px;
}
.hair_base_10_pblue2 {
background-image: url(spritesmith0.png);
background-position: -284px -740px;
background-position: -375px -740px;
width: 90px;
height: 90px;
}
.customize-option.hair_base_10_pblue2 {
background-image: url(spritesmith0.png);
background-position: -309px -755px;
background-position: -400px -755px;
width: 60px;
height: 60px;
}
.hair_base_10_peppermint {
background-image: url(spritesmith0.png);
background-position: -364px -979px;
background-position: -284px -740px;
width: 90px;
height: 90px;
}
.customize-option.hair_base_10_peppermint {
background-image: url(spritesmith0.png);
background-position: -389px -994px;
background-position: -309px -755px;
width: 60px;
height: 60px;
}
.hair_base_10_pgreen {
background-image: url(spritesmith0.png);
background-position: -273px -979px;
background-position: -364px -979px;
width: 90px;
height: 90px;
}
.customize-option.hair_base_10_pgreen {
background-image: url(spritesmith0.png);
background-position: -298px -994px;
background-position: -389px -994px;
width: 60px;
height: 60px;
}
.hair_base_10_pgreen2 {
background-image: url(spritesmith0.png);
background-position: -182px -979px;
background-position: -273px -979px;
width: 90px;
height: 90px;
}
.customize-option.hair_base_10_pgreen2 {
background-image: url(spritesmith0.png);
background-position: -207px -994px;
background-position: -298px -994px;
width: 60px;
height: 60px;
}
.hair_base_10_porange {
background-image: url(spritesmith0.png);
background-position: -91px -979px;
background-position: -182px -979px;
width: 90px;
height: 90px;
}
.customize-option.hair_base_10_porange {
background-image: url(spritesmith0.png);
background-position: -207px -994px;
width: 60px;
height: 60px;
}
.hair_base_10_porange2 {
background-image: url(spritesmith0.png);
background-position: -91px -979px;
width: 90px;
height: 90px;
}
.customize-option.hair_base_10_porange2 {
background-image: url(spritesmith0.png);
background-position: -116px -994px;
width: 60px;

BIN
common/dist/sprites/spritesmith0.png vendored
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 284 KiB

After

Width:  |  Height:  |  Size: 284 KiB

1520
common/dist/sprites/spritesmith1.css vendored
View file

File diff suppressed because it is too large Load diff

BIN
common/dist/sprites/spritesmith1.png vendored
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 75 KiB

After

Width:  |  Height:  |  Size: 75 KiB

1370
common/dist/sprites/spritesmith2.css vendored
View file

File diff suppressed because it is too large Load diff

BIN
common/dist/sprites/spritesmith2.png vendored
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 148 KiB

After

Width:  |  Height:  |  Size: 149 KiB

788
common/dist/sprites/spritesmith3.css vendored
View file

File diff suppressed because it is too large Load diff

BIN
common/dist/sprites/spritesmith3.png vendored
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 147 KiB

After

Width:  |  Height:  |  Size: 149 KiB

612
common/dist/sprites/spritesmith4.css vendored
View file

File diff suppressed because it is too large Load diff

BIN
common/dist/sprites/spritesmith4.png vendored
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 557 KiB

After

Width:  |  Height:  |  Size: 557 KiB

762
common/dist/sprites/spritesmith5.css vendored
View file

File diff suppressed because it is too large Load diff

BIN
common/dist/sprites/spritesmith5.png vendored
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 345 KiB

After

Width:  |  Height:  |  Size: 346 KiB

774
common/dist/sprites/spritesmith6.css vendored
View file

File diff suppressed because it is too large Load diff

BIN
common/dist/sprites/spritesmith6.png vendored
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 289 KiB

After

Width:  |  Height:  |  Size: 290 KiB

BIN
common/img/sprites/spritesmith/gear/events/mystery_201505/head_mystery_201505.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 3.3 KiB

BIN
common/img/sprites/spritesmith/gear/events/mystery_201505/shop_head_mystery_201505.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 3.2 KiB

BIN
common/img/sprites/spritesmith/gear/events/mystery_201505/shop_weapon_mystery_201505.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 3 KiB

BIN
common/img/sprites/spritesmith/gear/events/mystery_201505/weapon_mystery_201505.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 3.1 KiB

BIN
common/img/sprites/spritesmith/promo/promo_mystery_201505.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 3.8 KiB

4
common/locales/en/gear.json
View file

@ -133,6 +133,8 @@
"weaponMystery201411Notes": "Stab your enemies or dig in to your favorite foods - this versatile pitchfork does it all! Confers no benefit. November 2014 Subscriber Item.",
"weaponMystery201502Text": "Shimmery Winged Staff of Love and Also Truth",
"weaponMystery201502Notes": "For WINGS! For LOVE! For ALSO TRUTH! Confers no benefit. February 2015 Subscriber Item.",
"weaponMystery201505Text": "Green Knight Lance",
"weaponMystery201505Notes": "This green and silver lance has unseated many opponents from their mounts. Confers no benefit. May 2015 Subscriber Item.",
"weaponMystery301404Text": "Steampunk Cane",
"weaponMystery301404Notes": "Excellent for taking a turn about town. March 3015 Subscriber Item. Confers no benefit.",
@ -413,6 +415,8 @@
"headMystery201412Notes": "Who's a penguin? Confers no benefit. December 2014 Subscriber Item.",
"headMystery201501Text": "Starry Helm",
"headMystery201501Notes": "The constellations flicker and swirl in this helm, guiding the wearer's thoughts towards focus. Confers no benefit. January 2015 Subscriber Item.",
"headMystery201505Text": "Green Knight Helm",
"headMystery201505Notes": "The green plume on this iron helm waves proudly. Confers no benefit. May 2015 Subscriber Item.",
"headMystery301404Text": "Fancy Top Hat",
"headMystery301404Notes": "A fancy top hat for the finest of gentlefolk! January 3015 Subscriber Item. Confers no benefit.",
"headMystery301405Text": "Basic Top Hat",

3
common/script/content.coffee
View file

@ -48,6 +48,7 @@ api.mystery =
201502: {start:'2015-02-24',end:'2015-03-02', text:'Winged Enchanter Set'}
201503: {start:'2015-03-25',end:'2015-04-02', text:'Aquamarine Set'}
201504: {start:'2015-04-24',end:'2015-05-02', text:'Busy Bee Set'}
201505: {start:'2015-05-25',end:'2015-06-02', text:'Green Knight Set'}
301404: {start:'3014-03-24',end:'3014-04-02', text:'Steampunk Standard Set'}
301405: {start:'3014-04-24',end:'3014-05-02', text:'Steampunk Accessories Set'}
wondercon: {start:'2014-03-24',end:'2014-04-01'} # not really, but the mechanic works
@ -137,6 +138,7 @@ gear =
mystery:
201411: text: t('weaponMystery201411Text'), notes: t('weaponMystery201411Notes'), mystery:'201411', value: 0
201502: text: t('weaponMystery201502Text'), notes: t('weaponMystery201502Notes'), mystery:'201502', value: 0
201505: text: t('weaponMystery201505Text'), notes: t('weaponMystery201505Notes'), mystery:'201505', value: 0
301404: text: t('weaponMystery301404Text'), notes: t('weaponMystery301404Notes'), mystery:'301404', value: 0
armor:
@ -301,6 +303,7 @@ gear =
201411: text: t('headMystery201411Text'), notes: t('headMystery201411Notes'), mystery:'201411', value: 0
201412: text: t('headMystery201412Text'), notes: t('headMystery201412Notes'), mystery:'201412', value: 0
201501: text: t('headMystery201501Text'), notes: t('headMystery201501Notes'), mystery:'201501', value: 0
201505: text: t('headMystery201505Text'), notes: t('headMystery201505Notes'), mystery:'201505', value: 0
301404: text: t('headMystery301404Text'), notes: t('headMystery301404Notes'), mystery:'301404', value: 0
301405: text: t('headMystery301405Text'), notes: t('headMystery301405Notes'), mystery:'301405', value: 0

2
migrations/mysteryitems.js
View file

@ -2,7 +2,7 @@ var _id = '';
var update = {
$addToSet: {
'purchased.plan.mysteryItems':{
$each:['armor_mystery_201504','back_mystery_201504']
$each:['weapon_mystery_201505','head_mystery_201505']
}
}
};

19
website/views/shared/new-stuff.jade
View file

@ -1,18 +1,25 @@
h5 5/20/2015 - NEW PET QUEST: SHEEP!
h5 5/25/2015 - MAY SUBSCRIBER ITEM SET: GREEN KNIGHT!
hr
tr
td
.quest_sheep.pull-right
h5 New Pet Quest: Sheep!
p It looks like there's some ba-a-a-ad weather in the Taskan countryside! Can you and your party be diligent enough to defeat the Thunder Ram? If so, you may find yourself with some wooly sheep pets...
p.small.muted art by Starsystemic and Misceo
p.small.muted writing by Salambander, Leephon, and Lemoness
.promo_mystery_201505.pull-right
h5 May Subscriber Item Set Revealed: Green Knight!
p The May Subscriber Item has been revealed: the Green Knight Item Set! All May subscribers will receive the Green Knight Helm and the Green Knight Lance. You still have six days to <a href='/#/options/settings/subscription' target='_blank'>subscribe</a> and receive the item set, along with the ability to buy Gems with Gold! Thank you so much for your support - we really do rely on you to keep HabitRPG free to use and running smoothly.
p.small.muted by Lemoness
hr
a(href='/static/old-news', target='_blank') Read older news
mixin oldNews
h5 5/20/2015 - NEW PET QUEST: SHEEP!
tr
td
.quest_sheep.pull-right
h5 New Pet Quest: Sheep!
p It looks like there's some ba-a-a-ad weather in the Taskan countryside! Can you and your party be diligent enough to defeat the Thunder Ram? If so, you may find yourself with some wooly sheep pets...
p.small.muted art by Starsystemic and Misceo
p.small.muted writing by Salambander, Leephon, and Lemoness
h5 5/13/2015 - NEW ANIMAL SKINS AND ACCESSORIES, INN IMPROVEMENTS, COPY CHAT TO TO-DO, AND EXTRA INFO
tr
td