diff --git a/.luacheckrc b/.luacheckrc index a0dd5e7..b21a65e 100644 --- a/.luacheckrc +++ b/.luacheckrc @@ -1,7 +1,6 @@ read_globals = { "minetest", "ItemStack", - "VoxelArea", "AreaStore", table = {fields = {"copy", "indexof"}}, "vector", @@ -11,6 +10,7 @@ read_globals = { } globals = { + "VoxelArea", "awards", "big_webs", "bones_loot", @@ -63,4 +63,4 @@ globals = { max_line_length = false unused_args = false -unused = false \ No newline at end of file +unused = true \ No newline at end of file diff --git a/bubblesponge/init.lua b/bubblesponge/init.lua index 4238770..fb94370 100644 --- a/bubblesponge/init.lua +++ b/bubblesponge/init.lua @@ -142,7 +142,6 @@ minetest.register_node("bubblesponge:stem", { local tries = 0 while tries < 3 do - local this_node = minetest.get_node(pos).name if minetest.get_node(pos).name == water_node then minetest.set_node(pos, {name = "bubblesponge:frond"}) return diff --git a/collectible_lore/items.lua b/collectible_lore/items.lua index 314060e..472b5e0 100644 --- a/collectible_lore/items.lua +++ b/collectible_lore/items.lua @@ -278,13 +278,13 @@ minetest.register_on_player_receive_fields(function(player, formname, fields) end end) -local function tour(player, loc_list) - local pop = table.remove(loc_list) - if pop then - player:set_pos(pop) - minetest.after(10, tour, player, loc_list) - end -end +--local function tour(player, loc_list) +-- local pop = table.remove(loc_list) +-- if pop then +-- player:set_pos(pop) +-- minetest.after(10, tour, player, loc_list) +-- end +--end minetest.register_chatcommand("cairn_locations", { params = "", -- Short parameter description diff --git a/df_ambience/init.lua b/df_ambience/init.lua index ef5665f..918bad1 100644 --- a/df_ambience/init.lua +++ b/df_ambience/init.lua @@ -74,7 +74,6 @@ local get_ambience = function(player, name) -- loop through sets in order and choose first that meets its conditions for _, set in ipairs(registered_sets) do if random() < set.frequency then - local check_passed local sound_check = set.sound_check local nodes = set.nodes if sound_check or nodes then diff --git a/df_caverns/level1.lua b/df_caverns/level1.lua index 9113b5d..4b6cb8a 100644 --- a/df_caverns/level1.lua +++ b/df_caverns/level1.lua @@ -105,7 +105,6 @@ local decorate_level_1 = function(minp, maxp, seed, vm, node_arrays, area, data) vm:get_param2_data(data_param2) local nvals_cracks = mapgen_helper.perlin2d("df_cavern:cracks", minp, maxp, df_caverns.np_cracks) local nvals_cave = node_arrays.nvals_cave - local cave_area = node_arrays.cave_area -- Partly fill flooded caverns and warrens if minp.y <= subsea_level then diff --git a/df_caverns/level2.lua b/df_caverns/level2.lua index 011258c..22bae50 100644 --- a/df_caverns/level2.lua +++ b/df_caverns/level2.lua @@ -148,7 +148,6 @@ local decorate_level_2 = function(minp, maxp, seed, vm, node_arrays, area, data) vm:get_param2_data(data_param2) local nvals_cracks = mapgen_helper.perlin2d("df_cavern:cracks", minp, maxp, df_caverns.np_cracks) local nvals_cave = node_arrays.nvals_cave - local cave_area = node_arrays.cave_area local cavern_def = node_arrays.cavern_def local vein_noise diff --git a/df_caverns/level3.lua b/df_caverns/level3.lua index 652c6a1..cf0c309 100644 --- a/df_caverns/level3.lua +++ b/df_caverns/level3.lua @@ -8,7 +8,6 @@ local c_ice = df_caverns.node_id.ice local c_hoar_moss = df_caverns.node_id.hoar_moss local c_gravel = df_caverns.node_id.gravel local c_oil = df_caverns.node_id.oil -local c_cobble_fungus_fine = df_caverns.node_id.cobble_fungus_fine local c_cobble_fungus = df_caverns.node_id.cobble_fungus local c_cobble = df_caverns.node_id.cobble local c_wet_flowstone = df_caverns.node_id.wet_flowstone @@ -219,7 +218,6 @@ local decorate_level_3 = function(minp, maxp, seed, vm, node_arrays, area, data) vm:get_param2_data(data_param2) local nvals_cracks = mapgen_helper.perlin2d("df_cavern:cracks", minp, maxp, df_caverns.np_cracks) local nvals_cave = node_arrays.nvals_cave - local cave_area = node_arrays.cave_area local cavern_def = node_arrays.cavern_def -- Partly fill flooded caverns and warrens diff --git a/df_caverns/oil_sea.lua b/df_caverns/oil_sea.lua index b295789..562c356 100644 --- a/df_caverns/oil_sea.lua +++ b/df_caverns/oil_sea.lua @@ -5,7 +5,6 @@ end local c_oil = df_caverns.node_id.oil local c_gas = df_caverns.node_id.gas local c_gas_wisp = df_caverns.node_id.gas_wisp -local c_lava = df_caverns.node_id.lava local c_obsidian = df_caverns.node_id.obsidian local log_location diff --git a/df_caverns/primordial.lua b/df_caverns/primordial.lua index 6097354..d449ab3 100644 --- a/df_caverns/primordial.lua +++ b/df_caverns/primordial.lua @@ -154,7 +154,6 @@ end local c_jungle_dirt = df_caverns.node_id.jungle_dirt local c_plant_matter = df_caverns.node_id.plant_matter -local c_packed_roots = df_caverns.node_id.packed_roots local c_glowstone = df_caverns.node_id.glowstone local c_ivy = df_caverns.node_id.ivy local c_root_2 = df_caverns.node_id.root_2 @@ -275,7 +274,6 @@ local decorate_primordial = function(minp, maxp, seed, vm, node_arrays, area, da local data_param2 = df_caverns.data_param2 vm:get_param2_data(data_param2) local nvals_cracks = mapgen_helper.perlin2d("df_cavern:cracks", minp, maxp, df_caverns.np_cracks) - local cave_area = node_arrays.cave_area local nvals_cave = node_arrays.nvals_cave local humiditymap = minetest.get_mapgen_object("humiditymap") diff --git a/df_caverns/shared.lua b/df_caverns/shared.lua index 42fa440..814f774 100644 --- a/df_caverns/shared.lua +++ b/df_caverns/shared.lua @@ -5,8 +5,6 @@ local c_cobble = df_caverns.node_id.cobble local c_cobble_fungus = df_caverns.node_id.cobble_fungus local c_cobble_fungus_fine = df_caverns.node_id.cobble_fungus_fine local c_dead_fungus = df_caverns.node_id.dead_fungus -local c_dirt = df_caverns.node_id.dirt -local c_dirt_moss = df_caverns.node_id.dirt_moss local c_dry_flowstone = df_caverns.node_id.dry_flowstone local c_fireflies = df_caverns.node_id.fireflies local c_glowstone = df_caverns.node_id.glowstone diff --git a/df_caverns/sunless_sea.lua b/df_caverns/sunless_sea.lua index b5bd646..3af19c4 100644 --- a/df_caverns/sunless_sea.lua +++ b/df_caverns/sunless_sea.lua @@ -197,9 +197,6 @@ local decorate_sunless_sea = function(minp, maxp, seed, vm, node_arrays, area, d vm:get_param2_data(data_param2) local nvals_cracks = mapgen_helper.perlin2d("df_cavern:cracks", minp, maxp, df_caverns.np_cracks) - local minp_below = minp.y <= sea_level - local maxp_above = maxp.y > sea_level - local nvals_cave = mapgen_helper.perlin2d("df_caverns:sunless_sea", minp, maxp, perlin_cave_rivers) --cave noise for structure local nvals_wave = mapgen_helper.perlin2d("df_caverns:sunless_sea_wave", minp, maxp, perlin_wave_rivers) --cave noise for structure diff --git a/df_caverns/underworld.lua b/df_caverns/underworld.lua index 0c782c7..10e0e03 100644 --- a/df_caverns/underworld.lua +++ b/df_caverns/underworld.lua @@ -533,9 +533,7 @@ minetest.register_on_generated(function(minp, maxp, seed) local index2d = mapgen_helper.index2d(emin, emax, minp.x + 3, minp.z + 3) local abs_cave = math.abs(nvals_cave[index2d]) -- range is from 0 to approximately 2, with 0 being connected and 2s being islands local wave = nvals_wave[index2d] * wave_mult - local floor_height = math.floor(abs_cave * floor_mult + median + floor_displace + wave) - local underside_height = math.floor(y_min + math.abs(wave) / 5) if floor_height < maxp.y and floor_height > minp.y then for plat_vi in area:iter(minp.x, floor_height-6, minp.z, minp.x+6, floor_height, minp.z+6) do diff --git a/df_dependencies/init.lua b/df_dependencies/init.lua index b8cbc49..ba92d47 100644 --- a/df_dependencies/init.lua +++ b/df_dependencies/init.lua @@ -37,18 +37,18 @@ dofile(modpath.."/nodes.lua") dofile(modpath.."/misc.lua") dofile(modpath.."/mapgen.lua") -local list_mods_required = function() - local mods_required = "" - local mods_sorted = {} - for mod, _ in pairs(df_dependencies.mods_required) do - table.insert(mods_sorted, mod) - end - table.sort(mods_sorted) - for _, mod in ipairs(mods_sorted) do - mods_required = mods_required .. ", " .. mod - end - minetest.debug(mods_required) -end +--local list_mods_required = function() +-- local mods_required = "" +-- local mods_sorted = {} +-- for mod, _ in pairs(df_dependencies.mods_required) do +-- table.insert(mods_sorted, mod) +-- end +-- table.sort(mods_sorted) +-- for _, mod in ipairs(mods_sorted) do +-- mods_required = mods_required .. ", " .. mod +-- end +-- minetest.debug(mods_required) +--end --list_mods_required() -- This mod is meant to only exist at initialization time. Other mods should make copies of anything it points to for their own use. diff --git a/df_dependencies/mapgen.lua b/df_dependencies/mapgen.lua index 40c99b8..02c4549 100644 --- a/df_dependencies/mapgen.lua +++ b/df_dependencies/mapgen.lua @@ -1,5 +1,3 @@ -local S = minetest.get_translator(minetest.get_current_modname()) - local function deep_copy(table_in) local table_out = {} for index, value in pairs(table_in) do diff --git a/df_dependencies/misc.lua b/df_dependencies/misc.lua index d298eb2..4631d17 100644 --- a/df_dependencies/misc.lua +++ b/df_dependencies/misc.lua @@ -1,7 +1,6 @@ local S = minetest.get_translator(minetest.get_current_modname()) local select_required = df_dependencies.select_required -local select_optional = df_dependencies.select_optional df_dependencies.mods_required.farming = true diff --git a/df_dependencies/nodes.lua b/df_dependencies/nodes.lua index adc4297..a7b86ec 100644 --- a/df_dependencies/nodes.lua +++ b/df_dependencies/nodes.lua @@ -1,5 +1,3 @@ -local S = minetest.get_translator(minetest.get_current_modname()) - local required_nodes = {} local function select_required(def) local newdef = {} diff --git a/df_dependencies/sounds.lua b/df_dependencies/sounds.lua index 90ab2ad..c698e34 100644 --- a/df_dependencies/sounds.lua +++ b/df_dependencies/sounds.lua @@ -1,7 +1,4 @@ -local S = minetest.get_translator(minetest.get_current_modname()) - local select_required = df_dependencies.select_required -local select_optional = df_dependencies.select_optional df_dependencies.mods_required.mcl_sounds = true diff --git a/df_farming/cave_wheat.lua b/df_farming/cave_wheat.lua index 89972ae..6503074 100644 --- a/df_farming/cave_wheat.lua +++ b/df_farming/cave_wheat.lua @@ -168,7 +168,7 @@ minetest.register_node("df_farming:cave_straw", { description = S("Cave Straw"), tiles = {"dfcaverns_cave_straw.png"}, is_ground_content = false, - groups = {snappy=3, flammable=4, straw=1, handy=1,hoey=1, compostability=85, flammable=2, fire_encouragement=60, fire_flammability=20, building_block=1, fall_damage_add_percent=-80, enderman_takable=1}, + groups = {snappy=3, flammable=4, straw=1, handy=1,hoey=1, compostability=85, fire_encouragement=60, fire_flammability=20, building_block=1, fall_damage_add_percent=-80, enderman_takable=1}, sounds = df_dependencies.sound_leaves(), _mcl_blast_resistance = 0.5, _mcl_hardness = 0.5, diff --git a/df_farming/cooking.lua b/df_farming/cooking.lua index 7cc625f..d39ba01 100644 --- a/df_farming/cooking.lua +++ b/df_farming/cooking.lua @@ -76,7 +76,7 @@ for index1 = 1, table.getn(recipes)-1 do assert(not identical, "recipes " .. recipes[index1].name .. " and " .. recipes[index2].name .. " have identical ingredients!") end end -local ingredient_count = {} +--local ingredient_count = {} --for _, recipe_entry in pairs(recipes) do -- for _, item in pairs(recipe_entry.recipe) do -- ingredient_count[item] = (ingredient_count[item] or 0) + 1 diff --git a/df_farming/plants.lua b/df_farming/plants.lua index 5d55028..342089f 100644 --- a/df_farming/plants.lua +++ b/df_farming/plants.lua @@ -167,7 +167,7 @@ local place_seed = function(itemstack, placer, pointed_thing, plantname) end end - if not minetest.is_creative_enabled(placer:get_player_name()) then + if take_item and not minetest.is_creative_enabled(placer:get_player_name()) then itemstack:take_item() end return itemstack diff --git a/df_farming/plump_helmet.lua b/df_farming/plump_helmet.lua index 2d7ddeb..2b57fe2 100644 --- a/df_farming/plump_helmet.lua +++ b/df_farming/plump_helmet.lua @@ -78,7 +78,7 @@ local plump_helmet_on_place = function(itemstack, placer, pointed_thing, plantn end end - if not minetest.is_creative_enabled(placer:get_player_name()) then + if take_item and not minetest.is_creative_enabled(placer:get_player_name()) then itemstack:take_item() end return itemstack diff --git a/df_lorebooks/ecology_flora.lua b/df_lorebooks/ecology_flora.lua index 4ddfedd..cbd060e 100644 --- a/df_lorebooks/ecology_flora.lua +++ b/df_lorebooks/ecology_flora.lua @@ -78,14 +78,6 @@ Professor Amelia Rose]]), sort = base + 4, }) -local ss_text = "" -if minetest.get_modpath("cottages") then - ss_text = S("When milled, sweet pods produce a granular pink-tinted sugary substance.") -else - ss_text = S("When dried in an oven, sweet pods produce a granular pink-tinted sugary substance.") -end -ss_text = ss_text .. " " .. S("Crushing them in a bucket squeezes out a flavorful syrup.") - collectible_lore.register_lorebook({ id = "rose sweet pod", title = S("Sweet Pod"), diff --git a/df_lorebooks/init.lua b/df_lorebooks/init.lua index 3ad1e47..24c1c38 100644 --- a/df_lorebooks/init.lua +++ b/df_lorebooks/init.lua @@ -1,7 +1,5 @@ local modpath = minetest.get_modpath(minetest.get_current_modname()) -local S = minetest.get_translator(minetest.get_current_modname()) - local torch_node = {name=df_dependencies.node_name_torch, param2=1} collectible_lore.get_light_node = function() local selection = math.random() diff --git a/df_mapitems/flowstone.lua b/df_mapitems/flowstone.lua index d622697..1f800fb 100644 --- a/df_mapitems/flowstone.lua +++ b/df_mapitems/flowstone.lua @@ -70,7 +70,7 @@ df_mapitems.icicle_ids = subterrane.register_stalagmite_nodes("df_mapitems:icicl tiles = { df_dependencies.texture_ice, }, - groups = {cracky = 3, puts_out_fire = 1, cools_lava = 1, slippery = 3, pickaxey=1, building_block=1, handy=1, slippery=3, building_block=1, ice=1}, + groups = {cracky = 3, puts_out_fire = 1, cools_lava = 1, slippery = 3, pickaxey=1, building_block=1, handy=1, ice=1}, sounds = df_dependencies.sound_glass(), _mcl_blast_resistance = 0.5, _mcl_hardness = 0.5, diff --git a/df_primordial_items/giant_fern.lua b/df_primordial_items/giant_fern.lua index 528bc3b..914fa52 100644 --- a/df_primordial_items/giant_fern.lua +++ b/df_primordial_items/giant_fern.lua @@ -304,7 +304,7 @@ minetest.register_node("df_primordial_items:fern_sapling", { tiles = {"dfcaverns_jungle_fern_03.png"}, inventory_image = "dfcaverns_jungle_fern_03.png", wield_image = "dfcaverns_jungle_fern_03.png", - groups = {snappy = 3, attached_node = 1, flammable = 1, sapling = 1, light_sensitive_fungus = 13, attached_node=1,dig_by_piston=1,destroy_by_lava_flow=1,deco_block=1, compostability=30,dig_immediate=3}, + groups = {snappy = 3, attached_node = 1, flammable = 1, sapling = 1, light_sensitive_fungus = 13, dig_by_piston=1,destroy_by_lava_flow=1,deco_block=1, compostability=30,dig_immediate=3}, _dfcaverns_dead_node = df_dependencies.node_name_dry_shrub, selection_box = { type = "fixed", diff --git a/df_primordial_items/jungle_mushroom.lua b/df_primordial_items/jungle_mushroom.lua index 9be6785..9552661 100644 --- a/df_primordial_items/jungle_mushroom.lua +++ b/df_primordial_items/jungle_mushroom.lua @@ -10,7 +10,7 @@ minetest.register_node("df_primordial_items:jungle_mushroom_trunk", { tiles = {"dfcaverns_jungle_mushroom_stem.png", "dfcaverns_jungle_mushroom_stem.png", "dfcaverns_jungle_mushroom_stem_02.png"}, paramtype2 = "facedir", is_ground_content = false, - groups = {tree = 1, choppy = 2, oddly_breakable_by_hand = 1, flammable = 2, handy=1,axey=1, tree=1, flammable=2, building_block=1, material_wood=1, fire_encouragement=5, fire_flammability=5}, + groups = {tree = 1, choppy = 2, oddly_breakable_by_hand = 1, flammable = 2, handy=1,axey=1, building_block=1, material_wood=1, fire_encouragement=5, fire_flammability=5}, sounds = df_trees.node_sound_tree_soft_fungus_defaults(), on_place = minetest.rotate_node, _mcl_blast_resistance = 2, @@ -24,7 +24,7 @@ minetest.register_node("df_primordial_items:jungle_mushroom_cap_1", { tiles = {"dfcaverns_jungle_mushroom_top_02.png"}, paramtype2 = "facedir", is_ground_content = false, - groups = {tree = 1, choppy = 2, oddly_breakable_by_hand = 1, flammable = 2, primordial_mushroom_cap = 1, handy=1,axey=1, tree=1, building_block=1, material_wood=1, fire_encouragement=5, fire_flammability=5, compostability=30}, + groups = {tree = 1, choppy = 2, oddly_breakable_by_hand = 1, flammable = 2, primordial_mushroom_cap = 1, handy=1,axey=1, building_block=1, material_wood=1, fire_encouragement=5, fire_flammability=5, compostability=30}, sounds = df_trees.node_sound_tree_soft_fungus_defaults(), on_place = minetest.rotate_node, drop = { @@ -50,7 +50,7 @@ minetest.register_node("df_primordial_items:jungle_mushroom_cap_2", { tiles = {"dfcaverns_jungle_mushroom_top_01.png"}, paramtype2 = "facedir", is_ground_content = false, - groups = {tree = 1, choppy = 2, oddly_breakable_by_hand = 1, flammable = 2, primordial_mushroom_cap = 1, handy=1,axey=1, tree=1, building_block=1, material_wood=1, fire_encouragement=5, fire_flammability=5, compostability=30}, + groups = {tree = 1, choppy = 2, oddly_breakable_by_hand = 1, flammable = 2, primordial_mushroom_cap = 1, handy=1,axey=1, building_block=1, material_wood=1, fire_encouragement=5, fire_flammability=5, compostability=30}, sounds = df_trees.node_sound_tree_soft_fungus_defaults(), on_place = minetest.rotate_node, drop = { diff --git a/df_primordial_items/jungle_nodes.lua b/df_primordial_items/jungle_nodes.lua index ae3189e..6b58822 100644 --- a/df_primordial_items/jungle_nodes.lua +++ b/df_primordial_items/jungle_nodes.lua @@ -221,7 +221,7 @@ minetest.register_node("df_primordial_items:jungle_ivy", { tiles = {"dfcaverns_jungle_ivy_01.png"}, inventory_image = "dfcaverns_jungle_ivy_01.png", wield_image = "dfcaverns_jungle_ivy_01.png", - groups = {snappy = 3, flammable = 1, vines = 1, handy=1,axey=1,shearsy=1,swordy=1, flammable=2,deco_block=1,destroy_by_lava_flow=1,dig_by_piston=1, fire_encouragement=15, fire_flammability=100, compostability=50}, + groups = {snappy = 3, flammable = 1, vines = 1, handy=1,axey=1,shearsy=1,swordy=1, deco_block=1,destroy_by_lava_flow=1,dig_by_piston=1, fire_encouragement=15, fire_flammability=100, compostability=50}, paramtype = "light", drawtype = "plantlike", place_param2 = 3, @@ -349,7 +349,7 @@ minetest.register_node("df_primordial_items:packed_roots", { tiles = {"dfcaverns_jungle_plant_packed_roots_01.png"}, paramtype2 = "facedir", is_ground_content = false, - groups = {choppy = 2, oddly_breakable_by_hand = 2, flammable = 2, handy=1,axey=1, tree=1, flammable=2, building_block=1, material_wood=1, fire_encouragement=5, fire_flammability=5}, + groups = {choppy = 2, oddly_breakable_by_hand = 2, flammable = 2, handy=1,axey=1, tree=1, building_block=1, material_wood=1, fire_encouragement=5, fire_flammability=5}, sounds = df_dependencies.sound_wood(), _mcl_blast_resistance = 3, _mcl_hardness = 3, diff --git a/df_primordial_items/jungle_tree.lua b/df_primordial_items/jungle_tree.lua index 9064b2f..208f78a 100644 --- a/df_primordial_items/jungle_tree.lua +++ b/df_primordial_items/jungle_tree.lua @@ -79,7 +79,7 @@ minetest.register_node("df_primordial_items:jungle_tree", { tiles = {"dfcaverns_jungle_wood_02.png", "dfcaverns_jungle_wood_02.png", "dfcaverns_jungle_wood_01.png"}, paramtype2 = "facedir", is_ground_content = false, - groups = {tree = 1, choppy = 2, oddly_breakable_by_hand = 1, flammable = 2, primordial_jungle_tree = 1, handy=1,axey=1, flammable=2, building_block=1, material_wood=1, fire_encouragement=5, fire_flammability=5}, + groups = {tree = 1, choppy = 2, oddly_breakable_by_hand = 1, flammable = 2, primordial_jungle_tree = 1, handy=1,axey=1, building_block=1, material_wood=1, fire_encouragement=5, fire_flammability=5}, sounds = df_dependencies.sound_wood(), on_place = minetest.rotate_node, _mcl_blast_resistance = 2, @@ -93,7 +93,7 @@ minetest.register_node("df_primordial_items:jungle_tree_mossy", { tiles = {"dfcaverns_jungle_wood_02.png", "dfcaverns_jungle_wood_02.png", "dfcaverns_jungle_wood_03.png"}, paramtype2 = "facedir", is_ground_content = false, - groups = {tree = 1, choppy = 2, oddly_breakable_by_hand = 1, flammable = 2, primordial_jungle_tree = 1, handy=1,axey=1, flammable=2, building_block=1, material_wood=1, fire_encouragement=5, fire_flammability=5}, + groups = {tree = 1, choppy = 2, oddly_breakable_by_hand = 1, flammable = 2, primordial_jungle_tree = 1, handy=1,axey=1, building_block=1, material_wood=1, fire_encouragement=5, fire_flammability=5}, sounds = df_dependencies.sound_wood(), on_place = minetest.rotate_node, _mcl_blast_resistance = 2, @@ -108,7 +108,7 @@ minetest.register_node("df_primordial_items:jungle_tree_glowing", { paramtype2 = "facedir", is_ground_content = false, light_source = 4, - groups = {tree = 1, choppy = 2, oddly_breakable_by_hand = 1, flammable = 2, primordial_jungle_tree = 1, handy=1,axey=1, flammable=2, building_block=1, material_wood=1, fire_encouragement=5, fire_flammability=5}, + groups = {tree = 1, choppy = 2, oddly_breakable_by_hand = 1, flammable = 2, primordial_jungle_tree = 1, handy=1,axey=1, building_block=1, material_wood=1, fire_encouragement=5, fire_flammability=5}, sounds = df_dependencies.sound_wood(), on_place = minetest.rotate_node, _mcl_blast_resistance = 2, diff --git a/df_trees/black_cap.lua b/df_trees/black_cap.lua index de7d571..a66344c 100644 --- a/df_trees/black_cap.lua +++ b/df_trees/black_cap.lua @@ -155,7 +155,7 @@ minetest.register_node("df_trees:black_cap_sapling", { fixed = {-4 / 16, -0.5, -4 / 16, 4 / 16, 7 / 16, 4 / 16} }, groups = {snappy = 2, dig_immediate = 3, flammable = 2, - attached_node = 1, sapling = 1, light_sensitive_fungus = 11, dig_immediate=3,dig_by_piston=1,destroy_by_lava_flow=1,deco_block=1, compostability=30}, + attached_node = 1, sapling = 1, light_sensitive_fungus = 11, dig_by_piston=1,destroy_by_lava_flow=1,deco_block=1, compostability=30}, sounds = df_dependencies.sound_leaves(), _mcl_blast_resistance = 0.5, _mcl_hardness = 0.5, diff --git a/df_trees/fungiwood.lua b/df_trees/fungiwood.lua index 7b11822..cfed1c7 100644 --- a/df_trees/fungiwood.lua +++ b/df_trees/fungiwood.lua @@ -125,7 +125,7 @@ minetest.register_node("df_trees:fungiwood_sapling", { fixed = {-4 / 16, -0.5, -4 / 16, 4 / 16, 7 / 16, 4 / 16} }, groups = {snappy = 2, dig_immediate = 3, flammable = 2, - attached_node = 1, sapling = 1, light_sensitive_fungus = 11, dig_immediate=3,dig_by_piston=1,destroy_by_lava_flow=1,deco_block=1, compostability=30}, + attached_node = 1, sapling = 1, light_sensitive_fungus = 11, dig_by_piston=1,destroy_by_lava_flow=1,deco_block=1, compostability=30}, sounds = df_dependencies.sound_leaves(), _mcl_blast_resistance = 0.2, _mcl_hardness = 0.2, diff --git a/df_trees/goblin_cap.lua b/df_trees/goblin_cap.lua index a501e0d..f8a4398 100644 --- a/df_trees/goblin_cap.lua +++ b/df_trees/goblin_cap.lua @@ -220,7 +220,7 @@ minetest.register_node("df_trees:goblin_cap_sapling", { fixed = {-4 / 16, -0.5, -4 / 16, 4 / 16, 7 / 16, 4 / 16} }, groups = {snappy = 2, dig_immediate = 3, flammable = 2, - attached_node = 1, sapling = 1, light_sensitive_fungus = 11, dig_immediate=3,dig_by_piston=1,destroy_by_lava_flow=1,deco_block=1, compostability=30}, + attached_node = 1, sapling = 1, light_sensitive_fungus = 11, dig_by_piston=1,destroy_by_lava_flow=1,deco_block=1, compostability=30}, sounds = df_dependencies.sound_leaves(), _mcl_blast_resistance = 0.2, _mcl_hardness = 0.2, diff --git a/df_trees/nether_cap.lua b/df_trees/nether_cap.lua index b77212f..e321224 100644 --- a/df_trees/nether_cap.lua +++ b/df_trees/nether_cap.lua @@ -115,7 +115,7 @@ minetest.register_node("df_trees:nether_cap_sapling", { fixed = {-4 / 16, -0.5, -4 / 16, 4 / 16, 7 / 16, 4 / 16} }, groups = {snappy = 2, dig_immediate = 3, - attached_node = 1, sapling = 1, light_sensitive_fungus = 11, dig_immediate=3,dig_by_piston=1,destroy_by_lava_flow=1,deco_block=1}, + attached_node = 1, sapling = 1, light_sensitive_fungus = 11, dig_by_piston=1,destroy_by_lava_flow=1,deco_block=1}, sounds = df_dependencies.sound_leaves(), _mcl_blast_resistance = 0.1, _mcl_hardness = 0.1, diff --git a/df_trees/spore_tree.lua b/df_trees/spore_tree.lua index f0ab31e..a1dda66 100644 --- a/df_trees/spore_tree.lua +++ b/df_trees/spore_tree.lua @@ -170,7 +170,7 @@ minetest.register_node("df_trees:spore_tree_sapling", { fixed = {-4 / 16, -0.5, -4 / 16, 4 / 16, 7 / 16, 4 / 16} }, groups = {snappy = 2, dig_immediate = 3, flammable = 2, - attached_node = 1, sapling = 1, light_sensitive_fungus = 11, dig_immediate=3,dig_by_piston=1,destroy_by_lava_flow=1,deco_block=1, compostability=30}, + attached_node = 1, sapling = 1, light_sensitive_fungus = 11, dig_by_piston=1,destroy_by_lava_flow=1,deco_block=1, compostability=30}, sounds = df_dependencies.sound_leaves(), _mcl_blast_resistance = 0.2, _mcl_hardness = 0.2, diff --git a/df_trees/torchspine.lua b/df_trees/torchspine.lua index e23d2de..fd97b17 100644 --- a/df_trees/torchspine.lua +++ b/df_trees/torchspine.lua @@ -397,7 +397,6 @@ df_trees.spawn_torchspine_vm = function(vi, area, data, data_param2, height, lit local pos = area:position(vi) pos.y = pos.y+height-1 - local node = minetest.get_node(pos) minetest.get_node_timer(pos):start(math.random()*3000) end diff --git a/df_trees/tower_cap.lua b/df_trees/tower_cap.lua index 33b97d9..795f0ee 100644 --- a/df_trees/tower_cap.lua +++ b/df_trees/tower_cap.lua @@ -130,7 +130,7 @@ minetest.register_node("df_trees:tower_cap_sapling", { fixed = {-4 / 16, -0.5, -4 / 16, 4 / 16, 7 / 16, 4 / 16} }, groups = {snappy = 2, dig_immediate = 3, flammable = 2, - attached_node = 1, sapling = 1, light_sensitive_fungus = 11, dig_immediate=3,dig_by_piston=1,destroy_by_lava_flow=1,deco_block=1, compostability=30}, + attached_node = 1, sapling = 1, light_sensitive_fungus = 11, dig_by_piston=1,destroy_by_lava_flow=1,deco_block=1, compostability=30}, sounds = df_dependencies.sound_leaves(), _mcl_blast_resistance = 0.2, _mcl_hardness = 0.2, diff --git a/df_trees/tunnel_tube.lua b/df_trees/tunnel_tube.lua index e1c36b9..0be05df 100644 --- a/df_trees/tunnel_tube.lua +++ b/df_trees/tunnel_tube.lua @@ -338,7 +338,7 @@ minetest.register_node("df_trees:tunnel_tube_sapling", { fixed = {-4 / 16, -0.5, -4 / 16, 4 / 16, 7 / 16, 4 / 16} }, groups = {snappy = 2, dig_immediate = 3, flammable = 2, - attached_node = 1, sapling = 1, light_sensitive_fungus = 11, dig_immediate=3,dig_by_piston=1,destroy_by_lava_flow=1,deco_block=1, compostability=30}, + attached_node = 1, sapling = 1, light_sensitive_fungus = 11, dig_by_piston=1,destroy_by_lava_flow=1,deco_block=1, compostability=30}, sounds = df_dependencies.sound_leaves(), _mcl_blast_resistance = 10, _mcl_hardness = 0.2, diff --git a/hunter_statue/init.lua b/hunter_statue/init.lua index 87fa53b..00d4440 100644 --- a/hunter_statue/init.lua +++ b/hunter_statue/init.lua @@ -12,7 +12,7 @@ local statue_box = { }, } -local fourtyfivedegrees = math.pi/4 +--local fourtyfivedegrees = math.pi/4 local sixtydegrees = math.pi/3 local default_sounds diff --git a/mine_gas/wisp.lua b/mine_gas/wisp.lua index 2b0f2ac..cdbeb1c 100644 --- a/mine_gas/wisp.lua +++ b/mine_gas/wisp.lua @@ -59,8 +59,6 @@ minetest.register_abm({ minetest.swap_node(next_pos, node) minetest.swap_node(pos, next_node) end - pos = next_pos - end, }) diff --git a/pit_caves/init.lua b/pit_caves/init.lua index ffbeab5..8d31570 100644 --- a/pit_caves/init.lua +++ b/pit_caves/init.lua @@ -1,6 +1,5 @@ pit_caves = {} -local modpath = minetest.get_modpath(minetest.get_current_modname()) local S = minetest.get_translator(minetest.get_current_modname()) local min_depth = tonumber(minetest.settings:get("pit_caves_min_bottom") or -2500)