flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity

Merge pull request #35 from mc-server/foodstuffs

Browse Source 
Add the new food items.
This commit is contained in:
bearbin 2013-08-01 23:56:10 -07:00
commit 86ca755bc2
1 changed files with 22 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
source/Items/ItemFood.h
View File

@ -1,4 +1,3 @@
#pragma once #pragma once
#include "ItemHandler.h" #include "ItemHandler.h"
@ -29,21 +28,28 @@ public:
{ {
switch(m_ItemType) switch(m_ItemType)
{ {
case E_ITEM_BREAD: return FoodInfo(5, 6); // Please keep alpha-sorted.
case E_ITEM_COOKIE: return FoodInfo(2, 0.4); case E_ITEM_BAKED_POTATO: return FoodInfo(6, 7.2);
case E_ITEM_MELON_SLICE: return FoodInfo(2, 1.2); case E_ITEM_BREAD: return FoodInfo(5, 6);
case E_ITEM_RAW_CHICKEN: return FoodInfo(2, 1.2, 30); case E_ITEM_CARROT: return FoodInfo(4, 4.8);
case E_ITEM_COOKED_CHICKEN: return FoodInfo(6, 7.2); case E_ITEM_COOKED_CHICKEN: return FoodInfo(6, 7.2);
case E_ITEM_RAW_BEEF: return FoodInfo(3, 1.8); case E_ITEM_COOKED_FISH: return FoodInfo(5, 6);
case E_ITEM_RAW_PORKCHOP: return FoodInfo(3, 1.8); case E_ITEM_COOKED_PORKCHOP: return FoodInfo(8, 12.8);
case E_ITEM_STEAK: return FoodInfo(8, 12.8); case E_ITEM_COOKIE: return FoodInfo(2, 0.4);
case E_ITEM_COOKED_PORKCHOP: return FoodInfo(8, 12.8); case E_ITEM_GOLDEN_APPLE: return FoodInfo(4, 9.6);
case E_ITEM_RAW_FISH: return FoodInfo(2, 1.2); case E_ITEM_GOLDEN_CARROT: return FoodInfo(6, 14.4);
case E_ITEM_COOKED_FISH: return FoodInfo(5, 6); case E_ITEM_MELON_SLICE: return FoodInfo(2, 1.2);
case E_ITEM_RED_APPLE: return FoodInfo(4, 2.4); case E_ITEM_POISONOUS_POTATO: return FoodInfo(2, 1.2, 60);
case E_ITEM_GOLDEN_APPLE: return FoodInfo(4, 9.6); case E_ITEM_POTATO: return FoodInfo(1, 0.6);
case E_ITEM_ROTTEN_FLESH: return FoodInfo(4, 0.8, 80); case E_ITEM_PUMPKIN_PIE: return FoodInfo(8, 4.8);
case E_ITEM_SPIDER_EYE: return FoodInfo(2, 3.2, 100); 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); LOGWARNING("%s: Unknown food item (%d), returning zero nutrition", __FUNCTION__, m_ItemType);
return FoodInfo(0, 0.f); return FoodInfo(0, 0.f);