diff --git a/img/sprites/spritesmith/achievements/achievement-habitBirthday.png b/img/sprites/spritesmith/achievements/achievement-habitBirthday.png index 231fca394c..32f4855fb2 100644 Binary files a/img/sprites/spritesmith/achievements/achievement-habitBirthday.png and b/img/sprites/spritesmith/achievements/achievement-habitBirthday.png differ diff --git a/img/sprites/spritesmith/npcs/npc_bailey_broken.png b/img/sprites/spritesmith/gear/events/birthday/broad_armor_special_birthday2015.png similarity index 75% rename from img/sprites/spritesmith/npcs/npc_bailey_broken.png rename to img/sprites/spritesmith/gear/events/birthday/broad_armor_special_birthday2015.png index a58142a930..64d356b5ec 100644 Binary files a/img/sprites/spritesmith/npcs/npc_bailey_broken.png and b/img/sprites/spritesmith/gear/events/birthday/broad_armor_special_birthday2015.png differ diff --git a/img/sprites/spritesmith/npcs/npc_justin_broken.png b/img/sprites/spritesmith/gear/events/birthday/slim_armor_special_birthday2015.png similarity index 61% rename from img/sprites/spritesmith/npcs/npc_justin_broken.png rename to img/sprites/spritesmith/gear/events/birthday/slim_armor_special_birthday2015.png index bafbf848a9..2fffc6921b 100644 Binary files a/img/sprites/spritesmith/npcs/npc_justin_broken.png and b/img/sprites/spritesmith/gear/events/birthday/slim_armor_special_birthday2015.png differ diff --git a/img/sprites/spritesmith/npcs/npc_alex.png b/img/sprites/spritesmith/npcs/npc_alex.png index 8d45538129..9d322bdeec 100644 Binary files a/img/sprites/spritesmith/npcs/npc_alex.png and b/img/sprites/spritesmith/npcs/npc_alex.png differ diff --git a/img/sprites/spritesmith/npcs/npc_bailey.png b/img/sprites/spritesmith/npcs/npc_bailey.png index 9bd12818af..c5a8b3e682 100644 Binary files a/img/sprites/spritesmith/npcs/npc_bailey.png and b/img/sprites/spritesmith/npcs/npc_bailey.png differ diff --git a/img/sprites/spritesmith/npcs/npc_daniel.png b/img/sprites/spritesmith/npcs/npc_daniel.png index 4132b30145..ce2a49189e 100644 Binary files a/img/sprites/spritesmith/npcs/npc_daniel.png and b/img/sprites/spritesmith/npcs/npc_daniel.png differ diff --git a/img/sprites/spritesmith/npcs/npc_ian.png b/img/sprites/spritesmith/npcs/npc_ian.png index 6d490c1152..73eea25a23 100644 Binary files a/img/sprites/spritesmith/npcs/npc_ian.png and b/img/sprites/spritesmith/npcs/npc_ian.png differ diff --git a/img/sprites/spritesmith/npcs/npc_justin.png b/img/sprites/spritesmith/npcs/npc_justin.png index bf42f04508..08ad42e374 100644 Binary files a/img/sprites/spritesmith/npcs/npc_justin.png and b/img/sprites/spritesmith/npcs/npc_justin.png differ diff --git a/img/sprites/spritesmith/npcs/npc_matt.png b/img/sprites/spritesmith/npcs/npc_matt.png index ed0e3bab59..57418b0fdd 100644 Binary files a/img/sprites/spritesmith/npcs/npc_matt.png and b/img/sprites/spritesmith/npcs/npc_matt.png differ diff --git a/img/sprites/spritesmith/npcs/npc_matt_broken.png b/img/sprites/spritesmith/npcs/npc_matt_broken.png deleted file mode 100644 index df8ed628b2..0000000000 Binary files a/img/sprites/spritesmith/npcs/npc_matt_broken.png and /dev/null differ diff --git a/img/sprites/spritesmith/npcs/seasonalshop_winter2015.png b/img/sprites/spritesmith/npcs/seasonalshop_winter2015.png index bf18da469c..5e0ab92cb1 100644 Binary files a/img/sprites/spritesmith/npcs/seasonalshop_winter2015.png and b/img/sprites/spritesmith/npcs/seasonalshop_winter2015.png differ diff --git a/locales/en/gear.json b/locales/en/gear.json index a511c7e204..a9e0fb9319 100644 --- a/locales/en/gear.json +++ b/locales/en/gear.json @@ -190,7 +190,9 @@ "armorSpecialSnowflakeText": "Snowflake Robe", "armorSpecialSnowflakeNotes": "A robe to keep you warm, even in a blizzard. Increases Constitution by <%= con %>. Limited Edition 2013-2014 Winter Gear.", "armorSpecialBirthdayText": "Absurd Party Robes", - "armorSpecialBirthdayNotes": "As part of the festivities, Absurd Party Robes are available free of charge in the Item Store! Swath yourself in those silly garbs and don your matching hats to celebrate this momentous day. Confers no benefit.", + "armorSpecialBirthdayNotes": "Happy Birthday, HabitRPG! Wear these Absurd Party Robes to celebrate this wonderful day. Confers no benefit.", + "armorSpecialBirthday2015Text": "Silly Party Robes", + "armorSpecialBirthday2015Notes": "Happy Birthday, HabitRPG! Wear these Silly Party Robes to celebrate this wonderful day. Confers no benefit.", "armorSpecialGaymerxText": "Rainbow Warrior Armor", "armorSpecialGaymerxNotes": "In celebration of pride season and GaymerX, this special armor is decorated with a radiant, colorful rainbow pattern! GaymerX is a game convention celebrating LGBTQ and gaming and is open to everyone. It takes place at the InterContinental in downtown San Francisco on July 11-13! Confers no benefit.", diff --git a/locales/en/generic.json b/locales/en/generic.json index a7eaac1b92..2bb3e9e14c 100644 --- a/locales/en/generic.json +++ b/locales/en/generic.json @@ -44,8 +44,9 @@ "veteranText": "Has weathered Habit The Grey (our pre Angular website), and has gained many battle-scars from its bugs.", "originalUser": "Original User!", "originalUserText": "One of the very original early adopters. Talk about alpha tester!", - "habitBirthday": "2014 HabitRPG Birthday Bash", - "habitBirthdayText": "Participated in the HabitRPG Birthday Bash of 2014.", + "habitBirthday": "HabitRPG Birthday Bash", + "habitBirthdayText": "Celebrated the HabitRPG Birthday Bash!", + "habitBirthdayPluralText": "Celebrated <%= number %> HabitRPG Birthday Bashes!", "achievementDilatory": "Savior of Dilatory", "achievementDilatoryText": "Helped defeat the Dread Drag'on of Dilatory during the 2014 Summer Splash Event!", "costumeContest": "2014 Costume Contest", diff --git a/locales/en/rebirth.json b/locales/en/rebirth.json index a78f60ed02..cbed4474b8 100644 --- a/locales/en/rebirth.json +++ b/locales/en/rebirth.json @@ -24,7 +24,7 @@ "reborn": "Reborn, max level <%= reLevel %>", "welcome100": "Welcome to Level 100!", "intro100": "Now that you've hit level 100, you have the option to use the Orb of Rebirth for free at any time.", - "followup100": "While you can continue to level up, it will no long boost your stats and no more content will unlock, to keep Habit fun for folks of all play styles.", + "followup100": "While you can continue to level up, it will no longer boost your stats and no more content will unlock, to keep Habit fun for folks of all play styles.", "rebirth100Info": "If you're ready to start a new adventure, you can Rebirth now... or see how much further you can push yourself.", "rebirthWait": "I'll wait...", "rebirthNow": "Rebirth Now!" diff --git a/script/content.coffee b/script/content.coffee index 220ac9b8f5..875145903d 100644 --- a/script/content.coffee +++ b/script/content.coffee @@ -27,6 +27,7 @@ events = gaymerx: {start:'2014-07-02',end:'2014-08-01'} fall: {start:'2014-09-21',end:'2014-11-01'} winter2015: {start:'2014-12-21',end:'2015-01-31'} + birthday2015: {start:'2015-01-30',end:'2015-02-01'} api.mystery = 201402: {start:'2014-02-22',end:'2014-02-28', text:'Winged Messenger Set'} @@ -187,6 +188,7 @@ gear = winter2015Warrior: event: events.winter2015, specialClass: 'warrior', text: t('armorSpecialWinter2015WarriorText'), notes: t('armorSpecialWinter2015WarriorNotes', {con: 9}), value: 90, con: 9 winter2015Mage: event: events.winter2015, specialClass: 'wizard', text: t('armorSpecialWinter2015MageText'), notes: t('armorSpecialWinter2015MageNotes', {int: 9}), value: 90, int: 9 winter2015Healer: event: events.winter2015, specialClass: 'healer', text: t('armorSpecialWinter2015HealerText'), notes: t('armorSpecialWinter2015HealerNotes', {con: 15}), value: 90, con: 15 + birthday2015: event: events.birthday2015, text: t('armorSpecialBirthday2015Text'), notes: t('armorSpecialBirthday2015Notes'), value: 0 # Other gaymerx: event: events.gaymerx, text: t('armorSpecialGaymerxText'), notes: t('armorSpecialGaymerxNotes'), value: 0 mystery: @@ -832,30 +834,30 @@ api.questMounts = _.transform api.questEggs, (m, egg) -> api.food = # Base - Meat: canBuy:true, canDrop:true, text: t('foodMeat'), target: 'Base', article: '' - Milk: canBuy:true, canDrop:true, text: t('foodMilk'), target: 'White', article: '' - Potatoe: canBuy:true, canDrop:true, text: t('foodPotatoe'), target: 'Desert', article: 'a ' - Strawberry: canBuy:true, canDrop:true, text: t('foodStrawberry'), target: 'Red', article: 'a ' - Chocolate: canBuy:true, canDrop:true, text: t('foodChocolate'), target: 'Shade', article: '' - Fish: canBuy:true, canDrop:true, text: t('foodFish'), target: 'Skeleton', article: 'a ' - RottenMeat: canBuy:true, canDrop:true, text: t('foodRottenMeat'), target: 'Zombie', article: '' - CottonCandyPink: canBuy:true, canDrop:true, text: t('foodCottonCandyPink'), target: 'CottonCandyPink', article: '' - CottonCandyBlue: canBuy:true, canDrop:true, text: t('foodCottonCandyBlue'), target: 'CottonCandyBlue', article: '' - Honey: canBuy:true, canDrop:true, text: t('foodHoney'), target: 'Golden', article: '' + Meat: canBuy:false, canDrop:false, text: t('foodMeat'), target: 'Base', article: '' + Milk: canBuy:false, canDrop:false, text: t('foodMilk'), target: 'White', article: '' + Potatoe: canBuy:false, canDrop:false, text: t('foodPotatoe'), target: 'Desert', article: 'a ' + Strawberry: canBuy:false, canDrop:false, text: t('foodStrawberry'), target: 'Red', article: 'a ' + Chocolate: canBuy:false, canDrop:false, text: t('foodChocolate'), target: 'Shade', article: '' + Fish: canBuy:false, canDrop:false, text: t('foodFish'), target: 'Skeleton', article: 'a ' + RottenMeat: canBuy:false, canDrop:false, text: t('foodRottenMeat'), target: 'Zombie', article: '' + CottonCandyPink: canBuy:false, canDrop:false, text: t('foodCottonCandyPink'), target: 'CottonCandyPink', article: '' + CottonCandyBlue: canBuy:false, canDrop:false, text: t('foodCottonCandyBlue'), target: 'CottonCandyBlue', article: '' + Honey: canBuy:false, canDrop:false, text: t('foodHoney'), target: 'Golden', article: '' Saddle: canBuy:true, canDrop:false, text: t('foodSaddleText'), value: 5, notes: t('foodSaddleNotes') # Cake - Cake_Skeleton: canBuy:false, canDrop:false, text: t('foodCakeSkeleton'), target: 'Skeleton', article: '' - Cake_Base: canBuy:false, canDrop:false, text: t('foodCakeBase'), target: 'Base', article: '' - Cake_CottonCandyBlue: canBuy:false, canDrop:false, text: t('foodCakeCottonCandyBlue'), target: 'CottonCandyBlue', article: '' - Cake_CottonCandyPink: canBuy:false, canDrop:false, text: t('foodCakeCottonCandyPink'), target: 'CottonCandyPink', article: '' - Cake_Shade: canBuy:false, canDrop:false, text: t('foodCakeShade'), target: 'Shade', article: '' - Cake_White: canBuy:false, canDrop:false, text: t('foodCakeWhite'), target: 'White', article: '' - Cake_Golden: canBuy:false, canDrop:false, text: t('foodCakeGolden'), target: 'Golden', article: '' - Cake_Zombie: canBuy:false, canDrop:false, text: t('foodCakeZombie'), target: 'Zombie', article: '' - Cake_Desert: canBuy:false, canDrop:false, text: t('foodCakeDesert'), target: 'Desert', article: '' - Cake_Red: canBuy:false, canDrop:false, text: t('foodCakeRed'), target: 'Red', article: '' + Cake_Skeleton: canBuy:true, canDrop:true, text: t('foodCakeSkeleton'), target: 'Skeleton', article: '' + Cake_Base: canBuy:true, canDrop:true, text: t('foodCakeBase'), target: 'Base', article: '' + Cake_CottonCandyBlue: canBuy:true, canDrop:true, text: t('foodCakeCottonCandyBlue'), target: 'CottonCandyBlue', article: '' + Cake_CottonCandyPink: canBuy:true, canDrop:true, text: t('foodCakeCottonCandyPink'), target: 'CottonCandyPink', article: '' + Cake_Shade: canBuy:true, canDrop:true, text: t('foodCakeShade'), target: 'Shade', article: '' + Cake_White: canBuy:true, canDrop:true, text: t('foodCakeWhite'), target: 'White', article: '' + Cake_Golden: canBuy:true, canDrop:true, text: t('foodCakeGolden'), target: 'Golden', article: '' + Cake_Zombie: canBuy:true, canDrop:true, text: t('foodCakeZombie'), target: 'Zombie', article: '' + Cake_Desert: canBuy:true, canDrop:true, text: t('foodCakeDesert'), target: 'Desert', article: '' + Cake_Red: canBuy:true, canDrop:true, text: t('foodCakeRed'), target: 'Red', article: '' # Fall Candy_Skeleton: canBuy:false, canDrop:false, text: t('foodCandySkeleton'), target: 'Skeleton', article: ''