From b8a1cac0cbc2dc2ced722f021fdb02ad7df7de5d Mon Sep 17 00:00:00 2001 From: LeMagnesium Date: Mon, 8 Dec 2014 22:44:21 +0100 Subject: [PATCH] Update minetestforfun_game with minetest_game - I hope there is no problem. I see a lot of new stuff in the vanilla game. I keep a backup on another computer to restore the state of the repository if there is a problem. --- minetestforfun_game/game.conf | 2 +- minetestforfun_game/game_api.txt | 88 +++- minetestforfun_game/minetest.conf | 1 + minetestforfun_game/minetest.conf.example | 24 + minetestforfun_game/mods/boats/init.lua | 60 +-- minetestforfun_game/mods/default/README.txt | 35 +- .../mods/default/craftitems.lua | 32 +- .../mods/default/functions.lua | 275 ++++-------- minetestforfun_game/mods/default/furnace.lua | 283 ++++++++++++ minetestforfun_game/mods/default/init.lua | 140 +----- .../mods/default/models/character.png | Bin 1848 -> 2754 bytes minetestforfun_game/mods/default/player.lua | 101 ++--- .../mods/default/textures/crack_anylength.png | Bin 1472 -> 252 bytes .../mods/default/textures/default_grass.png | Bin 692 -> 859 bytes .../default/textures/default_grass_side.png | Bin 794 -> 473 bytes .../default/textures/default_jungleleaves.png | Bin 667 -> 193 bytes .../default/textures/default_pine_needles.png | Bin 0 -> 512 bytes .../default/textures/default_pine_sapling.png | Bin 0 -> 406 bytes .../default/textures/default_pinetree.png | Bin 0 -> 693 bytes .../default/textures/default_pinetree_top.png | Bin 0 -> 802 bytes .../default/textures/default_pinewood.png | Bin 0 -> 455 bytes .../default/textures/default_steel_block.png | Bin 315 -> 604 bytes .../default/textures/default_steel_ingot.png | Bin 181 -> 283 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/tools.lua | 413 +++++++----------- minetestforfun_game/mods/default/trees.lua | 1 + minetestforfun_game/mods/doors/init.lua | 131 +++--- minetestforfun_game/mods/dye/init.lua | 60 +-- minetestforfun_game/mods/fire/init.lua | 24 +- minetestforfun_game/mods/stairs/init.lua | 8 + 32 files changed, 820 insertions(+), 858 deletions(-) create mode 100644 minetestforfun_game/minetest.conf.example create mode 100644 minetestforfun_game/mods/default/furnace.lua create mode 100644 minetestforfun_game/mods/default/textures/default_pine_needles.png create mode 100644 minetestforfun_game/mods/default/textures/default_pine_sapling.png create mode 100644 minetestforfun_game/mods/default/textures/default_pinetree.png create mode 100644 minetestforfun_game/mods/default/textures/default_pinetree_top.png create mode 100644 minetestforfun_game/mods/default/textures/default_pinewood.png diff --git a/minetestforfun_game/game.conf b/minetestforfun_game/game.conf index e14369b2..8b819bb9 100755 --- a/minetestforfun_game/game.conf +++ b/minetestforfun_game/game.conf @@ -1 +1 @@ -name = minetestforfun_game +name = Minetest diff --git a/minetestforfun_game/game_api.txt b/minetestforfun_game/game_api.txt index 3d9d7a59..8123c010 100755 --- a/minetestforfun_game/game_api.txt +++ b/minetestforfun_game/game_api.txt @@ -46,6 +46,8 @@ The doors mod allows modders to register custom doors. node_box_top = regular nodebox, see [Node boxes], OPTIONAL, selection_box_bottom = regular nodebox, see [Node boxes], OPTIONAL, selection_box_top = regular nodebox, see [Node boxes], OPTIONAL, + sound_open_door = sound play for open door, OPTIONAL, + sound_close_door = sound play for close door, OPTIONAL, only_placer_can_open = true/false, ^ If true, only placer can open the door (locked for others) } @@ -118,7 +120,7 @@ Xpanes API Creates panes that automatically connect to each other xpanes.register_pane(subname, def) - -> subname: used for nodename. Result: "xpanes:subname_{1..16}" + -> subname: used for nodename. Result: "xpanes:subname" and "xpanes:subname_{2..15}" -> def: See [#Pane definition] #Pane definition @@ -132,10 +134,6 @@ xpanes.register_pane(subname, def) ^ See [#Default sounds] recipe = {{"","","","","","","","",""}}, ^ Recipe field only - on_construct = function(pos) - update_pane(pos, "pane") - end, - ^ Required to handle rotation correctly } Default sounds @@ -197,3 +195,83 @@ Model Definition -- ... }, } + +Leafdecay +--------- +To enable leaf decay for a node, add it to the "leafdecay" group. + +The rating of the group determines how far from a node in the group "tree" +the node can be without decaying. + +If param2 of the node is ~= 0, the node will always be preserved. Thus, if +the player places a node of that kind, you will want to set param2=1 or so. + +The function default.after_place_leaves can be set as after_place_node of a node +to set param2 to 1 if the player places the node (should not be used for nodes +that use param2 otherwise (e.g. facedir)). + +If the node is in the leafdecay_drop group then it will always be dropped as an +item. + +Dyes +---- +To make recipes that will work with any dye ever made by anybody, define +them based on groups. You can select any group of groups, based on your need for +amount of colors. + +#Color groups +------------- +Base color groups: +- basecolor_white +- basecolor_grey +- basecolor_black +- basecolor_red +- basecolor_yellow +- basecolor_green +- basecolor_cyan +- basecolor_blue +- basecolor_magenta + +Extended color groups (* = equal to a base color): +* excolor_white +- excolor_lightgrey +* excolor_grey +- excolor_darkgrey +* excolor_black +* excolor_red +- excolor_orange +* excolor_yellow +- excolor_lime +* excolor_green +- excolor_aqua +* excolor_cyan +- excolor_sky_blue +* excolor_blue +- excolor_violet +* excolor_magenta +- excolor_red_violet + +The whole unifieddyes palette as groups: +- unicolor_ +For the following, no white/grey/black is allowed: +- unicolor_medium_ +- unicolor_dark_ +- unicolor_light_ +- unicolor__s50 +- unicolor_medium__s50 +- unicolor_dark__s50 + +Example of one shapeless recipe using a color group: +minetest.register_craft({ + type = "shapeless", + output = ':item_yellow', + recipe = {':item_no_color', 'group:basecolor_yellow'}, +}) + +#Color lists +------------ +dye.basecolors +^ Array containing the names of available base colors + +dye.excolors +^ Array containing the names of the available extended colors diff --git a/minetestforfun_game/minetest.conf b/minetestforfun_game/minetest.conf index 3fb76797..cda1589f 100755 --- a/minetestforfun_game/minetest.conf +++ b/minetestforfun_game/minetest.conf @@ -1,3 +1,4 @@ +mg_flags = dungeons mgv6_spflags = biomeblend, jungles movement_liquid_sink = 25 diff --git a/minetestforfun_game/minetest.conf.example b/minetestforfun_game/minetest.conf.example new file mode 100644 index 00000000..b908ad24 --- /dev/null +++ b/minetestforfun_game/minetest.conf.example @@ -0,0 +1,24 @@ +# This file contains settings of minetest_game that can be changed in +# minetest.conf +# +# By default, all the settings are commented and not functional. +# Uncomment settings by removing the preceding #. + +# Whether creative mode (fast digging of all blocks, unlimited resources) should be enabled +#creative_mode = false + +# The time in seconds after which the bones of a dead player can be looted by everyone +# 0 to disable +#share_bones_time = 1200 + +# Whether fire should be disabled (all fire nodes will instantly disappear) +#disable_fire = false + +# Whether steel tools, torches and cobblestone should be given to new players +#give_initial_stuff = false + +# Whether the TNT mod should be enabled +#enable_tnt = + +# The radius of a TNT explosion +#tnt_radius = 3 diff --git a/minetestforfun_game/mods/boats/init.lua b/minetestforfun_game/mods/boats/init.lua index 12126988..da013ab5 100644 --- a/minetestforfun_game/mods/boats/init.lua +++ b/minetestforfun_game/mods/boats/init.lua @@ -32,7 +32,7 @@ end local boat = { physical = true, - collisionbox = {-0.6, -0.4, -0.6, 0.6, 0.3, 0.6}, + collisionbox = {-0.5, -0.4, -0.5, 0.5, 0.3, 0.5}, visual = "mesh", mesh = "boat.x", textures = {"default_wood.png"}, @@ -80,16 +80,20 @@ function boat.on_punch(self, puncher, time_from_last_punch, tool_capabilities, d if not puncher or not puncher:is_player() or self.removed then return end - puncher:set_detach() - default.player_attached[puncher:get_player_name()] = false - - self.removed = true - -- delay remove to ensure player is detached - minetest.after(0.1, function() - self.object:remove() - end) - if not minetest.setting_getbool("creative_mode") then - puncher:get_inventory():add_item("main", "boats:boat") + if self.driver and puncher == self.driver then + self.driver = nil + puncher:set_detach() + default.player_attached[puncher:get_player_name()] = false + end + if not self.driver then + self.removed = true + -- delay remove to ensure player is detached + minetest.after(0.1, function() + self.object:remove() + end) + if not minetest.setting_getbool("creative_mode") then + puncher:get_inventory():add_item("main", "boats:boat") + end end end @@ -100,19 +104,17 @@ function boat.on_step(self, dtime) local yaw = self.object:getyaw() if ctrl.up then self.v = self.v + 0.1 - end - if ctrl.down then - self.v = self.v - 0.08 + elseif ctrl.down then + self.v = self.v - 0.1 end if ctrl.left then - if ctrl.down then + if self.v < 0 then self.object:setyaw(yaw - (1 + dtime) * 0.03) else self.object:setyaw(yaw + (1 + dtime) * 0.03) end - end - if ctrl.right then - if ctrl.down then + elseif ctrl.right then + if self.v < 0 then self.object:setyaw(yaw + (1 + dtime) * 0.03) else self.object:setyaw(yaw - (1 + dtime) * 0.03) @@ -121,6 +123,7 @@ function boat.on_step(self, dtime) end local velo = self.object:getvelocity() if self.v == 0 and velo.x == 0 and velo.y == 0 and velo.z == 0 then + self.object:setpos(self.object:getpos()) return end local s = get_sign(self.v) @@ -144,30 +147,33 @@ function boat.on_step(self, dtime) self.v = 0 new_acce = {x = 0, y = 1, z = 0} else - new_acce = {x = 0, y = -9.8, z = 0} -- freefall in air -9.81 + new_acce = {x = 0, y = -9.8, z = 0} end new_velo = get_velocity(self.v, self.object:getyaw(), self.object:getvelocity().y) + self.object:setpos(self.object:getpos()) else p.y = p.y + 1 if is_water(p) then - new_acce = {x = 0, y = 3, z = 0} local y = self.object:getvelocity().y - if y > 2 then - y = 2 - end - if y < 0 then - self.object:setacceleration({x = 0, y = 10, z = 0}) + if y >= 4.5 then + y = 4.5 + elseif y < 0 then + new_acce = {x = 0, y = 20, z = 0} + else + new_acce = {x = 0, y = 5, z = 0} end new_velo = get_velocity(self.v, self.object:getyaw(), y) + self.object:setpos(self.object:getpos()) else new_acce = {x = 0, y = 0, z = 0} - if math.abs(self.object:getvelocity().y) <= 2 then + if math.abs(self.object:getvelocity().y) < 1 then local pos = self.object:getpos() pos.y = math.floor(pos.y) + 0.5 self.object:setpos(pos) new_velo = get_velocity(self.v, self.object:getyaw(), 0) else new_velo = get_velocity(self.v, self.object:getyaw(), self.object:getvelocity().y) + self.object:setpos(self.object:getpos()) end end end @@ -177,7 +183,6 @@ end minetest.register_entity("boats:boat", boat) - minetest.register_craftitem("boats:boat", { description = "Boat", inventory_image = "boat_inventory.png", @@ -209,3 +214,4 @@ minetest.register_craft({ {"group:wood", "group:wood", "group:wood"}, }, }) + diff --git a/minetestforfun_game/mods/default/README.txt b/minetestforfun_game/mods/default/README.txt index 40502509..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,6 +34,9 @@ Cisoun's WTFPL texture pack: default_tree_top.png default_water.png +Cisoun's conifers mod (WTFPL): + default_pine_needles.png + Originating from G4JC's Almost MC Texture Pack: default_torch.png default_torch_on_ceiling.png @@ -68,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 @@ -87,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 @@ -102,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 @@ -112,6 +108,9 @@ Zeg9 (CC BY-SA 3.0): paramat (CC BY-SA 3.0): wieldhand.png, based on character.png by Jordach (CC BY-SA 3.0) + default_pinetree.png + default_pinetree_top.png + default_pinewood.png brunob.santos (CC BY-SA 4.0): default_desert_cobble.png @@ -119,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 @@ -133,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/craftitems.lua b/minetestforfun_game/mods/default/craftitems.lua index 7a8185f7..539f6b43 100644 --- a/minetestforfun_game/mods/default/craftitems.lua +++ b/minetestforfun_game/mods/default/craftitems.lua @@ -2,41 +2,35 @@ minetest.register_craftitem("default:stick", { description = "Stick", - stack_max = 1000, inventory_image = "default_stick.png", - wield_image = "default_stick.png^[transformR90", - groups = {stick = 1}, + groups = {stick=1}, }) minetest.register_craftitem("default:paper", { description = "Paper", - wield_scale = {x = 1, y = 1, z = 0.25}, inventory_image = "default_paper.png", }) minetest.register_craftitem("default:book", { description = "Book", inventory_image = "default_book.png", + 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", { description = "Iron Lump", - wield_scale = {x = 1, y = 1, z = 2}, inventory_image = "default_iron_lump.png", - groups = {ingot_lump = 1}, }) minetest.register_craftitem("default:copper_lump", { description = "Copper Lump", - wield_scale = {x = 1, y = 1, z = 2}, inventory_image = "default_copper_lump.png", - groups = {ingot_lump = 1}, }) minetest.register_craftitem("default:mese_crystal", { @@ -46,9 +40,7 @@ minetest.register_craftitem("default:mese_crystal", { minetest.register_craftitem("default:gold_lump", { description = "Gold Lump", - wield_scale = {x = 1, y = 1, z = 2}, inventory_image = "default_gold_lump.png", - groups = {ingot_lump = 1}, }) minetest.register_craftitem("default:diamond", { @@ -58,37 +50,27 @@ minetest.register_craftitem("default:diamond", { minetest.register_craftitem("default:clay_lump", { description = "Clay Lump", - stack_max = 200, - wield_scale = {x = 1, y = 1, z = 2}, inventory_image = "default_clay_lump.png", }) minetest.register_craftitem("default:steel_ingot", { description = "Steel Ingot", - wield_scale = {x = 1, y = 1, z = 2}, inventory_image = "default_steel_ingot.png", - groups = {ingot = 1}, }) minetest.register_craftitem("default:copper_ingot", { description = "Copper Ingot", - wield_scale = {x = 1, y = 1, z = 2}, inventory_image = "default_copper_ingot.png", - groups = {ingot = 1}, }) minetest.register_craftitem("default:bronze_ingot", { description = "Bronze Ingot", - wield_scale = {x = 1, y = 1, z = 2}, inventory_image = "default_bronze_ingot.png", - groups = {ingot = 1}, }) minetest.register_craftitem("default:gold_ingot", { description = "Gold Ingot", - wield_scale = {x = 1, y = 1, z = 2}, - inventory_image = "default_gold_ingot.png", - groups = {ingot = 1}, + inventory_image = "default_gold_ingot.png" }) minetest.register_craftitem("default:mese_crystal_fragment", { @@ -98,15 +80,9 @@ minetest.register_craftitem("default:mese_crystal_fragment", { minetest.register_craftitem("default:clay_brick", { description = "Clay Brick", - wield_scale = {x = 1, y = 1, z = 2}, inventory_image = "default_clay_brick.png", }) -minetest.register_craftitem("default:scorched_stuff", { - description = "Scorched Stuff", - inventory_image = "default_scorched_stuff.png", -}) - minetest.register_craftitem("default:obsidian_shard", { description = "Obsidian Shard", inventory_image = "default_obsidian_shard.png", diff --git a/minetestforfun_game/mods/default/functions.lua b/minetestforfun_game/mods/default/functions.lua index 80f3374a..ecb7f612 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,95 +108,43 @@ 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({ nodenames = {"default:lava_flowing"}, neighbors = {"group:water"}, - interval = 2, + interval = 1, chance = 1, action = function(pos, node, active_object_count, active_object_count_wider) default.cool_lava_flowing(pos, node, active_object_count, active_object_count_wider) @@ -249,7 +154,7 @@ minetest.register_abm({ minetest.register_abm({ nodenames = {"default:lava_source"}, neighbors = {"group:water"}, - interval = 2, + interval = 1, chance = 1, action = function(pos, node, active_object_count, active_object_count_wider) default.cool_lava_source(pos, node, active_object_count, active_object_count_wider) @@ -263,21 +168,21 @@ minetest.register_abm({ minetest.register_abm({ nodenames = {"default:cactus"}, neighbors = {"group:sand"}, - interval = 30, - chance = 50, + interval = 50, + chance = 20, 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 @@ -286,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"}, - interval = 30, - chance = 30, + neighbors = {"default:dirt", "default:dirt_with_grass"}, + interval = 50, + chance = 20, 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} @@ -328,19 +233,6 @@ end -- Leafdecay -- --- To enable leaf decay for a node, add it to the "leafdecay" group. --- --- The rating of the group determines how far from a node in the group "tree" --- the node can be without decaying. --- --- If param2 of the node is ~= 0, the node will always be preserved. Thus, if --- the player places a node of that kind, you will want to set param2= 1 or so. --- --- If the node is in the leafdecay_drop group then the it will always be dropped --- as an item - -if minetest.setting_getbool("leaf_decay") ~= false then -- “If not defined or set to true then” - default.leafdecay_trunk_cache = {} default.leafdecay_enable_cache = true -- Spread the load of finding trunks @@ -352,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. - chance = 2, + -- A low interval and a high inverse chance spreads the load + interval = 2, + chance = 5, 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 @@ -378,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 @@ -393,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 new file mode 100644 index 00000000..d49d8efe --- /dev/null +++ b/minetestforfun_game/mods/default/furnace.lua @@ -0,0 +1,283 @@ + +-- +-- Formspecs +-- + +local function active_formspec(fuel_percent, item_percent) + local formspec = + "size[8,8.5]".. + default.gui_bg.. + default.gui_bg_img.. + default.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-fuel_percent)..":default_furnace_fire_fg.png]".. + "image[3.75,1.5;1,1;gui_furnace_arrow_bg.png^[lowpart:".. + (item_percent)..":gui_furnace_arrow_fg.png^[transformR270]".. + "list[current_name;dst;4.75,0.96;2,2;]".. + "list[current_player;main;0,4.25;8,1;]".. + "list[current_player;main;0,5.5;8,3;8]".. + default.get_hotbar_bg(0, 4.25) + return formspec +end + +local inactive_formspec = + "size[8,8.5]".. + default.gui_bg.. + default.gui_bg_img.. + default.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,1;]".. + "list[current_player;main;0,5.5;8,3;8]".. + default.get_hotbar_bg(0, 4.25) + +-- +-- Node callback functions that are the same for active and inactive furnace +-- + +local function can_dig(pos, player) + local meta = minetest.get_meta(pos); + local inv = meta:get_inventory() + return inv:is_empty("fuel") and inv:is_empty("dst") and inv:is_empty("src") +end + +local function allow_metadata_inventory_put(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 + +local function allow_metadata_inventory_move(pos, from_list, from_index, to_list, to_index, count, player) + local meta = minetest.get_meta(pos) + local inv = meta:get_inventory() + local stack = inv:get_stack(from_list, from_index) + return allow_metadata_inventory_put(pos, to_list, to_index, stack, player) +end + +local function allow_metadata_inventory_take(pos, listname, index, stack, player) + if minetest.is_protected(pos, player:get_player_name()) then + return 0 + end + return stack:get_count() +end + +-- +-- Node definitions +-- + +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}, + 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, +}) + +minetest.register_node("default:furnace_active", { + description = "Furnace", + 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.5 + }, + } + }, + paramtype2 = "facedir", + light_source = 8, + drop = "default:furnace", + groups = {cracky=2, not_in_creative_inventory=1}, + legacy_facedir_simple = true, + is_ground_content = false, + sounds = default.node_sound_stone_defaults(), + + can_dig = can_dig, + + aallow_metadata_inventory_put = allow_metadata_inventory_put, + allow_metadata_inventory_move = allow_metadata_inventory_move, + allow_metadata_inventory_take = allow_metadata_inventory_take, +}) + +-- +-- ABM +-- + +local function swap_node(pos, name) + local node = minetest.get_node(pos) + if node.name == name then + return + end + node.name = name + minetest.swap_node(pos, node) +end + +minetest.register_abm({ + nodenames = {"default:furnace", "default:furnace_active"}, + interval = 1.0, + chance = 1, + action = function(pos, node, active_object_count, active_object_count_wider) + -- + -- Inizialize metadata + -- + local meta = minetest.get_meta(pos) + 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, + }) do + if inv:get_size(listname) ~= size then + inv:set_size(listname, size) + end + end + local srclist = inv:get_list("src") + local fuellist = inv:get_list("fuel") + local dstlist = inv:get_list("dst") + + -- + -- Cooking + -- + + -- 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 + if src_time >= cooked.time then + -- Place result in dst list if possible + if inv:room_for_item("dst", cooked.item) then + inv:add_item("dst", cooked.item) + inv:set_stack("src", 1, aftercooked.items[1]) + src_time = 0 + end + end + end + else + -- Furnace ran out of fuel + 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 + fuel_time = 0 + src_time = 0 + 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 + fuel_totaltime = 0 + fuel_time = 0 + src_time = 0 + end + end + + -- + -- Update formspec, infotext and node + -- + local formspec = inactive_formspec + local item_state = "" + local item_percent = 0 + if cookable then + item_percent = math.floor(src_time / cooked.time * 100) + item_state = item_percent .. "%" + else + if srclist[1]:is_empty() then + item_state = "Empty" + else + item_state = "Not cookable" + end + end + + local fuel_state = "Empty" + local active = "inactive " + if fuel_time <= fuel_totaltime and fuel_totaltime ~= 0 then + active = "active " + local fuel_percent = math.floor(fuel_time / fuel_totaltime * 100) + fuel_state = fuel_percent .. "%" + formspec = active_formspec(fuel_percent, item_percent) + swap_node(pos, "default:furnace_active") + else + if not fuellist[1]:is_empty() then + fuel_state = "0%" + end + swap_node(pos, "default:furnace") + end + + local infotext = "Furnace " .. active .. "(Item: " .. item_state .. "; Fuel: " .. fuel_state .. ")" + + -- + -- Set meta values + -- + meta:set_float("fuel_totaltime", fuel_totaltime) + meta:set_float("fuel_time", fuel_time) + meta:set_float("src_time", src_time) + meta:set_string("formspec", formspec) + meta:set_string("infotext", infotext) + end, +}) diff --git a/minetestforfun_game/mods/default/init.lua b/minetestforfun_game/mods/default/init.lua index 0bb0a077..276af543 100644 --- a/minetestforfun_game/mods/default/init.lua +++ b/minetestforfun_game/mods/default/init.lua @@ -1,39 +1,44 @@ -- 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. +LAVA_VISC = 7 +LIGHT_MAX = 14 --- GUI related stuff: +-- Definitions made by this mod that other mods can use too +default = {} -gui_slots = "listcolors[#606060AA;#808080;#101010;#202020;#FFF]" +-- 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]".. - 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").."/furnace.lua") dofile(minetest.get_modpath("default").."/tools.lua") dofile(minetest.get_modpath("default").."/craftitems.lua") dofile(minetest.get_modpath("default").."/crafting.lua") @@ -41,102 +46,3 @@ dofile(minetest.get_modpath("default").."/mapgen.lua") dofile(minetest.get_modpath("default").."/player.lua") dofile(minetest.get_modpath("default").."/trees.lua") dofile(minetest.get_modpath("default").."/aliases.lua") - --- Code below by Casimir. - -local function count_items() - local i = 0 - local number = 0 - for name, item in pairs(minetest.registered_items) do - if (name and name ~= "") then - number = number + 1 - end - i = i + 1 - end - minetest.log("action", "There are " .. number .. " registered nodes, items and tools.") -end - -local function player_join_sounds() - minetest.register_on_joinplayer(function() - minetest.sound_play("player_join", {gain = 0.75}) - end) -end - -local function player_leave_sounds() - minetest.register_on_leaveplayer(function() - minetest.sound_play("player_leave", {gain = 1}) - end) -end - -minetest.after(1, count_items) -minetest.after(5, player_join_sounds) -minetest.after(5, player_leave_sounds) - -hotbar_size = minetest.setting_get("hotbar_size") or 16 - -minetest.register_on_joinplayer(function(player) - player:set_physics_override({ - sneak_glitch = false, -- Climable blocks are quite fast in Carbone. - }) - player:hud_set_hotbar_itemcount(hotbar_size) -end) - -minetest.register_on_respawnplayer(function(player) - player:set_eye_offset({x = 0, y = 0, z = 0}, {x = 0, y = 0, z = 0}) - local pos = player:getpos() - -- minetest.sound_play("player_join", {pos = pos, gain = 0.5}) -end) - -minetest.register_on_item_eat(function(hp_change, replace_with_item, itemstack, user, pointed_thing) - if user:get_hp() >= 20 then return itemstack end - local pos = user:getpos() - minetest.sound_play("health_gain", {pos = pos, gain = 0.4}) -end) - -minetest.log("action", "") -- Empty line. -minetest.log("action", "") -- Empty line. - -if minetest.setting_getbool("creative_mode") then - minetest.log("action", "Creative mode is enabled.") - else - minetest.log("action", "Creative mode is disabled.") -end - -if minetest.setting_getbool("enable_damage") then - minetest.log("action", "Damage is enabled.") - else - minetest.log("action", "Damage is disabled.") -end - -if minetest.setting_getbool("enable_pvp") then - minetest.log("action", "PvP is enabled.") - else - minetest.log("action", "PvP is disabled.") -end - -if not minetest.is_singleplayer() and minetest.setting_getbool("server_announce") then - minetest.log("action", "") -- Empty line. - minetest.log("action", "Server name: " .. minetest.setting_get("server_name") or "(none)") - minetest.log("action", "Server description: " .. minetest.setting_get("server_description") or "(none)") - minetest.log("action", "Server URL: " .. minetest.setting_get("server_address") or "(none)") - minetest.log("action", "MOTD: " .. minetest.setting_get("motd") or "(none)") - minetest.log("action", "Maximum users: " .. minetest.setting_get("max_users") or 15) -end - -minetest.log("action", "") -- Empty line. -minetest.log("action", "") -- Empty line. - --- Reserved slot handling: - -minetest.register_on_prejoinplayer(function(name, ip) - if #minetest.get_connected_players() >= (minetest.setting_get("max_users") - 2) - and not minetest.check_player_privs(name, {server = true}) then - return "Sorry, 2 slots are reserved for administrators." - end -end) - - -if minetest.setting_getbool("log_mods") then - -- Highlight the default mod in the mod loading logs: - minetest.log("action", "Carbone: * [default] loaded.") -end 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/player.lua b/minetestforfun_game/mods/default/player.lua index 73e4e1e0..688ef62f 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 @@ -65,15 +16,17 @@ end -- Default player appearance default.player_register_model("character.x", { - animation_speed = 35, + animation_speed = 30, 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,18 +94,14 @@ 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}, 30) -- set GUI - if minetest.setting_getbool("creative_mode") then - -- creative.set_creative_formspec(player, 0, 1) - else - player:set_inventory_formspec(gui_suvival_form) + if not minetest.setting_getbool("creative_mode") then + player:set_inventory_formspec(default.gui_suvival_form) end - minetest.after(0.5,function() - player:hud_set_hotbar_image("gui_hotbar.png") - player:hud_set_hotbar_selected_image("gui_hotbar_selected.png") - end) + player:hud_set_hotbar_image("gui_hotbar.png") + player:hud_set_hotbar_selected_image("gui_hotbar_selected.png") end) minetest.register_on_leaveplayer(function(player) @@ -164,6 +113,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,10 +121,10 @@ 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 + local animation_speed_mod = model.animation_speed or 30 -- Determine if the player is walking if controls.up or controls.down or controls.left or controls.right then @@ -183,27 +133,26 @@ 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_animation(player, "lay") elseif walking then if player_sneak[name] ~= controls.sneak then player_anim[name] = nil player_sneak[name] = controls.sneak end - if controls.LMB or controls.RMB then + if controls.LMB then player_set_animation(player, "walk_mine", animation_speed_mod) else player_set_animation(player, "walk", animation_speed_mod) end - elseif controls.LMB or controls.RMB then - player_set_animation(player, "mine", animation_speed_mod) + elseif controls.LMB then + player_set_animation(player, "mine") else - player_set_animation(player, "stand", animation_speed_mod * 0.4) + player_set_animation(player, "stand", animation_speed_mod) end end end diff --git a/minetestforfun_game/mods/default/textures/crack_anylength.png b/minetestforfun_game/mods/default/textures/crack_anylength.png index dd3aac9a5117f5f9e9610f47a337f2a3cfaf30a0..2788dc1da00d0859f7cb5bb4e35bc438d759ce9e 100644 GIT binary patch delta 238 zcmX@W{fBXaSUp1k2Qvc$gL)~eJ&@uF@Ck7R(r{q<(tH|_!(0;N7tGMq_FY1P3CNw} z>EaktaqH-$M!seP4wv$M|NlRK*%7C)b*|p+4gvlQF8$g+S0ZXXCpo)yRxR1Obo$Tz znX?w8+>F^IvcoawswDr#7jfsWPhTFhDBbAil=cYG6V)6RvkdrMFLbo4>T+|*)HZqW z&1@I`{el=0`qS~`#r-{Uzt`S*a&Q8BYr7WzM=}0G ffwQ=|_^TS`U7yZaS7L4O3FHY+S3j3^P6 delta 1468 zcmV;t1w;D$0l*887JmT%2m}BC01#U~#Q*>Whey)ZAbj38u1b=h}eE1jd9sEHD{-2M(Lc zNI<(s#j%cu-Ad4_4?N{aN1|JotG`P_JODY&20g}`D1VJ;_WQM1(?cFAFvMwy%#eq> zoCz>0{LT41r1>Eamt>gJr$3TQnmlM)T$16DGw7_t+jzJj)#%r@-Npu9N0CX2PL_Qk50U!@m*Na}BGunX z3YhNbfrWCKjYtGcqT8m_2LV1e9wL_@S4(9a6HSWLvO-SayRe@GqaYJl*6e{dWl)$0 zUvD#AQd>L}g}-1B_oBUr*Eks?S|1q8ZLIh5(0@-h>*#hK)?ik959|1ATMrp(mvMUg zQIdEZC%F?{dl;P~SCA6MQgZnomdhz##!*zrOb-uFKBI97O&7XwnLhThrt3jH!asSB zdnGeG8v#s|6S@U3eRYP52hBmONs(GEcmf_~ax%AidSJF}^762PXL*W0yLljhQJBdB zFMkh4>SQn9Z}Cti^TUd%X2?rzJ;d6Q^|X2Dj0_JCQl`1m%hiJb&;=;d5)Ti$9$p@# zm)+gd1M_4W_dFXOcFUJsBd73#qX*f>1KbKkPq#-oc<=#`F)D%w-DfT1xz}-CT;b9N#B!8XY z=Al#2o*L=lBF|xwl-kAq3HBUcRk(*KcA3@1@uvM{_haT=8#_?1B zE|;0@>Oo>yg9A9?Hq*=`M^uWa^<|Gdf(SOmJ&VncD zp|aV-F4jAE*zeBs!KcaT~RyFwEkcHrJbIxp+YjRu9ur4N5mfH=w!K#z{xMms?)BXiZ W?~v=j^{t)&0000oPhLnJ>wqq+$5(03t} z4Uz807576AH9JOiDN(m&3R6ENL!>wh@T==2JNBVj62+;XiXqb4CV2V0Lg@Yei@TwR z&f$XgK83oBP_-n|x`UhkDMdr1x{A{IxT0tTXl)ZTH*xy^{7uCW5z@MYk|9!G%Vc^k zv{e*s6{Yodj(=)N)a)1)GtA?}N6n5g{Q8Nul*o^~)GP_1^>$8LcW~EtksF_(ni0C6 zSCn3ZJRdHpm|+UD0Odu9@;pd&89{jsaocs!Sjz}^12>ILoJ`L}bDN;OPjTIKQd`Tk zc1aX7Ld}lx$F#Lg(0)r&ocbxv0tkhvpG@zR+rFDj&woXJ;^T4RBi(V3pZZZPiPkQ8 zG%!TUhRA*IgwElT;nz=uU;1|{ix7$#Ci8NF^1pIpn>d089uzae!_Y%>6Q{A3DNg<5 zh91;K2q8c9(cC5|zXo~QB`F#KDrT5W@04`MLG$gL$MG4O9iuSyQ=A28tYs84Om65w z&{omoFn{t=U&}N$ak3*X`sWqx_Y|5PqqR#?vttatevs|EDH;JvMgVOo9RVdnq`6HT z7jqHSlE@C+D9Z?{CDB;N=^QS2+9j#mGRkX++|WaNmqh3sE-B4}wD&10i_q~N%Lt`; zkh|Uqsu|(={etp5$nC(*{lLw&?xg#1N!^YiRDb3ogMWX}+{CHdF=}><#x_B96{R=} zP+dwCrhb~6IM4eObvuS;NvLL+@?1nv%`nO$L~-ipapdLh#YuG;p}kL$)*Wb;#KXW% zVdCRjccLu9G}bcry%V1IDTF`GtF5A_W|;i=jKajn?TeG=eTv8N8P#QkvLSNYbJ+cp#cP%IY&0TQGnO12fp zwbMG=WZH*5ncsk0;YC@W%2FyRz<44vCG zPH|?Z3HPD6%FVv*bPs|P%Gm3x#p+dhto?kY?4fgQSGj4%V1H-3{Y!gsnVD_VcB9Hg zWITvP+G*E~lSt@c*A}OFAozY$wPskYm6bsc6UaF9?LpfhfnHuKqu$Vmjvtxu26zaMYfPqu8`M!5Rz4MDz zdh%{bFzOKUIM5Nz-V~8yj^Va(06=4YdtcFCKQ8j~SzETI8J+9br@85z55zV-cb+p+ zKGY+|SML@tcjbrQUlUabchG7n5uin(p6~Xi>In|(1%FTG(sVvOk!S1d;ik$mSw3sR zISekOB2GAD7|pMWYTvPOD$Tfgtl~T=R;jTAWlTsOd{5thUdxORW55_~jf*fw7%ehs zItxJbrtSh-B}{7%DBv_Eew;S{?!4{Gmo`IqyKNw#9-*%734`K#mMxRpr(=;sjh)IT z4Xb5}0)NuAef#J6{oh+DS)#aUtjeW3=&9#~*x#;Cn&)~LJ;sE-`J*75oL|guzWs~^ zhy=7Ai?fsh;3P&NtWK1!jEEx+&=W*jGmIm;`>*n3vTmRNl;OS`+sYv05*2$Nq!Nu8 zs$;Ka0$>^?#rZt45e^Zd6hy}AvPl(3D5yLgtswdFV>e&tQjq#*^FR0bSsJlFqZj}H N002ovPDHLkV1f`FM1=qV diff --git a/minetestforfun_game/mods/default/textures/default_grass_side.png b/minetestforfun_game/mods/default/textures/default_grass_side.png index 5f4aee59fbbf83864a37191b1236df6fd2685897..a8a2bb3c210452a31ac0f4dbd4f724af99f3e72c 100644 GIT binary patch delta 448 zcmV;x0YCnl2H69UBYyx1a7bBm000id000id0mpBsWB>pGi%CR5RCt{2jLl9HVE{!B z228|+n7D(|Z|0ja)P)NTk&S|pt?OoZ0o}N8 zaX0tedk8Y4Xy~Xlb=AH0b#UeD!--LA=Bab(sdiLSGk4Vf?0+fB9qo>cKAsvS6RUdP zh;VGwyQ!*?xk}GAwD-xXGv82suUm8Sy;ANWtpinJjOaE<#GrkhVR_)0jHrn3fn%p^}H=jXezr z5fCZ-DB$zm7AX-|AEu_<6|DYyCWCJ3_r^T_v%|A&dJNAm1@noAvMr&uU(z*!izOtB%L$Wr6CVHEVDtd#+Bmku_}!Sp z-GR35X{#DP@bE_=%ljSH^^Y^6^AYJjBTqWYvSKkGk$>ei4U#gc&{d0LOLh+@Iw5)c zL(J21&xfBbk>SLpI;4cL2NuL}$kXybeyWhdu$XB4u}4^B)h1lvu5GSC1;)?nE- zudYW7r#{QCCtmpuN!hXcmZE0U0AUR2spR`#&iV592G3Xcp(al%hC`R~kkVBHEKBhI zdPcH7(RM9D2(0%%&yd>U;&RO0A8TCK!u4&^q&S9ZD(GK++T~*)fN_#t$9prpFsx?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_pine_needles.png b/minetestforfun_game/mods/default/textures/default_pine_needles.png new file mode 100644 index 0000000000000000000000000000000000000000..2b007be759433464dbc2de2652ff6c56571c6e21 GIT binary patch literal 512 zcmV+b0{{JqP)HdX?x zAvB>vqK1n1e*mg|f>fc|NT%@0AyIa2fhIE1-fEPI=kJ>{l<(F&4I=?Sd2}2aPfM#a z!_zR%HuWoURM(ng8(>`iW~*yG2Z>GnqI*M(83XP}H_p~`}5!(QPEbY|v?o6{E4Fw*l8 zF%2WB^5|G+hWjo;6&j)OR9$QKU*9N?j(>lqw+_TV`u+vctSkhWyX?_-5h*+Y`xi`i z*@Hw#k|c%qm%x@Vl|7UIFvHTBVG)UOIm`UjwdT-x`uMbnZJ4e-vd2O3fm9*zeI zmMTymd-}3FyF0V<0skI{YoG6$$ylE0hXe(-eFp&0_8p>}=g*l01)^fmcS>`cITtT{RREdB3zwEp~pWNQY**w$C$-K`jV-xOn?P_ z`J-{iBrcvrx+7k_2sCWsjnISwoQ@ltHgWPG7JZ^AnxVH&cm}a&F`bRacLMu15ePx#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2i^n@ z11b`4D+M(G00K2hL_t(I%RQ4zjx1FS1;f7I%&h8uunnecfc>uoBqZpr%({OwNMLN~ zC>+O@-+ukY)JL{`BX~zjiJT&RPGZXZ`N!{k{`?c?>m=n3C&GE27{>WJ(FKGU=&jS| zWUWPQ9TCGj<^298$B1_x=NyRA$HY0o=0sH>B!@ahL@1@uduPtcvc)u`l*WGS*qU7B z0-*N^0&3!L?hXjfv4Ckt?~?_@5dRNtwXtjgV9Qtrsx0Q5Y&p^AWcH48j#3)ER`%xy z*LmTcQfgt@!aJqb4uF~&wM`IZj>$qvG0^J8XpLjvK$KD%qc)DbQEJ211p9Y|1s|bP$sM-Rj)Kan8S#zMyvmXx(!$dGM<}y-F04y6U zTP(P1Oet`lZ{oJoS_2kN9Wh2;*F`Ih7$e7i<3FFDEE_1Gf?;BuuWugvjyfzMtK)h73Tvn`nv@M zuCtJigRj58cz!%N&o@4JFeM!a0HwBDE=GA@Y}%0gdkaMQBL96X{U>Iu*+PkpUqSwlt6I3xXQV56$wN_G0j4_yfGR^K41jENn zX@j(FU`oyz?;@(oyHt+jKvkJ$_bljt4d4;IHJTBEC#Q%4$FX5z1aY*{Q0H$lz^lK1 b!YTg%;Xz=CmniwT00000NkvXXu0mjfhT1f1 literal 0 HcmV?d00001 diff --git a/minetestforfun_game/mods/default/textures/default_pinetree_top.png b/minetestforfun_game/mods/default/textures/default_pinetree_top.png new file mode 100644 index 0000000000000000000000000000000000000000..9e2f8647645e47ea52f0014e6d638b7751cc6f8f GIT binary patch literal 802 zcmV+-1Ks?IP)Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2i^n@ z11bUQl|<_R00N>(L_t(I%WacSYb#Y8hMzO%%uFW9}?gu4*D{=o}UTkMr2ZSKiTCUa)a9~VI@>brawKc3$MulV$n4u z7*p}@{MBn+{@p2nkKUg1)7tP(p%|Q8;?o>GKc%fZ5Dxpwu)Mw|goMp-#Lc#0Tqy4P z3}sA3x7U39!Mhwiy~4E}-tG`8Mdmrd2b5Bz@_j^>lTOaKd;W~iKl=h>DwNhGqiWCb zTUWH(n%#OuR!*SX(=OKtC6Refo1{pUlJ^PoH?BCJYo0IL1A%;fK|rzlW5xL5f^=9y zfOzat#gs&5BvKJ$r2hS91QX6K&e1o`!NGRdfOkX@iN2@0`;GDZ0#|SGoh1<&-dl>J zGlUQadu{vpf=?yUd-`g}epu1BJ!2HZ#hV}!Y<-X0Y;d-QBmo>@-vW>rQ!&yduC2*W zG{e~pr4-J#tbh5A=HU+4Y;m?l2tjZy-g!nRbF?l=0A$}|o1V?GqHAhoCb88$!8;yq zex=*jL}vl;y(RjH&r*!34hQZZ3~45rPKTsfjx`mDfP7LiT`Z6?1(6Y4OZ1)?Ji;AZ zD6LCOd%*KukN2L?HTXWqS6jMWhpl$Zo?H?`Pv2Mu8oWOcDPt;Ldr}g-BY20md&cJr zVi2gokhFA+&t^!au$5sjn?i8-c8}KOf#B<9%X^(=cs#}JTdLca$WcK$C=f~_Lc}!< z#gV2sJw=X2*!$JNfiV@kR`Bf0ZwO68=sHI8V+yTNnLp!9^GhD2*gd_(U%QA)baD}G!(AYJmf#%((0_PXMQ78tYo g-#Pzx%7+7g0#Pt$?Q?}=djJ3c07*qoM6N<$f-zxgssI20 literal 0 HcmV?d00001 diff --git a/minetestforfun_game/mods/default/textures/default_pinewood.png b/minetestforfun_game/mods/default/textures/default_pinewood.png new file mode 100644 index 0000000000000000000000000000000000000000..4225296140912185e1d3f163fad29247a1449315 GIT binary patch literal 455 zcmV;&0XY7NP)?sSrf}moD0IUR# zNG_qVX{~htz!a}$qn&3@P-`Vnkb-gvU9cl!Y-++oO1lcS66Dhi-X;K#$zKl`=37lk z;yw=sGYuFl*U;{qVi`)!?dZ_yHwm^Ivmp>wZngPz)a%xF xIxJFcV5Y$jJB}&rBulHe)u>%$_vJzshfl1yssKp(`Y!+g002ovPDHLkV1kzYxs3n- literal 0 HcmV?d00001 diff --git a/minetestforfun_game/mods/default/textures/default_steel_block.png b/minetestforfun_game/mods/default/textures/default_steel_block.png index 789cc5a0befec3da3b86d6d2119bcad6ded9155e..0f7918ee5909e6c6aa7a00247b3f258bac41bba0 100644 GIT binary patch delta 590 zcmV-U0J1iiH;9UR!0sBcrK~yNuJ(9_8+&~OOx%47wtYBbc?9=>=f7ah*_&BG57bIF* zOLwz!P!JxAg(CP+{PyvH=`@a`h<}KPs@7UxUS5dEdGB9e zUjYD6st|8xDJ1|RAx0%4A_Bn7A0Hobzuy5A0L-M}ScedpS;PQi7G@R^5T}&ndc6Yh zBDQY;%#4WI)-_GzoMWPtXCfk!bxHF)%k6d(5i90GJlp_sCJ|v~14W5umZs6nE|-gY ze0&5zLerl`TYnA0EPA{|L=38B72m97tCdnpG7N*6nOW={7c&t44;P7Hue6rUiHpIj zsyshGn^`reC>W&_t9-=Q4RzlEDO(L8FiWlr0MFEPP02feHUy1q zW}ly*LPYz%4}V6l%FNEGRpgv^!#t;IaLzgBsEC=J&wpoEYYia)VrB>L7~{HbL^pziAdfSCY<5DBtd%{dd1h_r3%a?Zk%m)dnc)w(SU5t*5R z)_rPypO(QpcZj7FcRrs1kh9;@2%rj;Whe6jW}vo2s%^W@csw zR#jC!HAn5gQ>8L<3^B%dzu#To_wVoTN9VR}^WKLLN-5JcJv=;oe}A`a+jZT~&(Gy@ cd3t*K3udc!VGsp2?*IS*07*qoM6N<$g4^{5m;e9( delta 299 zcmV+`0o4B71iJ!|8Gir(0026epuGS90Rl-xK~xwS1;I;B!ax`R;J^QafxdtggZPSx zAqEmxZash=!W(!LkKzej8e?LjaREyg-84i&Dgmb*rc?Yr?=~Gxq0eU@A???bBkSE= zF9$*_x|#=Tat}CLPLv-95`_nlKDmfb<)&xCx+)#U7iabppMND$ZSYYU5&rJ>aP%Vt zK)#Nks9Sc3t6>c&u8g4k!(KM!@mi5G3TAdm9+6@N8@GqfQs%dEj5`F!nB)cMRhR|8 zar1@yCwj)FK-hI{pDPc?oO7+WPD@fjwHV=>gbj_l2rJk*%Q?0;uVrnT+S}P6d+ZRW xawUmawH0WcA0+a^yLXNG`(;W-eaXPAVGd007NNL_t(| zoW+x|3W87+hVSF}D!$2Cgj%X4l6nL|L=b#|rXXku3>+LF4yeyDsDUvt>5up*(qJq6yW4E=n;Qe+*5=S2a5h2e~JRcmjs8EXvVc;VS zd@b0FKtxR-MR*CUmJ2P|*@6t(A}P3>PfAd^#=b}gj=F;(*s#nW{KDS_ZwPmGsh9n} Ru>b%707*qoL`R~LJ`1411g&E@v|`0y>V{Ov;pgYQ3XYM0CHee=$)rsA;40*?#5x88jYKX~Wp z`b#k|oL^^`;v0Pa P8puJOu6{1-oD!M<<@!TD 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 zcmds3dpHve7oS9u%apgIq*CZj?(s<}*D*{p%a~l2%iK~SQ=~$8n-rUvWkxn;MlMT3 zY>RCga+$k?qA1tQE3bU@ywCUj{q{WHU*GxXobx>AJm>d2=RD^*Y3Cszd0ACi001EG zU~l94LjwT-34n~`4=Wuj9R~nxaXIhgW_vcS;9NqH(Qi)Y^naw@AO$x&{rQ9~P z!Y-9zmsV+azZ#TQ0lHrW!q$KuFzxSG+GDHj(`)TB>g*q}!1pV_*eY;(4fp{Q{OAQZ zv)&O~>6lUHn8|X?YH-9gIX$Rx%6#FJRquprbiy|~XVf}Bs&mFQIOCg~v)RtMTu4R@ zB&!~RZ-itwLvlC}LW@fl%LUiqlEZe%<+|jxx)AwLTs;)u2+e7R=5nBf7HA&N6~}VL zH@N0Bx#qH630&8_R#ze)mfZ-;X@(Ivu)G!+kq09Q-0&>7oF=ziwp$+8jo9jz&vz?m zgX3PnbDQA=4xHEm&*#BO0(S!2J&)_2-|Ak_hREX}h%E>b4^bdMkcA$3Y!4#WBfr(7 zfbT(W^CWUS^IJSgJWsN~vrvd6G$Bc?$O1mHunk$%?p46^A`85VgkHrR-UY4RWWIM{ zn|E=$51HpvDDWu~`cOK2$*sPHeBYur-{N*(YNsEG<5wi`D;D}uI#9)JC`vnu+UZ{` z@TYe8m%IrmYz?5c2b6RM77GGPIs!}I1X0?8%DT}M0lKsUUG@e|?+Gqx4=(Errgw*y zc7)R3gqHV&m34-dcZV^0!|89r89m_@qRaHo%jMmdD|#d79TAM4h)U7b^3JP_?yD8O zSF8H2Rf-}jdn2p*qN+qu)dSJhebF_8G1a1&ngL8rAEtINwptWhI}pnpy1^X0SvM5N z9E^K0e2X=bz#6_?KXRvGG^t_qUemkO=65X)8n1tBSWA>E1eW{%AR}mHc>q9W-oeJw z4FR$djVJ61QUffI!b6Pix`#(Sv`@r9`5t{Tnx|9;`v9}0129Bj#2dNY0a^=K|0^A! zPi7POS5;%LvwHY~$%j3>MclAbHTs4lK_($buWfp=X(4_&8EuTZqumy4av%c~zi$E) z`o0E9JG93f$xxEa(PbJI6GR3j+I$!wjhGyw03r{}(ANCrqDV1!?Hp~s>P8$sv7<{f zdOLyJ1)V6NO|vJ<^_y<4T4v&+pW8MZy3$qeQFifoTYnq`mMNz?wBL3V(B<7fVxE;L zVXAC_(&|cm9`fOuhh#Y-(s>0$^nnIq17AyxNBX0x$&Jw(J{N$=7M#}4x+#;i@wIaA zt=YRtZ&y})hHQCk^>78{hs96Kr%A{x?9fh4FmfBRM}hva43>8P6@A~~+mL~koFWR$ zo#Uu^uWT%rv@JVdf-msfEhnZ%jGHx8SE$n8_jp{VcLFLWWN-rfdV))IkC7>>) z{f&;L-h<-vFXKKMJGAj5!y;t7q9W)oYdmr8YU4r&L-fkqsYG*S=m8TFMrVm1zaxFi zHKyB;c)|X|scGseICS>Jo~_IBPM-2#dZmi#D#HgNmo0cV@P=Th z7v0_)9Q&-@L`YM3W~UwKFS-)3ZcQpN$T|O+cCAn5fIR1diJ4RZFt1BB@X(IWt`>Lz z`+`$hB|>I%|JQhuiLdZX$V_ZI>-I+a^?{Vdk6Df^zs&dFUw@$(hgvgqzJHq&84(~2 zJJw^I9M1PXnY);{ppC*mHGV8T)$h@4p=>>ipBzKzXaK{PP+23t`>)0?H&={}s{y5I zzjjwyi`=Gk*bR#IMzfubJHN*6DrI2MiSQ?z?25PRFxeDxx#_x$s^_imUMAbK)^*17 zh?dP;*`X<@ET7PC4<;`)+nG*ufIW3%v8M8BsPx+o!J;ek+pHmNKlp`dtfEe0jAi>) zJ5DcNnQ`9DjGs;8sXp7WBY8pHuQRAd;!;P6het0xG$|#9V}X5cVc}kWDU*m?{y68c z@7jm@`Nr6(B+8}vZ_l3|+x~~>`a8Gn8Q;8Iz@Lou$Nb5gdIqm}3Tg;#4Im^^M4sPM zRo`S7v%(safNJl_&OS}kG@=@a*KZq#<+D`8W(IIxf^Q=HjJRiP^Gl-goER+?qf~&p z{5>7Jbyt1bg0n8*H^*(AREh-U8BlW)lJXkPb_F6!f@f$?(#M-Kkfq z9ET%t?na6E(81R~$9Q8->I}wMK{qIn0>Ei5K8fa7rR1)~oszgKQX}|iCn&~9O^ zY}7(4u=vAhHQUg8qy4PqDsn*B58o^F-+2&` z^#aTQT3|WhiliQvXE&WvtrVUVuL4T=m%p!5rXXPKEUxO1d!+Z7Z=a0_4@QQkSGA64 zqoz*&B$gVub6Zby+~FIicUm`0N0tf?Z?W`l+K-8m_4ri!YSE}h67`~{vOu4v+0)r8 zSD|QM^k;W^Nhh+-igr}GVF?Ubyh_73`k`$9$+F)G_rtw?UiY4;vYfFcsq zC6@_2eKO;M;pKe3(D>Y~QO2h~ETyJvdpfB{Ds>M3bwO{&luoFbOxD4gHIAeoZt1qD zkL(}$UDA|PZ-ry(YE77DQ6w zCw4z)GWSO$N*EnG{^P#)9GzZM)x9h3D4;&hd}gDd5w-l>_T0dpr{sWWQp!s|H1O

9_oX2FZ`A$`|?gm=#HI;bm{5g1NW4DUULS>b*3uX*}F4Z zb{R@Oe`<^bBOh<}Us4+~R=Fpk61QL5Smm^2v)nt{0GV?9AdOb3{aMdmhJB0XXW%s7 zcx-O!+l+W_ZG_9anlKP?mfHV#ojN*99$g*t42{q4pI`46*L_eskQsxqUw-h~dPzZ1 zV1D|@{KCTq?mu#-)E=k2|2zNf_@UU8|FI+dB`|+u&W*wF8!jD~_*GQPzsmhT<%HJ% nuvz~N^M7lgxcDpO-mAa7vl1Zp+W6#;Uk>143$bBX`QH6E&!=51 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:item_no_color', 'group:basecolor_yellow'}, --- }) - -- Other mods can use these for looping through available colors -local dye = {} +dye = {} dye.basecolors = {"white", "grey", "black", "red", "yellow", "green", "cyan", "blue", "magenta"} dye.excolors = {"white", "lightgrey", "grey", "darkgrey", "black", "red", "orange", "yellow", "lime", "green", "aqua", "cyan", "sky_blue", "blue", "violet", "magenta", "red_violet"} --- Base color groups: --- - basecolor_white --- - basecolor_grey --- - basecolor_black --- - basecolor_red --- - basecolor_yellow --- - basecolor_green --- - basecolor_cyan --- - basecolor_blue --- - basecolor_magenta - --- Extended color groups (* = equal to a base color): --- * excolor_white --- - excolor_lightgrey --- * excolor_grey --- - excolor_darkgrey --- * excolor_black --- * excolor_red --- - excolor_orange --- * excolor_yellow --- - excolor_lime --- * excolor_green --- - excolor_aqua --- * excolor_cyan --- - excolor_sky_blue --- * excolor_blue --- - excolor_violet --- * excolor_magenta --- - excolor_red_violet - --- The whole unifieddyes palette as groups: --- - unicolor_ --- For the following, no white/grey/black is allowed: --- - unicolor_medium_ --- - unicolor_dark_ --- - unicolor_light_ --- - unicolor__s50 --- - unicolor_medium__s50 --- - unicolor_dark__s50 - -- Local stuff local dyelocal = {} @@ -138,8 +85,3 @@ for one,results in pairs(dyelocal.mixes) do }) end end - --- Hide dyelocal -dyelocal = nil - --- EOF diff --git a/minetestforfun_game/mods/fire/init.lua b/minetestforfun_game/mods/fire/init.lua index 4ce9f6a7..f932b0c5 100644 --- a/minetestforfun_game/mods/fire/init.lua +++ b/minetestforfun_game/mods/fire/init.lua @@ -1,5 +1,7 @@ -- minetest/fire/init.lua +fire = {} + minetest.register_node("fire:basic_flame", { description = "Fire", drawtype = "firelike", @@ -9,22 +11,21 @@ minetest.register_node("fire:basic_flame", { }}, inventory_image = "fire_basic_flame.png", light_source = 14, - groups = {igniter=2,dig_immediate=3,hot=3}, + groups = {igniter=2,dig_immediate=3}, drop = '', walkable = false, buildable_to = true, damage_per_second = 4, - - after_place_node = function(pos, placer) - fire.on_flame_add_at(pos) + + on_construct = function(pos) + minetest.after(0, fire.on_flame_add_at, pos) end, - - after_dig_node = function(pos, oldnode, oldmetadata, digger) - fire.on_flame_remove_at(pos) + + on_destruct = function(pos) + minetest.after(0, fire.on_flame_remove_at, pos) end, }) -fire = {} fire.D = 6 -- key: position hash of low corner of area -- value: {handle=sound handle, name=sound name} @@ -81,12 +82,10 @@ function fire.update_sounds_around(pos) end function fire.on_flame_add_at(pos) - --print("flame added at "..minetest.pos_to_string(pos)) fire.update_sounds_around(pos) end function fire.on_flame_remove_at(pos) - --print("flame removed at "..minetest.pos_to_string(pos)) fire.update_sounds_around(pos) end @@ -117,7 +116,6 @@ minetest.register_abm({ local p = fire.find_pos_for_flame_around(p0) if p then minetest.set_node(p, {name="fire:basic_flame"}) - fire.on_flame_add_at(p) end end, }) @@ -143,7 +141,6 @@ minetest.register_abm({ local p2 = fire.find_pos_for_flame_around(p) if p2 then minetest.set_node(p2, {name="fire:basic_flame"}) - fire.on_flame_add_at(p2) end end end, @@ -158,7 +155,6 @@ minetest.register_abm({ -- If there is water or stuff like that around flame, remove flame if fire.flame_should_extinguish(p0) then minetest.remove_node(p0) - fire.on_flame_remove_at(p0) return end -- Make the following things rarer @@ -168,7 +164,6 @@ minetest.register_abm({ -- If there are no flammable nodes around flame, remove flame if not minetest.find_node_near(p0, 1, {"group:flammable"}) then minetest.remove_node(p0) - fire.on_flame_remove_at(p0) return end if math.random(1,4) == 1 then @@ -185,7 +180,6 @@ minetest.register_abm({ else -- remove flame minetest.remove_node(p0) - fire.on_flame_remove_at(p0) end end, }) diff --git a/minetestforfun_game/mods/stairs/init.lua b/minetestforfun_game/mods/stairs/init.lua index afd89bda..c7df28c5 100644 --- a/minetestforfun_game/mods/stairs/init.lua +++ b/minetestforfun_game/mods/stairs/init.lua @@ -288,3 +288,11 @@ stairs.register_stair_and_slab("stonebrick", "default:stonebrick", "Stone Brick Stair", "Stone Brick Slab", default.node_sound_stone_defaults()) + +stairs.register_stair_and_slab("pinewood", "default:pinewood", + {snappy=2,choppy=2,oddly_breakable_by_hand=2,flammable=3}, + {"default_pinewood.png"}, + "Pinewood Stair", + "Pinewood Slab", + default.node_sound_wood_defaults()) +