diff options
| author | bearbin <bearbin@gmail.com> | 2013-08-02 08:56:10 +0200 |
|---|---|---|
| committer | bearbin <bearbin@gmail.com> | 2013-08-02 08:56:10 +0200 |
| commit | 86ca755bc20a6cb9dad2641434edca380687486a (patch) | |
| tree | 0743baa5d89009b99fb445ff52439efd128812cf | |
| parent | Pull in the latest core changes. (diff) | |
| parent | Alpha-sort the foodstuffs. (diff) | |
| download | cuberite-86ca755bc20a6cb9dad2641434edca380687486a.tar cuberite-86ca755bc20a6cb9dad2641434edca380687486a.tar.gz cuberite-86ca755bc20a6cb9dad2641434edca380687486a.tar.bz2 cuberite-86ca755bc20a6cb9dad2641434edca380687486a.tar.lz cuberite-86ca755bc20a6cb9dad2641434edca380687486a.tar.xz cuberite-86ca755bc20a6cb9dad2641434edca380687486a.tar.zst cuberite-86ca755bc20a6cb9dad2641434edca380687486a.zip | |
| -rw-r--r-- | source/Items/ItemFood.h | 38 |
1 files changed, 22 insertions, 16 deletions
diff --git a/source/Items/ItemFood.h b/source/Items/ItemFood.h index 8a6898103..6434f3dc7 100644 --- a/source/Items/ItemFood.h +++ b/source/Items/ItemFood.h @@ -1,4 +1,3 @@ - #pragma once #include "ItemHandler.h" @@ -29,21 +28,28 @@ 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); + // 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_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_CHICKEN: return FoodInfo(2, 1.2, 30); + case E_ITEM_RAW_FISH: return FoodInfo(2, 1.2); + case E_ITEM_RAW_PORKCHOP: return FoodInfo(3, 1.8); + case E_ITEM_RED_APPLE: return FoodInfo(4, 2.4); + 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_STEAK: return FoodInfo(8, 12.8); } LOGWARNING("%s: Unknown food item (%d), returning zero nutrition", __FUNCTION__, m_ItemType); return FoodInfo(0, 0.f); |