develop #31

Merged
milan merged 3 commits from develop into master 2021-02-03 19:32:36 +01:00
13 changed files with 291 additions and 4 deletions
Showing only changes of commit 280082765a - Show all commits

View file

@ -109,6 +109,7 @@ mobs:alias_mob("mobs:lava_flan", "mobs_monster:lava_flan") -- compatibility
minetest.register_craftitem(":mobs:lava_orb", { minetest.register_craftitem(":mobs:lava_orb", {
description = S("Lava orb"), description = S("Lava orb"),
inventory_image = "zmobs_lava_orb.png", inventory_image = "zmobs_lava_orb.png",
light_source = 14,
}) })
minetest.register_alias("zmobs:lava_orb", "mobs:lava_orb") minetest.register_alias("zmobs:lava_orb", "mobs:lava_orb")
@ -178,7 +179,8 @@ minetest.register_tool(":mobs:pick_lava", {
}, },
damage_groups = {fleshy = 6, fire = 1}, damage_groups = {fleshy = 6, fire = 1},
}, },
groups = {pickaxe = 1} groups = {pickaxe = 1},
light_source = 14
}) })
minetest.register_craft({ minetest.register_craft({

View file

@ -0,0 +1,3 @@
connor kenway
gamer 20n
CC BY-SA 3.0

View file

@ -0,0 +1,3 @@
kiro
gamer 20n
CC BY-SA 3.0

View file

@ -0,0 +1,3 @@
shay patrick cormac
gamer 20n
CC BY-SA 3.0

View file

@ -0,0 +1,3 @@
james heller
gamer 20n
CC BY-SA 3.0

Binary file not shown.

After

Width:  |  Height:  |  Size: 8.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 8.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 8.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 8.1 KiB

View file

@ -15,6 +15,6 @@ Attribution-ShareAlike 3.0 Unported (CC BY-SA 3.0)
http://creativecommons.org/licenses/by-sa/3.0/ http://creativecommons.org/licenses/by-sa/3.0/
Note: This mod has been amended to add new features like transparent and glowing Note: This mod has been amended to add new features like transparent and glowing
stairs, sloped stairs, recipes to return stairs back into blocks and also to be stairs, slopes, recipes to return stairs / slopes back into blocks and also for
used as fuel for furnaces, and alternative placement functions that use stairs to be used as fuel for furnaces, also alternative placement functions
on_rotate and sneak key. that use on_rotate and sneak key.

View file

@ -494,6 +494,140 @@ function stairs.register_slope(
end end
-- Node will be called stairs:slope_inner_<subname>
function stairs.register_slope_inner(
subname, recipeitem, groups, images, description, snds, wat)
local stair_images = set_textures(images, wat)
local new_groups = table.copy(groups)
new_groups.stair = 1
local light, alpha, propa = get_node_vars(recipeitem)
minetest.register_node(":stairs:slope_inner_" .. subname, {
description = description,
drawtype = "mesh",
mesh = "stairs_slope_inner.obj",
tiles = stair_images,
paramtype = "light",
paramtype2 = "facedir",
is_ground_content = false,
use_texture_alpha = alpha,
light_source = light,
sunlight_propagates = propa,
groups = new_groups,
sounds = snds,
selection_box = {
type = "fixed",
fixed = {
{-0.5, -0.5, -0.5, 0.5, 0, 0.5},
{-0.5, 0, 0, 0.5, 0.5, 0.5},
{-0.5, 0, -0.5, 0, 0.5, 0}
}
},
collision_box = {
type = "fixed",
fixed = {
{-0.5, -0.5, -0.5, 0.5, 0, 0.5},
{-0.5, 0, 0, 0.5, 0.5, 0.5},
{-0.5, 0, -0.5, 0, 0.5, 0}
}
},
on_place = function(itemstack, placer, pointed_thing)
return stair_place(itemstack, placer, pointed_thing,
"stairs:slope_inner_" .. subname)
end
})
-- slope recipe
minetest.register_craft({
output = "stairs:slope_inner_" .. subname .. " 6",
recipe = {
{"", recipeitem, recipeitem},
{recipeitem, recipeitem, recipeitem}
}
})
-- slope to original material recipe
minetest.register_craft({
output = recipeitem,
recipe = {
{"stairs:slope_inner_" .. subname, "stairs:slope_inner_" .. subname}
}
})
set_burn(recipeitem, "stairs:slope_inner_" .. subname, 0.5)
end
-- Node will be called stairs:slope_outer_<subname>
function stairs.register_slope_outer(
subname, recipeitem, groups, images, description, snds, wat)
local stair_images = set_textures(images, wat)
local new_groups = table.copy(groups)
new_groups.stair = 1
local light, alpha, propa = get_node_vars(recipeitem)
minetest.register_node(":stairs:slope_outer_" .. subname, {
description = description,
drawtype = "mesh",
mesh = "stairs_slope_outer.obj",
tiles = stair_images,
paramtype = "light",
paramtype2 = "facedir",
is_ground_content = false,
use_texture_alpha = alpha,
light_source = light,
sunlight_propagates = propa,
groups = new_groups,
sounds = snds,
selection_box = {
type = "fixed",
fixed = {
{-0.5, -0.5, -0.5, 0.5, 0, 0.5},
{-0.5, 0, 0, 0, 0.5, 0.5}
},
},
collision_box = {
type = "fixed",
fixed = {
{-0.5, -0.5, -0.5, 0.5, 0, 0.5},
{-0.5, 0, 0, 0, 0.5, 0.5}
},
},
on_place = function(itemstack, placer, pointed_thing)
return stair_place(itemstack, placer, pointed_thing,
"stairs:slope_outer_" .. subname)
end
})
-- slope recipe
minetest.register_craft({
output = "stairs:slope_outer_" .. subname .. " 6",
recipe = {
{"", "", recipeitem},
{"", recipeitem, recipeitem}
}
})
-- slope to original material recipe
minetest.register_craft({
output = recipeitem,
recipe = {
{"stairs:slope_outer_" .. subname, "stairs:slope_outer_" .. subname}
}
})
set_burn(recipeitem, "stairs:slope_outer_" .. subname, 0.5)
end
-- Nodes will be called stairs:{stair,slab}_<subname> -- Nodes will be called stairs:{stair,slab}_<subname>
function stairs.register_stair_and_slab( function stairs.register_stair_and_slab(
subname, recipeitem, groups, images, desc_stair, desc_slab, sounds, wat) subname, recipeitem, groups, images, desc_stair, desc_slab, sounds, wat)
@ -530,6 +664,12 @@ function stairs.register_all(
stairs.register_slope( stairs.register_slope(
subname, recipeitem, groups, images, desc .. " Slope", snds, wat) subname, recipeitem, groups, images, desc .. " Slope", snds, wat)
stairs.register_slope_inner(
subname, recipeitem, groups, images, desc .. " Slope", snds, wat)
stairs.register_slope_outer(
subname, recipeitem, groups, images, desc .. " Slope", snds, wat)
end end

View file

@ -0,0 +1,83 @@
# Blender v2.76 (sub 0) OBJ File: ''
# www.blender.org
g top
v 0.5 0.5 -0.5
v 0.5 0.5 0.5
v -0.5 0.5 0.5
v -0.5 -0.5 -0.5
v -0.5 -0.5 -0.5
vt 1.0 1.0
vt 0.0 1.0
vt 1.0 0.0
vt 1.0 1.0
vt 0.0 1.0
vt 0.0 0.0
vn 0.0 0.7071 -0.7071
vn -0.7071 0.7071 0.0
s 1
f 3/1/1 2/2/1 4/3/1
f 2/4/2 1/5/2 5/6/2
g bottom
v 0.5 -0.5 0.5
v 0.5 -0.5 -0.5
v -0.5 -0.5 0.5
v -0.5 -0.5 -0.5
v 0.5 -0.5 0.5
vt 1.0 1.0
vt 0.0 1.0
vt 0.0 0.0
vt 1.0 0.0
vn 0.0 -1.0 -0.0
s 1
f 9/7/3 7/8/3 6/9/3 8/10/3
l 8 10
g right
v -0.5 0.5 0.5
v -0.5 -0.5 -0.5
v -0.5 -0.5 0.5
vt 1.0 1.0
vt 0.0 0.0
vt 1.0 0.0
vn -1.0 0.0 0.0
s 1
f 11/11/4 12/12/4 13/13/4
g left
v 0.5 0.5 -0.5
v 0.5 0.5 0.5
v 0.5 -0.5 0.5
v 0.5 -0.5 -0.5
v 0.5 -0.5 0.5
vt 1.0 1.0
vt 0.0 1.0
vt 0.0 0.0
vt 1.0 0.0
vn 1.0 0.0 0.0
s 1
f 14/14/5 15/15/5 16/16/5 17/17/5
l 15 18
g back
v 0.5 0.5 0.5
v 0.5 -0.5 0.5
v -0.5 0.5 0.5
v -0.5 -0.5 0.5
v 0.5 -0.5 0.5
vt 0.0 0.0
vt 1.0 0.0
vt 1.0 1.0
vt 0.0 1.0
vn 0.0 -0.0 1.0
s 1
f 22/18/6 20/19/6 19/20/6 21/21/6
l 22 23
l 19 23
g front
v 0.5 0.5 -0.5
v 0.5 -0.5 -0.5
v -0.5 -0.5 -0.5
v -0.5 -0.5 -0.5
vt 0.0 1.0
vt 0.0 0.0
vt 1.0 0.0
vn 0.0 0.0 -1.0
s 1
f 24/22/7 25/23/7 27/24/7

View file

@ -0,0 +1,50 @@
# Blender v2.76 (sub 0) OBJ File: ''
# www.blender.org
g top
v -0.5 -0.5 0.5
v -0.5 -0.5 -0.5
v 0.5 -0.5 -0.5
v 0.5 0.5 0.5
vt 1.0 1.0
vt 0.0 0.0
vt 1.0 0.0
vt 0.0 1.0
vt 0.0 0.0
vt 1.0 0.0
vn -0.7071 0.7071 0.0
vn 0.0 0.7071 -0.7071
s off
f 4/1/1 2/2/1 1/3/1
f 4/4/2 3/5/2 2/6/2
g bottom
v 0.5 -0.5 0.5
v -0.5 -0.5 0.5
v -0.5 -0.5 -0.5
v 0.5 -0.5 -0.5
vt 1.0 1.0
vt 0.0 1.0
vt 0.0 0.0
vt 1.0 0.0
vn 0.0 -1.0 -0.0
s off
f 5/7/3 6/8/3 7/9/3 8/10/3
g right
v 0.5 -0.5 0.5
v -0.5 -0.5 0.5
v 0.5 0.5 0.5
vt 0.0 0.0
vt 1.0 0.0
vt 1.0 1.0
vn 0.0 -0.0 1.0
s off
f 10/11/4 9/12/4 11/13/4
g left
v 0.5 -0.5 0.5
v 0.5 -0.5 -0.5
v 0.5 0.5 0.5
vt 0.0 1.0
vt 0.0 0.0
vt 1.0 0.0
vn 1.0 0.0 0.0
s off
f 14/14/5 12/15/5 13/16/5