From: sfan5 <sfan5@live.de>
Date: Mon, 12 Sep 2011 18:10:17 +0000 (+0200)
Subject: Added Iron Apple which heals 4 Hearts
X-Git-Url: http://81.2.79.47:8989/gitweb/?a=commitdiff_plain;h=88dc8c694ed0e182b4d5ace4fcd94a0a82946c31;p=zefram%2Fminetest%2Fminetest_engine.git

Added Iron Apple which heals 4 Hearts
---

diff --git a/data/apple_iron.png b/data/apple_iron.png
new file mode 100644
index 00000000..2dffdf01
Binary files /dev/null and b/data/apple_iron.png differ
diff --git a/src/content_craft.cpp b/src/content_craft.cpp
index 20ab5f06..8e8b17a9 100644
--- a/src/content_craft.cpp
+++ b/src/content_craft.cpp
@@ -428,6 +428,20 @@ InventoryItem *craft_get_result(InventoryItem **items)
 			return new MaterialItem(CONTENT_LADDER, 1);
 		}
 	}
+	
+	// Iron Apple
+	{
+		ItemSpec specs[9];
+		specs[1] = ItemSpec(ITEM_CRAFT, "steel_ingot");
+		specs[3] = ItemSpec(ITEM_CRAFT, "steel_ingot");
+		specs[4] = ItemSpec(ITEM_CRAFT, "apple");
+		specs[5] = ItemSpec(ITEM_CRAFT, "steel_ingot");
+		specs[7] = ItemSpec(ITEM_CRAFT, "steel_ingot");
+		if(checkItemCombination(items, specs))
+		{
+			return new CraftItem("apple_iron", 1);
+		}
+	}
 
 	return NULL;
 }
diff --git a/src/content_inventory.cpp b/src/content_inventory.cpp
index e0c9d8b8..59997ee4 100644
--- a/src/content_inventory.cpp
+++ b/src/content_inventory.cpp
@@ -73,6 +73,8 @@ std::string item_craft_get_image_name(const std::string &subname)
 		return "firefly.png";
 	else if(subname == "apple")
 		return "apple.png";
+		else if(subname == "apple_iron")
+		return "apple_iron.png";
 	else
 		return "cloud.png"; // just something
 }
@@ -130,6 +132,8 @@ bool item_craft_is_eatable(const std::string &subname)
 		return true;
 	else if(subname == "apple")
 		return true;
+	else if(subname == "apple_iron")
+		return true;
 	return false;
 }
 
@@ -139,6 +143,8 @@ s16 item_craft_eat_hp_change(const std::string &subname)
 		return 6; // 3 hearts
 	else if(subname == "apple")
 		return 4; // 2 hearts
+	else if(subname == "apple_iron")
+		return 8; // 4 hearts
 	return 0;
 }