diff --git a/dist/habitrpg-shared.js b/dist/habitrpg-shared.js index 2d084878a4..26a5852539 100644 --- a/dist/habitrpg-shared.js +++ b/dist/habitrpg-shared.js @@ -12300,70 +12300,70 @@ api.questPets = _.transform(api.questEggs, function(m, egg) { api.food = { Meat: { canBuy: true, - canDrop: false, + canDrop: true, text: t('foodMeat'), target: 'Base', article: '' }, Milk: { canBuy: true, - canDrop: false, + canDrop: true, text: t('foodMilk'), target: 'White', article: '' }, Potatoe: { canBuy: true, - canDrop: false, + canDrop: true, text: t('foodPotatoe'), target: 'Desert', article: 'a ' }, Strawberry: { canBuy: true, - canDrop: false, + canDrop: true, text: t('foodStrawberry'), target: 'Red', article: 'a ' }, Chocolate: { canBuy: true, - canDrop: false, + canDrop: true, text: t('foodChocolate'), target: 'Shade', article: '' }, Fish: { canBuy: true, - canDrop: false, + canDrop: true, text: t('foodFish'), target: 'Skeleton', article: 'a ' }, RottenMeat: { canBuy: true, - canDrop: false, + canDrop: true, text: t('foodRottenMeat'), target: 'Zombie', article: '' }, CottonCandyPink: { canBuy: true, - canDrop: false, + canDrop: true, text: t('foodCottonCandyPink'), target: 'CottonCandyPink', article: '' }, CottonCandyBlue: { canBuy: true, - canDrop: false, + canDrop: true, text: t('foodCottonCandyBlue'), target: 'CottonCandyBlue', article: '' }, Honey: { canBuy: true, - canDrop: false, + canDrop: true, text: t('foodHoney'), target: 'Golden', article: '' @@ -12446,71 +12446,71 @@ api.food = { article: '' }, Candy_Skeleton: { - canBuy: true, - canDrop: true, + canBuy: false, + canDrop: false, text: t('foodCandySkeleton'), target: 'Skeleton', article: '' }, Candy_Base: { - canBuy: true, - canDrop: true, + canBuy: false, + canDrop: false, text: t('foodCandyBase'), target: 'Base', article: '' }, Candy_CottonCandyBlue: { - canBuy: true, - canDrop: true, + canBuy: false, + canDrop: false, text: t('foodCandyCottonCandyBlue'), target: 'CottonCandyBlue', article: '' }, Candy_CottonCandyPink: { - canBuy: true, - canDrop: true, + canBuy: false, + canDrop: false, text: t('foodCandyCottonCandyPink'), target: 'CottonCandyPink', article: '' }, Candy_Shade: { - canBuy: true, - canDrop: true, + canBuy: false, + canDrop: false, text: t('foodCandyShade'), target: 'Shade', article: '' }, Candy_White: { - canBuy: true, - canDrop: true, + canBuy: false, + canDrop: false, text: t('foodCandyWhite'), target: 'White', article: '' }, Candy_Golden: { - canBuy: true, - canDrop: true, + canBuy: false, + canDrop: false, text: t('foodCandyGolden'), target: 'Golden', article: '' }, Candy_Zombie: { - canBuy: true, - canDrop: true, + canBuy: false, + canDrop: false, text: t('foodCandyZombie'), target: 'Zombie', article: '' }, Candy_Desert: { - canBuy: true, - canDrop: true, + canBuy: false, + canDrop: false, text: t('foodCandyDesert'), target: 'Desert', article: '' }, Candy_Red: { - canBuy: true, - canDrop: true, + canBuy: false, + canDrop: false, text: t('foodCandyRed'), target: 'Red', article: '' diff --git a/script/content.coffee b/script/content.coffee index 7db4eec2ef..26c942c01b 100644 --- a/script/content.coffee +++ b/script/content.coffee @@ -730,19 +730,18 @@ api.questPets = _.transform api.questEggs, (m, egg) -> _.defaults m, _.transform api.hatchingPotions, (m2, pot) -> m2[egg.key + "-" + pot.key] = true -#TODO after the fall event, set Base set to canBuy:true (or remove, since it's default) and set Fall set to canBuy:false api.food = # Base - Meat: canBuy:true, canDrop:false, text: t('foodMeat'), target: 'Base', article: '' - Milk: canBuy:true, canDrop:false, text: t('foodMilk'), target: 'White', article: '' - Potatoe: canBuy:true, canDrop:false, text: t('foodPotatoe'), target: 'Desert', article: 'a ' - Strawberry: canBuy:true, canDrop:false, text: t('foodStrawberry'), target: 'Red', article: 'a ' - Chocolate: canBuy:true, canDrop:false, text: t('foodChocolate'), target: 'Shade', article: '' - Fish: canBuy:true, canDrop:false, text: t('foodFish'), target: 'Skeleton', article: 'a ' - RottenMeat: canBuy:true, canDrop:false, text: t('foodRottenMeat'), target: 'Zombie', article: '' - CottonCandyPink: canBuy:true, canDrop:false, text: t('foodCottonCandyPink'), target: 'CottonCandyPink', article: '' - CottonCandyBlue: canBuy:true, canDrop:false, text: t('foodCottonCandyBlue'), target: 'CottonCandyBlue', article: '' - Honey: canBuy:true, 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') @@ -759,16 +758,16 @@ api.food = Cake_Red: canBuy:false, canDrop:false, text: t('foodCakeRed'), target: 'Red', article: '' # Fall - Candy_Skeleton: canBuy:true, canDrop:true, text: t('foodCandySkeleton'), target: 'Skeleton', article: '' - Candy_Base: canBuy:true, canDrop:true, text: t('foodCandyBase'), target: 'Base', article: '' - Candy_CottonCandyBlue: canBuy:true, canDrop:true, text: t('foodCandyCottonCandyBlue'), target: 'CottonCandyBlue', article: '' - Candy_CottonCandyPink: canBuy:true, canDrop:true, text: t('foodCandyCottonCandyPink'), target: 'CottonCandyPink', article: '' - Candy_Shade: canBuy:true, canDrop:true, text: t('foodCandyShade'), target: 'Shade', article: '' - Candy_White: canBuy:true, canDrop:true, text: t('foodCandyWhite'), target: 'White', article: '' - Candy_Golden: canBuy:true, canDrop:true, text: t('foodCandyGolden'), target: 'Golden', article: '' - Candy_Zombie: canBuy:true, canDrop:true, text: t('foodCandyZombie'), target: 'Zombie', article: '' - Candy_Desert: canBuy:true, canDrop:true, text: t('foodCandyDesert'), target: 'Desert', article: '' - Candy_Red: canBuy:true, canDrop:true, text: t('foodCandyRed'), target: 'Red', article: '' + Candy_Skeleton: canBuy:false, canDrop:false, text: t('foodCandySkeleton'), target: 'Skeleton', article: '' + Candy_Base: canBuy:false, canDrop:false, text: t('foodCandyBase'), target: 'Base', article: '' + Candy_CottonCandyBlue: canBuy:false, canDrop:false, text: t('foodCandyCottonCandyBlue'), target: 'CottonCandyBlue', article: '' + Candy_CottonCandyPink: canBuy:false, canDrop:false, text: t('foodCandyCottonCandyPink'), target: 'CottonCandyPink', article: '' + Candy_Shade: canBuy:false, canDrop:false, text: t('foodCandyShade'), target: 'Shade', article: '' + Candy_White: canBuy:false, canDrop:false, text: t('foodCandyWhite'), target: 'White', article: '' + Candy_Golden: canBuy:false, canDrop:false, text: t('foodCandyGolden'), target: 'Golden', article: '' + Candy_Zombie: canBuy:false, canDrop:false, text: t('foodCandyZombie'), target: 'Zombie', article: '' + Candy_Desert: canBuy:false, canDrop:false, text: t('foodCandyDesert'), target: 'Desert', article: '' + Candy_Red: canBuy:false, canDrop:false, text: t('foodCandyRed'), target: 'Red', article: '' _.each api.food, (food,key) -> _.defaults food, {value: 1, key, notes: t('foodNotes')}