From 874f854688561d967c79dc238e4b2c5e51de4293 Mon Sep 17 00:00:00 2001 From: LeMagnesium Date: Fri, 15 Jan 2016 19:39:01 +0100 Subject: [PATCH] [minetestforfun_game] Update - Add new tree - Creative mod improved - New schematic files --- minetestforfun_game/mods/creative/init.lua | 184 ++++++++---- .../mods/creative/textures/trash_icon.png | Bin 0 -> 179 bytes minetestforfun_game/mods/default/README.txt | 8 + minetestforfun_game/mods/default/crafting.lua | 7 + .../mods/default/craftitems.lua | 32 ++- minetestforfun_game/mods/default/mapgen.lua | 263 ++++++++++++++++-- minetestforfun_game/mods/default/nodes.lua | 72 ++++- .../mods/default/schematics/acacia_tree.mts | Bin 204 -> 204 bytes .../mods/default/schematics/apple_tree.mts | Bin 161 -> 165 bytes .../schematics/apple_tree_from_sapling.mts | Bin 165 -> 167 bytes .../mods/default/schematics/aspen_tree.mts | Bin 0 -> 177 bytes .../schematics/aspen_tree_from_sapling.mts | Bin 0 -> 171 bytes .../mods/default/schematics/large_cactus.mts | Bin 94 -> 92 bytes .../mods/default/schematics/pine_tree.mts | Bin 175 -> 177 bytes .../default/textures/default_aspen_leaves.png | Bin 0 -> 761 bytes .../textures/default_aspen_sapling.png | Bin 0 -> 320 bytes .../default/textures/default_aspen_tree.png | Bin 0 -> 695 bytes .../textures/default_aspen_tree_top.png | Bin 0 -> 656 bytes .../default/textures/default_aspen_wood.png | Bin 0 -> 373 bytes .../default/textures/default_book_written.png | Bin 0 -> 228 bytes minetestforfun_game/mods/default/trees.lua | 15 +- minetestforfun_game/mods/doors/README.txt | 7 +- minetestforfun_game/mods/doors/init.lua | 49 +++- .../mods/doors/sounds/doors_door_close.ogg | Bin 12054 -> 6161 bytes .../mods/doors/sounds/doors_door_open.ogg | Bin 6584 -> 6184 bytes .../doors/textures/doors_trapdoor_steel.png | Bin 0 -> 153 bytes .../textures/doors_trapdoor_steel_side.png | Bin 0 -> 101 bytes minetestforfun_game/mods/flowers/init.lua | 164 +++++------ minetestforfun_game/mods/flowers/mapgen.lua | 12 +- minetestforfun_game/mods/screwdriver/init.lua | 4 + minetestforfun_game/mods/stairs/init.lua | 7 + 31 files changed, 631 insertions(+), 193 deletions(-) create mode 100644 minetestforfun_game/mods/creative/textures/trash_icon.png create mode 100644 minetestforfun_game/mods/default/schematics/aspen_tree.mts create mode 100644 minetestforfun_game/mods/default/schematics/aspen_tree_from_sapling.mts create mode 100644 minetestforfun_game/mods/default/textures/default_aspen_leaves.png create mode 100644 minetestforfun_game/mods/default/textures/default_aspen_sapling.png create mode 100644 minetestforfun_game/mods/default/textures/default_aspen_tree.png create mode 100644 minetestforfun_game/mods/default/textures/default_aspen_tree_top.png create mode 100644 minetestforfun_game/mods/default/textures/default_aspen_wood.png create mode 100644 minetestforfun_game/mods/default/textures/default_book_written.png create mode 100644 minetestforfun_game/mods/doors/textures/doors_trapdoor_steel.png create mode 100644 minetestforfun_game/mods/doors/textures/doors_trapdoor_steel_side.png diff --git a/minetestforfun_game/mods/creative/init.lua b/minetestforfun_game/mods/creative/init.lua index fc6c41b5..edbfb79c 100755 --- a/minetestforfun_game/mods/creative/init.lua +++ b/minetestforfun_game/mods/creative/init.lua @@ -1,11 +1,16 @@ -- minetest/creative/init.lua creative_inventory = {} -creative_inventory.creative_inventory_size = 0 -- Create detached creative inventory after loading all mods -minetest.after(0, function() - local inv = minetest.create_detached_inventory("creative", { +creative_inventory.init_creative_inventory = function(player) + local player_name = player:get_player_name() + creative_inventory[player_name] = {} + creative_inventory[player_name].size = 0 + creative_inventory[player_name].filter = nil + creative_inventory[player_name].start_i = 1 + + local inv = minetest.create_detached_inventory("creative_" .. player_name, { allow_move = function(inv, from_list, from_index, to_list, to_index, count, player) if minetest.setting_getbool("creative_mode") then return count @@ -35,19 +40,41 @@ minetest.after(0, function() end end, }) + + creative_inventory.update(player_name, nil, 2) + --print("creative inventory size: "..dump(creative_inventory.creative_inventory_size)) +end + +local function tab_category(tab_id) + local id_category = { + nil, -- Reserved for crafting tab. + minetest.registered_items, + minetest.registered_nodes, + minetest.registered_tools, + minetest.registered_craftitems + } + + -- If index out of range, show default ("All") page. + return id_category[tab_id] or id_category[2] +end + +function creative_inventory.update(player_name, filter, tab_id) local creative_list = {} - for name,def in pairs(minetest.registered_items) do - if (not def.groups.not_in_creative_inventory or def.groups.not_in_creative_inventory == 0) - and def.description and def.description ~= "" then + local inv = minetest.get_inventory({type = "detached", name = "creative_" .. player_name}) + + for name, def in pairs(tab_category(tab_id)) do + if not (def.groups.not_in_creative_inventory == 1) and + def.description and def.description ~= "" and + (not filter or def.name:find(filter, 1, true)) then creative_list[#creative_list+1] = name end end + table.sort(creative_list) inv:set_size("main", #creative_list) inv:set_list("main", creative_list) - creative_inventory.creative_inventory_size = #creative_list - --print("creative inventory size: "..dump(creative_inventory.creative_inventory_size)) -end) + creative_inventory[player_name].size = #creative_list +end -- Create the trash field local trash = minetest.create_detached_inventory("creative_trash", { @@ -66,70 +93,114 @@ local trash = minetest.create_detached_inventory("creative_trash", { }) trash:set_size("main", 1) - -creative_inventory.set_creative_formspec = function(player, start_i, pagenum) +creative_inventory.set_creative_formspec = function(player, start_i, pagenum, tab_id) + local player_name = player:get_player_name() + local filter = creative_inventory[player_name].filter or "" pagenum = math.floor(pagenum) - local pagemax = math.floor((creative_inventory.creative_inventory_size-1) / (6*4) + 1) - player:set_inventory_formspec( - "size[13,7.5]".. - --"image[6,0.6;1,2;player.png]".. - default.gui_bg.. - default.gui_bg_img.. - default.gui_slots.. - "list[current_player;main;5,3.5;8,1;]".. - "list[current_player;main;5,4.75;8,3;8]".. - "list[current_player;craft;8,0;3,3;]".. - "list[current_player;craftpreview;12,1;1,1;]".. - "image[11,1;1,1;gui_furnace_arrow_bg.png^[transformR270]".. - "list[detached:creative;main;0.3,0.5;4,6;"..tostring(start_i).."]".. - "label[2.0,6.55;"..tostring(pagenum).."/"..tostring(pagemax).."]".. - "button[0.3,6.5;1.6,1;creative_prev;<<]".. - "button[2.7,6.5;1.6,1;creative_next;>>]".. - "listring[current_player;main]".. - "listring[current_player;craft]".. - "listring[current_player;main]".. - "listring[detached:creative;main]".. - "label[5,1.5;Trash:]".. - "list[detached:creative_trash;main;5,2;1,1;]".. - default.get_hotbar_bg(5,3.5) + local pagemax = math.floor((creative_inventory[player_name].size - 1) / (3*8) + 1) + tab_id = tab_id or 2 + + player:set_inventory_formspec([[ + size[8,8.6] + image[4.06,3.4;0.8,0.8;trash_icon.png] + list[current_player;main;0,4.7;8,1;] + list[current_player;main;0,5.85;8,3;8] + list[detached:creative_trash;main;4,3.3;1,1;] + tablecolumns[color;text;color;text] + tableoptions[background=#00000000;highlight=#00000000;border=false] + button[5.4,3.2;0.8,0.9;creative_prev;<] + button[7.25,3.2;0.8,0.9;creative_next;>] + button[2.1,3.4;0.8,0.5;search;?] + button[2.75,3.4;0.8,0.5;clear;X] + tooltip[search;Search] + tooltip[clear;Reset] + listring[current_player;main] + ]] .. + "field[0.3,3.5;2.2,1;filter;;".. filter .."]".. + "listring[detached:creative_".. player_name ..";main]".. + "tabheader[0,0;tabs;Crafting,All,Nodes,Tools,Items;".. tostring(tab_id) ..";true;false]".. + "list[detached:creative_".. player_name ..";main;0,0;8,3;".. tostring(start_i) .."]".. + "table[6.05,3.35;1.15,0.5;pagenum;#FFFF00,".. tostring(pagenum) ..",#FFFFFF,/ ".. tostring(pagemax) .."]".. + default.get_hotbar_bg(0,4.7).. + default.gui_bg .. default.gui_bg_img .. default.gui_slots ) end + +creative_inventory.set_crafting_formspec = function(player) + player:set_inventory_formspec([[ + size[8,7.5] + list[current_player;craft;2,0.25;3,3;] + list[current_player;craftpreview;6,1.25;1,1;] + list[current_player;main;0,3.6;8,1;] + list[current_player;main;0,4.75;8,3;8] + list[detached:creative_trash;main;0,2.25;1,1;] + image[0.06,2.35;0.8,0.8;trash_icon.png] + image[5,1.25;1,1;gui_furnace_arrow_bg.png^[transformR270] + tabheader[0,0;tabs;Crafting,All,Nodes,Tools,Items;1;true;false] + listring[current_player;main] + listring[current_player;craft] + ]] .. + default.get_hotbar_bg(0,3.6).. + default.gui_bg .. default.gui_bg_img .. default.gui_slots + ) +end + minetest.register_on_joinplayer(function(player) -- If in creative mode, modify player's inventory forms if not minetest.setting_getbool("creative_mode") then return end - creative_inventory.set_creative_formspec(player, 0, 1) + creative_inventory.init_creative_inventory(player) + creative_inventory.set_creative_formspec(player, 0, 1, 2) end) + minetest.register_on_player_receive_fields(function(player, formname, fields) if not minetest.setting_getbool("creative_mode") then return end -- Figure out current page from formspec - local current_page = 0 + local player_name = player:get_player_name() local formspec = player:get_inventory_formspec() - local start_i = string.match(formspec, "list%[detached:creative;main;[%d.]+,[%d.]+;[%d.]+,[%d.]+;(%d+)%]") + local filter = formspec:match("filter;;([%w_:]+)") or "" + local start_i = formspec:match("list%[detached:creative_".. player_name ..";.*;(%d+)%]") + local tab_id = tonumber(formspec:match("tabheader%[.*;(%d+)%;.*%]")) + local inv_size = creative_inventory[player_name].size start_i = tonumber(start_i) or 0 - if fields.creative_prev then - start_i = start_i - 4*6 - end - if fields.creative_next then - start_i = start_i + 4*6 - end + if fields.quit then + if tab_id == 1 then + creative_inventory.set_crafting_formspec(player) + end + elseif fields.tabs then + if tonumber(fields.tabs) == 1 then + creative_inventory.set_crafting_formspec(player) + else + creative_inventory.update(player_name, filter, tonumber(fields.tabs)) + creative_inventory.set_creative_formspec(player, 0, 1, tonumber(fields.tabs)) + end + elseif fields.clear then + creative_inventory[player_name].filter = "" + creative_inventory.update(player_name, nil, tab_id) + creative_inventory.set_creative_formspec(player, 0, 1, tab_id) + elseif fields.search then + creative_inventory[player_name].filter = fields.filter:lower() + creative_inventory.update(player_name, fields.filter:lower(), tab_id) + creative_inventory.set_creative_formspec(player, 0, 1, tab_id) + else + if fields.creative_prev then + start_i = start_i - 3*8 + if start_i < 0 then + start_i = inv_size - (inv_size % (3*8)) + end + elseif fields.creative_next then + start_i = start_i + 3*8 + if start_i >= inv_size then + start_i = 0 + end + end - if start_i < 0 then - start_i = start_i + 4*6 + creative_inventory.set_creative_formspec(player, start_i, start_i / (3*8) + 1, tab_id) end - if start_i >= creative_inventory.creative_inventory_size then - start_i = start_i - 4*6 - end - - if start_i < 0 or start_i >= creative_inventory.creative_inventory_size then - start_i = 0 - end - - creative_inventory.set_creative_formspec(player, start_i, start_i / (6*4) + 1) end) if minetest.setting_getbool("creative_mode") then @@ -137,7 +208,7 @@ if minetest.setting_getbool("creative_mode") then minetest.register_item(":", { type = "none", wield_image = "wieldhand.png", - wield_scale = {x=1,y=1,z=2.5}, + wield_scale = {x=1, y=1, z=2.5}, range = 10, tool_capabilities = { full_punch_interval = 0.5, @@ -163,7 +234,7 @@ if minetest.setting_getbool("creative_mode") then end local inv = digger:get_inventory() if inv then - for _,item in ipairs(drops) do + for _, item in ipairs(drops) do item = ItemStack(item):get_name() if not inv:contains_item("main", item) then inv:add_item("main", item) @@ -171,5 +242,4 @@ if minetest.setting_getbool("creative_mode") then end end end - end diff --git a/minetestforfun_game/mods/creative/textures/trash_icon.png b/minetestforfun_game/mods/creative/textures/trash_icon.png new file mode 100644 index 0000000000000000000000000000000000000000..e789ad634450a5fa5227e9efd8fe804703d3eece GIT binary patch literal 179 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!D3?x-;bCrM;TYyi9E0AtzXqc3_Qw7LkED7=p zW^j0RBMrn!@^*J&=wOxg0CG4BJR*x37`TN&n2}-D90{Nxdx@v7EBgaRE>UjzKQU*6 zfkJAYE{-7_*OL=$4jfo=K;eJ8V`JyRfAY-?+|4IMbT~B5{cmn;WMp`p!KrFv-vct4 N!PC{xWt~$(69DO#EW-c* literal 0 HcmV?d00001 diff --git a/minetestforfun_game/mods/default/README.txt b/minetestforfun_game/mods/default/README.txt index f0dea682..c190cee0 100755 --- a/minetestforfun_game/mods/default/README.txt +++ b/minetestforfun_game/mods/default/README.txt @@ -148,6 +148,14 @@ BlockMen (CC BY-SA 3.0): heart.png gui_*.png +sofar (CC BY-SA 3.0): + default_book_written.png, based on default_book.png + default_aspen_sapling + default_aspen_leaves + default_aspen_tree + default_aspen_tree_top, derived from default_pine_tree_top (by paramat) + default_aspen_wood, derived from default_pine_wood (by paramat) + Neuromancer (CC BY-SA 2.0): default_cobble.png, based on texture by Brane praefect default_mossycobble.png, based on texture by Brane praefect diff --git a/minetestforfun_game/mods/default/crafting.lua b/minetestforfun_game/mods/default/crafting.lua index 5b86f19c..bf51bd61 100755 --- a/minetestforfun_game/mods/default/crafting.lua +++ b/minetestforfun_game/mods/default/crafting.lua @@ -35,6 +35,13 @@ minetest.register_craft({ } }) +minetest.register_craft({ + output = 'default:aspen_wood 4', + recipe = { + {'default:aspen_tree'}, + } +}) + minetest.register_craft({ output = 'default:stick 9', recipe = { diff --git a/minetestforfun_game/mods/default/craftitems.lua b/minetestforfun_game/mods/default/craftitems.lua index 9761be50..c630c72b 100755 --- a/minetestforfun_game/mods/default/craftitems.lua +++ b/minetestforfun_game/mods/default/craftitems.lua @@ -85,12 +85,42 @@ minetest.register_craftitem("default:book", { minetest.register_craftitem("default:book_written", { description = "Book With Text", - inventory_image = "default_book.png", + inventory_image = "default_book_written.png", groups = {book=1, not_in_creative_inventory=1}, stack_max = 1, on_use = book_on_use, }) +minetest.register_craft({ + type = "shapeless", + output = "default:book_written", + recipe = { "default:book", "default:book_written" } +}) + +minetest.register_on_craft(function(itemstack, player, old_craft_grid, craft_inv) + if itemstack:get_name() ~= "default:book_written" then + return + end + + local copy = ItemStack("default:book_written") + local original + local index + for i = 1, player:get_inventory():get_size("craft") do + if old_craft_grid[i]:get_name() == "default:book_written" then + original = old_craft_grid[i] + index = i + end + end + if not original then + return + end + local copymeta = original:get_metadata() + -- copy of the book held by player's mouse cursor + itemstack:set_metadata(copymeta) + -- put the book with metadata back in the craft grid + craft_inv:set_stack("craft", index, original) +end) + minetest.register_craftitem("default:coal_lump", { description = "Coal Lump", wield_scale = {x = 1, y = 1, z = 2}, diff --git a/minetestforfun_game/mods/default/mapgen.lua b/minetestforfun_game/mods/default/mapgen.lua index 4e17fa6a..f8d97c99 100755 --- a/minetestforfun_game/mods/default/mapgen.lua +++ b/minetestforfun_game/mods/default/mapgen.lua @@ -2,6 +2,7 @@ -- Aliases for map generator outputs -- +minetest.register_alias("mapgen_air", "air") minetest.register_alias("mapgen_stone", "default:stone") minetest.register_alias("mapgen_dirt", "default:dirt") minetest.register_alias("mapgen_dirt_with_grass", "default:dirt_with_grass") @@ -74,10 +75,11 @@ function default.register_ores() -- Sand - minetest.register_ore({ - ore_type = "blob", - ore = "default:sand", - wherein = {"default:stone"}, + minetest.register_ore({ + ore_type = "blob", + ore = "default:sand", + wherein = {"default:stone", "default:sandstone", + "default:desert_stone"}, clust_scarcity = 24 * 24 * 24, clust_size = 7, y_min = -63, @@ -96,9 +98,9 @@ function default.register_ores() -- Dirt minetest.register_ore({ - ore_type = "blob", - ore = "default:dirt", - wherein = {"default:stone"}, + ore_type = "blob", + ore = "default:dirt", + wherein = {"default:stone", "default:sandstone"}, clust_scarcity = 24 * 24 * 24, clust_size = 7, y_min = -63, @@ -117,9 +119,9 @@ function default.register_ores() -- Gravel minetest.register_ore({ - ore_type = "blob", - ore = "default:gravel", - wherein = {"default:stone"}, + ore_type = "blob", + ore = "default:gravel", + wherein = {"default:stone"}, clust_scarcity = 24 * 24 * 24, clust_size = 7, y_min = -31000, @@ -773,12 +775,30 @@ function default.register_biomes() --depth_water_top = , --node_water = "", --node_river_water = "", - y_min = 5, + y_min = 6, y_max = 31000, heat_point = 40, humidity_point = 35, }) + minetest.register_biome({ + name = "stone_grassland_dunes", + --node_dust = "", + node_top = "default:sand", + depth_top = 1, + node_filler = "default:sand", + depth_filler = 2, + --node_stone = "", + --node_water_top = "", + --depth_water_top = , + --node_water = "", + --node_river_water = "", + y_min = 5, + y_max = 5, + heat_point = 40, + humidity_point = 35, + }) + minetest.register_biome({ name = "stone_grassland_ocean", --node_dust = "", @@ -810,12 +830,30 @@ function default.register_biomes() --depth_water_top = , --node_water = "", --node_river_water = "", - y_min = 5, + y_min = 6, y_max = 31000, heat_point = 40, humidity_point = 65, }) + minetest.register_biome({ + name = "coniferous_forest_dunes", + --node_dust = "", + node_top = "default:sand", + depth_top = 1, + node_filler = "default:sand", + depth_filler = 3, + --node_stone = "", + --node_water_top = "", + --depth_water_top = , + --node_water = "", + --node_river_water = "", + y_min = 5, + y_max = 5, + heat_point = 40, + humidity_point = 65, + }) + minetest.register_biome({ name = "coniferous_forest_ocean", --node_dust = "", @@ -847,12 +885,30 @@ function default.register_biomes() --depth_water_top = , --node_water = "", --node_river_water = "", - y_min = 5, + y_min = 6, y_max = 31000, heat_point = 60, humidity_point = 35, }) + minetest.register_biome({ + name = "sandstone_grassland_dunes", + --node_dust = "", + node_top = "default:sand", + depth_top = 1, + node_filler = "default:sand", + depth_filler = 2, + node_stone = "default:sandstone", + --node_water_top = "", + --depth_water_top = , + --node_water = "", + --node_river_water = "", + y_min = 5, + y_max = 5, + heat_point = 60, + humidity_point = 35, + }) + minetest.register_biome({ name = "sandstone_grassland_ocean", --node_dust = "", @@ -1227,7 +1283,9 @@ local function register_grass_decoration(offset, scale, length) persist = 0.6 }, biomes = {"stone_grassland", "sandstone_grassland", - "deciduous_forest", "coniferous_forest"}, + "deciduous_forest", "coniferous_forest", + "stone_grassland_dunes", "sandstone_grassland_dunes", + "coniferous_forest_dunes"}, y_min = 1, y_max = 31000, decoration = "default:grass_"..length, @@ -1257,7 +1315,7 @@ end function default.register_decorations() minetest.clear_registered_decorations() - -- Apple tree + -- Apple tree and log minetest.register_decoration({ deco_type = "schematic", @@ -1278,7 +1336,40 @@ function default.register_decorations() flags = "place_center_x, place_center_z", }) - -- Jungle tree + minetest.register_decoration({ + deco_type = "schematic", + place_on = {"default:dirt_with_grass"}, + sidelen = 16, + noise_params = { + offset = 0.002, + scale = 0.001, + spread = {x = 250, y = 250, z = 250}, + seed = 2, + octaves = 3, + persist = 0.66 + }, + biomes = {"deciduous_forest"}, + y_min = 1, + y_max = 31000, + schematic = { + size = { x = 3, y = 3, z = 1}, + data = { + { name = "air", prob = 0 }, + { name = "air", prob = 0 }, + { name = "air", prob = 0 }, + { name = "default:tree", param2 = 12, prob = 191 }, + { name = "default:tree", param2 = 12 }, + { name = "default:tree", param2 = 12, prob = 127 }, + { name = "air", prob = 0 }, + { name = "flowers:mushroom_brown", prob = 63 }, + { name = "air", prob = 0 }, + }, + }, + flags = "place_center_x", + rotation = "random", + }) + + -- Jungle tree and log minetest.register_decoration({ deco_type = "schematic", @@ -1293,7 +1384,33 @@ function default.register_decorations() rotation = "random", }) - -- Taiga and temperate coniferous forest pine tree + minetest.register_decoration({ + deco_type = "schematic", + place_on = {"default:dirt_with_grass", "default:dirt"}, + sidelen = 80, + fill_ratio = 0.01, + biomes = {"rainforest", "rainforest_swamp"}, + y_min = 1, + y_max = 31000, + schematic = { + size = { x = 3, y = 3, z = 1}, + data = { + { name = "air", prob = 0 }, + { name = "air", prob = 0 }, + { name = "air", prob = 0 }, + { name = "default:jungletree", param2 = 12, prob = 191 }, + { name = "default:jungletree", param2 = 12 }, + { name = "default:jungletree", param2 = 12, prob = 127 }, + { name = "air", prob = 0 }, + { name = "flowers:mushroom_brown", prob = 127 }, + { name = "air", prob = 0 }, + }, + }, + flags = "place_center_x", + rotation = "random", + }) + + -- Taiga and temperate coniferous forest pine tree and log minetest.register_decoration({ deco_type = "schematic", @@ -1314,7 +1431,33 @@ function default.register_decorations() flags = "place_center_x, place_center_z", }) - -- Acacia tree + minetest.register_decoration({ + deco_type = "schematic", + place_on = {"default:dirt_with_snow", "default:dirt_with_grass"}, + sidelen = 80, + fill_ratio = 0.003, + biomes = {"taiga", "coniferous_forest"}, + y_min = 1, + y_max = 31000, + schematic = { + size = { x = 3, y = 3, z = 1}, + data = { + { name = "air", prob = 0 }, + { name = "air", prob = 0 }, + { name = "air", prob = 0 }, + { name = "default:pine_tree", param2 = 12, prob = 191 }, + { name = "default:pine_tree", param2 = 12 }, + { name = "default:pine_tree", param2 = 12, prob = 127 }, + { name = "air", prob = 0 }, + { name = "flowers:mushroom_red", prob = 63 }, + { name = "air", prob = 0 }, + }, + }, + flags = "place_center_x", + rotation = "random", + }) + + -- Acacia tree and log minetest.register_decoration({ deco_type = "schematic", @@ -1336,6 +1479,90 @@ function default.register_decorations() rotation = "random", }) + minetest.register_decoration({ + deco_type = "schematic", + place_on = {"default:dirt_with_dry_grass"}, + sidelen = 16, + noise_params = { + offset = 0, + scale = 0.001, + spread = {x = 250, y = 250, z = 250}, + seed = 2, + octaves = 3, + persist = 0.66 + }, + biomes = {"savanna"}, + y_min = 1, + y_max = 31000, + schematic = { + size = { x = 3, y = 2, z = 1}, + data = { + { name = "air", prob = 0 }, + { name = "air", prob = 0 }, + { name = "air", prob = 0 }, + { name = "default:acacia_tree", param2 = 12, prob = 191 }, + { name = "default:acacia_tree", param2 = 12 }, + { name = "default:acacia_tree", param2 = 12, prob = 127 }, + }, + }, + flags = "place_center_x", + rotation = "random", + }) + + -- Aspen tree and log + + minetest.register_decoration({ + deco_type = "schematic", + place_on = {"default:dirt_with_grass"}, + sidelen = 16, + noise_params = { + offset = 0.01, + scale = -0.02, + spread = {x = 250, y = 250, z = 250}, + seed = 2, + octaves = 3, + persist = 0.66 + }, + biomes = {"deciduous_forest"}, + y_min = 1, + y_max = 31000, + schematic = minetest.get_modpath("default").."/schematics/aspen_tree.mts", + flags = "place_center_x, place_center_z", + rotation = "random", + }) + + minetest.register_decoration({ + deco_type = "schematic", + place_on = {"default:dirt_with_grass"}, + sidelen = 16, + noise_params = { + offset = 0.0005, + scale = -0.001, + spread = {x = 250, y = 250, z = 250}, + seed = 2, + octaves = 3, + persist = 0.66 + }, + biomes = {"deciduous_forest"}, + y_min = 1, + y_max = 31000, + schematic = { + size = { x = 3, y = 3, z = 1}, + data = { + { name = "air", prob = 0 }, + { name = "air", prob = 0 }, + { name = "air", prob = 0 }, + { name = "default:aspen_tree", param2 = 12 }, + { name = "default:aspen_tree", param2 = 12 }, + { name = "default:aspen_tree", param2 = 12, prob = 127 }, + { name = "flowers:mushroom_red", prob = 63 }, + { name = "flowers:mushroom_brown", prob = 63 }, + { name = "air", prob = 0 }, + }, + }, + flags = "place_center_x", + rotation = "random", + }) -- Large cactus minetest.register_decoration({ diff --git a/minetestforfun_game/mods/default/nodes.lua b/minetestforfun_game/mods/default/nodes.lua index 900d1af9..e0aa94a7 100755 --- a/minetestforfun_game/mods/default/nodes.lua +++ b/minetestforfun_game/mods/default/nodes.lua @@ -80,6 +80,11 @@ default:acacia_wood default:acacia_leaves default:acacia_sapling +default:aspen_tree +default:aspen_wood +default:aspen_leaves +default:aspen_sapling + default:cherry_tree default:cherry_log default:cherry_plank @@ -822,6 +827,58 @@ minetest.register_node("default:acacia_sapling", { sounds = default.node_sound_leaves_defaults(), }) +minetest.register_node("default:aspen_tree", { + description = "Aspen Tree", + tiles = {"default_aspen_tree_top.png", "default_aspen_tree_top.png", + "default_aspen_tree.png"}, + paramtype2 = "facedir", + is_ground_content = false, + groups = {tree = 1, choppy = 2, oddly_breakable_by_hand = 1, flammable = 2}, + sounds = default.node_sound_wood_defaults(), + + on_place = minetest.rotate_node +}) + +minetest.register_node("default:aspen_wood", { + description = "Aspen Wood Planks", + tiles = {"default_aspen_wood.png"}, + is_ground_content = false, + groups = {choppy = 2, oddly_breakable_by_hand = 2, flammable = 3, wood = 1}, + sounds = default.node_sound_wood_defaults(), +}) + +minetest.register_node("default:aspen_leaves", { + description = "Aspen Leaves", + drawtype = "allfaces_optional", + visual_scale = 1.3, + tiles = {"default_aspen_leaves.png"}, + waving = 1, + paramtype = "light", + is_ground_content = false, + groups = {snappy = 3, leafdecay = 3, flammable = 2, leaves = 1}, + drop = { + max_items = 1, + items = { + {items = {"default:aspen_sapling"}, rarity = 20}, + {items = {"default:aspen_leaves"}} + } + }, + sounds = default.node_sound_leaves_defaults(), + + after_place_node = default.after_place_leaves, +}) + +minetest.register_node("default:aspen_sapling", { + description = "Aspen Tree Sapling", + drawtype = "plantlike", + visual_scale = 1.0, + tiles = {"default_aspen_sapling.png"}, + inventory_image = "default_aspen_sapling.png", + wield_image = "default_aspen_sapling.png", + paramtype = "light", + sunlight_propagates = true, +}) + -- From BFD, cherry tree minetest.register_node("default:cherry_tree", { description = "Cherry Log", @@ -906,7 +963,8 @@ minetest.register_node("default:cherry_sapling", { type = "fixed", fixed = {-0.3, -0.5, -0.3, 0.3, 0.35, 0.3} }, - groups = {snappy=2,dig_immediate=3,flammable=2,attached_node=1,sapling=1}, + groups = {snappy = 2, dig_immediate = 3, flammable = 2, + attached_node = 1, sapling = 1}, sounds = default.node_sound_leaves_defaults(), }) @@ -1376,8 +1434,8 @@ minetest.register_node("default:water_source", { liquid_alternative_flowing = "default:water_flowing", liquid_alternative_source = "default:water_source", liquid_viscosity = 1, + post_effect_color = {a = 103, r = 30, g = 60, b = 90}, liquid_range = 6, - post_effect_color = {a = 120, r = 20, g = 60, b = 80}, groups = {water = 3, liquid = 3, puts_out_fire = 1}, }) @@ -1422,8 +1480,8 @@ minetest.register_node("default:water_flowing", { liquid_alternative_flowing = "default:water_flowing", liquid_alternative_source = "default:water_source", liquid_viscosity = 1, + post_effect_color = {a = 103, r = 30, g = 60, b = 90}, liquid_range = 6, - post_effect_color = {a = 120, r = 20, g = 60, b = 80}, groups = {water = 3, liquid = 3, puts_out_fire = 1, not_in_creative_inventory=1}, }) @@ -1470,7 +1528,7 @@ minetest.register_node("default:river_water_source", { liquid_viscosity = 1, liquid_renewable = false, liquid_range = 2, - post_effect_color = {a = 64, r = 100, g = 100, b = 200}, + post_effect_color = {a = 103, r = 30, g = 76, b = 90}, groups = {water = 3, liquid = 3, puts_out_fire = 1}, }) @@ -1517,7 +1575,7 @@ minetest.register_node("default:river_water_flowing", { liquid_viscosity = 1, liquid_renewable = false, liquid_range = 2, - post_effect_color = {a = 64, r = 100, g = 100, b = 200}, + post_effect_color = {a = 103, r = 30, g = 76, b = 90}, groups = {water = 3, liquid = 3, puts_out_fire = 1, not_in_creative_inventory = 1}, }) @@ -1566,7 +1624,7 @@ minetest.register_node("default:lava_source", { liquid_range = 6, liquid_renewable = false, damage_per_second = 4 * 2, - post_effect_color = {a = 220, r = 250, g = 70, b = 20}, + post_effect_color = {a = 191, r = 255, g = 64, b = 0}, groups = {lava = 3, liquid = 2, hot = 3, igniter = 1}, }) @@ -1614,7 +1672,7 @@ minetest.register_node("default:lava_flowing", { liquid_range = 6, liquid_renewable = false, damage_per_second = 4 * 2, - post_effect_color = {a = 220, r = 250, g = 70, b = 20}, + post_effect_color = {a = 191, r = 255, g = 64, b = 0}, groups = {lava = 3, liquid = 2, hot = 3, igniter = 1, not_in_creative_inventory = 1}, }) diff --git a/minetestforfun_game/mods/default/schematics/acacia_tree.mts b/minetestforfun_game/mods/default/schematics/acacia_tree.mts index 4732ade3d9df99c4f543ad168dc090e551cfdee5..ec7d5f9a539030e474682d24f76fe1b466fa36e7 100755 GIT binary patch delta 68 zcmV-K0K5Op0n7oARRef*Ymrz!HX*{epmyKg800M~&jQT($q82|tP delta 110 zcmV-!0FnQt0igjBO;l4&00aO900#gCe}6xJe}9n^JX2zUqyt6n0jB{IO;l4&00aO900;mDe}6xJe}6xb5eSJOyP#sX99whpo0mcFn`SSJh UFeUZ*#F;{tTLv)z09n5q5taZdw*UYD diff --git a/minetestforfun_game/mods/default/schematics/aspen_tree.mts b/minetestforfun_game/mods/default/schematics/aspen_tree.mts new file mode 100644 index 0000000000000000000000000000000000000000..fe54f6777c8848ea3578c2f7fbf6d6904339fdf1 GIT binary patch literal 177 zcmeYb3HD`RVPIw8VqmSWkFN&;Ai==Qz?_&_#2}KAnwD6aQ(~1^T#%X8EBt6PWVj-=57U zb7l5*EDg@-YJRk2N8sNlAN%y*?daP6k9i(L=R^(;qi>$MZY`$M_0FnfIi zd+$CsEah7EK%~oQ@voB~`}E)K=-U3TS<^F6Ih4!v+slhS{MqYbKR-L2Khg53*JA5= NcRot%+;7!q2LKWxO56Yd literal 0 HcmV?d00001 diff --git a/minetestforfun_game/mods/default/schematics/large_cactus.mts b/minetestforfun_game/mods/default/schematics/large_cactus.mts index b71077b3c5a0f397aade8d76cbe2f0a081d80b9f..43555b962f7bdb0e13a16b5ede7c1fafe9be97c4 100755 GIT binary patch delta 35 qcma!xnP4Y(MOpZ30z=Bx+svHRD_S^=6q(o@#9A1-85!z5IdlQsV+xZ1 delta 37 tcma!vn_#E#hh6Y%z#=)GhBZ~y3W@wv1sv5}4ltZ(5=by)Sm?>I761dX4H*Cc diff --git a/minetestforfun_game/mods/default/schematics/pine_tree.mts b/minetestforfun_game/mods/default/schematics/pine_tree.mts index 3a3fa7ad0e7f7c3bbd3282856d1985734b62d702..576a2dfb79acfa829190dd5358c04693b9acabc4 100755 GIT binary patch delta 41 xcmZ3_xRG%}zfyzbf5VO{1;&tH`{m@tbGYuPoVwe@9H1WK#wg0bkiN>e7XU{W4wC=? delta 39 xcmV+?0NDSr0j~j&k0AWVPSgVlpwj>K__$zG;3iS-794;&;W7%S004fuG!25t5y}7n diff --git a/minetestforfun_game/mods/default/textures/default_aspen_leaves.png b/minetestforfun_game/mods/default/textures/default_aspen_leaves.png new file mode 100644 index 0000000000000000000000000000000000000000..17a708d1783819a4acdd09e730a2c1a9698dd686 GIT binary patch literal 761 zcmV6QJkpf{zalHKgb?9R@-GslZHOI6V4>U?p|;dvebsJ(qyjavlqxpd~b z0GwQTPNUf2%Gw|Ym|2|EqF*3MGrnHGBLEISE*@L;9kMK9e&q!P_H3(A?7M zbTM9mm)<<00K@Ia7bdg-xW){(A3ynoW_eDv60-5h&+_WKlbTqUb`((!OJpj@?DErU zGoM~uCrLAWuYmD=zB+eXW|xm@GwNZJoJ#0Xt?Z>8HOaIZj~Vms)2i<*C(a?Q~&d?Yba>D;ZZW{Q9>;0#I9;)V|G$0>mym43y zqHI3&-9NoBY`pRpS$UrGT% ryHf5ta(4NMzWmlxdTjon@;~?!-@`}`k9r=l00000NkvXXu0mjfvp{<5 literal 0 HcmV?d00001 diff --git a/minetestforfun_game/mods/default/textures/default_aspen_sapling.png b/minetestforfun_game/mods/default/textures/default_aspen_sapling.png new file mode 100644 index 0000000000000000000000000000000000000000..f8d9136a0b5c0397e3feb54f1abce3e44e75ec47 GIT binary patch literal 320 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4(FKU}X1naSX9Iot$uh$t(Qk|8xZ* zgGAw)PhXXtzayQ5*pPOs&FM9vUqwQFRQ?(1cez>s0^ MboFyt=akR{08U_&&Hw-a literal 0 HcmV?d00001 diff --git a/minetestforfun_game/mods/default/textures/default_aspen_tree.png b/minetestforfun_game/mods/default/textures/default_aspen_tree.png new file mode 100644 index 0000000000000000000000000000000000000000..933b9cad5eee86718a3c916251725c6324ac5824 GIT binary patch literal 695 zcmV;o0!aOdP)Pr9mrKsMQmSp+JkJM%K~+^+>o|^sAXu$d2q9}NA*A2$7e(Q4&NrJ4gs?2j z@9*#D=jWzr;y89)*BH|@jpupRS^$8Q5&!@nA0MMA!WbK4T-U9t%JaOYX^b(9F+xb! zby7;-_wzg_gdoP)Y&O$c0|2($ZQHh-b89Wexa&Hl6vh|;ptYuy{`~wPYwi2{`_G~Jiy6hQkLb($w{x*n@*?K*VkbfYOM(&JF2_8 zyTxLWrs?VFX_6%H_VyMbG@VY5kB@gG2%#iNthGl+N5+_4m43f(jJdhFfuEnBd7cl4 z!>Xzr$H}rR2m%PGZ zthHenc3r2n?z)arikqfs+qNvrD2jF|eBTEED5ZSguj{(1DhMGVq;1>PYUM;xB!s{i zd!FaIE&w3UbEQ-mhFO*sMS&3N^?ICh0KjN8LKhbo|Ni}R9H*{p&+{OJ>-GBJ;9x$V zzrMaoDa*2?lmkH=%zb@%r6>bg$T z^y%pdo}HaB#s-4{A>{J%^8EaKI2?{fBT8wOWe~!us)P_PFE5M5;`jF#-rwJ2j1LbF zqbMST2q7SZl+xV~=bR8y*EM4dLO7q#;c~f@QfjSt_MGz|2$WLB7)mLn)N!2cb{j=aKk133K*L}%P*&?qHS0i}wP8c;MhU(cV{%ZK0U z+n-ekp}YLv{qSv^U)IM_cL$8LZ&y)C(o&$5x?=d;bkc6UFh*HxuR;heVF~?r-&5EC zK)=eWGDT?t0szA0UyWatQr2Zr^E@{Pn+u2aT5pYezP7^+I~OAfluWVidH~3I2LaYv zrL_*hmsET?G%iQa2Bki|5g@W(;=U>h*eHR85(y%lrb!A>m@9aZO;!@K56eG)r};|G zF%b&j5HkUaB7{)GFx1#*XwZHGB?IQ@){@Kh(`dS?qyzwzqRs_nHLt6x>w24?TbUJY z0$OrOexdcDZV`!@kvT_Z%%%K)z;PUd3#BlpltL<;*l%%OKYf^hBPxVU*(KD9GdE46 z&gb(o)c}PkXqM)tV?ZU~WElXo7QyXp-$Je=hH0AAIF2efQ@zD=`~3Kqs^z*LS_}e9 zVUhK*!nHY{fXU6*{J93HJO9@VOr!-%;iaw6-g|?^T(R;6!Wl>7CZ5ygzjJ1kr+qMAE qG>x(L@$qpOhW+X3csvpjGyeza5{5fc{>$(H0000KP)a(Q6^WAQ`lC-7wi&FU}meApBRSr#+|tcUpRR zegexEy<{we#DTo8%EBFHq*>2NL?8gLX4|9#g0DFw5dr(9)K?<_nKgPi0sU#;)Yc9F zMT!GKkpiHvW*`Y)#BmH?@LqF6r1%U6GSseraZ`MKa%#8RLG%eA3UM##AOVnelV-*+ z17OZG%pM+bPTp5#z78P(khxv5#g^}=C{k=f0#J$OY+c3aYM}k z{PomC1A?zV-rpE6vqlc|n(iaz`R+U!Y-V0Xjcf>2c}O!!E2JRi&LC TFEZ)J00000NkvXXu0mjfULl|; literal 0 HcmV?d00001 diff --git a/minetestforfun_game/mods/default/textures/default_book_written.png b/minetestforfun_game/mods/default/textures/default_book_written.png new file mode 100644 index 0000000000000000000000000000000000000000..d843e5f6d7c7cc0a7a0740aed086390f33713d7e GIT binary patch literal 228 zcmeAS@N?(olHy`uVBq!ia0vp^0zfRt!VDzU8V$b#Dct~{5LX~=r@>Yh!0T_wQ4_>< z`TF_2ySHuGvSR9l+S@m-tXn&O?#%WGYtHv?Ud))(`Ssg7R-gvPk|4ie28U-i(tw;) zPZ!4!j_b(>_*hsMY?-9gk;HPzk4a(Q#tDl%lmZ+)E7o-_n8eV$VDhYwDypuGYzvjW z&hyB+N=vjP%@OH!JuEFD;q5BZdQ`gc))FSy)`MzBdc4AIGj#R_3M8>FX1GwIlAXxF Y@W+}@MPN@vC(uF$Pgg&ebxsLQ07*AZ#Q*>R literal 0 HcmV?d00001 diff --git a/minetestforfun_game/mods/default/trees.lua b/minetestforfun_game/mods/default/trees.lua index e2fb9799..15491693 100755 --- a/minetestforfun_game/mods/default/trees.lua +++ b/minetestforfun_game/mods/default/trees.lua @@ -28,7 +28,8 @@ end minetest.register_abm({ nodenames = {"default:sapling", "default:junglesapling", - "default:pine_sapling", "default:acacia_sapling"}, + "default:pine_sapling", "default:acacia_sapling", + "default:aspen_sapling"}, interval = 10, chance = 50, action = function(pos, node) @@ -65,6 +66,10 @@ minetest.register_abm({ minetest.log("action", "An acacia sapling grows into a tree at ".. minetest.pos_to_string(pos)) default.grow_new_acacia_tree(pos) + elseif node.name == "default:aspen_sapling" then + minetest.log("action", "An aspen sapling grows into a tree at ".. + minetest.pos_to_string(pos)) + default.grow_new_aspen_tree(pos) end end }) @@ -395,6 +400,14 @@ function default.grow_new_acacia_tree(pos) path, random, nil, false) end +-- New aspen tree + +function default.grow_new_aspen_tree(pos) + local path = minetest.get_modpath("default") .. "/schematics/aspen_tree_from_sapling.mts" + minetest.place_schematic({x = pos.x - 2, y = pos.y - 1, z = pos.z - 2}, + path, 0, nil, false) +end + -- From BFD: minetest.register_node("default:mg_cherry_sapling", { diff --git a/minetestforfun_game/mods/doors/README.txt b/minetestforfun_game/mods/doors/README.txt index 5ae63caf..c83720ce 100755 --- a/minetestforfun_game/mods/doors/README.txt +++ b/minetestforfun_game/mods/doors/README.txt @@ -6,6 +6,7 @@ License of source code: ----------------------- Copyright (C) 2012 PilzAdam modified by BlockMen (added sounds, glassdoors[glass, obsidian glass], trapdoor) +Steel trapdoor added by sofar. This program is free software. It comes without any warranty, to the extent permitted by applicable law. You can redistribute it @@ -30,11 +31,15 @@ following textures created by celeron55 (CC BY-SA 3.0): door_trapdoor_side.png door_glass_a.png door_glass_b.png - + following Textures created by PenguinDad (CC BY-SA 4.0): door_glass.png door_obsidian_glass.png +Steel trapdoor textures by sofar (CC-BY-SA-3.0) + doors_trapdoor_steel.png + doors_trapdoor_steel_side.png + All other textures (created by PilzAdam): WTFPL diff --git a/minetestforfun_game/mods/doors/init.lua b/minetestforfun_game/mods/doors/init.lua index ed90c98b..8c60be2d 100755 --- a/minetestforfun_game/mods/doors/init.lua +++ b/minetestforfun_game/mods/doors/init.lua @@ -512,7 +512,19 @@ function doors.register_trapdoor(name, def) local name_closed = name local name_opened = name.."_open" - def.on_rightclick = function (pos, node) + local function check_player_priv(pos, player) + if not def.only_placer_can_open then + return true + end + local meta = minetest.get_meta(pos) + local pn = player:get_player_name() + return meta:get_string("doors_owner") == pn + end + + def.on_rightclick = function (pos, node, clicker, itemstack, pointed_thing) + if not check_player_priv(pos, clicker) then + return + end local newname = node.name == name_closed and name_opened or name_closed local sound = false if node.name == name_closed then sound = def.sound_open end @@ -520,7 +532,7 @@ function doors.register_trapdoor(name, def) if sound then minetest.sound_play(sound, {pos = pos, gain = 0.3, max_hear_distance = 10}) end - minetest.set_node(pos, {name = newname, param1 = node.param1, param2 = node.param2}) + minetest.swap_node(pos, {name = newname, param1 = node.param1, param2 = node.param2}) end def.on_rotate = minetest.get_modpath("screwdriver") and screwdriver.rotate_simple @@ -530,6 +542,18 @@ function doors.register_trapdoor(name, def) def.paramtype = "light" def.paramtype2 = "facedir" def.is_ground_content = false + def.can_dig = check_player_priv + + if def.only_placer_can_open then + def.after_place_node = function(pos, placer, itemstack, pointed_thing) + local pn = placer:get_player_name() + local meta = minetest.get_meta(pos) + meta:set_string("doors_owner", pn) + meta:set_string("infotext", "Owned by "..pn) + + return minetest.setting_getbool("creative_mode") + end + end local def_opened = table.copy(def) local def_closed = table.copy(def) @@ -576,6 +600,19 @@ doors.register_trapdoor("doors:trapdoor", { sound_close = "doors_door_close" }) +doors.register_trapdoor("doors:trapdoor_steel", { + description = "Steel Trapdoor", + inventory_image = "doors_trapdoor_steel.png", + wield_image = "doors_trapdoor_steel.png", + tile_front = "doors_trapdoor_steel.png", + tile_side = "doors_trapdoor_steel_side.png", + only_placer_can_open = true, + groups = {snappy=1, bendy=2, cracky=1, melty=2, level=2, door=1}, + sounds = default.node_sound_wood_defaults(), + sound_open = "doors_door_open", + sound_close = "doors_door_close" +}) + minetest.register_craft({ output = 'doors:trapdoor 2', recipe = { @@ -585,6 +622,14 @@ minetest.register_craft({ } }) +minetest.register_craft({ + output = 'doors:trapdoor_steel', + recipe = { + {'default:steel_ingot', 'default:steel_ingot'}, + {'default:steel_ingot', 'default:steel_ingot'}, + } +}) + doors.register_trapdoor("doors:trapdoor_cherry", { description = "Cherry tree trapdoor", inventory_image = "doors_trapdoor_cherry.png", diff --git a/minetestforfun_game/mods/doors/sounds/doors_door_close.ogg b/minetestforfun_game/mods/doors/sounds/doors_door_close.ogg index 896b503b38731b332f905cdbd9522d4d30a3739e..fede4af323d1b4322180c4a2a0734a60077b4121 100755 GIT binary patch literal 6161 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 diff --git a/minetestforfun_game/mods/doors/sounds/doors_door_open.ogg b/minetestforfun_game/mods/doors/sounds/doors_door_open.ogg index 1ccfdca6157daf2ea0a7d93fd4edd9f5d543de02..9a4c4f1114ed0ef70a6f91646dff16e1c5d9722e 100755 GIT binary patch literal 6184 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 literal 0 HcmV?d00001 diff --git a/minetestforfun_game/mods/flowers/init.lua b/minetestforfun_game/mods/flowers/init.lua index 27f3a20f..cefe9052 100755 --- a/minetestforfun_game/mods/flowers/init.lua +++ b/minetestforfun_game/mods/flowers/init.lua @@ -147,120 +147,84 @@ minetest.register_abm({ -- Mushrooms -- -local mushrooms_datas = { - {"brown", 2}, - {"red", -6} -} +minetest.register_node("flowers:mushroom_red", { + description = "Red Mushroom", + tiles = {"flowers_mushroom_red.png"}, + inventory_image = "flowers_mushroom_red.png", + wield_image = "flowers_mushroom_red.png", + drawtype = "plantlike", + paramtype = "light", + sunlight_propagates = true, + walkable = false, + buildable_to = true, + groups = {snappy = 3, flammable = 3, attached_node = 1}, + sounds = default.node_sound_leaves_defaults(), + on_use = minetest.item_eat(-5), + selection_box = { + type = "fixed", + fixed = {-0.3, -0.5, -0.3, 0.3, 0, 0.3} + } +}) -for _, m in pairs(mushrooms_datas) do - local name, nut = m[1], m[2] - - -- Register fertile mushrooms - - -- These are placed by mapgen and the growing ABM. - -- These drop an infertile mushroom, and 0 to 3 spore - -- nodes with an average of 1.25 per mushroom, for - -- a slow multiplication of mushrooms when farming. - - minetest.register_node("flowers:mushroom_fertile_" .. name, { - description = string.sub(string.upper(name), 0, 1) .. - string.sub(name, 2) .. " Fertile Mushroom", - tiles = {"flowers_mushroom_" .. name .. ".png"}, - inventory_image = "flowers_mushroom_" .. name .. ".png", - wield_image = "flowers_mushroom_" .. name .. ".png", - drawtype = "plantlike", - paramtype = "light", - sunlight_propagates = true, - walkable = false, - buildable_to = true, - groups = {snappy = 3, flammable = 3, attached_node = 1, - not_in_creative_inventory = 1}, - drop = { - items = { - {items = {"flowers:mushroom_" .. name}}, - {items = {"flowers:mushroom_spores_" .. name}, rarity = 4}, - {items = {"flowers:mushroom_spores_" .. name}, rarity = 2}, - {items = {"flowers:mushroom_spores_" .. name}, rarity = 2} - } - }, - sounds = default.node_sound_leaves_defaults(), - on_use = minetest.item_eat(nut), - selection_box = { - type = "fixed", - fixed = {-0.3, -0.5, -0.3, 0.3, 0, 0.3} - } - }) - - -- Register infertile mushrooms - - -- These do not drop spores, to avoid the use of repeated digging - -- and placing of a single mushroom to generate unlimited spores. - - minetest.register_node("flowers:mushroom_" .. name, { - description = string.sub(string.upper(name), 0, 1) .. - string.sub(name, 2) .. " Mushroom", - tiles = {"flowers_mushroom_" .. name .. ".png"}, - inventory_image = "flowers_mushroom_" .. name .. ".png", - wield_image = "flowers_mushroom_" .. name .. ".png", - drawtype = "plantlike", - paramtype = "light", - sunlight_propagates = true, - walkable = false, - buildable_to = true, - groups = {snappy = 3, flammable = 3, attached_node = 1}, - sounds = default.node_sound_leaves_defaults(), - on_use = minetest.item_eat(nut), - selection_box = { - type = "fixed", - fixed = {-0.3, -0.5, -0.3, 0.3, 0, 0.3} - } - }) - - -- Register mushroom spores - - minetest.register_node("flowers:mushroom_spores_" .. name, { - description = string.sub(string.upper(name), 0, 1) .. - string.sub(name, 2) .. " Mushroom Spores", - drawtype = "signlike", - tiles = {"flowers_mushroom_spores_" .. name .. ".png"}, - inventory_image = "flowers_mushroom_spores_" .. name .. ".png", - wield_image = "flowers_mushroom_spores_" .. name .. ".png", - paramtype = "light", - paramtype2 = "wallmounted", - sunlight_propagates = true, - walkable = false, - buildable_to = true, - selection_box = { - type = "wallmounted", - }, - groups = {dig_immediate = 3, attached_node = 1}, - }) -end - - --- Register growing ABM +minetest.register_node("flowers:mushroom_brown", { + description = "Brown Mushroom", + tiles = {"flowers_mushroom_brown.png"}, + inventory_image = "flowers_mushroom_brown.png", + wield_image = "flowers_mushroom_brown.png", + drawtype = "plantlike", + paramtype = "light", + sunlight_propagates = true, + walkable = false, + buildable_to = true, + groups = {snappy = 3, flammable = 3, attached_node = 1}, + sounds = default.node_sound_leaves_defaults(), + on_use = minetest.item_eat(1), + selection_box = { + type = "fixed", + fixed = {-0.3, -0.5, -0.3, 0.3, 0, 0.3} + } +}) +-- mushroom spread and death minetest.register_abm({ - nodenames = {"flowers:mushroom_spores_brown", "flowers:mushroom_spores_red"}, + nodenames = {"flowers:mushroom_brown", "flowers:mushroom_red"}, interval = 11, chance = 50, action = function(pos, node) - local node_under = minetest.get_node_or_nil({x = pos.x, - y = pos.y - 1, z = pos.z}) + if minetest.get_node_light(pos, nil) == 15 then + minetest.remove_node(pos) + end + local random = { + x = pos.x + math.random(-2,2), + y = pos.y + math.random(-1,1), + z = pos.z + math.random(-2,2) + } + local random_node = minetest.get_node_or_nil(random) + if not random_node then + return + end + if random_node.name ~= "air" then + return + end + local node_under = minetest.get_node_or_nil({x = random.x, + y = random.y - 1, z = random.z}) if not node_under then return end if minetest.get_item_group(node_under.name, "soil") ~= 0 and - minetest.get_node_light(pos, nil) <= 13 then - if node.name == "flowers:mushroom_spores_brown" then - minetest.set_node(pos, {name = "flowers:mushroom_fertile_brown"}) - elseif node.name == "flowers:mushroom_spores_red" then - minetest.set_node(pos, {name = "flowers:mushroom_fertile_red"}) - end + minetest.get_node_light(pos, nil) <= 9 and + minetest.get_node_light(random, nil) <= 9 then + minetest.set_node(random, {name = node.name}) end end }) +-- these old mushroom related nodes can be simplified now +minetest.register_alias("flowers:mushroom_spores_brown", "flowers:mushroom_brown") +minetest.register_alias("flowers:mushroom_spores_red", "flowers:mushroom_red") +minetest.register_alias("flowers:mushroom_fertile_brown", "flowers:mushroom_brown") +minetest.register_alias("flowers:mushroom_fertile_red", "flowers:mushroom_red") + -- -- Waterlily diff --git a/minetestforfun_game/mods/flowers/mapgen.lua b/minetestforfun_game/mods/flowers/mapgen.lua index eac24b10..d0e7c6ad 100755 --- a/minetestforfun_game/mods/flowers/mapgen.lua +++ b/minetestforfun_game/mods/flowers/mapgen.lua @@ -70,8 +70,8 @@ function flowers.register_mgv6_decorations() register_mgv6_flower("viola") register_mgv6_flower("dandelion_white") - register_mgv6_mushroom("mushroom_fertile_brown") - register_mgv6_mushroom("mushroom_fertile_red") + register_mgv6_mushroom("mushroom_brown") + register_mgv6_mushroom("mushroom_red") register_mgv6_waterlily() end @@ -87,8 +87,8 @@ local function register_flower(seed, name) place_on = {"default:dirt_with_grass"}, sidelen = 16, noise_params = { - offset = -0.02, - scale = 0.03, + offset = -0.015, + scale = 0.025, spread = {x = 200, y = 200, z = 200}, seed = seed, octaves = 3, @@ -151,8 +151,8 @@ function flowers.register_decorations() register_flower(1133, "viola") register_flower(73133, "dandelion_white") - register_mushroom("mushroom_fertile_brown") - register_mushroom("mushroom_fertile_red") + register_mushroom("mushroom_brown") + register_mushroom("mushroom_red") register_waterlily() end diff --git a/minetestforfun_game/mods/screwdriver/init.lua b/minetestforfun_game/mods/screwdriver/init.lua index bd65a4af..8c7dba39 100755 --- a/minetestforfun_game/mods/screwdriver/init.lua +++ b/minetestforfun_game/mods/screwdriver/init.lua @@ -36,6 +36,10 @@ local function screwdriver_handler(itemstack, user, pointed_thing, mode) local node = minetest.get_node(pos) local ndef = minetest.registered_nodes[node.name] + -- verify node is facedir (expected to be rotatable) + if ndef.paramtype2 ~= "facedir" then + return + end -- Compute param2 local rotationPart = node.param2 % 32 -- get first 4 bits local preservePart = node.param2 - rotationPart diff --git a/minetestforfun_game/mods/stairs/init.lua b/minetestforfun_game/mods/stairs/init.lua index 7e193371..7243b59f 100755 --- a/minetestforfun_game/mods/stairs/init.lua +++ b/minetestforfun_game/mods/stairs/init.lua @@ -287,6 +287,13 @@ stairs.register_stair_and_slab("acacia_wood", "default:acacia_wood", "Acacia Wood Slab", default.node_sound_wood_defaults()) +stairs.register_stair_and_slab("aspen_wood", "default:aspen_wood", + {snappy = 2, choppy = 2, oddly_breakable_by_hand = 2, flammable = 3}, + {"default_aspen_wood.png"}, + "Aspen Wood Stair", + "Aspen Wood Slab", + default.node_sound_wood_defaults()) + stairs.register_stair_and_slab("stone", "default:stone", {cracky = 3}, {"default_stone.png"},