From 796961b01a5e41f4e5e044e67fbdc0c5a842c10d Mon Sep 17 00:00:00 2001 From: bas080 Date: Tue, 10 Feb 2015 07:15:16 +0100 Subject: [PATCH] Complete rewrite A big code update. Some features have changes slightly. The goal of this update is to improve performance on servers. This is achieved by removing ABMs and using on_timers instead. The amount of times that on_timer is used is also minimized. Other features include. - vine register function that allows the registering of side and bottom vines - Removing vines remove all vines beneath it. - New vine named Roots --- crafts.lua | 14 ++ functions.lua | 98 ++++++++++++ init.lua | 404 ++------------------------------------------------ nodes.lua | 83 +++++++++++ recipes.lua | 12 ++ shear.lua | 15 ++ spawning.lua | 47 ++++++ vines.lua | 23 +++ 8 files changed, 303 insertions(+), 393 deletions(-) create mode 100644 crafts.lua create mode 100644 functions.lua create mode 100644 nodes.lua create mode 100644 recipes.lua create mode 100644 shear.lua create mode 100644 spawning.lua create mode 100644 vines.lua diff --git a/crafts.lua b/crafts.lua new file mode 100644 index 0000000..19e658b --- /dev/null +++ b/crafts.lua @@ -0,0 +1,14 @@ +minetest.register_craft({ + output = 'vines:rope_block', + recipe = vines.recipes['rope_block'] +}) + +minetest.register_craft({ + output = 'vines:shears', + recipe = vines.recipes['shears'] +}) + +minetest.register_craftitem("vines:vines", { + description = "Vines", + inventory_image = "vines_item.png", +}) diff --git a/functions.lua b/functions.lua new file mode 100644 index 0000000..219effb --- /dev/null +++ b/functions.lua @@ -0,0 +1,98 @@ +vines.register_vine = function( name, defs ) + --different properties for bottom and side vines. + local drawtype = '' + local selection_box + if ( defs.is_side_vine ) then + selection_box = { + type = "wallmounted", + } + drawtype = 'signlike' + else + selection_box = { + type = "fixed", + fixed = { -0.4, -1/2, -0.4, 0.4, 1/2, 0.4 }, + } + drawtype = 'plantlike' + end + + minetest.register_node("vines:"..name, { + description = defs.description, + walkable = false, + climbable = true, + wield_image = "vines_"..name..".png", + drop = "", + sunlight_propagates = true, + paramtype = "light", + paramtype2 = "wallmounted", + buildable_to = true, + tile_images = { "vines_"..name..".png" }, + drawtype = drawtype, + inventory_image = "vines_"..name..".png", + groups = vines.groups, + sounds = default.node_sound_leaves_defaults(), + selection_box = selection_box, + on_construct = function( pos ) + local timer = minetest.get_node_timer( pos ) + timer:start( math.random(5, 10) ) + end, + on_timer = function( pos ) + local node = minetest.get_node( pos ) + local bottom = {x=pos.x, y=pos.y-1, z=pos.z} + local bottom_node = minetest.get_node( bottom ) + if bottom_node.name == "air" then + if not ( math.random( defs.average_length ) == 1 ) then + minetest.set_node( pos, { name = node.name..'_rotten', param2 = node.param2 } ) + minetest.set_node( bottom, { name = node.name, param2 = node.param2 } ) + local timer = minetest.get_node_timer( bottom_node ) + timer:start( math.random(5, 10) ) + end + end + end, + after_dig_node = function(pos, node, oldmetadata, user) + vines.dig_vine( pos, node, user ) + end + }) + + local name = name..'_rotten' + + minetest.register_node( "vines:"..name, { + description = "Rotten "..defs.description, + walkable = false, + climbable = true, + drop = "", + sunlight_propagates = true, + paramtype = "light", + paramtype2 = "wallmounted", + buildable_to = true, + tile_images = { "vines_"..name..".png" }, + wield_image = "vines_"..name..".png", + drawtype = drawtype, + inventory_image = "vines_"..name..".png", + groups = vines.groups, + sounds = default.node_sound_leaves_defaults(), + selection_box = selection_box, + on_destruct = function( pos ) + local node = minetest.get_node( pos ) + local bottom = {x=pos.x, y=pos.y-1, z=pos.z} + local bottom_node = minetest.get_node( bottom ) + if minetest.get_item_group( bottom_node.name, "vines") then + minetest.remove_node( bottom ) + end + end, + after_dig_node = function(pos, node, oldmetadata, user) + vines.dig_vine( pos, node, user ) + end + }) +end + +vines.dig_vine = function( pos, node, user ) + --only dig give the vine if shears are used + if not user then return false end + local wielded = user:get_wielded_item() + if 'vines:shears' == wielded:get_name() then + local inv = user:get_inventory() + if inv then + inv:add_item("main", ItemStack(node.name)) + end + end +end diff --git a/init.lua b/init.lua index a889037..3876fbb 100644 --- a/init.lua +++ b/init.lua @@ -1,397 +1,15 @@ -vines = {} - -local mod_name = "vines" -local average_height = 12 -local spawn_interval = 90 -local vines_group = {attached_node=1,vines=1,snappy=3,flammable=2,hanging_node=1,vines_cleanup=1} - -vines.growth_interval = 300 -vines.growth_chance = 2 -vines.rot_interval = 300 -vines.rot_chance = 8 - -local jungle_leaves_list = { - "default:jungleleaves", - "moretrees:jungle_leaves_red", - "moretrees:jungle_leaves_yellow", - "moretrees:jungle_leaves_green" +vines = { + name = 'vines', + groups = { vines=1, snappy=3, flammable=2 }, + recipes = {} } --- Nodes -minetest.register_node("vines:rope_block", { - description = "Rope", - sunlight_propagates = true, - paramtype = "light", - tile_images = { - "default_wood.png^vines_rope.png", - "default_wood.png^vines_rope.png", - "default_wood.png", - "default_wood.png", - "default_wood.png^vines_rope.png", - "default_wood.png^vines_rope.png", - }, - drawtype = "cube", - groups = {choppy=2,oddly_breakable_by_hand=1}, - after_place_node = function(pos) - local p = {x=pos.x, y=pos.y-1, z=pos.z} - local n = minetest.get_node(p) - if n.name == "air" then - minetest.add_node(p, {name="vines:rope_end"}) - end - end, - after_dig_node = function(pos, node, digger) - local p = {x=pos.x, y=pos.y-1, z=pos.z} - local n = minetest.get_node(p) - while n.name == 'vines:rope' do - minetest.remove_node(p) - p = {x=p.x, y=p.y-1, z=p.z} - n = minetest.get_node(p) - end - if n.name == 'vines:rope_end' then - minetest.remove_node(p) - end - end -}) - -minetest.register_node("vines:rope", { - description = "Rope", - walkable = false, - climbable = true, - sunlight_propagates = true, - paramtype = "light", - drop = "", - tile_images = { "vines_rope.png" }, - drawtype = "plantlike", - groups = {flammable=2, not_in_creative_inventory=1}, - sounds = default.node_sound_leaves_defaults(), - selection_box = { - type = "fixed", - fixed = {-1/7, -1/2, -1/7, 1/7, 1/2, 1/7}, - }, - on_destruct = function() - - end, -}) - -minetest.register_node("vines:rope_end", { - description = "Rope", - walkable = false, - climbable = true, - sunlight_propagates = true, - paramtype = "light", - drop = "", - tile_images = { "vines_rope_end.png" }, - drawtype = "plantlike", - groups = {flammable=2, not_in_creative_inventory=1}, - sounds = default.node_sound_leaves_defaults(), - after_place_node = function(pos) - yesh = {x = pos.x, y= pos.y-1, z=pos.z} - minetest.add_node(yesh, {name="vines:rope"}) - end, - selection_box = { - type = "fixed", - fixed = {-1/7, -1/2, -1/7, 1/7, 1/2, 1/7}, - }, -}) - -minetest.register_node("vines:side", { - description = "Vine", - walkable = false, - climbable = true, - drop = "", - sunlight_propagates = true, - paramtype = "light", - paramtype2 = "wallmounted", - buildable_to = true, - tile_images = { "vines_side.png" }, - drawtype = "signlike", - inventory_image = "vines_side.png", - groups = vines_group, - sounds = default.node_sound_leaves_defaults(), - selection_box = { - type = "wallmounted", - }, - after_dig_node = function(pos, oldnode, oldmetadata, user) - local wielded if user:get_wielded_item() ~= nil then wielded = user:get_wielded_item() else return end - if 'vines:shears' == wielded:get_name() then - local inv = user:get_inventory() - if inv then - inv:add_item("main", ItemStack(oldnode.name)) - end - end - end -}) - -minetest.register_node("vines:side_rotten", { - description = "Vine", - walkable = false, - climbable = false, - drop = "", - sunlight_propagates = true, - paramtype = "light", - paramtype2 = "wallmounted", - buildable_to = true, - tile_images = { "vines_side_rotten.png" }, - drawtype = "signlike", - inventory_image = "vines_side.png", - groups = {snappy = 3,flammable=2, hanging_node=1,vines_cleanup=1}, - sounds = default.node_sound_leaves_defaults(), - selection_box = { - type = "wallmounted", - }, -}) - -minetest.register_node("vines:willow", { - description = "Vine", - walkable = false, - climbable = true, - drop = "", - sunlight_propagates = true, - paramtype = "light", - paramtype2 = "wallmounted", - buildable_to = true, - tile_images = { "vines_willow.png" }, - drawtype = "signlike", - inventory_image = "vines_willow.png", - groups = vines_group, - sounds = default.node_sound_leaves_defaults(), - selection_box = { - type = "wallmounted", - }, - after_dig_node = function(pos, oldnode, oldmetadata, user) - local wielded if user:get_wielded_item() ~= nil then wielded = user:get_wielded_item() else return end - if 'vines:shears' == wielded:get_name() then - local inv = user:get_inventory() - if inv then - inv:add_item("main", ItemStack(oldnode.name)) - end - end - end -}) - -minetest.register_node("vines:willow_rotten", { - description = "Vine", - walkable = false, - climbable = false, - sunlight_propagates = true, - paramtype = "light", - drop = "", - paramtype2 = "wallmounted", - buildable_to = true, - tile_images = { "vines_willow_rotten.png" }, - drawtype = "signlike", - inventory_image = "vines_willow.png", - groups = {snappy = 3,flammable=2, hanging_node=1,vines_cleanup=1}, - sounds = default.node_sound_leaves_defaults(), - selection_box = { - type = "wallmounted", - }, -}) - -minetest.register_node("vines:root", { - description = "Vine", - walkable = false, - climbable = true, - sunlight_propagates = true, - paramtype = "light", - buildable_to = true, - tile_images = { "vines_root.png" }, - drawtype = "plantlike", - inventory_image = "vines_root.png", - groups = {vines=1,snappy = 3,flammable=2, hanging_node=1,vines_cleanup=1}, - sounds = default.node_sound_leaves_defaults(), - selection_box = { - type = "fixed", - fixed = {-1/7, -1/2, -1/7, 1/7, 1/2, 1/7}, - }, -}) - -minetest.register_node("vines:vine", { - description = "Vine", - walkable = false, - climbable = true, - sunlight_propagates = true, - drop = "", - paramtype = "light", - buildable_to = true, - tile_images = { "vines_vine.png" }, - drawtype = "plantlike", - inventory_image = "vines_vine.png", - groups = vines_group, - sounds = default.node_sound_leaves_defaults(), - selection_box = { - type = "fixed", - fixed = {-0.3, -1/2, -0.3, 0.3, 1/2, 0.3}, - }, - after_dig_node = function(pos, oldnode, oldmetadata, user) - local wielded if user:get_wielded_item() ~= nil then wielded = user:get_wielded_item() else return end - if 'vines:shears' == wielded:get_name() then - local inv = user:get_inventory() - if inv then - inv:add_item("main", ItemStack(oldnode.name)) - end - end - end -}) - -minetest.register_node("vines:vine_rotten", { - description = "Rotten vine", - walkable = false, - climbable = true, - drop = "", - sunlight_propagates = true, - paramtype = "light", - buildable_to = true, - tile_images = { "vines_vine_rotten.png" }, - drawtype = "plantlike", - inventory_image = "vines_vine_rotten.png", - groups = {snappy = 3,flammable=2, hanging_node=1,vines_cleanup=1}, - sounds = default.node_sound_leaves_defaults(), - selection_box = { - type = "fixed", - fixed = {-0.3, -1/2, -0.3, 0.3, 1/2, 0.3}, - }, -}) - --- vine rotting - -minetest.register_abm({ - nodenames = {"vines:vine", "vines:side", "vines:willow"}, - interval = vines.rot_interval, - chance = vines.rot_chance, - action = function(pos, node, active_object_count, active_object_count_wider) - if minetest.find_node_near(pos, 5, "group:tree") == nil then - local walldir = node.param2 - minetest.add_node(pos, {name=node.name.."_rotten", param2 = walldir}) - end - end -}) - --- vine growth - -minetest.register_abm({ - nodenames = {"vines:vine", "vines:side", "vines:willow"}, - interval = vines.growth_interval, - chance = vines.growth_chance, - action = function(pos, node, active_object_count, active_object_count_wider) - local p = {x=pos.x, y=pos.y-1, z=pos.z} - local n = minetest.get_node(p) - if n.name == "air" then - local walldir = node.param2 - minetest.add_node(p, {name=node.name, param2 = walldir}) - end - end -}) - --- cleanup if the initial tree is missing entirely (e.g. has been dug away) - -minetest.register_abm({ - nodenames = {"group:vines_cleanup"}, - interval = 10, - chance = 5, - action = function(pos, node, active_object_count, active_object_count_wider) - if not minetest.find_node_near(pos, 1, jungle_leaves_list) then - local p_top = {x=pos.x, y=pos.y+1, z=pos.z} - if minetest.get_item_group(minetest.get_node(p_top).name, "vines_cleanup") == 0 then - minetest.remove_node(pos) - end - end - end -}) - --- rope extension - -minetest.register_abm({ - nodenames = {"vines:rope_end"}, - interval = 1, - chance = 1, - drop = "", - action = function(pos, node, active_object_count, active_object_count_wider) - local p = {x=pos.x, y=pos.y-1, z=pos.z} - local n = minetest.get_node(p) - --remove if top node is removed - if n.name == "air" then - minetest.set_node(pos, {name="vines:rope"}) - minetest.add_node(p, {name="vines:rope_end"}) - end - end -}) ---Craft -minetest.register_craft({ - output = 'vines:rope_block', - recipe = { - {'', 'default:wood', ''}, - {'', 'vines:side', ''}, - {'', 'vines:side', ''}, - } -}) - -minetest.register_craftitem("vines:vines", { - description = "Vines", - inventory_image = "vines_item.png", -}) ---spawning -plantslib:spawn_on_surfaces({ - avoid_nodes = {"vines:vine"}, - avoid_radius = 5, - spawn_delay = spawn_interval, - spawn_plants = {"vines:vine"}, - spawn_chance = 10, - spawn_surfaces = {"default:dirt_with_grass","default:dirt"}, - spawn_on_bottom = true, - plantlife_limit = -0.9, -}) - -plantslib:spawn_on_surfaces({ - avoid_nodes = {"vines:vine", "vines:side"}, - avoid_radius = 3, - spawn_delay = spawn_interval, - spawn_plants = {"vines:side"}, - spawn_chance = 10, - spawn_surfaces = jungle_leaves_list, - spawn_on_side = true, - near_nodes = {"default:jungletree"}, - near_nodes_size = 5, - plantlife_limit = -0.9, -}) - -plantslib:spawn_on_surfaces({ - spawn_plants = {"vines:willow"}, - spawn_delay = spawn_interval, - spawn_chance = 3, - spawn_surfaces = {"moretrees:willow_leaves"}, - spawn_on_side = true, - near_nodes = {"default:water_source"}, - near_nodes_size = 2, - near_nodes_vertical = 5, - near_nodes_count = 1, - plantlife_limit = -0.9, -}) - ---Shears jojoa1997's shears -minetest.register_tool("vines:shears", { - description = "Shears", - inventory_image = "shears.png", - wield_image = "shears.png", - stack_max = 1, - max_drop_level=3, - tool_capabilities = { - full_punch_interval = 1.0, - max_drop_level=0, - groupcaps={ - snappy={times={[3]=0.2}, maxwear=0.05, maxlevel=3}, - wool={times={[3]=0.2}, maxwear=0.05, maxlevel=3} - } - }, -}) - -minetest.register_craft({ - output = 'vines:shears', - recipe = { - {'', 'default:steel_ingot', ''}, - {'default:stick', 'default:wood', 'default:steel_ingot'}, - {'', '', 'default:stick'}, - } -}) +dofile( minetest.get_modpath( vines.name ) .. "/functions.lua" ) +dofile( minetest.get_modpath( vines.name ) .. "/recipes.lua" ) +dofile( minetest.get_modpath( vines.name ) .. "/crafts.lua" ) +dofile( minetest.get_modpath( vines.name ) .. "/nodes.lua" ) +dofile( minetest.get_modpath( vines.name ) .. "/shear.lua" ) +dofile( minetest.get_modpath( vines.name ) .. "/vines.lua" ) +dofile( minetest.get_modpath( vines.name ) .. "/spawning.lua" ) print("[Vines] Loaded!") diff --git a/nodes.lua b/nodes.lua new file mode 100644 index 0000000..ab14b28 --- /dev/null +++ b/nodes.lua @@ -0,0 +1,83 @@ +minetest.register_node("vines:rope_block", { + description = "Rope", + sunlight_propagates = true, + paramtype = "light", + tile_images = { + "default_wood.png^vines_rope.png", + "default_wood.png^vines_rope.png", + "default_wood.png", + "default_wood.png", + "default_wood.png^vines_rope.png", + "default_wood.png^vines_rope.png", + }, + groups = { flammable=2, choppy=2, oddly_breakable_by_hand=1 }, + after_place_node = function(pos) + local p = {x=pos.x, y=pos.y-1, z=pos.z} + local n = minetest.get_node(p) + if n.name == "air" then + minetest.add_node(p, {name="vines:rope_end"}) + end + end, + after_dig_node = function(pos, node, digger) + local p = {x=pos.x, y=pos.y-1, z=pos.z} + local n = minetest.get_node(p) + while ( n.name == 'vines:rope' or n.name == 'vines:rope_end' ) do + minetest.remove_node(p) + p = {x=p.x, y=p.y-1, z=p.z} + n = minetest.get_node(p) + end + end +}) + +minetest.register_node("vines:rope", { + description = "Rope", + walkable = false, + climbable = true, + sunlight_propagates = true, + paramtype = "light", + drop = "", + tile_images = { "vines_rope.png" }, + drawtype = "plantlike", + groups = {flammable=2, not_in_creative_inventory=1}, + sounds = default.node_sound_leaves_defaults(), + selection_box = { + type = "fixed", + fixed = {-1/7, -1/2, -1/7, 1/7, 1/2, 1/7}, + }, +}) + +minetest.register_node("vines:rope_end", { + description = "Rope", + walkable = false, + climbable = true, + sunlight_propagates = true, + paramtype = "light", + drop = "", + tile_images = { "vines_rope_end.png" }, + drawtype = "plantlike", + groups = {flammable=2, not_in_creative_inventory=1}, + sounds = default.node_sound_leaves_defaults(), + after_place_node = function(pos) + yesh = {x = pos.x, y= pos.y-1, z=pos.z} + minetest.add_node(yesh, {name="vines:rope"}) + end, + selection_box = { + type = "fixed", + fixed = {-1/7, -1/2, -1/7, 1/7, 1/2, 1/7}, + }, + on_construct = function( pos ) + local timer = minetest.get_node_timer( pos ) + timer:start( 1 ) + end, + on_timer = function( pos, elapsed ) + local p = {x=pos.x, y=pos.y-1, z=pos.z} + local n = minetest.get_node(p) + if n.name == "air" then + minetest.set_node(pos, {name="vines:rope"}) + minetest.add_node(p, {name="vines:rope_end"}) + else + local timer = minetest.get_node_timer( pos ) + timer:start( 1 ) + end + end +}) diff --git a/recipes.lua b/recipes.lua new file mode 100644 index 0000000..a7d3b45 --- /dev/null +++ b/recipes.lua @@ -0,0 +1,12 @@ +vines.recipes['rope_block'] = { + {'', 'default:wood', ''}, + {'', 'vines:side', ''}, + {'', 'vines:side', ''} +} + +vines.recipes['shears'] = { + {'', 'default:steel_ingot', ''}, + {'default:stick', 'default:wood', 'default:steel_ingot'}, + {'', '', 'default:stick'} +} + diff --git a/shear.lua b/shear.lua new file mode 100644 index 0000000..5a0ddc4 --- /dev/null +++ b/shear.lua @@ -0,0 +1,15 @@ +minetest.register_tool("vines:shears", { + description = "Shears", + inventory_image = "shears.png", + wield_image = "shears.png", + stack_max = 1, + max_drop_level=3, + tool_capabilities = { + full_punch_interval = 1.0, + max_drop_level=0, + groupcaps={ + snappy={times={[3]=0.2}, maxwear=0.05, maxlevel=3}, + wool={times={[3]=0.2}, maxwear=0.05, maxlevel=3} + } + }, +}) diff --git a/spawning.lua b/spawning.lua new file mode 100644 index 0000000..51b52c7 --- /dev/null +++ b/spawning.lua @@ -0,0 +1,47 @@ +plantslib:spawn_on_surfaces({ + avoid_nodes = {"vines:vine"}, + avoid_radius = 5, + spawn_delay = 500, + spawn_plants = {"vines:vine"}, + spawn_chance = 10, + spawn_surfaces = {"default:dirt_with_grass","default:dirt"}, + spawn_on_bottom = true, + plantlife_limit = -0.9, +}) + +plantslib:spawn_on_surfaces({ + avoid_nodes = {"vines:root"}, + avoid_radius = 5, + spawn_delay = 500, + spawn_plants = {"vines:vine"}, + spawn_chance = 10, + spawn_surfaces = {"default:dirt_with_grass","default:dirt"}, + spawn_on_bottom = true, + plantlife_limit = -0.9, +}) + +plantslib:spawn_on_surfaces({ + avoid_nodes = {"vines:vine", "vines:side"}, + avoid_radius = 3, + spawn_delay = 300, + spawn_plants = {"vines:side"}, + spawn_chance = 10, + spawn_surfaces = {}, --TODO + spawn_on_side = true, + near_nodes = {"default:jungletree"}, + near_nodes_size = 5, + plantlife_limit = -0.9, +}) + +plantslib:spawn_on_surfaces({ + spawn_plants = {"vines:willow"}, + spawn_delay = 200, + spawn_chance = 3, + spawn_surfaces = {"moretrees:willow_leaves"}, + spawn_on_side = true, + near_nodes = {"default:water_source"}, + near_nodes_size = 2, + near_nodes_vertical = 5, + near_nodes_count = 1, + plantlife_limit = -0.9, +}) diff --git a/vines.lua b/vines.lua new file mode 100644 index 0000000..a223ccd --- /dev/null +++ b/vines.lua @@ -0,0 +1,23 @@ +vines.register_vine( 'vine', { + description = "Vines", + is_side_vine = false, + average_length = 9 +}) + +vines.register_vine( 'root', { + description = "Roots", + is_side_vine = false, + average_length = 5 +}) + +vines.register_vine( 'side', { + description = "Vines", + is_side_vine = true, + average_length = 7 +}) + +vines.register_vine( 'willow', { + description = "Willow Vines", + is_side_vine = true, + average_length = 9 +})