Wuzzy
/
BlockColor-Engine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update hand and tools capabilities

master
MoNTE48 2019-06-08 11:09:33 +02:00
parent c8903e401f
commit f1efc3ab70
12 changed files with 48 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
games/default/files/bluestone/mesecons_compatibility/init.lua
View File

@ -146,22 +146,3 @@ function doors:register_door(name, def)
can_dig = check_player_priv,
})
end
doors:register_door("doors:door_wood", {
description = "Wooden Door",
inventory_image = "door_wood.png",
groups = {snappy = 1, choppy = 2, oddly_breakable_by_hand = 2, flammable = 2,door=1},
tiles_bottom = {"door_wood_b.png", "door_brown.png"},
tiles_top = {"door_wood_a.png", "door_brown.png"},
sounds = default.node_sound_wood_defaults(),
})
doors:register_door("doors:door_steel", {
description = "Steel Door",
inventory_image = "door_steel.png",
groups = {snappy = 1,bendy=2,cracky=1,melty=2,level=2,door=1},
tiles_bottom = {"door_steel_b.png", "door_grey.png"},
tiles_top = {"door_steel_a.png", "door_grey.png"},
only_placer_can_open = true,
sounds = default.node_sound_stone_defaults(),
})

6
games/default/files/default/furnace.lua
View File

