WIP(event): Summer Splash 2015

This commit is contained in:
Sabe Jones 2015-06-19 10:21:32 -05:00
parent 07b41d16b6
commit f6fafc5b6d
65 changed files with 8063 additions and 7792 deletions

View file

@ -2,12 +2,12 @@
margin-left: 1.25em;
}*/
/* Comment out for holiday events */
/* Comment out for holiday events
.npc_ian {
background: url("/common/img/sprites/npc_ian.gif") no-repeat;
width: 78px;
height: 135px;
}
} */
.Gems {
display:inline-block;

File diff suppressed because one or more lines are too long

View file

@ -1,216 +1,216 @@
.achievement-alien {
background-image: url(spritesmith0.png);
background-position: -1949px -479px;
background-position: -1949px -1025px;
width: 24px;
height: 26px;
}
.achievement-alpha {
background-image: url(spritesmith0.png);
background-position: -1924px -182px;
background-position: -1924px -728px;
width: 24px;
height: 26px;
}
.achievement-armor {
background-image: url(spritesmith0.png);
background-position: -1924px -479px;
background-position: -1924px -1025px;
width: 24px;
height: 26px;
}
.achievement-boot {
background-image: url(spritesmith0.png);
background-position: -1899px -479px;
background-position: -1899px -1025px;
width: 24px;
height: 26px;
}
.achievement-bow {
background-image: url(spritesmith0.png);
background-position: -1949px -452px;
background-position: -1949px -998px;
width: 24px;
height: 26px;
}
.achievement-cactus {
background-image: url(spritesmith0.png);
background-position: -1924px -452px;
background-position: -1924px -998px;
width: 24px;
height: 26px;
}
.achievement-cake {
background-image: url(spritesmith0.png);
background-position: -1899px -452px;
background-position: -1899px -998px;
width: 24px;
height: 26px;
}
.achievement-cave {
background-image: url(spritesmith0.png);
background-position: -1949px -425px;
background-position: -1949px -971px;
width: 24px;
height: 26px;
}
.achievement-coffin {
background-image: url(spritesmith0.png);
background-position: -1924px -425px;
background-position: -1924px -971px;
width: 24px;
height: 26px;
}
.achievement-comment {
background-image: url(spritesmith0.png);
background-position: -1899px -425px;
background-position: -1899px -971px;
width: 24px;
height: 26px;
}
.achievement-costumeContest {
background-image: url(spritesmith0.png);
background-position: -1949px -398px;
background-position: -1949px -944px;
width: 24px;
height: 26px;
}
.achievement-dilatory {
background-image: url(spritesmith0.png);
background-position: -1924px -398px;
background-position: -1924px -944px;
width: 24px;
height: 26px;
}
.achievement-firefox {
background-image: url(spritesmith0.png);
background-position: -1899px -398px;
background-position: -1899px -944px;
width: 24px;
height: 26px;
}
.achievement-habitBirthday {
background-image: url(spritesmith0.png);
background-position: -1949px -371px;
background-position: -1949px -917px;
width: 24px;
height: 26px;
}
.achievement-heart {
background-image: url(spritesmith0.png);
background-position: -1924px -371px;
background-position: -1924px -917px;
width: 24px;
height: 26px;
}
.achievement-karaoke {
background-image: url(spritesmith0.png);
background-position: -1899px -371px;
background-position: -1899px -917px;
width: 24px;
height: 26px;
}
.achievement-ninja {
background-image: url(spritesmith0.png);
background-position: -1949px -344px;
background-position: -1949px -890px;
width: 24px;
height: 26px;
}
.achievement-nye {
background-image: url(spritesmith0.png);
background-position: -1924px -344px;
background-position: -1924px -890px;
width: 24px;
height: 26px;
}
.achievement-perfect {
background-image: url(spritesmith0.png);
background-position: -1899px -182px;
background-position: -1899px -728px;
width: 24px;
height: 26px;
}
.achievement-rat {
background-image: url(spritesmith0.png);
background-position: -1949px -317px;
background-position: -1949px -863px;
width: 24px;
height: 26px;
}
.achievement-shield {
background-image: url(spritesmith0.png);
background-position: -1924px -317px;
background-position: -1924px -863px;
width: 24px;
height: 26px;
}
.achievement-shinySeed {
background-image: url(spritesmith0.png);
background-position: -1899px -317px;
background-position: -1899px -863px;
width: 24px;
height: 26px;
}
.achievement-snowball {
background-image: url(spritesmith0.png);
background-position: -1949px -290px;
background-position: -1949px -836px;
width: 24px;
height: 26px;
}
.achievement-spookDust {
background-image: url(spritesmith0.png);
background-position: -1924px -290px;
background-position: -1924px -836px;
width: 24px;
height: 26px;
}
.achievement-stoikalm {
background-image: url(spritesmith0.png);
background-position: -1899px -290px;
background-position: -1899px -836px;
width: 24px;
height: 26px;
}
.achievement-sun {
background-image: url(spritesmith0.png);
background-position: -1949px -263px;
background-position: -1949px -809px;
width: 24px;
height: 26px;
}
.achievement-sword {
background-image: url(spritesmith0.png);
background-position: -1924px -263px;
background-position: -1924px -809px;
width: 24px;
height: 26px;
}
.achievement-thermometer {
background-image: url(spritesmith0.png);
background-position: -1899px -263px;
background-position: -1899px -809px;
width: 24px;
height: 26px;
}
.achievement-tree {
background-image: url(spritesmith0.png);
background-position: -1949px -236px;
background-position: -1949px -782px;
width: 24px;
height: 26px;
}
.achievement-triadbingo {
background-image: url(spritesmith0.png);
background-position: -1924px -236px;
background-position: -1924px -782px;
width: 24px;
height: 26px;
}
.achievement-ultimate-healer {
background-image: url(spritesmith0.png);
background-position: -1899px -236px;
background-position: -1899px -782px;
width: 24px;
height: 26px;
}
.achievement-ultimate-mage {
background-image: url(spritesmith0.png);
background-position: -1949px -209px;
background-position: -1949px -755px;
width: 24px;
height: 26px;
}
.achievement-ultimate-rogue {
background-image: url(spritesmith0.png);
background-position: -1924px -209px;
background-position: -1924px -755px;
width: 24px;
height: 26px;
}
.achievement-ultimate-warrior {
background-image: url(spritesmith0.png);
background-position: -1899px -209px;
background-position: -1899px -755px;
width: 24px;
height: 26px;
}
.achievement-valentine {
background-image: url(spritesmith0.png);
background-position: -1949px -182px;
background-position: -1949px -728px;
width: 24px;
height: 26px;
}
.achievement-wolf {
background-image: url(spritesmith0.png);
background-position: -1899px -344px;
background-position: -1899px -890px;
width: 24px;
height: 26px;
}
@ -1890,13 +1890,13 @@
}
.hair_mustache_1_ppurple {
background-image: url(spritesmith0.png);
background-position: -708px -592px;
background-position: -182px -1434px;
width: 90px;
height: 90px;
}
.customize-option.hair_mustache_1_ppurple {
background-image: url(spritesmith0.png);
background-position: -733px -607px;
background-position: -207px -1449px;
width: 60px;
height: 60px;
}
@ -1926,13 +1926,13 @@
}
.hair_mustache_1_pyellow {
background-image: url(spritesmith0.png);
background-position: -455px -1434px;
background-position: -708px -592px;
width: 90px;
height: 90px;
}
.customize-option.hair_mustache_1_pyellow {
background-image: url(spritesmith0.png);
background-position: -480px -1449px;
background-position: -733px -607px;
width: 60px;
height: 60px;
}
@ -3810,431 +3810,503 @@
}
.hair_bangs_3_rainbow {
background-image: url(spritesmith0.png);
background-position: -182px -1434px;
background-position: -1899px -182px;
width: 90px;
height: 90px;
}
.customize-option.hair_bangs_3_rainbow {
background-image: url(spritesmith0.png);
background-position: -207px -1449px;
background-position: -1924px -197px;
width: 60px;
height: 60px;
}
.hair_bangs_3_red {
background-image: url(spritesmith0.png);
background-position: -637px -979px;
background-position: -1899px -273px;
width: 90px;
height: 90px;
}
.customize-option.hair_bangs_3_red {
background-image: url(spritesmith0.png);
background-position: -662px -994px;
background-position: -1924px -288px;
width: 60px;
height: 60px;
}
.hair_bangs_3_snowy {
background-image: url(spritesmith0.png);
background-position: -546px -979px;
background-position: -1899px -364px;
width: 90px;
height: 90px;
}
.customize-option.hair_bangs_3_snowy {
background-image: url(spritesmith0.png);
background-position: -571px -994px;
background-position: -1924px -379px;
width: 60px;
height: 60px;
}
.hair_bangs_3_white {
background-image: url(spritesmith0.png);
background-position: -455px -979px;
background-position: -1899px -455px;
width: 90px;
height: 90px;
}
.customize-option.hair_bangs_3_white {
background-image: url(spritesmith0.png);
background-position: -480px -994px;
background-position: -1924px -470px;
width: 60px;
height: 60px;
}
.hair_bangs_3_winternight {
background-image: url(spritesmith0.png);
background-position: -364px -979px;
background-position: -1899px -546px;
width: 90px;
height: 90px;
}
.customize-option.hair_bangs_3_winternight {
background-image: url(spritesmith0.png);
background-position: -389px -994px;
background-position: -1924px -561px;
width: 60px;
height: 60px;
}
.hair_bangs_3_winterstar {
background-image: url(spritesmith0.png);
background-position: -273px -979px;
background-position: -1899px -637px;
width: 90px;
height: 90px;
}
.customize-option.hair_bangs_3_winterstar {
background-image: url(spritesmith0.png);
background-position: -298px -994px;
background-position: -1924px -652px;
width: 60px;
height: 60px;
}
.hair_bangs_3_yellow {
background-image: url(spritesmith0.png);
background-position: -182px -979px;
background-position: -455px -1434px;
width: 90px;
height: 90px;
}
.customize-option.hair_bangs_3_yellow {
background-image: url(spritesmith0.png);
background-position: -207px -994px;
background-position: -480px -1449px;
width: 60px;
height: 60px;
}
.hair_bangs_3_zombie {
background-image: url(spritesmith0.png);
background-position: -91px -979px;
background-position: -637px -979px;
width: 90px;
height: 90px;
}
.customize-option.hair_bangs_3_zombie {
background-image: url(spritesmith0.png);
background-position: -116px -994px;
background-position: -662px -994px;
width: 60px;
height: 60px;
}
.hair_base_10_TRUred {
background-image: url(spritesmith0.png);
background-position: 0px -979px;
background-position: -546px -979px;
width: 90px;
height: 90px;
}
.customize-option.hair_base_10_TRUred {
background-image: url(spritesmith0.png);
background-position: -25px -994px;
background-position: -571px -994px;
width: 60px;
height: 60px;
}
.hair_base_10_aurora {
background-image: url(spritesmith0.png);
background-position: -989px -819px;
background-position: -455px -979px;
width: 90px;
height: 90px;
}
.customize-option.hair_base_10_aurora {
background-image: url(spritesmith0.png);
background-position: -1014px -834px;
background-position: -480px -994px;
width: 60px;
height: 60px;
}
.hair_base_10_black {
background-image: url(spritesmith0.png);
background-position: -989px -728px;
background-position: -364px -979px;
width: 90px;
height: 90px;
}
.customize-option.hair_base_10_black {
background-image: url(spritesmith0.png);
background-position: -1014px -743px;
background-position: -389px -994px;
width: 60px;
height: 60px;
}
.hair_base_10_blond {
background-image: url(spritesmith0.png);
background-position: -989px -637px;
background-position: -273px -979px;
width: 90px;
height: 90px;
}
.customize-option.hair_base_10_blond {
background-image: url(spritesmith0.png);
background-position: -1014px -652px;
background-position: -298px -994px;
width: 60px;
height: 60px;
}
.hair_base_10_blue {
background-image: url(spritesmith0.png);
background-position: -989px -546px;
background-position: -182px -979px;
width: 90px;
height: 90px;
}
.customize-option.hair_base_10_blue {
background-image: url(spritesmith0.png);
background-position: -1014px -561px;
background-position: -207px -994px;
width: 60px;
height: 60px;
}
.hair_base_10_brown {
background-image: url(spritesmith0.png);
background-position: -989px -455px;
background-position: -91px -979px;
width: 90px;
height: 90px;
}
.customize-option.hair_base_10_brown {
background-image: url(spritesmith0.png);
background-position: -1014px -470px;
background-position: -116px -994px;
width: 60px;
height: 60px;
}
.hair_base_10_candycane {
background-image: url(spritesmith0.png);
background-position: -989px -364px;
background-position: 0px -979px;
width: 90px;
height: 90px;
}
.customize-option.hair_base_10_candycane {
background-image: url(spritesmith0.png);
background-position: -1014px -379px;
background-position: -25px -994px;
width: 60px;
height: 60px;
}
.hair_base_10_candycorn {
background-image: url(spritesmith0.png);
background-position: -989px -273px;
background-position: -989px -819px;
width: 90px;
height: 90px;
}
.customize-option.hair_base_10_candycorn {
background-image: url(spritesmith0.png);
background-position: -1014px -288px;
background-position: -1014px -834px;
width: 60px;
height: 60px;
}
.hair_base_10_festive {
background-image: url(spritesmith0.png);
background-position: -989px -182px;
background-position: -989px -728px;
width: 90px;
height: 90px;
}
.customize-option.hair_base_10_festive {
background-image: url(spritesmith0.png);
background-position: -1014px -197px;
background-position: -1014px -743px;
width: 60px;
height: 60px;
}
.hair_base_10_frost {
background-image: url(spritesmith0.png);
background-position: -989px -91px;
background-position: -989px -637px;
width: 90px;
height: 90px;
}
.customize-option.hair_base_10_frost {
background-image: url(spritesmith0.png);
background-position: -1014px -106px;
background-position: -1014px -652px;
width: 60px;
height: 60px;
}
.hair_base_10_ghostwhite {
background-image: url(spritesmith0.png);
background-position: -989px 0px;
background-position: -989px -546px;
width: 90px;
height: 90px;
}
.customize-option.hair_base_10_ghostwhite {
background-image: url(spritesmith0.png);
background-position: -1014px -15px;
background-position: -1014px -561px;
width: 60px;
height: 60px;
}
.hair_base_10_green {
background-image: url(spritesmith0.png);
background-position: -819px -888px;
background-position: -989px -455px;
width: 90px;
height: 90px;
}
.customize-option.hair_base_10_green {
background-image: url(spritesmith0.png);
background-position: -844px -903px;
background-position: -1014px -470px;
width: 60px;
height: 60px;
}
.hair_base_10_halloween {
background-image: url(spritesmith0.png);
background-position: -728px -888px;
background-position: -989px -364px;
width: 90px;
height: 90px;
}
.customize-option.hair_base_10_halloween {
background-image: url(spritesmith0.png);
background-position: -753px -903px;
background-position: -1014px -379px;
width: 60px;
height: 60px;
}
.hair_base_10_holly {
background-image: url(spritesmith0.png);
background-position: -637px -888px;
background-position: -989px -273px;
width: 90px;
height: 90px;
}
.customize-option.hair_base_10_holly {
background-image: url(spritesmith0.png);
background-position: -662px -903px;
background-position: -1014px -288px;
width: 60px;
height: 60px;
}
.hair_base_10_hollygreen {
background-image: url(spritesmith0.png);
background-position: -546px -888px;
background-position: -989px -182px;
width: 90px;
height: 90px;
}
.customize-option.hair_base_10_hollygreen {
background-image: url(spritesmith0.png);
background-position: -571px -903px;
background-position: -1014px -197px;
width: 60px;
height: 60px;
}
.hair_base_10_midnight {
background-image: url(spritesmith0.png);
background-position: -455px -888px;
background-position: -989px -91px;
width: 90px;
height: 90px;
}
.customize-option.hair_base_10_midnight {
background-image: url(spritesmith0.png);
background-position: -480px -903px;
background-position: -1014px -106px;
width: 60px;
height: 60px;
}
.hair_base_10_pblue {
background-image: url(spritesmith0.png);
background-position: -364px -888px;
background-position: -989px 0px;
width: 90px;
height: 90px;
}
.customize-option.hair_base_10_pblue {
background-image: url(spritesmith0.png);
background-position: -389px -903px;
background-position: -1014px -15px;
width: 60px;
height: 60px;
}
.hair_base_10_pblue2 {
background-image: url(spritesmith0.png);
background-position: -273px -888px;
background-position: -819px -888px;
width: 90px;
height: 90px;
}
.customize-option.hair_base_10_pblue2 {
background-image: url(spritesmith0.png);
background-position: -298px -903px;
background-position: -844px -903px;
width: 60px;
height: 60px;
}
.hair_base_10_peppermint {
background-image: url(spritesmith0.png);
background-position: -182px -888px;
background-position: -728px -888px;
width: 90px;
height: 90px;
}
.customize-option.hair_base_10_peppermint {
background-image: url(spritesmith0.png);
background-position: -207px -903px;
background-position: -753px -903px;
width: 60px;
height: 60px;
}
.hair_base_10_pgreen {
background-image: url(spritesmith0.png);
background-position: -91px -888px;
background-position: -637px -888px;
width: 90px;
height: 90px;
}
.customize-option.hair_base_10_pgreen {
background-image: url(spritesmith0.png);
background-position: -116px -903px;
background-position: -662px -903px;
width: 60px;
height: 60px;
}
.hair_base_10_pgreen2 {
background-image: url(spritesmith0.png);
background-position: 0px -888px;
background-position: -546px -888px;
width: 90px;
height: 90px;
}
.customize-option.hair_base_10_pgreen2 {
background-image: url(spritesmith0.png);
background-position: -25px -903px;
background-position: -571px -903px;
width: 60px;
height: 60px;
}
.hair_base_10_porange {
background-image: url(spritesmith0.png);
background-position: -889px -740px;
background-position: -455px -888px;
width: 90px;
height: 90px;
}
.customize-option.hair_base_10_porange {
background-image: url(spritesmith0.png);
background-position: -914px -755px;
background-position: -480px -903px;
width: 60px;
height: 60px;
}
.hair_base_10_porange2 {
background-image: url(spritesmith0.png);
background-position: -798px -740px;
background-position: -364px -888px;
width: 90px;
height: 90px;
}
.customize-option.hair_base_10_porange2 {
background-image: url(spritesmith0.png);
background-position: -823px -755px;
background-position: -389px -903px;
width: 60px;
height: 60px;
}
.hair_base_10_ppink {
background-image: url(spritesmith0.png);
background-position: -707px -740px;
background-position: -273px -888px;
width: 90px;
height: 90px;
}
.customize-option.hair_base_10_ppink {
background-image: url(spritesmith0.png);
background-position: -732px -755px;
background-position: -298px -903px;
width: 60px;
height: 60px;
}
.hair_base_10_ppink2 {
background-image: url(spritesmith0.png);
background-position: -1080px 0px;
background-position: -182px -888px;
width: 90px;
height: 90px;
}
.customize-option.hair_base_10_ppink2 {
background-image: url(spritesmith0.png);
background-position: -1105px -15px;
background-position: -207px -903px;
width: 60px;
height: 60px;
}
.hair_base_10_ppurple {
background-image: url(spritesmith0.png);
background-position: -910px -979px;
background-position: -91px -888px;
width: 90px;
height: 90px;
}
.customize-option.hair_base_10_ppurple {
background-image: url(spritesmith0.png);
background-position: -935px -994px;
background-position: -116px -903px;
width: 60px;
height: 60px;
}
.hair_base_10_ppurple2 {
background-image: url(spritesmith0.png);
background-position: -819px -979px;
background-position: 0px -888px;
width: 90px;
height: 90px;
}
.customize-option.hair_base_10_ppurple2 {
background-image: url(spritesmith0.png);
background-position: -844px -994px;
background-position: -25px -903px;
width: 60px;
height: 60px;
}
.hair_base_10_pumpkin {
background-image: url(spritesmith0.png);
background-position: -728px -979px;
background-position: -889px -740px;
width: 90px;
height: 90px;
}
.customize-option.hair_base_10_pumpkin {
background-image: url(spritesmith0.png);
background-position: -914px -755px;
width: 60px;
height: 60px;
}
.hair_base_10_purple {
background-image: url(spritesmith0.png);
background-position: -798px -740px;
width: 90px;
height: 90px;
}
.customize-option.hair_base_10_purple {
background-image: url(spritesmith0.png);
background-position: -823px -755px;
width: 60px;
height: 60px;
}
.hair_base_10_pyellow {
background-image: url(spritesmith0.png);
background-position: -707px -740px;
width: 90px;
height: 90px;
}
.customize-option.hair_base_10_pyellow {
background-image: url(spritesmith0.png);
background-position: -732px -755px;
width: 60px;
height: 60px;
}
.hair_base_10_pyellow2 {
background-image: url(spritesmith0.png);
background-position: -1080px 0px;
width: 90px;
height: 90px;
}
.customize-option.hair_base_10_pyellow2 {
background-image: url(spritesmith0.png);
background-position: -1105px -15px;
width: 60px;
height: 60px;
}
.hair_base_10_rainbow {
background-image: url(spritesmith0.png);
background-position: -910px -979px;
width: 90px;
height: 90px;
}
.customize-option.hair_base_10_rainbow {
background-image: url(spritesmith0.png);
background-position: -935px -994px;
width: 60px;
height: 60px;
}
.hair_base_10_red {
background-image: url(spritesmith0.png);
background-position: -819px -979px;
width: 90px;
height: 90px;
}
.customize-option.hair_base_10_red {
background-image: url(spritesmith0.png);
background-position: -844px -994px;
width: 60px;
height: 60px;
}
.hair_base_10_snowy {
background-image: url(spritesmith0.png);
background-position: -728px -979px;
width: 90px;
height: 90px;
}
.customize-option.hair_base_10_snowy {
background-image: url(spritesmith0.png);
background-position: -753px -994px;
width: 60px;

Binary file not shown.

Before

Width:  |  Height:  |  Size: 305 KiB

After

Width:  |  Height:  |  Size: 306 KiB

File diff suppressed because it is too large Load diff

Binary file not shown.

Before

Width:  |  Height:  |  Size: 78 KiB

After

Width:  |  Height:  |  Size: 79 KiB

File diff suppressed because it is too large Load diff

Binary file not shown.

Before

Width:  |  Height:  |  Size: 150 KiB

After

Width:  |  Height:  |  Size: 150 KiB

File diff suppressed because it is too large Load diff

Binary file not shown.

Before

Width:  |  Height:  |  Size: 151 KiB

After

Width:  |  Height:  |  Size: 157 KiB

File diff suppressed because it is too large Load diff

Binary file not shown.

Before

Width:  |  Height:  |  Size: 696 KiB

After

Width:  |  Height:  |  Size: 722 KiB

File diff suppressed because it is too large Load diff

Binary file not shown.

Before

Width:  |  Height:  |  Size: 364 KiB

After

Width:  |  Height:  |  Size: 367 KiB

File diff suppressed because it is too large Load diff

Binary file not shown.

Before

Width:  |  Height:  |  Size: 304 KiB

After

Width:  |  Height:  |  Size: 310 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.8 KiB

After

Width:  |  Height:  |  Size: 5.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.6 KiB

After

Width:  |  Height:  |  Size: 3.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5 KiB

After

Width:  |  Height:  |  Size: 5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.3 KiB

After

Width:  |  Height:  |  Size: 4.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.7 KiB

After

Width:  |  Height:  |  Size: 6.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 30 KiB

View file

@ -44,5 +44,9 @@
"mightyBunnySet": "Mighty Bunny (Warrior)",
"magicMouseSet": "Magic Mouse (Mage)",
"lovingPupSet": "Loving Pup (Healer)",
"stealthyKittySet": "Stealthy Kitty (Rogue)"
"stealthyKittySet": "Stealthy Kitty (Rogue)",
"daringSwashbucklerSet": "Daring Swashbuckler (Warrior)",
"emeraldMermageSet": "Emerald Mermage (Mage)",
"reefSeahealerSet": "Reef Seahealer (Healer)",
"roguishPirateSet": "Roguish Pirate (Rogue)"
}

