Luanti/fun_caves
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Extra error checking.

Browse source
This commit is contained in:
Duane 2016-07-15 02:58:33 -05:00
parent aa999e2ed5
commit bf26b8bee1
25 changed files with 897 additions and 314 deletions
Download patch file Download diff file Expand all files Collapse all files

57
treegen.lua
View file

@ -178,28 +178,6 @@ minetest.register_node("fun_caves:syrup", {
sounds = default.node_sound_glass_defaults(),
})
minetest.register_on_craft(function(itemstack, player, old_craft_grid, craft_inv)
local name = itemstack:get_name()
if not (name and name == 'fun_caves:syrup') then
return
end
local bucket
local index
for i = 1, player:get_inventory():get_size("craft") do
if (old_craft_grid[i]:get_name()):find('^fun_caves:bucket') then
bucket = old_craft_grid[i]:get_name()
index = i
end
end
if not bucket then
return
end
bucket = bucket:gsub('sap', 'empty')
craft_inv:set_stack("craft", index, bucket)
end)
newnode = fun_caves.clone_node("default:tree")
newnode.description = "Glowing Fungal Wood"
newnode.tiles = {"fun_caves_tree.png^vmg_glowing_fungal.png",}
@ -282,6 +260,32 @@ minetest.register_craft({
},
})
minetest.register_on_craft(function(itemstack, player, old_craft_grid, craft_inv)
if not (itemstack and player and old_craft_grid and craft_inv) then
return
end
local name = itemstack:get_name()
if not (name and name == 'fun_caves:syrup') then
return
end
local bucket
local index
for i = 1, player:get_inventory():get_size("craft") do
if (old_craft_grid[i]:get_name()):find('^fun_caves:bucket') then
bucket = old_craft_grid[i]:get_name()
index = i
end
end
if not bucket then
return
end
bucket = bucket:gsub('sap', 'empty')
craft_inv:set_stack("craft", index, bucket)
end)
minetest.register_craft({
type = "cooking",
output = "fun_caves:amber",
@ -305,8 +309,12 @@ local wood_noise = {offset = 0, scale = 1, seed = -4640, spread = {x = 32, y = 3
fun_caves.treegen = function(minp, maxp, data, p2data, area, node)
if not (minp and maxp and data and p2data and area and node and type(data) == 'table' and type(p2data) == 'table') then
return
end
local tree_n = minetest.get_perlin(tree_noise_1):get2d({x=math.floor((minp.x + 32) / 160) * 80, y=math.floor((minp.z + 32) / 160) * 80})
if minp.y < -112 or minp.y > 208 or (not fun_caves.DEBUG and tree_n < 1) then
if not tree_n or minp.y < -112 or minp.y > 208 or (not fun_caves.DEBUG and tree_n < 1) then
return
end
@ -315,6 +323,9 @@ fun_caves.treegen = function(minp, maxp, data, p2data, area, node)
local map_min = {x = minp.x, y = minp.y - 1, z = minp.z}
local wood_1 = minetest.get_perlin_map(wood_noise, map_max):get3dMap_flat(map_min)
if not wood_1 then
return
end
local write = false