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

Merge pull request #6091 from HabitRPG/sabrecat/mystery-201510

Browse Source 
October 2015 Subscriber Items
This commit is contained in:
Sabe Jones
2015-10-26 15:04:43 -05:00
parent 04fbdaa107 2582d0b7c7
commit 2df6df2bee
26 changed files with 2355 additions and 2304 deletions
Download Patch File Download Diff File Expand all files Collapse all files
common/dist/sprites/spritesmith-largeSprites-0.css
Vendored
+33 -27
View File
@@ -1,6 +1,6 @@
.2014_Fall_HealerPROMO2 {
background-image: url(spritesmith-largeSprites-0.png);
background-position: -472px -950px;
background-position: -475px -950px;
width: 90px;
height: 90px;
}
@@ -18,7 +18,7 @@
}
.2014_Fall_Warrior_PROMO {
background-image: url(spritesmith-largeSprites-0.png);
background-position: -563px -950px;
background-position: -566px -950px;
width: 90px;
height: 90px;
}
@@ -48,7 +48,7 @@
}
.promo_dilatoryDistress {
background-image: url(spritesmith-largeSprites-0.png);
background-position: -836px -950px;
background-position: -839px -950px;
width: 90px;
height: 90px;
}
@@ -60,7 +60,7 @@
}
.promo_enchanted_armoire_201507 {
background-image: url(spritesmith-largeSprites-0.png);
background-position: -289px -859px;
background-position: -507px -859px;
width: 217px;
height: 90px;
}
@@ -72,7 +72,7 @@
}
.promo_enchanted_armoire_201509 {
background-image: url(spritesmith-largeSprites-0.png);
background-position: -290px -950px;
background-position: -293px -950px;
width: 90px;
height: 90px;
}
@@ -102,7 +102,7 @@
}
.promo_mystery_201405 {
background-image: url(spritesmith-largeSprites-0.png);
background-position: -199px -950px;
background-position: -1111px -91px;
width: 90px;
height: 90px;
}
@@ -114,73 +114,73 @@
}
.promo_mystery_201407 {
background-image: url(spritesmith-largeSprites-0.png);
background-position: -1111px -431px;
background-position: -1111px -613px;
width: 42px;
height: 62px;
}
.promo_mystery_201408 {
background-image: url(spritesmith-largeSprites-0.png);
background-position: -1111px -155px;
background-position: -1111px -337px;
width: 60px;
height: 71px;
}
.promo_mystery_201409 {
background-image: url(spritesmith-largeSprites-0.png);
background-position: -745px -950px;
background-position: -748px -950px;
width: 90px;
height: 90px;
}
.promo_mystery_201410 {
background-image: url(spritesmith-largeSprites-0.png);
background-position: -1111px -91px;
background-position: -1111px -273px;
width: 72px;
height: 63px;
}
.promo_mystery_201411 {
background-image: url(spritesmith-largeSprites-0.png);
background-position: -927px -950px;
background-position: -930px -950px;
width: 90px;
height: 90px;
}
.promo_mystery_201412 {
background-image: url(spritesmith-largeSprites-0.png);
background-position: -1154px -361px;
background-position: -1154px -543px;
width: 42px;
height: 66px;
}
.promo_mystery_201501 {
background-image: url(spritesmith-largeSprites-0.png);
background-position: -1111px -297px;
background-position: -1111px -479px;
width: 48px;
height: 63px;
}
.promo_mystery_201502 {
background-image: url(spritesmith-largeSprites-0.png);
background-position: -381px -950px;
background-position: -384px -950px;
width: 90px;
height: 90px;
}
.promo_mystery_201503 {
background-image: url(spritesmith-largeSprites-0.png);
background-position: -1111px 0px;
background-position: -1111px -182px;
width: 90px;
height: 90px;
}
.promo_mystery_201504 {
background-image: url(spritesmith-largeSprites-0.png);
background-position: -1111px -227px;
background-position: -1111px -409px;
width: 60px;
height: 69px;
}
.promo_mystery_201505 {
background-image: url(spritesmith-largeSprites-0.png);
background-position: -654px -950px;
background-position: -657px -950px;
width: 90px;
height: 90px;
}
.promo_mystery_201506 {
background-image: url(spritesmith-largeSprites-0.png);
background-position: -1111px -361px;
background-position: -1111px -543px;
width: 42px;
height: 69px;
}
@@ -192,19 +192,25 @@
}
.promo_mystery_201508 {
background-image: url(spritesmith-largeSprites-0.png);
background-position: -970px -777px;
background-position: -199px -950px;
width: 93px;
height: 90px;
}
.promo_mystery_201509 {
background-image: url(spritesmith-largeSprites-0.png);
background-position: -1018px -950px;
background-position: -1111px 0px;
width: 90px;
height: 90px;
}
.promo_mystery_201510 {
background-image: url(spritesmith-largeSprites-0.png);
background-position: -970px -777px;
width: 93px;
height: 90px;
}
.promo_mystery_3014 {
background-image: url(spritesmith-largeSprites-0.png);
background-position: -507px -859px;
background-position: -289px -859px;
width: 217px;
height: 90px;
}
@@ -222,13 +228,13 @@
}
.promo_pastel_skin {
background-image: url(spritesmith-largeSprites-0.png);
background-position: 0px -775px;
background-position: -331px -775px;
width: 330px;
height: 83px;
}
.customize-option.promo_pastel_skin {
background-image: url(spritesmith-largeSprites-0.png);
background-position: -25px -790px;
background-position: -356px -790px;
width: 60px;
height: 60px;
}
@@ -246,13 +252,13 @@
}
.promo_shimmer_hair {
background-image: url(spritesmith-largeSprites-0.png);
background-position: -331px -775px;
background-position: 0px -775px;
width: 330px;
height: 83px;
}
.customize-option.promo_shimmer_hair {
background-image: url(spritesmith-largeSprites-0.png);
background-position: -356px -790px;
background-position: -25px -790px;
width: 60px;
height: 60px;
}
@@ -270,13 +276,13 @@
}
.promo_springclasses2014 {
background-image: url(spritesmith-largeSprites-0.png);
background-position: -430px -461px;
background-position: 0px -859px;
width: 288px;
height: 90px;
}
.promo_springclasses2015 {
background-image: url(spritesmith-largeSprites-0.png);
background-position: 0px -859px;
background-position: -430px -461px;
width: 288px;
height: 90px;
}
common/dist/sprites/spritesmith-largeSprites-0.png
Vendored
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 153 KiB

