Merge pull request #394 from SabreCat/seasonal

Seasonal Shop Basics
This commit is contained in:
Sabe Jones
2014-12-16 21:52:28 -06:00
9 changed files with 593 additions and 584 deletions
+1 -1
View File
File diff suppressed because one or more lines are too long
+9 -3
View File
@@ -6,7 +6,7 @@
}
.shop_armor_healer_2 {
background-image: url(spritesmith2.png);
background-position: -1025px -1234px;
background-position: -1066px -1234px;
width: 40px;
height: 40px;
}
@@ -900,13 +900,13 @@
}
.shop_armor_mystery_301404 {
background-image: url(spritesmith2.png);
background-position: -1310px -500px;
background-position: -1025px -1234px;
width: 40px;
height: 40px;
}
.shop_eyewear_mystery_301404 {
background-image: url(spritesmith2.png);
background-position: -1066px -1234px;
background-position: -1310px -500px;
width: 40px;
height: 40px;
}
@@ -1804,3 +1804,9 @@
width: 40px;
height: 40px;
}
.shop_body_special_wondercon_red {
background-image: url(spritesmith2.png);
background-position: -82px -1316px;
width: 40px;
height: 40px;
}
BIN
View File
Binary file not shown.

Before

Width:  |  Height:  |  Size: 133 KiB

After

Width:  |  Height:  |  Size: 133 KiB

+273 -279
View File
File diff suppressed because it is too large Load Diff
BIN
View File
Binary file not shown.

Before

Width:  |  Height:  |  Size: 349 KiB

After

Width:  |  Height:  |  Size: 352 KiB

+306 -300
View File
File diff suppressed because it is too large Load Diff
BIN
View File
Binary file not shown.

Before

Width:  |  Height:  |  Size: 264 KiB

After

Width:  |  Height:  |  Size: 265 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.5 KiB

+4 -1
View File
@@ -13,5 +13,8 @@
"polarBear": "Polar Bear",
"turkey": "Turkey",
"polarBearPup": "Polar Bear Cub",
"jackolantern": "Jack-O-Lantern"
"jackolantern": "Jack-O-Lantern",
"seasonalShop": "Seasonal Shop",
"seasonalShopClosedTitle": "Seasonal Shop (Closed)",
"seasonalShopClosedText": "The Seasonal Shop is currently closed!! I don't know where the Seasonal Sorceress is now, but I bet she'll be back during the next <%= linkStart %>Grand Gala<%= linkEnd %>!"
}