View file

@ -20,6 +20,9 @@ classes = ['warrior', 'rogue', 'healer', 'wizard']
gearTypes = [ 'weapon', 'armor', 'head', 'shield', 'body', 'back', 'headAccessory', 'eyewear']
events =
# IMPORTANT: The end date should be one to two days AFTER the actual end of
# the event, to allow people in different timezones to still buy the
# event gear up until at least the actual end of the event.
winter: {start:'2013-12-31',end:'2014-02-01'}
birthday: {start:'2013-01-30',end:'2014-02-01'}
spring: {start:'2014-03-21',end:'2014-05-01'}
@ -28,9 +31,7 @@ events =
fall: {start:'2014-09-21',end:'2014-11-01'}
winter2015: {start:'2014-12-21',end:'2015-02-02'}
spring2015: {start:'2015-03-20',end:'2015-05-02'}
# IMPORTANT: The end date should be one to two days AFTER the actual end of
# the event, to allow people in different timezones to still buy the
# event gear up until at least the actual end of the event.
summer2015: {start:'2015-06-21',end:'2015-08-02'}
api.mystery =
201402: {start:'2014-02-22',end:'2014-02-28', text:'Winged Messenger Set'}
@ -135,6 +136,11 @@ gear =
spring2015Warrior: event: events.spring2015, specialClass: 'warrior', text: t('weaponSpecialSpring2015WarriorText'), notes: t('weaponSpecialSpring2015WarriorNotes', {str: 15}), value: 90, str: 15
spring2015Mage: event: events.spring2015, specialClass: 'wizard', twoHanded:true, text: t('weaponSpecialSpring2015MageText'), notes: t('weaponSpecialSpring2015MageNotes', {int: 15, per: 7}), value: 160, int:15, per:7
spring2015Healer: event: events.spring2015, specialClass: 'healer', text: t('weaponSpecialSpring2015HealerText'), notes: t('weaponSpecialSpring2015HealerNotes', {int: 9}), value: 90, int: 9
# Summer 2015
summer2015Rogue: event: events.summer2015, specialClass: 'rogue', text: t('weaponSpecialSummer2015RogueText'), notes: t('weaponSpecialSummer2015RogueNotes', {str: 8}), value: 80, str: 8
summer2015Warrior: event: events.summer2015, specialClass: 'warrior', text: t('weaponSpecialSummer2015WarriorText'), notes: t('weaponSpecialSummer2015WarriorNotes', {str: 15}), value: 90, str: 15
summer2015Mage: event: events.summer2015, specialClass: 'wizard', twoHanded:true, text: t('weaponSpecialSummer2015MageText'), notes: t('weaponSpecialSummer2015MageNotes', {int: 15, per: 7}), value: 160, int:15, per:7
summer2015Healer: event: events.summer2015, specialClass: 'healer', text: t('weaponSpecialSummer2015HealerText'), notes: t('weaponSpecialSummer2015HealerNotes', {int: 9}), value: 90, int: 9
mystery:
201411: text: t('weaponMystery201411Text'), notes: t('weaponMystery201411Notes'), mystery:'201411', value: 0
201502: text: t('weaponMystery201502Text'), notes: t('weaponMystery201502Notes'), mystery:'201502', value: 0
@ -211,6 +217,11 @@ gear =
spring2015Warrior: event: events.spring2015, specialClass: 'warrior', text: t('armorSpecialSpring2015WarriorText'), notes: t('armorSpecialSpring2015WarriorNotes', {con: 9}), value: 90, con: 9
spring2015Mage: event: events.spring2015, specialClass: 'wizard', text: t('armorSpecialSpring2015MageText'), notes: t('armorSpecialSpring2015MageNotes', {int: 9}), value: 90, int: 9
spring2015Healer: event: events.spring2015, specialClass: 'healer', text: t('armorSpecialSpring2015HealerText'), notes: t('armorSpecialSpring2015HealerNotes', {con: 15}), value: 90, con: 15
# Summer 2015
summer2015Rogue: event: events.summer2015, specialClass: 'rogue', text: t('armorSpecialSummer2015RogueText'), notes: t('armorSpecialSummer2015RogueNotes', {per: 15}), value: 90, per: 15
summer2015Warrior: event: events.summer2015, specialClass: 'warrior', text: t('armorSpecialSummer2015WarriorText'), notes: t('armorSpecialSummer2015WarriorNotes', {con: 9}), value: 90, con: 9
summer2015Mage: event: events.summer2015, specialClass: 'wizard', text: t('armorSpecialSummer2015MageText'), notes: t('armorSpecialSummer2015MageNotes', {int: 9}), value: 90, int: 9
summer2015Healer: event: events.summer2015, specialClass: 'healer', text: t('armorSpecialSummer2015HealerText'), notes: t('armorSpecialSummer2015HealerNotes', {con: 15}), value: 90, con: 15
# Other
gaymerx: event: events.gaymerx, text: t('armorSpecialGaymerxText'), notes: t('armorSpecialGaymerxNotes'), value: 0
mystery:
@ -298,6 +309,11 @@ gear =
spring2015Warrior: event: events.spring2015, specialClass: 'warrior', text: t('headSpecialSpring2015WarriorText'), notes: t('headSpecialSpring2015WarriorNotes', {str: 9}),value: 60,str: 9
spring2015Mage: event: events.spring2015, specialClass: 'wizard', text: t('headSpecialSpring2015MageText'), notes: t('headSpecialSpring2015MageNotes', {per: 7}),value: 60,per: 7
spring2015Healer: event: events.spring2015, specialClass: 'healer', text: t('headSpecialSpring2015HealerText'), notes: t('headSpecialSpring2015HealerNotes', {int: 7}), value: 60, int: 7
# Summer 2015
summer2015Rogue: event: events.summer2015, specialClass: 'rogue', text: t('headSpecialSummer2015RogueText'), notes: t('headSpecialSummer2015RogueNotes', {per: 9}),value: 60,per: 9
summer2015Warrior: event: events.summer2015, specialClass: 'warrior', text: t('headSpecialSummer2015WarriorText'), notes: t('headSpecialSummer2015WarriorNotes', {str: 9}),value: 60,str: 9
summer2015Mage: event: events.summer2015, specialClass: 'wizard', text: t('headSpecialSummer2015MageText'), notes: t('headSpecialSummer2015MageNotes', {per: 7}),value: 60,per: 7
summer2015Healer: event: events.summer2015, specialClass: 'healer', text: t('headSpecialSummer2015HealerText'), notes: t('headSpecialSummer2015HealerNotes', {int: 7}), value: 60, int: 7
# Other
gaymerx: event: events.gaymerx, text: t('headSpecialGaymerxText'), notes: t('headSpecialGaymerxNotes'), value: 0
mystery:
@ -375,6 +391,10 @@ gear =
spring2015Rogue: event: events.spring2015, specialClass: 'rogue', text: t('shieldSpecialSpring2015RogueText'), notes: t('shieldSpecialSpring2015RogueNotes', {str: 8}), value: 80, str: 8
spring2015Warrior: event: events.spring2015, specialClass: 'warrior', text: t('shieldSpecialSpring2015WarriorText'), notes: t('shieldSpecialSpring2015WarriorNotes', {con: 7}), value: 70, con: 7
spring2015Healer: event: events.spring2015, specialClass: 'healer', text: t('shieldSpecialSpring2015HealerText'), notes: t('shieldSpecialSpring2015HealerNotes', {con: 9}), value: 70, con: 9
# Summer 2015
summer2015Rogue: event: events.summer2015, specialClass: 'rogue', text: t('shieldSpecialSummer2015RogueText'), notes: t('shieldSpecialSummer2015RogueNotes', {str: 8}), value: 80, str: 8
summer2015Warrior: event: events.summer2015, specialClass: 'warrior', text: t('shieldSpecialSummer2015WarriorText'), notes: t('shieldSpecialSummer2015WarriorNotes', {con: 7}), value: 70, con: 7
summer2015Healer: event: events.summer2015, specialClass: 'healer', text: t('shieldSpecialSummer2015HealerText'), notes: t('shieldSpecialSummer2015HealerNotes', {con: 9}), value: 70, con: 9
mystery:
301405: text: t('shieldMystery301405Text'), notes: t('shieldMystery301405Notes'), mystery:'301405', value: 0
armoire:
@ -402,6 +422,11 @@ gear =
# Summer
summerHealer: event: events.summer, specialClass: 'healer', text: t('bodySpecialSummerHealerText'), notes: t('bodySpecialSummerHealerNotes'), value: 20
summerMage: event: events.summer, specialClass: 'wizard', text: t('bodySpecialSummerMageText'), notes: t('bodySpecialSummerMageNotes'), value: 20
# Summer 2015
summer2015Healer: event: events.summer2015, specialClass: 'healer', text: t('bodySpecialSummer2015HealerText'), notes: t('bodySpecialSummer2015HealerNotes'), value: 20
summer2015Mage: event: events.summer2015, specialClass: 'wizard', text: t('bodySpecialSummer2015MageText'), notes: t('bodySpecialSummer2015MageNotes'), value: 20
summer2015Rogue: event: events.summer2015, specialClass: 'rogue', text: t('bodySpecialSummer2015RogueText'), notes: t('bodySpecialSummer2015RogueNotes'), value: 20
summer2015Warrior: event: events.summer2015, specialClass: 'warrior', text: t('bodySpecialSummer2015WarriorText'), notes: t('bodySpecialSummer2015WarriorNotes'), value: 20
headAccessory:
base:

