diff --git a/df_dependencies/init.lua b/df_dependencies/init.lua index 1623956..2695109 100644 --- a/df_dependencies/init.lua +++ b/df_dependencies/init.lua @@ -4,25 +4,24 @@ local modpath = minetest.get_modpath(minetest.get_current_modname()) df_dependencies.mods_required = {} df_dependencies.select_required = function(def) - local count = 0 - local total = 0 local ret - for mod, item in pairs(def) do - total = total + 1 + for _, dependency in ipairs(def) do + mod = dependency[1] + item = dependency[2] df_dependencies.mods_required[mod] = true if minetest.get_modpath(mod) then - count = count + 1 ret = item end end - assert(count ~= 0, "Unable to find item for dependency set " .. dump(def)) - assert(count == 1, "Found more than one item for dependency set " .. dump(def)) + assert(ret, "Unable to find item for dependency set " .. dump(def)) return ret end df_dependencies.select_optional = function(def) local ret - for mod, item in pairs(def) do + for _, dependency in ipairs(def) do + mod = dependency[1] + item = dependency[2] df_dependencies.mods_required[mod] = true if minetest.get_modpath(mod) then ret = item diff --git a/df_dependencies/misc.lua b/df_dependencies/misc.lua index 2f628b2..d298eb2 100644 --- a/df_dependencies/misc.lua +++ b/df_dependencies/misc.lua @@ -49,24 +49,24 @@ end -- don't trigger on air, that's for sparkle generation df_dependencies.abm_pit_plasma_neighbors = {"group:stone", "group:lava", "group:water", "group:material_stone"} -df_dependencies.texture_cobble = select_required({default="default_cobble.png", mcl_core="default_cobble.png"}) -df_dependencies.texture_coral_skeleton = select_required({default="default_coral_skeleton.png", mcl_ocean="mcl_ocean_dead_horn_coral_block.png"}) -df_dependencies.texture_dirt = select_required({default="default_dirt.png", mcl_core="default_dirt.png"}) -df_dependencies.texture_gold_block = select_required({default="default_gold_block.png", mcl_core="default_gold_block.png"}) -df_dependencies.texture_ice = select_required({default="default_ice.png", mcl_core="default_ice.png"}) -df_dependencies.texture_sand = select_required({default="default_sand.png", mcl_core="default_sand.png"}) -df_dependencies.texture_stone = select_required({default="default_stone.png", mcl_core="default_stone.png"}) -df_dependencies.texture_wood = select_required({default="default_wood.png", mcl_core="default_wood.png"}) -df_dependencies.texture_mineral_coal = select_required({default="default_mineral_coal.png", mcl_core="mcl_core_coal_ore.png"}) -- MCL's coal texture isn't transparent, but is only used with gas seeps and should work fine that way -df_dependencies.texture_glass_bottle = select_required({vessels="vessels_glass_bottle.png", mcl_potions="mcl_potions_potion_bottle.png"}) +df_dependencies.texture_cobble = select_required({{"default", "default_cobble.png"}, {"mcl_core", "default_cobble.png"}}) +df_dependencies.texture_coral_skeleton = select_required({{"default", "default_coral_skeleton.png"}, {"mcl_ocean", "mcl_ocean_dead_horn_coral_block.png"}}) +df_dependencies.texture_dirt = select_required({{"default", "default_dirt.png"}, {"mcl_core", "default_dirt.png"}}) +df_dependencies.texture_gold_block = select_required({{"default", "default_gold_block.png"}, {"mcl_core", "default_gold_block.png"}}) +df_dependencies.texture_ice = select_required({{"default", "default_ice.png"}, {"mcl_core", "default_ice.png"}}) +df_dependencies.texture_sand = select_required({{"default", "default_sand.png"}, {"mcl_core", "default_sand.png"}}) +df_dependencies.texture_stone = select_required({{"default", "default_stone.png"}, {"mcl_core", "default_stone.png"}}) +df_dependencies.texture_wood = select_required({{"default", "default_wood.png"}, {"mcl_core", "default_wood.png"}}) +df_dependencies.texture_mineral_coal = select_required({{"default", "default_mineral_coal.png"}, {"mcl_core", "mcl_core_coal_ore.png"}}) -- MCL's coal texture isn't transparent, but is only used with gas seeps and should work fine that way +df_dependencies.texture_glass_bottle = select_required({{"vessels", "vessels_glass_bottle.png"}, {"mcl_potions", "mcl_potions_potion_bottle.png"}}) df_dependencies.texture_meselamp = "dfcaverns_glow_mese.png" -df_dependencies.texture_tool_steelhoe = select_required({default="farming_tool_steelhoe.png", mcl_farming="farming_tool_steelhoe.png"}) -df_dependencies.texture_tool_steelpick = select_required({default="default_tool_steelpick.png", mcl_farming="default_tool_steelpick.png"}) -df_dependencies.texture_tool_steelshovel = select_required({default="default_tool_steelshovel.png", mcl_farming="default_tool_steelshovel.png"}) -df_dependencies.texture_farming_soil = select_required({default="(default_dirt.png^farming_soil.png)", mcl_farming="mcl_farming_farmland_dry.png"}) +df_dependencies.texture_tool_steelhoe = select_required({{"default", "farming_tool_steelhoe.png"}, {"mcl_farming", "farming_tool_steelhoe.png"}}) +df_dependencies.texture_tool_steelpick = select_required({{"default", "default_tool_steelpick.png"}, {"mcl_farming", "default_tool_steelpick.png"}}) +df_dependencies.texture_tool_steelshovel = select_required({{"default", "default_tool_steelshovel.png"}, {"mcl_farming", "default_tool_steelshovel.png"}}) +df_dependencies.texture_farming_soil = select_required({{"default", "(default_dirt.png^farming_soil.png)"}, {"mcl_farming", "mcl_farming_farmland_dry.png"}}) -df_dependencies.texture_mapping_kit = select_required({default="map_mapping_kit.png", mcl_maps="mcl_maps_map_filled.png"}) +df_dependencies.texture_mapping_kit = select_required({{"default", "map_mapping_kit.png"}, {"mcl_maps", "mcl_maps_map_filled.png"}}) df_dependencies.nethercap_name = S("Nethercap") if minetest.get_modpath("mcl_mapgen_core") then diff --git a/df_dependencies/nodes.lua b/df_dependencies/nodes.lua index db51632..2372547 100644 --- a/df_dependencies/nodes.lua +++ b/df_dependencies/nodes.lua @@ -1,20 +1,20 @@ local S = minetest.get_translator(minetest.get_current_modname()) local required_nodes = {} -local function select_required(...) +local function select_required(def) local newdef = {} - for _, node in pairs({...}) do - newdef[string.match(node, "(.-):")] = node + for _, node in ipairs(def) do + table.insert(newdef, {string.match(node, "(.-):"), node}) end local ret = df_dependencies.select_required(newdef) table.insert(required_nodes, ret) return ret end -local function select_optional(...) +local function select_optional(def) local newdef = {} - for _, node in pairs({...}) do - newdef[string.match(node, "(.-):")] = node + for _, node in ipairs(def) do + table.insert(newdef, {string.match(node, "(.-):"), node}) end local ret = df_dependencies.select_optional(newdef) table.insert(required_nodes, ret) @@ -37,86 +37,86 @@ minetest.after(0, function() end) -df_dependencies.node_name_apple = select_required("default:apple", "mcl_core:apple") -df_dependencies.node_name_chest = select_required("default:chest", "mcl_chests:chest") -df_dependencies.node_name_coalblock = select_required("default:coalblock", "mcl_core:coalblock") -df_dependencies.node_name_coal_lump = select_required("default:coal_lump", "mcl_core:coal_lump") -df_dependencies.node_name_cobble = select_required("default:cobble", "mcl_core:cobble") -df_dependencies.node_name_coral_skeleton = select_required("default:coral_skeleton", "mcl_ocean:dead_horn_coral_block") -df_dependencies.node_name_desert_sand = select_required("default:desert_sand", "mcl_core:redsand") -df_dependencies.node_name_dirt = select_required("default:dirt", "mcl_core:dirt") -df_dependencies.node_name_dry_grass_3 = select_required("default:dry_grass_3", "mcl_core:deadbush") -- There doesn't seem to be an MCL equivalent of this -df_dependencies.node_name_dry_grass_4 = select_required("default:dry_grass_4", "mcl_core:deadbush") -- There doesn't seem to be an MCL equivalent of this -df_dependencies.node_name_dry_shrub = select_required("default:dry_shrub", "mcl_core:deadbush") -df_dependencies.node_name_furnace = select_required("default:furnace", "mcl_furnaces:furnace") -df_dependencies.node_name_gold_ingot = select_required("default:gold_ingot", "mcl_core:gold_ingot") -df_dependencies.node_name_gravel = select_required("default:gravel", "mcl_core:gravel") -df_dependencies.node_name_ice = select_required("default:ice", "mcl_core:ice") -df_dependencies.node_name_junglewood = select_required("default:junglewood", "mcl_core:junglewood") -df_dependencies.node_name_lava_source = select_required("default:lava_source", "mcl_core:lava_source") -df_dependencies.node_name_mese_crystal = select_required("default:mese_crystal", "mesecons:wire_00000000_off") --make sure default:mese_crystal is first, so that default will be checked for before mesecons is checked for. -df_dependencies.node_name_mossycobble = select_required("default:mossycobble", "mcl_core:mossycobble") -df_dependencies.node_name_obsidian = select_required("default:obsidian", "mcl_core:obsidian") -df_dependencies.node_name_paper = select_required("default:paper", "mcl_core:paper") -df_dependencies.node_name_river_water_flowing = select_required("default:river_water_flowing", "mclx_core:river_water_flowing") -df_dependencies.node_name_river_water_source = select_required("default:river_water_source", "mclx_core:river_water_source") -df_dependencies.node_name_sand = select_required("default:sand", "mcl_core:sand") -df_dependencies.node_name_silver_sand = select_required("default:silver_sand", "mcl_core:sand") -- There doesn't seem to be an MCL equivalent of this -df_dependencies.node_name_snow = select_required("default:snow", "mcl_core:snow") -df_dependencies.node_name_stone = select_required("default:stone", "mcl_core:stone") -df_dependencies.node_name_stone_with_coal = select_required("default:stone_with_coal", "mcl_core:stone_with_coal") -df_dependencies.node_name_stone_with_mese = select_required("default:stone_with_mese", "mcl_core:stone_with_redstone") -df_dependencies.node_name_torch = select_required("default:torch", "mcl_torches:torch") -df_dependencies.node_name_torch_wall = select_required("default:torch_wall", "mcl_torches:torch_wall") -df_dependencies.node_name_water_flowing = select_required("default:water_flowing", "mcl_core:water_flowing") -df_dependencies.node_name_water_source = select_required("default:water_source", "mcl_core:water_source") -df_dependencies.node_name_stone_with_iron = select_required("default:stone_with_iron", "mcl_core:stone_with_iron") -df_dependencies.node_name_steelblock = select_required("default:steelblock", "mcl_core:ironblock") -df_dependencies.node_name_stone_with_copper = select_required("default:stone_with_copper", "mcl_copper:stone_with_copper") -df_dependencies.node_name_copperblock = select_required("default:copperblock", "mcl_copper:block_raw") - -df_dependencies.node_name_dirt_furrowed = select_required("farming:soil", "mcl_farming:soil") -df_dependencies.node_name_dirt_wet = select_required("farming:soil_wet", "mcl_farming:soil_wet") ---df_dependencies.node_name_mortar_pestle = select_optional("farming:mortar_pestle") -- TODO where did this go? -df_dependencies.node_name_string = select_required("farming:string", "mcl_mobitems:string") - -df_dependencies.node_name_bucket_empty = select_required("bucket:bucket_empty", "mcl_buckets:bucket_empty") -df_dependencies.node_name_bucket_lava = select_required("bucket:bucket_lava", "mcl_buckets:bucket_lava") +df_dependencies.node_name_apple = select_required({"default:apple", "mcl_core:apple"}) +df_dependencies.node_name_chest = select_required({"default:chest", "mcl_chests:chest"}) +df_dependencies.node_name_coalblock = select_required({"default:coalblock", "mcl_core:coalblock"}) +df_dependencies.node_name_coal_lump = select_required({"default:coal_lump", "mcl_core:coal_lump"}) +df_dependencies.node_name_cobble = select_required({"default:cobble", "mcl_core:cobble"}) +df_dependencies.node_name_coral_skeleton = select_required({"default:coral_skeleton", "mcl_ocean:dead_horn_coral_block"}) +df_dependencies.node_name_desert_sand = select_required({"default:desert_sand", "mcl_core:redsand"}) +df_dependencies.node_name_dirt = select_required({"default:dirt", "mcl_core:dirt"}) +df_dependencies.node_name_dry_grass_3 = select_required({"default:dry_grass_3", "mcl_core:deadbush"}) -- There doesn't seem to be an MCL equivalent of this +df_dependencies.node_name_dry_grass_4 = select_required({"default:dry_grass_4", "mcl_core:deadbush"}) -- There doesn't seem to be an MCL equivalent of this +df_dependencies.node_name_dry_shrub = select_required({"default:dry_shrub", "mcl_core:deadbush"}) +df_dependencies.node_name_furnace = select_required({"default:furnace", "mcl_furnaces:furnace"}) +df_dependencies.node_name_gold_ingot = select_required({"default:gold_ingot", "mcl_core:gold_ingot"}) +df_dependencies.node_name_gravel = select_required({"default:gravel", "mcl_core:gravel"}) +df_dependencies.node_name_ice = select_required({"default:ice", "mcl_core:ice"}) +df_dependencies.node_name_junglewood = select_required({"default:junglewood", "mcl_core:junglewood"}) +df_dependencies.node_name_lava_source = select_required({"default:lava_source", "mcl_core:lava_source"}) +df_dependencies.node_name_mese_crystal = select_required({"mesecons:wire_00000000_off", "default:mese_crystal"}) --make sure default:mese_crystal is second, so that default will take priority if mesecons is also installed. +df_dependencies.node_name_mossycobble = select_required({"default:mossycobble", "mcl_core:mossycobble"}) +df_dependencies.node_name_obsidian = select_required({"default:obsidian", "mcl_core:obsidian"}) +df_dependencies.node_name_paper = select_required({"default:paper", "mcl_core:paper"}) +df_dependencies.node_name_river_water_flowing = select_required({"default:river_water_flowing", "mclx_core:river_water_flowing"}) +df_dependencies.node_name_river_water_source = select_required({"default:river_water_source", "mclx_core:river_water_source"}) +df_dependencies.node_name_sand = select_required({"default:sand", "mcl_core:sand"}) +df_dependencies.node_name_silver_sand = select_required({"default:silver_sand", "mcl_core:sand"}) -- There doesn't seem to be an MCL equivalent of this +df_dependencies.node_name_snow = select_required({"default:snow", "mcl_core:snow"}) +df_dependencies.node_name_stone = select_required({"default:stone", "mcl_core:stone"}) +df_dependencies.node_name_stone_with_coal = select_required({"default:stone_with_coal", "mcl_core:stone_with_coal"}) +df_dependencies.node_name_stone_with_mese = select_required({"default:stone_with_mese", "mcl_core:stone_with_redstone"}) +df_dependencies.node_name_torch = select_required({"default:torch", "mcl_torches:torch"}) +df_dependencies.node_name_torch_wall = select_required({"default:torch_wall", "mcl_torches:torch_wall"}) +df_dependencies.node_name_water_flowing = select_required({"default:water_flowing", "mcl_core:water_flowing"}) +df_dependencies.node_name_water_source = select_required({"default:water_source", "mcl_core:water_source"}) +df_dependencies.node_name_stone_with_iron = select_required({"default:stone_with_iron", "mcl_core:stone_with_iron"}) +df_dependencies.node_name_steelblock = select_required({"default:steelblock", "mcl_core:ironblock"}) +df_dependencies.node_name_stone_with_copper = select_required({"default:stone_with_copper", "mcl_copper:stone_with_copper"}) +df_dependencies.node_name_copperblock = select_required({"default:copperblock", "mcl_copper:block_raw"}) + +df_dependencies.node_name_dirt_furrowed = select_required({"farming:soil", "mcl_farming:soil"}) +df_dependencies.node_name_dirt_wet = select_required({"farming:soil_wet", "mcl_farming:soil_wet"}) +--df_dependencies.node_name_mortar_pestle = select_optional({"farming:mortar_pestle"}) -- TODO where did this go? +df_dependencies.node_name_string = select_required({"farming:string", "mcl_mobitems:string"}) + +df_dependencies.node_name_bucket_empty = select_required({"bucket:bucket_empty", "mcl_buckets:bucket_empty"}) +df_dependencies.node_name_bucket_lava = select_required({"bucket:bucket_lava", "mcl_buckets:bucket_lava"}) -- from "wool" -df_dependencies.node_name_wool_white = select_required("wool:white", "mcl_wool:white") +df_dependencies.node_name_wool_white = select_required({"wool:white", "mcl_wool:white"}) -- from "fireflies" -df_dependencies.node_name_fireflies = select_optional("fireflies:firefly") +df_dependencies.node_name_fireflies = select_optional({"fireflies:firefly"}) -- from "vessels" -df_dependencies.node_name_glass_bottle = select_required("vessels:glass_bottle", "mcl_potions:glass_bottle") -df_dependencies.node_name_shelf = select_optional("vessels:shelf") +df_dependencies.node_name_glass_bottle = select_required({"vessels:glass_bottle", "mcl_potions:glass_bottle"}) +df_dependencies.node_name_shelf = select_optional({"vessels:shelf"}) -- from "beds" -df_dependencies.node_name_bed_bottom = select_required("beds:bed_bottom", "mcl_beds:bed_red_bottom") -df_dependencies.node_name_bed_top = select_required("beds:bed_top", "mcl_beds:bed_red_top") +df_dependencies.node_name_bed_bottom = select_required({"beds:bed_bottom", "mcl_beds:bed_red_bottom"}) +df_dependencies.node_name_bed_top = select_required({"beds:bed_top", "mcl_beds:bed_red_top"}) -- from "doors" -df_dependencies.node_name_door_wood_a = select_required("doors:door_wood_a", "mcl_doors:wooden_door_b_1") -df_dependencies.node_name_door_hidden = select_required("doors:hidden", "mcl_doors:wooden_door_t_1") +df_dependencies.node_name_door_wood_a = select_required({"doors:door_wood_a", "mcl_doors:wooden_door_b_1"}) +df_dependencies.node_name_door_hidden = select_required({"doors:hidden", "mcl_doors:wooden_door_t_1"}) -- from "stairs" -df_dependencies.node_name_slab_goblin_cap_stem_wood = select_required("stairs:slab_goblin_cap_stem_wood", "mcl_stairs:slab_goblin_cap_stem_wood") -df_dependencies.node_name_slab_slade_brick = select_required("stairs:slab_slade_brick", "mcl_stairs:slab_slade_brick") -df_dependencies.node_name_stair_goblin_cap_stem_wood = select_required("stairs:stair_goblin_cap_stem_wood", "mcl_stairs:stair_goblin_cap_stem_wood") -df_dependencies.node_name_stair_inner_slade_brick = select_required("stairs:stair_inner_slade_brick", "mcl_stairs:stair_slade_brick_inner") -df_dependencies.node_name_stair_outer_slade_brick = select_required("stairs:stair_outer_slade_brick", "mcl_stairs:stair_slade_brick_outer") -df_dependencies.node_name_stair_slade_block = select_required("stairs:stair_slade_block", "mcl_stairs:stair_slade_block") -df_dependencies.node_name_slab_slade_block = select_required("stairs:slab_slade_block", "mcl_stairs:slab_slade_block") -df_dependencies.node_name_stair_slade_brick = select_required("stairs:stair_slade_brick", "mcl_stairs:stair_slade_brick") -df_dependencies.node_name_slab_slade_block_top = select_optional("mcl_stairs:slab_slade_block_top") +df_dependencies.node_name_slab_goblin_cap_stem_wood = select_required({"stairs:slab_goblin_cap_stem_wood", "mcl_stairs:slab_goblin_cap_stem_wood"}) +df_dependencies.node_name_slab_slade_brick = select_required({"stairs:slab_slade_brick", "mcl_stairs:slab_slade_brick"}) +df_dependencies.node_name_stair_goblin_cap_stem_wood = select_required({"stairs:stair_goblin_cap_stem_wood", "mcl_stairs:stair_goblin_cap_stem_wood"}) +df_dependencies.node_name_stair_inner_slade_brick = select_required({"stairs:stair_inner_slade_brick", "mcl_stairs:stair_slade_brick_inner"}) +df_dependencies.node_name_stair_outer_slade_brick = select_required({"stairs:stair_outer_slade_brick", "mcl_stairs:stair_slade_brick_outer"}) +df_dependencies.node_name_stair_slade_block = select_required({"stairs:stair_slade_block", "mcl_stairs:stair_slade_block"}) +df_dependencies.node_name_slab_slade_block = select_required({"stairs:slab_slade_block", "mcl_stairs:slab_slade_block"}) +df_dependencies.node_name_stair_slade_brick = select_required({"stairs:stair_slade_brick", "mcl_stairs:stair_slade_brick"}) +df_dependencies.node_name_slab_slade_block_top = select_optional({"mcl_stairs:slab_slade_block_top"}) -- from "tnt" -df_dependencies.node_name_gunpowder = select_optional("tnt:gunpowder", "mcl_mobitems:gunpowder") +df_dependencies.node_name_gunpowder = select_optional({"tnt:gunpowder", "mcl_mobitems:gunpowder"}) local modpath = minetest.get_modpath(minetest.get_current_modname()) diff --git a/df_dependencies/sounds.lua b/df_dependencies/sounds.lua index 95f9031..90ab2ad 100644 --- a/df_dependencies/sounds.lua +++ b/df_dependencies/sounds.lua @@ -31,8 +31,8 @@ else assert(false, "One of [default] or [mcl_sounds] must be active") end -df_dependencies.soundfile_grass_footstep = select_required({default="default_grass_footstep", mcl_sounds="default_grass_footstep"}) -df_dependencies.soundfile_snow_footstep = select_required({default="default_snow_footstep", mcl_sounds="pedology_snow_soft_footstep"}) -df_dependencies.soundfile_gravel_footstep = select_required({default="default_gravel_footstep", mcl_sounds="default_gravel_footstep"}) -df_dependencies.soundfile_cool_lava = select_required({default="default_cool_lava", mcl_sounds="default_cool_lava"}) -df_dependencies.soundfile_tnt_ignite = select_required({default="tnt_ignite", mcl_tnt="tnt_ignite"}) \ No newline at end of file +df_dependencies.soundfile_grass_footstep = select_required({{"default", "default_grass_footstep"}, {"mcl_sounds", "default_grass_footstep"}}) +df_dependencies.soundfile_snow_footstep = select_required({{"default", "default_snow_footstep"}, {"mcl_sounds", "pedology_snow_soft_footstep"}}) +df_dependencies.soundfile_gravel_footstep = select_required({{"default", "default_gravel_footstep"}, {"mcl_sounds", "default_gravel_footstep"}}) +df_dependencies.soundfile_cool_lava = select_required({{"default", "default_cool_lava"}, {"mcl_sounds", "default_cool_lava"}}) +df_dependencies.soundfile_tnt_ignite = select_required({{"default", "tnt_ignite"}, {"mcl_tnt", "tnt_ignite"}}) \ No newline at end of file diff --git a/df_farming/cave_wheat.lua b/df_farming/cave_wheat.lua index 276f1fb..3040c4a 100644 --- a/df_farming/cave_wheat.lua +++ b/df_farming/cave_wheat.lua @@ -18,7 +18,7 @@ local register_cave_wheat = function(number) is_ground_content = false, buildable_to = true, floodable = true, - groups = {snappy = 3, flammable = 2, plant = 1, not_in_creative_inventory = 1, attached_node = 1, light_sensitive_fungus = 11, flora = 1, handy=1, swordy=1, hoey=1, destroy_by_lava_flow=1,dig_by_piston=1}, + groups = {snappy = 3, flammable = 2, plant = 1, not_in_creative_inventory = 1, attached_node = 1, light_sensitive_fungus = 11, handy=1, swordy=1, hoey=1, destroy_by_lava_flow=1,dig_by_piston=1}, sounds = df_dependencies.sound_leaves(), selection_box = { type = "fixed", diff --git a/df_farming/dimple_cup.lua b/df_farming/dimple_cup.lua index 0dcb520..71adedd 100644 --- a/df_farming/dimple_cup.lua +++ b/df_farming/dimple_cup.lua @@ -2,7 +2,7 @@ local S = minetest.get_translator(minetest.get_current_modname()) local dimple_grow_time = df_farming.config.plant_growth_time * df_farming.config.dimple_cup_delay_multiplier / 4 -local dimple_cup_groups = {snappy = 3, flammable = 2, plant = 1, not_in_creative_inventory = 1, attached_node = 1, light_sensitive_fungus = 11, flower = 1, flora = 1, fire_encouragement=60,fire_flammability=100, compostability=70, handy=1,shearsy=1,hoey=1} +local dimple_cup_groups = {snappy = 3, flammable = 2, plant = 1, not_in_creative_inventory = 1, attached_node = 1, light_sensitive_fungus = 11, flower = 1, fire_encouragement=60,fire_flammability=100, compostability=70, handy=1,shearsy=1,hoey=1} local register_dimple_cup = function(number) local name = "df_farming:dimple_cup_"..tostring(number) diff --git a/df_farming/pig_tail.lua b/df_farming/pig_tail.lua index ecbf43f..d5dcc62 100644 --- a/df_farming/pig_tail.lua +++ b/df_farming/pig_tail.lua @@ -18,7 +18,7 @@ local register_pig_tail = function(number) is_ground_content = false, floodable = true, buildable_to = true, - groups = {snappy = 3, flammable = 2, plant = 1, not_in_creative_inventory = 1, attached_node = 1, light_sensitive_fungus = 11, flora = 1, fire_encouragement=60,fire_flammability=100, compostability=70, handy=1,shearsy=1,hoey=1, destroy_by_lava_flow=1,dig_by_piston=1}, + groups = {snappy = 3, flammable = 2, plant = 1, not_in_creative_inventory = 1, attached_node = 1, light_sensitive_fungus = 11, fire_encouragement=60,fire_flammability=100, compostability=70, handy=1,shearsy=1,hoey=1, destroy_by_lava_flow=1,dig_by_piston=1}, sounds = df_dependencies.sound_leaves(), selection_box = { type = "fixed", diff --git a/df_farming/plants.lua b/df_farming/plants.lua index 871179e..53c89ce 100644 --- a/df_farming/plants.lua +++ b/df_farming/plants.lua @@ -15,7 +15,7 @@ minetest.register_node("df_farming:dead_fungus", { is_ground_content = false, buildable_to = true, floodable = true, - groups = {snappy = 3, flammable = 2, plant = 1, not_in_creative_inventory = 1, attached_node = 1, flow_through = 1, flora = 1, fire_encouragement=60,fire_flammability=100,destroy_by_lava_flow=1,dig_by_piston=1, compostability=65, handy=1, hoey=1}, + groups = {snappy = 3, flammable = 2, plant = 1, not_in_creative_inventory = 1, attached_node = 1, flow_through = 1, fire_encouragement=60,fire_flammability=100,destroy_by_lava_flow=1,dig_by_piston=1, compostability=65, handy=1, hoey=1}, sounds = df_dependencies.sound_leaves(), selection_box = { type = "fixed", @@ -50,7 +50,7 @@ minetest.register_node("df_farming:cavern_fungi", { buildable_to = true, floodable = true, light_source = 6, - groups = {snappy = 3, flammable = 2, plant = 1, not_in_creative_inventory = 1, attached_node = 1, light_sensitive_fungus = 11, flow_through = 1, flora = 1, fire_encouragement=50,fire_flammability=60,destroy_by_lava_flow=1,dig_by_piston=1, compostability=65, handy=1, hoey=1}, + groups = {snappy = 3, flammable = 2, plant = 1, not_in_creative_inventory = 1, attached_node = 1, light_sensitive_fungus = 11, flow_through = 1, fire_encouragement=50,fire_flammability=60,destroy_by_lava_flow=1,dig_by_piston=1, compostability=65, handy=1, hoey=1}, sounds = df_dependencies.sound_leaves(), selection_box = { type = "fixed", diff --git a/df_farming/plump_helmet.lua b/df_farming/plump_helmet.lua index 69dc3ec..004b7f8 100644 --- a/df_farming/plump_helmet.lua +++ b/df_farming/plump_helmet.lua @@ -92,7 +92,7 @@ minetest.register_node("df_farming:plump_helmet_spawn", { tiles = { "dfcaverns_plump_helmet_cap.png", }, - groups = {snappy = 3, plant = 1, attached_node = 1, light_sensitive_fungus = 11, dfcaverns_cookable = 1, digtron_on_place=1, flora = 1, destroy_by_lava_flow=1,dig_by_piston=1, handy=1, hoey=1}, + groups = {snappy = 3, plant = 1, attached_node = 1, light_sensitive_fungus = 11, dfcaverns_cookable = 1, digtron_on_place=1, destroy_by_lava_flow=1,dig_by_piston=1, handy=1, hoey=1}, _dfcaverns_next_stage = "df_farming:plump_helmet_1", _dfcaverns_next_stage_time = plump_helmet_grow_time, drawtype = "nodebox", @@ -123,7 +123,7 @@ minetest.register_node("df_farming:plump_helmet_spawn", { end, }) -local plump_helmet_groups = {snappy = 3, flammable = 2, plant = 1, not_in_creative_inventory = 1, attached_node = 1, light_sensitive_fungus = 11, dfcaverns_cookable = 1, plump_helmet = 1, digtron_on_place=1, flora = 1, fire_encouragement=30,fire_flammability=100,destroy_by_lava_flow=1,dig_by_piston=1,compostability=65} +local plump_helmet_groups = {snappy = 3, flammable = 2, plant = 1, not_in_creative_inventory = 1, attached_node = 1, light_sensitive_fungus = 11, dfcaverns_cookable = 1, plump_helmet = 1, digtron_on_place=1, fire_encouragement=30,fire_flammability=100,destroy_by_lava_flow=1,dig_by_piston=1,compostability=65} local get_plump_helmet_groups = function(eatable) local ret = {} for key, val in pairs(plump_helmet_groups) do diff --git a/df_farming/quarry_bush.lua b/df_farming/quarry_bush.lua index e56feb3..8c78d5a 100644 --- a/df_farming/quarry_bush.lua +++ b/df_farming/quarry_bush.lua @@ -18,7 +18,7 @@ local register_quarry_bush = function(number) buildable_to = true, is_ground_content = false, floodable = true, - groups = {snappy = 3, flammable = 2, plant = 1, not_in_creative_inventory = 1, attached_node = 1, light_sensitive_fungus = 11, flora = 1, fire_encouragement=60,fire_flammability=100, compostability=50, handy=1,shearsy=1,hoey=1, destroy_by_lava_flow=1,dig_by_piston=1}, + groups = {snappy = 3, flammable = 2, plant = 1, not_in_creative_inventory = 1, attached_node = 1, light_sensitive_fungus = 11, fire_encouragement=60,fire_flammability=100, compostability=50, handy=1,shearsy=1,hoey=1, destroy_by_lava_flow=1,dig_by_piston=1}, sounds = df_dependencies.sound_leaves(), selection_box = { type = "fixed", diff --git a/df_farming/sweet_pod.lua b/df_farming/sweet_pod.lua index 92dd964..78a4661 100644 --- a/df_farming/sweet_pod.lua +++ b/df_farming/sweet_pod.lua @@ -21,7 +21,7 @@ local register_sweet_pod = function(number) is_ground_content = false, buildable_to = true, floodable = true, - groups = {snappy = 3, flammable = 2, plant = 1, not_in_creative_inventory = 1, attached_node = 1, light_sensitive_fungus = 11, flora = 1, fire_encouragement=60,fire_flammability=100, compostability=70, handy=1,shearsy=1,hoey=1, destroy_by_lava_flow=1,dig_by_piston=1}, + groups = {snappy = 3, flammable = 2, plant = 1, not_in_creative_inventory = 1, attached_node = 1, light_sensitive_fungus = 11, fire_encouragement=60,fire_flammability=100, compostability=70, handy=1,shearsy=1,hoey=1, destroy_by_lava_flow=1,dig_by_piston=1}, sounds = df_dependencies.sound_leaves(), selection_box = { type = "fixed", diff --git a/df_primordial_items/ceiling_fungus.lua b/df_primordial_items/ceiling_fungus.lua index 9257f59..4b590e2 100644 --- a/df_primordial_items/ceiling_fungus.lua +++ b/df_primordial_items/ceiling_fungus.lua @@ -40,7 +40,7 @@ minetest.register_node("df_primordial_items:glow_orb_hanging", { tiles = {"dfcaverns_mush_orb_vert.png"}, inventory_image = "dfcaverns_mush_orb_vert.png", wield_image = "dfcaverns_mush_orb_vert.png", - groups = {snappy = 3, flora = 1, flammable = 1, attached_node = 1, plant = 1, handy=1, swordy=1, hoey=1, destroy_by_lava_flow=1,dig_by_piston=1}, + groups = {snappy = 3, flammable = 1, attached_node = 1, plant = 1, handy=1, swordy=1, hoey=1, destroy_by_lava_flow=1,dig_by_piston=1}, paramtype = "light", paramtype2 = "degrotate", drawtype = "plantlike", diff --git a/df_primordial_items/fungal_nodes.lua b/df_primordial_items/fungal_nodes.lua index a15f9a5..6cda843 100644 --- a/df_primordial_items/fungal_nodes.lua +++ b/df_primordial_items/fungal_nodes.lua @@ -12,7 +12,7 @@ minetest.register_node("df_primordial_items:fungal_grass_1", { tiles = {"dfcaverns_mush_grass_01.png"}, inventory_image = "dfcaverns_mush_grass_01.png", wield_image = "dfcaverns_mush_grass_01.png", - groups = {snappy = 3, flora = 1, attached_node = 1, flammable = 1, primordial_fungal_plant = 1, light_sensitive_fungus = 11, plant=1, handy=1, swordy=1, hoey=1, destroy_by_lava_flow=1,dig_by_piston=1}, + groups = {snappy = 3, attached_node = 1, flammable = 1, primordial_fungal_plant = 1, light_sensitive_fungus = 11, plant=1, handy=1, swordy=1, hoey=1, destroy_by_lava_flow=1,dig_by_piston=1}, paramtype = "light", drawtype = "plantlike", buildable_to = true, @@ -33,7 +33,7 @@ minetest.register_node("df_primordial_items:fungal_grass_2", { tiles = {"dfcaverns_mush_grass_02.png"}, inventory_image = "dfcaverns_mush_grass_02.png", wield_image = "dfcaverns_mush_grass_02.png", - groups = {snappy = 3, flora = 1, attached_node = 1, flammable = 1, primordial_fungal_plant = 1, light_sensitive_fungus = 11, plant=1, handy=1, swordy=1, hoey=1, destroy_by_lava_flow=1,dig_by_piston=1}, + groups = {snappy = 3, attached_node = 1, flammable = 1, primordial_fungal_plant = 1, light_sensitive_fungus = 11, plant=1, handy=1, swordy=1, hoey=1, destroy_by_lava_flow=1,dig_by_piston=1}, paramtype = "light", drawtype = "plantlike", buildable_to = true, @@ -57,7 +57,7 @@ minetest.register_node("df_primordial_items:glow_orb", { tiles = {"dfcaverns_mush_orb.png"}, inventory_image = "dfcaverns_mush_orb.png", wield_image = "dfcaverns_mush_orb.png", - groups = {snappy = 3, flora = 1, attached_node = 1, flammable = 1, primordial_fungal_plant = 1, light_sensitive_fungus = 13, plant=1, handy=1, swordy=1, hoey=1, destroy_by_lava_flow=1,dig_by_piston=1}, + groups = {snappy = 3, attached_node = 1, flammable = 1, primordial_fungal_plant = 1, light_sensitive_fungus = 13, plant=1, handy=1, swordy=1, hoey=1, destroy_by_lava_flow=1,dig_by_piston=1}, paramtype = "light", drawtype = "plantlike", buildable_to = true, @@ -79,7 +79,7 @@ minetest.register_node("df_primordial_items:glow_orb_stalks", { tiles = {"dfcaverns_mush_stalks.png"}, inventory_image = "dfcaverns_mush_stalks.png", wield_image = "dfcaverns_mush_stalks.png", - groups = {snappy = 3, flora = 1, attached_node = 1, flammable = 1, primordial_fungal_plant = 1, light_sensitive_fungus = 13, plant=1, handy=1, swordy=1, hoey=1, destroy_by_lava_flow=1,dig_by_piston=1}, + groups = {snappy = 3, attached_node = 1, flammable = 1, primordial_fungal_plant = 1, light_sensitive_fungus = 13, plant=1, handy=1, swordy=1, hoey=1, destroy_by_lava_flow=1,dig_by_piston=1}, paramtype = "light", drawtype = "plantlike", buildable_to = true, @@ -101,7 +101,7 @@ minetest.register_node("df_primordial_items:glow_pods", { tiles = {"dfcaverns_mush_pods.png"}, inventory_image = "dfcaverns_mush_pods.png", wield_image = "dfcaverns_mush_pods.png", - groups = {snappy = 3, flora = 1, attached_node = 1, flammable = 1, primordial_fungal_plant = 1, light_sensitive_fungus = 13, plant=1, handy=1, swordy=1, hoey=1, destroy_by_lava_flow=1,dig_by_piston=1}, + groups = {snappy = 3, attached_node = 1, flammable = 1, primordial_fungal_plant = 1, light_sensitive_fungus = 13, plant=1, handy=1, swordy=1, hoey=1, destroy_by_lava_flow=1,dig_by_piston=1}, paramtype = "light", drawtype = "plantlike", drop = { diff --git a/df_primordial_items/giant_fern.lua b/df_primordial_items/giant_fern.lua index 0348aa0..863b0e8 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, flora = 1, 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, attached_node=1,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 265fbd4..4841a17 100644 --- a/df_primordial_items/jungle_mushroom.lua +++ b/df_primordial_items/jungle_mushroom.lua @@ -101,7 +101,7 @@ minetest.register_node("df_primordial_items:jungle_mushroom_sapling", { tiles = {"dfcaverns_jungle_mushroom_02.png^[brighten"}, inventory_image = "dfcaverns_jungle_mushroom_02.png^[brighten", wield_image = "dfcaverns_jungle_mushroom_02.png^[brighten", - groups = {snappy = 3, flora = 1, 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}, + 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}, selection_box = { type = "fixed", fixed = {-4 / 16, -0.5, -4 / 16, 4 / 16, 7 / 16, 4 / 16} diff --git a/df_primordial_items/jungle_nodes.lua b/df_primordial_items/jungle_nodes.lua index bc6c998..a44569c 100644 --- a/df_primordial_items/jungle_nodes.lua +++ b/df_primordial_items/jungle_nodes.lua @@ -3,7 +3,7 @@ local S = minetest.get_translator(minetest.get_current_modname()) ---------------------------------------------------- -- Ferns -local jungle_plant_groups = {snappy = 3, flora = 1, attached_node = 1, flammable = 1, primordial_jungle_plant = 1, light_sensitive_fungus = 13, handy=1, swordy=1, hoey=1, destroy_by_lava_flow=1,dig_by_piston=1, compostability = 30} +local jungle_plant_groups = {snappy = 3, attached_node = 1, flammable = 1, primordial_jungle_plant = 1, light_sensitive_fungus = 13, handy=1, swordy=1, hoey=1, destroy_by_lava_flow=1,dig_by_piston=1, compostability = 30} minetest.register_node("df_primordial_items:fern_1", { description = S("Primordial Fern"), @@ -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, flora = 1, 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, flammable=2,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, @@ -398,7 +398,7 @@ minetest.register_node("df_primordial_items:jungle_roots_1", { tiles = {"dfcaverns_jungle_root_01.png"}, inventory_image = "dfcaverns_jungle_root_01.png", wield_image = "dfcaverns_jungle_root_01.png", - groups = {snappy = 3, flora = 1, 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=3, fire_flammability=10, 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=3, fire_flammability=10, compostability=50}, paramtype = "light", drawtype = "plantlike", sounds = df_dependencies.sound_leaves(), @@ -418,7 +418,7 @@ minetest.register_node("df_primordial_items:jungle_roots_2", { tiles = {"dfcaverns_jungle_root_02.png"}, inventory_image = "dfcaverns_jungle_root_02.png", wield_image = "dfcaverns_jungle_root_02.png", - groups = {snappy = 3, flora = 1, 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=3, fire_flammability=10, 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=3, fire_flammability=10, compostability=50}, paramtype = "light", drawtype = "plantlike", sounds = df_dependencies.sound_leaves(), @@ -442,7 +442,7 @@ minetest.register_node("df_primordial_items:jungle_thorns", { visual_scale = 1.41, inventory_image = "dfcaverns_jungle_thorns_01.png", wield_image = "dfcaverns_jungle_thorns_01.png", - groups = {snappy = 3, flora = 1, flammable = 1, primordial_jungle_plant = 1, handy=1, swordy=1, hoey=1, destroy_by_lava_flow=1,dig_by_piston=1, fire_encouragement=30, fire_flammability=100, compostability=50}, + groups = {snappy = 3, flammable = 1, primordial_jungle_plant = 1, handy=1, swordy=1, hoey=1, destroy_by_lava_flow=1,dig_by_piston=1, fire_encouragement=30, fire_flammability=100, compostability=50}, paramtype = "light", drawtype = "plantlike", walkable = false, diff --git a/df_primordial_items/jungle_tree.lua b/df_primordial_items/jungle_tree.lua index 2484b46..73c3477 100644 --- a/df_primordial_items/jungle_tree.lua +++ b/df_primordial_items/jungle_tree.lua @@ -233,7 +233,7 @@ minetest.register_node("df_primordial_items:jungletree_sapling", { tiles = {"dfcaverns_jungle_sapling.png"}, inventory_image = "dfcaverns_jungle_sapling.png", wield_image = "dfcaverns_jungle_sapling.png", - groups = {snappy = 3, flora = 1, 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}, + 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/primordial_mushroom.lua b/df_primordial_items/primordial_mushroom.lua index ea4c6b2..10e3dac 100644 --- a/df_primordial_items/primordial_mushroom.lua +++ b/df_primordial_items/primordial_mushroom.lua @@ -35,7 +35,7 @@ minetest.register_node("df_primordial_items:mushroom_gills", { tiles = {"dfcaverns_mush_gills.png"}, inventory_image = "dfcaverns_mush_gills.png", wield_image = "dfcaverns_mush_gills.png", - groups = {snappy = 3, flora = 1, flammable = 1, leaves = 1, leafdecay = 8,handy=1, hoey=1, shearsy=1, swordy=1, deco_block=1, dig_by_piston=1, fire_encouragement=15, fire_flammability=30, compostability=30}, + groups = {snappy = 3, flammable = 1, leaves = 1, leafdecay = 8,handy=1, hoey=1, shearsy=1, swordy=1, deco_block=1, dig_by_piston=1, fire_encouragement=15, fire_flammability=30, compostability=30}, paramtype = "light", drawtype = "plantlike", waving = 2, @@ -71,7 +71,7 @@ minetest.register_node("df_primordial_items:mushroom_gills_glowing", { tiles = {"dfcaverns_mush_gills_glow.png"}, inventory_image = "dfcaverns_mush_gills_glow.png", wield_image = "dfcaverns_mush_gills_glow.png", - groups = {snappy = 3, flora = 1, flammable = 1, leaves = 1, leafdecay = 8,handy=1, hoey=1, shearsy=1, swordy=1, deco_block=1, dig_by_piston=1, fire_encouragement=15, fire_flammability=30, compostability=30}, + groups = {snappy = 3, flammable = 1, leaves = 1, leafdecay = 8,handy=1, hoey=1, shearsy=1, swordy=1, deco_block=1, dig_by_piston=1, fire_encouragement=15, fire_flammability=30, compostability=30}, paramtype = "light", drawtype = "plantlike", waving = 2, @@ -747,7 +747,7 @@ minetest.register_node("df_primordial_items:mush_sapling", { tiles = {"dfcaverns_mush_sapling.png"}, inventory_image = "dfcaverns_mush_sapling.png", wield_image = "dfcaverns_mush_sapling.png", - groups = {snappy = 3, flora = 1, attached_node = 1, flammable = 1, sapling = 1, light_sensitive_fungus = 11, 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 = 11, dig_by_piston=1,destroy_by_lava_flow=1,deco_block=1, compostability=30,dig_immediate=3}, selection_box = { type = "fixed", fixed = {-4 / 16, -0.5, -4 / 16, 4 / 16, 7 / 16, 4 / 16}