After

Width:  |  Height:  |  Size: 154 KiB

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

Before

Width:  |  Height:  |  Size: 128 KiB

After

Width:  |  Height:  |  Size: 127 KiB

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

Before

Width:  |  Height:  |  Size: 390 KiB

After

Width:  |  Height:  |  Size: 387 KiB

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

Before

Width:  |  Height:  |  Size: 152 KiB

After

Width:  |  Height:  |  Size: 152 KiB

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

Before

Width:  |  Height:  |  Size: 148 KiB

After

Width:  |  Height:  |  Size: 146 KiB

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

Before

Width:  |  Height:  |  Size: 143 KiB

After

Width:  |  Height:  |  Size: 143 KiB

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

Before

Width:  |  Height:  |  Size: 105 KiB

After

Width:  |  Height:  |  Size: 106 KiB

common/img/sprites/spritesmith/gear/events/mystery_201510/back_mystery_201510.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.9 KiB

common/img/sprites/spritesmith/gear/events/mystery_201510/headAccessory_mystery_201510.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.1 KiB

common/img/sprites/spritesmith/gear/events/mystery_201510/shop_back_mystery_201510.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.9 KiB

common/img/sprites/spritesmith/gear/events/mystery_201510/shop_headAccessory_mystery_201510.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.0 KiB

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

After

Width:  |  Height:  |  Size: 4.1 KiB

