diff --git a/minetestforfun_game/mods/default/README.txt b/minetestforfun_game/mods/default/README.txt index c53e149e..695d3b1f 100644 --- a/minetestforfun_game/mods/default/README.txt +++ b/minetestforfun_game/mods/default/README.txt @@ -23,13 +23,6 @@ Everything not listed in here: Copyright (C) 2010-2012 celeron55, Perttu Ahola Cisoun's WTFPL texture pack: - default_chest_front.png - default_chest_lock.png - default_chest_side.png - default_chest_top.png - default_dirt.png - default_grass.png - default_grass_side.png default_jungletree.png default_jungletree_top.png default_lava.png @@ -41,7 +34,7 @@ Cisoun's WTFPL texture pack: default_tree_top.png default_water.png -Cisoun's conifere mod (WTFPL): +Cisoun's conifers mod (WTFPL): default_pine_needles.png Originating from G4JC's Almost MC Texture Pack: @@ -71,12 +64,12 @@ VanessaE (WTFPL): default_sand.png default_sandstone_brick.png -Calinou (CC BY-SA 3.0): - crack_anylength.png +Calinou (CC BY-SA): default_brick.png default_papyrus.png default_copper_lump.png default_mineral_copper.png + default_glass_detail.png MirceaKitsune (WTFPL): character.x @@ -90,7 +83,6 @@ PilzAdam (WTFPL): default_junglewood.png default_obsidian_glass.png default_obsidian_shard.png - default_mossycobble.png default_gold_lump.png default_mineral_gold.png default_snowball.png @@ -105,6 +97,7 @@ Splizard (CC BY-SA 3.0): default_snow.png default_snow_side.png default_ice.png + default_pine_sapling.png Zeg9 (CC BY-SA 3.0): default_coal_block.png @@ -125,7 +118,6 @@ brunob.santos (CC BY-SA 4.0): BlockMen (CC BY-SA 3.0): default_stone_brick.png default_wood.png - default_cobble.png default_clay_brick.png default_tool_steelsword.png default_bronze_ingot.png @@ -139,10 +131,25 @@ BlockMen (CC BY-SA 3.0): default_book.png default_paper.png default_stick.png + default_chest_front.png + default_chest_lock.png + default_chest_side.png + default_chest_top.png bubble.png heart.png gui_*.png +Neuromancer (CC BY-SA 2.0): + default_cobble.png, based on texture by Brane praefect + default_mossycobble.png, based on texture by Brane praefect +Neuromancer (CC BY-SA 3.0): + default_dirt.png + default_furnace_*.png + +Philipbenr (CC BY-SA 3.0): + default_grass.png + default_grass_side.png + Glass breaking sounds (CC BY 3.0): 1: http://www.freesound.org/people/cmusounddesign/sounds/71947/ 2: http://www.freesound.org/people/Tomlija/sounds/97669/ diff --git a/minetestforfun_game/mods/default/crafting.lua b/minetestforfun_game/mods/default/crafting.lua index 4d075d1b..d8f233af 100644 --- a/minetestforfun_game/mods/default/crafting.lua +++ b/minetestforfun_game/mods/default/crafting.lua @@ -5,19 +5,6 @@ minetest.register_craft({ recipe = {{"default:tree"},} }) -minetest.register_craft({ - output = 'default:pinewood 4', - recipe = { - {'default:pinetree'}, - } -}) - -minetest.register_craft({ - type = "fuel", - recipe = "default:pine_sapling", - burntime = 10, -}) - minetest.register_craft({ output = "default:junglewood 4", recipe = {{"default:jungletree"},} diff --git a/minetestforfun_game/mods/default/craftitems.lua b/minetestforfun_game/mods/default/craftitems.lua index 70ad25b8..fcd76240 100644 --- a/minetestforfun_game/mods/default/craftitems.lua +++ b/minetestforfun_game/mods/default/craftitems.lua @@ -17,13 +17,14 @@ minetest.register_craftitem("default:paper", { minetest.register_craftitem("default:book", { description = "Book", inventory_image = "default_book.png", - groups = {book = 1}, + groups = {book=1}, }) minetest.register_craftitem("default:coal_lump", { description = "Coal Lump", wield_scale = {x = 1, y = 1, z = 2}, inventory_image = "default_coal_lump.png", + groups = {coal = 1} }) minetest.register_craftitem("default:iron_lump", { diff --git a/minetestforfun_game/mods/default/functions.lua b/minetestforfun_game/mods/default/functions.lua index d949badd..806e8969 100644 --- a/minetestforfun_game/mods/default/functions.lua +++ b/minetestforfun_game/mods/default/functions.lua @@ -7,40 +7,20 @@ function default.node_sound_defaults(table) table = table or {} table.footstep = table.footstep or - {name = "default_hard_footstep", gain = 0.6} - table.dig = table.dig or - {name = "default_hard_footstep", gain = 0.7} + {name="", gain=1.0} table.dug = table.dug or - {name = "default_hard_footstep", gain = 0.8} + {name="default_dug_node", gain=0.25} table.place = table.place or - {name = "default_hard_footstep", gain = 0.8} + {name="default_place_node_hard", gain=1.0} return table end function default.node_sound_stone_defaults(table) table = table or {} table.footstep = table.footstep or - {name = "default_hard_footstep", gain = 0.6} - table.dig = table.dig or - {name = "default_hard_footstep", gain = 0.7} + {name="default_hard_footstep", gain=0.5} table.dug = table.dug or - {name = "default_hard_footstep", gain = 0.8} - table.place = table.place or - {name = "default_hard_footstep", gain = 0.8} - default.node_sound_defaults(table) - return table -end - -function default.node_sound_metal_defaults(table) - table = table or {} - table.footstep = table.footstep or - {name = "default_metal_footstep", gain = 0.575} - table.dig = table.dig or - {name = "default_metal_footstep", gain = 0.65} - table.dug = table.dug or - {name = "default_metal_footstep", gain = 0.8} - table.place = table.place or - {name = "default_metal_footstep", gain = 0.8} + {name="default_hard_footstep", gain=1.0} default.node_sound_defaults(table) return table end @@ -48,27 +28,11 @@ end function default.node_sound_dirt_defaults(table) table = table or {} table.footstep = table.footstep or - {name = "default_dirt_footstep", gain = 0.8} - table.dig = table.dig or - {name = "default_dirt_footstep", gain = 0.9} + {name="default_dirt_footstep", gain=1.0} table.dug = table.dug or - {name = "default_dirt_footstep", gain = 1.0} + {name="default_dirt_footstep", gain=1.5} table.place = table.place or - {name = "default_dirt_footstep", gain = 1.0} - default.node_sound_defaults(table) - return table -end - -function default.node_sound_gravel_defaults(table) - table = table or {} - table.footstep = table.footstep or - {name = "default_dirt_footstep", gain = 0.8} - table.dig = table.dig or - {name = "default_dirt_footstep", gain = 0.9} - table.dug = table.dug or - {name = "default_dirt_footstep", gain = 1.0} - table.place = table.place or - {name = "default_dirt_footstep", gain = 1.0} + {name="default_place_node", gain=1.0} default.node_sound_defaults(table) return table end @@ -76,13 +40,11 @@ end function default.node_sound_sand_defaults(table) table = table or {} table.footstep = table.footstep or - {name = "default_sand_footstep", gain = 0.6} - table.dig = table.dig or - {name = "default_sand_footstep", gain = 0.7} + {name="default_sand_footstep", gain=0.2} table.dug = table.dug or - {name = "default_sand_footstep", gain = 0.8} + {name="default_sand_footstep", gain=0.4} table.place = table.place or - {name = "default_sand_footstep", gain = 0.8} + {name="default_place_node", gain=1.0} default.node_sound_defaults(table) return table end @@ -90,13 +52,9 @@ end function default.node_sound_wood_defaults(table) table = table or {} table.footstep = table.footstep or - {name = "default_wood_footstep", gain = 0.625} - table.dig = table.dig or - {name = "default_wood_footstep", gain = 0.7} + {name="default_wood_footstep", gain=0.5} table.dug = table.dug or - {name = "default_wood_footstep", gain = 0.8} - table.place = table.place or - {name = "default_wood_footstep", gain = 0.8} + {name="default_wood_footstep", gain=1.0} default.node_sound_defaults(table) return table end @@ -104,13 +62,13 @@ end function default.node_sound_leaves_defaults(table) table = table or {} table.footstep = table.footstep or - {name = "default_grass_footstep", gain = 0.6} - table.dig = table.dig or - {name = "default_grass_footstep", gain = 0.7} + {name="default_grass_footstep", gain=0.35} table.dug = table.dug or - {name = "default_snow_footstep", gain = 0.8} + {name="default_grass_footstep", gain=0.7} + table.dig = table.dig or + {name="default_dig_crumbly", gain=0.4} table.place = table.place or - {name = "default_snow_footstep", gain = 0.8} + {name="default_place_node", gain=1.0} default.node_sound_defaults(table) return table end @@ -118,28 +76,27 @@ end function default.node_sound_glass_defaults(table) table = table or {} table.footstep = table.footstep or - {name = "default_hard_footstep", gain = 0.55} - table.dig = table.dig or - {name = "default_hard_footstep", gain = 0.65} + {name="default_glass_footstep", gain=0.5} table.dug = table.dug or - {name = "default_break_glass", gain = 0.8} - table.place = table.place or - {name = "default_hard_footstep", gain = 0.75} + {name="default_break_glass", gain=1.0} default.node_sound_defaults(table) return table end --- Legacy: +-- +-- Legacy +-- + function default.spawn_falling_node(p, nodename) spawn_falling_node(p, nodename) end --- Horrible crap to support old code, --- don't use this and never do what this does, it's completely wrong! --- (more specifically, the client and the C++ code doesn't get the group). +-- Horrible crap to support old code +-- Don't use this and never do what this does, it's completely wrong! +-- (More specifically, the client and the C++ code doesn't get the group) function default.register_falling_node(nodename, texture) minetest.log("error", debug.traceback()) - minetest.log("error", "WARNING: default.register_falling_node is deprecated.") + minetest.log('error', "WARNING: default.register_falling_node is deprecated") if minetest.registered_nodes[nodename] then minetest.registered_nodes[nodename].groups.falling_node = 1 end @@ -151,89 +108,37 @@ end -- Global environment step function function on_step(dtime) - -- print("on_step, " .. p .. ", " .. node) + -- print("on_step") end minetest.register_globalstep(on_step) function on_placenode(p, node) - -- print("on_placenode, " .. p .. ", " .. node) + --print("on_placenode") end minetest.register_on_placenode(on_placenode) function on_dignode(p, node) - -- print("on_dignode, " .. p .. ", " .. node) + --print("on_dignode") end minetest.register_on_dignode(on_dignode) function on_punchnode(p, node) - -- print("on_punchnode, " .. p .. ", " .. node) end minetest.register_on_punchnode(on_punchnode) + -- --- Lava cooling +-- Lavacooling -- -local function cool_wf_vm(pos, node1, node2) - local t1 = os.clock() - local minp = vector.subtract(pos, 10) - local maxp = vector.add(pos, 10) - local manip = minetest.get_voxel_manip() - local emerged_pos1, emerged_pos2 = manip:read_from_map(minp, maxp) - local area = VoxelArea:new({MinEdge=emerged_pos1, MaxEdge=emerged_pos2}) - local nodes = manip:get_data() - - local stone = minetest.get_content_id(node2) - local lava = minetest.get_content_id(node1) - - for i in area:iterp(minp, maxp) do - local p = area:position(i) - if nodes[i] == lava and minetest.find_node_near(p, 1, {"group:water"}) then - nodes[i] = stone - end - end - - manip:set_data(nodes) - manip:write_to_map() - -- minetest.log("action", "Lava cooling happened at (" .. pos.x .. "," .. pos.y .. "," .. pos.z .. ").") - local t1 = os.clock() - manip:update_map() - -- minetest.log("action", string.format("Lava cooling updated the map after ca. %.2fs.", os.clock() - t1)) -end - -local del1 = 0 -local count = 0 - default.cool_lava_source = function(pos) - local del2 = tonumber(os.clock()) - if del2-del1 < 0.1 - and count > 1 then - cool_wf_vm(pos, "default:lava_source", "default:obsidian_cooled") - count = 0 - else - minetest.set_node(pos, {name = "default:obsidian_cooled"}) - minetest.sound_play("default_cool_lava", {pos = pos, gain = 0.2}) - if del2-del1 < 0.1 then - count = count + 1 - end - end - del1 = del2 + minetest.set_node(pos, {name="default:obsidian"}) + minetest.sound_play("default_cool_lava", {pos = pos, gain = 0.25}) end default.cool_lava_flowing = function(pos) - local del2 = tonumber(os.clock()) - if del2-del1 < 0.1 - and count > 1 then - cool_wf_vm(pos, "default:lava_flowing", "default:cobble_cooled") - count = 0 - else - minetest.set_node(pos, {name = "default:cobble_cooled"}) - minetest.sound_play("default_cool_lava", {pos = pos, gain = 0.2}) - if del2-del1 < 0.1 then - count = count + 1 - end - end - del1 = del2 + minetest.set_node(pos, {name="default:stone"}) + minetest.sound_play("default_cool_lava", {pos = pos, gain = 0.25}) end minetest.register_abm({ @@ -246,12 +151,6 @@ minetest.register_abm({ end, }) -default.after_place_leaves = function(pos, placer, itemstack, pointed_thing) - local node = minetest.get_node(pos) - node.param2 = 1 - minetest.set_node(pos, node) -end - minetest.register_abm({ nodenames = {"default:lava_source"}, neighbors = {"group:water"}, @@ -272,18 +171,18 @@ minetest.register_abm({ interval = 30, chance = 25, action = function(pos, node) - pos.y = pos.y - 1 + pos.y = pos.y-1 local name = minetest.get_node(pos).name if minetest.get_item_group(name, "sand") ~= 0 then - pos.y = pos.y + 1 + pos.y = pos.y+1 local height = 0 while minetest.get_node(pos).name == "default:cactus" and height < 4 do - height = height + 1 - pos.y = pos.y + 1 + height = height+1 + pos.y = pos.y+1 end if height < 4 then if minetest.get_node(pos).name == "air" then - minetest.set_node(pos, {name = "default:cactus"}) + minetest.set_node(pos, {name="default:cactus"}) end end end @@ -292,35 +191,35 @@ minetest.register_abm({ minetest.register_abm({ nodenames = {"default:papyrus"}, - neighbors = {"default:dirt", "default:dirt_with_grass", "default:dirt_with_snow", "default:sand", "default:desert_sand"}, + neighbors = {"default:dirt", "default:dirt_with_grass"}, interval = 30, chance = 25, action = function(pos, node) - pos.y = pos.y - 1 + pos.y = pos.y-1 local name = minetest.get_node(pos).name - if name == "default:dirt" - or name == "default:dirt_with_grass" - or name == "default:dirt_with_snow" - or name == "default:sand" - or name == "default:desert_sand" then + if name == "default:dirt" or name == "default:dirt_with_grass" then if minetest.find_node_near(pos, 3, {"group:water"}) == nil then return end - pos.y = pos.y + 1 + pos.y = pos.y+1 local height = 0 while minetest.get_node(pos).name == "default:papyrus" and height < 4 do - height = height + 1 - pos.y = pos.y + 1 + height = height+1 + pos.y = pos.y+1 end if height < 4 then if minetest.get_node(pos).name == "air" then - minetest.set_node(pos, {name = "default:papyrus"}) + minetest.set_node(pos, {name="default:papyrus"}) end end end end, }) +-- +-- dig upwards +-- + function default.dig_up(pos, node, digger) if digger == nil then return end local np = {x = pos.x, y = pos.y + 1, z = pos.z} @@ -330,7 +229,9 @@ function default.dig_up(pos, node, digger) end end -if minetest.setting_getbool("leaf_decay") ~= false then -- “If not defined or set to true then” +-- +-- Leafdecay +-- default.leafdecay_trunk_cache = {} default.leafdecay_enable_cache = true @@ -343,23 +244,30 @@ minetest.register_globalstep(function(dtime) math.floor(dtime * finds_per_second) end) +default.after_place_leaves = function(pos, placer, itemstack, pointed_thing) + local node = minetest.get_node(pos) + node.param2 = 1 + minetest.set_node(pos, node) +end + minetest.register_abm({ nodenames = {"group:leafdecay"}, neighbors = {"air", "group:liquid"}, - interval = 1, -- A low interval and a high inverse chance spreads the load. + -- A low interval and a high inverse chance spreads the load + interval = 1, chance = 2, action = function(p0, node, _, _) - -- print("leafdecay ABM at "..p0.x..", "..p0.y..", "..p0.z..")") + --print("leafdecay ABM at "..p0.x..", "..p0.y..", "..p0.z..")") local do_preserve = false local d = minetest.registered_nodes[node.name].groups.leafdecay if not d or d == 0 then - -- print("not groups.leafdecay") + --print("not groups.leafdecay") return end local n0 = minetest.get_node(p0) if n0.param2 ~= 0 then - -- print("param2 ~= 0") + --print("param2 ~= 0") return end local p0_hash = nil @@ -369,13 +277,13 @@ minetest.register_abm({ if trunkp then local n = minetest.get_node(trunkp) local reg = minetest.registered_nodes[n.name] - -- Assume ignore is a trunk, to make the thing work at the border of the active area: + -- Assume ignore is a trunk, to make the thing work at the border of the active area if n.name == "ignore" or (reg and reg.groups.tree and reg.groups.tree ~= 0) then - -- print("Cached trunk still exists.") + --print("cached trunk still exists") return end - -- print("Cached trunk is invalid.") - -- Cache is invalid: + --print("cached trunk is invalid") + -- Cache is invalid table.remove(default.leafdecay_trunk_cache, p0_hash) end end @@ -384,30 +292,34 @@ minetest.register_abm({ end default.leafdecay_trunk_find_allow_accumulator = default.leafdecay_trunk_find_allow_accumulator - 1 - -- Assume ignore is a trunk, to make the thing work at the border of the active area: + -- Assume ignore is a trunk, to make the thing work at the border of the active area local p1 = minetest.find_node_near(p0, d, {"ignore", "group:tree"}) if p1 then do_preserve = true if default.leafdecay_enable_cache then - -- print("Caching trunk.") - -- Cache the trunk: + --print("caching trunk") + -- Cache the trunk default.leafdecay_trunk_cache[p0_hash] = p1 end end if not do_preserve then - -- Drop stuff other than the node itself: - itemstacks = minetest.get_node_drops(n0.name) + -- Drop stuff other than the node itself + local itemstacks = minetest.get_node_drops(n0.name) for _, itemname in ipairs(itemstacks) do - if minetest.get_item_group(n0.name, "leafdecay_drop") ~= 0 - or itemname ~= n0.name then - minetest.add_item(p0, itemname) + if minetest.get_item_group(n0.name, "leafdecay_drop") ~= 0 or + itemname ~= n0.name then + local p_drop = { + x = p0.x - 0.5 + math.random(), + y = p0.y - 0.5 + math.random(), + z = p0.z - 0.5 + math.random(), + } + minetest.add_item(p_drop, itemname) end end + -- Remove node minetest.remove_node(p0) - -- minetest.log("action", n0.name .. " decayed at " .. minetest.pos_to_string(p0) .. ".") nodeupdate(p0) end end }) -end -- Ends: if minetest.setting_getbool("leaf_decay") ~= false diff --git a/minetestforfun_game/mods/default/furnace.lua b/minetestforfun_game/mods/default/furnace.lua index 1bb61b33..d49d8efe 100644 --- a/minetestforfun_game/mods/default/furnace.lua +++ b/minetestforfun_game/mods/default/furnace.lua @@ -1,15 +1,14 @@ - -- - -- Formspecs - -- +-- +-- Formspecs +-- local function active_formspec(fuel_percent, item_percent) - local formspec = + local formspec = "size[8,8.5]".. default.gui_bg.. default.gui_bg_img.. default.gui_slots.. - --gui_slots.. "list[current_name;src;2.75,0.5;1,1;]".. "list[current_name;fuel;2.75,2.5;1,1;]".. "image[2.75,1.5;1,1;default_furnace_fire_bg.png^[lowpart:".. @@ -99,9 +98,9 @@ minetest.register_node("default:furnace", { legacy_facedir_simple = true, is_ground_content = false, sounds = default.node_sound_stone_defaults(), - + can_dig = can_dig, - + allow_metadata_inventory_put = allow_metadata_inventory_put, allow_metadata_inventory_move = allow_metadata_inventory_move, allow_metadata_inventory_take = allow_metadata_inventory_take, @@ -134,7 +133,7 @@ minetest.register_node("default:furnace_active", { can_dig = can_dig, - allow_metadata_inventory_put = allow_metadata_inventory_put, + aallow_metadata_inventory_put = allow_metadata_inventory_put, allow_metadata_inventory_move = allow_metadata_inventory_move, allow_metadata_inventory_take = allow_metadata_inventory_take, }) @@ -164,15 +163,15 @@ minetest.register_abm({ local fuel_time = meta:get_float("fuel_time") or 0 local src_time = meta:get_float("src_time") or 0 local fuel_totaltime = meta:get_float("fuel_totaltime") or 0 - + -- -- Inizialize inventory -- local inv = meta:get_inventory() for listname, size in pairs({ - src = 1, - fuel = 1, - dst = 4, + src = 1, + fuel = 1, + dst = 4, }) do if inv:get_size(listname) ~= size then inv:set_size(listname, size) @@ -189,16 +188,16 @@ minetest.register_abm({ -- Check if we have cookable content local cooked, aftercooked = minetest.get_craft_result({method = "cooking", width = 1, items = srclist}) local cookable = true - + if cooked.time == 0 then cookable = false end - + -- Check if we have enough fuel to burn if fuel_time < fuel_totaltime then -- The furnace is currently active and has enough fuel fuel_time = fuel_time + 1 - + -- If there is a cookable item then check if it is ready yet if cookable then src_time = src_time + 1 @@ -216,7 +215,7 @@ minetest.register_abm({ if cookable then -- We need to get new fuel local fuel, afterfuel = minetest.get_craft_result({method = "fuel", width = 1, items = fuellist}) - + if fuel.time == 0 then -- No valid fuel in fuel list fuel_totaltime = 0 @@ -225,10 +224,10 @@ minetest.register_abm({ else -- Take fuel from fuel list inv:set_stack("fuel", 1, afterfuel.items[1]) - + fuel_totaltime = fuel.time fuel_time = 0 - + end else -- We don't need to get new fuel since there is no cookable item @@ -237,7 +236,7 @@ minetest.register_abm({ src_time = 0 end end - + -- -- Update formspec, infotext and node -- @@ -245,7 +244,7 @@ minetest.register_abm({ local item_state = "" local item_percent = 0 if cookable then - item_percent = math.floor(src_time / cooked.time * 100) + item_percent = math.floor(src_time / cooked.time * 100) item_state = item_percent .. "%" else if srclist[1]:is_empty() then @@ -254,7 +253,7 @@ minetest.register_abm({ item_state = "Not cookable" end end - + local fuel_state = "Empty" local active = "inactive " if fuel_time <= fuel_totaltime and fuel_totaltime ~= 0 then @@ -269,9 +268,9 @@ minetest.register_abm({ end swap_node(pos, "default:furnace") end - - local infotext = "Furnace " .. active .. "(Item: " .. item_state .. "; Fuel: " .. fuel_state .. ")" - + + local infotext = "Furnace " .. active .. "(Item: " .. item_state .. "; Fuel: " .. fuel_state .. ")" + -- -- Set meta values -- diff --git a/minetestforfun_game/mods/default/init.lua b/minetestforfun_game/mods/default/init.lua index 2f7218de..792b367f 100644 --- a/minetestforfun_game/mods/default/init.lua +++ b/minetestforfun_game/mods/default/init.lua @@ -1,42 +1,45 @@ -- Minetest 0.4 mod: default -- See README.txt for licensing and other information. -default = {} -- Definitions made by this mod are usable by all mods. - --- The API documentation in here was moved into doc/lua_api.txt. +-- The API documentation in here was moved into doc/lua_api.txt WATER_ALPHA = 160 WATER_VISC = 1 LAVA_VISC = 3 -- Slower movement in lava. LIGHT_MAX = 14 -- 15 is reserved for sunlight. --- GUI related stuff: +-- Definitions made by this mod that other mods can use too +default = {} + +-- GUI related stuff default.gui_bg = "bgcolor[#080808BB;true]" default.gui_bg_img = "background[5,5;1,1;gui_formbg.png;true]" default.gui_slots = "listcolors[#00000069;#5A5A5A;#141318;#30434C;#FFF]" function default.get_hotbar_bg(x,y) local out = "" - for i= 0, 7, 1 do - out = out .."image[" .. x + i .. "," .. y .. ";1,1;gui_hb_bg.png]" + for i=0,7,1 do + out = out .."image["..x+i..","..y..";1,1;gui_hb_bg.png]" end return out end -gui_suvival_form = "size[8,8.5]".. - default.gui_slots .. - "list[current_player;main; 0, 4.25; 8, 4; ]" .. - "list[current_player;craft; 1.75, 0.5; 3, 3; ]" .. - "list[current_player;craftpreview; 5.75, 1.5; 1, 1; ]" .. - default.get_hotbar_bg(0, 4.25) .. - default.get_hotbar_bg(0, 5.25) +default.gui_suvival_form = "size[8,8.5]".. + default.gui_bg.. + default.gui_bg_img.. + default.gui_slots.. + "list[current_player;main;0,4.25;8,1;]".. + "list[current_player;main;0,5.5;8,3;8]".. + "list[current_player;craft;1.75,0.5;3,3;]".. + "list[current_player;craftpreview;5.75,1.5;1,1;]".. + "image[4.75,1.5;1,1;gui_furnace_arrow_bg.png^[transformR270]".. + default.get_hotbar_bg(0,4.25) --- Load files: +-- Load files dofile(minetest.get_modpath("default").."/functions.lua") -dofile(minetest.get_modpath("default").."/commands.lua") dofile(minetest.get_modpath("default").."/nodes.lua") -dofile(minetest.get_modpath("default").."/tools.lua") dofile(minetest.get_modpath("default").."/furnace.lua") +dofile(minetest.get_modpath("default").."/tools.lua") dofile(minetest.get_modpath("default").."/craftitems.lua") dofile(minetest.get_modpath("default").."/crafting.lua") dofile(minetest.get_modpath("default").."/mapgen.lua") diff --git a/minetestforfun_game/mods/default/models/character.png b/minetestforfun_game/mods/default/models/character.png index 321f9fb2..05021781 100644 Binary files a/minetestforfun_game/mods/default/models/character.png and b/minetestforfun_game/mods/default/models/character.png differ diff --git a/minetestforfun_game/mods/default/nodes.lua b/minetestforfun_game/mods/default/nodes.lua index 29ebe97d..3709315d 100644 --- a/minetestforfun_game/mods/default/nodes.lua +++ b/minetestforfun_game/mods/default/nodes.lua @@ -476,7 +476,6 @@ minetest.register_node("default:jungleleaves", { } } }, - after_place_node = default.after_place_leaves, sounds = default.node_sound_leaves_defaults(), }) @@ -539,7 +538,6 @@ minetest.register_node("default:leaves", { } } }, - after_place_node = default.after_place_leaves, sounds = default.node_sound_leaves_defaults(), }) @@ -610,8 +608,7 @@ minetest.register_node("default:bookshelf", { local meta = minetest.get_meta(pos) local inv = meta:get_inventory() if listname == "books" then - if minetest.get_item_group(stack:get_name(), "book") ~= 0 - and to_stack:is_empty() then + if stack:get_name() == "default:book" then return 1 else return 0 @@ -814,8 +811,9 @@ minetest.register_node("default:water_flowing", { liquid_alternative_flowing = "default:water_flowing", liquid_alternative_source = "default:water_source", liquid_viscosity = WATER_VISC, + freezemelt = "default:snow", 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}, + groups = {water= 3, liquid = 3, puts_out_fire = 1, not_in_creative_inventory = 1, freezes = 1, melt_around = 1}, }) minetest.register_node("default:water_source", { @@ -845,8 +843,9 @@ minetest.register_node("default:water_source", { liquid_alternative_flowing = "default:water_flowing", liquid_alternative_source = "default:water_source", liquid_viscosity = WATER_VISC, + freezemelt = "default:ice", post_effect_color = {a = 120, r = 20, g = 60, b = 80}, - groups = {water= 3, liquid = 3, puts_out_fire = 1}, + groups = {water= 3, liquid = 3, puts_out_fire = 1, freezes = 1}, }) --[[ @@ -1140,7 +1139,7 @@ minetest.register_node("default:torch", { wall_bottom = {-0.25, -0.5 , -0.25, 0.25, 0.0625, 0.25}, wall_side = {-0.25, -0.5 , -0.25, -0.5, 0.0625, 0.25}, }, - groups = {choppy = 2, dig_immediate = 3, flammable = 1, attached_node = 1}, + groups = {choppy = 2, dig_immediate = 3, flammable = 1, attached_node = 1, hot = 2}, sounds = default.node_sound_wood_defaults(), }) @@ -1322,67 +1321,226 @@ minetest.register_node("default:chest_locked", { end, }) -minetest.register_node("default:pine_needles",{ - description = "Pine Needles", - drawtype = "allfaces_optional", - visual_scale = 1.3, - tiles = {"default_pine_needles.png"}, - waving = 1, - paramtype = "light", +function default.furnace_active(pos, percent, item_percent) + local formspec = + "size[8,8.5]".. + gui_slots.. + "list[current_name;src;2.75, 0.5;1,1;]" .. + "list[current_name;fuel;2.75,2.5;1,1;]" .. + "image[2.75,1.5;1,1;default_furnace_fire_bg.png^[lowpart:" .. + (100-percent)..":default_furnace_fire_fg.png]" .. + "image[3.75,1.5;1,1;gui_furnace_arrow_bg.png^[lowpart:" .. + (item_percent * 100)..":gui_furnace_arrow_fg.png^[transformR270]" .. + "list[current_name;dst;4.75,0.96;2,2;]" .. + "list[current_player;main;0,4.25;8,4;]" .. + default.get_hotbar_bg(0, 4.25) .. + default.get_hotbar_bg(0, 5.25) + return formspec + end + +function default.get_furnace_active_formspec(pos, percent) + local meta = minetest.get_meta(pos)local inv = meta:get_inventory() + local srclist = inv:get_list("src") + local cooked = nil + local aftercooked = nil + if srclist then + cooked, aftercooked = minetest.get_craft_result({method = "cooking", width = 1, items = srclist}) + end + local item_percent = 0 + if cooked then + item_percent = meta:get_float("src_time")/cooked.time + end + + return default.furnace_active(pos, percent, item_percent) +end + +default.furnace_inactive_formspec = + "size[8,8.5]".. + gui_slots.. + "list[current_name;src;2.75, 0.5;1,1;]" .. + "list[current_name;fuel;2.75,2.5;1,1;]" .. + "image[2.75,1.5;1,1;default_furnace_fire_bg.png]" .. + "image[3.75,1.5;1,1;gui_furnace_arrow_bg.png^[transformR270]" .. + "list[current_name;dst;4.75, 0.96;2,2;]" .. + "list[current_player;main;0,4.25;8,4;]" .. + default.get_hotbar_bg(0, 4.25) .. + default.get_hotbar_bg(0, 5.25) + +minetest.register_node("default:furnace", { + description = "Furnace", + tiles = {"default_furnace_top.png", "default_furnace_bottom.png", "default_furnace_side.png", + "default_furnace_side.png", "default_furnace_side.png", "default_furnace_front.png"}, + paramtype2 = "facedir", + groups = {cracky = 2}, is_ground_content = false, - groups = {snappy=3, leafdecay=3, flammable=2, leaves=1}, - drop = { - max_items = 1, - items = { - { - -- player will get sapling with 1/20 chance - items = {"default:pine_sapling"}, - rarity = 20, + sounds = default.node_sound_stone_defaults(), + on_construct = function(pos) + local meta = minetest.get_meta(pos) + meta:set_string("formspec", default.furnace_inactive_formspec) + meta:set_string("infotext", "Furnace") + local inv = meta:get_inventory() + inv:set_size("fuel", 1) + inv:set_size("src", 1) + inv:set_size("dst", 4) + end, + can_dig = function(pos,player) + local meta = minetest.get_meta(pos); + local inv = meta:get_inventory() + if not inv:is_empty("fuel") then + return false + elseif not inv:is_empty("dst") then + return false + elseif not inv:is_empty("src") then + return false + end + return true + end, + allow_metadata_inventory_put = function(pos, listname, index, stack, player) + if minetest.is_protected(pos, player:get_player_name()) then + return 0 + end + local meta = minetest.get_meta(pos) + local inv = meta:get_inventory() + if listname == "fuel" then + if minetest.get_craft_result({method = "fuel",width = 1, items ={stack}}).time ~= 0 then + if inv:is_empty("src") then + meta:set_string("infotext","Furnace is empty") + end + return stack:get_count() + else + return 0 + end + elseif listname == "src" then + return stack:get_count() + elseif listname == "dst" then + return 0 + end + end, + allow_metadata_inventory_move = function(pos, from_list, from_index, to_list, to_index, count, player) + if minetest.is_protected(pos, player:get_player_name()) then + return 0 + end + local meta = minetest.get_meta(pos) + local inv = meta:get_inventory() + local stack = inv:get_stack(from_list, from_index) + if to_list == "fuel" then + if minetest.get_craft_result({method = "fuel",width = 1, items ={stack}}).time ~= 0 then + if inv:is_empty("src") then + meta:set_string("infotext","Furnace is empty") + end + return count + else + return 0 + end + elseif to_list == "src" then + return count + elseif to_list == "dst" then + return 0 + end + end, + allow_metadata_inventory_take = function(pos, listname, index, stack, player) + if minetest.is_protected(pos, player:get_player_name()) then + return 0 + end + return stack:get_count() + end, +}) + +minetest.register_node("default:furnace_active", { + description = "Furnace (active)", + tiles = { + "default_furnace_top.png", + "default_furnace_bottom.png", + "default_furnace_side.png", + "default_furnace_side.png", + "default_furnace_side.png", + { + image = "default_furnace_front_active.png", + backface_culling = false, + animation = { + type = "vertical_frames", + aspect_w = 16, + aspect_h = 16, + length = 1 }, - { - -- player will get leaves only if he get no saplings, - -- this is because max_items is 1 - items = {"default:pine_needles"}, - } } }, - sounds = default.node_sound_leaves_defaults(), - after_place_node = default.after_place_leaves, -}) - -minetest.register_node("default:pine_sapling", { - description = "Pine Sapling", - drawtype = "plantlike", - visual_scale = 1.0, - tiles = {"default_pine_sapling.png"}, - inventory_image = "default_pine_sapling.png", - wield_image = "default_pine_sapling.png", - paramtype = "light", - walkable = false, - is_ground_content = true, - selection_box = { - 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}, - sounds = default.node_sound_leaves_defaults(), -}) - -minetest.register_node("default:pinetree", { - description = "Pine Tree", - tiles = {"default_pinetree_top.png", "default_pinetree_top.png", "default_pinetree.png"}, paramtype2 = "facedir", + light_source = 9, + drop = "default:furnace", + groups = {cracky = 2, not_in_creative_inventory = 1,hot= 1}, 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:pinewood", { - description = "Pinewood Planks", - tiles = {"default_pinewood.png"}, - groups = {choppy=2,oddly_breakable_by_hand=2,flammable=3,wood=1}, - sounds = default.node_sound_wood_defaults(), + sounds = default.node_sound_stone_defaults(), + on_construct = function(pos) + local meta = minetest.get_meta(pos) + meta:set_string("formspec", default.furnace_inactive_formspec) + meta:set_string("infotext", "Furnace"); + local inv = meta:get_inventory() + inv:set_size("fuel", 1) + inv:set_size("src", 1) + inv:set_size("dst", 4) + end, + can_dig = function(pos,player) + local meta = minetest.get_meta(pos); + local inv = meta:get_inventory() + if not inv:is_empty("fuel") then + return false + elseif not inv:is_empty("dst") then + return false + elseif not inv:is_empty("src") then + return false + end + return true + end, + allow_metadata_inventory_put = function(pos, listname, index, stack, player) + if minetest.is_protected(pos, player:get_player_name()) then + return 0 + end + local meta = minetest.get_meta(pos) + local inv = meta:get_inventory() + if listname == "fuel" then + if minetest.get_craft_result({method = "fuel",width = 1, items ={stack}}).time ~= 0 then + if inv:is_empty("src") then + meta:set_string("infotext","Furnace is empty") + end + return stack:get_count() + else + return 0 + end + elseif listname == "src" then + return stack:get_count() + elseif listname == "dst" then + return 0 + end + end, + allow_metadata_inventory_move = function(pos, from_list, from_index, to_list, to_index, count, player) + if minetest.is_protected(pos, player:get_player_name()) then + return 0 + end + local meta = minetest.get_meta(pos) + local inv = meta:get_inventory() + local stack = inv:get_stack(from_list, from_index) + if to_list == "fuel" then + if minetest.get_craft_result({method = "fuel",width = 1, items ={stack}}).time ~= 0 then + if inv:is_empty("src") then + meta:set_string("infotext","Furnace is empty") + end + return count + else + return 0 + end + elseif to_list == "src" then + return count + elseif to_list == "dst" then + return 0 + end + end, + allow_metadata_inventory_take = function(pos, listname, index, stack, player) + if minetest.is_protected(pos, player:get_player_name()) then + return 0 + end + return stack:get_count() + end, }) -- Locked Furnace thanks to kotolegokot: @@ -2151,14 +2309,16 @@ minetest.register_node("default:snow", { sunlight_propagates = true, walkable = false, buildable_to = true, + leveled = 7, drawtype = "nodebox", + freezemelt = "default:water_flowing", node_box = { - type = "fixed", + type = "leveled", fixed = { {-0.5, -0.5, -0.5, 0.5, -0.375, 0.5}, }, }, - groups = {crumbly = 3, falling_node = 1}, + groups = {crumbly = 3, falling_node = 1, melts = 1, float = 1}, sounds = default.node_sound_dirt_defaults({footstep = {name = "default_snow_footstep", gain = 0.7}}), on_construct = function(pos) pos.y = pos.y - 1 @@ -2175,7 +2335,8 @@ minetest.register_node("default:snowblock", { description = "Snow Block", tiles = {"default_snow.png"}, is_ground_content = true, - groups = {crumbly = 3}, + freezemelt = "default:water_source", + groups = {crumbly = 3, melts = 1}, sounds = default.node_sound_dirt_defaults({footstep = {name = "default_snow_footstep", gain = 0.625}}), }) diff --git a/minetestforfun_game/mods/default/player.lua b/minetestforfun_game/mods/default/player.lua index 73e4e1e0..017a6172 100644 --- a/minetestforfun_game/mods/default/player.lua +++ b/minetestforfun_game/mods/default/player.lua @@ -1,55 +1,6 @@ -- Minetest 0.4 mod: player -- See README.txt for licensing and other information. ---[[ - -API ---- - -default.player_register_model(name, def) -^ Register a new model to be used by players. -^ is the model filename such as "character.x", "foo.b3d", etc. -^ See Model Definition below for format of . - -default.registered_player_models[name] -^ See Model Definition below for format. - -default.player_set_model(player, model_name) -^ is a PlayerRef. -^ is a model registered with player_register_model. - -default.player_set_animation(player, anim_name [, speed]) -^ is a PlayerRef. -^ is the name of the animation. -^ is in frames per second. If nil, default from the model is used - -default.player_set_textures(player, textures) -^ is a PlayerRef. -^ is an array of textures -^ If is nil, the default textures from the model def are used - -default.player_get_animation(player) -^ is a PlayerRef. -^ Returns a table containing fields "model", "textures" and "animation". -^ Any of the fields of the returned table may be nil. - -Model Definition ----------------- - -model_def = { - animation_speed = 30, -- Default animation speed, in FPS. - textures = {"character.png", }, -- Default array of textures. - visual_size = {x = 1, y = 1,}, -- Used to scale the model. - animations = { - -- = { x =, y =, }, - foo = { x = 0, y = 19, }, - bar = { x = 20, y =39, }, - -- ... - }, -} - -]] - -- Player animation blending -- Note: This is currently broken due to a bug in Irrlicht, leave at 0 local animation_blend = 0 @@ -68,12 +19,14 @@ default.player_register_model("character.x", { animation_speed = 35, textures = {"character.png", }, animations = { - stand = {x = 0, y = 40}, - lay = {x = 162, y = 166}, - walk = {x = 168, y = 187}, - mine = {x = 189, y = 198}, - walk_mine = {x = 200, y = 219}, - sit = {x = 81, y = 160}, + -- Standard animations. + stand = { x= 0, y= 79, }, + lay = { x=162, y=166, }, + walk = { x=168, y=187, }, + mine = { x=189, y=198, }, + walk_mine = { x=200, y=219, }, + -- Extra animations (not currently used by the game). + sit = { x= 81, y=160, }, }, }) @@ -93,7 +46,7 @@ function default.player_get_animation(player) } end --- Called when a player"s appearance needs to be updated +-- Called when a player's appearance needs to be updated function default.player_set_model(player, model_name) local name = player:get_player_name() local model = models[model_name] @@ -105,7 +58,7 @@ function default.player_set_model(player, model_name) mesh = model_name, textures = player_textures[name] or model.textures, visual = "mesh", - visual_size = model.visual_size or {x = 1, y = 1}, + visual_size = model.visual_size or {x=1, y=1}, }) default.player_set_animation(player, "stand") else @@ -141,10 +94,10 @@ end minetest.register_on_joinplayer(function(player) default.player_attached[player:get_player_name()] = false default.player_set_model(player, "character.x") - player:set_local_animation({x = 0, y = 40}, {x = 168, y = 187}, {x = 189, y = 198}, {x = 200, y = 219}, 35) + player:set_local_animation({x=0, y=79}, {x=168, y=187}, {x=189, y=198}, {x=200, y=219}, 35) -- set GUI - if minetest.setting_getbool("creative_mode") then + if minetest.setting_getbool("creative_mode") then -- creative.set_creative_formspec(player, 0, 1) else player:set_inventory_formspec(gui_suvival_form) @@ -153,7 +106,6 @@ minetest.register_on_joinplayer(function(player) player:hud_set_hotbar_image("gui_hotbar.png") player:hud_set_hotbar_selected_image("gui_hotbar_selected.png") end) -end) minetest.register_on_leaveplayer(function(player) local name = player:get_player_name() @@ -164,6 +116,7 @@ end) -- Localize for better performance. local player_set_animation = default.player_set_animation +local player_attached = default.player_attached -- Check each player and apply animations minetest.register_globalstep(function(dtime) @@ -171,7 +124,7 @@ minetest.register_globalstep(function(dtime) local name = player:get_player_name() local model_name = player_model[name] local model = model_name and models[model_name] - if model and not default.player_attached[name] then + if model and not player_attached[name] then local controls = player:get_player_control() local walking = false local animation_speed_mod = model.animation_speed or 35 @@ -183,13 +136,13 @@ minetest.register_globalstep(function(dtime) -- Determine if the player is sneaking, and reduce animation speed if so if controls.sneak then - animation_speed_mod = animation_speed_mod * 0.5 + animation_speed_mod = animation_speed_mod / 2 end -- Apply animations based on what the player is doing if player:get_hp() == 0 then player_set_animation(player, "lay", animation_speed_mod) - player:set_eye_offset({x = 0, y = -10, z = 0}, {x = 0, y = -10, z = 0}) + player:set_eye_offset({x = 0, y = -10, z = 0}, {x = 0 elseif walking then if player_sneak[name] ~= controls.sneak then player_anim[name] = nil @@ -201,7 +154,7 @@ minetest.register_globalstep(function(dtime) player_set_animation(player, "walk", animation_speed_mod) end elseif controls.LMB or controls.RMB then - player_set_animation(player, "mine", animation_speed_mod) + player_set_animation(player, "mine", animation_spee else player_set_animation(player, "stand", animation_speed_mod * 0.4) end diff --git a/minetestforfun_game/mods/default/textures/default_jungleleaves.png b/minetestforfun_game/mods/default/textures/default_jungleleaves.png index f1b55e88..65ad8484 100644 Binary files a/minetestforfun_game/mods/default/textures/default_jungleleaves.png and b/minetestforfun_game/mods/default/textures/default_jungleleaves.png differ diff --git a/minetestforfun_game/mods/default/textures/default_water.png b/minetestforfun_game/mods/default/textures/default_water.png index e94615cc..9b6ff356 100644 Binary files a/minetestforfun_game/mods/default/textures/default_water.png and b/minetestforfun_game/mods/default/textures/default_water.png differ diff --git a/minetestforfun_game/mods/default/textures/default_water_flowing_animated.png b/minetestforfun_game/mods/default/textures/default_water_flowing_animated.png index 6eaadc94..9cb138c2 100644 Binary files a/minetestforfun_game/mods/default/textures/default_water_flowing_animated.png and b/minetestforfun_game/mods/default/textures/default_water_flowing_animated.png differ diff --git a/minetestforfun_game/mods/default/textures/default_water_source_animated.png b/minetestforfun_game/mods/default/textures/default_water_source_animated.png index a5fe1490..3b9b2d9f 100644 Binary files a/minetestforfun_game/mods/default/textures/default_water_source_animated.png and b/minetestforfun_game/mods/default/textures/default_water_source_animated.png differ diff --git a/minetestforfun_game/mods/default/trees.lua b/minetestforfun_game/mods/default/trees.lua index b994cc1f..5752fe0d 100644 --- a/minetestforfun_game/mods/default/trees.lua +++ b/minetestforfun_game/mods/default/trees.lua @@ -180,3 +180,4 @@ function default.grow_jungletree(pos, bad) vm:write_to_map() vm:update_map() end +