diff --git a/css/index.css b/css/index.css index 0f5f69aeb1..3fa87c8191 100644 --- a/css/index.css +++ b/css/index.css @@ -2,12 +2,12 @@ margin-left: 1.25em; }*/ -/* Comment out for holiday events +/* Comment out for holiday events */ .npc_ian { background: url("../img/sprites/npc_ian.gif") no-repeat; width: 78px; height: 135px; -} */ +} .Gems { display:inline-block; diff --git a/img/sprites/spritesmith/misc/inventory_present.png b/img/sprites/spritesmith/misc/inventory_present.png index 9e6ee336b5..264c7b13a7 100644 Binary files a/img/sprites/spritesmith/misc/inventory_present.png and b/img/sprites/spritesmith/misc/inventory_present.png differ diff --git a/img/sprites/spritesmith/npcs/npc_alex.png b/img/sprites/spritesmith/npcs/npc_alex.png index 9d322bdeec..67b7476d33 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 c5a8b3e682..d5940b986b 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 ce2a49189e..fa1df767d2 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 deleted file mode 100644 index 73eea25a23..0000000000 Binary files a/img/sprites/spritesmith/npcs/npc_ian.png and /dev/null differ diff --git a/img/sprites/spritesmith/npcs/npc_justin.png b/img/sprites/spritesmith/npcs/npc_justin.png index 08ad42e374..08ba7025c2 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 57418b0fdd..c32af92c28 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/seasonalshop_winter2015.png b/img/sprites/spritesmith/npcs/seasonalshop_winter2015.png deleted file mode 100644 index 5e0ab92cb1..0000000000 Binary files a/img/sprites/spritesmith/npcs/seasonalshop_winter2015.png and /dev/null differ diff --git a/script/content.coffee b/script/content.coffee index f0a32158cc..a7a66b755b 100644 --- a/script/content.coffee +++ b/script/content.coffee @@ -836,30 +836,30 @@ api.questMounts = _.transform api.questEggs, (m, egg) -> api.food = # Base - 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: '' + 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: '' Saddle: canBuy:true, canDrop:false, text: t('foodSaddleText'), value: 5, notes: t('foodSaddleNotes') # Cake - 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: '' + 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: '' # Fall Candy_Skeleton: canBuy:false, canDrop:false, text: t('foodCandySkeleton'), target: 'Skeleton', article: ''