Merge remote-tracking branch 'upstream/master'

This commit is contained in:
bri cassa 2021-08-16 18:18:21 +02:00
commit 2fd4de11c0
4 changed files with 80 additions and 58 deletions

View File

@ -1099,6 +1099,22 @@ minetest.register_craft({
}
})
-- wet metal plant pot from dry metal plant pot
minetest.register_craft({
output = "scifi_nodes:pot2",
recipe = {
{"scifi_nodes:pot", "bucket:bucket_water"}
},
replacements = {{"bucket:bucket_water", "bucket:bucket_empty"}}
})
-- dry metal plant pot from wet metal plant pot
minetest.register_craft({
type = "cooking",
output = "scifi_nodes:pot",
recipe = "scifi_nodes:pot2",
})
-- 6 itemholder from 2 dented metal block and 1 plastic
minetest.register_craft({
output = "scifi_nodes:itemholder 6",

View File

@ -324,13 +324,8 @@ minetest.register_node("scifi_nodes:gloshroom", {
})
minetest.register_node("scifi_nodes:pot_lid", {
description = "plant pot lid(place above plant)",
description = "Plant Pot Lid",
tiles = {
"scifi_nodes_glass2.png",
"scifi_nodes_glass2.png",
"scifi_nodes_glass2.png",
"scifi_nodes_glass2.png",
"scifi_nodes_glass2.png",
"scifi_nodes_glass2.png"
},
inventory_image = "scifi_nodes_pod_inv.png",
@ -338,36 +333,55 @@ minetest.register_node("scifi_nodes:pot_lid", {
use_texture_alpha = "blend",
drawtype = "nodebox",
paramtype = "light",
groups = {cracky=1, not_in_creative_inventory=1},
groups = {not_in_creative_inventory = 1},
sunlight_propagates = true,
diggable = false,
drop = "",
selection_box = {
type = "fixed",
fixed = {0, 0, 0, 0, 0, 0}
},
collision_box = {
type = "fixed",
fixed = {-0.5, -1.5, -0.5, 0.5, -0.5, 0.5}
fixed = {-0.5, -1.5, -0.5, 0.5, -0.25, 0.5}
},
node_box = {
type = "fixed",
fixed = {
{-0.1875, -0.5625, -0.1875, 0.1875, -0.5, 0.1875}, -- NodeBox13
{-0.25, -0.625, -0.25, 0.25, -0.5625, 0.25}, -- NodeBox14
{-0.3125, -0.6875, -0.3125, 0.3125, -0.625, 0.3125}, -- NodeBox15
{-0.375, -0.75, -0.375, 0.375, -0.6875, 0.375}, -- NodeBox16
{-0.4375, -0.75, 0.375, 0.4375, -1.5, 0.4375}, -- NodeBox17
{-0.4375, -0.75, -0.4375, 0.4375, -1.5, -0.375}, -- NodeBox18
{0.375, -0.75, -0.4375, 0.4375, -1.5, 0.4375}, -- NodeBox19
{-0.4375, -0.75, -0.4375, -0.375, -1.5, 0.4375}, -- NodeBox20
{-0.4375, -1.5, -0.4375, 0.4375, -0.5, -0.375},
{-0.4375, -1.5, 0.375, 0.4375, -0.5, 0.4375},
{-0.4375, -1.5, -0.375, -0.375, -0.5, 0.375},
{0.375, -1.5, -0.375, 0.4375, -0.5, 0.375},
{-0.375, -0.5, -0.375, 0.375, -0.4375, 0.375},
{-0.3125, -0.4375, -0.3125, 0.3125, -0.375, 0.3125},
{-0.25, -0.375, -0.25, 0.25, -0.3125, 0.25},
{-0.1875, -0.3125, -0.1875, 0.1875, -0.25, 0.1875}
}
},
sounds = default.node_sound_glass_defaults()
})
local function toggle_lid(pos, node, player, itemstack)
if not player or minetest.is_protected(pos, player:get_player_name()) then
return
end
local lid_pos = {x = pos.x, y = pos.y+2 , z = pos.z}
local lid_node = minetest.get_node(lid_pos)
if lid_node.name == "scifi_nodes:pot_lid" then
minetest.set_node(lid_pos, {name = "air"})
elseif lid_node.name == "air" then
minetest.set_node(lid_pos, {name = "scifi_nodes:pot_lid"})
end
end
local function remove_lid(pos)
local lid_pos = {x = pos.x, y = pos.y+2 , z = pos.z}
local lid_node = minetest.get_node(lid_pos)
if lid_node.name == "scifi_nodes:pot_lid" then
minetest.set_node(lid_pos, {name = "air"})
end
end
minetest.register_node("scifi_nodes:pot", {
description = "metal plant pot (right click for lid, shift+rightclick to plant)",
description = "Metal Plant Pot (right-click for lid, sneak + right-click to plant)",
tiles = {
"scifi_nodes_pot.png",
"default_dirt.png^scifi_nodes_pot.png",
"scifi_nodes_greybolts.png",
"scifi_nodes_greybolts.png",
"scifi_nodes_greybolts.png",
@ -376,34 +390,30 @@ minetest.register_node("scifi_nodes:pot", {
},
drawtype = "nodebox",
paramtype = "light",
groups = {cracky=1, soil=1, sand=1},
groups = {cracky = 1, soil = 1, sand = 1},
selection_box = {
type = "fixed",
fixed = {-0.5, -0.5, -0.5, 0.5, 0.5, 0.5}
},
node_box = {
type = "fixed",
fixed = {
{-0.5, -0.25, -0.5, 0.5, 0.5, 0.5}, -- NodeBox1
{0.1875, -0.5, 0.1875, 0.5, -0.25, 0.5}, -- NodeBox2
{-0.5, -0.5, -0.5, -0.1875, -0.25, -0.1875}, -- NodeBox3
{-0.5, -0.5, 0.1875, -0.1875, -0.25, 0.5}, -- NodeBox4
{0.1875, -0.5, -0.5, 0.5, -0.25, -0.1875}, -- NodeBox5
{-0.5, -0.25, -0.5, 0.5, 0.5, 0.5},
{0.1875, -0.5, 0.1875, 0.5, -0.25, 0.5},
{-0.5, -0.5, -0.5, -0.1875, -0.25, -0.1875},
{-0.5, -0.5, 0.1875, -0.1875, -0.25, 0.5},
{0.1875, -0.5, -0.5, 0.5, -0.25, -0.1875}
}
},
on_rightclick = function(pos, node, clicker, item, _)
local lid_node = minetest.get_node({x=pos.x, y=pos.y+2, z=pos.z})
if lid_node.name == "scifi_nodes:pot_lid" then
minetest.set_node({x=pos.x, y=pos.y+2, z=pos.z}, {name="air", param2=lid_node.param2})
elseif lid_node.name ~= "scifi_nodes:pot_lid" and node.name == "air" then
minetest.set_node({x=pos.x, y=pos.y+2, z=pos.z}, {name="scifi_nodes:pot_lid", param2=lid_node.param2})
end
end,
on_destruct = function(pos, node, _)
minetest.remove_node({x=pos.x, y=pos.y+2, z=pos.z})
end
on_rightclick = toggle_lid,
on_destruct = remove_lid,
sounds = default.node_sound_metal_defaults(),
})
minetest.register_node("scifi_nodes:pot2", {
description = "metal wet plant pot(right click for lid, shift+rightclick to plant)",
description = "Metal Plant Pot Wet (right-click for lid, sneak + right-click to plant)",
tiles = {
"scifi_nodes_pot.png^[colorize:black:100",
"default_dirt.png^scifi_nodes_pot2.png",
"scifi_nodes_greybolts.png",
"scifi_nodes_greybolts.png",
"scifi_nodes_greybolts.png",
@ -412,28 +422,24 @@ minetest.register_node("scifi_nodes:pot2", {
},
drawtype = "nodebox",
paramtype = "light",
groups = {cracky=1, soil=3, wet=1},
groups = {cracky = 1, soil = 3, wet = 1},
selection_box = {
type = "fixed",
fixed = {-0.5, -0.5, -0.5, 0.5, 0.5, 0.5}
},
node_box = {
type = "fixed",
fixed = {
{-0.5, -0.25, -0.5, 0.5, 0.5, 0.5}, -- NodeBox1
{0.1875, -0.5, 0.1875, 0.5, -0.25, 0.5}, -- NodeBox2
{-0.5, -0.5, -0.5, -0.1875, -0.25, -0.1875}, -- NodeBox3
{-0.5, -0.5, 0.1875, -0.1875, -0.25, 0.5}, -- NodeBox4
{0.1875, -0.5, -0.5, 0.5, -0.25, -0.1875}, -- NodeBox5
{-0.5, -0.25, -0.5, 0.5, 0.5, 0.5},
{0.1875, -0.5, 0.1875, 0.5, -0.25, 0.5},
{-0.5, -0.5, -0.5, -0.1875, -0.25, -0.1875},
{-0.5, -0.5, 0.1875, -0.1875, -0.25, 0.5},
{0.1875, -0.5, -0.5, 0.5, -0.25, -0.1875}
}
},
on_rightclick = function(pos, node, clicker, item, _)
local lid_node = minetest.get_node({x=pos.x, y=pos.y+2, z=pos.z})
if lid_node.name == "scifi_nodes:pot_lid" then
minetest.set_node({x=pos.x, y=pos.y+2, z=pos.z}, {name="air", param2=lid_node.param2})
elseif lid_node.name ~= "scifi_nodes:pot_lid" and node.name == "air" then
minetest.set_node({x=pos.x, y=pos.y+2, z=pos.z}, {name="scifi_nodes:pot_lid", param2=lid_node.param2})
end
end,
on_destruct = function(pos, node, _)
minetest.remove_node({x=pos.x, y=pos.y+2, z=pos.z})
end
on_rightclick = toggle_lid,
on_destruct = remove_lid,
sounds = default.node_sound_metal_defaults(),
})
minetest.register_node("scifi_nodes:lightbar", {

Binary file not shown.

Before

Width:  |  Height:  |  Size: 193 B

After

Width:  |  Height:  |  Size: 124 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 124 B