krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-17 06:37:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

feat(mystery): July 2015 goodies

Browse Source 
Also makes the mystery box opening notification translatable and adds item graphics to it.
This commit is contained in:
Sabe Jones
2015-07-23 12:05:13 -05:00
parent bfd56b35e1
commit d32d05e873
28 changed files with 5317 additions and 5267 deletions
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

166
common/dist/sprites/spritesmith0.css vendored
View File

@@ -1998,25 +1998,25 @@
} }
.hair_mustache_1_white { .hair_mustache_1_white {
background-image: url(spritesmith0.png); background-image: url(spritesmith0.png);
background-position: 0px -888px; background-position: -1274px -1434px;
width: 90px; width: 90px;
height: 90px; height: 90px;
} }
.customize-option.hair_mustache_1_white { .customize-option.hair_mustache_1_white {
background-image: url(spritesmith0.png); background-image: url(spritesmith0.png);
background-position: -25px -903px; background-position: -1299px -1449px;
width: 60px; width: 60px;
height: 60px; height: 60px;
} }
.hair_mustache_1_winternight { .hair_mustache_1_winternight {
background-image: url(spritesmith0.png); background-image: url(spritesmith0.png);
background-position: -1365px -1434px; background-position: 0px -888px;
width: 90px; width: 90px;
height: 90px; height: 90px;
} }
.customize-option.hair_mustache_1_winternight { .customize-option.hair_mustache_1_winternight {
background-image: url(spritesmith0.png); background-image: url(spritesmith0.png);
background-position: -1390px -1449px; background-position: -25px -903px;
width: 60px; width: 60px;
height: 60px; height: 60px;
} }
@@ -4038,443 +4038,455 @@
} }
.hair_base_10_frost { .hair_base_10_frost {
background-image: url(spritesmith0.png); background-image: url(spritesmith0.png);
background-position: -1274px -1434px; background-position: -364px -1889px;
width: 90px; width: 90px;
height: 90px; height: 90px;
} }
.customize-option.hair_base_10_frost { .customize-option.hair_base_10_frost {
background-image: url(spritesmith0.png); background-image: url(spritesmith0.png);
background-position: -1299px -1449px; background-position: -389px -1904px;
width: 60px; width: 60px;
height: 60px; height: 60px;
} }
.hair_base_10_ghostwhite { .hair_base_10_ghostwhite {
background-image: url(spritesmith0.png); background-image: url(spritesmith0.png);
background-position: -910px -979px; background-position: -1365px -1434px;
width: 90px; width: 90px;
height: 90px; height: 90px;
} }
.customize-option.hair_base_10_ghostwhite { .customize-option.hair_base_10_ghostwhite {
background-image: url(spritesmith0.png); background-image: url(spritesmith0.png);
background-position: -935px -994px; background-position: -1390px -1449px;
width: 60px; width: 60px;
height: 60px; height: 60px;
} }
.hair_base_10_green { .hair_base_10_green {
background-image: url(spritesmith0.png); background-image: url(spritesmith0.png);
background-position: -819px -979px; background-position: -910px -979px;
width: 90px; width: 90px;
height: 90px; height: 90px;
} }
.customize-option.hair_base_10_green { .customize-option.hair_base_10_green {
background-image: url(spritesmith0.png); background-image: url(spritesmith0.png);
background-position: -844px -994px; background-position: -935px -994px;
width: 60px; width: 60px;
height: 60px; height: 60px;
} }
.hair_base_10_halloween { .hair_base_10_halloween {
background-image: url(spritesmith0.png); background-image: url(spritesmith0.png);
background-position: -728px -979px; background-position: -819px -979px;
width: 90px; width: 90px;
height: 90px; height: 90px;
} }
.customize-option.hair_base_10_halloween { .customize-option.hair_base_10_halloween {
background-image: url(spritesmith0.png); background-image: url(spritesmith0.png);
background-position: -753px -994px; background-position: -844px -994px;
width: 60px; width: 60px;
height: 60px; height: 60px;
} }
.hair_base_10_holly { .hair_base_10_holly {
background-image: url(spritesmith0.png); background-image: url(spritesmith0.png);
background-position: -637px -979px; background-position: -728px -979px;
width: 90px; width: 90px;
height: 90px; height: 90px;
} }
.customize-option.hair_base_10_holly { .customize-option.hair_base_10_holly {
background-image: url(spritesmith0.png); background-image: url(spritesmith0.png);
background-position: -662px -994px; background-position: -753px -994px;
width: 60px; width: 60px;
height: 60px; height: 60px;
} }
.hair_base_10_hollygreen { .hair_base_10_hollygreen {
background-image: url(spritesmith0.png); background-image: url(spritesmith0.png);
background-position: -546px -979px; background-position: -637px -979px;
width: 90px; width: 90px;
height: 90px; height: 90px;
} }
.customize-option.hair_base_10_hollygreen { .customize-option.hair_base_10_hollygreen {
background-image: url(spritesmith0.png); background-image: url(spritesmith0.png);
background-position: -571px -994px; background-position: -662px -994px;
width: 60px; width: 60px;
height: 60px; height: 60px;
} }
.hair_base_10_midnight { .hair_base_10_midnight {
background-image: url(spritesmith0.png); background-image: url(spritesmith0.png);
background-position: -455px -979px; background-position: -546px -979px;
width: 90px; width: 90px;
height: 90px; height: 90px;
} }
.customize-option.hair_base_10_midnight { .customize-option.hair_base_10_midnight {
background-image: url(spritesmith0.png); background-image: url(spritesmith0.png);
background-position: -480px -994px; background-position: -571px -994px;
width: 60px; width: 60px;
height: 60px; height: 60px;
} }
.hair_base_10_pblue { .hair_base_10_pblue {
background-image: url(spritesmith0.png); background-image: url(spritesmith0.png);
background-position: -364px -979px; background-position: -455px -979px;
width: 90px; width: 90px;
height: 90px; height: 90px;
} }
.customize-option.hair_base_10_pblue { .customize-option.hair_base_10_pblue {
background-image: url(spritesmith0.png); background-image: url(spritesmith0.png);
background-position: -389px -994px; background-position: -480px -994px;
width: 60px; width: 60px;
height: 60px; height: 60px;
} }
.hair_base_10_pblue2 { .hair_base_10_pblue2 {
background-image: url(spritesmith0.png); background-image: url(spritesmith0.png);
background-position: -273px -979px; background-position: -364px -979px;
width: 90px; width: 90px;
height: 90px; height: 90px;
} }
.customize-option.hair_base_10_pblue2 { .customize-option.hair_base_10_pblue2 {
background-image: url(spritesmith0.png); background-image: url(spritesmith0.png);
background-position: -298px -994px; background-position: -389px -994px;
width: 60px; width: 60px;
height: 60px; height: 60px;
} }
.hair_base_10_peppermint { .hair_base_10_peppermint {
background-image: url(spritesmith0.png); background-image: url(spritesmith0.png);
background-position: -182px -979px; background-position: -273px -979px;
width: 90px; width: 90px;
height: 90px; height: 90px;
} }
.customize-option.hair_base_10_peppermint { .customize-option.hair_base_10_peppermint {
background-image: url(spritesmith0.png); background-image: url(spritesmith0.png);
background-position: -207px -994px; background-position: -298px -994px;
width: 60px; width: 60px;
height: 60px; height: 60px;
} }
.hair_base_10_pgreen { .hair_base_10_pgreen {
background-image: url(spritesmith0.png); background-image: url(spritesmith0.png);
background-position: -91px -979px; background-position: -182px -979px;
width: 90px; width: 90px;
height: 90px; height: 90px;
} }
.customize-option.hair_base_10_pgreen { .customize-option.hair_base_10_pgreen {
background-image: url(spritesmith0.png); background-image: url(spritesmith0.png);
background-position: -116px -994px; background-position: -207px -994px;
width: 60px; width: 60px;
height: 60px; height: 60px;
} }
.hair_base_10_pgreen2 { .hair_base_10_pgreen2 {
background-image: url(spritesmith0.png); background-image: url(spritesmith0.png);
background-position: 0px -979px; background-position: -91px -979px;
width: 90px; width: 90px;
height: 90px; height: 90px;
} }
.customize-option.hair_base_10_pgreen2 { .customize-option.hair_base_10_pgreen2 {
background-image: url(spritesmith0.png); background-image: url(spritesmith0.png);
background-position: -25px -994px; background-position: -116px -994px;
width: 60px; width: 60px;
height: 60px; height: 60px;
} }
.hair_base_10_porange { .hair_base_10_porange {
background-image: url(spritesmith0.png); background-image: url(spritesmith0.png);
background-position: -990px -819px; background-position: 0px -979px;
width: 90px; width: 90px;
height: 90px; height: 90px;
} }
.customize-option.hair_base_10_porange { .customize-option.hair_base_10_porange {
background-image: url(spritesmith0.png); background-image: url(spritesmith0.png);
background-position: -1015px -834px; background-position: -25px -994px;
width: 60px; width: 60px;
height: 60px; height: 60px;
} }
.hair_base_10_porange2 { .hair_base_10_porange2 {
background-image: url(spritesmith0.png); background-image: url(spritesmith0.png);
background-position: -990px -728px; background-position: -990px -819px;
width: 90px; width: 90px;
height: 90px; height: 90px;
} }
.customize-option.hair_base_10_porange2 { .customize-option.hair_base_10_porange2 {
background-image: url(spritesmith0.png); background-image: url(spritesmith0.png);
background-position: -1015px -743px; background-position: -1015px -834px;
width: 60px; width: 60px;
height: 60px; height: 60px;
} }
.hair_base_10_ppink { .hair_base_10_ppink {
background-image: url(spritesmith0.png); background-image: url(spritesmith0.png);
background-position: -990px -637px; background-position: -990px -728px;
width: 90px; width: 90px;
height: 90px; height: 90px;
} }
.customize-option.hair_base_10_ppink { .customize-option.hair_base_10_ppink {
background-image: url(spritesmith0.png); background-image: url(spritesmith0.png);
background-position: -1015px -652px; background-position: -1015px -743px;
width: 60px; width: 60px;
height: 60px; height: 60px;
} }
.hair_base_10_ppink2 { .hair_base_10_ppink2 {
background-image: url(spritesmith0.png); background-image: url(spritesmith0.png);
background-position: -990px -546px; background-position: -990px -637px;
width: 90px; width: 90px;
height: 90px; height: 90px;
} }
.customize-option.hair_base_10_ppink2 { .customize-option.hair_base_10_ppink2 {
background-image: url(spritesmith0.png); background-image: url(spritesmith0.png);
background-position: -1015px -561px; background-position: -1015px -652px;
width: 60px; width: 60px;
height: 60px; height: 60px;
} }
.hair_base_10_ppurple { .hair_base_10_ppurple {
background-image: url(spritesmith0.png); background-image: url(spritesmith0.png);
background-position: -990px -455px; background-position: -990px -546px;
width: 90px; width: 90px;
height: 90px; height: 90px;
} }
.customize-option.hair_base_10_ppurple { .customize-option.hair_base_10_ppurple {
background-image: url(spritesmith0.png); background-image: url(spritesmith0.png);
background-position: -1015px -470px; background-position: -1015px -561px;
width: 60px; width: 60px;
height: 60px; height: 60px;
} }
.hair_base_10_ppurple2 { .hair_base_10_ppurple2 {
background-image: url(spritesmith0.png); background-image: url(spritesmith0.png);
background-position: -990px -364px; background-position: -990px -455px;
width: 90px; width: 90px;
height: 90px; height: 90px;
} }
.customize-option.hair_base_10_ppurple2 { .customize-option.hair_base_10_ppurple2 {
background-image: url(spritesmith0.png); background-image: url(spritesmith0.png);
background-position: -1015px -379px; background-position: -1015px -470px;
width: 60px; width: 60px;
height: 60px; height: 60px;
} }
.hair_base_10_pumpkin { .hair_base_10_pumpkin {
background-image: url(spritesmith0.png); background-image: url(spritesmith0.png);
background-position: -990px -273px; background-position: -990px -364px;
width: 90px; width: 90px;
height: 90px; height: 90px;
} }
.customize-option.hair_base_10_pumpkin { .customize-option.hair_base_10_pumpkin {
background-image: url(spritesmith0.png); background-image: url(spritesmith0.png);
background-position: -1015px -288px; background-position: -1015px -379px;
width: 60px; width: 60px;
height: 60px; height: 60px;
} }
.hair_base_10_purple { .hair_base_10_purple {
background-image: url(spritesmith0.png); background-image: url(spritesmith0.png);
background-position: -990px -182px; background-position: -990px -273px;
width: 90px; width: 90px;
height: 90px; height: 90px;
} }
.customize-option.hair_base_10_purple { .customize-option.hair_base_10_purple {
background-image: url(spritesmith0.png); background-image: url(spritesmith0.png);
background-position: -1015px -197px; background-position: -1015px -288px;
width: 60px; width: 60px;
height: 60px; height: 60px;
} }
.hair_base_10_pyellow { .hair_base_10_pyellow {
background-image: url(spritesmith0.png); background-image: url(spritesmith0.png);
background-position: -990px -91px; background-position: -990px -182px;
width: 90px; width: 90px;
height: 90px; height: 90px;
} }
.customize-option.hair_base_10_pyellow { .customize-option.hair_base_10_pyellow {
background-image: url(spritesmith0.png); background-image: url(spritesmith0.png);
background-position: -1015px -106px; background-position: -1015px -197px;
width: 60px; width: 60px;
height: 60px; height: 60px;
} }
.hair_base_10_pyellow2 { .hair_base_10_pyellow2 {
background-image: url(spritesmith0.png); background-image: url(spritesmith0.png);
background-position: -990px 0px; background-position: -990px -91px;
width: 90px; width: 90px;
height: 90px; height: 90px;
} }
.customize-option.hair_base_10_pyellow2 { .customize-option.hair_base_10_pyellow2 {
background-image: url(spritesmith0.png); background-image: url(spritesmith0.png);
background-position: -1015px -15px; background-position: -1015px -106px;
width: 60px; width: 60px;
height: 60px; height: 60px;
} }
.hair_base_10_rainbow { .hair_base_10_rainbow {
background-image: url(spritesmith0.png); background-image: url(spritesmith0.png);
background-position: -819px -888px; background-position: -990px 0px;
width: 90px; width: 90px;
height: 90px; height: 90px;
} }
.customize-option.hair_base_10_rainbow { .customize-option.hair_base_10_rainbow {
background-image: url(spritesmith0.png); background-image: url(spritesmith0.png);
background-position: -844px -903px; background-position: -1015px -15px;
width: 60px; width: 60px;
height: 60px; height: 60px;
} }
.hair_base_10_red { .hair_base_10_red {
background-image: url(spritesmith0.png); background-image: url(spritesmith0.png);
background-position: -728px -888px; background-position: -819px -888px;
width: 90px; width: 90px;
height: 90px; height: 90px;
} }
.customize-option.hair_base_10_red { .customize-option.hair_base_10_red {
background-image: url(spritesmith0.png); background-image: url(spritesmith0.png);
background-position: -753px -903px; background-position: -844px -903px;
width: 60px; width: 60px;
height: 60px; height: 60px;
} }
.hair_base_10_snowy { .hair_base_10_snowy {
background-image: url(spritesmith0.png); background-image: url(spritesmith0.png);
background-position: -637px -888px; background-position: -728px -888px;
width: 90px; width: 90px;
height: 90px; height: 90px;
} }
.customize-option.hair_base_10_snowy { .customize-option.hair_base_10_snowy {
background-image: url(spritesmith0.png); background-image: url(spritesmith0.png);
background-position: -662px -903px; background-position: -753px -903px;
width: 60px; width: 60px;
height: 60px; height: 60px;
} }
.hair_base_10_white { .hair_base_10_white {
background-image: url(spritesmith0.png); background-image: url(spritesmith0.png);
background-position: -546px -888px; background-position: -637px -888px;
width: 90px; width: 90px;
height: 90px; height: 90px;
} }
.customize-option.hair_base_10_white { .customize-option.hair_base_10_white {
background-image: url(spritesmith0.png); background-image: url(spritesmith0.png);
background-position: -571px -903px; background-position: -662px -903px;
width: 60px; width: 60px;
height: 60px; height: 60px;
} }
.hair_base_10_winternight { .hair_base_10_winternight {
background-image: url(spritesmith0.png); background-image: url(spritesmith0.png);
background-position: -455px -888px; background-position: -546px -888px;
width: 90px; width: 90px;
height: 90px; height: 90px;
} }
.customize-option.hair_base_10_winternight { .customize-option.hair_base_10_winternight {
background-image: url(spritesmith0.png); background-image: url(spritesmith0.png);
background-position: -480px -903px; background-position: -571px -903px;
width: 60px; width: 60px;
height: 60px; height: 60px;
} }
.hair_base_10_winterstar { .hair_base_10_winterstar {
background-image: url(spritesmith0.png); background-image: url(spritesmith0.png);
background-position: -364px -888px; background-position: -455px -888px;
width: 90px; width: 90px;
height: 90px; height: 90px;
} }
.customize-option.hair_base_10_winterstar { .customize-option.hair_base_10_winterstar {
background-image: url(spritesmith0.png); background-image: url(spritesmith0.png);
background-position: -389px -903px; background-position: -480px -903px;
width: 60px; width: 60px;
height: 60px; height: 60px;
} }
.hair_base_10_yellow { .hair_base_10_yellow {
background-image: url(spritesmith0.png); background-image: url(spritesmith0.png);
background-position: -273px -888px; background-position: -364px -888px;
width: 90px; width: 90px;
height: 90px; height: 90px;
} }
.customize-option.hair_base_10_yellow { .customize-option.hair_base_10_yellow {
background-image: url(spritesmith0.png); background-image: url(spritesmith0.png);
background-position: -298px -903px; background-position: -389px -903px;
width: 60px; width: 60px;
height: 60px; height: 60px;
} }
.hair_base_10_zombie { .hair_base_10_zombie {
background-image: url(spritesmith0.png); background-image: url(spritesmith0.png);
background-position: -182px -888px; background-position: -273px -888px;
width: 90px; width: 90px;
height: 90px; height: 90px;
} }
.customize-option.hair_base_10_zombie { .customize-option.hair_base_10_zombie {
background-image: url(spritesmith0.png); background-image: url(spritesmith0.png);
background-position: -207px -903px; background-position: -298px -903px;
width: 60px; width: 60px;
height: 60px; height: 60px;
} }
.hair_base_11_TRUred { .hair_base_11_TRUred {
background-image: url(spritesmith0.png); background-image: url(spritesmith0.png);
background-position: -91px -888px; background-position: -182px -888px;
width: 90px; width: 90px;
height: 90px; height: 90px;
} }
.customize-option.hair_base_11_TRUred { .customize-option.hair_base_11_TRUred {
background-image: url(spritesmith0.png); background-image: url(spritesmith0.png);
background-position: -116px -903px; background-position: -207px -903px;
width: 60px; width: 60px;
height: 60px; height: 60px;
} }
.hair_base_11_aurora { .hair_base_11_aurora {
background-image: url(spritesmith0.png); background-image: url(spritesmith0.png);
background-position: -1081px -455px; background-position: -91px -888px;
width: 90px; width: 90px;
height: 90px; height: 90px;
} }
.customize-option.hair_base_11_aurora { .customize-option.hair_base_11_aurora {
background-image: url(spritesmith0.png); background-image: url(spritesmith0.png);
background-position: -1106px -470px; background-position: -116px -903px;
width: 60px; width: 60px;
height: 60px; height: 60px;
} }
.hair_base_11_black { .hair_base_11_black {
background-image: url(spritesmith0.png); background-image: url(spritesmith0.png);
background-position: -1081px -364px; background-position: -1081px -455px;
width: 90px; width: 90px;
height: 90px; height: 90px;
} }
.customize-option.hair_base_11_black { .customize-option.hair_base_11_black {
background-image: url(spritesmith0.png); background-image: url(spritesmith0.png);
background-position: -1106px -379px; background-position: -1106px -470px;
width: 60px; width: 60px;
height: 60px; height: 60px;
} }
.hair_base_11_blond { .hair_base_11_blond {
background-image: url(spritesmith0.png); background-image: url(spritesmith0.png);
background-position: -1081px -273px; background-position: -1081px -364px;
width: 90px; width: 90px;
height: 90px; height: 90px;
} }
.customize-option.hair_base_11_blond { .customize-option.hair_base_11_blond {
background-image: url(spritesmith0.png); background-image: url(spritesmith0.png);
background-position: -1106px -288px; background-position: -1106px -379px;
width: 60px; width: 60px;
height: 60px; height: 60px;
} }
.hair_base_11_blue { .hair_base_11_blue {
background-image: url(spritesmith0.png); background-image: url(spritesmith0.png);
background-position: -1081px -182px; background-position: -1081px -273px;
width: 90px; width: 90px;
height: 90px; height: 90px;
} }
.customize-option.hair_base_11_blue { .customize-option.hair_base_11_blue {
background-image: url(spritesmith0.png); background-image: url(spritesmith0.png);
background-position: -1106px -197px; background-position: -1106px -288px;
width: 60px; width: 60px;
height: 60px; height: 60px;
} }
.hair_base_11_brown { .hair_base_11_brown {
background-image: url(spritesmith0.png); background-image: url(spritesmith0.png);
background-position: -1081px -91px; background-position: -1081px -182px;
width: 90px; width: 90px;
height: 90px; height: 90px;
} }
.customize-option.hair_base_11_brown { .customize-option.hair_base_11_brown {
background-image: url(spritesmith0.png); background-image: url(spritesmith0.png);
background-position: -1106px -106px; background-position: -1106px -197px;
width: 60px; width: 60px;
height: 60px; height: 60px;
} }
.hair_base_11_candycane { .hair_base_11_candycane {
background-image: url(spritesmith0.png); background-image: url(spritesmith0.png);
background-position: -1081px 0px; background-position: -1081px -91px;
width: 90px; width: 90px;
height: 90px; height: 90px;
} }
.customize-option.hair_base_11_candycane { .customize-option.hair_base_11_candycane {
background-image: url(spritesmith0.png);
background-position: -1106px -106px;
width: 60px;
height: 60px;
}
.hair_base_11_candycorn {
background-image: url(spritesmith0.png);
background-position: -1081px 0px;
width: 90px;
height: 90px;
}
.customize-option.hair_base_11_candycorn {
background-image: url(spritesmith0.png); background-image: url(spritesmith0.png);
background-position: -1106px -15px; background-position: -1106px -15px;
width: 60px; width: 60px;

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

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 221 KiB

After

Width:  |  Height:  |  Size: 222 KiB

1656
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: 25 KiB

After

Width:  |  Height:  |  Size: 25 KiB

5388
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: 109 KiB

After

Width:  |  Height:  |  Size: 110 KiB

828
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: 88 KiB

After

Width:  |  Height:  |  Size: 88 KiB

828
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: 549 KiB

After

Width:  |  Height:  |  Size: 552 KiB

836
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: 234 KiB

After

Width:  |  Height:  |  Size: 234 KiB

806
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: 199 KiB

After

Width:  |  Height:  |  Size: 200 KiB

BIN
common/img/sprites/spritesmith/gear/events/mystery_201507/back_mystery_201507.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.1 KiB

BIN
common/img/sprites/spritesmith/gear/events/mystery_201507/eyewear_mystery_201507.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.9 KiB

BIN
common/img/sprites/spritesmith/gear/events/mystery_201507/shop_back_mystery_201507.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.9 KiB

BIN
common/img/sprites/spritesmith/gear/events/mystery_201507/shop_eyewear_mystery_201507.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.9 KiB

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 6.2 KiB

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

@@ -588,6 +588,8 @@
"backMystery201410Notes": "Swoop through the night on these strong wings. Confers no benefit. October 2014 Subscriber Item.", "backMystery201410Notes": "Swoop through the night on these strong wings. Confers no benefit. October 2014 Subscriber Item.",
"backMystery201504Text": "Busy Bee Wings", "backMystery201504Text": "Busy Bee Wings",
"backMystery201504Notes": "Buzz buzz buzz! Flit from task to task. Confers no benefit. April 2015 Subscriber Item.", "backMystery201504Notes": "Buzz buzz buzz! Flit from task to task. Confers no benefit. April 2015 Subscriber Item.",
"backMystery201507Text": "Rad Surfboard",
"backMystery201507Notes": "Surf off the Diligent Docks and ride the waves in Inkomplete Bay! Confers no benefit. July 2015 Subscriber Item.",
"backSpecialWonderconRedText": "Mighty Cape", "backSpecialWonderconRedText": "Mighty Cape",
"backSpecialWonderconRedNotes": "Swishes with strength and beauty. Confers no benefit. Special Edition Convention Item.", "backSpecialWonderconRedNotes": "Swishes with strength and beauty. Confers no benefit. Special Edition Convention Item.",
@@ -690,6 +692,8 @@
"eyewearMystery201503Notes": "Don't get poked in the eye by these shimmering gems! Confers no benefit. March 2015 Subscriber Item.", "eyewearMystery201503Notes": "Don't get poked in the eye by these shimmering gems! Confers no benefit. March 2015 Subscriber Item.",
"eyewearMystery201506Text": "Neon Snorkel", "eyewearMystery201506Text": "Neon Snorkel",
"eyewearMystery201506Notes": "This neon snorkel lets its wearer see underwater. Confers no benefit. June 2015 Subscriber Item.", "eyewearMystery201506Notes": "This neon snorkel lets its wearer see underwater. Confers no benefit. June 2015 Subscriber Item.",
"eyewearMystery201507Text": "Rad Sunglasses",
"eyewearMystery201507Notes": "These sunglasses let you stay cool even when the weather is hot. Confers no benefit. July 2015 Subscriber Item.",
"eyewearMystery301404Text": "Eyewear Goggles", "eyewearMystery301404Text": "Eyewear Goggles",
"eyewearMystery301404Notes": "No eyewear could be fancier than a pair of goggles - except, perhaps, for a monocle. Confers no benefit. April 3015 Subscriber Item.", "eyewearMystery301404Notes": "No eyewear could be fancier than a pair of goggles - except, perhaps, for a monocle. Confers no benefit. April 3015 Subscriber Item.",
"eyewearMystery301405Text": "Monocle", "eyewearMystery301405Text": "Monocle",

1
common/locales/en/messages.json
View File

@@ -22,6 +22,7 @@
"messageDropEgg": "You've found a <%= dropText %> Egg! <%= dropNotes %>", "messageDropEgg": "You've found a <%= dropText %> Egg! <%= dropNotes %>",
"messageDropPotion": "You've found a <%= dropText %> Hatching Potion! <%= dropNotes %>", "messageDropPotion": "You've found a <%= dropText %> Hatching Potion! <%= dropNotes %>",
"messageDropQuest": "You've found a quest!", "messageDropQuest": "You've found a quest!",
"messageDropMysteryItem": "You open the box and find <%= dropText %>!",
"messageFoundQuest": "You've found the quest \"<%= questText %>\"!", "messageFoundQuest": "You've found the quest \"<%= questText %>\"!",
"messageAlreadyPurchasedGear": "You purchased this gear in the past, but do not currently own it. You can buy it again in the rewards column on the tasks page.", "messageAlreadyPurchasedGear": "You purchased this gear in the past, but do not currently own it. You can buy it again in the rewards column on the tasks page.",

5
common/script/content.coffee
View File

@@ -51,6 +51,7 @@ api.mystery =
201504: {start:'2015-04-24',end:'2015-05-02', text:'Busy Bee 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'} 201505: {start:'2015-05-25',end:'2015-06-02', text:'Green Knight Set'}
201506: {start:'2015-06-25',end:'2015-07-02', text:'Neon Snorkeler Set'} 201506: {start:'2015-06-25',end:'2015-07-02', text:'Neon Snorkeler Set'}
201507: {start:'2015-07-24',end:'2015-08-02', text:'Rad Surfer Set'}
301404: {start:'3014-03-24',end:'3014-04-02', text:'Steampunk Standard 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'} 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 wondercon: {start:'2014-03-24',end:'2014-04-01'} # not really, but the mechanic works
@@ -429,6 +430,7 @@ gear =
201404: text: t('backMystery201404Text'), notes: t('backMystery201404Notes'), mystery:'201404', value: 0 201404: text: t('backMystery201404Text'), notes: t('backMystery201404Notes'), mystery:'201404', value: 0
201410: text: t('backMystery201410Text'), notes: t('backMystery201410Notes'), mystery:'201410', value: 0 201410: text: t('backMystery201410Text'), notes: t('backMystery201410Notes'), mystery:'201410', value: 0
201504: text: t('backMystery201504Text'), notes: t('backMystery201504Notes'), mystery:'201504', value: 0 201504: text: t('backMystery201504Text'), notes: t('backMystery201504Notes'), mystery:'201504', value: 0
201507: text: t('backMystery201507Text'), notes: t('backMystery201507Notes'), mystery:'201507', value: 0
special: special:
wondercon_red: text: t('backSpecialWonderconRedText'), notes: t('backSpecialWonderconRedNotes'), value: 0, mystery:'wondercon' wondercon_red: text: t('backSpecialWonderconRedText'), notes: t('backSpecialWonderconRedNotes'), value: 0, mystery:'wondercon'
wondercon_black: text: t('backSpecialWonderconBlackText'), notes: t('backSpecialWonderconBlackNotes'), value: 0, mystery:'wondercon' wondercon_black: text: t('backSpecialWonderconBlackText'), notes: t('backSpecialWonderconBlackNotes'), value: 0, mystery:'wondercon'
@@ -491,12 +493,13 @@ gear =
mystery: mystery:
201503: text: t('eyewearMystery201503Text'), notes: t('eyewearMystery201503Notes'), mystery:'201503', value: 0 201503: text: t('eyewearMystery201503Text'), notes: t('eyewearMystery201503Notes'), mystery:'201503', value: 0
201506: text: t('eyewearMystery201506Text'), notes: t('eyewearMystery201506Notes'), mystery:'201506', value: 0 201506: text: t('eyewearMystery201506Text'), notes: t('eyewearMystery201506Notes'), mystery:'201506', value: 0
201507: text: t('eyewearMystery201507Text'), notes: t('eyewearMystery201507Notes'), mystery:'201507', value: 0
301404: text: t('eyewearMystery301404Text'), notes: t('eyewearMystery301404Notes'), mystery:'301404', value: 0 301404: text: t('eyewearMystery301404Text'), notes: t('eyewearMystery301404Notes'), mystery:'301404', value: 0
301405: text: t('eyewearMystery301405Text'), notes: t('eyewearMystery301405Notes'), mystery:'301405', value: 0 301405: text: t('eyewearMystery301405Text'), notes: t('eyewearMystery301405Notes'), mystery:'301405', value: 0
### ###
The gear is exported as a tree (defined above), and a flat list (eg, {weapon_healer_1: .., shield_special_0: ...}) since The gear is exported as a tree (defined above), and a flat list (eg, {weapon_healer_1: .., shield_special_0: ...}) since
they are needed in different froms at different points in the app they are needed in different forms at different points in the app
### ###
api.gear = api.gear =
tree: gear tree: gear

5
common/script/index.coffee
View File

@@ -1064,9 +1064,8 @@ api.wrap = (user, main=true) ->
item = content.gear.flat[item] item = content.gear.flat[item]
user.items.gear.owned[item.key] = true user.items.gear.owned[item.key] = true
user.markModified? 'purchased.plan.mysteryItems' user.markModified? 'purchased.plan.mysteryItems'
# Could show {code:200} message, but it's yellow with no icon. This is round-about, but prettier. FIXME item.type = 'Mystery'
(user._tmp?={}).drop = {type: 'gear', dialog: "#{item.text(req.language)} inside!"} if typeof window != 'undefined' (user._tmp?={}).drop = item if typeof window != 'undefined'
#cb? {code:200, message:"#{item.text} inside!"}, user.items.gear.owned
cb? null, user.items.gear.owned cb? null, user.items.gear.owned
readNYE: (req,cb) -> readNYE: (req,cb) ->

2
migrations/mysteryitems.js → migrations/mystery_items.js
View File

@@ -2,7 +2,7 @@ var _id = '';
var update = { var update = {
$addToSet: { $addToSet: {
'purchased.plan.mysteryItems':{ 'purchased.plan.mysteryItems':{
$each:['armor_mystery_201506','eyewear_mystery_201506'] $each:['back_mystery_201507','eyewear_mystery_201507']
} }
} }
}; };

5
website/public/js/controllers/notificationCtrl.js
View File

@@ -62,7 +62,7 @@ habitrpg.controller('NotificationCtrl',
var text, notes, type; var text, notes, type;
$rootScope.playSound('Item_Drop'); $rootScope.playSound('Item_Drop');
if (after.type !== 'gear' && after.type !== 'Quest') { if (after.type !== 'gear' && after.type !== 'Quest' && after.type !== 'Mystery') {
if (after.type === 'Food') { if (after.type === 'Food') {
type = 'food'; type = 'food';
} else if (after.type === 'HatchingPotion') { } else if (after.type === 'HatchingPotion') {
@@ -91,6 +91,9 @@ habitrpg.controller('NotificationCtrl',
} else if (after.type === 'Quest') { } else if (after.type === 'Quest') {
$rootScope.selectedQuest = Content.quests[after.key]; $rootScope.selectedQuest = Content.quests[after.key];
$rootScope.openModal('questDrop', {controller:'PartyCtrl'}); $rootScope.openModal('questDrop', {controller:'PartyCtrl'});
} else if (after.type === 'Mystery') {
text = Content.gear.flat[after.key].text();
Notification.drop(env.t('messageDropMysteryItem', {dropText: text}), after);
} else { } else {
// Keep support for another type of drops that might be added // Keep support for another type of drops that might be added
Notification.drop(User.user._tmp.drop.dialog); Notification.drop(User.user._tmp.drop.dialog);

3
website/public/js/services/notificationServices.js
View File

@@ -39,6 +39,9 @@ angular.module("habitrpg").factory("Notification",
case "Food": case "Food":
dropClass = 'Pet_Food_' + item.key; dropClass = 'Pet_Food_' + item.key;
break; break;
case "Mystery":
dropClass = 'shop_' + item.key;
break;
default: default:
dropClass = 'glyphicon glyphicon-gift'; dropClass = 'glyphicon glyphicon-gift';
} }

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

@@ -1,5 +1,17 @@
h5 7/22/2015 - NEW iOS UPDATE, INCLUDING FACEBOOK LOGIN! h5 7/24/2015 - JULY SUBSCRIBER ITEM SET: RAD SURFER!
hr hr
tr
td
.promo_mystery_201507.pull-right
h5 July Subscriber Items Revealed!
p The July Subscriber Items have been revealed: the Rad Surfer Item Set! All July subscribers will receive the Rad Surfboard and the Rad Sunglasses. You still have six days to <a href='/#/options/settings/subscription'>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 7/22/2015 - NEW iOS UPDATE, INCLUDING FACEBOOK LOGIN!
tr tr
td td
.promo_habitica.pull-right .promo_habitica.pull-right
@@ -10,11 +22,6 @@ h5 7/22/2015 - NEW iOS UPDATE, INCLUDING FACEBOOK LOGIN!
br br
p We're still hard at work on the native Android app, don't worry! Our Blacksmiths are toiling away. Stay tuned for further information! p We're still hard at work on the native Android app, don't worry! Our Blacksmiths are toiling away. Stay tuned for further information!
p.small.muted by Viirus p.small.muted by Viirus
hr
a(href='/static/old-news', target='_blank') Read older news
mixin oldNews
h5 7/14/2015 - GOLD-PURCHASABLE QUESTS, NEW EQUIPMENT IN THE ENCHANTED ARMOIRE, AND TRIVIAL TASK DIFFICULTY SETTING! h5 7/14/2015 - GOLD-PURCHASABLE QUESTS, NEW EQUIPMENT IN THE ENCHANTED ARMOIRE, AND TRIVIAL TASK DIFFICULTY SETTING!
tr tr
td td