common/locales/en/gear.json
+4
View File
@@ -662,6 +662,8 @@
"backMystery201504Notes": "Buzz buzz buzz! Flit from task to task. Confers no benefit. April 2015 Subscriber Item.",
"backMystery201507Text": "Rad Surfboard",
"backMystery201507Notes": "Surf off the Diligent Docks and ride the waves in Inkomplete Bay! Confers no benefit. July 2015 Subscriber Item.",
"backMystery201510Text": "Goblin Tail",
"backMystery201510Notes": "Prehensile and powerful! Confers no benefit. October 2015 Subscriber Item.",
"backSpecialWonderconRedText": "Mighty Cape",
"backSpecialWonderconRedNotes": "Swishes with strength and beauty. Confers no benefit. Special Edition Convention Item.",
@@ -743,6 +745,8 @@
"headAccessoryMystery201409Notes": "These powerful antlers change colors with the leaves. Confers no benefit. September 2014 Subscriber Item.",
"headAccessoryMystery201502Text": "Wings of Thought",
"headAccessoryMystery201502Notes": "Let your imagination take flight! Confers no benefit. February 2015 Subscriber Item.",
"headAccessoryMystery201510Text": "Goblin Horns",
"headAccessoryMystery201510Notes": "These fearsome horns are slightly slimy. Confers no benefit. October 2015 Subscriber Item.",
"headAccessoryMystery301405Text": "Headwear Goggles",
"headAccessoryMystery301405Notes": "\"Goggles are for your eyes,\" they said. \"Nobody wants goggles that you can only wear on your head,\" they said. Hah! You sure showed them! Confers no benefit. August 3015 Subscriber Item.",
common/script/content/index.coffee
+3
View File
@@ -50,6 +50,7 @@ api.mystery =
201507: {start:'2015-07-24',end:'2015-08-02', text:'Rad Surfer Set'}
201508: {start:'2015-08-23',end:'2015-09-02', text:'Cheetah Costume Set'}
201509: {start:'2015-09-24',end:'2015-10-02', text:'Werewolf Set'}
201510: {start:'2015-10-26',end:'2015-11-02', text:'Horned Goblin Set'}
301404: {start:'3014-03-24',end:'3014-04-02', text:'Steampunk Standard Set'}
301405: {start:'3014-04-24',end:'3014-05-02', text:'Steampunk Accessories Set'}
wondercon: {start:'2014-03-24',end:'2014-04-01'} # not really, but the mechanic works
@@ -459,6 +460,7 @@ gear =
201410: text: t('backMystery201410Text'), notes: t('backMystery201410Notes'), mystery:'201410', value: 0
201504: text: t('backMystery201504Text'), notes: t('backMystery201504Notes'), mystery:'201504', value: 0
201507: text: t('backMystery201507Text'), notes: t('backMystery201507Notes'), mystery:'201507', value: 0
201510: text: t('backMystery201510Text'), notes: t('backMystery201510Notes'), mystery:'201510', value: 0
special:
wondercon_red: text: t('backSpecialWonderconRedText'), notes: t('backSpecialWonderconRedNotes'), value: 0, mystery:'wondercon'
wondercon_black: text: t('backSpecialWonderconBlackText'), notes: t('backSpecialWonderconBlackNotes'), value: 0, mystery:'wondercon'
@@ -507,6 +509,7 @@ gear =
201404: text: t('headAccessoryMystery201404Text'), notes: t('headAccessoryMystery201404Notes'), mystery:'201404', value: 0
201409: text: t('headAccessoryMystery201409Text'), notes: t('headAccessoryMystery201409Notes'), mystery:'201409', value: 0
201502: text: t('headAccessoryMystery201502Text'), notes: t('headAccessoryMystery201502Notes'), mystery:'201502', value: 0
201510: text: t('headAccessoryMystery201510Text'), notes: t('headAccessoryMystery201510Notes'), mystery:'201510', value: 0
301405: text: t('headAccessoryMystery301405Text'), notes: t('headAccessoryMystery301405Notes'), mystery:'301405', value: 0
eyewear:
common/script/src/content/gear/sets/mystery.js
+3 -1
View File
@@ -25,6 +25,7 @@ let back = {
201410: { mystery: '201410', value: 0 },
201504: { mystery: '201504', value: 0 },
201507: { mystery: '201507', value: 0 },
201510: { mystery: '201510', value: 0 },
};
let eyewear = {
@@ -46,7 +47,7 @@ let head = {
201501: { mystery: '201501', value: 0 },
201505: { mystery: '201505', value: 0 },
201508: { mystery: '201508', value: 0 },
201509: { mystery:'201509', value: 0 },
201509: { mystery: '201509', value: 0 },
301404: { mystery: '301404', value: 0 },
301405: { mystery: '301405', value: 0 },
};
@@ -56,6 +57,7 @@ let headAccessory = {
201404: { mystery: '201404', value: 0 },
201409: { mystery: '201409', value: 0 },
201502: { mystery: '201502', value: 0 },
201510: { mystery: '201510', value: 0 },
301405: { mystery: '301405', value: 0 },
};
common/script/src/content/mystery-sets.js
+5
View File
@@ -102,6 +102,11 @@ let mysterySets = {
end:'2015-10-02',
text:'Werewolf Set'
},
201510: {
start:'2015-10-26',
end:'2015-11-02',
text:'Horned Goblin Set'
},
301404: {
start: '3014-03-24',
end: '3014-04-02',