Kai/habitica
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' into api-v3

Browse Source
This commit is contained in:
Blade Barringer
2016-04-08 21:31:41 -05:00
parent 68ff26e6d6 e6b5a6820f
commit 8a42a3a51e
59 changed files with 11692 additions and 11518 deletions
Download Patch File Download Diff File Expand all files Collapse all files
common/dist/sprites/spritesmith-largeSprites-0.css
Vendored
+77 -71
View File
@@ -1,120 +1,126 @@
.2014_Fall_HealerPROMO2 {
background-image: url(spritesmith-largeSprites-0.png);
background-position: -543px -429px;
background-position: -927px -1203px;
width: 90px;
height: 90px;
}
.2014_Fall_Mage_PROMO9 {
background-image: url(spritesmith-largeSprites-0.png);
background-position: -1066px -684px;
background-position: -813px -295px;
width: 120px;
height: 90px;
}
.2014_Fall_RoguePROMO3 {
background-image: url(spritesmith-largeSprites-0.png);
background-position: -1371px -915px;
background-position: -813px -477px;
width: 105px;
height: 90px;
}
.2014_Fall_Warrior_PROMO {
background-image: url(spritesmith-largeSprites-0.png);
background-position: -182px -1156px;
background-position: -381px -1203px;
width: 90px;
height: 90px;
}
.promo_android {
background-image: url(spritesmith-largeSprites-0.png);
background-position: -943px -332px;
background-position: -955px -480px;
width: 175px;
height: 175px;
}
.promo_backgrounds_armoire_201602 {
background-image: url(spritesmith-largeSprites-0.png);
background-position: -672px -181px;
background-position: -306px -220px;
width: 141px;
height: 294px;
}
.promo_backgrounds_armoire_201603 {
background-image: url(spritesmith-largeSprites-0.png);
background-position: -306px -220px;
background-position: -813px 0px;
width: 141px;
height: 294px;
}
.promo_backgrounds_armoire_201604 {
background-image: url(spritesmith-largeSprites-0.png);
background-position: -452px 0px;
width: 140px;
height: 441px;
}
.promo_backtoschool {
background-image: url(spritesmith-largeSprites-0.png);
background-position: -1190px -342px;
background-position: -1236px -148px;
width: 150px;
height: 150px;
}
.promo_burnout {
background-image: url(spritesmith-largeSprites-0.png);
background-position: -452px 0px;
background-position: -593px 0px;
width: 219px;
height: 240px;
}
.promo_classes_fall_2014 {
background-image: url(spritesmith-largeSprites-0.png);
background-position: -326px -872px;
background-position: -326px -912px;
width: 321px;
height: 100px;
}
.promo_classes_fall_2015 {
background-image: url(spritesmith-largeSprites-0.png);
background-position: -430px -621px;
background-position: -430px -706px;
width: 377px;
height: 99px;
}
.promo_dilatoryDistress {
background-image: url(spritesmith-largeSprites-0.png);
background-position: -808px -621px;
background-position: -563px -1203px;
width: 90px;
height: 90px;
}
.promo_egg_mounts {
background-image: url(spritesmith-largeSprites-0.png);
background-position: 0px -724px;
background-position: -955px 0px;
width: 280px;
height: 147px;
}
.promo_enchanted_armoire {
background-image: url(spritesmith-largeSprites-0.png);
background-position: -648px -872px;
background-position: -271px -621px;
width: 374px;
height: 76px;
}
.promo_enchanted_armoire_201507 {
background-image: url(spritesmith-largeSprites-0.png);
background-position: -1190px -641px;
background-position: -578px -1112px;
width: 217px;
height: 90px;
}
.promo_enchanted_armoire_201508 {
background-image: url(spritesmith-largeSprites-0.png);
background-position: -1190px -915px;
background-position: -796px -1112px;
width: 180px;
height: 90px;
}
.promo_enchanted_armoire_201509 {
background-image: url(spritesmith-largeSprites-0.png);
background-position: 0px -1156px;
background-position: -654px -1203px;
width: 90px;
height: 90px;
}
.promo_enchanted_armoire_201511 {
background-image: url(spritesmith-largeSprites-0.png);
background-position: -943px -684px;
background-position: -1236px -915px;
width: 122px;
height: 90px;
}
.promo_enchanted_armoire_201601 {
background-image: url(spritesmith-largeSprites-0.png);
background-position: -546px -1156px;
background-position: -1200px -1203px;
width: 90px;
height: 90px;
}
.promo_habitica {
background-image: url(spritesmith-largeSprites-0.png);
background-position: -943px -508px;
background-position: -593px -241px;
width: 175px;
height: 175px;
}
@@ -126,289 +132,289 @@
}
.promo_haunted_hair {
background-image: url(spritesmith-largeSprites-0.png);
background-position: -1347px -194px;
background-position: -1236px -595px;
width: 100px;
height: 137px;
}
.promo_item_notif {
background-image: url(spritesmith-largeSprites-0.png);
background-position: -1190px -91px;
background-position: -955px -656px;
width: 249px;
height: 102px;
}
.promo_mystery_201405 {
background-image: url(spritesmith-largeSprites-0.png);
background-position: -637px -1156px;
background-position: -1071px -1112px;
width: 90px;
height: 90px;
}
.promo_mystery_201406 {
background-image: url(spritesmith-largeSprites-0.png);
background-position: -452px -241px;
background-position: -813px -568px;
width: 90px;
height: 96px;
}
.promo_mystery_201407 {
background-image: url(spritesmith-largeSprites-0.png);
background-position: -1300px -1082px;
background-position: -904px -568px;
width: 42px;
height: 62px;
}
.promo_mystery_201408 {
background-image: url(spritesmith-largeSprites-0.png);
background-position: -1408px -732px;
background-position: -513px -442px;
width: 60px;
height: 71px;
}
.promo_mystery_201409 {
background-image: url(spritesmith-largeSprites-0.png);
background-position: -91px -1156px;
background-position: -745px -1203px;
width: 90px;
height: 90px;
}
.promo_mystery_201410 {
background-image: url(spritesmith-largeSprites-0.png);
background-position: -1389px -823px;
background-position: -1131px -586px;
width: 72px;
height: 63px;
}
.promo_mystery_201411 {
background-image: url(spritesmith-largeSprites-0.png);
background-position: -364px -1156px;
background-position: -1109px -1203px;
width: 90px;
height: 90px;
}
.promo_mystery_201412 {
background-image: url(spritesmith-largeSprites-0.png);
background-position: -1119px -402px;
background-position: -1342px -809px;
width: 42px;
height: 66px;
}
.promo_mystery_201501 {
background-image: url(spritesmith-largeSprites-0.png);
background-position: -1251px -1082px;
background-position: -1337px -595px;
width: 48px;
height: 63px;
}
.promo_mystery_201502 {
background-image: url(spritesmith-largeSprites-0.png);
background-position: -546px -338px;
background-position: -199px -1203px;
width: 90px;
height: 90px;
}
.promo_mystery_201503 {
background-image: url(spritesmith-largeSprites-0.png);
background-position: -452px -429px;
background-position: -290px -1203px;
width: 90px;
height: 90px;
}
.promo_mystery_201504 {
background-image: url(spritesmith-largeSprites-0.png);
background-position: -1190px -1082px;
background-position: -646px -621px;
width: 60px;
height: 69px;
}
.promo_mystery_201505 {
background-image: url(spritesmith-largeSprites-0.png);
background-position: -910px -1156px;
background-position: -472px -1203px;
width: 90px;
height: 90px;
}
.promo_mystery_201506 {
background-image: url(spritesmith-largeSprites-0.png);
background-position: -1119px -332px;
background-position: -1337px -659px;
width: 42px;
height: 69px;
}
.promo_mystery_201507 {
background-image: url(spritesmith-largeSprites-0.png);
background-position: -814px -363px;
background-position: -1131px -480px;
width: 90px;
height: 105px;
}
.promo_mystery_201508 {
background-image: url(spritesmith-largeSprites-0.png);
background-position: -452px -338px;
background-position: -977px -1112px;
width: 93px;
height: 90px;
}
.promo_mystery_201509 {
background-image: url(spritesmith-largeSprites-0.png);
background-position: -273px -1156px;
background-position: -836px -1203px;
width: 90px;
height: 90px;
}
.promo_mystery_201510 {
background-image: url(spritesmith-largeSprites-0.png);
background-position: -543px -241px;
background-position: -813px -665px;
width: 93px;
height: 90px;
}
.promo_mystery_201511 {
background-image: url(spritesmith-largeSprites-0.png);
background-position: -455px -1156px;
background-position: -1018px -1203px;
width: 90px;
height: 90px;
}
.promo_mystery_201512 {
background-image: url(spritesmith-largeSprites-0.png);
background-position: -1408px -641px;
background-position: -452px -442px;
width: 60px;
height: 81px;
}
.promo_mystery_201601 {
background-image: url(spritesmith-largeSprites-0.png);
background-position: -814px -181px;
background-position: -1236px -1082px;
width: 120px;
height: 90px;
}
.promo_mystery_201602 {
background-image: url(spritesmith-largeSprites-0.png);
background-position: -728px -1156px;
background-position: -1291px -1203px;
width: 90px;
height: 90px;
}
.promo_mystery_201603 {
background-image: url(spritesmith-largeSprites-0.png);
background-position: -819px -1156px;
background-position: 0px -1295px;
width: 90px;
height: 90px;
}
.promo_mystery_3014 {
background-image: url(spritesmith-largeSprites-0.png);
background-position: -1190px -732px;
background-position: -593px -417px;
width: 217px;
height: 90px;
}
.promo_orca {
background-image: url(spritesmith-largeSprites-0.png);
background-position: -1341px -342px;
background-position: -1236px -809px;
width: 105px;
height: 105px;
}
.promo_partyhats {
background-image: url(spritesmith-largeSprites-0.png);
background-position: -1343px -1006px;
background-position: -955px -759px;
width: 115px;
height: 47px;
}
.promo_pastel_skin {
background-image: url(spritesmith-largeSprites-0.png);
background-position: 0px -983px;
background-position: -724px -809px;
width: 330px;
height: 83px;
}
.customize-option.promo_pastel_skin {
background-image: url(spritesmith-largeSprites-0.png);
background-position: -25px -998px;
background-position: -749px -824px;
width: 60px;
height: 60px;
}
.promo_peppermint_flame {
background-image: url(spritesmith-largeSprites-0.png);
background-position: -1331px -493px;
background-position: -1236px -447px;
width: 140px;
height: 147px;
}
.promo_pet_skins {
background-image: url(spritesmith-largeSprites-0.png);
background-position: -1190px -493px;
background-position: -1236px -299px;
width: 140px;
height: 147px;
}
.customize-option.promo_pet_skins {
background-image: url(spritesmith-largeSprites-0.png);
background-position: -1215px -508px;
background-position: -1261px -314px;
width: 60px;
height: 60px;
}
.promo_shimmer_hair {
background-image: url(spritesmith-largeSprites-0.png);
background-position: -331px -983px;
background-position: -648px -912px;
width: 330px;
height: 83px;
}
.promo_splashyskins {
background-image: url(spritesmith-largeSprites-0.png);
background-position: -1190px -823px;
background-position: 0px -1203px;
width: 198px;
height: 91px;
}
.customize-option.promo_splashyskins {
background-image: url(spritesmith-largeSprites-0.png);
background-position: -1215px -838px;
background-position: -25px -1218px;
width: 60px;
height: 60px;
}
.promo_spring_classes_2016 {
background-image: url(spritesmith-largeSprites-0.png);
background-position: -281px -724px;
background-position: 0px -809px;
width: 362px;
height: 102px;
}
.promo_springclasses2014 {
background-image: url(spritesmith-largeSprites-0.png);
background-position: -644px -724px;
background-position: -289px -1112px;
width: 288px;
height: 90px;
}
.promo_springclasses2015 {
background-image: url(spritesmith-largeSprites-0.png);
background-position: -1190px 0px;
background-position: 0px -1112px;
width: 288px;
height: 90px;
}
.promo_summer_classes_2014 {
background-image: url(spritesmith-largeSprites-0.png);
background-position: 0px -621px;
background-position: 0px -706px;
width: 429px;
height: 102px;
}
.promo_summer_classes_2015 {
background-image: url(spritesmith-largeSprites-0.png);
background-position: 0px -1067px;
background-position: 0px -1023px;
width: 300px;
height: 88px;
}
.promo_updos {
background-image: url(spritesmith-largeSprites-0.png);
background-position: -1190px -194px;
background-position: -1236px 0px;
width: 156px;
height: 147px;
}
.promo_veteran_pets {
background-image: url(spritesmith-largeSprites-0.png);
background-position: -943px -775px;
background-position: -1236px -1006px;
width: 146px;
height: 75px;
}
.promo_winter_classes_2016 {
background-image: url(spritesmith-largeSprites-0.png);
background-position: -499px -525px;
background-position: -363px -809px;
width: 360px;
height: 90px;
}
.promo_winterclasses2015 {
background-image: url(spritesmith-largeSprites-0.png);
background-position: 0px -872px;
background-position: 0px -912px;
width: 325px;
height: 110px;
}
.promo_winteryhair {
background-image: url(spritesmith-largeSprites-0.png);
background-position: -1190px -1006px;
background-position: -1236px -733px;
width: 152px;
height: 75px;
}
.avatar_variety {
background-image: url(spritesmith-largeSprites-0.png);
background-position: 0px -525px;
background-position: -271px -525px;
width: 498px;
height: 95px;
}
.npc_viirus {
background-image: url(spritesmith-largeSprites-0.png);
background-position: -814px -272px;
background-position: -813px -386px;
width: 108px;
height: 90px;
}
@@ -420,19 +426,19 @@
}
.welcome_basic_avatars {
background-image: url(spritesmith-largeSprites-0.png);
background-position: -943px 0px;
background-position: -955px -148px;
width: 246px;
height: 165px;
}
.welcome_promo_party {
background-image: url(spritesmith-largeSprites-0.png);
background-position: -672px 0px;
background-position: 0px -525px;
width: 270px;
height: 180px;
}
.welcome_sample_tasks {
background-image: url(spritesmith-largeSprites-0.png);
background-position: -943px -166px;
background-position: -955px -314px;
width: 246px;
height: 165px;
}
common/dist/sprites/spritesmith-largeSprites-0.png
Vendored
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 246 KiB

After

Width:  |  Height:  |  Size: 263 KiB

common/dist/sprites/spritesmith-main-0.css
Vendored
+567 -633
View File
File diff suppressed because it is too large Load Diff
common/dist/sprites/spritesmith-main-0.png
Vendored
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 293 KiB

After

Width:  |  Height:  |  Size: 309 KiB

common/dist/sprites/spritesmith-main-1.css
Vendored
+726 -726
View File
File diff suppressed because it is too large Load Diff
common/dist/sprites/spritesmith-main-1.png
Vendored
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 60 KiB

After

Width:  |  Height:  |  Size: 61 KiB

common/dist/sprites/spritesmith-main-10.css
Vendored
+365 -365
View File
File diff suppressed because it is too large Load Diff
common/dist/sprites/spritesmith-main-10.png
Vendored
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 145 KiB

After

Width:  |  Height:  |  Size: 148 KiB

common/dist/sprites/spritesmith-main-11.css
Vendored
+332 -332
View File
File diff suppressed because it is too large Load Diff
common/dist/sprites/spritesmith-main-11.png
Vendored
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 157 KiB

After

Width:  |  Height:  |  Size: 159 KiB

common/dist/sprites/spritesmith-main-12.css
Vendored
+325 -265
View File
@@ -1,420 +1,480 @@
.Pet-TRex-Base {
background-image: url(spritesmith-main-12.png);
background-position: -328px -100px;
width: 81px;
height: 99px;
}
.Pet-TRex-CottonCandyBlue {
background-image: url(spritesmith-main-12.png);
background-position: -328px -200px;
width: 81px;
height: 99px;
}
.Pet-TRex-CottonCandyPink {
background-image: url(spritesmith-main-12.png);
background-position: 0px -300px;
width: 81px;
height: 99px;
}
.Pet-TRex-Desert {
background-image: url(spritesmith-main-12.png);
background-position: -82px -300px;
width: 81px;
height: 99px;
}
.Pet-TRex-Golden {
background-image: url(spritesmith-main-12.png);
background-position: -164px -300px;
width: 81px;
height: 99px;
}
.Pet-TRex-Red {
background-image: url(spritesmith-main-12.png);
background-position: -246px -300px;
width: 81px;
height: 99px;
}
.Pet-TRex-Shade {
background-image: url(spritesmith-main-12.png);
background-position: -328px -300px;
width: 81px;
height: 99px;
}
.Pet-TRex-Skeleton {
background-image: url(spritesmith-main-12.png);
background-position: -410px 0px;
width: 81px;
height: 99px;
}
.Pet-TRex-White {
background-image: url(spritesmith-main-12.png);
background-position: -410px -100px;
width: 81px;
height: 99px;
}
.Pet-TRex-Zombie {
background-image: url(spritesmith-main-12.png);
background-position: -410px -200px;
width: 81px;
height: 99px;
}
.Pet-Tiger-Veteran {
.Pet-Spider-Base {
background-image: url(spritesmith-main-12.png);
background-position: -82px 0px;
width: 81px;
height: 99px;
}
.Pet-TigerCub-Base {
background-image: url(spritesmith-main-12.png);
background-position: -574px 0px;
width: 81px;
height: 99px;
}
.Pet-TigerCub-CottonCandyBlue {
background-image: url(spritesmith-main-12.png);
background-position: -164px 0px;
width: 81px;
height: 99px;
}
.Pet-TigerCub-CottonCandyPink {
background-image: url(spritesmith-main-12.png);
background-position: 0px -100px;
width: 81px;
height: 99px;
}
.Pet-TigerCub-Desert {
background-image: url(spritesmith-main-12.png);
background-position: -82px -100px;
width: 81px;
height: 99px;
}
.Pet-TigerCub-Golden {
background-image: url(spritesmith-main-12.png);
background-position: -164px -100px;
width: 81px;
height: 99px;
}
.Pet-TigerCub-Peppermint {
background-image: url(spritesmith-main-12.png);
background-position: -246px 0px;
width: 81px;
height: 99px;
}
.Pet-TigerCub-Red {
background-image: url(spritesmith-main-12.png);
background-position: -246px -100px;
width: 81px;
height: 99px;
}
.Pet-TigerCub-Shade {
background-image: url(spritesmith-main-12.png);
background-position: 0px -200px;
width: 81px;
height: 99px;
}
.Pet-TigerCub-Skeleton {
background-image: url(spritesmith-main-12.png);
background-position: -82px -200px;
width: 81px;
height: 99px;
}
.Pet-TigerCub-Spooky {
background-image: url(spritesmith-main-12.png);
background-position: -164px -200px;
width: 81px;
height: 99px;
}
.Pet-TigerCub-White {
background-image: url(spritesmith-main-12.png);
background-position: -246px -200px;
width: 81px;
height: 99px;
}
.Pet-TigerCub-Zombie {
background-image: url(spritesmith-main-12.png);
background-position: -328px 0px;
width: 81px;
height: 99px;
}
.Pet-Turkey-Base {
background-image: url(spritesmith-main-12.png);
background-position: -410px -300px;
width: 81px;
height: 99px;
}
.Pet-Turkey-Gilded {
background-image: url(spritesmith-main-12.png);
background-position: -492px 0px;
width: 81px;
height: 99px;
}
.Pet-Unicorn-Base {
background-image: url(spritesmith-main-12.png);
background-position: -492px -100px;
width: 81px;
height: 99px;
}
.Pet-Unicorn-CottonCandyBlue {
background-image: url(spritesmith-main-12.png);
background-position: -492px -200px;
width: 81px;
height: 99px;
}
.Pet-Unicorn-CottonCandyPink {
background-image: url(spritesmith-main-12.png);
background-position: -492px -300px;
width: 81px;
height: 99px;
}
.Pet-Unicorn-Desert {
background-image: url(spritesmith-main-12.png);
background-position: 0px -400px;
width: 81px;
height: 99px;
}
.Pet-Unicorn-Golden {
background-image: url(spritesmith-main-12.png);
background-position: -82px -400px;
width: 81px;
height: 99px;
}
.Pet-Unicorn-Red {
background-image: url(spritesmith-main-12.png);
background-position: -164px -400px;
width: 81px;
height: 99px;
}
.Pet-Unicorn-Shade {
background-image: url(spritesmith-main-12.png);
background-position: -246px -400px;
width: 81px;
height: 99px;
}
.Pet-Unicorn-Skeleton {
background-image: url(spritesmith-main-12.png);
background-position: -328px -400px;
width: 81px;
height: 99px;
}
.Pet-Unicorn-White {
background-image: url(spritesmith-main-12.png);
background-position: -410px -400px;
width: 81px;
height: 99px;
}
.Pet-Unicorn-Zombie {
background-image: url(spritesmith-main-12.png);
background-position: -492px -400px;
width: 81px;
height: 99px;
}
.Pet-Whale-Base {
background-image: url(spritesmith-main-12.png);
background-position: 0px 0px;
width: 81px;
height: 99px;
}
.Pet-Whale-CottonCandyBlue {
background-image: url(spritesmith-main-12.png);
background-position: -574px -100px;
width: 81px;
height: 99px;
}
.Pet-Whale-CottonCandyPink {
background-image: url(spritesmith-main-12.png);
background-position: -574px -200px;
width: 81px;
height: 99px;
}
.Pet-Whale-Desert {
background-image: url(spritesmith-main-12.png);
background-position: -574px -300px;
width: 81px;
height: 99px;
}
.Pet-Whale-Golden {
background-image: url(spritesmith-main-12.png);
background-position: -574px -400px;
width: 81px;
height: 99px;
}
.Pet-Whale-Red {
.Pet-Spider-CottonCandyBlue {
background-image: url(spritesmith-main-12.png);
background-position: 0px -500px;
width: 81px;
height: 99px;
}
.Pet-Whale-Shade {
.Pet-Spider-CottonCandyPink {
background-image: url(spritesmith-main-12.png);
background-position: -164px 0px;
width: 81px;
height: 99px;
}
.Pet-Spider-Desert {
background-image: url(spritesmith-main-12.png);
background-position: 0px -100px;
width: 81px;
height: 99px;
}
.Pet-Spider-Golden {
background-image: url(spritesmith-main-12.png);
background-position: -82px -100px;
width: 81px;
height: 99px;
}
.Pet-Spider-Red {
background-image: url(spritesmith-main-12.png);
background-position: -164px -100px;
width: 81px;
height: 99px;
}
.Pet-Spider-Shade {
background-image: url(spritesmith-main-12.png);
background-position: -246px 0px;
width: 81px;
height: 99px;
}
.Pet-Spider-Skeleton {
background-image: url(spritesmith-main-12.png);
background-position: -246px -100px;
width: 81px;
height: 99px;
}
.Pet-Spider-White {
background-image: url(spritesmith-main-12.png);
background-position: 0px -200px;
width: 81px;
height: 99px;
}
.Pet-Spider-Zombie {
background-image: url(spritesmith-main-12.png);
background-position: -82px -200px;
width: 81px;
height: 99px;
}
.Pet-TRex-Base {
background-image: url(spritesmith-main-12.png);
background-position: -410px -300px;
width: 81px;
height: 99px;
}
.Pet-TRex-CottonCandyBlue {
background-image: url(spritesmith-main-12.png);
background-position: -492px 0px;
width: 81px;
height: 99px;
}
.Pet-TRex-CottonCandyPink {
background-image: url(spritesmith-main-12.png);
background-position: -492px -100px;
width: 81px;
height: 99px;
}
.Pet-TRex-Desert {
background-image: url(spritesmith-main-12.png);
background-position: -492px -200px;
width: 81px;
height: 99px;
}
.Pet-TRex-Golden {
background-image: url(spritesmith-main-12.png);
background-position: -492px -300px;
width: 81px;
height: 99px;
}
.Pet-TRex-Red {
background-image: url(spritesmith-main-12.png);
background-position: 0px -400px;
width: 81px;
height: 99px;
}
.Pet-TRex-Shade {
background-image: url(spritesmith-main-12.png);
background-position: -82px -400px;
width: 81px;
height: 99px;
}
.Pet-TRex-Skeleton {
background-image: url(spritesmith-main-12.png);
background-position: -164px -400px;
width: 81px;
height: 99px;
}
.Pet-TRex-White {
background-image: url(spritesmith-main-12.png);
background-position: -246px -400px;
width: 81px;
height: 99px;
}
.Pet-TRex-Zombie {
background-image: url(spritesmith-main-12.png);
background-position: -328px -400px;
width: 81px;
height: 99px;
}
.Pet-Tiger-Veteran {
background-image: url(spritesmith-main-12.png);
background-position: -164px -200px;
width: 81px;
height: 99px;
}
.Pet-TigerCub-Base {
background-image: url(spritesmith-main-12.png);
background-position: -246px -200px;
width: 81px;
height: 99px;
}
.Pet-TigerCub-CottonCandyBlue {
background-image: url(spritesmith-main-12.png);
background-position: -328px 0px;
width: 81px;
height: 99px;
}
.Pet-TigerCub-CottonCandyPink {
background-image: url(spritesmith-main-12.png);
background-position: -328px -100px;
width: 81px;
height: 99px;
}
.Pet-TigerCub-Desert {
background-image: url(spritesmith-main-12.png);
background-position: -328px -200px;
width: 81px;
height: 99px;
}
.Pet-TigerCub-Golden {
background-image: url(spritesmith-main-12.png);
background-position: 0px -300px;
width: 81px;
height: 99px;
}
.Pet-TigerCub-Peppermint {
background-image: url(spritesmith-main-12.png);
background-position: -82px -300px;
width: 81px;
height: 99px;
}
.Pet-TigerCub-Red {
background-image: url(spritesmith-main-12.png);
background-position: -164px -300px;
width: 81px;
height: 99px;
}
.Pet-TigerCub-Shade {
background-image: url(spritesmith-main-12.png);
background-position: -246px -300px;
width: 81px;
height: 99px;
}
.Pet-TigerCub-Skeleton {
background-image: url(spritesmith-main-12.png);
background-position: -328px -300px;
width: 81px;
height: 99px;
}
.Pet-TigerCub-Spooky {
background-image: url(spritesmith-main-12.png);
background-position: -410px 0px;
width: 81px;
height: 99px;
}
.Pet-TigerCub-White {
background-image: url(spritesmith-main-12.png);
background-position: -410px -100px;
width: 81px;
height: 99px;
}
.Pet-TigerCub-Zombie {
background-image: url(spritesmith-main-12.png);
background-position: -410px -200px;
width: 81px;
height: 99px;
}
.Pet-Turkey-Base {
background-image: url(spritesmith-main-12.png);
background-position: -410px -400px;
width: 81px;
height: 99px;
}
.Pet-Turkey-Gilded {
background-image: url(spritesmith-main-12.png);
background-position: -492px -400px;
width: 81px;
height: 99px;
}
.Pet-Unicorn-Base {
background-image: url(spritesmith-main-12.png);
background-position: -574px 0px;
width: 81px;
height: 99px;
}
.Pet-Unicorn-CottonCandyBlue {
background-image: url(spritesmith-main-12.png);
background-position: -574px -100px;
width: 81px;
height: 99px;
}
.Pet-Unicorn-CottonCandyPink {
background-image: url(spritesmith-main-12.png);
background-position: -574px -200px;
width: 81px;
height: 99px;
}
.Pet-Unicorn-Desert {
background-image: url(spritesmith-main-12.png);
background-position: -574px -300px;
width: 81px;
height: 99px;
}
.Pet-Unicorn-Golden {
background-image: url(spritesmith-main-12.png);
background-position: -574px -400px;
width: 81px;
height: 99px;
}
.Pet-Unicorn-Red {
background-image: url(spritesmith-main-12.png);
background-position: 0px 0px;
width: 81px;
height: 99px;
}
.Pet-Unicorn-Shade {
background-image: url(spritesmith-main-12.png);
background-position: -82px -500px;
width: 81px;
height: 99px;
}
.Pet-Whale-Skeleton {
.Pet-Unicorn-Skeleton {
background-image: url(spritesmith-main-12.png);
background-position: -164px -500px;
width: 81px;
height: 99px;
}
.Pet-Whale-White {
.Pet-Unicorn-White {
background-image: url(spritesmith-main-12.png);
background-position: -246px -500px;
width: 81px;
height: 99px;
}
.Pet-Whale-Zombie {
.Pet-Unicorn-Zombie {
background-image: url(spritesmith-main-12.png);
background-position: -328px -500px;
width: 81px;
height: 99px;
}
.Pet-Wolf-Base {
.Pet-Whale-Base {
background-image: url(spritesmith-main-12.png);
background-position: -410px -500px;
width: 81px;
height: 99px;
}
.Pet-Wolf-CottonCandyBlue {
.Pet-Whale-CottonCandyBlue {
background-image: url(spritesmith-main-12.png);
background-position: -492px -500px;
width: 81px;
height: 99px;
}
.Pet-Wolf-CottonCandyPink {
.Pet-Whale-CottonCandyPink {
background-image: url(spritesmith-main-12.png);
background-position: -574px -500px;
width: 81px;
height: 99px;
}
.Pet-Wolf-Desert {
.Pet-Whale-Desert {
background-image: url(spritesmith-main-12.png);
background-position: -656px 0px;
width: 81px;
height: 99px;
}
.Pet-Wolf-Golden {
.Pet-Whale-Golden {
background-image: url(spritesmith-main-12.png);
background-position: -656px -100px;
width: 81px;
height: 99px;
}
.Pet-Wolf-Peppermint {
.Pet-Whale-Red {
background-image: url(spritesmith-main-12.png);
background-position: -656px -200px;
width: 81px;
height: 99px;
}
.Pet-Wolf-Red {
.Pet-Whale-Shade {
background-image: url(spritesmith-main-12.png);
background-position: -656px -300px;
width: 81px;
height: 99px;
}
.Pet-Wolf-Shade {
.Pet-Whale-Skeleton {
background-image: url(spritesmith-main-12.png);
background-position: -656px -400px;
width: 81px;
height: 99px;
}
.Pet-Wolf-Skeleton {
.Pet-Whale-White {
background-image: url(spritesmith-main-12.png);
background-position: -656px -500px;
width: 81px;
height: 99px;
}
.Pet-Wolf-Spooky {
.Pet-Whale-Zombie {
background-image: url(spritesmith-main-12.png);
background-position: 0px -600px;
width: 81px;
height: 99px;
}
.Pet-Wolf-Veteran {
.Pet-Wolf-Base {
background-image: url(spritesmith-main-12.png);
background-position: -82px -600px;
width: 81px;
height: 99px;
}
.Pet-Wolf-White {
.Pet-Wolf-CottonCandyBlue {
background-image: url(spritesmith-main-12.png);
background-position: -164px -600px;
width: 81px;
height: 99px;
}
.Pet-Wolf-Zombie {
.Pet-Wolf-CottonCandyPink {
background-image: url(spritesmith-main-12.png);
background-position: -246px -600px;
width: 81px;
height: 99px;
}
.Pet-Wolf-Desert {
background-image: url(spritesmith-main-12.png);
background-position: -328px -600px;
width: 81px;
height: 99px;
}
.Pet-Wolf-Golden {
background-image: url(spritesmith-main-12.png);
background-position: -410px -600px;
width: 81px;
height: 99px;
}
.Pet-Wolf-Peppermint {
background-image: url(spritesmith-main-12.png);
background-position: -492px -600px;
width: 81px;
height: 99px;
}
.Pet-Wolf-Red {
background-image: url(spritesmith-main-12.png);
background-position: -574px -600px;
width: 81px;
height: 99px;
}
.Pet-Wolf-Shade {
background-image: url(spritesmith-main-12.png);
background-position: -656px -600px;
width: 81px;
height: 99px;
}
.Pet-Wolf-Skeleton {
background-image: url(spritesmith-main-12.png);
background-position: -738px 0px;
width: 81px;
height: 99px;
}
.Pet-Wolf-Spooky {
background-image: url(spritesmith-main-12.png);
background-position: -738px -100px;
width: 81px;
height: 99px;
}
.Pet-Wolf-Veteran {
background-image: url(spritesmith-main-12.png);
background-position: -738px -200px;
width: 81px;
height: 99px;
}
.Pet-Wolf-White {
background-image: url(spritesmith-main-12.png);
background-position: -738px -300px;
width: 81px;
height: 99px;
}
.Pet-Wolf-Zombie {
background-image: url(spritesmith-main-12.png);
background-position: -738px -400px;
width: 81px;
height: 99px;
}
.Pet_HatchingPotion_Base {
background-image: url(spritesmith-main-12.png);
background-position: -377px -600px;
background-position: -738px -552px;
width: 48px;
height: 51px;
}
.Pet_HatchingPotion_CottonCandyBlue {
background-image: url(spritesmith-main-12.png);
background-position: -622px -600px;
background-position: -147px -700px;
width: 48px;
height: 51px;
}
.Pet_HatchingPotion_CottonCandyPink {
background-image: url(spritesmith-main-12.png);
background-position: -426px -600px;
background-position: -738px -604px;
width: 48px;
height: 51px;
}
.Pet_HatchingPotion_Desert {
background-image: url(spritesmith-main-12.png);
background-position: -475px -600px;
background-position: 0px -700px;
width: 48px;
height: 51px;
}
.Pet_HatchingPotion_Golden {
background-image: url(spritesmith-main-12.png);
background-position: -524px -600px;
background-position: -49px -700px;
width: 48px;
height: 51px;
}
.Pet_HatchingPotion_Peppermint {
background-image: url(spritesmith-main-12.png);
background-position: -573px -600px;
background-position: -98px -700px;
width: 48px;
height: 51px;
}
.Pet_HatchingPotion_Red {
background-image: url(spritesmith-main-12.png);
background-position: -328px -600px;
background-position: -738px -500px;
width: 48px;
height: 51px;
}
.Pet_HatchingPotion_Shade {
background-image: url(spritesmith-main-12.png);
background-position: -671px -600px;
background-position: -196px -700px;
width: 48px;
height: 51px;
}
.Pet_HatchingPotion_Skeleton {
background-image: url(spritesmith-main-12.png);
background-position: -738px 0px;
background-position: -245px -700px;
width: 48px;
height: 51px;
}
.Pet_HatchingPotion_Spooky {
background-image: url(spritesmith-main-12.png);
background-position: -738px -52px;
background-position: -294px -700px;
width: 48px;
height: 51px;
}
.Pet_HatchingPotion_White {
background-image: url(spritesmith-main-12.png);
background-position: -738px -104px;
background-position: -343px -700px;
width: 48px;
height: 51px;
}
.Pet_HatchingPotion_Zombie {
background-image: url(spritesmith-main-12.png);
background-position: -738px -156px;
background-position: -392px -700px;
width: 48px;
height: 51px;
}
common/dist/sprites/spritesmith-main-12.png
Vendored
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 29 KiB

After

Width:  |  Height:  |  Size: 33 KiB

common/dist/sprites/spritesmith-main-2.css
Vendored
+3348 -3348
View File
File diff suppressed because it is too large Load Diff
common/dist/sprites/spritesmith-main-2.png
Vendored
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 32 KiB

After

Width:  |  Height:  |  Size: 32 KiB

common/dist/sprites/spritesmith-main-3.css
Vendored
+3412 -3358
View File
File diff suppressed because it is too large Load Diff
common/dist/sprites/spritesmith-main-3.png
Vendored
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 136 KiB

After

Width:  |  Height:  |  Size: 137 KiB

common/dist/sprites/spritesmith-main-4.css
Vendored
+530 -524
View File
File diff suppressed because it is too large Load Diff
common/dist/sprites/spritesmith-main-4.png
Vendored
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 132 KiB

After

Width:  |  Height:  |  Size: 131 KiB

common/dist/sprites/spritesmith-main-5.css
Vendored
+497 -431
View File
File diff suppressed because it is too large Load Diff
common/dist/sprites/spritesmith-main-5.png
Vendored
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 323 KiB

After

Width:  |  Height:  |  Size: 322 KiB

common/dist/sprites/spritesmith-main-6.css
Vendored
+334 -364
View File
File diff suppressed because it is too large Load Diff
common/dist/sprites/spritesmith-main-6.png
Vendored
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 234 KiB

After

Width:  |  Height:  |  Size: 241 KiB

common/dist/sprites/spritesmith-main-7.css
Vendored
+272 -260
View File
File diff suppressed because it is too large Load Diff
common/dist/sprites/spritesmith-main-7.png
Vendored
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 141 KiB

After

Width:  |  Height:  |  Size: 140 KiB

common/dist/sprites/spritesmith-main-8.css
Vendored
+412 -430
View File
File diff suppressed because it is too large Load Diff
common/dist/sprites/spritesmith-main-8.png
Vendored
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 143 KiB

After

Width:  |  Height:  |  Size: 144 KiB

common/dist/sprites/spritesmith-main-9.css
Vendored
+310 -322
View File
File diff suppressed because it is too large Load Diff
common/dist/sprites/spritesmith-main-9.png
Vendored
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 143 KiB

After

Width:  |  Height:  |  Size: 144 KiB

common/img/sprites/spritesmith/backgrounds/background_archery_range.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 6.6 KiB

common/img/sprites/spritesmith/backgrounds/background_giant_florals.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.3 KiB

common/img/sprites/spritesmith/backgrounds/background_rainbows_end.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 22 KiB

common/img/sprites/spritesmith/gear/armoire/broad_armor_armoire_basicArcherArmor.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 650 B

common/img/sprites/spritesmith/gear/armoire/headAccessory_armoire_comicalArrow.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.0 KiB

common/img/sprites/spritesmith/gear/armoire/head_armoire_basicArcherCap.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 802 B

common/img/sprites/spritesmith/gear/armoire/shop/shop_armor_armoire_basicArcherArmor.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 833 B

common/img/sprites/spritesmith/gear/armoire/shop/shop_headAccessory_armoire_comicalArrow.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.9 KiB

common/img/sprites/spritesmith/gear/armoire/shop/shop_head_armoire_basicArcherCap.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 632 B

common/img/sprites/spritesmith/gear/armoire/shop/shop_weapon_armoire_basicLongbow.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.1 KiB

common/img/sprites/spritesmith/gear/armoire/slim_armor_armoire_basicArcherArmor.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 625 B

common/img/sprites/spritesmith/gear/armoire/weapon_armoire_basicLongbow.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.3 KiB

common/img/sprites/spritesmith_large/promo/promo_backgrounds_armoire_201604.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 20 KiB

common/locales/en/backgrounds.json
+9 -1
View File
@@ -175,6 +175,14 @@
"backgroundRainforestText": "Rainforest",
"backgroundRainforestNotes": "Venture into a Rainforest.",
"backgroundStoneCircleText": "Circle of Stones",
"backgroundStoneCircleNotes": "Cast spells in a Circle of Stones."
"backgroundStoneCircleNotes": "Cast spells in a Circle of Stones.",
"backgrounds042016": "SET 23: Released April 2016",
"backgroundArcheryRangeText": "Archery Range",
"backgroundArcheryRangeNotes": "Practice on the Archery Range.",
"backgroundGiantFlowersText": "Giant Flowers",
"backgroundGiantFlowersNotes": "Frolic atop Giant Flowers.",
"backgroundRainbowsEndText": "End of the Rainbow",
"backgroundRainbowsEndNotes": "Discover gold at the End of the Rainbow."
}
common/locales/en/gear.json
+9
View File
@@ -206,6 +206,8 @@
"weaponArmoireJesterBatonNotes": "With a wave of your baton and some witty repartee, even the most complicated situations become clear. Increases Intelligence and Perception by <%= attrs %> each. Enchanted Armoire: Jester Set (Item 3 of 3).",
"weaponArmoireMiningPickaxText": "Mining Pickax",
"weaponArmoireMiningPickaxNotes": "Mine the maximum amount of gold from your tasks! Increases Perception by <%= per %>. Enchanted Armoire: Miner Set (Item 3 of 3).",
"weaponArmoireBasicLongbowText": "Basic Longbow",
"weaponArmoireBasicLongbowNotes": "A serviceable hand-me-down bow. Increases Strength by <%= str %>. Enchanted Armoire: Basic Archer Set (Item 1 of 3).",
"armor": "armor",
@@ -429,6 +431,8 @@
"armorArmoireJesterCostumeNotes": "Tra-la-la! Despite the look of this costume, you are no fool. Increases Intelligence by <%= int %>. Enchanted Armoire: Jester Set (Item 2 of 3).",
"armorArmoireMinerOverallsText": "Miner Overalls",
"armorArmoireMinerOverallsNotes": "They may seem worn, but they are enchanted to repel dirt. Increases Constitution by <%= con %>. Enchanted Armoire: Miner Set (Item 2 of 3).",
"armorArmoireBasicArcherArmorText": "Basic Archer Armor",
"armorArmoireBasicArcherArmorNotes": "This camouflaged vest lets you slip unnoticed through the forests. Increases Perception by <%= per %>. Enchanted Armoire: Basic Archer Set (Item 2 of 3).",
"headgear": "headgear",
@@ -666,6 +670,8 @@
"headArmoireJesterCapNotes": "The bells on this hat might distract your opponents, but they just help you focus. Increases Perception by <%= per %>. Enchanted Armoire: Jester Set (Item 1 of 3).",
"headArmoireMinerHelmetText": "Miner Helmet",
"headArmoireMinerHelmetNotes": "Protect your head from falling tasks! Increases Intelligence by <%= int %>. Enchanted Armoire: Miner Set (Item 1 of 3).",
"headArmoireBasicArcherCapText": "Basic Archer Cap",
"headArmoireBasicArcherCapNotes": "No archer would be complete without a jaunty cap! Increases Perception by <%= per %>. Enchanted Armoire: Basic Archer Set (Item 3 of 3).",
"offhand": "shield-hand item",
@@ -901,6 +907,9 @@
"headAccessoryMystery301405Text": "Headwear Goggles",
"headAccessoryMystery301405Notes": "\"Goggles are for your eyes,\" they said. \"Nobody wants goggles that you can only wear on your head,\" they said. Hah! You sure showed them! Confers no benefit. August 3015 Subscriber Item.",
"headAccessoryArmoireComicalArrowText": "Comical Arrow",
"headAccessoryArmoireComicalArrowNotes": "This whimsical item doesn't provide a stat boost, but it sure is good for a laugh! Confers no benefit. Enchanted Armoire: Independent Item.",
"eyewear": "Eyewear",
"eyewearBase0Text": "No Eyewear",
"eyewearBase0Notes": "No Eyewear.",
common/script/content/appearance/backgrounds.js
+14
View File
@@ -311,6 +311,20 @@ let backgrounds = {
notes: t('backgroundStoneCircleNotes'),
},
},
backgrounds042016: {
archery_range: {
text: t('backgroundArcheryRangeText'),
notes: t('backgroundArcheryRangeNotes'),
},
giant_florals: {
text: t('backgroundGiantFlowersText'),
notes: t('backgroundGiantFlowersNotes'),
},
rainbows_end: {
text: t('backgroundRainbowsEndText'),
notes: t('backgroundRainbowsEndNotes'),
},
},
};
/* eslint-enable quote-props */
common/script/content/gear/head-accessory.js
+2
View File
@@ -2,11 +2,13 @@ import {headAccessory as baseHeadAccessory} from './sets/base';
import {headAccessory as specialHeadAccessory} from './sets/special';
import {headAccessory as mysteryHeadAccessory} from './sets/mystery';
import {headAccessory as armoireHeadAccessory} from './sets/armoire';
let headAccessory = {
base: baseHeadAccessory,
special: specialHeadAccessory,
mystery: mysteryHeadAccessory,
armoire: armoireHeadAccessory,
};
module.exports = headAccessory;
common/script/content/gear/sets/armoire.js
+37
View File
@@ -118,6 +118,14 @@ let armor = {
set: 'miner',
canOwn: ownsItem('armor_armoire_minerOveralls'),
},
basicArcherArmor: {
text: t('armorArmoireBasicArcherArmorText'),
notes: t('armorArmoireBasicArcherArmorNotes', { per: 12 }),
value: 100,
per: 12,
set: 'basicArcher',
canOwn: ownsItem('armor_armoire_basicArcherArmor'),
},
};
let eyewear = {
@@ -314,6 +322,14 @@ let head = {
set: 'miner',
canOwn: ownsItem('head_armoire_minerHelmet'),
},
basicArcherCap: {
text: t('headArmoireBasicArcherCapText'),
notes: t('headArmoireBasicArcherCapNotes', { per: 6 }),
value: 100,
per: 6,
set: 'basicArcher',
canOwn: ownsItem('head_armoire_basicArcherCap'),
},
};
let shield = {
@@ -361,6 +377,15 @@ let shield = {
},
};
let headAccessory = {
comicalArrow: {
text: t('headAccessoryArmoireComicalArrowText'),
notes: t('headAccessoryArmoireComicalArrowNotes'),
value: 100,
canOwn: ownsItem('headAccessory_armoire_comicalArrow'),
},
};
let weapon = {
basicCrossbow: {
text: t('weaponArmoireBasicCrossbowText'),
@@ -476,6 +501,7 @@ let weapon = {
value: 100,
int: 8,
per: 8,
set: 'jester',
canOwn: ownsItem('weapon_armoire_jesterBaton'),
},
miningPickax: {
@@ -483,14 +509,25 @@ let weapon = {
notes: t('weaponArmoireMiningPickaxNotes', { per: 15 }),
value: 100,
per: 15,
set: 'miner',
canOwn: ownsItem('weapon_armoire_miningPickax'),
},
basicLongbow: {
text: t('weaponArmoireBasicLongbowText'),
notes: t('weaponArmoireBasicLongbowNotes', { str: 6 }),
value: 100,
str: 6,
twoHanded: true,
set: 'basicArcher',
canOwn: ownsItem('weapon_armoire_basicLongbow'),
},
};
let armoireSet = {
armor,
eyewear,
head,
headAccessory,
shield,
weapon,
};
config.json.example
+1 -1
View File
@@ -29,7 +29,7 @@
"MWS_KEY": "",
"MWS_SECRET": ""
},
"FLAG_REPORT_EMAIL": ["email@mod.com"],
"FLAG_REPORT_EMAIL": "email@mod.com,email2@mod.com",
"EMAIL_SERVER": {
"url": "http://example.com",
"authUser": "user",
package.json
+1 -1
View File
@@ -67,7 +67,7 @@
"mongoose-id-autoinc": "~2013.7.14-4",
"morgan": "^1.7.0",
"nconf": "~0.8.2",
"newrelic": "~1.25.0",
"newrelic": "~1.26.1",
"nib": "~1.0.1",
"nodemailer": "^1.9.0",
"object-path": "^0.9.2",
website/public/css/tasks.styl
+4
View File
@@ -407,6 +407,10 @@ for $stage in $stages
form
margin-bottom: 0 // stupid bootstrap override
.task textarea.form-control
position: relative
z-index: 50
[class$="-options"]
padding: 1em 1em 0
color: #333
website/src/controllers/api-v2/groups.js
+3 -11
View File
@@ -31,6 +31,8 @@ var partyFields = api.partyFields = 'profile preferences stats achievements part
var nameFields = 'profile.name';
var challengeFields = '_id name';
var guildPopulate = {path: 'members', select: nameFields, options: {limit: 15} };
const FLAG_REPORT_EMAILS = nconf.get('FLAG_REPORT_EMAIL').split(',').map(email => {return {email, canSend: true}});
/**
* For parties, we want a lot of member details so we can show their avatars in the header. For guilds, we want very
* limited fields - and only a sampling of the members, beacuse they can be in the thousands
@@ -366,18 +368,8 @@ api.flagChatMessage = function(req, res, next){
'chat.$.flagCount': message.flagCount,
}}, function(err) {
if (err) return next(err);
var addressesToSendTo = nconf.get('FLAG_REPORT_EMAIL');
addressesToSendTo = (typeof addressesToSendTo == 'string') ? JSON.parse(addressesToSendTo) : addressesToSendTo;
if(Array.isArray(addressesToSendTo)){
addressesToSendTo = addressesToSendTo.map(function(email){
return {email: email, canSend: true}
});
}else{
addressesToSendTo = {email: addressesToSendTo}
}
utils.txnEmail(addressesToSendTo, 'flag-report-to-mods', [
utils.txnEmail(FLAG_REPORT_EMAILS, 'flag-report-to-mods', [
{name: "MESSAGE_TIME", content: (new Date(message.timestamp)).toString()},
{name: "MESSAGE_TEXT", content: message.text},
website/src/libs/api-v2/logging.js
-1
View File
@@ -25,7 +25,6 @@ if (nconf.get('LOGGLY:enabled')){
if (logger == null) {
logger = new (winston.Logger)({});
if (nconf.get('NODE_ENV') == 'production') {
//logger.add(winston.transports.newrelic, {});
if (!nconf.get('DISABLE_ERROR_EMAILS') && false) {
logger.add(winston.transports.Mail, {
to: nconf.get('ADMIN_EMAIL') || nconf.get('SMTP_USER'),
website/src/libs/api-v3/newrelic.js
+1 -1
View File
@@ -9,7 +9,7 @@ const nconf = require('nconf');
// more info here https://docs.newrelic.com/docs/agents/nodejs-agent/installation-configuration/nodejs-agent-configuration
exports.config = {
app_name: ['Habitica'], // eslint-disable-line camelcase
app_name: nconf.get('NEW_RELIC_APP_NAME'), // eslint-disable-line camelcase
license_key: nconf.get('NEW_RELIC_LICENSE_KEY'), // eslint-disable-line camelcase
logging: {
/**
website/src/middlewares/api-v2/domain.js
+7 -5
View File
@@ -12,20 +12,22 @@ module.exports = function(server,mongoose) {
useAvg = false, // use average over 3 minutes, or simply the last minute's report
url = 'https://api.newrelic.com/v2/applications/'+nconf.get('NEW_RELIC_APPLICATION_ID')+'/metrics/data.json?names[]=Apdex&values[]=score';
setInterval(function(){
// TODO, DISABLED UNTIL NEW RELIC IS ADDED AGAIN
// see https://docs.newrelic.com/docs/apm/apis/api-v2-examples/average-response-time-examples-api-v2, https://rpm.newrelic.com/api/explore/applications/data
/*request({
request({
url: useAvg ? url+'&from='+moment().subtract({minutes:mins}).utc().format()+'&to='+moment().utc().format()+'&summarize=true' : url,
headers: {'X-Api-Key': nconf.get('NEW_RELIC_API_KEY')}
}, function(err, response, body){
var ts = JSON.parse(body).metric_data.metrics[0].timeslices,
score = ts[ts.length-1].values.score,
apdexBad = score < .75 || score == 1,
memory = os.freemem() / os.totalmem(),
memoryHigh = memory < 0.1;
if (apdexBad || memoryHigh) throw '[Memory Leak] Apdex='+score+' Memory='+parseFloat(memory).toFixed(3)+' Time='+moment().format();
});*/
if (memoryHigh) {
var newRelicMemoryLeakMessage = '[Memory Leak] Apdex='+score+' Memory='+parseFloat(memory).toFixed(3)+' Time='+moment().format();
throw newRelicMemoryLeakMessage;
}
});
var memory = os.freemem() / os.totalmem(),
memoryHigh = memory < 0.1;
if (memoryHigh) {
website/src/models/group.js
+1 -1
View File
@@ -503,7 +503,7 @@ schema.statics.bossQuest = async function bossQuest (user, progress) {
group.quest.progress.hp -= progress.up;
// TODO Create a party preferred language option so emits like this can be localized
group.sendChat(`\`${user.profile.name} attacks ${quest.boss.name('en')} for ${progress.up.toFixed(1)} damage, ${quest.boss.name('en')} attacks party for ${Math.abs(down).toFixed(1)} damage.\``);
group.sendChat(`\`${user.profile.name} attacks ${quest.boss.name('en')} for ${progress.up.toFixed(1)} damage.\` \`${quest.boss.name('en')} attacks party for ${Math.abs(down).toFixed(1)} damage.\``);
// If boss has Rage, increment Rage as well
if (quest.boss.rage) {
website/views/index.jade
+1 -7
View File
File diff suppressed because one or more lines are too long
website/views/options/inventory/seasonal-shop.jade
+23 -23
View File
@@ -20,6 +20,29 @@
ng-click='buyQuest(quest.key)')
p {{::quest.value}}&nbsp;
span.Pet_Currency_Gem1x.inline-gems
menu.pets-menu(label=env.t('seasonalItems'))
div
button.customize-option(class='inventory_special_shinySeed',
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)')
p {{::Content.spells.special.shinySeed.value}}
span(class='shop_gold')
// div
button.customize-option(class='Pet_HatchingPotion_Peppermint',
popover='{{::Content.hatchingPotions.Peppermint.notes()}}',
popover-title!=env.t("potion", {potionType: "{{::Content.hatchingPotions.Peppermint.text()}}"}),
popover-trigger='mouseenter', popover-placement='right',
popover-append-to-body='true',
ng-click='purchase("hatchingPotions", Content.hatchingPotions.Peppermint)')
p {{::Content.hatchingPotions.Peppermint.value}}&nbsp;
span.Pet_Currency_Gem1x.inline-gems
// div
button.customize-option(popover='{{::Content.spells.special.nye.notes()}}', popover-title='{{::Content.spells.special.nye.text()}}', popover-trigger='mouseenter', popover-placement='right', popover-append-to-body='true', ng-click='castStart(Content.spells.special.nye)', class='inventory_special_nye')
p {{Content.spells.special.nye.value}}
span(class='shop_gold')
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"), spring2015Warrior:env.t("bewareDogSet"), spring2015Mage:env.t("magicianBunnySet"), spring2015Healer:env.t("comfortingKittySet"), spring2015Rogue:env.t("sneakySqueakerSet")}')
div(ng-repeat='item in ::getSeasonalShopArray(set)',
ng-class="{transparent: user.items.gear.owned[item.key] !== undefined}")
@@ -31,26 +54,3 @@
div
| {{((item.specialClass == "wizard") && (item.type == "weapon")) + 1}}&nbsp;
span.Pet_Currency_Gem1x.inline-gems
// menu.pets-menu(label=env.t('seasonalItems'))
div
button.customize-option(class='inventory_special_snowball',
popover='{{::Content.spells.special.snowball.notes()}}',
popover-title='{{::Content.spells.special.snowball.text()}}',
popover-trigger='mouseenter', popover-placement='right',
popover-append-to-body='true',
ng-click='purchase("special", Content.spells.special.snowball)')
p {{::Content.spells.special.snowball.value}}
span(class='shop_gold')
div
button.customize-option(class='Pet_HatchingPotion_Peppermint',
popover='{{::Content.hatchingPotions.Peppermint.notes()}}',
popover-title!=env.t("potion", {potionType: "{{::Content.hatchingPotions.Peppermint.text()}}"}),
popover-trigger='mouseenter', popover-placement='right',
popover-append-to-body='true',
ng-click='purchase("hatchingPotions", Content.hatchingPotions.Peppermint)')
p {{::Content.hatchingPotions.Peppermint.value}}&nbsp;
span.Pet_Currency_Gem1x.inline-gems
div
button.customize-option(popover='{{::Content.spells.special.nye.notes()}}', popover-title='{{::Content.spells.special.nye.text()}}', popover-trigger='mouseenter', popover-placement='right', popover-append-to-body='true', ng-click='castStart(Content.spells.special.nye)', class='inventory_special_nye')
p {{Content.spells.special.nye.value}}
span(class='shop_gold')
website/views/shared/new-relic.jade
+5
View File
File diff suppressed because one or more lines are too long
website/views/shared/new-stuff.jade
+66 -32
View File
@@ -1,45 +1,79 @@
h2 4/1/2016 - WORLD BOSS REVEALED: THE BE-WILDER!
h2 4/8/2016 - WORLD BOSS ATTACK: BEGUILEMENT STRIKE!
hr
tr
td
.quest_bewilder.pull-right
h3 World Boss: The Be-Wilder
p Complete Dailies and To-Dos to damage the World Boss! Incomplete Dailies fill the Beguilement Strike Bar. When the Beguilement Strike bar is full, the World Boss will attack an NPC. A World Boss will never damage individual players or accounts in any way. Only active accounts who are not resting in the inn will have their incomplete Dailies tallied.
tr
.npc_alex_broken.pull-right
h3 Beguilement Strike on Alex the Merchant!
p Oh no! The Be-Wilder has used its Beguilement Strike!
br
p.text-center ~*~
p Despite our best efforts, we've gotten distracted by the Be-Wilder’s charming illusions and have forgotten to do some of our Dailies! With a cackling cry, the shining bird beats its wings, raising a swarm of mist around Alex the Merchant. When the fog clears, he has been possessed! “Have some free samples!” he shouts gleefully, and begins to hurl exploding eggs and potions at fleeing Habiticans. Not the most favorable of sales, to be sure.
br
p The party begins like any other.
br
p The appetizers are excellent, the music is swinging, and even the dancing elephants have become routine. Habiticans laugh and frolic amid the overflowing floral centerpieces, happy to have a distraction from their least-favorite tasks, and the April Fool whirls among them, eagerly providing an amusing trick here and a witty twist there.
br
p As the Mistiflying clock tower strikes midnight, the April Fool leaps onto the stage to give a speech.
br
p “Friends! Enemies! Tolerant acquaintances! Lend me your ears.” The crowd chuckles as animal ears sprout from their heads, and they pose with their new accessories.
br
.npc_aprilFool.pull-left.slight-right-margin
p “As you know,” the Fool continues, “my confusing illusions usually only last a single day. But I’m pleased to announce that I’ve discovered a shortcut that will guarantee us non-stop fun, without having to deal with the pesky weight of our responsibilities. Charming Habiticans, meet my magical new friend... the Be-Wilder!”
br
p Lemoness pales suddenly, dropping her hors d'oeuvres. “Wait! Don’t trust--”
br
p But suddenly mists are pouring into the room, glittering and thick, and they swirl around the April Fool, coalescing into cloudy feathers and a stretching neck. The crowd is speechless as an monstrous bird unfolds before them, its wings shimmering with illusions. It lets out a horrible screeching laugh.
br
p “Oh, it has been ages since a Habitican has been foolish enough to summon me! How wonderful it feels, to have a tangible form at last.”
br
p Buzzing in terror, the magic bees of Mistiflying flee the floating city, which sags from the sky. One by one, the brilliant spring flowers wither up and wisp away.
br
p “My dearest friends, why so alarmed?” crows the Be-Wilder, beating its wings. “There’s no need to toil for your rewards any more. I’ll just give you all the things that you desire!”
br
p A rain of coins pours from the sky, hammering into the ground with brutal force, and the crowd screams and flees for cover. “Is this a joke?” Baconsaur shouts, as the gold smashes through windows and shatters roof shingles.
br
p PainterProphet ducks as lightning bolt crackle overhead, and fog blots out the sun. “No! This time, I don’t think it is!”
br
p Quickly, Habiticans, don’t let this World Boss distract us from our goals! Stay focused on the tasks that you need to complete so we can rescue Mistiflying -- and hopefully, ourselves.
p Hurry! Let's stay focused on our Dailies to defeat this monster before it possesses someone else.
if menuItem !== 'oldNews'
hr
a(href='/static/old-news', target='_blank') Read older news
mixin oldNews
h2 4/5/2016 - APRIL BACKGROUNDS, ARMOIRE ITEMS, AND SHINY SEEDS!
tr
td
.promo_backgrounds_armoire_201604.pull-right
h3 April Backgrounds
p There are three new avatar backgrounds in the <a href='/#/options/profile/backgrounds'>Background Shop!</a> Now your avatar can practice on the Archery Range, frolic on Giant Flowers, or discover gold at the End of the Rainbow!
p.small.muted Art by Sunstroke, PainterProphet, and UncommonCriminal
tr
td
h3 April Armoire Items Revealed
p There is new equipment in the Enchanted Armoire, a 100 GP Reward in the Rewards Column which unlocks after you've attained Ultimate Gear!
br
p Click on the Enchanted Armoire for a random chance at special Equipment, including the Basic Archer Set, and the Comical Arrow! It may also give you random XP or food items. We add new equipment to it during the first week of each month, but even when you've exhausted the current supply, you can keep clicking for a chance at food and XP.
br
p Now go spend all that accumulated Gold! May the Random Number Generator smile upon you...
p.small.muted Art by Balduranne, Fandekasp, nonight, and Kiwibot
tr
td
.avatar_floral_healer.pull-left.slight-right-margin
h3 Shiny Seeds
p Throw a Shiny Seed at your friends and they will turn into a cheerful flower until their next cron! You can buy the Seeds in the <a href='/#/options/inventory/seasonalshop'>Seasonal Shop</a> for Gold. Don't want to be a flower? Just buy some Petal-Free Potion from the <a href='/#/tasks'>Rewards Store</a> to reverse it.
br
p Shiny Seeds will be available until April 30th!
h2 4/1/2016 - WORLD BOSS REVEALED: THE BE-WILDER!
tr
td
.quest_bewilder.pull-right
h3 World Boss: The Be-Wilder
p Complete Dailies and To-Dos to damage the World Boss! Incomplete Dailies fill the Beguilement Strike Bar. When the Beguilement Strike bar is full, the World Boss will attack an NPC. A World Boss will never damage individual players or accounts in any way. Only active accounts who are not resting in the inn will have their incomplete Dailies tallied.
br
p.text-center ~*~
br
p The party begins like any other.
br
p The appetizers are excellent, the music is swinging, and even the dancing elephants have become routine. Habiticans laugh and frolic amid the overflowing floral centerpieces, happy to have a distraction from their least-favorite tasks, and the April Fool whirls among them, eagerly providing an amusing trick here and a witty twist there.
br
p As the Mistiflying clock tower strikes midnight, the April Fool leaps onto the stage to give a speech.
br
p “Friends! Enemies! Tolerant acquaintances! Lend me your ears.” The crowd chuckles as animal ears sprout from their heads, and they pose with their new accessories.
br
.npc_aprilFool.pull-left.slight-right-margin
p “As you know,” the Fool continues, “my confusing illusions usually only last a single day. But I’m pleased to announce that I’ve discovered a shortcut that will guarantee us non-stop fun, without having to deal with the pesky weight of our responsibilities. Charming Habiticans, meet my magical new friend... the Be-Wilder!”
br
p Lemoness pales suddenly, dropping her hors d'oeuvres. “Wait! Don’t trust--”
br
p But suddenly mists are pouring into the room, glittering and thick, and they swirl around the April Fool, coalescing into cloudy feathers and a stretching neck. The crowd is speechless as an monstrous bird unfolds before them, its wings shimmering with illusions. It lets out a horrible screeching laugh.
br
p “Oh, it has been ages since a Habitican has been foolish enough to summon me! How wonderful it feels, to have a tangible form at last.”
br
p Buzzing in terror, the magic bees of Mistiflying flee the floating city, which sags from the sky. One by one, the brilliant spring flowers wither up and wisp away.
br
p “My dearest friends, why so alarmed?” crows the Be-Wilder, beating its wings. “There’s no need to toil for your rewards any more. I’ll just give you all the things that you desire!”
br
p A rain of coins pours from the sky, hammering into the ground with brutal force, and the crowd screams and flees for cover. “Is this a joke?” Baconsaur shouts, as the gold smashes through windows and shatters roof shingles.
br
p PainterProphet ducks as lightning bolt crackle overhead, and fog blots out the sun. “No! This time, I don’t think it is!”
br
p Quickly, Habiticans, don’t let this World Boss distract us from our goals! Stay focused on the tasks that you need to complete so we can rescue Mistiflying -- and hopefully, ourselves.
h2 3/30/2016 - LAST CHANCE FOR MARCH SUBSCRIBER ITEMS! ALSO, EQUIPMENT SORTING AND WHEELCHAIRS FOR AVATARS
tr
td
website/views/static/layout.jade
+1 -5
View File
File diff suppressed because one or more lines are too long