Merge branch 'release' into develop

This commit is contained in:
Sabe Jones
2020-05-19 14:01:49 -05:00
74 changed files with 15638 additions and 15557 deletions
+1 -1
View File
@@ -1,6 +1,6 @@
{
"name": "habitica",
"version": "4.141.4",
"version": "4.142.0",
"lockfileVersion": 1,
"requires": true,
"dependencies": {
+1 -1
View File
@@ -1,7 +1,7 @@
{
"name": "habitica",
"description": "A habit tracker app which treats your goals like a Role Playing Game.",
"version": "4.141.4",
"version": "4.142.0",
"main": "./website/server/index.js",
"dependencies": {
"@babel/core": "^7.9.6",
@@ -10,9 +10,15 @@
width: 423px;
height: 147px;
}
.promo_mystery_202005 {
.promo_jungle_buddies_bundle {
background-image: url('~@/assets/images/sprites/spritesmith-largeSprites-0.png');
background-position: 0px -434px;
width: 423px;
height: 147px;
}
.promo_mystery_202005 {
background-image: url('~@/assets/images/sprites/spritesmith-largeSprites-0.png');
background-position: -424px -434px;
width: 282px;
height: 147px;
}
@@ -1,450 +1,456 @@
.achievement-alien {
background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
background-position: -1659px -1480px;
background-position: -1274px -1628px;
width: 24px;
height: 26px;
}
.achievement-alien2x {
background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
background-position: -568px -1549px;
background-position: -1586px -1480px;
width: 48px;
height: 52px;
}
.achievement-allYourBase2x {
background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
background-position: -958px -1480px;
background-position: -885px -1480px;
width: 64px;
height: 56px;
}
.achievement-alpha2x {
background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
background-position: -617px -1549px;
background-position: -1635px -1480px;
width: 48px;
height: 52px;
}
.achievement-aridAuthority2x {
background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
background-position: -1023px -1480px;
background-position: -950px -1480px;
width: 64px;
height: 56px;
}
.achievement-armor2x {
background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
background-position: -666px -1549px;
background-position: -426px -1549px;
width: 48px;
height: 52px;
}
.achievement-backToBasics2x {
background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
background-position: -1218px -1480px;
background-position: -1145px -1480px;
width: 48px;
height: 56px;
}
.achievement-bareNecessities2x {
background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
background-position: -426px -1480px;
width: 68px;
height: 68px;
}
.achievement-bewilder2x {
background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
background-position: -715px -1549px;
background-position: -475px -1549px;
width: 48px;
height: 52px;
}
.achievement-birthday2x {
background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
background-position: -764px -1549px;
background-position: -524px -1549px;
width: 48px;
height: 52px;
}
.achievement-boot2x {
background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
background-position: -813px -1549px;
background-position: -573px -1549px;
width: 48px;
height: 52px;
}
.achievement-bow2x {
background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
background-position: -862px -1549px;
background-position: -622px -1549px;
width: 48px;
height: 52px;
}
.achievement-bugBonanza2x {
background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
background-position: -775px -1480px;
background-position: -702px -1480px;
width: 60px;
height: 64px;
}
.achievement-burnout2x {
background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
background-position: -911px -1549px;
background-position: -671px -1549px;
width: 48px;
height: 52px;
}
.achievement-cactus2x {
background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
background-position: -960px -1549px;
background-position: -720px -1549px;
width: 48px;
height: 52px;
}
.achievement-cake2x {
background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
background-position: -1009px -1549px;
background-position: -769px -1549px;
width: 48px;
height: 52px;
}
.achievement-cave2x {
background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
background-position: -1058px -1549px;
background-position: -818px -1549px;
width: 48px;
height: 52px;
}
.achievement-challenge2x {
background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
background-position: -1107px -1549px;
background-position: -867px -1549px;
width: 48px;
height: 52px;
}
.achievement-comment2x {
background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
background-position: -1156px -1549px;
background-position: -916px -1549px;
width: 48px;
height: 52px;
}
.achievement-completedTask2x {
background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
background-position: -1267px -1480px;
background-position: -1194px -1480px;
width: 48px;
height: 56px;
}
.achievement-congrats2x {
background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
background-position: -1205px -1549px;
background-position: -965px -1549px;
width: 48px;
height: 52px;
}
.achievement-costumeContest2x {
background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
background-position: -1254px -1549px;
background-position: -1014px -1549px;
width: 48px;
height: 52px;
}
.achievement-createdTask2x {
background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
background-position: -1316px -1480px;
background-position: -1243px -1480px;
width: 48px;
height: 56px;
}
.achievement-dilatory2x {
background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
background-position: -1303px -1549px;
background-position: -1063px -1549px;
width: 48px;
height: 52px;
}
.achievement-dustDevil2x {
background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
background-position: -1365px -1480px;
background-position: -1292px -1480px;
width: 48px;
height: 56px;
}
.achievement-dysheartener2x {
background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
background-position: -1352px -1549px;
background-position: -1112px -1549px;
width: 48px;
height: 52px;
}
.achievement-fedPet2x {
background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
background-position: -1414px -1480px;
background-position: -1341px -1480px;
width: 48px;
height: 56px;
}
.achievement-friends2x {
background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
background-position: -1401px -1549px;
background-position: -1161px -1549px;
width: 48px;
height: 52px;
}
.achievement-getwell2x {
background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
background-position: -1450px -1549px;
background-position: -1210px -1549px;
width: 48px;
height: 52px;
}
.achievement-goodluck2x {
background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
background-position: -1499px -1549px;
background-position: -1259px -1549px;
width: 48px;
height: 52px;
}
.achievement-greeting2x {
background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
background-position: -1548px -1549px;
background-position: -1308px -1549px;
width: 48px;
height: 52px;
}
.achievement-guild2x {
background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
background-position: -1597px -1549px;
background-position: -1357px -1549px;
width: 48px;
height: 52px;
}
.achievement-habitBirthday2x {
background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
background-position: -1646px -1549px;
background-position: -1406px -1549px;
width: 48px;
height: 52px;
}
.achievement-habiticaDay2x {
background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
background-position: 0px -1628px;
background-position: -1455px -1549px;
width: 48px;
height: 52px;
}
.achievement-hatchedPet2x {
background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
background-position: -1463px -1480px;
background-position: -1390px -1480px;
width: 48px;
height: 56px;
}
.achievement-heart2x {
background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
background-position: -49px -1628px;
background-position: -1504px -1549px;
width: 48px;
height: 52px;
}
.achievement-justAddWater2x {
background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
background-position: -836px -1480px;
background-position: -763px -1480px;
width: 60px;
height: 64px;
}
.achievement-karaoke-2x {
background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
background-position: -98px -1628px;
background-position: -1553px -1549px;
width: 48px;
height: 52px;
}
.achievement-karaoke {
background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
background-position: -1659px -1507px;
background-position: -1299px -1628px;
width: 24px;
height: 26px;
}
.achievement-kickstarter20192x {
background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
background-position: -568px -1480px;
background-position: -495px -1480px;
width: 68px;
height: 68px;
}
.achievement-lostMasterclasser2x {
background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
background-position: -147px -1628px;
background-position: -1602px -1549px;
width: 48px;
height: 52px;
}
.achievement-mindOverMatter2x {
background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
background-position: -897px -1480px;
background-position: -824px -1480px;
width: 60px;
height: 64px;
}
.achievement-monsterMagus2x {
background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
background-position: -1512px -1480px;
background-position: -1439px -1480px;
width: 48px;
height: 56px;
}
.achievement-ninja2x {
background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
background-position: -196px -1628px;
background-position: -1651px -1549px;
width: 48px;
height: 52px;
}
.achievement-npc2x {
background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
background-position: -245px -1628px;
background-position: 0px -1628px;
width: 48px;
height: 52px;
}
.achievement-nye2x {
background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
background-position: -294px -1628px;
background-position: -49px -1628px;
width: 48px;
height: 52px;
}
.achievement-partyOn2x {
background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
background-position: -343px -1628px;
background-position: -98px -1628px;
width: 48px;
height: 52px;
}
.achievement-partyUp2x {
background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
background-position: -392px -1628px;
background-position: -147px -1628px;
width: 48px;
height: 52px;
}
.achievement-pearlyPro2x {
background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
background-position: -1088px -1480px;
background-position: -1015px -1480px;
width: 64px;
height: 56px;
}
.achievement-perfect2x {
background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
background-position: -441px -1628px;
background-position: -196px -1628px;
width: 48px;
height: 52px;
}
.achievement-primedForPainting2x {
background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
background-position: -1561px -1480px;
background-position: -1488px -1480px;
width: 48px;
height: 56px;
}
.achievement-purchasedEquipment2x {
background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
background-position: -1610px -1480px;
background-position: -1537px -1480px;
width: 48px;
height: 56px;
}
.achievement-rat2x {
background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
background-position: -490px -1628px;
background-position: -245px -1628px;
width: 48px;
height: 52px;
}
.achievement-rosyOutlook2x {
background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
background-position: -637px -1480px;
background-position: -564px -1480px;
width: 68px;
height: 68px;
}
.achievement-royally-loyal2x {
background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
background-position: -539px -1628px;
background-position: -294px -1628px;
width: 48px;
height: 52px;
}
.achievement-seafoam2x {
background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
background-position: -588px -1628px;
background-position: -343px -1628px;
width: 48px;
height: 52px;
}
.achievement-shield2x {
background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
background-position: -637px -1628px;
background-position: -392px -1628px;
width: 48px;
height: 52px;
}
.achievement-shinySeed2x {
background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
background-position: -686px -1628px;
background-position: -441px -1628px;
width: 48px;
height: 52px;
}
.achievement-snowball2x {
background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
background-position: -735px -1628px;
background-position: -490px -1628px;
width: 48px;
height: 52px;
}
.achievement-spookySparkles2x {
background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
background-position: -784px -1628px;
background-position: -539px -1628px;
width: 48px;
height: 52px;
}
.achievement-stoikalm2x {
background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
background-position: -833px -1628px;
background-position: -588px -1628px;
width: 48px;
height: 52px;
}
.achievement-sun2x {
background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
background-position: -882px -1628px;
background-position: -637px -1628px;
width: 48px;
height: 52px;
}
.achievement-sword2x {
background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
background-position: -931px -1628px;
background-position: -686px -1628px;
width: 48px;
height: 52px;
}
.achievement-thankyou2x {
background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
background-position: -980px -1628px;
background-position: -735px -1628px;
width: 48px;
height: 52px;
}
.achievement-thermometer2x {
background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
background-position: -1029px -1628px;
background-position: -784px -1628px;
width: 48px;
height: 52px;
}
.achievement-tickledPink2x {
background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
background-position: -706px -1480px;
background-position: -633px -1480px;
width: 68px;
height: 68px;
}
.achievement-tree2x {
background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
background-position: -1078px -1628px;
background-position: -833px -1628px;
width: 48px;
height: 52px;
}
.achievement-triadbingo2x {
background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
background-position: -1127px -1628px;
background-position: -882px -1628px;
width: 48px;
height: 52px;
}
.achievement-ultimate-healer2x {
background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
background-position: -1176px -1628px;
background-position: -931px -1628px;
width: 48px;
height: 52px;
}
.achievement-ultimate-mage2x {
background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
background-position: -1225px -1628px;
background-position: -980px -1628px;
width: 48px;
height: 52px;
}
.achievement-ultimate-rogue2x {
background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
background-position: -1274px -1628px;
background-position: -1029px -1628px;
width: 48px;
height: 52px;
}
.achievement-ultimate-warrior2x {
background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
background-position: -1323px -1628px;
background-position: -1078px -1628px;
width: 48px;
height: 52px;
}
.achievement-undeadUndertaker2x {
background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
background-position: -1153px -1480px;
background-position: -1080px -1480px;
width: 64px;
height: 56px;
}
.achievement-unearned2x {
background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
background-position: -1372px -1628px;
background-position: -1127px -1628px;
width: 48px;
height: 52px;
}
.achievement-valentine2x {
background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
background-position: -1421px -1628px;
background-position: -1176px -1628px;
width: 48px;
height: 52px;
}
.achievement-wolf2x {
background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
background-position: -1470px -1628px;
background-position: -1225px -1628px;
width: 48px;
height: 52px;
}
@@ -1210,9 +1216,3 @@
width: 141px;
height: 147px;
}
.background_marble_temple {
background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
background-position: -426px -1480px;
width: 141px;
height: 147px;
}
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
@@ -1,18 +1,18 @@
.quest_TEMPLATE_FOR_MISSING_IMAGE {
background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
background-position: -502px -1543px;
background-position: -502px -1546px;
width: 221px;
height: 39px;
}
.quest_dilatory {
background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
background-position: -220px 0px;
background-position: -440px 0px;
width: 219px;
height: 219px;
}
.quest_dilatoryDistress1 {
background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
background-position: 0px -1332px;
background-position: -220px -1332px;
width: 210px;
height: 210px;
}
@@ -24,19 +24,25 @@
}
.quest_dilatoryDistress3 {
background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
background-position: -440px 0px;
background-position: 0px -232px;
width: 219px;
height: 219px;
}
.quest_dilatory_derby {
background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
background-position: -220px 0px;
width: 219px;
height: 219px;
}
.quest_dolphin {
background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
background-position: 0px -232px;
background-position: -220px -232px;
width: 219px;
height: 219px;
}
.quest_dustbunnies {
background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
background-position: -220px -232px;
background-position: -440px -232px;
width: 219px;
height: 219px;
}
@@ -54,19 +60,19 @@
}
.quest_evilsanta2 {
background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
background-position: -440px -232px;
background-position: -660px 0px;
width: 219px;
height: 219px;
}
.quest_falcon {
background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
background-position: -660px 0px;
background-position: -660px -220px;
width: 219px;
height: 219px;
}
.quest_ferret {
background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
background-position: -660px -220px;
background-position: 0px -452px;
width: 219px;
height: 219px;
}
@@ -78,19 +84,19 @@
}
.quest_ghost_stag {
background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
background-position: 0px -452px;
background-position: -220px -452px;
width: 219px;
height: 219px;
}
.quest_goldenknight1 {
background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
background-position: -220px -452px;
background-position: -440px -452px;
width: 219px;
height: 219px;
}
.quest_goldenknight2 {
background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
background-position: 0px -1543px;
background-position: 0px -1546px;
width: 250px;
height: 150px;
}
@@ -102,67 +108,67 @@
}
.quest_gryphon {
background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
background-position: -654px -1332px;
background-position: -874px -1332px;
width: 216px;
height: 177px;
}
.quest_guineapig {
background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
background-position: -440px -452px;
background-position: -660px -452px;
width: 219px;
height: 219px;
}
.quest_harpy {
background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
background-position: -660px -452px;
background-position: -880px 0px;
width: 219px;
height: 219px;
}
.quest_hedgehog {
background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
background-position: -211px -1332px;
background-position: -431px -1332px;
width: 219px;
height: 186px;
}
.quest_hippo {
background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
background-position: -880px 0px;
background-position: -880px -220px;
width: 219px;
height: 219px;
}
.quest_horse {
background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
background-position: -880px -220px;
background-position: -880px -440px;
width: 219px;
height: 219px;
}
.quest_kangaroo {
background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
background-position: -880px -440px;
background-position: 0px -672px;
width: 219px;
height: 219px;
}
.quest_kraken {
background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
background-position: -871px -1332px;
background-position: -1091px -1332px;
width: 216px;
height: 177px;
}
.quest_lostMasterclasser1 {
background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
background-position: 0px -672px;
background-position: -220px -672px;
width: 219px;
height: 219px;
}
.quest_lostMasterclasser2 {
background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
background-position: -220px -672px;
background-position: -440px -672px;
width: 219px;
height: 219px;
}
.quest_lostMasterclasser3 {
background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
background-position: -440px -672px;
background-position: -660px -672px;
width: 219px;
height: 219px;
}
@@ -174,19 +180,19 @@
}
.quest_mayhemMistiflying2 {
background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
background-position: -660px -672px;
background-position: -880px -672px;
width: 219px;
height: 219px;
}
.quest_mayhemMistiflying3 {
background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
background-position: -880px -672px;
background-position: -1100px 0px;
width: 219px;
height: 219px;
}
.quest_monkey {
background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
background-position: -1100px 0px;
background-position: -1100px -220px;
width: 219px;
height: 219px;
}
@@ -198,31 +204,31 @@
}
.quest_moon2 {
background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
background-position: -1100px -220px;
background-position: -1100px -440px;
width: 219px;
height: 219px;
}
.quest_moon3 {
background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
background-position: -1100px -440px;
background-position: -1100px -660px;
width: 219px;
height: 219px;
}
.quest_moonstone1 {
background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
background-position: -1100px -660px;
background-position: 0px -892px;
width: 219px;
height: 219px;
}
.quest_moonstone2 {
background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
background-position: 0px -892px;
background-position: -220px -892px;
width: 219px;
height: 219px;
}
.quest_moonstone3 {
background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
background-position: -220px -892px;
background-position: -440px -892px;
width: 219px;
height: 219px;
}
@@ -234,13 +240,13 @@
}
.quest_octopus {
background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
background-position: -431px -1332px;
background-position: -651px -1332px;
width: 222px;
height: 177px;
}
.quest_owl {
background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
background-position: -440px -892px;
background-position: -660px -892px;
width: 219px;
height: 219px;
}
@@ -258,19 +264,19 @@
}
.quest_pterodactyl {
background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
background-position: -660px -892px;
background-position: -880px -892px;
width: 219px;
height: 219px;
}
.quest_rat {
background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
background-position: -880px -892px;
background-position: -1100px -892px;
width: 219px;
height: 219px;
}
.quest_robot {
background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
background-position: -1100px -892px;
background-position: -1320px 0px;
width: 219px;
height: 219px;
}
@@ -288,67 +294,67 @@
}
.quest_ruby {
background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
background-position: -1320px 0px;
background-position: -1320px -220px;
width: 219px;
height: 219px;
}
.quest_sabretooth {
background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
background-position: -1320px -220px;
background-position: -1320px -440px;
width: 219px;
height: 219px;
}
.quest_seaserpent {
background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
background-position: -1320px -440px;
background-position: -1320px -660px;
width: 219px;
height: 219px;
}
.quest_sheep {
background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
background-position: -1320px -660px;
background-position: -1320px -880px;
width: 219px;
height: 219px;
}
.quest_silver {
background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
background-position: -1320px -880px;
background-position: 0px -1112px;
width: 219px;
height: 219px;
}
.quest_slime {
background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
background-position: 0px -1112px;
background-position: -220px -1112px;
width: 219px;
height: 219px;
}
.quest_sloth {
background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
background-position: -220px -1112px;
background-position: -440px -1112px;
width: 219px;
height: 219px;
}
.quest_snail {
background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
background-position: -1320px -1112px;
background-position: 0px -1332px;
width: 219px;
height: 213px;
}
.quest_snake {
background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
background-position: -1088px -1332px;
background-position: -1308px -1332px;
width: 216px;
height: 177px;
}
.quest_spider {
background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
background-position: -251px -1543px;
background-position: -251px -1546px;
width: 250px;
height: 150px;
}
.quest_squirrel {
background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
background-position: -440px -1112px;
background-position: -660px -1112px;
width: 219px;
height: 219px;
}
@@ -360,13 +366,13 @@
}
.quest_stoikalmCalamity2 {
background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
background-position: -660px -1112px;
background-position: -880px -1112px;
width: 219px;
height: 219px;
}
.quest_stoikalmCalamity3 {
background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
background-position: -880px -1112px;
background-position: -1100px -1112px;
width: 219px;
height: 219px;
}
@@ -384,19 +390,13 @@
}
.quest_taskwoodsTerror3 {
background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
background-position: -1100px -1112px;
background-position: -1320px -1112px;
width: 219px;
height: 219px;
}
.quest_treeling {
background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
background-position: -1305px -1332px;
width: 216px;
height: 177px;
}
.quest_trex_undead {
background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
background-position: -1522px -1332px;
background-position: -1525px -1332px;
width: 216px;
height: 177px;
}
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
@@ -1,54 +1,78 @@
.icon_background_rainbow_meadow {
background-image: url('~@/assets/images/sprites/spritesmith-main-2.png');
background-position: -637px -1456px;
width: 68px;
height: 68px;
}
.icon_background_rainbows_end {
background-image: url('~@/assets/images/sprites/spritesmith-main-2.png');
background-position: -706px -1456px;
width: 68px;
height: 68px;
}
.icon_background_rainforest {
background-image: url('~@/assets/images/sprites/spritesmith-main-2.png');
background-position: -775px -1456px;
width: 68px;
height: 68px;
}
.icon_background_rainy_barnyard {
background-image: url('~@/assets/images/sprites/spritesmith-main-2.png');
background-position: -844px -1456px;
width: 68px;
height: 68px;
}
.icon_background_rainy_city {
background-image: url('~@/assets/images/sprites/spritesmith-main-2.png');
background-position: -910px -1456px;
background-position: -913px -1456px;
width: 68px;
height: 68px;
}
.icon_background_red {
background-image: url('~@/assets/images/sprites/spritesmith-main-2.png');
background-position: -979px -1456px;
background-position: -982px -1456px;
width: 68px;
height: 68px;
}
.icon_background_rolling_hills {
background-image: url('~@/assets/images/sprites/spritesmith-main-2.png');
background-position: -1048px -1456px;
background-position: -1051px -1456px;
width: 68px;
height: 68px;
}
.icon_background_rose_garden {
background-image: url('~@/assets/images/sprites/spritesmith-main-2.png');
background-position: -1117px -1456px;
background-position: -1120px -1456px;
width: 68px;
height: 68px;
}
.icon_background_rowboat {
background-image: url('~@/assets/images/sprites/spritesmith-main-2.png');
background-position: -1186px -1456px;
background-position: -1189px -1456px;
width: 68px;
height: 68px;
}
.icon_background_sandcastle {
background-image: url('~@/assets/images/sprites/spritesmith-main-2.png');
background-position: -1255px -1456px;
background-position: -1258px -1456px;
width: 68px;
height: 68px;
}
.icon_background_school_of_fish {
background-image: url('~@/assets/images/sprites/spritesmith-main-2.png');
background-position: -1324px -1456px;
background-position: -1327px -1456px;
width: 68px;
height: 68px;
}
.icon_background_scribes_workshop {
background-image: url('~@/assets/images/sprites/spritesmith-main-2.png');
background-position: -1393px -1456px;
background-position: -1396px -1456px;
width: 68px;
height: 68px;
}
.icon_background_seafarer_ship {
background-image: url('~@/assets/images/sprites/spritesmith-main-2.png');
background-position: -1462px -1456px;
background-position: -1465px -1456px;
width: 68px;
height: 68px;
}
@@ -3724,39 +3748,3 @@
width: 60px;
height: 60px;
}
.hair_bangs_3_candycane {
background-image: url('~@/assets/images/sprites/spritesmith-main-2.png');
background-position: -637px -1456px;
width: 90px;
height: 90px;
}
.customize-option.hair_bangs_3_candycane {
background-image: url('~@/assets/images/sprites/spritesmith-main-2.png');
background-position: -662px -1471px;
width: 60px;
height: 60px;
}
.hair_bangs_3_candycorn {
background-image: url('~@/assets/images/sprites/spritesmith-main-2.png');
background-position: -728px -1456px;
width: 90px;
height: 90px;
}
.customize-option.hair_bangs_3_candycorn {
background-image: url('~@/assets/images/sprites/spritesmith-main-2.png');
background-position: -753px -1471px;
width: 60px;
height: 60px;
}
.hair_bangs_3_festive {
background-image: url('~@/assets/images/sprites/spritesmith-main-2.png');
background-position: -819px -1456px;
width: 90px;
height: 90px;
}
.customize-option.hair_bangs_3_festive {
background-image: url('~@/assets/images/sprites/spritesmith-main-2.png');
background-position: -844px -1471px;
width: 60px;
height: 60px;
}
File diff suppressed because it is too large Load Diff
@@ -1,45 +1,63 @@
.Mount_Head_Sabretooth-Desert {
.Mount_Head_Sabretooth-Base {
background-image: url('~@/assets/images/sprites/spritesmith-main-21.png');
background-position: 0px 0px;
width: 135px;
height: 135px;
}
.Mount_Head_Sabretooth-Golden {
.Mount_Head_Sabretooth-CottonCandyBlue {
background-image: url('~@/assets/images/sprites/spritesmith-main-21.png');
background-position: -136px 0px;
width: 135px;
height: 135px;
}
.Mount_Head_Sabretooth-Red {
.Mount_Head_Sabretooth-CottonCandyPink {
background-image: url('~@/assets/images/sprites/spritesmith-main-21.png');
background-position: 0px -136px;
width: 135px;
height: 135px;
}
.Mount_Head_Sabretooth-Shade {
.Mount_Head_Sabretooth-Desert {
background-image: url('~@/assets/images/sprites/spritesmith-main-21.png');
background-position: -136px -136px;
width: 135px;
height: 135px;
}
.Mount_Head_Sabretooth-Skeleton {
.Mount_Head_Sabretooth-Golden {
background-image: url('~@/assets/images/sprites/spritesmith-main-21.png');
background-position: -272px 0px;
width: 135px;
height: 135px;
}
.Mount_Head_Sabretooth-White {
.Mount_Head_Sabretooth-Red {
background-image: url('~@/assets/images/sprites/spritesmith-main-21.png');
background-position: -272px -136px;
width: 135px;
height: 135px;
}
.Mount_Head_Sabretooth-Zombie {
.Mount_Head_Sabretooth-Shade {
background-image: url('~@/assets/images/sprites/spritesmith-main-21.png');
background-position: 0px -272px;
width: 135px;
height: 135px;
}
.Mount_Head_Sabretooth-Skeleton {
background-image: url('~@/assets/images/sprites/spritesmith-main-21.png');
background-position: -136px -272px;
width: 135px;
height: 135px;
}
.Mount_Head_Sabretooth-White {
background-image: url('~@/assets/images/sprites/spritesmith-main-21.png');
background-position: -272px -272px;
width: 135px;
height: 135px;
}
.Mount_Head_Sabretooth-Zombie {
background-image: url('~@/assets/images/sprites/spritesmith-main-21.png');
background-position: -408px 0px;
width: 135px;
height: 135px;
}
.Mount_Head_SeaSerpent-Base {
background-image: url('~@/assets/images/sprites/spritesmith-main-21.png');
background-position: -318px -816px;
@@ -582,61 +600,61 @@
}
.Mount_Head_TRex-Base {
background-image: url('~@/assets/images/sprites/spritesmith-main-21.png');
background-position: -136px -272px;
background-position: -408px -136px;
width: 135px;
height: 135px;
}
.Mount_Head_TRex-CottonCandyBlue {
background-image: url('~@/assets/images/sprites/spritesmith-main-21.png');
background-position: -272px -272px;
background-position: -408px -272px;
width: 135px;
height: 135px;
}
.Mount_Head_TRex-CottonCandyPink {
background-image: url('~@/assets/images/sprites/spritesmith-main-21.png');
background-position: -408px 0px;
background-position: 0px -408px;
width: 135px;
height: 135px;
}
.Mount_Head_TRex-Desert {
background-image: url('~@/assets/images/sprites/spritesmith-main-21.png');
background-position: -408px -136px;
background-position: -136px -408px;
width: 135px;
height: 135px;
}
.Mount_Head_TRex-Golden {
background-image: url('~@/assets/images/sprites/spritesmith-main-21.png');
background-position: -408px -272px;
background-position: -272px -408px;
width: 135px;
height: 135px;
}
.Mount_Head_TRex-Red {
background-image: url('~@/assets/images/sprites/spritesmith-main-21.png');
background-position: 0px -408px;
background-position: -408px -408px;
width: 135px;
height: 135px;
}
.Mount_Head_TRex-Shade {
background-image: url('~@/assets/images/sprites/spritesmith-main-21.png');
background-position: -136px -408px;
background-position: -544px 0px;
width: 135px;
height: 135px;
}
.Mount_Head_TRex-Skeleton {
background-image: url('~@/assets/images/sprites/spritesmith-main-21.png');
background-position: -272px -408px;
background-position: -544px -136px;
width: 135px;
height: 135px;
}
.Mount_Head_TRex-White {
background-image: url('~@/assets/images/sprites/spritesmith-main-21.png');
background-position: -408px -408px;
background-position: -544px -272px;
width: 135px;
height: 135px;
}
.Mount_Head_TRex-Zombie {
background-image: url('~@/assets/images/sprites/spritesmith-main-21.png');
background-position: -544px 0px;
background-position: -544px -408px;
width: 135px;
height: 135px;
}
@@ -1248,107 +1266,89 @@
}
.Mount_Head_Wolf-Amber {
background-image: url('~@/assets/images/sprites/spritesmith-main-21.png');
background-position: -544px -136px;
background-position: 0px -544px;
width: 135px;
height: 135px;
}
.Mount_Head_Wolf-Aquatic {
background-image: url('~@/assets/images/sprites/spritesmith-main-21.png');
background-position: -544px -272px;
background-position: -136px -544px;
width: 135px;
height: 135px;
}
.Mount_Head_Wolf-Aurora {
background-image: url('~@/assets/images/sprites/spritesmith-main-21.png');
background-position: -544px -408px;
background-position: -272px -544px;
width: 135px;
height: 135px;
}
.Mount_Head_Wolf-Base {
background-image: url('~@/assets/images/sprites/spritesmith-main-21.png');
background-position: 0px -544px;
background-position: -408px -544px;
width: 135px;
height: 135px;
}
.Mount_Head_Wolf-BirchBark {
background-image: url('~@/assets/images/sprites/spritesmith-main-21.png');
background-position: -136px -544px;
background-position: -544px -544px;
width: 135px;
height: 135px;
}
.Mount_Head_Wolf-Bronze {
background-image: url('~@/assets/images/sprites/spritesmith-main-21.png');
background-position: -272px -544px;
background-position: -680px 0px;
width: 135px;
height: 135px;
}
.Mount_Head_Wolf-Celestial {
background-image: url('~@/assets/images/sprites/spritesmith-main-21.png');
background-position: -408px -544px;
background-position: -680px -136px;
width: 135px;
height: 135px;
}
.Mount_Head_Wolf-CottonCandyBlue {
background-image: url('~@/assets/images/sprites/spritesmith-main-21.png');
background-position: -544px -544px;
background-position: -680px -272px;
width: 135px;
height: 135px;
}
.Mount_Head_Wolf-CottonCandyPink {
background-image: url('~@/assets/images/sprites/spritesmith-main-21.png');
background-position: -680px 0px;
background-position: -680px -408px;
width: 135px;
height: 135px;
}
.Mount_Head_Wolf-Cupid {
background-image: url('~@/assets/images/sprites/spritesmith-main-21.png');
background-position: -680px -136px;
background-position: -680px -544px;
width: 135px;
height: 135px;
}
.Mount_Head_Wolf-Desert {
background-image: url('~@/assets/images/sprites/spritesmith-main-21.png');
background-position: -680px -272px;
background-position: 0px -680px;
width: 135px;
height: 135px;
}
.Mount_Head_Wolf-Ember {
background-image: url('~@/assets/images/sprites/spritesmith-main-21.png');
background-position: -680px -408px;
background-position: -136px -680px;
width: 135px;
height: 135px;
}
.Mount_Head_Wolf-Fairy {
background-image: url('~@/assets/images/sprites/spritesmith-main-21.png');
background-position: -680px -544px;
background-position: -272px -680px;
width: 135px;
height: 135px;
}
.Mount_Head_Wolf-Floral {
background-image: url('~@/assets/images/sprites/spritesmith-main-21.png');
background-position: 0px -680px;
background-position: -408px -680px;
width: 135px;
height: 135px;
}
.Mount_Head_Wolf-Frost {
background-image: url('~@/assets/images/sprites/spritesmith-main-21.png');
background-position: -136px -680px;
width: 135px;
height: 135px;
}
.Mount_Head_Wolf-Ghost {
background-image: url('~@/assets/images/sprites/spritesmith-main-21.png');
background-position: -272px -680px;
width: 135px;
height: 135px;
}
.Mount_Head_Wolf-Glass {
background-image: url('~@/assets/images/sprites/spritesmith-main-21.png');
background-position: -408px -680px;
width: 135px;
height: 135px;
}
.Mount_Head_Wolf-Glow {
background-image: url('~@/assets/images/sprites/spritesmith-main-21.png');
background-position: -544px -680px;
width: 135px;
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: 42 KiB

After

Width:  |  Height:  |  Size: 53 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 469 KiB

After

Width:  |  Height:  |  Size: 470 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 623 KiB

After

Width:  |  Height:  |  Size: 615 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 117 KiB

After

Width:  |  Height:  |  Size: 117 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 113 KiB

After

Width:  |  Height:  |  Size: 114 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 178 KiB

After

Width:  |  Height:  |  Size: 175 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 430 KiB

After

Width:  |  Height:  |  Size: 431 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 218 KiB

After

Width:  |  Height:  |  Size: 223 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 167 KiB

After

Width:  |  Height:  |  Size: 167 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 148 KiB

After

Width:  |  Height:  |  Size: 150 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 135 KiB

After

Width:  |  Height:  |  Size: 136 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 143 KiB

After

Width:  |  Height:  |  Size: 140 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 172 KiB

After

Width:  |  Height:  |  Size: 173 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 205 KiB

After

Width:  |  Height:  |  Size: 213 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 146 KiB

After

Width:  |  Height:  |  Size: 143 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 152 KiB

After

Width:  |  Height:  |  Size: 152 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 155 KiB

After

Width:  |  Height:  |  Size: 155 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 144 KiB

After

Width:  |  Height:  |  Size: 146 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 185 KiB

After

Width:  |  Height:  |  Size: 183 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 166 KiB

After

Width:  |  Height:  |  Size: 167 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 162 KiB

After

Width:  |  Height:  |  Size: 162 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 112 KiB

After

Width:  |  Height:  |  Size: 118 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 55 KiB

After

Width:  |  Height:  |  Size: 55 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 76 KiB

After

Width:  |  Height:  |  Size: 75 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 72 KiB

After

Width:  |  Height:  |  Size: 72 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 135 KiB

After

Width:  |  Height:  |  Size: 137 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 116 KiB

After

Width:  |  Height:  |  Size: 115 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 129 KiB

After

Width:  |  Height:  |  Size: 129 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 147 KiB

After

Width:  |  Height:  |  Size: 150 KiB

@@ -319,6 +319,14 @@ const NOTIFICATIONS = {
achievement: 'bugBonanza', // defined manually until the server sends all the necessary data
},
},
ACHIEVEMENT_BARE_NECESSITIES: {
achievement: true,
label: $t => `${$t('achievement')}: ${$t('achievementBareNecessities')}`,
modalId: 'generic-achievement',
data: {
achievement: 'bareNecessities', // defined manually until the server sends all the necessary data
},
},
};
export default {
@@ -377,7 +385,7 @@ export default {
'ACHIEVEMENT_MOUNT_MASTER', 'ACHIEVEMENT_TRIAD_BINGO', 'ACHIEVEMENT_DUST_DEVIL', 'ACHIEVEMENT_ARID_AUTHORITY',
'ACHIEVEMENT_MONSTER_MAGUS', 'ACHIEVEMENT_UNDEAD_UNDERTAKER', 'ACHIEVEMENT_PRIMED_FOR_PAINTING',
'ACHIEVEMENT_PEARLY_PRO', 'ACHIEVEMENT_TICKLED_PINK', 'ACHIEVEMENT_ROSY_OUTLOOK', 'ACHIEVEMENT',
'ONBOARDING_COMPLETE', 'FIRST_DROPS', 'ACHIEVEMENT_BUG_BONANZA',
'ONBOARDING_COMPLETE', 'FIRST_DROPS', 'ACHIEVEMENT_BUG_BONANZA', 'ACHIEVEMENT_BARE_NECESSITIES',
].forEach(type => {
handledNotifications[type] = true;
});
@@ -792,6 +800,7 @@ export default {
case 'ACHIEVEMENT_TICKLED_PINK':
case 'ACHIEVEMENT_ROSY_OUTLOOK':
case 'ACHIEVEMENT_BUG_BONANZA':
case 'ACHIEVEMENT_BARE_NECESSITIES':
case 'GENERIC_ACHIEVEMENT':
this.showNotificationWithModal(notification);
break;
@@ -318,7 +318,7 @@
>
<div
:id="achievKey + '-achievement'"
class="box achievement-container"
class="box achievement-container d-flex align-items-center justify-content-center"
:class="{'achievement-unearned': !achievement.earned}"
>
<b-popover
@@ -568,7 +568,6 @@
.box {
margin: 0 auto;
margin-bottom: 1em;
padding-top: 1.2em;
background: $white;
}
+4 -1
View File
@@ -78,5 +78,8 @@
"achievementRosyOutlookModalText": "You tamed all the Cotton Candy Pink Mounts!",
"achievementBugBonanza": "Bug Bonanza",
"achievementBugBonanzaText": "Has completed Beetle, Butterfly, Snail, and Spider pet quests.",
"achievementBugBonanzaModalText": "You completed the Beetle, Butterfly, Snail, and Spider pet quests!"
"achievementBugBonanzaModalText": "You completed the Beetle, Butterfly, Snail, and Spider pet quests!",
"achievementBareNecessities": "Bare Necessities",
"achievementBareNecessitiesText": "Has completed Monkey, Sloth, and Treeling pet quests.",
"achievementBareNecessitiesModalText": "You completed the Monkey, Sloth, and Treeling pet quests!"
}
+4 -1
View File
@@ -806,5 +806,8 @@
"questWaffleRageDescription": "Maple Mire: This bar fills when you don't complete your Dailies. When it is full, the Awful Waffle will set back the party's attack progress!",
"questWaffleRageEffect": "`Awful Waffle uses MAPLE MIRE!` Sticky sappy syrup slows your swings and spells!",
"questWaffleDropDessertPotion": "Confection Hatching Potion",
"questWaffleUnlockText": "Unlocks Confection Hatching Potions for purchase in the Market"
"questWaffleUnlockText": "Unlocks Confection Hatching Potions for purchase in the Market",
"jungleBuddiesText": "Jungle Buddies Quest Bundle",
"jungleBuddiesNotes": "Contains 'Monstrous Mandrill and the Mischief Monkeys', 'The Somnolent Sloth', and 'The Tangle Tree'. Available until <%= date %>."
}
@@ -192,6 +192,11 @@ const basicAchievs = {
titleKey: 'achievementBugBonanza',
textKey: 'achievementBugBonanzaText',
},
bareNecessities: {
icon: 'achievement-bareNecessities',
titleKey: 'achievementBareNecessities',
textKey: 'achievementBareNecessitiesText',
},
};
Object.assign(achievementsData, basicAchievs);
+15
View File
@@ -221,6 +221,21 @@ const bundles = {
type: 'quests',
value: 7,
},
jungleBuddies: {
key: 'jungleBuddies',
text: t('jungleBuddiesText'),
notes: t('jungleBuddiesNotes', { date: moment('2020-05-31').format('LL') }),
bundleKeys: [
'monkey',
'sloth',
'treeling',
],
canBuy () {
return moment().isBetween('2020-05-19', '2020-06-02');
},
type: 'quests',
value: 7,
},
};
export default bundles;
@@ -282,6 +282,11 @@ export const QUEST_SERIES_ACHIEVEMENTS = {
'snail',
'spider',
],
bareNecessities: [
'monkey',
'sloth',
'treeling',
],
};
export const ANIMAL_COLOR_ACHIEVEMENTS = [
@@ -200,6 +200,7 @@ function _getBasicAchievements (user, language) {
_addSimple(result, user, { path: 'tickledPink', language });
_addSimple(result, user, { path: 'rosyOutlook', language });
_addSimple(result, user, { path: 'bugBonanza', language });
_addSimple(result, user, { path: 'bareNecessities', language });
_addSimpleWithMasterCount(result, user, { path: 'beastMaster', language });
_addSimpleWithMasterCount(result, user, { path: 'mountMaster', language });
Binary file not shown.

After

Width:  |  Height:  |  Size: 1.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 17 KiB

+30 -9
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 = 'BLOG POST: RESTING IN THE INN';
const LAST_ANNOUNCEMENT_TITLE = 'NEW PET ACHIEVEMENT AND QUEST BUNDLE!';
const worldDmg = { // @TODO
bailey: false,
};
@@ -35,16 +35,37 @@ api.getNews = {
</div>
</div>
<hr/>
<div class="scene_pets_resting center-block"></div>
<div class="achievement-bareNecessities2x center-block"></div>
<h3>New Quest Pet Badge!</h3>
<p>
This month's <a href='https://habitica.wordpress.com/2020/05/13/rest-in-the-inn/'
target='_blank'>featured Wiki article</a> is about Resting in the Inn! We hope that it
will help you when you need a break from your Dailies. Be sure to check it out, and let
us know what you think by reaching out on <a href='https://twitter.com/habitica'
target='_blank'>Twitter</a>, <a href='http://blog.habitrpg.com' target='_blank'>
Tumblr</a>, and <a href='https://facebook.com/habitica' target='_blank'>Facebook</a>.
We're releasing a new achievement so you can celebrate your successes in the world of
Habitican Pet collecting! Earn the Bare Necessities achievement by collecting all
Habitica's jungle-dwelling Pets and you'll earn a nifty badge for your profile.
</p>
<div class="small mb-3">by shanaqui and the Wiki Wizards</div>
<p>
If youve already completed the required Quests for a newly released achievement, you
dont have to do them all again! Just complete one of the relevant Quests and the
Achievement will unlock. Check your profile and celebrate your new Achievement with
pride.
</p>
<div class="small mb-3">by Beffymaroo and SabreCat</div>
<div class="promo_jungle_buddies_bundle center-block"></div>
<h3>New Discounted Pet Quest Bundle: Jungle Buddies!</h3>
<p>
If you're eager to complete the Bare Necessities quests, or if you're simply looking to
add some equatorial pets to your Habitica stable, you're in luck! From now until May 30,
you can purchase the Jungle Buddies Pet Quest Bundle and receive the Monkey, Sloth, and
Treeling quests, all for only 7 Gems! That's a discount of 5 Gems from the price of
purchasing them separately. Check it out in the <a href='/shops/quests'>Quest Shop</a>
today!
</p>
<div class="small">by SabreCat</div>
<div class="small">Writing by PixelHunter, Emily Austin, Flutter Bee, and Felipe NA</div>
<div class="small mb-3">
Art by JaizakAripaik, Drevian, McCoyly, awakebyjava, PainterProphet, Kiwibot,
greenpencil, fuzzytrees, PainterProphet, aurakami, yamato, leephon, Misceo, and
Oneironaut
</div>
</div>
`,
});
+1
View File
@@ -134,6 +134,7 @@ export default new Schema({
tickledPink: Boolean,
rosyOutlook: Boolean,
bugBonanza: Boolean,
bareNecessities: Boolean,
// Onboarding Guide
createdTask: Boolean,
completedTask: Boolean,
@@ -55,6 +55,7 @@ const NOTIFICATION_TYPES = [
'ACHIEVEMENT_TICKLED_PINK',
'ACHIEVEMENT_ROSY_OUTLOOK',
'ACHIEVEMENT_BUG_BONANZA',
'ACHIEVEMENT_BARE_NECESSITIES',
'ACHIEVEMENT', // generic achievement notification, details inside `notification.data`
];