1 files changed, 55 insertions, 10 deletions

diff --git a/src/Items/ItemFood.h b/src/Items/ItemFood.h
index ff1d7991b..e7c718c77 100644
--- a/src/Items/ItemFood.h
+++ b/src/Items/ItemFood.h
@@ -1,3 +1,4 @@
+
 #pragma once
 
 #include "ItemHandler.h"
@@ -29,33 +30,77 @@ public:
 		switch (m_ItemType)
 		{
 			// Please keep alpha-sorted.
-			case E_ITEM_BAKED_POTATO:     return FoodInfo(6, 7.2);
+			case E_ITEM_BAKED_POTATO:     return FoodInfo(5, 7.2);
 			case E_ITEM_BREAD:            return FoodInfo(5, 6);
 			// Carrots handled in ItemSeeds
 			case E_ITEM_COOKED_CHICKEN:   return FoodInfo(6, 7.2);
-			case E_ITEM_COOKED_FISH:      return FoodInfo(5, 6);
+			case E_ITEM_COOKED_FISH:      return FoodInfo(5, 6);  // TODO: Add other fish types
+			case E_ITEM_COOKED_MUTTON:    return FoodInfo(6, 9.6);
 			case E_ITEM_COOKED_PORKCHOP:  return FoodInfo(8, 12.8);
+			case E_ITEM_COOKED_RABBIT:    return FoodInfo(5, 6);
 			case E_ITEM_COOKIE:           return FoodInfo(2, 0.4);
-			case E_ITEM_GOLDEN_APPLE:     return FoodInfo(4, 9.6);
+			// Golden apple handled in ItemGoldenApple
 			case E_ITEM_GOLDEN_CARROT:    return FoodInfo(6, 14.4);
 			case E_ITEM_MELON_SLICE:      return FoodInfo(2, 1.2);
-			case E_ITEM_MUSHROOM_SOUP:    return FoodInfo(6, 7.2);
-			case E_ITEM_POISONOUS_POTATO: return FoodInfo(2, 1.2, 60);
+			case E_ITEM_POISONOUS_POTATO: return FoodInfo(2, 1.2);
 			// Potatoes handled in ItemSeeds
 			case E_ITEM_PUMPKIN_PIE:      return FoodInfo(8, 4.8);
+			case E_ITEM_RABBIT_STEW:      return FoodInfo(10, 12);
+			case E_ITEM_RED_APPLE:        return FoodInfo(4, 2.4);
 			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_CHICKEN:      return FoodInfo(2, 1.2);
 			case E_ITEM_RAW_FISH:         return FoodInfo(2, 1.2);
+			case E_ITEM_RAW_MUTTON:       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_RAW_RABBIT:       return FoodInfo(3, 1.8);
+			case E_ITEM_ROTTEN_FLESH:     return FoodInfo(4, 0.8);
+			case E_ITEM_SPIDER_EYE:       return FoodInfo(2, 3.2);
 			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);
 	}
-	
+
+	virtual bool GetEatEffect(cEntityEffect::eType & a_EffectType, int & a_EffectDurationTicks, short & a_EffectIntensity, float & a_Chance) override
+	{
+		switch (m_ItemType)
+		{
+			case E_ITEM_RAW_CHICKEN:
+			{
+				a_EffectType = cEntityEffect::effHunger;
+				a_EffectDurationTicks = 600;
+				a_EffectIntensity = 0;
+				a_Chance = 0.3f;
+				return true;
+			}
+			case E_ITEM_ROTTEN_FLESH:
+			{
+				a_EffectType = cEntityEffect::effHunger;
+				a_EffectDurationTicks = 600;
+				a_EffectIntensity = 0;
+				a_Chance = 0.8f;
+				return true;
+			}
+			case E_ITEM_SPIDER_EYE:
+			{
+				a_EffectType = cEntityEffect::effPoison;
+				a_EffectDurationTicks = 100;
+				a_EffectIntensity = 0;
+				a_Chance = 1.0f;
+				return true;
+			}
+			case E_ITEM_POISONOUS_POTATO:
+			{
+				a_EffectType = cEntityEffect::effPoison;
+				a_EffectDurationTicks = 100;
+				a_EffectIntensity = 0;
+				a_Chance = 0.6f;
+				return true;
+			}
+		}
+		return false;
+	}
+
 };