@ -107,7 +107,7 @@ minetest.register_node("default:furnace", {
"default_furnace_side.png", "default_furnace_front.png"
},
paramtype2 = "facedir",
groups = {cracky=2},
groups = {cracky = 2},
legacy_facedir_simple = true,
is_ground_content = false,
sounds = default.node_sound_stone_defaults(),
@ -137,9 +137,9 @@ minetest.register_node("default:furnace_active", {
}
},
paramtype2 = "facedir",
light_source = 8,
light_source = default.LIGHT_MAX - 5,
drop = "default:furnace",
groups = {cracky=2, not_in_creative_inventory=1},
groups = {cracky = 2, not_in_creative_inventory=1},
legacy_facedir_simple = true,
is_ground_content = false,
sounds = default.node_sound_stone_defaults(),

10
games/default/files/default/nodes.lua
View File

@ -737,7 +737,7 @@ minetest.register_node("default:steelblock", {
description = "Steel Block",
tiles = {"default_steel_block.png"},
is_ground_content = false,
groups = {cracky = 1,level = 2},
groups = {cracky = 1, level = 2},
sounds = default.node_sound_stone_defaults(),
})
@ -1460,7 +1460,7 @@ minetest.register_node("default:glowstone", {
{items = {'default:glowdust 2'}},
}
},]]
light_source = 12,
light_source = default.LIGHT_MAX - 3,
})
minetest.register_node("default:slimeblock", {
@ -1496,14 +1496,14 @@ minetest.register_node("default:quartz_ore", {
minetest.register_node("default:quartz_block", {
description = "Quartz Block",
tiles = {"default_quartz_block_top.png", "default_quartz_block_bottom.png", "default_quartz_block_side.png"},
groups = {snappy = 1, bendy = 2,cracky = 1,level = 2},
groups = {snappy = 1, bendy = 2, cracky = 1},
sounds = default.node_sound_stone_defaults(),
})
minetest.register_node("default:quartz_chiseled", {
description = "Chiseled Quartz",
tiles = {"default_quartz_chiseled_top.png", "default_quartz_chiseled_top.png", "default_quartz_chiseled_side.png"},
groups = {snappy = 1, bendy = 2, cracky = 1, level = 2},
groups = {snappy = 1, bendy = 2, cracky = 1},
sounds = default.node_sound_stone_defaults(),
})
@ -1512,7 +1512,7 @@ minetest.register_node("default:quartz_pillar", {
paramtype2 = "facedir",
on_place = minetest.rotate_node,
tiles = {"default_quartz_pillar_top.png", "default_quartz_pillar_top.png", "default_quartz_pillar_side.png"},
groups = {snappy = 1, bendy = 2, cracky = 1, level = 2},
groups = {snappy = 1, bendy = 2, cracky = 1},
sounds = default.node_sound_stone_defaults(),
})

30
games/default/files/default/tools.lua
View File

@ -11,7 +11,7 @@ minetest.register_tool("default:pick_wood", {
full_punch_interval = 1.2,
max_drop_level=0,
groupcaps={
cracky = {times={[3]=1.60}, uses=10, maxlevel=1},
cracky = {times={[3]=1.60}, uses=20, maxlevel=1},
},
damage_groups = {fleshy=2},
},
@ -26,7 +26,7 @@ minetest.register_tool("default:pick_stone", {
full_punch_interval = 1.3,
max_drop_level=0,
groupcaps={
cracky = {times={[2]=2.0, [3]=1.00}, uses=20, maxlevel=1},
cracky = {times={[2]=2.0, [3]=1.00}, uses=40, maxlevel=1},
},
damage_groups = {fleshy=3},
},
@ -39,7 +39,7 @@ minetest.register_tool("default:pick_steel", {
full_punch_interval = 1.0,
max_drop_level=1,
groupcaps={
cracky = {times={[1]=4.00, [2]=1.60, [3]=0.80}, uses=20, maxlevel=2},
cracky = {times={[1]=4.00, [2]=1.60, [3]=0.80}, uses=40, maxlevel=2},
},
damage_groups = {fleshy=4},
},
@ -52,7 +52,7 @@ minetest.register_tool("default:pick_gold", {
full_punch_interval = 0.9,
max_drop_level=3,
groupcaps={
cracky = {times={[1]=2.4, [2]=1.2, [3]=0.60}, uses=20, maxlevel=3},
cracky = {times={[1]=2.4, [2]=1.2, [3]=0.60}, uses=40, maxlevel=3},
},
damage_groups = {fleshy=4},
},
@ -66,7 +66,7 @@ minetest.register_tool("default:pick_diamond", {
full_punch_interval = 0.9,
max_drop_level=3,
groupcaps={
cracky = {times={[1]=2.0, [2]=1.0, [3]=0.50}, uses=30, maxlevel=3},
cracky = {times={[1]=2.0, [2]=1.0, [3]=0.50}, uses=60, maxlevel=3},
},
damage_groups = {fleshy=5},
},
@ -85,7 +85,7 @@ minetest.register_tool("default:shovel_wood", {
full_punch_interval = 1.2,
max_drop_level=0,
groupcaps={
crumbly = {times={[1]=3.00, [2]=1.60, [3]=0.60}, uses=10, maxlevel=1},
crumbly = {times={[1]=3.00, [2]=1.60, [3]=0.60}, uses=20, maxlevel=1},
},
damage_groups = {fleshy=2},
},
@ -101,7 +101,7 @@ minetest.register_tool("default:shovel_stone", {
full_punch_interval = 1.4,
max_drop_level=0,
groupcaps={
crumbly = {times={[1]=1.80, [2]=1.20, [3]=0.50}, uses=20, maxlevel=1},
crumbly = {times={[1]=1.80, [2]=1.20, [3]=0.50}, uses=40, maxlevel=1},
},
damage_groups = {fleshy=2},
},
@ -115,7 +115,7 @@ minetest.register_tool("default:shovel_steel", {
full_punch_interval = 1.1,
max_drop_level=1,
groupcaps={
crumbly = {times={[1]=1.50, [2]=0.90, [3]=0.40}, uses=30, maxlevel=2},
crumbly = {times={[1]=1.50, [2]=0.90, [3]=0.40}, uses=60, maxlevel=2},
},
damage_groups = {fleshy=3},
},
@ -130,7 +130,7 @@ minetest.register_tool("default:shovel_gold", {
full_punch_interval = 1.0,
max_drop_level=3,
groupcaps={
crumbly = {times={[1]=1.20, [2]=0.60, [3]=0.30}, uses=20, maxlevel=3},
crumbly = {times={[1]=1.20, [2]=0.60, [3]=0.30}, uses=40, maxlevel=3},
},
damage_groups = {fleshy=3},
},
@ -145,7 +145,7 @@ minetest.register_tool("default:shovel_diamond", {
full_punch_interval = 1.0,
max_drop_level=1,
groupcaps={
crumbly = {times={[1]=1.10, [2]=0.50, [3]=0.30}, uses=30, maxlevel=3},
crumbly = {times={[1]=1.10, [2]=0.50, [3]=0.30}, uses=60, maxlevel=3},
},
damage_groups = {fleshy=4},
},
@ -163,7 +163,7 @@ minetest.register_tool("default:axe_wood", {
full_punch_interval = 1.0,
max_drop_level=0,
groupcaps={
choppy = {times={[2]=3.00, [3]=1.60}, uses=10, maxlevel=1},
choppy = {times={[2]=3.00, [3]=1.60}, uses=20, maxlevel=1},
},
damage_groups = {fleshy=2},
},
@ -178,7 +178,7 @@ minetest.register_tool("default:axe_stone", {
full_punch_interval = 1.2,
max_drop_level=0,
groupcaps={
choppy={times={[1]=3.00, [2]=2.00, [3]=1.30}, uses=20, maxlevel=1},
choppy={times={[1]=3.00, [2]=2.00, [3]=1.30}, uses=40, maxlevel=1},
},
damage_groups = {fleshy=3},
},
@ -192,7 +192,7 @@ minetest.register_tool("default:axe_steel", {
full_punch_interval = 1.0,
max_drop_level=1,
groupcaps={
choppy = {times={[1]=2.50, [2]=1.40, [3]=1.00}, uses=20, maxlevel=2},
choppy = {times={[1]=2.50, [2]=1.40, [3]=1.00}, uses=40, maxlevel=2},
},
damage_groups = {fleshy=4},
},
@ -205,7 +205,7 @@ minetest.register_tool("default:axe_gold", {
full_punch_interval = 0.9,
max_drop_level=1,
groupcaps={
choppy={times={[1]=2.20, [2]=1.00, [3]=0.60}, uses=20, maxlevel=3},
choppy={times={[1]=2.20, [2]=1.00, [3]=0.60}, uses=40, maxlevel=3},
},
damage_groups = {fleshy=5},
},
@ -219,7 +219,7 @@ minetest.register_tool("default:axe_diamond", {
full_punch_interval = 0.9,
max_drop_level=1,
groupcaps={
choppy={times={[1]=2.10, [2]=0.90, [3]=0.50}, uses=30, maxlevel=3},
choppy={times={[1]=2.10, [2]=0.90, [3]=0.50}, uses=60, maxlevel=3},
},
damage_groups = {fleshy=6},
},

5
games/default/files/doors/init.lua
View File

@ -299,6 +299,7 @@ doors:register_door("doors:door_wood", {
groups = {snappy = 1, choppy = 2, oddly_breakable_by_hand = 2, flammable = 2, door = 1},
tiles_bottom = {"door_wood_b.png", "door_brown.png"},
tiles_top = {"door_wood_a.png", "door_brown.png"},
sounds = default.node_sound_wood_defaults(),
})
minetest.register_craft({
@ -374,11 +375,11 @@ doors:register_door("doors:door_steel", {
description = "Steel Door",
stack_max = 16,
inventory_image = "door_steel.png",
groups = {snappy = 1,bendy=2,cracky=1,melty=2,level=2,door=1, mesecon_effector_on=1},
groups = {cracky = 1, level = 2, door = 1, mesecon_effector_on = 1},
tiles_bottom = {"door_steel_b.png", "door_grey.png"},
tiles_top = {"door_steel_a.png", "door_grey.png"},
only_placer_can_open = true,
sounds = default.node_sound_stone_defaults(),
})
minetest.register_craft({

3
games/default/files/hardened_clay/init.lua
View File

@ -24,7 +24,6 @@ minetest.register_node("hardened_clay:hardened_clay", {
tiles = {"hardened_clay.png"},
groups = {cracky = 3},
legacy_mineral = true,
groups = {buliding = 1},
})
minetest.register_craft({
@ -42,7 +41,7 @@ for _, row in ipairs(clay.dyes) do
minetest.register_node("hardened_clay:"..name, {
description = desc.." Hardened Clay",
tiles = {"hardened_clay_stained_"..name..".png"},
groups = {cracky = 3,hardened_clay=1, buliding = 1},
groups = {cracky = 3, hardened_clay=1},
sounds = default.node_sound_defaults(),
})
if craft_color_group then

7
games/default/files/hud/builtin.lua
View File

@ -20,16 +20,9 @@ end
hud.read_conf()
local damage_enabled = minetest.settings:get_bool("enable_damage")
hud.show_hunger = minetest.get_modpath("hunger") ~= nil
hud.show_armor = minetest.get_modpath("3d_armor") ~= nil
if damage_enabled ~= true then
hud.show_armor = false
return
end
hud.register("health", {
hud_elem_type = "statbar",
position = HUD_HEALTH_POS,

11
games/default/files/hud/init.lua
View File

@ -1,7 +1,10 @@
hud = {}
local path = minetest.get_modpath("hud")
if minetest.settings:get_bool("enable_damage") then
dofile(path .. "/api.lua")
dofile(path .. "/builtin.lua")
dofile(path .. "/legacy.lua")
local modpath = minetest.get_modpath("hud")
dofile(modpath .. "/api.lua")
dofile(modpath .. "/builtin.lua")
dofile(modpath .. "/legacy.lua")
end

10
games/default/files/hunger/functions.lua
View File

@ -39,10 +39,6 @@ function hunger.update_hunger(player, new_lvl)
if not name then
return false
end
if minetest.settings:get_bool("enable_damage") == false then
hunger.players[name] = 20
return
end
local lvl = hunger.players[name].lvl
if new_lvl then
lvl = new_lvl
@ -162,11 +158,7 @@ local function hunger_globaltimer(dtime)
end
end
if minetest.settings:get_bool("enable_damage") then
minetest.register_globalstep(hunger_globaltimer)
end
minetest.register_globalstep(hunger_globaltimer)
-- food functions
local food = hunger.food

9
games/default/files/hunger/init.lua
View File

@ -18,11 +18,6 @@ HUNGER_STARVE_LVL = 3 -- level of staturation that causes starving
HUNGER_MAX = 30 -- maximum level of saturation
local modpath = minetest.get_modpath("hunger")
dofile(modpath .. "/functions.lua")
dofile(modpath .. "/food.lua")
-- legacy functions
hud.item_eat = hunger.item_eat
hud.set_hunger = hunger.save
@ -33,6 +28,10 @@ hud.load_hunger = hunger.load
-- Callbacks
if minetest.settings:get_bool("enable_damage") then
local modpath = minetest.get_modpath("hunger")
dofile(modpath .. "/functions.lua")
dofile(modpath .. "/food.lua")
minetest.register_on_joinplayer(function(player)
minetest.after(0.1, function()
local inv = player:get_inventory()

14
games/default/files/player_api/init.lua
View File

@ -81,11 +81,11 @@ else
full_punch_interval = 0.9,
max_drop_level = 0,
groupcaps = {
crumbly = {times = {[2]=3.00, [3]=0.70}, uses = 0, maxlevel = 1},
snappy = {times ={[3]=0.40}, uses = 0, maxlevel = 1},
choppy = {times = {[3]=3}, uses = 0, maxlevel = 1},
cracky = {times = {[10]=10, [3]=7.5}, uses = 0, maxlevel = 1},
oddly_breakable_by_hand = {times = {[0]=90.00, [1]=7.00, [2]=3.00, [3]=3*3.33, [4]=250, [5]=999999.0, [6]=0.5}, uses = 0, maxlevel = 5}
crumbly = {times = {[1]=5.0, [2]=3.0, [3]=0.7}, uses = 0, maxlevel = 1},
snappy = {times = {[3]=0.4}, uses = 0, maxlevel = 1},
choppy = {times = {[1]=6.0, [2]=4.0, [3]=3.0}, uses = 0, maxlevel = 1},
cracky = {times = {[1]=7.0, [2]=4.0, [3]=3.0}, uses = 0, maxlevel = 1},
oddly_breakable_by_hand = {times = {[1]=3.5 ,[2]=2.0, [3]=0.7}, uses = 0}
},
damage_groups = {fleshy = 1},
}
@ -106,7 +106,7 @@ minetest.register_on_joinplayer(function(player)
player:hud_set_hotbar_itemcount(9)
player:hud_set_hotbar_image("gui_hotbar.png")
player:hud_set_hotbar_selected_image("gui_hotbar_selected.png")
player:get_inventory():set_stack("hand", 1, "player_api:hand")
end)
@ -137,7 +137,7 @@ minetest.register_on_dieplayer(function(player)
minetest.item_drop(stack, nil, pos)
inv:set_stack("craft", i, nil)
end
-- Display death coordinates
minetest.chat_send_player(player:get_player_name(), "Your last coordinates: "
.. minetest.pos_to_string(vector.round(pos)))

4
games/default/files/stairs/init.lua
View File

@ -419,7 +419,7 @@ stairs.register_all("acacia_wood", "default:acacia_wood",
-- Stone types
stairs.register_all("stone", "default:stone",
{cracky=3,stone=1, },
{cracky = 3, stone=1},
{"default_stone.png"},
"Stone",
stairs.stone)
@ -489,7 +489,7 @@ minetest.register_alias("stairs:slab_gold", "stairs:slab_goldblock")
minetest.register_alias("stairs:corner_gold", "stairs:corner_goldblock")
stairs.register_all("diamondblock", "default:diamondblock",
{cracky = 1, level=3},
{cracky = 1, level = 3},
{"default_diamond_block.png"},
"Diamond",
stairs.stone)