From ec73a8508fc8458e10be6a93bbc3be2eba26595f Mon Sep 17 00:00:00 2001 From: Vanessa Ezekowitz <vanessaezekowitz@gmail.com> Date: Mon, 19 Jan 2015 19:37:46 +0100 Subject: [PATCH] add custom collision and selection box handling to CNC machine also clean up formatting of surrounding code --- technic/tools/chainsaw.lua | 26 +++++++++++++++++++++++++- 1 files changed, 25 insertions(+), 1 deletions(-) diff --git a/technic/tools/chainsaw.lua b/technic/tools/chainsaw.lua index fcebde0..9de0c7a 100644 --- a/technic/tools/chainsaw.lua +++ b/technic/tools/chainsaw.lua @@ -14,11 +14,13 @@ ["default:cactus"] = true, ["default:tree"] = true, ["default:apple"] = true, + ["default:pine"] = true, } if chainsaw_leaves then timber_nodenames["default:leaves"] = true timber_nodenames["default:jungleleaves"] = true + timber_nodenames["default:pine_needles"] = true end -- technic_worldgen defines rubber trees if moretrees isn't installed @@ -33,6 +35,8 @@ -- Support moretrees if it is there if minetest.get_modpath("moretrees") then + timber_nodenames["moretrees:acacia_trunk"] = true + timber_nodenames["moretrees:acacia_trunk_sideways"] = true timber_nodenames["moretrees:apple_tree_trunk"] = true timber_nodenames["moretrees:apple_tree_trunk_sideways"] = true timber_nodenames["moretrees:beech_trunk"] = true @@ -59,6 +63,7 @@ timber_nodenames["moretrees:jungletree_trunk_sideways"] = true if chainsaw_leaves then + timber_nodenames["moretrees:acacia_leaves"] = true timber_nodenames["moretrees:apple_tree_leaves"] = true timber_nodenames["moretrees:oak_leaves"] = true timber_nodenames["moretrees:fir_leaves"] = true @@ -127,7 +132,10 @@ -- Support farming_plus if minetest.get_modpath("farming_plus") then if chainsaw_leaves then - timber_nodenames["farming_plus:cocoa_leaves"] = true + timber_nodenames["farming_plus:banana_leaves"] = true + timber_nodenames["farming_plus:banana"] = true + timber_nodenames["farming_plus:cocoa_leaves"] = true + timber_nodenames["farming_plus:cocoa"] = true end end @@ -138,6 +146,22 @@ end end +-- Support snow +if minetest.get_modpath("snow") then + if chainsaw_leaves then + timber_nodenames["snow:needles"] = true + timber_nodenames["snow:needles_decorated"] = true + timber_nodenames["snow:star"] = true + end +end + +-- Support vines (also generated by moretrees if available) +if minetest.get_modpath("vines") then + if chainsaw_leaves then + timber_nodenames["vines:vines"] = true + end +end + local S = technic.getter technic.register_power_tool("technic:chainsaw", chainsaw_max_charge) -- Gitblit v1.8.0