Merge branch 'release' into develop

This commit is contained in:
Sabe Jones
2017-09-05 19:50:08 +00:00
186 changed files with 38325 additions and 37766 deletions
@@ -1,222 +1,342 @@
.Pet_Currency_Gem {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -625px -1477px;
width: 68px;
height: 68px;
}
.Pet_Currency_Gem1x {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1893px -927px;
width: 15px;
height: 13px;
}
.Pet_Currency_Gem2x {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1876px -1148px;
width: 30px;
height: 26px;
}
.PixelPaw-Gold {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -901px -1477px;
width: 51px;
height: 51px;
}
.PixelPaw {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -953px -1477px;
width: 51px;
height: 51px;
}
.PixelPaw002 {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1005px -1477px;
width: 51px;
height: 51px;
}
.inventory_special_shinySeed {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1848px -1531px;
width: 68px;
height: 68px;
}
.inventory_special_snowball {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -556px -1477px;
width: 68px;
height: 68px;
}
.inventory_special_spookySparkles {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1592px -1326px;
width: 68px;
height: 68px;
}
.inventory_special_thankyou {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1523px -1326px;
width: 68px;
height: 68px;
}
.inventory_special_trinket {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -694px -1477px;
width: 68px;
height: 68px;
}
.inventory_special_valentine {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -832px -1477px;
width: 68px;
height: 68px;
}
.knockout {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1757px -1622px;
width: 120px;
height: 47px;
}
.pet_key {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -763px -1477px;
width: 68px;
height: 68px;
}
.rebirth_orb {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1661px -1326px;
width: 68px;
height: 68px;
}
.seafoam_star {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1341px -1326px;
width: 90px;
height: 90px;
}
.shop_armoire {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1878px -1183px;
width: 40px;
height: 40px;
}
.snowman {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1757px -1440px;
width: 90px;
height: 90px;
}
.zzz {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1878px -1622px;
width: 40px;
height: 40px;
}
.zzz_light {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1878px -1224px;
width: 40px;
height: 40px;
}
.npc_alex {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1757px -1153px;
background-position: -1757px -649px;
width: 162px;
height: 138px;
}
.npc_aprilFool {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1757px -1548px;
background-position: -1757px -1183px;
width: 120px;
height: 120px;
}
.npc_bailey {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1540px -1251px;
background-position: -556px -1546px;
width: 60px;
height: 72px;
}
.npc_daniel {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1757px -1292px;
background-position: -1757px -927px;
width: 135px;
height: 123px;
}
.npc_ian {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1570px -1326px;
background-position: -1757px -1304px;
width: 75px;
height: 135px;
}
.npc_justin {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1646px -1326px;
background-position: -1833px -1304px;
width: 84px;
height: 120px;
}
.npc_justin_head {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1893px -1292px;
background-position: -1876px -1051px;
width: 36px;
height: 96px;
}
.npc_matt {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -214px -1507px;
background-position: -753px -1326px;
width: 195px;
height: 138px;
}
.npc_sabe {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -410px -1507px;
background-position: -1757px -1531px;
width: 90px;
height: 90px;
}
.npc_timetravelers {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1178px -1326px;
background-position: -1145px -1326px;
width: 195px;
height: 138px;
}
.npc_timetravelers_active {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1374px -1326px;
background-position: -949px -1326px;
width: 195px;
height: 138px;
}
.npc_tyler {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -501px -1507px;
background-position: -1432px -1326px;
width: 90px;
height: 90px;
}
.npc_vicky {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -592px -1507px;
background-position: -1848px -1440px;
width: 59px;
height: 82px;
}
.seasonalshop_closed {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1757px -1014px;
background-position: -1757px -510px;
width: 162px;
height: 138px;
}
.seasonalshop_open {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1757px -875px;
background-position: -1757px -788px;
width: 162px;
height: 138px;
}
.quest_armadillo {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: 0px -672px;
background-position: -220px -892px;
width: 219px;
height: 219px;
}
.quest_atom1 {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -217px -1326px;
background-position: -251px -1326px;
width: 250px;
height: 150px;
}
.quest_atom2 {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -970px -1326px;
background-position: -1540px -1176px;
width: 207px;
height: 138px;
}
.quest_atom3 {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: 0px -1326px;
background-position: -1540px -817px;
width: 216px;
height: 180px;
}
.quest_axolotl {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -880px -672px;
background-position: -1100px -440px;
width: 219px;
height: 219px;
}
.quest_basilist {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -191px -1682px;
background-position: -366px -1477px;
width: 189px;
height: 141px;
}
.quest_beetle {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1540px -862px;
background-position: -1540px -428px;
width: 204px;
height: 201px;
}
.quest_bunny {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1540px -1064px;
background-position: -1540px -630px;
width: 210px;
height: 186px;
}
.quest_butterfly {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1100px -660px;
background-position: -880px 0px;
width: 219px;
height: 219px;
}
.quest_cheetah {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: 0px -892px;
background-position: -660px -452px;
width: 219px;
height: 219px;
}
.quest_cow {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1757px 0px;
background-position: 0px -1477px;
width: 174px;
height: 213px;
}
.quest_dilatory {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -660px -892px;
background-position: -1100px -892px;
width: 219px;
height: 219px;
}
.quest_dilatoryDistress1 {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1540px -651px;
background-position: -1540px -217px;
width: 210px;
height: 210px;
}
.quest_dilatoryDistress2 {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1757px -422px;
background-position: -1757px -359px;
width: 150px;
height: 150px;
}
.quest_dilatoryDistress3 {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1320px 0px;
background-position: -1320px -220px;
width: 219px;
height: 219px;
}
.quest_dilatory_derby {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -440px -892px;
background-position: -660px -220px;
width: 219px;
height: 219px;
}
.quest_dustbunnies {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1320px -220px;
background-position: -440px 0px;
width: 219px;
height: 219px;
}
.quest_egg {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1757px -214px;
background-position: -1757px 0px;
width: 165px;
height: 207px;
}
.quest_evilsanta {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1757px -1416px;
background-position: -1757px -1051px;
width: 118px;
height: 131px;
}
.quest_evilsanta2 {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1320px -660px;
background-position: -220px -452px;
width: 219px;
height: 219px;
}
.quest_falcon {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1320px -440px;
background-position: -660px -672px;
width: 219px;
height: 219px;
}
.quest_ferret {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1100px -892px;
background-position: -1100px -660px;
width: 219px;
height: 219px;
}
@@ -228,19 +348,19 @@
}
.quest_ghost_stag {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -220px 0px;
background-position: -880px -892px;
width: 219px;
height: 219px;
}
.quest_goldenknight1 {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -880px -892px;
background-position: -1320px 0px;
width: 219px;
height: 219px;
}
.quest_goldenknight2 {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -719px -1326px;
background-position: 0px -1326px;
width: 250px;
height: 150px;
}
@@ -252,19 +372,19 @@
}
.quest_gryphon {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1319px -1112px;
background-position: -1102px -1112px;
width: 216px;
height: 177px;
}
.quest_guineapig {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1100px -440px;
background-position: -660px -892px;
width: 219px;
height: 219px;
}
.quest_harpy {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1100px -220px;
background-position: -440px -892px;
width: 219px;
height: 219px;
}
@@ -276,85 +396,85 @@
}
.quest_hippo {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1100px 0px;
background-position: 0px -892px;
width: 219px;
height: 219px;
}
.quest_horse {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -660px -672px;
background-position: -220px 0px;
width: 219px;
height: 219px;
}
.quest_kraken {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1102px -1112px;
background-position: -1540px -998px;
width: 216px;
height: 177px;
}
.quest_mayhemMistiflying1 {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1757px -724px;
background-position: -1757px -208px;
width: 150px;
height: 150px;
}
.quest_mayhemMistiflying2 {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -440px -672px;
background-position: -1100px -220px;
width: 219px;
height: 219px;
}
.quest_mayhemMistiflying3 {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -220px -672px;
background-position: -1100px 0px;
width: 219px;
height: 219px;
}
.quest_monkey {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -880px -440px;
background-position: -880px -672px;
width: 219px;
height: 219px;
}
.quest_moon1 {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1320px -880px;
background-position: -1540px 0px;
width: 216px;
height: 216px;
}
.quest_moon2 {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -880px -220px;
background-position: -440px -672px;
width: 219px;
height: 219px;
}
.quest_moon3 {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -880px 0px;
background-position: -220px -672px;
width: 219px;
height: 219px;
}
.quest_moonstone1 {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -660px -452px;
background-position: 0px -672px;
width: 219px;
height: 219px;
}
.quest_moonstone2 {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -440px -452px;
background-position: -880px -440px;
width: 219px;
height: 219px;
}
.quest_moonstone3 {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -220px -452px;
background-position: -880px -220px;
width: 219px;
height: 219px;
}
.quest_nudibranch {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1540px -217px;
background-position: -1320px -440px;
width: 216px;
height: 216px;
}
@@ -366,37 +486,37 @@
}
.quest_owl {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: 0px -452px;
background-position: -440px -452px;
width: 219px;
height: 219px;
}
.quest_peacock {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1540px 0px;
background-position: -1320px -657px;
width: 216px;
height: 216px;
}
.quest_penguin {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: 0px -1682px;
background-position: -175px -1477px;
width: 190px;
height: 183px;
}
.quest_rat {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -660px -220px;
background-position: 0px -452px;
width: 219px;
height: 219px;
}
.quest_rock {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1540px -434px;
background-position: -1320px -874px;
width: 216px;
height: 216px;
}
.quest_rooster {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: 0px -1507px;
background-position: -1319px -1112px;
width: 213px;
height: 174px;
}
@@ -438,25 +558,7 @@
}
.quest_spider {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -468px -1326px;
background-position: -502px -1326px;
width: 250px;
height: 150px;
}
.quest_stoikalmCalamity1 {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -1757px -573px;
width: 150px;
height: 150px;
}
.quest_stoikalmCalamity2 {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -440px 0px;
width: 219px;
height: 219px;
}
.quest_stoikalmCalamity3 {
background-image: url(/static/sprites/spritesmith-main-9.png);
background-position: -220px -892px;
width: 219px;
height: 219px;
}