Merge pull request #4988 from SabreCat/shiny-seed

April backgrounds

common/dist/scripts/habitrpg-shared.js

@@ -4817,6 +4817,20 @@ api.backgrounds = {
       text: t('backgroundRollingHillsText'),
       notes: t('backgroundRollingHillsNotes')
     }
+  },
+  backgrounds042015: {
+    cherry_trees: {
+      text: t('backgroundCherryTreesText'),
+      notes: t('backgroundCherryTreesNotes')
+    },
+    floral_meadow: {
+      text: t('backgroundFloralMeadowText'),
+      notes: t('backgroundFloralMeadowNotes')
+    },
+    gumdrop_land: {
+      text: t('backgroundGumdropLandText'),
+      notes: t('backgroundGumdropLandNotes')
+    }
   }
 };
 

common/dist/sprites/spritesmith4.css

@@ -1,6 +1,6 @@
 .shop_head_healer_3 {
   background-image: url(spritesmith4.png);
-  background-position: -492px -1786px;
+  background-position: -451px -1786px;
   width: 40px;
   height: 40px;
 }
@@ -54,25 +54,25 @@
 }
 .shop_head_special_1 {
   background-image: url(spritesmith4.png);
-  background-position: -1107px -1745px;
+  background-position: -1066px -1745px;
   width: 40px;
   height: 40px;
 }
 .shop_head_special_2 {
   background-image: url(spritesmith4.png);
-  background-position: -1148px -1745px;
+  background-position: -1107px -1745px;
   width: 40px;
   height: 40px;
 }
 .shop_head_warrior_1 {
   background-image: url(spritesmith4.png);
-  background-position: -1189px -1745px;
+  background-position: -1148px -1745px;
   width: 40px;
   height: 40px;
 }
 .shop_head_warrior_2 {
   background-image: url(spritesmith4.png);
-  background-position: -451px -1786px;
+  background-position: -1189px -1745px;
   width: 40px;
   height: 40px;
 }
@@ -750,7 +750,7 @@
 }
 .Pet_Currency_Gem {
   background-image: url(spritesmith4.png);
-  background-position: -533px -1786px;
+  background-position: -492px -1786px;
   width: 45px;
   height: 39px;
 }
@@ -1620,7 +1620,7 @@
 }
 .shop_gold {
   background-image: url(spritesmith4.png);
-  background-position: -1856px -390px;
+  background-position: -1856px -445px;
   width: 32px;
   height: 22px;
 }
@@ -1644,25 +1644,25 @@
 }
 .shop_shinySeed {
   background-image: url(spritesmith4.png);
-  background-position: -1066px -1745px;
-  width: 40px;
-  height: 40px;
+  background-position: -1856px -280px;
+  width: 32px;
+  height: 32px;
 }
 .shop_silver {
   background-image: url(spritesmith4.png);
-  background-position: -1856px -413px;
+  background-position: -1856px -468px;
   width: 32px;
   height: 22px;
 }
 .shop_snowball {
   background-image: url(spritesmith4.png);
-  background-position: -1856px -335px;
+  background-position: -1856px -390px;
   width: 32px;
   height: 32px;
 }
 .shop_spookDust {
   background-image: url(spritesmith4.png);
-  background-position: -1856px -280px;
+  background-position: -1856px -335px;
   width: 32px;
   height: 32px;
 }

common/locales/en/backgrounds.json

@@ -79,5 +79,13 @@
   "backgroundStainedGlassText": "Stained Glass",
   "backgroundStainedGlassNotes": "Admire some Stained Glass.",
   "backgroundRollingHillsText": "Rolling Hills",
-  "backgroundRollingHillsNotes": "Frolic through the Rolling Hills."
+  "backgroundRollingHillsNotes": "Frolic through the Rolling Hills.",
+
+  "backgrounds042015": "SET 11: Released April 2015",
+  "backgroundCherryTreesText": "Cherry Trees",
+  "backgroundCherryTreesNotes": "Admire the Cherry Trees in blossom.",
+  "backgroundFloralMeadowText": "Flowering Meadow",
+  "backgroundFloralMeadowNotes": "Picnic in a Flowering Meadow.",
+  "backgroundGumdropLandText": "Gumdrop Land",
+  "backgroundGumdropLandNotes": "Nibble the scenery of Gumdrop Land."
 }

common/script/content.coffee

@@ -1737,6 +1737,16 @@ api.backgrounds =
     rolling_hills:
       text: t('backgroundRollingHillsText')
       notes: t('backgroundRollingHillsNotes')
+  backgrounds042015:
+    cherry_trees:
+      text: t('backgroundCherryTreesText')
+      notes: t('backgroundCherryTreesNotes')
+    floral_meadow:
+      text: t('backgroundFloralMeadowText')
+      notes: t('backgroundFloralMeadowNotes')
+    gumdrop_land:
+      text: t('backgroundGumdropLandText')
+      notes: t('backgroundGumdropLandNotes')
 
 api.subscriptionBlocks =
   basic_earned: months:1, price:5

website/views/shared/new-stuff.jade

@@ -1,5 +1,17 @@
-h5 4/2/2015 - MARCH AND APRIL ITEM SETS; SHINY SEEDS; MESSAGE CHALLENGE CREATORS; ITEM DROP ICONS
+h5 4/7/2015 - APRIL BACKGROUNDS REVEALED
   hr
+  tr
+    td
+      .background_cherry_trees.pull-right
+      h5 April Backgrounds
+      p There are three new avatar backgrounds in the <a href='https://habitrpg.com/#/options/profile/backgrounds' target='_blank'>Background Shop</a>! Now your avatar can picnic in a Flowering Meadow, nibble the scenery of Gumdrop Land, or admire the Cherry Trees!
+      p.small.muted by Rattify, Painter de Cluster, and kmcallah
+
+hr
+a(href='/static/old-news', target='_blank') Read older news
+
+mixin oldNews
+  h5 4/2/2015 - MARCH AND APRIL ITEM SETS; SHINY SEEDS; MESSAGE CHALLENGE CREATORS; ITEM DROP ICONS
     tr
       td
         h5 Last Chance for March Item Set
@@ -31,11 +43,6 @@ h5 4/2/2015 - MARCH AND APRIL ITEM SETS; SHINY SEEDS; MESSAGE CHALLENGE CREATORS
         h5 Icons in Notifications
         p Now, when you find an item from scoring a task, an image of the item appears in the drop notification. Instant gratification when that egg or potion you've been hunting for finally appears!
         p.small.muted by TheHollidayInn
-
-hr
-a(href='/static/old-news', target='_blank') Read older news
-
-mixin oldNews
   h5 4/1/2015 - HOSTILE FLOWER TAKEOVER OF JOY AND DOOM
     tr
       td