Compare commits

..

20 Commits

Author SHA1 Message Date
Sabe Jones 24b2bc9aa1 4.2.3 2017-10-10 17:12:43 +00:00
Sabe Jones aea08a971a Merge branch 'develop' into release 2017-10-10 17:12:35 +00:00
Sabe Jones e3452b3ba7 chore(i18n): update locales 2017-10-10 17:11:48 +00:00
Michael Hibbs 3db666eb9e Show error message in empty market inventory drawer (#9041)
* client/tasks/user: (create dropdown) change icon color on menuitem hover

Previously the color was only changing when you hovered over the
text or icon.

This change changes the icon color when you hover anywhere over
the `menuitem`

* client/shops/market: fix search field in market

* Hide drawer sliders if number of items for type is empty
* Move drawer-help-text icon down to line up vertically with text
* Add TODO for error thrown when trying to sell special item types

* client/tasks/taskModal: display all selected tags for task

* i18n/groups: religous to religious

* client/shops/market: Add error message to empty drawer slider

* Create new locale file to hold inventory locales

* client/tasks/user: Revert change to create dropdown

* Revert tag changes

This will be picked up in a separate PR.

* Fix missing space before function paren
2017-10-10 11:18:50 -05:00
negue cf5985e38c oct 9 fixes (#9175)
* hide hatching modal before opening the hatched modal

* fix Options not sticking: Costume, Auto Equip

* Hall of Heroes - Collapse Items & Auth

* prevent wrapping currency icon+text

* fix spacing of remaining gems (if two digits)

* fix logo in safari (removed <mask />)

* update seasonal shop items on purchase
2017-10-09 22:40:39 -05:00
Sabe Jones d88a8247d1 Fixes 2017/10/09 (#9176)
* fix(quests): correctly divide owner-only/all

* fix(equipment): clarify locked items
2017-10-09 22:15:52 -05:00
Keith Holliday 7e1ae6a571 Oct 9 fixes (#9174)
* Prevented purchasing of locked quest

* Fixed category filters for challenges

* Added armoire equipment directly to user

* Halfed the time notifications display

* Added quest accept/reject to party page
2017-10-09 14:40:45 -05:00
Sabe Jones d117117885 4.2.2 2017-10-09 19:17:49 +00:00
Sabe Jones 5dd168eee4 chore(i18n): update locales 2017-10-09 19:14:21 +00:00
Keith Holliday a7c9355dd5 Fixed breaking api change (#9170) 2017-10-06 16:06:48 -05:00
Matteo Pagliazzi 81d3e8a68f add extra logging for ios/verify 2017-10-06 18:07:26 +02:00
Sabe Jones e0fbfffbf2 4.2.1 2017-10-06 00:49:02 +00:00
Sabe Jones 36b968a74a fix(news): remove Last Chance blurb 2017-10-06 00:48:34 +00:00
Sabe Jones fff249fb00 4.2.0 2017-10-06 00:39:47 +00:00
Sabe Jones ce5c6b9517 Merge branch 'develop' into release 2017-10-06 00:39:40 +00:00
Sabe Jones 702013f9ed chore(i18n): update locales 2017-10-06 00:38:10 +00:00
Sabe Jones 3503b307b2 Content and fixes 2017-10-05 (#9165)
* fix(market): display classless equipment

* fix(challenges): more missing Markdown

* feat(content): backgrounds and Enchanted Armoire 2017-10

* chore(sprites): compile
2017-10-05 19:00:39 -05:00
Keith Holliday f1ec8bbf2c Added styles to selecting challenge winner (#9164) 2017-10-05 18:02:26 -05:00
Keith Holliday 58b033db9e Oct 5 fixes (#9163)
* Added removing invites

* Addeed messages for empty gems to icon

* Added member for challenge members

* Fixed task cloning ending

* Fixed group task assignment

* Added small hack to prevent scrolling issues

* Fixed lint
2017-10-05 14:41:03 -05:00
thehollidayinn b0dcc2f6ef 4.1.4 2017-10-04 18:35:50 -05:00
445 changed files with 34594 additions and 33471 deletions
+1 -1
View File
@@ -1,6 +1,6 @@
{
"name": "habitica",
"version": "4.2.0",
"version": "4.2.3",
"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.2.0",
"version": "4.2.3",
"main": "./website/server/index.js",
"dependencies": {
"@slack/client": "^3.8.1",
@@ -142,4 +142,22 @@ describe('GET /challenges/:challengeId/members', () => {
let resIds = res.concat(res2).map(member => member._id);
expect(resIds).to.eql(expectedIds.sort());
});
it('supports using req.query.search to get search members', async () => {
let group = await generateGroup(user, {type: 'party', name: generateUUID()});
let challenge = await generateChallenge(user, group);
let usersToGenerate = [];
for (let i = 0; i < 3; i++) {
usersToGenerate.push(generateUser({challenges: [challenge._id]}));
}
let generatedUsers = await Promise.all(usersToGenerate);
let profileNames = generatedUsers.map(generatedUser => generatedUser.profile.name);
let firstProfileName = profileNames[0];
let nameToSearch = firstProfileName.substring(0, 4);
let response = await user.get(`/challenges/${challenge._id}/members?search=${nameToSearch}`);
expect(response[0].profile.name).to.eql(firstProfileName);
});
});
+19 -7
View File
@@ -1,12 +1,24 @@
.promo_login_screen {
.promo_armoire_backgrounds_201710 {
background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
background-position: -142px 0px;
width: 141px;
height: 438px;
}
.promo_farm_friends {
background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
background-position: 0px 0px;
width: 524px;
height: 274px;
width: 141px;
height: 441px;
}
.promo_spooky_sparkles {
.promo_mystery_201709 {
background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
background-position: 0px -275px;
width: 140px;
height: 294px;
background-position: -284px 0px;
width: 114px;
height: 90px;
}
.promo_takeThis_gear {
background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
background-position: -284px -91px;
width: 114px;
height: 87px;
}
Binary file not shown.

Before

Width:  |  Height:  |  Size: 14 KiB

After

Width:  |  Height:  |  Size: 25 KiB

File diff suppressed because it is too large Load Diff
Binary file not shown.

Before

Width:  |  Height:  |  Size: 556 KiB

After

Width:  |  Height:  |  Size: 538 KiB

File diff suppressed because it is too large Load Diff
Binary file not shown.

Before

Width:  |  Height:  |  Size: 285 KiB

After

Width:  |  Height:  |  Size: 314 KiB

File diff suppressed because it is too large Load Diff
Binary file not shown.

Before

Width:  |  Height:  |  Size: 279 KiB

After

Width:  |  Height:  |  Size: 290 KiB

File diff suppressed because it is too large Load Diff
Binary file not shown.

Before

Width:  |  Height:  |  Size: 156 KiB

After

Width:  |  Height:  |  Size: 153 KiB

File diff suppressed because it is too large Load Diff
Binary file not shown.

Before

Width:  |  Height:  |  Size: 152 KiB

After

Width:  |  Height:  |  Size: 150 KiB

File diff suppressed because it is too large Load Diff
Binary file not shown.

Before

Width:  |  Height:  |  Size: 143 KiB

After

Width:  |  Height:  |  Size: 138 KiB

File diff suppressed because it is too large Load Diff
Binary file not shown.

Before

Width:  |  Height:  |  Size: 150 KiB

After

Width:  |  Height:  |  Size: 154 KiB

File diff suppressed because it is too large Load Diff
Binary file not shown.

Before

Width:  |  Height:  |  Size: 145 KiB

After

Width:  |  Height:  |  Size: 147 KiB

File diff suppressed because it is too large Load Diff
Binary file not shown.

Before

Width:  |  Height:  |  Size: 155 KiB

After

Width:  |  Height:  |  Size: 152 KiB

File diff suppressed because it is too large Load Diff
Binary file not shown.

Before

Width:  |  Height:  |  Size: 173 KiB

After

Width:  |  Height:  |  Size: 157 KiB

File diff suppressed because it is too large Load Diff
Binary file not shown.

Before

Width:  |  Height:  |  Size: 160 KiB

After

Width:  |  Height:  |  Size: 174 KiB

File diff suppressed because it is too large Load Diff
Binary file not shown.

Before

Width:  |  Height:  |  Size: 151 KiB

After

Width:  |  Height:  |  Size: 158 KiB

File diff suppressed because it is too large Load Diff
Binary file not shown.

Before

Width:  |  Height:  |  Size: 56 KiB

After

Width:  |  Height:  |  Size: 58 KiB

File diff suppressed because it is too large Load Diff
Binary file not shown.

Before

Width:  |  Height:  |  Size: 75 KiB

After

Width:  |  Height:  |  Size: 74 KiB

File diff suppressed because it is too large Load Diff
Binary file not shown.

Before

Width:  |  Height:  |  Size: 73 KiB

After

Width:  |  Height:  |  Size: 67 KiB

File diff suppressed because it is too large Load Diff
Binary file not shown.

Before

Width:  |  Height:  |  Size: 143 KiB

After

Width:  |  Height:  |  Size: 147 KiB

File diff suppressed because it is too large Load Diff
Binary file not shown.

Before

Width:  |  Height:  |  Size: 136 KiB

After

Width:  |  Height:  |  Size: 136 KiB

File diff suppressed because it is too large Load Diff
Binary file not shown.

Before

Width:  |  Height:  |  Size: 129 KiB

After

Width:  |  Height:  |  Size: 132 KiB

File diff suppressed because it is too large Load Diff
Binary file not shown.

Before

Width:  |  Height:  |  Size: 115 KiB

After

Width:  |  Height:  |  Size: 115 KiB

+203 -143
View File
@@ -1,372 +1,450 @@
.weapon_rogue_0 {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1373px -1471px;
width: 90px;
height: 90px;
}
.weapon_rogue_1 {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1100px -1471px;
width: 90px;
height: 90px;
}
.weapon_rogue_2 {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -736px -1471px;
width: 90px;
height: 90px;
}
.weapon_rogue_3 {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -827px -1471px;
width: 90px;
height: 90px;
}
.weapon_rogue_4 {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -918px -1471px;
width: 90px;
height: 90px;
}
.weapon_rogue_5 {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1009px -1471px;
width: 90px;
height: 90px;
}
.weapon_rogue_6 {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1191px -1471px;
width: 90px;
height: 90px;
}
.weapon_special_1 {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1366px -1290px;
width: 102px;
height: 90px;
}
.weapon_special_2 {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1464px -1471px;
width: 90px;
height: 90px;
}
.weapon_special_3 {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: 0px -1613px;
width: 90px;
height: 90px;
}
.weapon_special_bardInstrument {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -182px -1613px;
width: 90px;
height: 90px;
}
.weapon_special_fencingFoil {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -273px -1613px;
width: 90px;
height: 90px;
}
.weapon_special_lunarScythe {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -364px -1613px;
width: 90px;
height: 90px;
}
.weapon_special_mammothRiderSpear {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1045px -1486px;
background-position: -455px -1613px;
width: 90px;
height: 90px;
}
.weapon_special_nomadsScimitar {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -954px -1486px;
background-position: -546px -1613px;
width: 90px;
height: 90px;
}
.weapon_special_pageBanner {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1136px -1486px;
background-position: -637px -1613px;
width: 90px;
height: 90px;
}
.weapon_special_roguishRainbowMessage {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1227px -1486px;
background-position: -728px -1613px;
width: 90px;
height: 90px;
}
.weapon_special_skeletonKey {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1318px -1486px;
background-position: -819px -1613px;
width: 90px;
height: 90px;
}
.weapon_special_tachi {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1409px -1486px;
background-position: -910px -1613px;
width: 90px;
height: 90px;
}
.weapon_special_taskwoodsLantern {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1591px -1486px;
background-position: -1001px -1613px;
width: 90px;
height: 90px;
}
.weapon_special_tridentOfCrashingTides {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1712px 0px;
background-position: -1183px -1613px;
width: 90px;
height: 90px;
}
.weapon_warrior_0 {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1712px -91px;
background-position: -1274px -1613px;
width: 90px;
height: 90px;
}
.weapon_warrior_1 {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1712px -273px;
background-position: -1456px -1613px;
width: 90px;
height: 90px;
}
.weapon_warrior_2 {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1712px -364px;
background-position: -1547px -1613px;
width: 90px;
height: 90px;
}
.weapon_warrior_3 {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1712px -546px;
background-position: -1712px 0px;
width: 90px;
height: 90px;
}
.weapon_warrior_4 {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1712px -637px;
background-position: -1712px -91px;
width: 90px;
height: 90px;
}
.weapon_warrior_5 {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1712px -728px;
background-position: -1712px -182px;
width: 90px;
height: 90px;
}
.weapon_warrior_6 {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1712px -819px;
background-position: -1712px -273px;
width: 90px;
height: 90px;
}
.weapon_wizard_0 {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1712px -910px;
background-position: -1712px -364px;
width: 90px;
height: 90px;
}
.weapon_wizard_1 {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1712px -1001px;
background-position: -190px -1471px;
width: 90px;
height: 90px;
}
.weapon_wizard_2 {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1712px -1092px;
background-position: -281px -1471px;
width: 90px;
height: 90px;
}
.weapon_wizard_3 {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1712px -1183px;
background-position: -372px -1471px;
width: 90px;
height: 90px;
}
.weapon_wizard_4 {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1712px -1274px;
background-position: -463px -1471px;
width: 90px;
height: 90px;
}
.weapon_wizard_5 {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1712px -1365px;
background-position: -554px -1471px;
width: 90px;
height: 90px;
}
.weapon_wizard_6 {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -772px -1486px;
background-position: -645px -1471px;
width: 90px;
height: 90px;
}
.Pet_Currency_Gem {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -621px -1670px;
background-position: -1712px -1228px;
width: 68px;
height: 68px;
}
.Pet_Currency_Gem1x {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1840px -73px;
background-position: -1772px -482px;
width: 15px;
height: 13px;
}
.Pet_Currency_Gem2x {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1803px -1084px;
background-position: -1772px -455px;
width: 30px;
height: 26px;
}
.PixelPaw-Gold {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1803px -170px;
background-position: -1656px -1265px;
width: 51px;
height: 51px;
}
.PixelPaw {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1803px -222px;
background-position: -1656px -1317px;
width: 51px;
height: 51px;
}
.PixelPaw002 {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1803px -274px;
background-position: -1646px -1471px;
width: 51px;
height: 51px;
}
.avatar_floral_healer {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -581px -1486px;
background-position: -1066px -1290px;
width: 99px;
height: 99px;
}
.avatar_floral_rogue {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -381px -1486px;
background-position: -966px -1290px;
width: 99px;
height: 99px;
}
.avatar_floral_warrior {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1385px -1299px;
background-position: -1166px -1290px;
width: 99px;
height: 99px;
}
.avatar_floral_wizard {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -481px -1486px;
background-position: -1266px -1290px;
width: 99px;
height: 99px;
}
.empty_bottles {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1712px -1608px;
background-position: -1712px -1642px;
width: 64px;
height: 54px;
}
.ghost {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1500px -1486px;
background-position: -1282px -1471px;
width: 90px;
height: 90px;
}
.inventory_present {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1803px -326px;
background-position: -138px -1704px;
width: 48px;
height: 51px;
}
.inventory_present_01 {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1803px -950px;
background-position: -1488px -1112px;
width: 48px;
height: 51px;
}
.inventory_present_02 {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1803px -898px;
background-position: -285px -1704px;
width: 48px;
height: 51px;
}
.inventory_present_03 {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1803px -846px;
background-position: -628px -1704px;
width: 48px;
height: 51px;
}
.inventory_present_04 {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1803px -794px;
background-position: -579px -1704px;
width: 48px;
height: 51px;
}
.inventory_present_05 {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1803px -742px;
background-position: -530px -1704px;
width: 48px;
height: 51px;
}
.inventory_present_06 {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1803px -690px;
background-position: -481px -1704px;
width: 48px;
height: 51px;
}
.inventory_present_07 {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1803px -638px;
background-position: -432px -1704px;
width: 48px;
height: 51px;
}
.inventory_present_08 {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1803px -586px;
background-position: -383px -1704px;
width: 48px;
height: 51px;
}
.inventory_present_09 {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1803px -534px;
background-position: -334px -1704px;
width: 48px;
height: 51px;
}
.inventory_present_10 {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1803px -482px;
background-position: -1488px -1164px;
width: 48px;
height: 51px;
}
.inventory_present_11 {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1803px -430px;
background-position: -236px -1704px;
width: 48px;
height: 51px;
}
.inventory_present_12 {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1803px -378px;
background-position: -187px -1704px;
width: 48px;
height: 51px;
}
.inventory_special_birthday {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1712px -1539px;
background-position: -1712px -538px;
width: 68px;
height: 68px;
}
.inventory_special_congrats {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: 0px -1670px;
background-position: -1712px -607px;
width: 68px;
height: 68px;
}
.inventory_special_fortify {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -207px -1670px;
background-position: -1712px -676px;
width: 68px;
height: 68px;
}
.inventory_special_getwell {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -276px -1670px;
background-position: -1712px -883px;
width: 68px;
height: 68px;
}
.inventory_special_goodluck {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -345px -1670px;
background-position: -1712px -952px;
width: 68px;
height: 68px;
}
.inventory_special_greeting {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -483px -1670px;
background-position: -1712px -1021px;
width: 68px;
height: 68px;
}
.inventory_special_nye {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -690px -1670px;
background-position: -69px -1704px;
width: 68px;
height: 68px;
}
.inventory_special_opaquePotion {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -552px -1670px;
background-position: -1712px -1090px;
width: 68px;
height: 68px;
}
.inventory_special_seafoam {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1173px -1670px;
background-position: -1712px -1159px;
width: 68px;
height: 68px;
}
.inventory_special_shinySeed {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1104px -1670px;
background-position: 0px -1704px;
width: 68px;
height: 68px;
}
.inventory_special_snowball {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1035px -1670px;
background-position: -1638px -1613px;
width: 68px;
height: 68px;
}
.inventory_special_spookySparkles {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -966px -1670px;
background-position: -1712px -1573px;
width: 68px;
height: 68px;
}
.inventory_special_thankyou {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -897px -1670px;
background-position: -1712px -1504px;
width: 68px;
height: 68px;
}
.inventory_special_trinket {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -828px -1670px;
background-position: -1712px -1435px;
width: 68px;
height: 68px;
}
.inventory_special_valentine {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -759px -1670px;
background-position: -1712px -1366px;
width: 68px;
height: 68px;
}
@@ -378,43 +456,43 @@
}
.pet_key {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -414px -1670px;
background-position: -1712px -1297px;
width: 68px;
height: 68px;
}
.rebirth_orb {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -138px -1670px;
background-position: -1712px -814px;
width: 68px;
height: 68px;
}
.seafoam_star {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -681px -1486px;
background-position: -1555px -1471px;
width: 90px;
height: 90px;
}
.shop_armoire {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -69px -1670px;
background-position: -1712px -745px;
width: 68px;
height: 68px;
}
.snowman {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -863px -1486px;
background-position: -91px -1613px;
width: 90px;
height: 90px;
}
.zzz {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1803px -1043px;
background-position: -1658px -1397px;
width: 40px;
height: 40px;
}
.zzz_light {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1803px -1002px;
background-position: -1320px -1064px;
width: 40px;
height: 40px;
}
@@ -426,13 +504,13 @@
}
.npc_aprilFool {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1379px -1112px;
background-position: -1367px -1112px;
width: 120px;
height: 120px;
}
.npc_bailey {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1803px 0px;
background-position: -1469px -1290px;
width: 60px;
height: 72px;
}
@@ -444,115 +522,115 @@
}
.npc_ian {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1224px -1299px;
background-position: -805px -1290px;
width: 75px;
height: 135px;
}
.npc_justin {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1300px -1299px;
background-position: -881px -1290px;
width: 84px;
height: 120px;
}
.npc_justin_head {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1803px -73px;
background-position: -1673px -1141px;
width: 36px;
height: 96px;
}
.npc_matt {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1028px -1299px;
background-position: -217px -1290px;
width: 195px;
height: 138px;
}
.npc_sabe {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1712px -182px;
background-position: -1092px -1613px;
width: 90px;
height: 90px;
}
.npc_timetravelers {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -832px -1299px;
background-position: -413px -1290px;
width: 195px;
height: 138px;
}
.npc_timetravelers_active {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -636px -1299px;
background-position: -609px -1290px;
width: 195px;
height: 138px;
}
.npc_tyler {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1712px -455px;
background-position: -1365px -1613px;
width: 90px;
height: 90px;
}
.npc_vicky {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1712px -1456px;
background-position: -1712px -455px;
width: 59px;
height: 82px;
}
.seasonalshop_closed {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1537px -863px;
background-position: -1537px -1002px;
width: 162px;
height: 138px;
}
.seasonalshop_open {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1537px -1002px;
background-position: -1537px -863px;
width: 162px;
height: 138px;
}
.quest_armadillo {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -440px 0px;
background-position: -880px -440px;
width: 219px;
height: 219px;
}
.quest_atom1 {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1128px -1112px;
background-position: -657px -1112px;
width: 250px;
height: 150px;
}
.quest_atom2 {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -428px -1299px;
background-position: -1159px -1112px;
width: 207px;
height: 138px;
}
.quest_atom3 {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -211px -1299px;
background-position: 0px -1290px;
width: 216px;
height: 180px;
}
.quest_axolotl {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -880px -440px;
background-position: -440px 0px;
width: 219px;
height: 219px;
}
.quest_basilist {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -191px -1486px;
background-position: 0px -1471px;
width: 189px;
height: 141px;
}
.quest_beetle {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1102px -892px;
background-position: -1320px -862px;
width: 204px;
height: 201px;
}
.quest_bunny {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: 0px -1299px;
background-position: -1102px -892px;
width: 210px;
height: 186px;
}
@@ -564,7 +642,7 @@
}
.quest_cheetah {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -440px -232px;
background-position: -220px -232px;
width: 219px;
height: 219px;
}
@@ -576,37 +654,37 @@
}
.quest_dilatory {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -220px -672px;
background-position: 0px -672px;
width: 219px;
height: 219px;
}
.quest_dilatoryDistress1 {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1320px -868px;
background-position: -1320px -651px;
width: 210px;
height: 210px;
}
.quest_dilatoryDistress2 {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1537px -573px;
background-position: -1537px -422px;
width: 150px;
height: 150px;
}
.quest_dilatoryDistress3 {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -440px -672px;
background-position: -220px -672px;
width: 219px;
height: 219px;
}
.quest_dilatory_derby {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -660px -220px;
background-position: -660px 0px;
width: 219px;
height: 219px;
}
.quest_dustbunnies {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1100px 0px;
background-position: -880px -672px;
width: 219px;
height: 219px;
}
@@ -624,43 +702,43 @@
}
.quest_evilsanta2 {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1100px -660px;
background-position: -1100px -440px;
width: 219px;
height: 219px;
}
.quest_falcon {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -220px -892px;
background-position: 0px -892px;
width: 219px;
height: 219px;
}
.quest_ferret {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: 0px -892px;
background-position: -1100px -660px;
width: 219px;
height: 219px;
}
.quest_frog {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -880px -892px;
background-position: -660px -892px;
width: 221px;
height: 213px;
}
.quest_ghost_stag {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -660px -892px;
background-position: -440px -892px;
width: 219px;
height: 219px;
}
.quest_goldenknight1 {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -440px -892px;
background-position: -220px -892px;
width: 219px;
height: 219px;
}
.quest_goldenknight2 {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -877px -1112px;
background-position: -908px -1112px;
width: 250px;
height: 150px;
}
@@ -672,145 +750,127 @@
}
.quest_gryphon {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -660px -1112px;
background-position: -440px -1112px;
width: 216px;
height: 177px;
}
.quest_guineapig {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1100px -440px;
background-position: -1100px -220px;
width: 219px;
height: 219px;
}
.quest_harpy {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1100px -220px;
background-position: -1100px 0px;
width: 219px;
height: 219px;
}
.quest_hedgehog {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: 0px -1112px;
background-position: -882px -892px;
width: 219px;
height: 186px;
}
.quest_hippo {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -880px -672px;
background-position: -660px -672px;
width: 219px;
height: 219px;
}
.quest_horse {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -660px -672px;
background-position: -440px -672px;
width: 219px;
height: 219px;
}
.quest_kraken {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -443px -1112px;
background-position: -223px -1112px;
width: 216px;
height: 177px;
}
.quest_mayhemMistiflying1 {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1537px -422px;
background-position: -1537px -573px;
width: 150px;
height: 150px;
}
.quest_mayhemMistiflying2 {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: 0px -672px;
background-position: -220px 0px;
width: 219px;
height: 219px;
}
.quest_mayhemMistiflying3 {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -220px 0px;
background-position: -880px -220px;
width: 219px;
height: 219px;
}
.quest_monkey {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -880px -220px;
background-position: -880px 0px;
width: 219px;
height: 219px;
}
.quest_moon1 {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1320px -651px;
background-position: -1320px -217px;
width: 216px;
height: 216px;
}
.quest_moon2 {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -880px 0px;
background-position: -660px -452px;
width: 219px;
height: 219px;
}
.quest_moon3 {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -660px -452px;
background-position: -440px -452px;
width: 219px;
height: 219px;
}
.quest_moonstone1 {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -440px -452px;
background-position: -220px -452px;
width: 219px;
height: 219px;
}
.quest_moonstone2 {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -220px -452px;
background-position: 0px -452px;
width: 219px;
height: 219px;
}
.quest_moonstone3 {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: 0px -452px;
background-position: -660px -220px;
width: 219px;
height: 219px;
}
.quest_nudibranch {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1320px 0px;
background-position: -1320px -434px;
width: 216px;
height: 216px;
}
.quest_octopus {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -220px -1112px;
background-position: 0px -1112px;
width: 222px;
height: 177px;
}
.quest_owl {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -660px 0px;
background-position: -440px -232px;
width: 219px;
height: 219px;
}
.quest_peacock {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1320px -434px;
width: 216px;
height: 216px;
}
.quest_penguin {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: 0px -1486px;
width: 190px;
height: 183px;
}
.quest_rat {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -220px -232px;
width: 219px;
height: 219px;
}
.quest_rock {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1320px -217px;
background-position: -1320px 0px;
width: 216px;
height: 216px;
}
Binary file not shown.

Before

Width:  |  Height:  |  Size: 361 KiB

After

Width:  |  Height:  |  Size: 351 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 411 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 356 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 375 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 11 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 18 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 11 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 8.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 18 KiB

+2 -1
View File
@@ -56,7 +56,8 @@
</style>
<style>
.modal {
/* @TODO: The modal-open class is not being removed. Let's try this for now */
.modal, .modal-open {
overflow-y: scroll !important;
}
@@ -1,12 +1,24 @@
.promo_login_screen {
.promo_armoire_backgrounds_201710 {
background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
background-position: -142px 0px;
width: 141px;
height: 438px;
}
.promo_farm_friends {
background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
background-position: 0px 0px;
width: 524px;
height: 274px;
width: 141px;
height: 441px;
}
.promo_spooky_sparkles {
.promo_mystery_201709 {
background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
background-position: 0px -275px;
width: 140px;
height: 294px;
background-position: -284px 0px;
width: 114px;
height: 90px;
}
.promo_takeThis_gear {
background-image: url(/static/sprites/spritesmith-largeSprites-0.png);
background-position: -284px -91px;
width: 114px;
height: 87px;
}
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
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,372 +1,450 @@
.weapon_rogue_0 {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1373px -1471px;
width: 90px;
height: 90px;
}
.weapon_rogue_1 {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1100px -1471px;
width: 90px;
height: 90px;
}
.weapon_rogue_2 {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -736px -1471px;
width: 90px;
height: 90px;
}
.weapon_rogue_3 {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -827px -1471px;
width: 90px;
height: 90px;
}
.weapon_rogue_4 {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -918px -1471px;
width: 90px;
height: 90px;
}
.weapon_rogue_5 {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1009px -1471px;
width: 90px;
height: 90px;
}
.weapon_rogue_6 {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1191px -1471px;
width: 90px;
height: 90px;
}
.weapon_special_1 {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1366px -1290px;
width: 102px;
height: 90px;
}
.weapon_special_2 {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1464px -1471px;
width: 90px;
height: 90px;
}
.weapon_special_3 {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: 0px -1613px;
width: 90px;
height: 90px;
}
.weapon_special_bardInstrument {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -182px -1613px;
width: 90px;
height: 90px;
}
.weapon_special_fencingFoil {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -273px -1613px;
width: 90px;
height: 90px;
}
.weapon_special_lunarScythe {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -364px -1613px;
width: 90px;
height: 90px;
}
.weapon_special_mammothRiderSpear {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1045px -1486px;
background-position: -455px -1613px;
width: 90px;
height: 90px;
}
.weapon_special_nomadsScimitar {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -954px -1486px;
background-position: -546px -1613px;
width: 90px;
height: 90px;
}
.weapon_special_pageBanner {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1136px -1486px;
background-position: -637px -1613px;
width: 90px;
height: 90px;
}
.weapon_special_roguishRainbowMessage {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1227px -1486px;
background-position: -728px -1613px;
width: 90px;
height: 90px;
}
.weapon_special_skeletonKey {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1318px -1486px;
background-position: -819px -1613px;
width: 90px;
height: 90px;
}
.weapon_special_tachi {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1409px -1486px;
background-position: -910px -1613px;
width: 90px;
height: 90px;
}
.weapon_special_taskwoodsLantern {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1591px -1486px;
background-position: -1001px -1613px;
width: 90px;
height: 90px;
}
.weapon_special_tridentOfCrashingTides {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1712px 0px;
background-position: -1183px -1613px;
width: 90px;
height: 90px;
}
.weapon_warrior_0 {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1712px -91px;
background-position: -1274px -1613px;
width: 90px;
height: 90px;
}
.weapon_warrior_1 {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1712px -273px;
background-position: -1456px -1613px;
width: 90px;
height: 90px;
}
.weapon_warrior_2 {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1712px -364px;
background-position: -1547px -1613px;
width: 90px;
height: 90px;
}
.weapon_warrior_3 {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1712px -546px;
background-position: -1712px 0px;
width: 90px;
height: 90px;
}
.weapon_warrior_4 {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1712px -637px;
background-position: -1712px -91px;
width: 90px;
height: 90px;
}
.weapon_warrior_5 {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1712px -728px;
background-position: -1712px -182px;
width: 90px;
height: 90px;
}
.weapon_warrior_6 {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1712px -819px;
background-position: -1712px -273px;
width: 90px;
height: 90px;
}
.weapon_wizard_0 {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1712px -910px;
background-position: -1712px -364px;
width: 90px;
height: 90px;
}
.weapon_wizard_1 {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1712px -1001px;
background-position: -190px -1471px;
width: 90px;
height: 90px;
}
.weapon_wizard_2 {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1712px -1092px;
background-position: -281px -1471px;
width: 90px;
height: 90px;
}
.weapon_wizard_3 {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1712px -1183px;
background-position: -372px -1471px;
width: 90px;
height: 90px;
}
.weapon_wizard_4 {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1712px -1274px;
background-position: -463px -1471px;
width: 90px;
height: 90px;
}
.weapon_wizard_5 {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1712px -1365px;
background-position: -554px -1471px;
width: 90px;
height: 90px;
}
.weapon_wizard_6 {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -772px -1486px;
background-position: -645px -1471px;
width: 90px;
height: 90px;
}
.Pet_Currency_Gem {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -621px -1670px;
background-position: -1712px -1228px;
width: 68px;
height: 68px;
}
.Pet_Currency_Gem1x {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1840px -73px;
background-position: -1772px -482px;
width: 15px;
height: 13px;
}
.Pet_Currency_Gem2x {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1803px -1084px;
background-position: -1772px -455px;
width: 30px;
height: 26px;
}
.PixelPaw-Gold {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1803px -170px;
background-position: -1656px -1265px;
width: 51px;
height: 51px;
}
.PixelPaw {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1803px -222px;
background-position: -1656px -1317px;
width: 51px;
height: 51px;
}
.PixelPaw002 {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1803px -274px;
background-position: -1646px -1471px;
width: 51px;
height: 51px;
}
.avatar_floral_healer {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -581px -1486px;
background-position: -1066px -1290px;
width: 99px;
height: 99px;
}
.avatar_floral_rogue {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -381px -1486px;
background-position: -966px -1290px;
width: 99px;
height: 99px;
}
.avatar_floral_warrior {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1385px -1299px;
background-position: -1166px -1290px;
width: 99px;
height: 99px;
}
.avatar_floral_wizard {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -481px -1486px;
background-position: -1266px -1290px;
width: 99px;
height: 99px;
}
.empty_bottles {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1712px -1608px;
background-position: -1712px -1642px;
width: 64px;
height: 54px;
}
.ghost {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1500px -1486px;
background-position: -1282px -1471px;
width: 90px;
height: 90px;
}
.inventory_present {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1803px -326px;
background-position: -138px -1704px;
width: 48px;
height: 51px;
}
.inventory_present_01 {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1803px -950px;
background-position: -1488px -1112px;
width: 48px;
height: 51px;
}
.inventory_present_02 {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1803px -898px;
background-position: -285px -1704px;
width: 48px;
height: 51px;
}
.inventory_present_03 {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1803px -846px;
background-position: -628px -1704px;
width: 48px;
height: 51px;
}
.inventory_present_04 {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1803px -794px;
background-position: -579px -1704px;
width: 48px;
height: 51px;
}
.inventory_present_05 {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1803px -742px;
background-position: -530px -1704px;
width: 48px;
height: 51px;
}
.inventory_present_06 {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1803px -690px;
background-position: -481px -1704px;
width: 48px;
height: 51px;
}
.inventory_present_07 {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1803px -638px;
background-position: -432px -1704px;
width: 48px;
height: 51px;
}
.inventory_present_08 {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1803px -586px;
background-position: -383px -1704px;
width: 48px;
height: 51px;
}
.inventory_present_09 {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1803px -534px;
background-position: -334px -1704px;
width: 48px;
height: 51px;
}
.inventory_present_10 {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1803px -482px;
background-position: -1488px -1164px;
width: 48px;
height: 51px;
}
.inventory_present_11 {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1803px -430px;
background-position: -236px -1704px;
width: 48px;
height: 51px;
}
.inventory_present_12 {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1803px -378px;
background-position: -187px -1704px;
width: 48px;
height: 51px;
}
.inventory_special_birthday {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1712px -1539px;
background-position: -1712px -538px;
width: 68px;
height: 68px;
}
.inventory_special_congrats {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: 0px -1670px;
background-position: -1712px -607px;
width: 68px;
height: 68px;
}
.inventory_special_fortify {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -207px -1670px;
background-position: -1712px -676px;
width: 68px;
height: 68px;
}
.inventory_special_getwell {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -276px -1670px;
background-position: -1712px -883px;
width: 68px;
height: 68px;
}
.inventory_special_goodluck {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -345px -1670px;
background-position: -1712px -952px;
width: 68px;
height: 68px;
}
.inventory_special_greeting {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -483px -1670px;
background-position: -1712px -1021px;
width: 68px;
height: 68px;
}
.inventory_special_nye {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -690px -1670px;
background-position: -69px -1704px;
width: 68px;
height: 68px;
}
.inventory_special_opaquePotion {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -552px -1670px;
background-position: -1712px -1090px;
width: 68px;
height: 68px;
}
.inventory_special_seafoam {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1173px -1670px;
background-position: -1712px -1159px;
width: 68px;
height: 68px;
}
.inventory_special_shinySeed {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1104px -1670px;
background-position: 0px -1704px;
width: 68px;
height: 68px;
}
.inventory_special_snowball {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1035px -1670px;
background-position: -1638px -1613px;
width: 68px;
height: 68px;
}
.inventory_special_spookySparkles {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -966px -1670px;
background-position: -1712px -1573px;
width: 68px;
height: 68px;
}
.inventory_special_thankyou {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -897px -1670px;
background-position: -1712px -1504px;
width: 68px;
height: 68px;
}
.inventory_special_trinket {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -828px -1670px;
background-position: -1712px -1435px;
width: 68px;
height: 68px;
}
.inventory_special_valentine {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -759px -1670px;
background-position: -1712px -1366px;
width: 68px;
height: 68px;
}
@@ -378,43 +456,43 @@
}
.pet_key {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -414px -1670px;
background-position: -1712px -1297px;
width: 68px;
height: 68px;
}
.rebirth_orb {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -138px -1670px;
background-position: -1712px -814px;
width: 68px;
height: 68px;
}
.seafoam_star {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -681px -1486px;
background-position: -1555px -1471px;
width: 90px;
height: 90px;
}
.shop_armoire {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -69px -1670px;
background-position: -1712px -745px;
width: 68px;
height: 68px;
}
.snowman {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -863px -1486px;
background-position: -91px -1613px;
width: 90px;
height: 90px;
}
.zzz {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1803px -1043px;
background-position: -1658px -1397px;
width: 40px;
height: 40px;
}
.zzz_light {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1803px -1002px;
background-position: -1320px -1064px;
width: 40px;
height: 40px;
}
@@ -426,13 +504,13 @@
}
.npc_aprilFool {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1379px -1112px;
background-position: -1367px -1112px;
width: 120px;
height: 120px;
}
.npc_bailey {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1803px 0px;
background-position: -1469px -1290px;
width: 60px;
height: 72px;
}
@@ -444,115 +522,115 @@
}
.npc_ian {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1224px -1299px;
background-position: -805px -1290px;
width: 75px;
height: 135px;
}
.npc_justin {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1300px -1299px;
background-position: -881px -1290px;
width: 84px;
height: 120px;
}
.npc_justin_head {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1803px -73px;
background-position: -1673px -1141px;
width: 36px;
height: 96px;
}
.npc_matt {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1028px -1299px;
background-position: -217px -1290px;
width: 195px;
height: 138px;
}
.npc_sabe {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1712px -182px;
background-position: -1092px -1613px;
width: 90px;
height: 90px;
}
.npc_timetravelers {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -832px -1299px;
background-position: -413px -1290px;
width: 195px;
height: 138px;
}
.npc_timetravelers_active {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -636px -1299px;
background-position: -609px -1290px;
width: 195px;
height: 138px;
}
.npc_tyler {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1712px -455px;
background-position: -1365px -1613px;
width: 90px;
height: 90px;
}
.npc_vicky {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1712px -1456px;
background-position: -1712px -455px;
width: 59px;
height: 82px;
}
.seasonalshop_closed {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1537px -863px;
background-position: -1537px -1002px;
width: 162px;
height: 138px;
}
.seasonalshop_open {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1537px -1002px;
background-position: -1537px -863px;
width: 162px;
height: 138px;
}
.quest_armadillo {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -440px 0px;
background-position: -880px -440px;
width: 219px;
height: 219px;
}
.quest_atom1 {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1128px -1112px;
background-position: -657px -1112px;
width: 250px;
height: 150px;
}
.quest_atom2 {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -428px -1299px;
background-position: -1159px -1112px;
width: 207px;
height: 138px;
}
.quest_atom3 {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -211px -1299px;
background-position: 0px -1290px;
width: 216px;
height: 180px;
}
.quest_axolotl {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -880px -440px;
background-position: -440px 0px;
width: 219px;
height: 219px;
}
.quest_basilist {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -191px -1486px;
background-position: 0px -1471px;
width: 189px;
height: 141px;
}
.quest_beetle {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1102px -892px;
background-position: -1320px -862px;
width: 204px;
height: 201px;
}
.quest_bunny {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: 0px -1299px;
background-position: -1102px -892px;
width: 210px;
height: 186px;
}
@@ -564,7 +642,7 @@
}
.quest_cheetah {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -440px -232px;
background-position: -220px -232px;
width: 219px;
height: 219px;
}
@@ -576,37 +654,37 @@
}
.quest_dilatory {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -220px -672px;
background-position: 0px -672px;
width: 219px;
height: 219px;
}
.quest_dilatoryDistress1 {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1320px -868px;
background-position: -1320px -651px;
width: 210px;
height: 210px;
}
.quest_dilatoryDistress2 {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1537px -573px;
background-position: -1537px -422px;
width: 150px;
height: 150px;
}
.quest_dilatoryDistress3 {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -440px -672px;
background-position: -220px -672px;
width: 219px;
height: 219px;
}
.quest_dilatory_derby {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -660px -220px;
background-position: -660px 0px;
width: 219px;
height: 219px;
}
.quest_dustbunnies {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1100px 0px;
background-position: -880px -672px;
width: 219px;
height: 219px;
}
@@ -624,43 +702,43 @@
}
.quest_evilsanta2 {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1100px -660px;
background-position: -1100px -440px;
width: 219px;
height: 219px;
}
.quest_falcon {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -220px -892px;
background-position: 0px -892px;
width: 219px;
height: 219px;
}
.quest_ferret {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: 0px -892px;
background-position: -1100px -660px;
width: 219px;
height: 219px;
}
.quest_frog {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -880px -892px;
background-position: -660px -892px;
width: 221px;
height: 213px;
}
.quest_ghost_stag {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -660px -892px;
background-position: -440px -892px;
width: 219px;
height: 219px;
}
.quest_goldenknight1 {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -440px -892px;
background-position: -220px -892px;
width: 219px;
height: 219px;
}
.quest_goldenknight2 {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -877px -1112px;
background-position: -908px -1112px;
width: 250px;
height: 150px;
}
@@ -672,145 +750,127 @@
}
.quest_gryphon {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -660px -1112px;
background-position: -440px -1112px;
width: 216px;
height: 177px;
}
.quest_guineapig {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1100px -440px;
background-position: -1100px -220px;
width: 219px;
height: 219px;
}
.quest_harpy {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1100px -220px;
background-position: -1100px 0px;
width: 219px;
height: 219px;
}
.quest_hedgehog {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: 0px -1112px;
background-position: -882px -892px;
width: 219px;
height: 186px;
}
.quest_hippo {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -880px -672px;
background-position: -660px -672px;
width: 219px;
height: 219px;
}
.quest_horse {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -660px -672px;
background-position: -440px -672px;
width: 219px;
height: 219px;
}
.quest_kraken {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -443px -1112px;
background-position: -223px -1112px;
width: 216px;
height: 177px;
}
.quest_mayhemMistiflying1 {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1537px -422px;
background-position: -1537px -573px;
width: 150px;
height: 150px;
}
.quest_mayhemMistiflying2 {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: 0px -672px;
background-position: -220px 0px;
width: 219px;
height: 219px;
}
.quest_mayhemMistiflying3 {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -220px 0px;
background-position: -880px -220px;
width: 219px;
height: 219px;
}
.quest_monkey {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -880px -220px;
background-position: -880px 0px;
width: 219px;
height: 219px;
}
.quest_moon1 {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1320px -651px;
background-position: -1320px -217px;
width: 216px;
height: 216px;
}
.quest_moon2 {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -880px 0px;
background-position: -660px -452px;
width: 219px;
height: 219px;
}
.quest_moon3 {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -660px -452px;
background-position: -440px -452px;
width: 219px;
height: 219px;
}
.quest_moonstone1 {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -440px -452px;
background-position: -220px -452px;
width: 219px;
height: 219px;
}
.quest_moonstone2 {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -220px -452px;
background-position: 0px -452px;
width: 219px;
height: 219px;
}
.quest_moonstone3 {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: 0px -452px;
background-position: -660px -220px;
width: 219px;
height: 219px;
}
.quest_nudibranch {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1320px 0px;
background-position: -1320px -434px;
width: 216px;
height: 216px;
}
.quest_octopus {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -220px -1112px;
background-position: 0px -1112px;
width: 222px;
height: 177px;
}
.quest_owl {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -660px 0px;
background-position: -440px -232px;
width: 219px;
height: 219px;
}
.quest_peacock {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1320px -434px;
width: 216px;
height: 216px;
}
.quest_penguin {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: 0px -1486px;
width: 190px;
height: 183px;
}
.quest_rat {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -220px -232px;
width: 219px;
height: 219px;
}
.quest_rock {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1320px -217px;
background-position: -1320px 0px;
width: 216px;
height: 216px;
}
-3
View File
@@ -4,9 +4,6 @@
</defs>
<g fill="none" fill-rule="evenodd">
<path fill="#FFF" d="M24.052 26.3c-.832-.09-.841-.462-.832-5.421 0 0-.083-.312.395-.582.477-.27 1.93-2.679 1.037-4.734-.892-2.056-.248-1.952.125-1.744.374.208.554-.055.332-1.183-.457-2.325-1.17-3.113-2.851-4.162-1.104-.69-.704-1.94.866-1.848.766.045.766.046.862-.555.152-.947-.15-2.565-1.327-2.788-.81-.154-1.817.713-3.015.109-1.198-.604-3.178.904-3.988 1.254s-1.479.354-2.403.331c-.925-.022.49 1.531 1.906 1.881 1.216.3.743.516.674 1.51-.078 1.113.24 1.59-.279 1.707-.796.178-1.686-1.961-3.052-2.857C9.4 5.183 7.56 6.152 2.15.201 1.211-.83 1.592 2.36 2.17 4.063c1.543 4.55 4.532 5.153 5.942 5.29 1.18.116 1.984-.158 1.984.297 0 .33-1.391.48-1.93.482a9.469 9.469 0 0 1-1.762-.173c-1.073-.2.569 2.535 1.624 3.402 1.78 1.465 3.818 2.014 5.456 2.18.473.048 1.146.04 1.146.41 0 .352-.354.438-.773.441-2.294.017-3.612 1.849-3.986 3.967-.237 1.346-.06 2.868-.035 4.005l.09.812c.18 1.426-4.948 1.975-5.627-.322-.743-2.51 3.309-3.837 3.383-6.232.047-1.509-1.333-2.194-1.333-2.194V14.224H4.76v-1.587H3.174V11.05H1.587v4.761h1.587V17.4h2.613c.594 0 1.07.392 1.015 1.24-.137 2.093-4.589 3.379-3.365 6.716.884 2.41 4.696 2.441 8.513 2.441l7.118-.006c.222 0 .534-.107.08-1.255-.367-.927-1.632-.276-2.706-.276-1.137 0-1.176-.96-.446-1.973.446-.618 1.014-1.078 1.979-1.527 1.486-.693 2.617.198 3.174.963.8 1.099 1.054 2.355.348 2.552-.851.238-1.113.27-1.141 1.08-.022.581.256.422 1.595.422h4.445c.688 0 .637-.53-.055-1.45-.491-.653-1.028.11-2.289-.027z"/>
<mask id="b" fill="#fff">
<use xlink:href="#a"/>
</mask>
<path fill="#FFF" d="M0 10.827h1.587V9.24H0zM113.986 19.894a1.385 1.385 0 0 0-1.942.25c-.54.7-1.354 1.101-2.236 1.101a2.82 2.82 0 0 1-2.815-2.645 416.05 416.05 0 0 1-.005-1.947 2.824 2.824 0 0 1 2.82-2.821c.781 0 1.508.312 2.046.879a1.385 1.385 0 0 0 2.008-1.907 5.614 5.614 0 0 0-4.054-1.741 5.596 5.596 0 0 0-5.59 5.59c0 .019.001 1.937.009 2.078a5.589 5.589 0 0 0 5.581 5.283c1.747 0 3.361-.793 4.429-2.178a1.385 1.385 0 0 0-.251-1.942M122.223 21.245a2.819 2.819 0 0 1-2.815-2.644 419.52 419.52 0 0 1-.006-1.949 2.824 2.824 0 0 1 2.82-2.82 2.824 2.824 0 0 1 2.821 2.82c0 .2-.002 1.734-.005 1.946a2.818 2.818 0 0 1-2.815 2.647m4.205-10.422c-.645 0-1.183.444-1.336 1.04a5.55 5.55 0 0 0-2.87-.8 5.596 5.596 0 0 0-5.589 5.59c0 .019.001 1.936.008 2.078a5.589 5.589 0 0 0 8.517 4.447 1.384 1.384 0 0 0 2.655-.548V12.208c0-.765-.62-1.385-1.385-1.385M58.861 21.245a2.819 2.819 0 0 1-2.815-2.646c-.003-.213-.005-1.747-.005-1.947a2.824 2.824 0 0 1 2.82-2.82 2.824 2.824 0 0 1 2.82 2.82c0 .2-.001 1.734-.005 1.946a2.818 2.818 0 0 1-2.815 2.647m4.206-10.422c-.646 0-1.183.444-1.337 1.04a5.55 5.55 0 0 0-2.869-.8 5.596 5.596 0 0 0-5.59 5.59c0 .019.001 1.937.009 2.078a5.589 5.589 0 0 0 8.516 4.447 1.384 1.384 0 0 0 2.655-.548V12.208c0-.765-.62-1.385-1.384-1.385M83.451 10.823c-.764 0-1.384.62-1.384 1.385V22.63a1.385 1.385 0 0 0 2.769 0V12.208c0-.765-.62-1.385-1.385-1.385M99.759 10.823c-.765 0-1.385.62-1.385 1.385V22.63a1.385 1.385 0 0 0 2.77 0V12.208c0-.765-.62-1.385-1.385-1.385M76.266 18.6a2.82 2.82 0 0 1-2.815 2.645 2.82 2.82 0 0 1-2.815-2.647c-.004-.214-.005-1.746-.005-1.946a2.824 2.824 0 0 1 2.82-2.82 2.824 2.824 0 0 1 2.82 2.82c0 .193-.002 1.733-.005 1.949m-2.815-7.538c-1.03 0-1.991.284-2.82.772v-5.17a1.385 1.385 0 0 0-2.77 0V22.63a1.385 1.385 0 0 0 2.655.548c.856.529 1.86.836 2.935.836a5.59 5.59 0 0 0 5.582-5.288c.007-.137.008-2.054.008-2.074a5.596 5.596 0 0 0-5.59-5.59M45.664 11.063a5.58 5.58 0 0 0-2.674.677V6.665a1.385 1.385 0 0 0-2.77 0V22.63a1.385 1.385 0 1 0 2.77 0v-7.157c.106-.09.203-.191.281-.315a2.808 2.808 0 0 1 2.393-1.326 2.824 2.824 0 0 1 2.82 2.82c0 .254-.002 5.635-.006 5.944a1.385 1.385 0 0 0 2.767.104c.007-.137.008-5.989.008-6.048a5.596 5.596 0 0 0-5.59-5.59M94.503 10.823h-1.616V6.665a1.385 1.385 0 0 0-2.77 0v4.158h-1.614a1.385 1.385 0 0 0 0 2.77h1.615v9.037a1.385 1.385 0 0 0 2.77 0v-9.038h1.615a1.385 1.385 0 0 0 0-2.769" mask="url(#b)"/>
<path fill="#FF6066" d="M84.785 6.665a1.385 1.385 0 1 1-2.77 0 1.385 1.385 0 0 1 2.77 0" mask="url(#b)"/>
<path fill="#4FB5E8" d="M101.092 6.665a1.385 1.385 0 1 1-2.77 0 1.385 1.385 0 0 1 2.77 0" mask="url(#b)"/>

