forked from MineClone5/MineClone5
Restore igloos
This commit is contained in:
parent
5c27e1c186
commit
34c6bf3446
|
|
@ -450,6 +450,7 @@ mcl_mapgen.dungeons = normal
|
|||
|
||||
mcl_mapgen.overworld = overworld
|
||||
mcl_mapgen.end_ = end_
|
||||
mcl_mapgen["end"] = mcl_mapgen.end_
|
||||
mcl_mapgen.nether = nether
|
||||
|
||||
mcl_mapgen.order = order
|
||||
|
|
|
|||
|
|
@ -67,7 +67,6 @@ end
|
|||
|
||||
--local chunk_has_desert_struct
|
||||
--local chunk_has_desert_temple
|
||||
--local chunk_has_igloo
|
||||
|
||||
local octaves = 3
|
||||
local persistence = 0.6
|
||||
|
|
@ -81,18 +80,6 @@ end
|
|||
max_noise = max_noise * octaves
|
||||
max_noise = offset + scale * max_noise
|
||||
|
||||
local function spawn_igloo(p, nn, pr, vm_context)
|
||||
if nn ~= "mcl_core:snowblock" and nn ~= "mcl_core:snow" and minetest_get_item_group(nn, "grass_block_snow") ~= 1 then return end
|
||||
-- if pr:next(1, 4400) ~= 1 then return end
|
||||
-- Check surface
|
||||
local floor = {x=p.x+9, y=p.y-1, z=p.z+9}
|
||||
local surface = minetest_find_nodes_in_area({x=p.x,y=p.y-1,z=p.z}, floor, {"mcl_core:snowblock", "mcl_core:dirt_with_grass_snow"})
|
||||
if #surface < 63 then return end
|
||||
mcl_structures.call_struct(p, "igloo", nil, pr)
|
||||
-- chunk_has_igloo = true
|
||||
return true
|
||||
end
|
||||
|
||||
local witch_hut_offsets = {
|
||||
["0"] = {
|
||||
{x=1, y=0, z=1}, {x=1, y=0, z=5}, {x=6, y=0, z=1}, {x=6, y=0, z=5},
|
||||
|
|
@ -228,7 +215,6 @@ local function generate_structures(vm_context)
|
|||
local pr = PcgRandom(vm_context.chunkseed)
|
||||
-- chunk_has_desert_struct = false
|
||||
-- chunk_has_desert_temple = false
|
||||
-- chunk_has_igloo = false
|
||||
local minp, maxp = vm_context.minp, vm_context.maxp
|
||||
|
||||
perlin_structures = perlin_structures or minetest.get_perlin(329, 3, 0.6, 100)
|
||||
|
|
@ -251,7 +237,6 @@ local function generate_structures(vm_context)
|
|||
if minetest.registered_nodes[nn0] and minetest.registered_nodes[nn0].buildable_to then
|
||||
--spawn_desert_temple(p, nn, pr, vm_context)
|
||||
--spawn_desert_well(p, nn, pr, vm_context)
|
||||
--spawn_igloo(p, nn, pr, vm_context)
|
||||
--spawn_fossil(p, nn, pr, vm_context)
|
||||
--spawn_witch_hut(p, nn, pr, vm_context)
|
||||
if V6 then
|
||||
|
|
|
|||
|
|
@ -0,0 +1,196 @@
|
|||
local modname = minetest.get_current_modname()
|
||||
local modpath = minetest.get_modpath(modname)
|
||||
|
||||
-- local chance_per_chunk = mcl_structures.from_16x16_to_chunk_inverted_chance(4400)
|
||||
local chance_per_chunk = 1
|
||||
local noise_multiplier = 0 --1.3
|
||||
local random_offset = 132
|
||||
local struct_threshold = 0 --chance_per_chunk - 1
|
||||
local scanning_ratio = 0.0003
|
||||
|
||||
local mcl_structures_get_perlin_noise_level = mcl_structures.get_perlin_noise_level
|
||||
|
||||
local node_list = {"mcl_core:snowblock", "mcl_core:snow", "group:grass_block_snow"}
|
||||
|
||||
local schematic_top = modpath.."/schematics/mcl_structures_igloo_top.mts"
|
||||
local schematic_basement = modpath.."/schematics/mcl_structures_igloo_basement.mts"
|
||||
|
||||
local brick = {
|
||||
-- monster egg:
|
||||
[false] = {
|
||||
-- cracked:
|
||||
[false] = "mcl_core:stonebrick",
|
||||
[true ] = "mcl_core:stonebrickcracked",
|
||||
},
|
||||
[true] = {
|
||||
[false] = "mcl_monster_eggs:monster_egg_stonebrick",
|
||||
[true ] = "mcl_monster_eggs:monster_egg_stonebrickcracked",
|
||||
},
|
||||
}
|
||||
local dirs = {
|
||||
["0"] = {x=-1, y=0, z= 0},
|
||||
["90"] = {x= 0, y=0, z=-1},
|
||||
["180"] = {x= 1, y=0, z= 0},
|
||||
["270"] = {x= 0, y=0, z= 1},
|
||||
}
|
||||
local tdirs = {
|
||||
["0"] = {x= 1, y=0, z= 0},
|
||||
["90"] = {x= 0, y=0, z=-1},
|
||||
["180"] = {x=-1, y=0, z= 0},
|
||||
["270"] = {x= 0, y=0, z= 1}
|
||||
}
|
||||
local tposes = {
|
||||
["0"] = {x=7, y=-1, z=3},
|
||||
["90"] = {x=3, y=-1, z=1},
|
||||
["180"] = {x=1, y=-1, z=3},
|
||||
["270"] = {x=3, y=-1, z=7},
|
||||
}
|
||||
local chest_offsets = {
|
||||
["0"] = {x=5, y=1, z=5},
|
||||
["90"] = {x=5, y=1, z=3},
|
||||
["180"] = {x=3, y=1, z=1},
|
||||
["270"] = {x=1, y=1, z=5},
|
||||
}
|
||||
|
||||
local function on_placed(pos, rotation, pr, size)
|
||||
local chest_offset = chest_offsets[rotation]
|
||||
if not chest_offset then return end
|
||||
local lootitems = mcl_loot.get_multi_loot({
|
||||
{
|
||||
stacks_min = 1,
|
||||
stacks_max = 1,
|
||||
items = {
|
||||
{ itemstring = "mcl_core:apple_gold", weight = 1 },
|
||||
}
|
||||
},
|
||||
{
|
||||
stacks_min = 2,
|
||||
stacks_max = 8,
|
||||
items = {
|
||||
{ itemstring = "mcl_core:coal_lump", weight = 15, amount_min = 1, amount_max = 4 },
|
||||
{ itemstring = "mcl_core:apple", weight = 15, amount_min = 1, amount_max = 3 },
|
||||
{ itemstring = "mcl_farming:wheat_item", weight = 10, amount_min = 2, amount_max = 3 },
|
||||
{ itemstring = "mcl_core:gold_nugget", weight = 10, amount_min = 1, amount_max = 3 },
|
||||
{ itemstring = "mcl_mobitems:rotten_flesh", weight = 10 },
|
||||
{ itemstring = "mcl_tools:axe_stone", weight = 2 },
|
||||
{ itemstring = "mcl_core:emerald", weight = 1 },
|
||||
}
|
||||
}}, pr)
|
||||
|
||||
local chest_pos = vector.add(pos, chest_offset)
|
||||
mcl_structures.init_node_construct(chest_pos)
|
||||
local meta = minetest.get_meta(chest_pos)
|
||||
local inv = meta:get_inventory()
|
||||
mcl_loot.fill_inventory(inv, "main", lootitems, pr)
|
||||
end
|
||||
|
||||
local function on_placed_top(p1, rotation, pr, size)
|
||||
local y = p1.y + 1
|
||||
local pos = {x = p1.x, y = y, z = p1.z}
|
||||
local dim = mcl_mapgen[mcl_worlds.pos_to_dimension(pos)]
|
||||
local bottom_of_dimension = (dim and dim.min or mcl_mapgen.EDGE_MIN) + 10
|
||||
local bottom_of_chunk = mcl_mapgen.get_chunk_beginning(y)
|
||||
local buffer = y - math.max(bottom_of_chunk, bottom_of_dimension)
|
||||
if buffer < 20 then return end
|
||||
|
||||
local depth = pr:next(19, buffer)
|
||||
local bpos = {x=pos.x, y=pos.y-depth, z=pos.z}
|
||||
local dir = dirs[rotation]
|
||||
if not dir then return end
|
||||
local tdir = tdirs[rotation]
|
||||
|
||||
-- Trapdoor position
|
||||
local tpos = vector.add(pos, tposes[rotation])
|
||||
local ladder_param2 = minetest.dir_to_wallmounted(tdir)
|
||||
|
||||
-- Check how deep we can actuall dig
|
||||
local real_depth = 0
|
||||
for y = 1, depth - 5 do
|
||||
local node = minetest.get_node({x=tpos.x,y=tpos.y-y,z=tpos.z})
|
||||
local def = minetest.registered_nodes[node.name]
|
||||
if (not def) or (not def.walkable) or (def.liquidtype ~= "none") then
|
||||
bpos.y = tpos.y-y+1
|
||||
break
|
||||
end
|
||||
real_depth = real_depth + 1
|
||||
end
|
||||
if real_depth < 6 then return end
|
||||
|
||||
-- Generate ladder to basement
|
||||
for y=1, real_depth-1 do
|
||||
minetest.set_node({x=tpos.x-1,y=tpos.y-y,z=tpos.z }, {name = brick[pr:next(1, 10) == 1][pr:next(1, 3) == 1]})
|
||||
minetest.set_node({x=tpos.x+1,y=tpos.y-y,z=tpos.z }, {name = brick[pr:next(1, 10) == 1][pr:next(1, 3) == 1]})
|
||||
minetest.set_node({x=tpos.x ,y=tpos.y-y,z=tpos.z-1}, {name = brick[pr:next(1, 10) == 1][pr:next(1, 3) == 1]})
|
||||
minetest.set_node({x=tpos.x ,y=tpos.y-y,z=tpos.z+1}, {name = brick[pr:next(1, 10) == 1][pr:next(1, 3) == 1]})
|
||||
minetest.set_node({x=tpos.x ,y=tpos.y-y,z=tpos.z }, {name="mcl_core:ladder", param2=ladder_param2})
|
||||
end
|
||||
|
||||
-- Place basement
|
||||
local def = {
|
||||
pos = bpos,
|
||||
schematic = schematic_basement,
|
||||
rotation = rotation,
|
||||
pr = pr,
|
||||
on_placed = on_placed,
|
||||
}
|
||||
mcl_structures.place_schematic(def)
|
||||
|
||||
minetest.after(5, function(tpos, dir)
|
||||
minetest.swap_node(tpos, {name="mcl_doors:trapdoor", param2=20+minetest.dir_to_facedir(dir)}) -- TODO: more reliable param2
|
||||
end, tpos, dir)
|
||||
end
|
||||
|
||||
local function place(pos, rotation, pr)
|
||||
local def = {
|
||||
pos = {x = pos.x, y = pos.y - 1, z = pos.z},
|
||||
schematic = schematic_top,
|
||||
rotation = rotation or tostring(pr:next(0,3)*90),
|
||||
pr = pr,
|
||||
on_placed = on_placed_top,
|
||||
}
|
||||
-- FIXME: This spawns bookshelf instead of furnace. Fix this!
|
||||
-- Furnace does not work atm because apparently meta is not set. :-(
|
||||
mcl_structures.place_schematic(def)
|
||||
end
|
||||
|
||||
local function get_place_rank(pos)
|
||||
local x, y, z = pos.x, pos.y, pos.z
|
||||
local p1 = {x = x , y = y, z = z }
|
||||
local p2 = {x = x + 9, y = y, z = z + 9}
|
||||
local best_pos_list_surface = #minetest.find_nodes_in_area(p1, p2, node_list, false)
|
||||
local other_pos_list_surface = #minetest.find_nodes_in_area(p1, p2, "group:opaque", false)
|
||||
return 10 * (best_pos_list_surface) + other_pos_list_surface - 640
|
||||
end
|
||||
|
||||
mcl_structures.register_structure({
|
||||
name = "igloo",
|
||||
decoration = {
|
||||
deco_type = "simple",
|
||||
place_on = node_list,
|
||||
flags = "all_floors",
|
||||
fill_ratio = scanning_ratio,
|
||||
y_min = -33,
|
||||
y_max = mcl_mapgen.overworld.max,
|
||||
height = 1,
|
||||
},
|
||||
on_finished_chunk = function(minp, maxp, seed, vm_context, pos_list)
|
||||
local pr = PseudoRandom(seed + random_offset)
|
||||
local random_number = pr:next(1, chance_per_chunk)
|
||||
local noise = mcl_structures_get_perlin_noise_level(minp) * noise_multiplier
|
||||
if (random_number + noise) < struct_threshold then return end
|
||||
local pos
|
||||
local count = -1
|
||||
for i = 1, #pos_list do
|
||||
local pos_i = vector.subtract(pos_list[i], {x = 4, y = 1, z = 4})
|
||||
local count_i = get_place_rank(pos_i)
|
||||
if count_i > count then
|
||||
count = count_i
|
||||
pos = pos_i
|
||||
end
|
||||
end
|
||||
if count < 0 then return end
|
||||
local pr = PseudoRandom(vm_context.chunkseed)
|
||||
place(pos, nil, pr)
|
||||
end,
|
||||
place_function = place,
|
||||
})
|
||||
|
|
@ -337,9 +337,7 @@ function mcl_structures.call_struct(pos, struct_style, rotation, pr, callback)
|
|||
if not rotation then
|
||||
rotation = "random"
|
||||
end
|
||||
if struct_style == "igloo" then
|
||||
return mcl_structures.generate_igloo(pos, rotation, pr)
|
||||
elseif struct_style == "witch_hut" then
|
||||
if struct_style == "witch_hut" then
|
||||
return mcl_structures.generate_witch_hut(pos, rotation)
|
||||
elseif struct_style == "ice_spike_small" then
|
||||
return mcl_structures.generate_ice_spike_small(pos, rotation)
|
||||
|
|
@ -376,164 +374,6 @@ function mcl_structures.generate_end_portal(pos, rotation, pr)
|
|||
end
|
||||
end
|
||||
|
||||
function mcl_structures.generate_igloo(pos, rotation, pr)
|
||||
-- Place igloo
|
||||
local success, rotation = mcl_structures.generate_igloo_top(pos, pr)
|
||||
-- Place igloo basement with 50% chance
|
||||
local r = pr:next(1,2)
|
||||
if r == 1 then
|
||||
-- Select basement depth
|
||||
local dim = mcl_worlds.pos_to_dimension(pos)
|
||||
--local buffer = pos.y - (mcl_mapgen.overworld.lava_max + 10)
|
||||
local buffer
|
||||
if dim == "nether" then
|
||||
buffer = pos.y - (mcl_vars.mg_lava_nether_max + 10)
|
||||
elseif dim == "end" then
|
||||
buffer = pos.y - (mcl_vars.mg_end_min + 1)
|
||||
elseif dim == "overworld" then
|
||||
buffer = pos.y - (mcl_mapgen.overworld.lava_max + 10)
|
||||
else
|
||||
return success
|
||||
end
|
||||
if buffer <= 19 then
|
||||
return success
|
||||
end
|
||||
local depth = pr:next(19, buffer)
|
||||
local bpos = {x=pos.x, y=pos.y-depth, z=pos.z}
|
||||
-- trapdoor position
|
||||
local tpos
|
||||
local dir, tdir
|
||||
if rotation == "0" then
|
||||
dir = {x=-1, y=0, z=0}
|
||||
tdir = {x=1, y=0, z=0}
|
||||
tpos = {x=pos.x+7, y=pos.y-1, z=pos.z+3}
|
||||
elseif rotation == "90" then
|
||||
dir = {x=0, y=0, z=-1}
|
||||
tdir = {x=0, y=0, z=-1}
|
||||
tpos = {x=pos.x+3, y=pos.y-1, z=pos.z+1}
|
||||
elseif rotation == "180" then
|
||||
dir = {x=1, y=0, z=0}
|
||||
tdir = {x=-1, y=0, z=0}
|
||||
tpos = {x=pos.x+1, y=pos.y-1, z=pos.z+3}
|
||||
elseif rotation == "270" then
|
||||
dir = {x=0, y=0, z=1}
|
||||
tdir = {x=0, y=0, z=1}
|
||||
tpos = {x=pos.x+3, y=pos.y-1, z=pos.z+7}
|
||||
else
|
||||
return success
|
||||
end
|
||||
local function set_brick(pos)
|
||||
local c = pr:next(1, 3) -- cracked chance
|
||||
local m = pr:next(1, 10) -- chance for monster egg
|
||||
local brick
|
||||
if m == 1 then
|
||||
if c == 1 then
|
||||
brick = "mcl_monster_eggs:monster_egg_stonebrickcracked"
|
||||
else
|
||||
brick = "mcl_monster_eggs:monster_egg_stonebrick"
|
||||
end
|
||||
else
|
||||
if c == 1 then
|
||||
brick = "mcl_core:stonebrickcracked"
|
||||
else
|
||||
brick = "mcl_core:stonebrick"
|
||||
end
|
||||
end
|
||||
minetest.set_node(pos, {name=brick})
|
||||
end
|
||||
local ladder_param2 = minetest.dir_to_wallmounted(tdir)
|
||||
local real_depth = 0
|
||||
-- Check how deep we can actuall dig
|
||||
for y=1, depth-5 do
|
||||
real_depth = real_depth + 1
|
||||
local node = minetest.get_node({x=tpos.x,y=tpos.y-y,z=tpos.z})
|
||||
local def = minetest.registered_nodes[node.name]
|
||||
if (not def) or (not def.walkable) or (def.liquidtype ~= "none") or (not def.is_ground_content) then
|
||||
bpos.y = tpos.y-y+1
|
||||
break
|
||||
end
|
||||
end
|
||||
if real_depth <= 6 then
|
||||
return success
|
||||
end
|
||||
-- Generate ladder to basement
|
||||
for y=1, real_depth-1 do
|
||||
set_brick({x=tpos.x-1,y=tpos.y-y,z=tpos.z })
|
||||
set_brick({x=tpos.x+1,y=tpos.y-y,z=tpos.z })
|
||||
set_brick({x=tpos.x ,y=tpos.y-y,z=tpos.z-1})
|
||||
set_brick({x=tpos.x ,y=tpos.y-y,z=tpos.z+1})
|
||||
minetest.set_node({x=tpos.x,y=tpos.y-y,z=tpos.z}, {name="mcl_core:ladder", param2=ladder_param2})
|
||||
end
|
||||
-- Place basement
|
||||
mcl_structures.generate_igloo_basement(bpos, rotation, pr)
|
||||
-- Place hidden trapdoor
|
||||
minetest.after(5, function(tpos, dir)
|
||||
minetest.set_node(tpos, {name="mcl_doors:trapdoor", param2=20+minetest.dir_to_facedir(dir)}) -- TODO: more reliable param2
|
||||
end, tpos, dir)
|
||||
end
|
||||
return success
|
||||
end
|
||||
|
||||
function mcl_structures.generate_igloo_top(pos, pr)
|
||||
-- FIXME: This spawns bookshelf instead of furnace. Fix this!
|
||||
-- Furnace does not work atm because apparently meta is not set. :-(
|
||||
local newpos = {x=pos.x,y=pos.y-1,z=pos.z}
|
||||
local path = modpath.."/schematics/mcl_structures_igloo_top.mts"
|
||||
local rotation = tostring(pr:next(0,3)*90)
|
||||
return mcl_structures.place_schematic(newpos, path, rotation, nil, true), rotation
|
||||
end
|
||||
|
||||
local function igloo_placement_callback(p1, p2, size, orientation, pr)
|
||||
local chest_offset
|
||||
if orientation == "0" then
|
||||
chest_offset = {x=5, y=1, z=5}
|
||||
elseif orientation == "90" then
|
||||
chest_offset = {x=5, y=1, z=3}
|
||||
elseif orientation == "180" then
|
||||
chest_offset = {x=3, y=1, z=1}
|
||||
elseif orientation == "270" then
|
||||
chest_offset = {x=1, y=1, z=5}
|
||||
else
|
||||
return
|
||||
end
|
||||
--local size = {x=9,y=5,z=7}
|
||||
local lootitems = mcl_loot.get_multi_loot({
|
||||
{
|
||||
stacks_min = 1,
|
||||
stacks_max = 1,
|
||||
items = {
|
||||
{ itemstring = "mcl_core:apple_gold", weight = 1 },
|
||||
}
|
||||
},
|
||||
{
|
||||
stacks_min = 2,
|
||||
stacks_max = 8,
|
||||
items = {
|
||||
{ itemstring = "mcl_core:coal_lump", weight = 15, amount_min = 1, amount_max = 4 },
|
||||
{ itemstring = "mcl_core:apple", weight = 15, amount_min = 1, amount_max = 3 },
|
||||
{ itemstring = "mcl_farming:wheat_item", weight = 10, amount_min = 2, amount_max = 3 },
|
||||
{ itemstring = "mcl_core:gold_nugget", weight = 10, amount_min = 1, amount_max = 3 },
|
||||
{ itemstring = "mcl_mobitems:rotten_flesh", weight = 10 },
|
||||
{ itemstring = "mcl_tools:axe_stone", weight = 2 },
|
||||
{ itemstring = "mcl_core:emerald", weight = 1 },
|
||||
}
|
||||
}}, pr)
|
||||
|
||||
local chest_pos = vector.add(p1, chest_offset)
|
||||
mcl_structures.init_node_construct(chest_pos)
|
||||
local meta = minetest.get_meta(chest_pos)
|
||||
local inv = meta:get_inventory()
|
||||
mcl_loot.fill_inventory(inv, "main", lootitems, pr)
|
||||
end
|
||||
|
||||
function mcl_structures.generate_igloo_basement(pos, orientation, pr)
|
||||
-- TODO: Add brewing stand
|
||||
-- TODO: Add monster eggs
|
||||
-- TODO: Spawn villager and zombie villager
|
||||
local path = modpath.."/schematics/mcl_structures_igloo_basement.mts"
|
||||
mcl_structures.place_schematic(pos, path, orientation, nil, true, nil, igloo_placement_callback, pr)
|
||||
end
|
||||
|
||||
function mcl_structures.generate_boulder(pos, rotation, pr)
|
||||
-- Choose between 2 boulder sizes (2×2×2 or 3×3×3)
|
||||
local r = pr:next(1, 10)
|
||||
|
|
@ -594,11 +434,11 @@ local chunk_square = mcl_mapgen.CS_NODES * mcl_mapgen.CS_NODES
|
|||
local block_square = mcl_mapgen.BS * mcl_mapgen.BS
|
||||
|
||||
function mcl_structures.from_16x16_to_chunk_inverted_chance(x)
|
||||
return math.floor(x * chunk_square / 256 + 0.5)
|
||||
return math.floor(x * 256 / chunk_square + 0.5)
|
||||
end
|
||||
|
||||
function mcl_structures.from_16x16_to_block_inverted_chance(x)
|
||||
return math.floor(x * block_square / 256 + 0.5)
|
||||
return math.floor(x * 256 / block_square + 0.5)
|
||||
end
|
||||
|
||||
dofile(modpath .. "/structures.lua")
|
||||
|
|
|
|||
|
|
@ -5,6 +5,7 @@ if not mcl_mapgen.singlenode then
|
|||
dofile(modpath .. "/desert_temple.lua")
|
||||
dofile(modpath .. "/desert_well.lua")
|
||||
dofile(modpath .. "/fossil.lua")
|
||||
dofile(modpath .. "/igloo.lua")
|
||||
dofile(modpath .. "/jungle_temple.lua")
|
||||
dofile(modpath .. "/nice_jungle_temple.lua")
|
||||
dofile(modpath .. "/noise_indicator.lua")
|
||||
|
|
|
|||
Loading…
Reference in New Issue