From 1d233bdc682b0a01e452f65c5a407b8324bd4ca1 Mon Sep 17 00:00:00 2001 From: bearbin Date: Fri, 2 Aug 2013 07:54:30 +0100 Subject: Alpha-sort the foodstuffs. --- source/Items/ItemFood.h | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) (limited to 'source/Items/ItemFood.h') diff --git a/source/Items/ItemFood.h b/source/Items/ItemFood.h index 05a7f9afd..6434f3dc7 100644 --- a/source/Items/ItemFood.h +++ b/source/Items/ItemFood.h @@ -28,27 +28,28 @@ public: { switch(m_ItemType) { + // Please keep alpha-sorted. + case E_ITEM_BAKED_POTATO: return FoodInfo(6, 7.2); case E_ITEM_BREAD: return FoodInfo(5, 6); + case E_ITEM_CARROT: return FoodInfo(4, 4.8); + case E_ITEM_COOKED_CHICKEN: return FoodInfo(6, 7.2); + case E_ITEM_COOKED_FISH: return FoodInfo(5, 6); + case E_ITEM_COOKED_PORKCHOP: return FoodInfo(8, 12.8); case E_ITEM_COOKIE: return FoodInfo(2, 0.4); + case E_ITEM_GOLDEN_APPLE: return FoodInfo(4, 9.6); + case E_ITEM_GOLDEN_CARROT: return FoodInfo(6, 14.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_POISONOUS_POTATO: return FoodInfo(2, 1.2, 60); + case E_ITEM_POTATO: return FoodInfo(1, 0.6); + case E_ITEM_PUMPKIN_PIE: return FoodInfo(8, 4.8); 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_CHICKEN: return FoodInfo(2, 1.2, 30); case E_ITEM_RAW_FISH: return FoodInfo(2, 1.2); - case E_ITEM_COOKED_FISH: return FoodInfo(5, 6); + case E_ITEM_RAW_PORKCHOP: return FoodInfo(3, 1.8); 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); + case E_ITEM_STEAK: return FoodInfo(8, 12.8); } LOGWARNING("%s: Unknown food item (%d), returning zero nutrition", __FUNCTION__, m_ItemType); return FoodInfo(0, 0.f); -- cgit v1.2.3