From 8b3abd1b43b98b3f202bc97b01ec84e0bb0656c3 Mon Sep 17 00:00:00 2001 From: LeMagnesium Date: Wed, 10 Dec 2014 23:31:28 +0100 Subject: [PATCH] Rollback again, something is crashing the server.. --- minetestforfun_game/mods/default/README.txt | 31 +- minetestforfun_game/mods/default/crafting.lua | 13 - .../mods/default/craftitems.lua | 3 +- .../mods/default/functions.lua | 258 +++++----------- minetestforfun_game/mods/default/furnace.lua | 47 ++- minetestforfun_game/mods/default/init.lua | 35 ++- .../mods/default/models/character.png | Bin 1848 -> 2754 bytes minetestforfun_game/mods/default/nodes.lua | 291 ++++++++++++++---- minetestforfun_game/mods/default/player.lua | 81 +---- .../default/textures/default_jungleleaves.png | Bin 667 -> 193 bytes .../mods/default/textures/default_water.png | Bin 502 -> 581 bytes .../default_water_flowing_animated.png | Bin 3156 -> 4403 bytes .../default_water_source_animated.png | Bin 2482 -> 3626 bytes minetestforfun_game/mods/default/trees.lua | 1 + 14 files changed, 392 insertions(+), 368 deletions(-) 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 321f9fb2b2b0b31a8087e8c781cfee2b1fa76c79..05021781e03fbb71cb309d5ac233c6c90f332fda 100644 GIT binary patch literal 2754 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 iZmC5klf;LiQ2RHy1z#|{W8SU+0000wqc3@ 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 f1b55e8817c698e70bb893679223a079c20f4aff..65ad848477788af136a4403c4462cecc516a3ec6 100644 GIT binary patch delta 177 zcmbQudXRB~L_G^L0|Ud`yN`l^6n}tEh%1m*G?L&Gx?Fnm3uMpY(A)o1v~{ZBa2#j)f(Y`AK7Nz-q-^o>SQ_ a{bbxK$zMC`TjxxmT@0SCelF{r5}E+3Ogs(% delta 655 zcmV;A0&xAo0h3K~xwS1;K?v6#)PMu+jMlX^9C1W?RS#N93y3 z`=oq+=YPoa_TRb5r5wUc|2h(AT#(qtEBk5{27F(wNBUYf$DtZi$oru`g>VCY21x{^ zb=Vp&I0Iui|KG($D-v~Hi!(4-92}l{c$D1qCcO7sZ1PtnFin2tfdYkpUQXgk6Y)-} p46!AA6BJwV=F8B`80}@zpAuyzMZ8f0e*gdg00>D%PDHLkV1iFTwoL#4 diff --git a/minetestforfun_game/mods/default/textures/default_water.png b/minetestforfun_game/mods/default/textures/default_water.png index e94615cc11354f311d0cef6683199160854ebacf..9b6ff356e4bd69a8e8daaee7b02fd938113fb6c1 100644 GIT binary patch delta 567 zcmV-70?7UL1H}Z88Gi-<001BJ|6u?C0t`t+K~#9!Rg>Lr5>XU|=P6(qz*bF-6@RK$ z<6HPPT14zX0o#Jq_HJMKN=9oFD}qd!8GH-(x2h-cVyB0!+3W9|M%B)D)4cs*ar(<1 zO-rjCq;P=^9&Ms_9a0T9d+Vj0yvI9_L_QWO%zx`IR&jz_cLu4lf^&W_DV%I&x84`_@IxUImFU?*`!zq;x)gPZRS^sC zUwId$_d{{Iflz4l?~1k#3)xM4Vppu}orl8i9_O~{$~Q-@J}sqQ@yOu+KP1lxJ0EY1 za@kj5y$l!OI*GvWn`;c2>VuUveeR8OS1nW$_{JdfMSm~)&4oLvo&zTq@wGDqgw>aqk=z!Xqyt zWJ~&)J#|~V-uBigv&yT_6s1z@2P+Cxr0sFZ_rfFCM9}5|&FBLM#L&9{-#*H$b$n%w zLC*gO%P=^Q8xd&!KA_fE9iSTC0(q0(((X?R2v|f^_#a4V83%)~{7L`-002ovPDHLk FV1gOa7Igps literal 502 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 literal 3156 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 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 a5fe14908eb318d273b994d0165c1e5134b1572e..3b9b2d9fcd804d607dfec47c4e0e01f32950af41 100644 GIT binary patch literal 3626 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 bDWSWKc}AQYtFnK7K#-}Sg+Z;p`@R1HchTNx literal 2482 zcmcguX;c$d8jUg)g~6Z$B1IzZg^ny^RRkg`kpKbGge?Jt7y$vh`}5Mjw}mPx ze60Wg0F*2(Ajr?RG61j*uv6|cx_f6w%;$&W_ty58p?B(`nGF_rhDBDBMRto-R-;vR zvsF$j49|dNH^FjRV7W}|oM!9XR_nZH)`WKJ!Va6<7Mnb#O+L$}kZqgSYMcMeme6in z)L~2Hz;j#R`Aj&01uta7iJfo~7m?SBAUs19wj+u<5JV25xC=>OA`4l_A~urPi6n9D zirVdn9d;y+T}hWcfoWgJvL~|bNuBn^TzfLlp{U(~)ZtLfaVY6>BC?%|JDp0nPGla6 z)PXADpvYY)3LjnEi6(Q=6dsx?a4z9EQ@Wg~e3xRjOG&2-nd?I3xzGfzWR5GP%az7= zqw?HJ1@7bycWReAjqgquVyIjUjfW`}V9L6$(uG*M09)4WLFapv2|dbtJj=U1ANF~b z3%wrpT&MG{SN3^V_IOu`e5(3xJQDdm>I<&v52@}6s}+Smc@QEbz2XYloi28Jho$D0L|Y?!CcaL z7eA_(sG#VdIOzey99MNi*0K7BGa$l3|BFMO)J1P?xD|2bVaP{Nmmr}1+*k1E15Z}j zHEpum;^7pIQSfvBNMp%;7dR+Cv;a13h?QPN`DcPc4RlQQSDr4kDNK8LFh$;i*$q?* zRRQ*GfV~dAW@Jdg(~njRyFZLHK*s7;Ce?l^Qo^lubd8!_nJa#NS~I?H;_%!0x~SlW z3bOpC+>?#r7v8p24p;#fOd!X2DAaItJ$8i*rm{xO7SDuhYcEWk0P4Alk8iKB(_0u@ zTcpexu8JYiRXNAzaFH5!hxRQg0!{2lFhFYa4av3=((bx#nvaE#=M1GWoTr>O^AvvS zB4=nqN3%)>;@`&BUewRZ1-XUycRxvEBLoAWY3V^f%GcP{waHh(V_Eg2JyB^hrwBek zTwbM);w6jlqrY(U};!iVp5Ls0b&lHG!ZXopNWs`aZ>>a#-Mm) zC&yIRM1sg-S(}{VJC58(|LQ0$hVb~w2s`JnER;L zOBvIR(@3lYKUXr74@>v`Dbeg3ufYt}bAt~~=G4kc2d*s#R<@M$Q>e+?tYN^)TQuRPmh)Ps_G(=ZWvv2*o+tClE#yUMu>2(B)*ppZB&Om0fb0=s@^qp*f z+?wCS=hd3V5F}`Ph4@p-5;yeVtkp;*PCd%{_AT`&hWu0(5S$;3H*#;OZS@6@iiH(D z>{d%bFKwV=Q&BeXH$pPi(Spt$*vZ+C&G-95!wt7}zLbvOqS3V60^wtD{N z^;v1R*k4cg#N_~R`+aqORchdD#!}FLKYnS34n^#vK&Ov8h}hCVaW7m_?ctAaT{4kb zWOFFcIM+BL3O~h7F}@KQx%L2s#)|{-N8OV_lSvCYi`=Nz$=Df#^6~phkpqK)xo(+i z#0Ds%IU_RSjSTgg7HEDedzsE*wA6tHg)}$OM5Lr;$$|tUf|jtgno)OV8lb@&wE7>` z+~BU_-WSuX;w3}ENaJf-fj{X<>`;?j>dwe_%453^93Dw9OEwNl3zFZxXZG2lc1=SF zW8y8yVSp|3nb|B`Om4#eVE$K`UyJvIUlhNAmP-x$R|H$}SY;Yp#`Vu$zxfP%tM{AVKaBVH+W%{~79U&jX3L}9|GumT dp__aA5h(HqM5Fd