From: Vanessa Ezekowitz Date: Wed, 17 Apr 2013 23:30:17 +0000 (-0400) Subject: Update 2013-04-17: Got rid of horizontal jungle tree trunk, aliased it X-Git-Url: http://81.2.79.47:8989/gitweb/?a=commitdiff_plain;h=c1a5cf776b5b3e43512842b2cd65a1d1c9410c27;p=zefram%2Fminetest%2Fmoretrees.git Update 2013-04-17: Got rid of horizontal jungle tree trunk, aliased it to the one in the moreblocks mod. Got rid of jungle tree planks recipe, default already has it. But that's not the important part... Acorns, fir/spruce/pine cones, and coconuts are now edible! Fir/spruce/pine cones can be cooked to extract fir/spruce/pine nuts. One cone yields 4 portions of nuts, each of which heals 1/2 heart. Coconuts can be broken apart to get milk and raw coconut solids (e.g. the "meat"). Craft one coconut, one drinking glass, and one cutting tool (*see below). Yields one portion of coconut solids, one glass full of coconut milk, and the tool is returned. The coconut milk heals 1 heart and returns the empty glass, while one portion of coconut solids heals two hearts. Coconut milk can be crafted with four acorns to produce acorn muffin batter. One portion of this batter can be cooked into four acorn muffins. Each muffin restores two hearts. Enjoy :-) ----- * Since Minetest doesn't have any default cutting tools that would normally be suitable for this purpose, the following tools may be used instead to cut the coconuts open: Default bronze, diamond, Mese, or steel axe, ...or... glooptest Alatro or Arol axe, ...or... moreores Mithril or silver axe, ...or... titanium axe. (note that stone and wooden axes are deliberately not usable) --- diff --git a/crafts.lua b/crafts.lua index cb4e755..4fb7a45 100644 --- a/crafts.lua +++ b/crafts.lua @@ -46,20 +46,104 @@ minetest.register_craft({ burntime = 1, }) --- extra crafting in case user has old jungle trees. +-- Food recipes! + +minetest.register_craftitem("moretrees:coconut_milk", { + description = "Coconut Milk", + inventory_image = "moretrees_coconut_milk_inv.png", + wield_image = "moretrees_coconut_milk.png", + on_use = minetest.item_eat(2), +}) + +minetest.register_craftitem("moretrees:raw_coconut", { + description = "Raw Coconut", + inventory_image = "moretrees_raw_coconut.png", + on_use = minetest.item_eat(4), +}) + +minetest.register_craftitem("moretrees:acorn_muffin_batter", { + description = "Acorn Muffin batter", + inventory_image = "moretrees_acorn_muffin_batter.png", +}) + +minetest.register_craftitem("moretrees:acorn_muffin", { + description = "Acorn Muffin", + inventory_image = "moretrees_acorn_muffin.png", + on_use = minetest.item_eat(4), +}) + +minetest.register_craftitem("moretrees:spruce_nuts", { + description = "Roasted Spruce Cone Nuts", + inventory_image = "moretrees_spruce_nuts.png", + on_use = minetest.item_eat(1), +}) + +minetest.register_craftitem("moretrees:pine_nuts", { + description = "Roasted Pine Cone Nuts", + inventory_image = "moretrees_pine_nuts.png", + on_use = minetest.item_eat(1), +}) + +minetest.register_craftitem("moretrees:fir_nuts", { + description = "Roasted Fir Cone Nuts", + inventory_image = "moretrees_fir_nuts.png", + on_use = minetest.item_eat(1), +}) + +for i in ipairs(moretrees.cutting_tools) do + local tool = moretrees.cutting_tools[i] + minetest.register_craft({ + type = "shapeless", + output = "moretrees:coconut_milk", + recipe = { + "moretrees:coconut", + "vessels:drinking_glass", + tool + }, + replacements = { + { "moretrees:coconut", "moretrees:raw_coconut" }, + { tool, tool } + } + }) +end minetest.register_craft({ - output = "moretrees:jungletree_trunk_sideways 2", + type = "shapeless", + output = "moretrees:acorn_muffin_batter", recipe = { - {"default:jungletree", "default:jungletree"}, + "moretrees:acorn", + "moretrees:acorn", + "moretrees:acorn", + "moretrees:acorn", + "moretrees:coconut_milk", + }, + replacements = { + { "moretrees:coconut_milk", "vessels:drinking_glass" } } }) minetest.register_craft({ - output = "moretrees:jungletree_planks 4", - recipe = { - {"default:jungletree"} - } + type = "cooking", + output = "moretrees:acorn_muffin 4", + recipe = "moretrees:acorn_muffin_batter", +}) + +minetest.register_craft({ + type = "cooking", + output = "moretrees:spruce_nuts 4", + recipe = "moretrees:spruce_cone", +}) + +minetest.register_craft({ + type = "cooking", + output = "moretrees:pine_nuts 4", + recipe = "moretrees:pine_cone", +}) + +minetest.register_craft({ + type = "cooking", + output = "moretrees:fir_nuts 4", + recipe = "moretrees:fir_cone", }) diff --git a/init.lua b/init.lua index 90768ab..3f31a3b 100644 --- a/init.lua +++ b/init.lua @@ -42,6 +42,18 @@ else dofile(worldpath.."/moretrees_settings.txt") end +moretrees.cutting_tools = { + "default:axe_bronze", + "default:axe_diamond", + "default:axe_mese", + "default:axe_steel", + "glooptest:axe_alatro", + "glooptest:axe_arol", + "moreores:axe_mithril", + "moreores:axe_silver", + "titanium:axe", +} + dofile(modpath.."/tree_models.lua") dofile(modpath.."/biome_defs.lua") dofile(modpath.."/node_defs.lua") diff --git a/node_defs.lua b/node_defs.lua index 8f3249f..011734c 100644 --- a/node_defs.lua +++ b/node_defs.lua @@ -144,24 +144,6 @@ for color = 1, 3 do }) end --- sideways jungle tree trunk: - -minetest.register_node("moretrees:jungletree_trunk_sideways", { - description = "Sideways Jungle Tree Trunk", - tiles = { - "default_jungletree.png^[transformR90", - "default_jungletree.png^[transformR90", - "default_jungletree_top.png", - "default_jungletree_top.png", - "default_jungletree.png^[transformR90", - "default_jungletree.png^[transformR90" - }, - is_ground_content = true, - groups = {tree=1,snappy=1,choppy=2,oddly_breakable_by_hand=1,flammable=2}, - sounds = default.node_sound_wood_defaults(), - paramtype2 = "facedir", -}) - -- Extra needles for firs minetest.register_node("moretrees:fir_leaves_bright", { @@ -206,7 +188,6 @@ table.insert(moretrees.avoidnodes, "moretrees:jungletree_trunk") table.insert(moretrees.avoidnodes, "moretrees:fir_trunk") table.insert(moretrees.avoidnodes, "default:tree") - -- "empty" (tapped) rubber tree nodes minetest.register_node("moretrees:rubber_tree_trunk_empty", { @@ -254,6 +235,8 @@ minetest.register_alias("moretrees:jungletree_planks", "default:junglewood") minetest.register_alias("moretrees:jungletree_sapling", "default:junglesapling") minetest.register_alias("jungletree:sapling", "default:junglesapling") +minetest.register_alias("moretrees:jungletree_trunk_sideways", "moreblocks:horizontal_jungle_tree") + minetest.register_alias("jungletree:leaves_green", "moretrees:jungletree_leaves_green") minetest.register_alias("jungletree:leaves_red", "moretrees:jungletree_leaves_red") minetest.register_alias("jungletree:leaves_yellow", "moretrees:jungletree_leaves_yellow") diff --git a/textures/moretrees_acorn_muffin.png b/textures/moretrees_acorn_muffin.png new file mode 100644 index 0000000..b308c8d Binary files /dev/null and b/textures/moretrees_acorn_muffin.png differ diff --git a/textures/moretrees_acorn_muffin_batter.png b/textures/moretrees_acorn_muffin_batter.png new file mode 100644 index 0000000..dba4a97 Binary files /dev/null and b/textures/moretrees_acorn_muffin_batter.png differ diff --git a/textures/moretrees_coconut_milk.png b/textures/moretrees_coconut_milk.png new file mode 100644 index 0000000..a0dd6ff Binary files /dev/null and b/textures/moretrees_coconut_milk.png differ diff --git a/textures/moretrees_coconut_milk_inv.png b/textures/moretrees_coconut_milk_inv.png new file mode 100644 index 0000000..d200365 Binary files /dev/null and b/textures/moretrees_coconut_milk_inv.png differ diff --git a/textures/moretrees_fir_nuts.png b/textures/moretrees_fir_nuts.png new file mode 100644 index 0000000..52480cc Binary files /dev/null and b/textures/moretrees_fir_nuts.png differ diff --git a/textures/moretrees_pine_nuts.png b/textures/moretrees_pine_nuts.png new file mode 100644 index 0000000..190fc11 Binary files /dev/null and b/textures/moretrees_pine_nuts.png differ diff --git a/textures/moretrees_raw_coconut.png b/textures/moretrees_raw_coconut.png new file mode 100644 index 0000000..a6ef83b Binary files /dev/null and b/textures/moretrees_raw_coconut.png differ diff --git a/textures/moretrees_spruce_nuts.png b/textures/moretrees_spruce_nuts.png new file mode 100644 index 0000000..2e639f5 Binary files /dev/null and b/textures/moretrees_spruce_nuts.png differ