From 7642fdd19425e875c085da8ccf96abac2bd726d0 Mon Sep 17 00:00:00 2001 From: bearbin Date: Fri, 2 Aug 2013 07:46:30 +0100 Subject: Add the new food items. Enchanted golden apples are not required, as they are a meta value and provide the same nourishment as plain golden apples. --- source/Items/ItemFood.h | 37 +++++++++++++++++++++---------------- 1 file changed, 21 insertions(+), 16 deletions(-) (limited to 'source/Items/ItemFood.h') diff --git a/source/Items/ItemFood.h b/source/Items/ItemFood.h index 8a6898103..05a7f9afd 100644 --- a/source/Items/ItemFood.h +++ b/source/Items/ItemFood.h @@ -1,4 +1,3 @@ - #pragma once #include "ItemHandler.h" @@ -29,21 +28,27 @@ public: { switch(m_ItemType) { - case E_ITEM_BREAD: return FoodInfo(5, 6); - case E_ITEM_COOKIE: return FoodInfo(2, 0.4); - case E_ITEM_MELON_SLICE: return FoodInfo(2, 1.2); - case E_ITEM_RAW_CHICKEN: return FoodInfo(2, 1.2, 30); - case E_ITEM_COOKED_CHICKEN: return FoodInfo(6, 7.2); - case E_ITEM_RAW_BEEF: return FoodInfo(3, 1.8); - case E_ITEM_RAW_PORKCHOP: return FoodInfo(3, 1.8); - case E_ITEM_STEAK: return FoodInfo(8, 12.8); - case E_ITEM_COOKED_PORKCHOP: return FoodInfo(8, 12.8); - case E_ITEM_RAW_FISH: return FoodInfo(2, 1.2); - case E_ITEM_COOKED_FISH: return FoodInfo(5, 6); - case E_ITEM_RED_APPLE: return FoodInfo(4, 2.4); - case E_ITEM_GOLDEN_APPLE: return FoodInfo(4, 9.6); - case E_ITEM_ROTTEN_FLESH: return FoodInfo(4, 0.8, 80); - case E_ITEM_SPIDER_EYE: return FoodInfo(2, 3.2, 100); + case E_ITEM_BREAD: return FoodInfo(5, 6); + case E_ITEM_COOKIE: return FoodInfo(2, 0.4); + case E_ITEM_MELON_SLICE: return FoodInfo(2, 1.2); + case E_ITEM_RAW_CHICKEN: return FoodInfo(2, 1.2, 30); + case E_ITEM_COOKED_CHICKEN: return FoodInfo(6, 7.2); + case E_ITEM_RAW_BEEF: return FoodInfo(3, 1.8); + case E_ITEM_RAW_PORKCHOP: return FoodInfo(3, 1.8); + case E_ITEM_STEAK: return FoodInfo(8, 12.8); + case E_ITEM_COOKED_PORKCHOP: return FoodInfo(8, 12.8); + case E_ITEM_RAW_FISH: return FoodInfo(2, 1.2); + case E_ITEM_COOKED_FISH: return FoodInfo(5, 6); + case E_ITEM_RED_APPLE: return FoodInfo(4, 2.4); + case E_ITEM_GOLDEN_APPLE: return FoodInfo(4, 9.6); + case E_ITEM_ROTTEN_FLESH: return FoodInfo(4, 0.8, 80); + case E_ITEM_SPIDER_EYE: return FoodInfo(2, 3.2, 100); + case E_ITEM_POTATO: return FoodInfo(1, 0.6); + case E_ITEM_BAKED_POTATO: return FoodInfo(6, 7.2); + case E_ITEM_POISONOUS_POTATO: return FoodInfo(2, 1.2, 60); + case E_ITEM_PUMPKIN_PIE: return FoodInfo(8, 4.8); + case E_ITEM_CARROT: return FoodInfo(4, 4.8); + case E_ITEM_GOLDEN_CARROT: return FoodInfo(6, 14.4); } LOGWARNING("%s: Unknown food item (%d), returning zero nutrition", __FUNCTION__, m_ItemType); return FoodInfo(0, 0.f); -- cgit v1.2.3