Before

Width:  |  Height:  |  Size: 4.3 KiB

After

Width:  |  Height:  |  Size: 4.2 KiB

+1
View File
@@ -234,6 +234,7 @@ div
font-weight: normal;
padding-top: 16px;
padding-left: 16px;
white-space: nowrap;
.svg-icon {
vertical-align: bottom;
@@ -74,7 +74,7 @@
button.btn.btn-secondary(v-once, @click='cloneChallenge()') {{$t('clone')}}
.description-section
h2 {{$t('challengeSummary')}}
p {{challenge.summary}}
p(v-markdown='challenge.summary')
h2 {{$t('challengeDescription')}}
p(v-markdown='challenge.description')
</template>
@@ -301,6 +301,9 @@ export default {
challengeId: this.searchId,
tasks: clonedTasks,
});
this.$store.state.challengeOptions.cloning = false;
this.$store.state.challengeOptions.tasksToClone = [];
},
async loadChallenge () {
this.challenge = await this.$store.dispatch('challenges:getChallenge', {challengeId: this.searchId});
@@ -10,8 +10,10 @@ div
.col-12
strong(v-once) {{$t('selectChallengeWinnersDescription')}}
.col-12
select.form-control(v-model='winnerId')
option(v-for='member in members', :value='member._id') {{member.profile.name}}
b-dropdown.create-dropdown(:text="winnerText")
input.form-control(type='text', v-model='searchTerm')
b-dropdown-item(v-for="member in memberResults", :key="member._id", @click="selectMember(member)")
| {{ member.profile.name }}
.col-12
button.btn.btn-primary(v-once, @click='closeChallenge') {{$t('awardWinners')}}
.col-12
@@ -72,6 +74,7 @@ div
</style>
<script>
import debounce from 'lodash/debounce';
import bModal from 'bootstrap-vue/lib/components/modal';
import bDropdown from 'bootstrap-vue/lib/components/dropdown';
import bDropdownItem from 'bootstrap-vue/lib/components/dropdown-item';
@@ -85,14 +88,39 @@ export default {
},
data () {
return {
winnerId: '',
winner: {},
searchTerm: '',
memberResults: [],
};
},
watch: {
searchTerm: debounce(function searchTerm (newSearch) {
this.searchChallengeMember(newSearch);
}, 500),
members () {
this.memberResults = this.members;
},
},
computed: {
winnerText () {
if (!this.winner.profile) return this.$t('selectMember');
return this.winner.profile.name;
},
},
methods: {
async searchChallengeMember (search) {
this.memberResults = await this.$store.dispatch('members:getChallengeMembers', {
challengeId: this.challengeId,
searchTerm: search,
});
},
selectMember (member) {
this.winner = member;
},
async closeChallenge () {
this.challenge = await this.$store.dispatch('challenges:selectChallengeWinner', {
challengeId: this.challengeId,
winnerId: this.winnerId,
winnerId: this.winner._id,
});
this.$router.push('/challenges/myChallenges');
},
@@ -11,8 +11,8 @@ div
.row
.col-9
router-link.title(:to="{ name: 'challenge', params: { challengeId: challenge._id } }")
strong {{challenge.name}}
p {{challenge.summary || challenge.name}}
strong(v-markdown='challenge.name')
p(v-markdown='challenge.summary || challenge.name')
div
.svg-icon.member-icon(v-html="icons.memberIcon")
.member-count {{challenge.memberCount}}
@@ -82,10 +82,11 @@ div
<script>
import challengeModal from './challengeModal';
import { mapState } from 'client/libs/store';
import markdownDirective from 'client/directives/markdown';
import challengeIcon from 'assets/svg/challenge.svg';
import gemIcon from 'assets/svg/gem.svg';
import memberIcon from 'assets/svg/member-icon.svg';
import challengeIcon from 'assets/svg/challenge.svg';
export default {
props: ['groupId'],
@@ -106,6 +107,9 @@ export default {
groupIdForChallenges: '',
};
},
directives: {
markdown: markdownDirective,
},
mounted () {
this.loadChallenges();
},
+41 -7
View File
@@ -91,6 +91,10 @@
p {{acceptedCount}} / {{group.memberCount}}
.col-4
button.btn.btn-secondary(@click="openQuestDetails()") {{ $t('details') }}
.row.quest-active-section.quest-invite(v-if='user.party.quest && user.party.quest.RSVPNeeded')
span {{ $t('wouldYouParticipate') }}
button.btn.btn-primary.accept(@click='questAccept(group._id)') {{$t('accept')}}
button.btn.btn-primary.reject(@click='questReject(group._id)') {{$t('reject')}}
.row.quest-active-section(v-if='isParty && !onPendingQuest && onActiveQuest')
.col-12.text-center
.quest-boss(:class="'quest_' + questData.key")
@@ -378,6 +382,37 @@
}
}
.quest-invite {
background-color: #2995cd;
color: #fff;
padding: 1em;
span {
margin-top: .3em;
font-size: 14px;
font-weight: bold;
}
.accept, .reject {
padding: .2em 1em;
font-size: 12px;
height: 24px;
border-radius: 2px;
box-shadow: 0 2px 2px 0 rgba(26, 24, 29, 0.16), 0 1px 4px 0 rgba(26, 24, 29, 0.12);
}
.accept {
background-color: #24cc8f;
margin-left: 4em;
margin-right: .5em;
}
.reject {
border-radius: 2px;
background-color: #f74e52;
}
}
.section-header {
border-top: 1px solid #e1e0e3;
margin-top: 1em;
@@ -859,14 +894,13 @@ export default {
let quest = await this.$store.dispatch('quests:sendAction', {groupId: this.group._id, action: 'quests/leave'});
this.group.quest = quest;
},
async questAccept () {
let quest = await this.$store.dispatch('quests:sendAction', {groupId: this.group._id, action: 'quests/accept'});
this.group.quest = quest;
async questAccept (partyId) {
let quest = await this.$store.dispatch('quests:sendAction', {groupId: partyId, action: 'quests/accept'});
this.user.party.quest = quest;
},
// @TODO: Move to notificaitons component?
async questReject () {
let quest = await this.$store.dispatch('quests:sendAction', {groupId: this.group._id, action: 'quests/reject'});
this.group.quest = quest;
async questReject (partyId) {
let quest = await this.$store.dispatch('quests:sendAction', {groupId: partyId, action: 'quests/reject'});
this.user.party.quest = quest;
},
showGroupGems () {
this.$root.$emit('show::modal', 'group-gems-modal');
@@ -53,9 +53,16 @@ div
button.btn.btn-secondary(@click='loadMoreMembers()') {{ $t('loadMore') }}
.row.gradient(v-if='members.length > 3')
div(v-if='selectedPage === "invites"')
.row(v-for='member in invites')
.row(v-for='(member, index) in invites')
.col-11.no-padding-left
member-details(:member='member')
.col-1.actions
b-dropdown(right=true)
.svg-icon.inline.dots(slot='button-content', v-html="icons.dots")
b-dropdown-item(@click='removeInvite(member, index)', v-if='isLeader')
span.dropdown-icon-item
.svg-icon.inline(v-html="icons.removeIcon", v-if='isLeader')
span.text {{$t('removeInvite')}}
.modal-footer
button.btn.btn-primary(@click='close()') {{ $t('close') }}
</template>
@@ -375,6 +382,14 @@ export default {
viewInvites () {
this.selectedPage = 'invites';
},
async removeInvite (member, index) {
this.invites.splice(index, 1);
await this.$store.dispatch('members:removeMember', {
memberId: member._id,
groupId: this.groupId,
});
this.viewMembers();
},
},
};
</script>
+25 -14
View File
@@ -38,8 +38,8 @@
small {{ '`user.balance`' + this.$t('notGems') }}
.accordion
.accordion-group(heading='Items')
h4 Update Item
.form-group.well
h4.expand-toggle(:class="{'open': expandItems}", @click="expandItems = !expandItems") Update Item
.form-group.well(v-if="expandItems")
input.form-control(type='text',placeholder='Path (eg, items.pets.BearCub-Base)',v-model='hero.itemPath')
small.muted Enter the <strong>item path</strong>. E.g., <code>items.pets.BearCub-Zombie</code> or <code>items.gear.owned.head_special_0</code> or <code>items.gear.equipped.head</code>. You can find all the item paths below.
br
@@ -51,18 +51,19 @@
.accordion-group(heading='Current Items')
pre {{hero.items}}
.accordion-group(heading='Auth')
h4 Auth
pre {{hero.auth}}
.form-group
.checkbox
label
input(type='checkbox', v-if='hero.flags', v-model='hero.flags.chatRevoked')
| Chat Privileges Revoked
.form-group
.checkbox
label
input(type='checkbox', v-model='hero.auth.blocked')
| Blocked
h4.expand-toggle(:class="{'open': expandAuth}", @click="expandAuth = !expandAuth") Auth
div(v-if="expandAuth")
pre {{hero.auth}}
.form-group
.checkbox
label
input(type='checkbox', v-if='hero.flags', v-model='hero.flags.chatRevoked')
| Chat Privileges Revoked
.form-group
.checkbox
label
input(type='checkbox', v-model='hero.auth.blocked')
| Blocked
// h4 Backer Status
// Add backer stuff like tier, disable adds, etcs
@@ -95,6 +96,12 @@
div(v-markdown='hero.contributor.contributions', target='_blank')
</template>
<style lang="scss" scoped>
h4.expand-toggle::after {
margin-left: 5px;
}
</style>
<script>
// import keys from 'lodash/keys';
import each from 'lodash/each';
@@ -123,6 +130,8 @@ export default {
hatchingPotions,
special,
gear,
expandItems: false,
expandAuth: false,
};
},
directives: {
@@ -171,6 +180,8 @@ export default {
chatRevoked: false,
};
}
this.expandItems = false;
this.expandAuth = false;
},
async saveHero () {
this.hero.contributor.admin = this.hero.contributor.level > 7 ? true : false;
@@ -1,10 +1,16 @@
<template lang="pug">
div
h4.popover-content-title {{ itemText }}
.popover-content-text {{ itemNotes }}
.popover-content-attr(v-for="attr in ATTRIBUTES", :key="attr")
span.popover-content-attr-key {{ `${$t(attr)}: ` }}
span.popover-content-attr-val {{ `+${item[attr]}` }}
div(v-if='item.locked')
h4.popover-content-title Locked Item
.popover-content-text(v-if='item.specialClass') {{ `${$t('classLockedItem')}` }}
.popover-content-text(v-else) {{ `${$t('tierLockedItem')}` }}
p
div(v-else)
h4.popover-content-title {{ itemText }}
.popover-content-text {{ itemNotes }}
.popover-content-attr(v-for="attr in ATTRIBUTES", :key="attr")
span.popover-content-attr-key {{ `${$t(attr)}: ` }}
span.popover-content-attr-val {{ `+${item[attr]}` }}
</template>
<script>
@@ -909,8 +909,8 @@
hatchPet (pet) {
this.$store.dispatch('common:hatch', {egg: pet.eggKey, hatchingPotion: pet.potionKey});
this.$root.$emit('hatchedPet::open', pet);
this.closeHatchPetDialog();
this.$root.$emit('hatchedPet::open', pet);
},
onDragStart (ev, food) {
@@ -64,7 +64,7 @@
.clearfix
h2.float-left
| {{ $t('classEquipment') }}
| {{ $t('equipment') }}
div.float-right
span.dropdown-label {{ $t('class') }}
@@ -148,6 +148,7 @@
@click="itemSelected(item)"
)
span(slot="popoverContent")
strong(v-if='item.key === "gem" && gemsLeft === 0') {{ $t('maxBuyGems') }}
h4.popover-content-title {{ item.text }}
template(slot="itemBadge", scope="ctx")
@@ -156,6 +157,8 @@
:show="userItems[item.purchaseType][item.key] != 0",
:count="userItems[item.purchaseType][item.key] || 0"
)
.gems-left(v-if='item.key === "gem"')
| {{ gemsLeft }}
span.badge.badge-pill.badge-item.badge-svg(
:class="{'item-selected-badge': ctx.item.pinned, 'hide': !ctx.item.pinned}",
@@ -163,10 +166,13 @@
)
span.svg-icon.inline.icon-12.color(v-html="icons.pin")
div.fill-height
//- @TODO: Create new InventoryDrawer component and re-use in 'inventory/stable' component.
drawer(
:title="$t('quickInventory')"
:errorMessage="inventoryDrawerErrorMessage(selectedDrawerItemType)"
)
div(slot="drawer-header")
drawer-header-tabs(
@@ -184,6 +190,7 @@
.popover-content-text(v-html="$t('petLikeToEatText')", v-once)
drawer-slider(
v-if="hasOwnedItemsForType(selectedDrawerItemType)"
:items="ownedItems(selectedDrawerItemType) || []",
slot="drawer-slider",
:itemWidth=94,
@@ -228,6 +235,14 @@
@import '~client/assets/scss/colors.scss';
@import '~client/assets/scss/variables.scss';
.market .drawer-slider {
min-height: 60px;
.message {
top: 10px;
}
}
.fill-height {
height: 38px; // button + margin + padding
}
@@ -339,6 +354,20 @@
}
}
.gems-left {
position: absolute;
right: -.5em;
top: -.5em;
color: $white;
background: $purple-200;
padding: .15em;
text-align: center;
width: 24px;
height: 24px;
border-radius: 50%;
box-shadow: 0 1px 1px 0 rgba($black, 0.12);
}
</style>
@@ -374,6 +403,7 @@
import getItemInfo from 'common/script/libs/getItemInfo';
import isPinned from 'common/script/libs/isPinned';
import shops from 'common/script/libs/shops';
import planGemLimits from 'common/script/libs/planGemLimits';
import _filter from 'lodash/filter';
import _sortBy from 'lodash/sortBy';
@@ -553,6 +583,10 @@ export default {
},
];
},
gemsLeft () {
if (!this.user.purchased.plan) return 0;
return planGemLimits.convCap + this.user.purchased.plan.consecutive.gemCapExtra - this.user.purchased.plan.gemsBought;
},
},
methods: {
getClassName (classType) {
@@ -588,6 +622,15 @@ export default {
return mappedItems;
}
},
hasOwnedItemsForType (type) {
return this.ownedItems(type).length > 0;
},
inventoryDrawerErrorMessage (type) {
if (!this.hasOwnedItemsForType(type)) {
// @TODO: Change any places using similar locales from `pets.json` and use these new locales from 'inventory.json'
return this.$t('noItemsAvailableForType', { type: this.$t(`${type}ItemType`) });
}
},
getItemClass (type, itemKey) {
switch (type) {
case 'food':
@@ -34,8 +34,6 @@
div.clearfix(slot="modal-footer")
span.balance.float-left {{ $t('yourBalance') }}
balanceInfo.float-right
</template>
<style lang="scss">
@@ -471,6 +471,8 @@ export default {
}
},
selectItem (item) {
if (item.locked) return;
this.selectedItemToBuy = item;
if (this.$store.state.recentlyPurchased[item.key]) {
@@ -7,8 +7,12 @@
div.reward-item(v-if="item.drop.gp != 0")
span.svg-icon.inline.icon(v-html="icons.gold")
span.reward-text {{ $t('amountGold', { amount: item.drop.gp }) }}
h3.text-center(v-if='item.drop.items') {{$t('questOwnerRewards')}}
div.reward-item(v-for="drop in item.drop.items")
div.reward-item(v-for='drop in getDropsList(item.drop.items, false)')
span.icon
div(:class="getDropIcon(drop)")
span.reward-text {{ getDropName(drop) }}
h3.text-center(v-if='getDropsList(item.drop.items, true).length > 0') {{$t('questOwnerRewards')}}
div.reward-item(v-for='drop in getDropsList(item.drop.items, true)')
span.icon
div(:class="getDropIcon(drop)")
span.reward-text {{ getDropName(drop) }}
@@ -60,7 +64,6 @@
</style>
<script>
import svgGold from 'assets/svg/gold.svg';
import svgExperience from 'assets/svg/experience.svg';
@@ -96,6 +99,15 @@
getDropName (drop) {
return drop.text();
},
getDropsList (drops, ownerOnly) {
return drops.filter(function dropsList (drop) {
if (ownerOnly) {
return drop.onlyOwner;
} else {
return !drop.onlyOwner;
}
});
},
},
props: {
item: {

Some files were not shown because too many files have changed in this diff Show More