mirror of
https://github.com/sudoxnym/habitica.git
synced 2026-08-03 00:09:41 +00:00
Merge pull request #5851 from HabitRPG/sabrecat/onboarding-tweaks
Sabrecat/onboarding tweaks
This commit is contained in:
Sabe Jones
commit
6ecf3a0e50
25 changed files with 3336 additions and 3288 deletions
2
common/dist/sprites/habitrpg-shared.css
vendored
2
common/dist/sprites/habitrpg-shared.css
vendored
File diff suppressed because one or more lines are too long
178
common/dist/sprites/spritesmith0.css
vendored
178
common/dist/sprites/spritesmith0.css
vendored
|
|
@ -2022,25 +2022,25 @@
|
|||
}
|
||||
.hair_mustache_1_snowy {
|
||||
background-image: url(spritesmith0.png);
|
||||
background-position: -990px -444px;
|
||||
background-position: -1365px -1434px;
|
||||
width: 90px;
|
||||
height: 90px;
|
||||
}
|
||||
.customize-option.hair_mustache_1_snowy {
|
||||
background-image: url(spritesmith0.png);
|
||||
background-position: -1015px -459px;
|
||||
background-position: -1390px -1449px;
|
||||
width: 60px;
|
||||
height: 60px;
|
||||
}
|
||||
.hair_mustache_1_white {
|
||||
background-image: url(spritesmith0.png);
|
||||
background-position: -1456px -1434px;
|
||||
background-position: -990px -444px;
|
||||
width: 90px;
|
||||
height: 90px;
|
||||
}
|
||||
.customize-option.hair_mustache_1_white {
|
||||
background-image: url(spritesmith0.png);
|
||||
background-position: -1481px -1449px;
|
||||
background-position: -1015px -459px;
|
||||
width: 60px;
|
||||
height: 60px;
|
||||
}
|
||||
|
|
@ -4086,479 +4086,491 @@
|
|||
}
|
||||
.hair_base_10_ghostwhite {
|
||||
background-image: url(spritesmith0.png);
|
||||
background-position: -1365px -1434px;
|
||||
background-position: -182px -1889px;
|
||||
width: 90px;
|
||||
height: 90px;
|
||||
}
|
||||
.customize-option.hair_base_10_ghostwhite {
|
||||
background-image: url(spritesmith0.png);
|
||||
background-position: -1390px -1449px;
|
||||
background-position: -207px -1904px;
|
||||
width: 60px;
|
||||
height: 60px;
|
||||
}
|
||||
.hair_base_10_green {
|
||||
background-image: url(spritesmith0.png);
|
||||
background-position: -1132px -455px;
|
||||
background-position: -1456px -1434px;
|
||||
width: 90px;
|
||||
height: 90px;
|
||||
}
|
||||
.customize-option.hair_base_10_green {
|
||||
background-image: url(spritesmith0.png);
|
||||
background-position: -1157px -470px;
|
||||
background-position: -1481px -1449px;
|
||||
width: 60px;
|
||||
height: 60px;
|
||||
}
|
||||
.hair_base_10_halloween {
|
||||
background-image: url(spritesmith0.png);
|
||||
background-position: -1132px -364px;
|
||||
background-position: -1132px -455px;
|
||||
width: 90px;
|
||||
height: 90px;
|
||||
}
|
||||
.customize-option.hair_base_10_halloween {
|
||||
background-image: url(spritesmith0.png);
|
||||
background-position: -1157px -379px;
|
||||
background-position: -1157px -470px;
|
||||
width: 60px;
|
||||
height: 60px;
|
||||
}
|
||||
.hair_base_10_holly {
|
||||
background-image: url(spritesmith0.png);
|
||||
background-position: -1132px -273px;
|
||||
background-position: -1132px -364px;
|
||||
width: 90px;
|
||||
height: 90px;
|
||||
}
|
||||
.customize-option.hair_base_10_holly {
|
||||
background-image: url(spritesmith0.png);
|
||||
background-position: -1157px -288px;
|
||||
background-position: -1157px -379px;
|
||||
width: 60px;
|
||||
height: 60px;
|
||||
}
|
||||
.hair_base_10_hollygreen {
|
||||
background-image: url(spritesmith0.png);
|
||||
background-position: -1132px -182px;
|
||||
background-position: -1132px -273px;
|
||||
width: 90px;
|
||||
height: 90px;
|
||||
}
|
||||
.customize-option.hair_base_10_hollygreen {
|
||||
background-image: url(spritesmith0.png);
|
||||
background-position: -1157px -197px;
|
||||
background-position: -1157px -288px;
|
||||
width: 60px;
|
||||
height: 60px;
|
||||
}
|
||||
.hair_base_10_midnight {
|
||||
background-image: url(spritesmith0.png);
|
||||
background-position: -1132px -91px;
|
||||
background-position: -1132px -182px;
|
||||
width: 90px;
|
||||
height: 90px;
|
||||
}
|
||||
.customize-option.hair_base_10_midnight {
|
||||
background-image: url(spritesmith0.png);
|
||||
background-position: -1157px -106px;
|
||||
background-position: -1157px -197px;
|
||||
width: 60px;
|
||||
height: 60px;
|
||||
}
|
||||
.hair_base_10_pblue {
|
||||
background-image: url(spritesmith0.png);
|
||||
background-position: -1132px 0px;
|
||||
background-position: -1132px -91px;
|
||||
width: 90px;
|
||||
height: 90px;
|
||||
}
|
||||
.customize-option.hair_base_10_pblue {
|
||||
background-image: url(spritesmith0.png);
|
||||
background-position: -1157px -15px;
|
||||
background-position: -1157px -106px;
|
||||
width: 60px;
|
||||
height: 60px;
|
||||
}
|
||||
.hair_base_10_pblue2 {
|
||||
background-image: url(spritesmith0.png);
|
||||
background-position: -1001px -979px;
|
||||
background-position: -1132px 0px;
|
||||
width: 90px;
|
||||
height: 90px;
|
||||
}
|
||||
.customize-option.hair_base_10_pblue2 {
|
||||
background-image: url(spritesmith0.png);
|
||||
background-position: -1026px -994px;
|
||||
background-position: -1157px -15px;
|
||||
width: 60px;
|
||||
height: 60px;
|
||||
}
|
||||
.hair_base_10_peppermint {
|
||||
background-image: url(spritesmith0.png);
|
||||
background-position: -910px -979px;
|
||||
background-position: -1001px -979px;
|
||||
width: 90px;
|
||||
height: 90px;
|
||||
}
|
||||
.customize-option.hair_base_10_peppermint {
|
||||
background-image: url(spritesmith0.png);
|
||||
background-position: -935px -994px;
|
||||
background-position: -1026px -994px;
|
||||
width: 60px;
|
||||
height: 60px;
|
||||
}
|
||||
.hair_base_10_pgreen {
|
||||
background-image: url(spritesmith0.png);
|
||||
background-position: -819px -979px;
|
||||
background-position: -910px -979px;
|
||||
width: 90px;
|
||||
height: 90px;
|
||||
}
|
||||
.customize-option.hair_base_10_pgreen {
|
||||
background-image: url(spritesmith0.png);
|
||||
background-position: -844px -994px;
|
||||
background-position: -935px -994px;
|
||||
width: 60px;
|
||||
height: 60px;
|
||||
}
|
||||
.hair_base_10_pgreen2 {
|
||||
background-image: url(spritesmith0.png);
|
||||
background-position: -728px -979px;
|
||||
background-position: -819px -979px;
|
||||
width: 90px;
|
||||
height: 90px;
|
||||
}
|
||||
.customize-option.hair_base_10_pgreen2 {
|
||||
background-image: url(spritesmith0.png);
|
||||
background-position: -753px -994px;
|
||||
background-position: -844px -994px;
|
||||
width: 60px;
|
||||
height: 60px;
|
||||
}
|
||||
.hair_base_10_porange {
|
||||
background-image: url(spritesmith0.png);
|
||||
background-position: -637px -979px;
|
||||
background-position: -728px -979px;
|
||||
width: 90px;
|
||||
height: 90px;
|
||||
}
|
||||
.customize-option.hair_base_10_porange {
|
||||
background-image: url(spritesmith0.png);
|
||||
background-position: -662px -994px;
|
||||
background-position: -753px -994px;
|
||||
width: 60px;
|
||||
height: 60px;
|
||||
}
|
||||
.hair_base_10_porange2 {
|
||||
background-image: url(spritesmith0.png);
|
||||
background-position: -546px -979px;
|
||||
background-position: -637px -979px;
|
||||
width: 90px;
|
||||
height: 90px;
|
||||
}
|
||||
.customize-option.hair_base_10_porange2 {
|
||||
background-image: url(spritesmith0.png);
|
||||
background-position: -571px -994px;
|
||||
background-position: -662px -994px;
|
||||
width: 60px;
|
||||
height: 60px;
|
||||
}
|
||||
.hair_base_10_ppink {
|
||||
background-image: url(spritesmith0.png);
|
||||
background-position: -455px -979px;
|
||||
background-position: -546px -979px;
|
||||
width: 90px;
|
||||
height: 90px;
|
||||
}
|
||||
.customize-option.hair_base_10_ppink {
|
||||
background-image: url(spritesmith0.png);
|
||||
background-position: -480px -994px;
|
||||
background-position: -571px -994px;
|
||||
width: 60px;
|
||||
height: 60px;
|
||||
}
|
||||
.hair_base_10_ppink2 {
|
||||
background-image: url(spritesmith0.png);
|
||||
background-position: -364px -979px;
|
||||
background-position: -455px -979px;
|
||||
width: 90px;
|
||||
height: 90px;
|
||||
}
|
||||
.customize-option.hair_base_10_ppink2 {
|
||||
background-image: url(spritesmith0.png);
|
||||
background-position: -389px -994px;
|
||||
background-position: -480px -994px;
|
||||
width: 60px;
|
||||
height: 60px;
|
||||
}
|
||||
.hair_base_10_ppurple {
|
||||
background-image: url(spritesmith0.png);
|
||||
background-position: -273px -979px;
|
||||
background-position: -364px -979px;
|
||||
width: 90px;
|
||||
height: 90px;
|
||||
}
|
||||
.customize-option.hair_base_10_ppurple {
|
||||
background-image: url(spritesmith0.png);
|
||||
background-position: -298px -994px;
|
||||
background-position: -389px -994px;
|
||||
width: 60px;
|
||||
height: 60px;
|
||||
}
|
||||
.hair_base_10_ppurple2 {
|
||||
background-image: url(spritesmith0.png);
|
||||
background-position: -182px -979px;
|
||||
background-position: -273px -979px;
|
||||
width: 90px;
|
||||
height: 90px;
|
||||
}
|
||||
.customize-option.hair_base_10_ppurple2 {
|
||||
background-image: url(spritesmith0.png);
|
||||
background-position: -207px -994px;
|
||||
background-position: -298px -994px;
|
||||
width: 60px;
|
||||
height: 60px;
|
||||
}
|
||||
.hair_base_10_pumpkin {
|
||||
background-image: url(spritesmith0.png);
|
||||
background-position: -91px -979px;
|
||||
background-position: -182px -979px;
|
||||
width: 90px;
|
||||
height: 90px;
|
||||
}
|
||||
.customize-option.hair_base_10_pumpkin {
|
||||
background-image: url(spritesmith0.png);
|
||||
background-position: -116px -994px;
|
||||
background-position: -207px -994px;
|
||||
width: 60px;
|
||||
height: 60px;
|
||||
}
|
||||
.hair_base_10_purple {
|
||||
background-image: url(spritesmith0.png);
|
||||
background-position: 0px -979px;
|
||||
background-position: -91px -979px;
|
||||
width: 90px;
|
||||
height: 90px;
|
||||
}
|
||||
.customize-option.hair_base_10_purple {
|
||||
background-image: url(spritesmith0.png);
|
||||
background-position: -25px -994px;
|
||||
background-position: -116px -994px;
|
||||
width: 60px;
|
||||
height: 60px;
|
||||
}
|
||||
.hair_base_10_pyellow {
|
||||
background-image: url(spritesmith0.png);
|
||||
background-position: -1001px -888px;
|
||||
background-position: 0px -979px;
|
||||
width: 90px;
|
||||
height: 90px;
|
||||
}
|
||||
.customize-option.hair_base_10_pyellow {
|
||||
background-image: url(spritesmith0.png);
|
||||
background-position: -1026px -903px;
|
||||
background-position: -25px -994px;
|
||||
width: 60px;
|
||||
height: 60px;
|
||||
}
|
||||
.hair_base_10_pyellow2 {
|
||||
background-image: url(spritesmith0.png);
|
||||
background-position: -910px -888px;
|
||||
background-position: -1001px -888px;
|
||||
width: 90px;
|
||||
height: 90px;
|
||||
}
|
||||
.customize-option.hair_base_10_pyellow2 {
|
||||
background-image: url(spritesmith0.png);
|
||||
background-position: -935px -903px;
|
||||
background-position: -1026px -903px;
|
||||
width: 60px;
|
||||
height: 60px;
|
||||
}
|
||||
.hair_base_10_rainbow {
|
||||
background-image: url(spritesmith0.png);
|
||||
background-position: -819px -888px;
|
||||
background-position: -910px -888px;
|
||||
width: 90px;
|
||||
height: 90px;
|
||||
}
|
||||
.customize-option.hair_base_10_rainbow {
|
||||
background-image: url(spritesmith0.png);
|
||||
background-position: -844px -903px;
|
||||
background-position: -935px -903px;
|
||||
width: 60px;
|
||||
height: 60px;
|
||||
}
|
||||
.hair_base_10_red {
|
||||
background-image: url(spritesmith0.png);
|
||||
background-position: -728px -888px;
|
||||
background-position: -819px -888px;
|
||||
width: 90px;
|
||||
height: 90px;
|
||||
}
|
||||
.customize-option.hair_base_10_red {
|
||||
background-image: url(spritesmith0.png);
|
||||
background-position: -753px -903px;
|
||||
background-position: -844px -903px;
|
||||
width: 60px;
|
||||
height: 60px;
|
||||
}
|
||||
.hair_base_10_snowy {
|
||||
background-image: url(spritesmith0.png);
|
||||
background-position: -637px -888px;
|
||||
background-position: -728px -888px;
|
||||
width: 90px;
|
||||
height: 90px;
|
||||
}
|
||||
.customize-option.hair_base_10_snowy {
|
||||
background-image: url(spritesmith0.png);
|
||||
background-position: -662px -903px;
|
||||
background-position: -753px -903px;
|
||||
width: 60px;
|
||||
height: 60px;
|
||||
}
|
||||
.hair_base_10_white {
|
||||
background-image: url(spritesmith0.png);
|
||||
background-position: -546px -888px;
|
||||
background-position: -637px -888px;
|
||||
width: 90px;
|
||||
height: 90px;
|
||||
}
|
||||
.customize-option.hair_base_10_white {
|
||||
background-image: url(spritesmith0.png);
|
||||
background-position: -571px -903px;
|
||||
background-position: -662px -903px;
|
||||
width: 60px;
|
||||
height: 60px;
|
||||
}
|
||||
.hair_base_10_winternight {
|
||||
background-image: url(spritesmith0.png);
|
||||
background-position: -455px -888px;
|
||||
background-position: -546px -888px;
|
||||
width: 90px;
|
||||
height: 90px;
|
||||
}
|
||||
.customize-option.hair_base_10_winternight {
|
||||
background-image: url(spritesmith0.png);
|
||||
background-position: -480px -903px;
|
||||
background-position: -571px -903px;
|
||||
width: 60px;
|
||||
height: 60px;
|
||||
}
|
||||
.hair_base_10_winterstar {
|
||||
background-image: url(spritesmith0.png);
|
||||
background-position: -364px -888px;
|
||||
background-position: -455px -888px;
|
||||
width: 90px;
|
||||
height: 90px;
|
||||
}
|
||||
.customize-option.hair_base_10_winterstar {
|
||||
background-image: url(spritesmith0.png);
|
||||
background-position: -389px -903px;
|
||||
background-position: -480px -903px;
|
||||
width: 60px;
|
||||
height: 60px;
|
||||
}
|
||||
.hair_base_10_yellow {
|
||||
background-image: url(spritesmith0.png);
|
||||
background-position: -273px -888px;
|
||||
background-position: -364px -888px;
|
||||
width: 90px;
|
||||
height: 90px;
|
||||
}
|
||||
.customize-option.hair_base_10_yellow {
|
||||
background-image: url(spritesmith0.png);
|
||||
background-position: -298px -903px;
|
||||
background-position: -389px -903px;
|
||||
width: 60px;
|
||||
height: 60px;
|
||||
}
|
||||
.hair_base_10_zombie {
|
||||
background-image: url(spritesmith0.png);
|
||||
background-position: -182px -888px;
|
||||
background-position: -273px -888px;
|
||||
width: 90px;
|
||||
height: 90px;
|
||||
}
|
||||
.customize-option.hair_base_10_zombie {
|
||||
background-image: url(spritesmith0.png);
|
||||
background-position: -207px -903px;
|
||||
background-position: -298px -903px;
|
||||
width: 60px;
|
||||
height: 60px;
|
||||
}
|
||||
.hair_base_11_TRUred {
|
||||
background-image: url(spritesmith0.png);
|
||||
background-position: -91px -888px;
|
||||
background-position: -182px -888px;
|
||||
width: 90px;
|
||||
height: 90px;
|
||||
}
|
||||
.customize-option.hair_base_11_TRUred {
|
||||
background-image: url(spritesmith0.png);
|
||||
background-position: -116px -903px;
|
||||
background-position: -207px -903px;
|
||||
width: 60px;
|
||||
height: 60px;
|
||||
}
|
||||
.hair_base_11_aurora {
|
||||
background-image: url(spritesmith0.png);
|
||||
background-position: 0px -888px;
|
||||
background-position: -91px -888px;
|
||||
width: 90px;
|
||||
height: 90px;
|
||||
}
|
||||
.customize-option.hair_base_11_aurora {
|
||||
background-image: url(spritesmith0.png);
|
||||
background-position: -25px -903px;
|
||||
background-position: -116px -903px;
|
||||
width: 60px;
|
||||
height: 60px;
|
||||
}
|
||||
.hair_base_11_black {
|
||||
background-image: url(spritesmith0.png);
|
||||
background-position: -990px -717px;
|
||||
background-position: 0px -888px;
|
||||
width: 90px;
|
||||
height: 90px;
|
||||
}
|
||||
.customize-option.hair_base_11_black {
|
||||
background-image: url(spritesmith0.png);
|
||||
background-position: -1015px -732px;
|
||||
background-position: -25px -903px;
|
||||
width: 60px;
|
||||
height: 60px;
|
||||
}
|
||||
.hair_base_11_blond {
|
||||
background-image: url(spritesmith0.png);
|
||||
background-position: -990px -626px;
|
||||
background-position: -990px -717px;
|
||||
width: 90px;
|
||||
height: 90px;
|
||||
}
|
||||
.customize-option.hair_base_11_blond {
|
||||
background-image: url(spritesmith0.png);
|
||||
background-position: -1015px -641px;
|
||||
background-position: -1015px -732px;
|
||||
width: 60px;
|
||||
height: 60px;
|
||||
}
|
||||
.hair_base_11_blue {
|
||||
background-image: url(spritesmith0.png);
|
||||
background-position: -990px -535px;
|
||||
background-position: -990px -626px;
|
||||
width: 90px;
|
||||
height: 90px;
|
||||
}
|
||||
.customize-option.hair_base_11_blue {
|
||||
background-image: url(spritesmith0.png);
|
||||
background-position: -1015px -550px;
|
||||
background-position: -1015px -641px;
|
||||
width: 60px;
|
||||
height: 60px;
|
||||
}
|
||||
.hair_base_11_brown {
|
||||
background-image: url(spritesmith0.png);
|
||||
background-position: 0px -1070px;
|
||||
background-position: -990px -535px;
|
||||
width: 90px;
|
||||
height: 90px;
|
||||
}
|
||||
.customize-option.hair_base_11_brown {
|
||||
background-image: url(spritesmith0.png);
|
||||
background-position: -25px -1085px;
|
||||
background-position: -1015px -550px;
|
||||
width: 60px;
|
||||
height: 60px;
|
||||
}
|
||||
.hair_base_11_candycane {
|
||||
background-image: url(spritesmith0.png);
|
||||
background-position: -1132px -910px;
|
||||
background-position: 0px -1070px;
|
||||
width: 90px;
|
||||
height: 90px;
|
||||
}
|
||||
.customize-option.hair_base_11_candycane {
|
||||
background-image: url(spritesmith0.png);
|
||||
background-position: -1157px -925px;
|
||||
background-position: -25px -1085px;
|
||||
width: 60px;
|
||||
height: 60px;
|
||||
}
|
||||
.hair_base_11_candycorn {
|
||||
background-image: url(spritesmith0.png);
|
||||
background-position: -1132px -819px;
|
||||
background-position: -1132px -910px;
|
||||
width: 90px;
|
||||
height: 90px;
|
||||
}
|
||||
.customize-option.hair_base_11_candycorn {
|
||||
background-image: url(spritesmith0.png);
|
||||
background-position: -1157px -834px;
|
||||
background-position: -1157px -925px;
|
||||
width: 60px;
|
||||
height: 60px;
|
||||
}
|
||||
.hair_base_11_festive {
|
||||
background-image: url(spritesmith0.png);
|
||||
background-position: -1132px -728px;
|
||||
background-position: -1132px -819px;
|
||||
width: 90px;
|
||||
height: 90px;
|
||||
}
|
||||
.customize-option.hair_base_11_festive {
|
||||
background-image: url(spritesmith0.png);
|
||||
background-position: -1157px -743px;
|
||||
background-position: -1157px -834px;
|
||||
width: 60px;
|
||||
height: 60px;
|
||||
}
|
||||
.hair_base_11_frost {
|
||||
background-image: url(spritesmith0.png);
|
||||
background-position: -1132px -637px;
|
||||
background-position: -1132px -728px;
|
||||
width: 90px;
|
||||
height: 90px;
|
||||
}
|
||||
.customize-option.hair_base_11_frost {
|
||||
background-image: url(spritesmith0.png);
|
||||
background-position: -1157px -652px;
|
||||
background-position: -1157px -743px;
|
||||
width: 60px;
|
||||
height: 60px;
|
||||
}
|
||||
.hair_base_11_ghostwhite {
|
||||
background-image: url(spritesmith0.png);
|
||||
background-position: -1132px -546px;
|
||||
background-position: -1132px -637px;
|
||||
width: 90px;
|
||||
height: 90px;
|
||||
}
|
||||
.customize-option.hair_base_11_ghostwhite {
|
||||
background-image: url(spritesmith0.png);
|
||||
background-position: -1157px -652px;
|
||||
width: 60px;
|
||||
height: 60px;
|
||||
}
|
||||
.hair_base_11_green {
|
||||
background-image: url(spritesmith0.png);
|
||||
background-position: -1132px -546px;
|
||||
width: 90px;
|
||||
height: 90px;
|
||||
}
|
||||
.customize-option.hair_base_11_green {
|
||||
background-image: url(spritesmith0.png);
|
||||
background-position: -1157px -561px;
|
||||
width: 60px;
|
||||
|
|
|
|||
BIN
common/dist/sprites/spritesmith0.png
vendored
BIN
common/dist/sprites/spritesmith0.png
vendored
Binary file not shown.
|
Before Width: | Height: | Size: 241 KiB After Width: | Height: | Size: 241 KiB |
1696
common/dist/sprites/spritesmith1.css
vendored
1696
common/dist/sprites/spritesmith1.css
vendored
File diff suppressed because it is too large
Load diff
BIN
common/dist/sprites/spritesmith1.png
vendored
BIN
common/dist/sprites/spritesmith1.png
vendored
Binary file not shown.
|
Before Width: | Height: | Size: 25 KiB After Width: | Height: | Size: 25 KiB |
1190
common/dist/sprites/spritesmith2.css
vendored
1190
common/dist/sprites/spritesmith2.css
vendored
File diff suppressed because it is too large
Load diff
BIN
common/dist/sprites/spritesmith2.png
vendored
BIN
common/dist/sprites/spritesmith2.png
vendored
Binary file not shown.
|
Before Width: | Height: | Size: 113 KiB After Width: | Height: | Size: 113 KiB |
872
common/dist/sprites/spritesmith3.css
vendored
872
common/dist/sprites/spritesmith3.css
vendored
File diff suppressed because it is too large
Load diff
BIN
common/dist/sprites/spritesmith3.png
vendored
BIN
common/dist/sprites/spritesmith3.png
vendored
Binary file not shown.
|
Before Width: | Height: | Size: 89 KiB After Width: | Height: | Size: 89 KiB |
870
common/dist/sprites/spritesmith4.css
vendored
870
common/dist/sprites/spritesmith4.css
vendored
File diff suppressed because it is too large
Load diff
BIN
common/dist/sprites/spritesmith4.png
vendored
BIN
common/dist/sprites/spritesmith4.png
vendored
Binary file not shown.
|
Before Width: | Height: | Size: 574 KiB After Width: | Height: | Size: 590 KiB |
864
common/dist/sprites/spritesmith5.css
vendored
864
common/dist/sprites/spritesmith5.css
vendored
File diff suppressed because it is too large
Load diff
BIN
common/dist/sprites/spritesmith5.png
vendored
BIN
common/dist/sprites/spritesmith5.png
vendored
Binary file not shown.
|
Before Width: | Height: | Size: 244 KiB After Width: | Height: | Size: 245 KiB |
828
common/dist/sprites/spritesmith6.css
vendored
828
common/dist/sprites/spritesmith6.css
vendored
File diff suppressed because it is too large
Load diff
BIN
common/dist/sprites/spritesmith6.png
vendored
BIN
common/dist/sprites/spritesmith6.png
vendored
Binary file not shown.
|
Before Width: | Height: | Size: 204 KiB After Width: | Height: | Size: 205 KiB |
BIN
common/img/sprites/spritesmith/misc/welcome_basic_avatars.png
Normal file
BIN
common/img/sprites/spritesmith/misc/welcome_basic_avatars.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 10 KiB |
BIN
common/img/sprites/spritesmith/misc/welcome_promo_party.png
Normal file
BIN
common/img/sprites/spritesmith/misc/welcome_promo_party.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 16 KiB |
BIN
common/img/sprites/spritesmith/misc/welcome_sample_tasks.png
Normal file
BIN
common/img/sprites/spritesmith/misc/welcome_sample_tasks.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 5.4 KiB |
|
|
@ -78,11 +78,14 @@
|
|||
"tourRewardsBrief": "<strong>Reward List</strong><ul><li>Spend your hard-earned Gold here!</li><li>Purchase Equipment for your avatar, or set custom Rewards.</li></ul>",
|
||||
"tourRewardsProceed": "That's all!",
|
||||
|
||||
"welcomeToHabit": "Welcome to Habitica, a game to improve your life!",
|
||||
"welcome1": "Create and customize an in-game avatar to represent you.",
|
||||
"welcome2": "Your real-life tasks affect your avatar's Health (HP), Experience (XP), and Gold!",
|
||||
"welcome3": "Complete tasks to earn Experience (XP) and Gold, which unlock awesome features and rewards!",
|
||||
"welcomeToHabit": "Welcome to Habitica!",
|
||||
"welcome1": "Create a basic avatar.",
|
||||
"welcome1notes": "This avatar will represent you as you progress.",
|
||||
"welcome2": "Set up your tasks.",
|
||||
"welcome2notes": "How well you do on your real-life tasks will control how well you do in the game!",
|
||||
"welcome3": "Progress in life and the game!",
|
||||
"welcome3notes": "As you improve your life, your avatar will level up and unlock pets, quests, equipment, and more!",
|
||||
"welcome4": "Avoid bad habits that drain Health (HP), or your avatar will die!",
|
||||
"welcome5": "Now you'll customize your avatar and set up your tasks...",
|
||||
"imReady": "I'm Ready!"
|
||||
"imReady": "Enter Habitica"
|
||||
}
|
||||
|
|
|
|||
|
|
@ -94,7 +94,7 @@ describe('notificationServices', function() {
|
|||
|
||||
expect($.pnotify).to.have.been.calledThrice;
|
||||
expect(arg.type).to.eql('xp');
|
||||
expect(arg.text).to.eql('+ 50 XP');
|
||||
expect(arg.text).to.eql('+ 50 Experience');
|
||||
expect(arg.icon).to.eql('glyphicon glyphicon-star');
|
||||
});
|
||||
|
||||
|
|
@ -104,7 +104,7 @@ describe('notificationServices', function() {
|
|||
|
||||
expect($.pnotify).to.have.been.calledOnce;
|
||||
expect(arg.type).to.eql('xp');
|
||||
expect(arg.text).to.eql('+ 50.2 XP');
|
||||
expect(arg.text).to.eql('+ 50.2 Experience');
|
||||
expect(arg.icon).to.eql('glyphicon glyphicon-star');
|
||||
});
|
||||
|
||||
|
|
@ -134,7 +134,7 @@ describe('notificationServices', function() {
|
|||
|
||||
expect($.pnotify).to.have.been.calledOnce;
|
||||
expect(arg.type).to.eql('hp');
|
||||
expect(arg.text).to.eql('+ 10 HP');
|
||||
expect(arg.text).to.eql('+ 10 Health');
|
||||
expect(arg.icon).to.eql('glyphicon glyphicon-heart');
|
||||
});
|
||||
|
||||
|
|
@ -170,7 +170,7 @@ describe('notificationServices', function() {
|
|||
|
||||
expect($.pnotify).to.have.been.calledOnce;
|
||||
expect(arg.type).to.eql('mp');
|
||||
expect(arg.text).to.eql('+ 10 MP');
|
||||
expect(arg.text).to.eql('+ 10 Mana');
|
||||
expect(arg.icon).to.eql('glyphicon glyphicon-fire');
|
||||
});
|
||||
|
||||
|
|
|
|||
|
|
@ -29,7 +29,10 @@ habitrpg.controller('NotificationCtrl',
|
|||
if (after == before) return;
|
||||
if (User.user.stats.lvl == 0) return;
|
||||
var money = after - before;
|
||||
var bonus = User.user._tmp.streakBonus;
|
||||
var bonus;
|
||||
if (User.user._tmp) {
|
||||
bonus = User.user._tmp.streakBonus || 0;
|
||||
}
|
||||
Notification.gp(money, bonus || 0);
|
||||
|
||||
//Append Bonus
|
||||
|
|
|
|||
|
|
@ -18,35 +18,45 @@ function($rootScope, User, $timeout, $state, Analytics) {
|
|||
placement: "top",
|
||||
proceed: window.env.t('tourAvatarProceed'),
|
||||
backdrop: false,
|
||||
orphan: true
|
||||
orphan: true,
|
||||
gold: 4,
|
||||
experience: 29
|
||||
},
|
||||
{
|
||||
state: 'tasks',
|
||||
element: ".task-column.todos",
|
||||
content: window.env.t('tourToDosBrief'),
|
||||
placement: "top",
|
||||
proceed: window.env.t('tourOkay')
|
||||
proceed: window.env.t('tourOkay'),
|
||||
gold: 4,
|
||||
experience: 29
|
||||
},
|
||||
{
|
||||
state: 'tasks',
|
||||
element: ".task-column.dailys",
|
||||
content: window.env.t('tourDailiesBrief'),
|
||||
placement: "top",
|
||||
proceed: window.env.t('tourDailiesProceed')
|
||||
proceed: window.env.t('tourDailiesProceed'),
|
||||
gold: 4,
|
||||
experience: 29
|
||||
},
|
||||
{
|
||||
state: 'tasks',
|
||||
element: ".task-column.habits",
|
||||
content: window.env.t('tourHabitsBrief'),
|
||||
placement: "right",
|
||||
proceed: window.env.t('tourHabitsProceed')
|
||||
placement: "top",
|
||||
proceed: window.env.t('tourHabitsProceed'),
|
||||
gold: 4,
|
||||
experience: 29
|
||||
},
|
||||
{
|
||||
state: 'tasks',
|
||||
element: ".task-column.rewards",
|
||||
element: "h2.task-column_title.reward-title",
|
||||
content: window.env.t('tourRewardsBrief'),
|
||||
placement: "top",
|
||||
placement: "left",
|
||||
proceed: window.env.t('tourRewardsProceed'),
|
||||
gold: 4,
|
||||
experience: 29,
|
||||
final: true
|
||||
}
|
||||
]
|
||||
|
|
@ -179,19 +189,25 @@ function($rootScope, User, $timeout, $state, Analytics) {
|
|||
$(step.element).popover('destroy'); // destroy existing hover popovers so we can add our own
|
||||
step.onShow = function(){
|
||||
Analytics.track({'hitType':'event','eventCategory':'behavior','eventAction':'tutorial','eventLabel':k+'-web','eventValue':i+1,'complete':false});
|
||||
// step.path doesn't work in Angular do to async ui-router. Our custom solution:
|
||||
if (step.state && !$state.is(step.state)) {
|
||||
// $state.go() returns a promise, necessary for async tour steps; however, that's not working here - have to use timeout instead :/
|
||||
$state.go(step.state);
|
||||
return $timeout(function(){});
|
||||
}
|
||||
};
|
||||
step.onHide = function(){
|
||||
var ups={};
|
||||
if (!$rootScope.stepAwarded) $rootScope.stepAwarded = {};
|
||||
if (!$rootScope.stepAwarded[i]) {
|
||||
$rootScope.stepAwarded[i] = true;
|
||||
ups['stats.gp'] = User.user.stats.gp + (step.gold || 0);
|
||||
ups['stats.exp'] = User.user.stats.exp + (step.experience || 0);
|
||||
}
|
||||
if (step.final) { // -2 indicates complete
|
||||
var ups={};ups['flags.tour.'+k] = -2;
|
||||
User.set(ups);
|
||||
ups['flags.tour.'+k] = -2;
|
||||
$rootScope.stepAwarded = null;
|
||||
Analytics.track({'hitType':'event','eventCategory':'behavior','eventAction':'tutorial','eventLabel':k+'-web','eventValue':i+1,'complete':true})
|
||||
}
|
||||
User.set(ups);
|
||||
}
|
||||
})
|
||||
});
|
||||
|
|
@ -210,7 +226,6 @@ function($rootScope, User, $timeout, $state, Analytics) {
|
|||
'<h3 class="popover-title"></h3>' +
|
||||
'<div class="popover-content"></div>' +
|
||||
'<div class="popover-navigation"> ' +
|
||||
//'<button class="btn btn-sm btn-default" data-role="end" style="float:none;">' + (step.final ? 'Finish Tour' : 'Hide') + '</button>' +
|
||||
(showCounter ? '<span style="float:right;">'+ (i+1 +' of '+ _.flatten(chapters[k]).length) +'</span>' : '')+ // counter
|
||||
'<div class="btn-group">' +
|
||||
(step.hideNavigation ? '' : '<button class="btn btn-sm btn-default" data-role="prev">« Previous</button>') +
|
||||
|
|
@ -222,14 +237,10 @@ function($rootScope, User, $timeout, $state, Analytics) {
|
|||
'</div>';
|
||||
},
|
||||
storage: false
|
||||
//onEnd: function(){
|
||||
// User.set({'flags.showTour': false});
|
||||
//}
|
||||
});
|
||||
});
|
||||
|
||||
var goto = function(chapter, page, force) {
|
||||
//return; // TODO temporarily remove old tutorial system while experimenting with leslie's new gettup
|
||||
if (chapter == 'intro') User.set({'flags.welcomed': true});
|
||||
var curr = User.user.flags.tour[chapter];
|
||||
if (page != curr+1 && !force) return;
|
||||
|
|
|
|||
|
|
@ -51,7 +51,7 @@ angular.module("habitrpg").factory("Notification",
|
|||
|
||||
function exp(val) {
|
||||
if (val < -50) return; // don't show when they level up (resetting their exp)
|
||||
_notify(_sign(val) + " " + _round(val) + " " + window.env.t('xp'), 'xp', 'glyphicon glyphicon-star');
|
||||
_notify(_sign(val) + " " + _round(val) + " " + window.env.t('experience'), 'xp', 'glyphicon glyphicon-star');
|
||||
}
|
||||
|
||||
function error(error){
|
||||
|
|
@ -64,7 +64,7 @@ angular.module("habitrpg").factory("Notification",
|
|||
|
||||
function hp(val) {
|
||||
// don't show notifications if user dead
|
||||
_notify(_sign(val) + " " + _round(val) + " " + window.env.t('hp'), 'hp', 'glyphicon glyphicon-heart');
|
||||
_notify(_sign(val) + " " + _round(val) + " " + window.env.t('health'), 'hp', 'glyphicon glyphicon-heart');
|
||||
}
|
||||
|
||||
function lvl(){
|
||||
|
|
@ -79,7 +79,7 @@ angular.module("habitrpg").factory("Notification",
|
|||
}
|
||||
|
||||
function mp(val) {
|
||||
_notify(_sign(val) + " " + _round(val) + " " + window.env.t('mp'), 'mp', 'glyphicon glyphicon-fire');
|
||||
_notify(_sign(val) + " " + _round(val) + " " + window.env.t('mana'), 'mp', 'glyphicon glyphicon-fire');
|
||||
}
|
||||
|
||||
function streak(val) {
|
||||
|
|
|
|||
|
|
@ -1,18 +1,31 @@
|
|||
// Created by sabrecat on 5/18/15.
|
||||
|
||||
script(type='text/ng-template', id='modals/welcome.html')
|
||||
.modal-header
|
||||
h4=env.t('welcomeToHabit')
|
||||
.modal-body.text-center
|
||||
h4=env.t('welcome1')
|
||||
.welcome_to_Habit_1.center-block
|
||||
h4=env.t('welcome2')
|
||||
.welcome_to_Habit_2.center-block
|
||||
h4=env.t('welcome3')
|
||||
.welcome_to_Habit_3.center-block
|
||||
h4=env.t('welcome4')
|
||||
.welcome_to_Habit_4.center-block
|
||||
.modal-footer
|
||||
span.h4=env.t('welcome5')
|
||||
|
|
||||
span.button.btn.btn-primary(ng-click='$close(); Guide.goto("intro",0)')=env.t('imReady')
|
||||
.modal-header.text-center
|
||||
h1=env.t('welcomeToHabit')
|
||||
.modal-body
|
||||
.container-fluid
|
||||
.col-sm-4.col-centered
|
||||
span(style='display:flex')
|
||||
h1
|
||||
| ①
|
||||
h3(style='margin:auto auto auto .5em')=env.t('welcome1')
|
||||
.welcome_basic_avatars(style='margin: 1.5em auto 1.5em')
|
||||
h4=env.t('welcome1notes')
|
||||
.col-sm-4.col-centered
|
||||
span(style='display:flex')
|
||||
h1
|
||||
| ②
|
||||
h3(style='margin:.3em auto auto .5em')=env.t('welcome2')
|
||||
.welcome_sample_tasks(style='margin: 2.5em auto 1.5em')
|
||||
h4=env.t('welcome2notes')
|
||||
.col-sm-4.col-centered
|
||||
span(style='display:flex')
|
||||
h1
|
||||
| ③
|
||||
h3(style='margin:auto auto auto .5em')=env.t('welcome3')
|
||||
.welcome_promo_party(style='margin: 1em auto 1em')
|
||||
h4=env.t('welcome3notes')
|
||||
.modal-footer.text-center(style='margin-top:0')
|
||||
.col-sm-3
|
||||
.col-sm-6
|
||||
a.btn.btn-primary.btn-lg.flex-column(ng-click='$close(); Guide.goto("intro",0)')=env.t('imReady')
|
||||
.col-sm-3
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@ script(id='templates/habitrpg-tasks.html', type="text/ng-template")
|
|||
|
||||
include ./task_view/graph
|
||||
|
||||
h2.task-column_title {{::list.header}}
|
||||
h2.task-column_title(class='{{::list.type}}-title') {{::list.header}}
|
||||
|
||||
include ./task_view/help
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue