Merge branch 'sabrecat/vampotions' into release

This commit is contained in:
Sabe Jones 2020-09-24 14:13:29 -05:00
commit ff77455b00
72 changed files with 6116 additions and 5865 deletions

View file

@ -28,6 +28,12 @@
width: 96px;
height: 69px;
}
.promo_vampire_potions {
background-image: url('~@/assets/images/sprites/spritesmith-largeSprites-0.png');
background-position: -424px -434px;
width: 423px;
height: 147px;
}
.scene_positivity {
background-image: url('~@/assets/images/sprites/spritesmith-largeSprites-0.png');
background-position: 0px 0px;

View file

@ -1096,150 +1096,156 @@
width: 105px;
height: 105px;
}
.Mount_Body_BearCub-Watery {
.Mount_Body_BearCub-Vampire {
background-image: url('~@/assets/images/sprites/spritesmith-main-15.png');
background-position: -212px -1014px;
width: 105px;
height: 105px;
}
.Mount_Body_BearCub-White {
.Mount_Body_BearCub-Watery {
background-image: url('~@/assets/images/sprites/spritesmith-main-15.png');
background-position: -318px -1014px;
width: 105px;
height: 105px;
}
.Mount_Body_BearCub-Windup {
.Mount_Body_BearCub-White {
background-image: url('~@/assets/images/sprites/spritesmith-main-15.png');
background-position: -424px -1014px;
width: 105px;
height: 105px;
}
.Mount_Body_BearCub-Zombie {
.Mount_Body_BearCub-Windup {
background-image: url('~@/assets/images/sprites/spritesmith-main-15.png');
background-position: -530px -1014px;
width: 105px;
height: 105px;
}
.Mount_Body_Beetle-Base {
.Mount_Body_BearCub-Zombie {
background-image: url('~@/assets/images/sprites/spritesmith-main-15.png');
background-position: -636px -1014px;
width: 105px;
height: 105px;
}
.Mount_Body_Beetle-CottonCandyBlue {
.Mount_Body_Beetle-Base {
background-image: url('~@/assets/images/sprites/spritesmith-main-15.png');
background-position: -742px -1014px;
width: 105px;
height: 105px;
}
.Mount_Body_Beetle-CottonCandyPink {
.Mount_Body_Beetle-CottonCandyBlue {
background-image: url('~@/assets/images/sprites/spritesmith-main-15.png');
background-position: -848px -1014px;
width: 105px;
height: 105px;
}
.Mount_Body_Beetle-Desert {
.Mount_Body_Beetle-CottonCandyPink {
background-image: url('~@/assets/images/sprites/spritesmith-main-15.png');
background-position: -954px -1014px;
width: 105px;
height: 105px;
}
.Mount_Body_Beetle-Golden {
.Mount_Body_Beetle-Desert {
background-image: url('~@/assets/images/sprites/spritesmith-main-15.png');
background-position: -1060px -1014px;
width: 105px;
height: 105px;
}
.Mount_Body_Beetle-Red {
.Mount_Body_Beetle-Golden {
background-image: url('~@/assets/images/sprites/spritesmith-main-15.png');
background-position: -1196px 0px;
width: 105px;
height: 105px;
}
.Mount_Body_Beetle-Shade {
.Mount_Body_Beetle-Red {
background-image: url('~@/assets/images/sprites/spritesmith-main-15.png');
background-position: -1196px -106px;
width: 105px;
height: 105px;
}
.Mount_Body_Beetle-Skeleton {
.Mount_Body_Beetle-Shade {
background-image: url('~@/assets/images/sprites/spritesmith-main-15.png');
background-position: -1196px -212px;
width: 105px;
height: 105px;
}
.Mount_Body_Beetle-White {
.Mount_Body_Beetle-Skeleton {
background-image: url('~@/assets/images/sprites/spritesmith-main-15.png');
background-position: -1196px -318px;
width: 105px;
height: 105px;
}
.Mount_Body_Beetle-Zombie {
.Mount_Body_Beetle-White {
background-image: url('~@/assets/images/sprites/spritesmith-main-15.png');
background-position: -1196px -424px;
width: 105px;
height: 105px;
}
.Mount_Body_Bunny-Base {
.Mount_Body_Beetle-Zombie {
background-image: url('~@/assets/images/sprites/spritesmith-main-15.png');
background-position: -1196px -530px;
width: 105px;
height: 105px;
}
.Mount_Body_Bunny-CottonCandyBlue {
.Mount_Body_Bunny-Base {
background-image: url('~@/assets/images/sprites/spritesmith-main-15.png');
background-position: -1196px -636px;
width: 105px;
height: 105px;
}
.Mount_Body_Bunny-CottonCandyPink {
.Mount_Body_Bunny-CottonCandyBlue {
background-image: url('~@/assets/images/sprites/spritesmith-main-15.png');
background-position: -1196px -742px;
width: 105px;
height: 105px;
}
.Mount_Body_Bunny-Desert {
.Mount_Body_Bunny-CottonCandyPink {
background-image: url('~@/assets/images/sprites/spritesmith-main-15.png');
background-position: -1196px -848px;
width: 105px;
height: 105px;
}
.Mount_Body_Bunny-Golden {
.Mount_Body_Bunny-Desert {
background-image: url('~@/assets/images/sprites/spritesmith-main-15.png');
background-position: -1196px -954px;
width: 105px;
height: 105px;
}
.Mount_Body_Bunny-Red {
.Mount_Body_Bunny-Golden {
background-image: url('~@/assets/images/sprites/spritesmith-main-15.png');
background-position: 0px -1120px;
width: 105px;
height: 105px;
}
.Mount_Body_Bunny-Shade {
.Mount_Body_Bunny-Red {
background-image: url('~@/assets/images/sprites/spritesmith-main-15.png');
background-position: -106px -1120px;
width: 105px;
height: 105px;
}
.Mount_Body_Bunny-Skeleton {
.Mount_Body_Bunny-Shade {
background-image: url('~@/assets/images/sprites/spritesmith-main-15.png');
background-position: -212px -1120px;
width: 105px;
height: 105px;
}
.Mount_Body_Bunny-White {
.Mount_Body_Bunny-Skeleton {
background-image: url('~@/assets/images/sprites/spritesmith-main-15.png');
background-position: -318px -1120px;
width: 105px;
height: 105px;
}
.Mount_Body_Bunny-Zombie {
.Mount_Body_Bunny-White {
background-image: url('~@/assets/images/sprites/spritesmith-main-15.png');
background-position: -424px -1120px;
width: 105px;
height: 105px;
}
.Mount_Body_Bunny-Zombie {
background-image: url('~@/assets/images/sprites/spritesmith-main-15.png');
background-position: -530px -1120px;
width: 105px;
height: 105px;
}
.Mount_Body_Butterfly-Base {
background-image: url('~@/assets/images/sprites/spritesmith-main-15.png');
background-position: 0px -121px;
@ -1302,211 +1308,211 @@
}
.Mount_Body_Cactus-Amber {
background-image: url('~@/assets/images/sprites/spritesmith-main-15.png');
background-position: -530px -1120px;
background-position: -636px -1120px;
width: 105px;
height: 105px;
}
.Mount_Body_Cactus-Aquatic {
background-image: url('~@/assets/images/sprites/spritesmith-main-15.png');
background-position: -636px -1120px;
background-position: -742px -1120px;
width: 105px;
height: 105px;
}
.Mount_Body_Cactus-Aurora {
background-image: url('~@/assets/images/sprites/spritesmith-main-15.png');
background-position: -742px -1120px;
background-position: -848px -1120px;
width: 105px;
height: 105px;
}
.Mount_Body_Cactus-Base {
background-image: url('~@/assets/images/sprites/spritesmith-main-15.png');
background-position: -848px -1120px;
background-position: -954px -1120px;
width: 105px;
height: 105px;
}
.Mount_Body_Cactus-BirchBark {
background-image: url('~@/assets/images/sprites/spritesmith-main-15.png');
background-position: -954px -1120px;
background-position: -1060px -1120px;
width: 105px;
height: 105px;
}
.Mount_Body_Cactus-Bronze {
background-image: url('~@/assets/images/sprites/spritesmith-main-15.png');
background-position: -1060px -1120px;
background-position: -1166px -1120px;
width: 105px;
height: 105px;
}
.Mount_Body_Cactus-Celestial {
background-image: url('~@/assets/images/sprites/spritesmith-main-15.png');
background-position: -1166px -1120px;
background-position: -1302px 0px;
width: 105px;
height: 105px;
}
.Mount_Body_Cactus-CottonCandyBlue {
background-image: url('~@/assets/images/sprites/spritesmith-main-15.png');
background-position: -1302px 0px;
background-position: -1302px -106px;
width: 105px;
height: 105px;
}
.Mount_Body_Cactus-CottonCandyPink {
background-image: url('~@/assets/images/sprites/spritesmith-main-15.png');
background-position: -1302px -106px;
background-position: -1302px -212px;
width: 105px;
height: 105px;
}
.Mount_Body_Cactus-Cupid {
background-image: url('~@/assets/images/sprites/spritesmith-main-15.png');
background-position: -1302px -212px;
background-position: -1302px -318px;
width: 105px;
height: 105px;
}
.Mount_Body_Cactus-Desert {
background-image: url('~@/assets/images/sprites/spritesmith-main-15.png');
background-position: -1302px -318px;
background-position: -1302px -424px;
width: 105px;
height: 105px;
}
.Mount_Body_Cactus-Ember {
background-image: url('~@/assets/images/sprites/spritesmith-main-15.png');
background-position: -1302px -424px;
background-position: -1302px -530px;
width: 105px;
height: 105px;
}
.Mount_Body_Cactus-Fairy {
background-image: url('~@/assets/images/sprites/spritesmith-main-15.png');
background-position: -1302px -530px;
background-position: -1302px -636px;
width: 105px;
height: 105px;
}
.Mount_Body_Cactus-Floral {
background-image: url('~@/assets/images/sprites/spritesmith-main-15.png');
background-position: -1302px -636px;
background-position: -1302px -742px;
width: 105px;
height: 105px;
}
.Mount_Body_Cactus-Fluorite {
background-image: url('~@/assets/images/sprites/spritesmith-main-15.png');
background-position: -1302px -742px;
background-position: -1302px -848px;
width: 105px;
height: 105px;
}
.Mount_Body_Cactus-Frost {
background-image: url('~@/assets/images/sprites/spritesmith-main-15.png');
background-position: -1302px -848px;
background-position: -1302px -954px;
width: 105px;
height: 105px;
}
.Mount_Body_Cactus-Ghost {
background-image: url('~@/assets/images/sprites/spritesmith-main-15.png');
background-position: -1302px -954px;
background-position: -1302px -1060px;
width: 105px;
height: 105px;
}
.Mount_Body_Cactus-Glass {
background-image: url('~@/assets/images/sprites/spritesmith-main-15.png');
background-position: -1302px -1060px;
background-position: 0px -1226px;
width: 105px;
height: 105px;
}
.Mount_Body_Cactus-Glow {
background-image: url('~@/assets/images/sprites/spritesmith-main-15.png');
background-position: 0px -1226px;
background-position: -106px -1226px;
width: 105px;
height: 105px;
}
.Mount_Body_Cactus-Golden {
background-image: url('~@/assets/images/sprites/spritesmith-main-15.png');
background-position: -106px -1226px;
background-position: -212px -1226px;
width: 105px;
height: 105px;
}
.Mount_Body_Cactus-Holly {
background-image: url('~@/assets/images/sprites/spritesmith-main-15.png');
background-position: -212px -1226px;
background-position: -318px -1226px;
width: 105px;
height: 105px;
}
.Mount_Body_Cactus-IcySnow {
background-image: url('~@/assets/images/sprites/spritesmith-main-15.png');
background-position: -318px -1226px;
background-position: -424px -1226px;
width: 105px;
height: 105px;
}
.Mount_Body_Cactus-Peppermint {
background-image: url('~@/assets/images/sprites/spritesmith-main-15.png');
background-position: -424px -1226px;
background-position: -530px -1226px;
width: 105px;
height: 105px;
}
.Mount_Body_Cactus-Rainbow {
background-image: url('~@/assets/images/sprites/spritesmith-main-15.png');
background-position: -530px -1226px;
background-position: -636px -1226px;
width: 105px;
height: 105px;
}
.Mount_Body_Cactus-Red {
background-image: url('~@/assets/images/sprites/spritesmith-main-15.png');
background-position: -636px -1226px;
background-position: -742px -1226px;
width: 105px;
height: 105px;
}
.Mount_Body_Cactus-RoseQuartz {
background-image: url('~@/assets/images/sprites/spritesmith-main-15.png');
background-position: -742px -1226px;
background-position: -848px -1226px;
width: 105px;
height: 105px;
}
.Mount_Body_Cactus-RoyalPurple {
background-image: url('~@/assets/images/sprites/spritesmith-main-15.png');
background-position: -848px -1226px;
background-position: -954px -1226px;
width: 105px;
height: 105px;
}
.Mount_Body_Cactus-Ruby {
background-image: url('~@/assets/images/sprites/spritesmith-main-15.png');
background-position: -954px -1226px;
background-position: -1060px -1226px;
width: 105px;
height: 105px;
}
.Mount_Body_Cactus-SandSculpture {
background-image: url('~@/assets/images/sprites/spritesmith-main-15.png');
background-position: -1060px -1226px;
background-position: -1166px -1226px;
width: 105px;
height: 105px;
}
.Mount_Body_Cactus-Shade {
background-image: url('~@/assets/images/sprites/spritesmith-main-15.png');
background-position: -1166px -1226px;
background-position: -1272px -1226px;
width: 105px;
height: 105px;
}
.Mount_Body_Cactus-Shadow {
background-image: url('~@/assets/images/sprites/spritesmith-main-15.png');
background-position: -1272px -1226px;
background-position: -1408px 0px;
width: 105px;
height: 105px;
}
.Mount_Body_Cactus-Shimmer {
background-image: url('~@/assets/images/sprites/spritesmith-main-15.png');
background-position: -1408px 0px;
background-position: -1408px -106px;
width: 105px;
height: 105px;
}
.Mount_Body_Cactus-Silver {
background-image: url('~@/assets/images/sprites/spritesmith-main-15.png');
background-position: -1408px -106px;
background-position: -1408px -212px;
width: 105px;
height: 105px;
}
.Mount_Body_Cactus-Skeleton {
background-image: url('~@/assets/images/sprites/spritesmith-main-15.png');
background-position: -1408px -212px;
background-position: -1408px -318px;
width: 105px;
height: 105px;
}
.Mount_Body_Cactus-Spooky {
background-image: url('~@/assets/images/sprites/spritesmith-main-15.png');
background-position: -1408px -318px;
background-position: -1408px -424px;
width: 105px;
height: 105px;
}
@ -1518,166 +1524,172 @@
}
.Mount_Body_Cactus-Sunshine {
background-image: url('~@/assets/images/sprites/spritesmith-main-15.png');
background-position: -1408px -424px;
background-position: -1408px -530px;
width: 105px;
height: 105px;
}
.Mount_Body_Cactus-Thunderstorm {
background-image: url('~@/assets/images/sprites/spritesmith-main-15.png');
background-position: -1408px -530px;
background-position: -1408px -636px;
width: 105px;
height: 105px;
}
.Mount_Body_Cactus-Turquoise {
background-image: url('~@/assets/images/sprites/spritesmith-main-15.png');
background-position: -1408px -636px;
width: 105px;
height: 105px;
}
.Mount_Body_Cactus-Watery {
background-image: url('~@/assets/images/sprites/spritesmith-main-15.png');
background-position: -1408px -742px;
width: 105px;
height: 105px;
}
.Mount_Body_Cactus-White {
.Mount_Body_Cactus-Vampire {
background-image: url('~@/assets/images/sprites/spritesmith-main-15.png');
background-position: -1408px -848px;
width: 105px;
height: 105px;
}
.Mount_Body_Cactus-Windup {
.Mount_Body_Cactus-Watery {
background-image: url('~@/assets/images/sprites/spritesmith-main-15.png');
background-position: -1408px -954px;
width: 105px;
height: 105px;
}
.Mount_Body_Cactus-Zombie {
.Mount_Body_Cactus-White {
background-image: url('~@/assets/images/sprites/spritesmith-main-15.png');
background-position: -1408px -1060px;
width: 105px;
height: 105px;
}
.Mount_Body_Cheetah-Base {
.Mount_Body_Cactus-Windup {
background-image: url('~@/assets/images/sprites/spritesmith-main-15.png');
background-position: -1408px -1166px;
width: 105px;
height: 105px;
}
.Mount_Body_Cheetah-CottonCandyBlue {
.Mount_Body_Cactus-Zombie {
background-image: url('~@/assets/images/sprites/spritesmith-main-15.png');
background-position: 0px -1332px;
width: 105px;
height: 105px;
}
.Mount_Body_Cheetah-CottonCandyPink {
.Mount_Body_Cheetah-Base {
background-image: url('~@/assets/images/sprites/spritesmith-main-15.png');
background-position: -106px -1332px;
width: 105px;
height: 105px;
}
.Mount_Body_Cheetah-Desert {
.Mount_Body_Cheetah-CottonCandyBlue {
background-image: url('~@/assets/images/sprites/spritesmith-main-15.png');
background-position: -212px -1332px;
width: 105px;
height: 105px;
}
.Mount_Body_Cheetah-Golden {
.Mount_Body_Cheetah-CottonCandyPink {
background-image: url('~@/assets/images/sprites/spritesmith-main-15.png');
background-position: -318px -1332px;
width: 105px;
height: 105px;
}
.Mount_Body_Cheetah-Red {
.Mount_Body_Cheetah-Desert {
background-image: url('~@/assets/images/sprites/spritesmith-main-15.png');
background-position: -424px -1332px;
width: 105px;
height: 105px;
}
.Mount_Body_Cheetah-Shade {
.Mount_Body_Cheetah-Golden {
background-image: url('~@/assets/images/sprites/spritesmith-main-15.png');
background-position: -530px -1332px;
width: 105px;
height: 105px;
}
.Mount_Body_Cheetah-Skeleton {
.Mount_Body_Cheetah-Red {
background-image: url('~@/assets/images/sprites/spritesmith-main-15.png');
background-position: -636px -1332px;
width: 105px;
height: 105px;
}
.Mount_Body_Cheetah-White {
.Mount_Body_Cheetah-Shade {
background-image: url('~@/assets/images/sprites/spritesmith-main-15.png');
background-position: -742px -1332px;
width: 105px;
height: 105px;
}
.Mount_Body_Cheetah-Zombie {
.Mount_Body_Cheetah-Skeleton {
background-image: url('~@/assets/images/sprites/spritesmith-main-15.png');
background-position: -848px -1332px;
width: 105px;
height: 105px;
}
.Mount_Body_Cow-Base {
.Mount_Body_Cheetah-White {
background-image: url('~@/assets/images/sprites/spritesmith-main-15.png');
background-position: -954px -1332px;
width: 105px;
height: 105px;
}
.Mount_Body_Cow-CottonCandyBlue {
.Mount_Body_Cheetah-Zombie {
background-image: url('~@/assets/images/sprites/spritesmith-main-15.png');
background-position: -1060px -1332px;
width: 105px;
height: 105px;
}
.Mount_Body_Cow-CottonCandyPink {
.Mount_Body_Cow-Base {
background-image: url('~@/assets/images/sprites/spritesmith-main-15.png');
background-position: -1166px -1332px;
width: 105px;
height: 105px;
}
.Mount_Body_Cow-Desert {
.Mount_Body_Cow-CottonCandyBlue {
background-image: url('~@/assets/images/sprites/spritesmith-main-15.png');
background-position: -1272px -1332px;
width: 105px;
height: 105px;
}
.Mount_Body_Cow-Golden {
.Mount_Body_Cow-CottonCandyPink {
background-image: url('~@/assets/images/sprites/spritesmith-main-15.png');
background-position: -1378px -1332px;
width: 105px;
height: 105px;
}
.Mount_Body_Cow-Red {
.Mount_Body_Cow-Desert {
background-image: url('~@/assets/images/sprites/spritesmith-main-15.png');
background-position: -1514px 0px;
width: 105px;
height: 105px;
}
.Mount_Body_Cow-Shade {
.Mount_Body_Cow-Golden {
background-image: url('~@/assets/images/sprites/spritesmith-main-15.png');
background-position: -1514px -106px;
width: 105px;
height: 105px;
}
.Mount_Body_Cow-Skeleton {
.Mount_Body_Cow-Red {
background-image: url('~@/assets/images/sprites/spritesmith-main-15.png');
background-position: -1514px -212px;
width: 105px;
height: 105px;
}
.Mount_Body_Cow-White {
.Mount_Body_Cow-Shade {
background-image: url('~@/assets/images/sprites/spritesmith-main-15.png');
background-position: -1514px -318px;
width: 105px;
height: 105px;
}
.Mount_Body_Cow-Zombie {
.Mount_Body_Cow-Skeleton {
background-image: url('~@/assets/images/sprites/spritesmith-main-15.png');
background-position: -1514px -424px;
width: 105px;
height: 105px;
}
.Mount_Body_Cow-White {
background-image: url('~@/assets/images/sprites/spritesmith-main-15.png');
background-position: -1514px -530px;
width: 105px;
height: 105px;
}
.Mount_Body_Cow-Zombie {
background-image: url('~@/assets/images/sprites/spritesmith-main-15.png');
background-position: -1514px -636px;
width: 105px;
height: 105px;
}
.Mount_Body_Cuttlefish-Base {
background-image: url('~@/assets/images/sprites/spritesmith-main-15.png');
background-position: -454px -248px;
@ -1740,59 +1752,47 @@
}
.Mount_Body_Deer-Base {
background-image: url('~@/assets/images/sprites/spritesmith-main-15.png');
background-position: -1514px -530px;
background-position: -1514px -742px;
width: 105px;
height: 105px;
}
.Mount_Body_Deer-CottonCandyBlue {
background-image: url('~@/assets/images/sprites/spritesmith-main-15.png');
background-position: -1514px -636px;
background-position: -1514px -848px;
width: 105px;
height: 105px;
}
.Mount_Body_Deer-CottonCandyPink {
background-image: url('~@/assets/images/sprites/spritesmith-main-15.png');
background-position: -1514px -742px;
background-position: -1514px -954px;
width: 105px;
height: 105px;
}
.Mount_Body_Deer-Desert {
background-image: url('~@/assets/images/sprites/spritesmith-main-15.png');
background-position: -1514px -848px;
background-position: -1514px -1060px;
width: 105px;
height: 105px;
}
.Mount_Body_Deer-Golden {
background-image: url('~@/assets/images/sprites/spritesmith-main-15.png');
background-position: -1514px -954px;
background-position: -1514px -1166px;
width: 105px;
height: 105px;
}
.Mount_Body_Deer-Red {
background-image: url('~@/assets/images/sprites/spritesmith-main-15.png');
background-position: -1514px -1060px;
background-position: -1514px -1272px;
width: 105px;
height: 105px;
}
.Mount_Body_Deer-Shade {
background-image: url('~@/assets/images/sprites/spritesmith-main-15.png');
background-position: -1514px -1166px;
background-position: 0px -1438px;
width: 105px;
height: 105px;
}
.Mount_Body_Deer-Skeleton {
background-image: url('~@/assets/images/sprites/spritesmith-main-15.png');
background-position: -1514px -1272px;
width: 105px;
height: 105px;
}
.Mount_Body_Deer-White {
background-image: url('~@/assets/images/sprites/spritesmith-main-15.png');
background-position: 0px -1438px;
width: 105px;
height: 105px;
}
.Mount_Body_Deer-Zombie {
background-image: url('~@/assets/images/sprites/spritesmith-main-15.png');
background-position: -106px -1438px;
width: 105px;

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff

Binary file not shown.

Before

Width:  |  Height:  |  Size: 54 KiB

After

Width:  |  Height:  |  Size: 66 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 151 KiB

After

Width:  |  Height:  |  Size: 152 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 168 KiB

After

Width:  |  Height:  |  Size: 166 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 144 KiB

After

Width:  |  Height:  |  Size: 145 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 140 KiB

After

Width:  |  Height:  |  Size: 140 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 159 KiB

After

Width:  |  Height:  |  Size: 153 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 166 KiB

After

Width:  |  Height:  |  Size: 175 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 149 KiB

After

Width:  |  Height:  |  Size: 151 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 147 KiB

After

Width:  |  Height:  |  Size: 151 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 156 KiB

After

Width:  |  Height:  |  Size: 157 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 146 KiB

After

Width:  |  Height:  |  Size: 145 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 187 KiB

After

Width:  |  Height:  |  Size: 182 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 170 KiB

After

Width:  |  Height:  |  Size: 172 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 162 KiB

After

Width:  |  Height:  |  Size: 161 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 126 KiB

After

Width:  |  Height:  |  Size: 149 KiB

View file

@ -304,6 +304,7 @@
"hatchingPotionSandSculpture": "Sand Sculpture",
"hatchingPotionWindup": "Wind-Up",
"hatchingPotionTurquoise": "Turquoise",
"hatchingPotionVampire": "Vampire",
"hatchingPotionNotes": "Pour this on an egg, and it will hatch as a <%= potText(locale) %> pet.",
"premiumPotionAddlNotes": "Not usable on quest pet eggs. Available for purchase until <%= date(locale) %>.",

View file

@ -149,6 +149,13 @@ const premium = {
value: 2,
text: t('hatchingPotionGhost'),
limited: true,
event: EVENTS.fall2020,
canBuy () {
return moment().isBefore('2020-11-02');
},
_addlNotes: t('premiumPotionAddlNotes', {
date: t('dateEndOctober'),
}),
},
Holly: {
value: 2,
@ -276,6 +283,13 @@ const premium = {
value: 2,
text: t('hatchingPotionShadow'),
limited: true,
event: EVENTS.fall2020,
canBuy () {
return moment().isBefore('2020-11-02');
},
_addlNotes: t('premiumPotionAddlNotes', {
date: t('dateEndOctober'),
}),
},
Amber: {
value: 2,
@ -347,6 +361,18 @@ const premium = {
canBuy: hasQuestAchievementFunction('turquoise'),
_addlNotes: t('premiumPotionUnlimitedNotes'),
},
Vampire: {
value: 2,
text: t('hatchingPotionVampire'),
limited: true,
event: EVENTS.fall2020,
canBuy () {
return moment().isBefore('2020-11-02');
},
_addlNotes: t('premiumPotionAddlNotes', {
date: t('dateEndOctober'),
}),
},
};
const wacky = {

View file

@ -1,8 +1,29 @@
import moment from 'moment';
// Magic Hatching Potions are configured like this:
// type: 'premiumHatchingPotion', // note no "s" at the end
// path: 'premiumHatchingPotions.Rainbow',
const featuredItems = {
market () {
if (moment().isBefore('2020-11-02')) {
return [
{
type: 'armoire',
path: 'armoire',
},
{
type: 'premiumHatchingPotion',
path: 'premiumHatchingPotions.Vampire',
},
{
type: 'premiumHatchingPotion',
path: 'premiumHatchingPotions.Ghost',
},
{
type: 'premiumHatchingPotion',
path: 'premiumHatchingPotions.Shadow',
},
];
}
return [
{
type: 'armoire',
@ -10,15 +31,15 @@ const featuredItems = {
},
{
type: 'hatchingPotions',
path: 'hatchingPotions.Shade',
path: 'hatchingPotions.Red',
},
{
type: 'eggs',
path: 'eggs.TigerCub',
path: 'eggs.Fox',
},
{
type: 'food',
path: 'food.Saddle',
path: 'food.potatoe',
},
];
},

Binary file not shown.

After

Width:  |  Height:  |  Size: 842 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 587 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 449 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 733 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 828 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 868 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 620 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 828 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 876 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 913 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 951 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 842 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 821 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 869 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 952 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1,000 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 958 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 909 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 956 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 941 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 844 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 16 KiB

View file

@ -4,7 +4,7 @@ const api = {};
// @TODO export this const, cannot export it from here because only routes are exported from
// controllers
const LAST_ANNOUNCEMENT_TITLE = 'FALL FESTIVAL BEGINS! NOW WITH A SALE ON GEMS!';
const LAST_ANNOUNCEMENT_TITLE = 'NEW VAMPIRE MAGIC HATCHING POTIONS, PLUS THE RETURN OF GHOST AND SHADOW POTIONS!';
const worldDmg = { // @TODO
bailey: false,
};
@ -31,53 +31,28 @@ api.getNews = {
<div class="mr-3 ${baileyClass}"></div>
<div class="media-body">
<h1 class="align-self-center">${res.t('newStuff')}</h1>
<h2>9/22/2020 - ${LAST_ANNOUNCEMENT_TITLE}</h2>
<h2>9/24/2020 - ${LAST_ANNOUNCEMENT_TITLE}</h2>
</div>
</div>
<hr/>
<div class="promo_fall_festival_2020 center-block"></div>
<h3>Limited Edition Class Outfits</h3>
<div class="promo_vampire_potions center-block"></div>
<p>
From now until October 31st, limited edition outfits are available in the Rewards column!
Depending on your class, you can be a Wraith Warrior, Death's Head Moth Healer, Third Eye
Mage, or Two-Headed Rogue. You'd better get productive to earn enough gold before your
time runs out...
There's a new pet breed in town! Between now and October 31st, you can buy Magic Hatching
Potions from <a href='/shops/market'>the Market</a> and use them to hatch any standard
pet egg. (Magic Hatching Potions do not work on Quest Pet eggs.) Magic Potion Pets aren't
picky, so they'll happily eat any kind of food that you feed them!
</p>
<div class="small mb-3">by Gawrone, Vikte, jjgame83, and SabreCat</div>
<div class="promo_fall_festival_2019 center-block"></div>
<h3>Seasonal Shop Opens</h3>
<p>
The <a href='/shops/seasonal'>Seasonal Shop</a> has opened! It's stocking autumnal
Seasonal Edition goodies at the moment, including past fall outfits. Everything there
will be available to purchase during the Fall Festival event each year, but it's only
open until October 31st, so be sure to stock up now, or you'll have to wait a year to
buy these items again!
For this Gala, we've brought back Ghost and Shadow Potions, and added a brand-new potion:
Vampire!
</p>
<p>
After they're gone, it will be at least a year before these Hatching Potions are
available again, so be sure to get them now!
</p>
<div class="small mb-3">
by Gawrone, jjgame83, AnnDeLune, ʂʈєƒąʃųƥągųʂ, Katy133, Lilith of Alfheim, Definitely not
a villain, ShoGirlGeek. cataclysms, maxpendragon, Vikte, QuartzFox, Lemoness, Beffymaroo
and SabreCat
by QuartzFox, Hermi, jjgame83, OuttaMyMind, loremi, and SabreCat
</div>
<div class="npc_justin center-block"></div>
<p>
Everyone has hastened down to the Flourishing Fields to celebrate this spooky harvest
festival. Be sure to check out all the outfits that people are sporting!
</p>
<h3>Fall Gem Sale! September 22-30</h3>
<p>
For the first time ever, Habitica is offering a Gem sale to kick off the fun of Fall
Festival! Receive bonus Gems with each Gem purchase on web or mobile - the more Gems you
buy, the bigger the bonus! Use them to grab past Fall Festival Gear from the Seasonal
Shop, Quests, Magic Hatching Potions, and more. Find more details via Menu > Gems on
mobile, or tapping the Gem on the top menu bar on web.
</p>
<p>
Be sure to update your mobile app to see details, although the promo will still work even
if you can't see the promotional information.
</p>
<p>
Thanks so much for your support. 💜 Gem purchases help keep us running ad-free!
</p>
</div>
`,
});