aboutsummaryrefslogtreecommitdiff
path: root/src/content_craft.cpp
diff options
context:
space:
mode:
authorPerttu Ahola <celeron55@gmail.com>2011-09-16 19:09:13 +0300
committerPerttu Ahola <celeron55@gmail.com>2011-09-16 19:09:13 +0300
commitb22cb69a155d586791341d4df90060b8220361e1 (patch)
tree9ba2ec3a1f675271f05509bfe1384514a83c1772 /src/content_craft.cpp
parent40707e3c5bc730ebc5780b1c545c5daeb3353a42 (diff)
parent88dc8c694ed0e182b4d5ace4fcd94a0a82946c31 (diff)
downloadminetest-b22cb69a155d586791341d4df90060b8220361e1.tar.gz
minetest-b22cb69a155d586791341d4df90060b8220361e1.tar.bz2
minetest-b22cb69a155d586791341d4df90060b8220361e1.zip
Merge remote-tracking branch 'sfan5/apple-trees'
Diffstat (limited to 'src/content_craft.cpp')
-rw-r--r--src/content_craft.cpp14
1 files changed, 14 insertions, 0 deletions
diff --git a/src/content_craft.cpp b/src/content_craft.cpp
index 20ab5f069..8e8b17a9b 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;
}