View file

@ -35,25 +35,21 @@ script(type='text/ng-template', id='partials/options.inventory.seasonalshop.html
h3.popover-title!=env.t('seasonalShopClosedTitle', {linkStart:"<a href='http://blog.habitrpg.com/who' target='_blank'>", linkEnd: "</a>"})
.popover-content
p!=env.t('seasonalShopClosedText', {linkStart:"<a href='http://habitrpg.wikia.com/wiki/Grand_Galas' target='_blank'>", linkEnd: "</a>"})
// .well(ng-if='User.user.achievements.rebirths > 0')=env.t('seasonalShopRebirth')
// li.customize-menu.inventory-gear
menu.pets-menu(label='{{::label}}', ng-repeat='(set,label) in ::{springWarrior:env.t("mightyBunnySet"), springMage:env.t("magicMouseSet"), springHealer:env.t("lovingPupSet"), springRogue:env.t("stealthyKittySet")}')
// The `if true || false` conditional for applying the transparent class is necessary because
// when a user activates the orb of rebirth, the seasonal items are still in their inventory, but
// they have each have a value of false. The item can be purchased for gold in the rewards column,
// not the seasonal shop. This makes that more clear.
.well(ng-if='User.user.achievements.rebirths > 0')=env.t('seasonalShopRebirth')
li.customize-menu.inventory-gear
menu.pets-menu(label='{{::label}}', ng-repeat='(set,label) in ::{summerWarrior:env.t("daringSwashbucklerSet"), summerMage:env.t("emeraldMermageSet"), summerHealer:env.t("reefSeahealerSet"), summerRogue:env.t("roguishPirateSet")}')
div(ng-repeat='item in ::getSeasonalShopArray(set)' ng-class="{transparent: user.items.gear.owned[item.key] === true ||user.items.gear.owned[item.key] === false}")
button.customize-option(popover='{{::item.notes()}}', popover-title='{{::item.text()}}', popover-trigger='mouseenter', popover-placement='right', popover-append-to-body='true', ng-click='purchase(item.type,item)', class='shop_{{::item.key}}')
.text-left
| {{((item.specialClass == "wizard") && (item.type == "weapon")) + 1}}&nbsp;
span.Pet_Currency_Gem1x.inline-gems
menu.pets-menu(label=env.t('quests'))
// menu.pets-menu(label=env.t('quests'))
div(ng-repeat='quest in ::getSeasonalShopQuests()')
button.customize-option(data-popover-html="{{::quest.previous && !user.achievements.quests[quest.previous] ? env.t('scrollsPre') : questPopover(quest) | markdown}}", popover-append-to-body='true', popover-title='{{::quest.text()}}', popover-trigger='mouseenter', popover-placement='right', ng-click='buyQuest(quest.key)', ng-class='(quest.previous && !user.achievements.quests[quest.previous]) ? "inventory_quest_scroll_locked inventory_quest_scroll_{{::quest.key}}_locked locked" : "inventory_quest_scroll inventory_quest_scroll_{{::quest.key}}"')
p
| {{::quest.value}}&nbsp;
span.Pet_Currency_Gem1x.inline-gems
menu.pets-menu(label=env.t('seasonalItems'))
// menu.pets-menu(label=env.t('seasonalItems'))
div
button.customize-option(popover='{{::Content.spells.special.shinySeed.notes()}}', popover-title='{{::Content.spells.special.shinySeed.text()}}', popover-trigger='mouseenter', popover-placement='right', popover-append-to-body='true', ng-click='purchase("special", Content.spells.special.shinySeed)', class='inventory_special_shinySeed')
p