FreeLikeGNU
/
witches
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

beds are against wall and gable window fix

master
francisco athens 2020-08-12 21:48:06 -07:00
parent 78cf4b79e2
commit d22437eaa9
2 changed files with 103 additions and 96 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

197
cottages.lua
View File

@ -4,12 +4,12 @@ local witches_dungeon_cellar_chance = tonumber(minetest.settings:get("witches_du
local witches_dungeon_cellar_depth = tonumber(minetest.settings:get("witches_dungeon_cellar_depth")) or -5
local function mts(table)
local output = minetest.serialize(table)
local output = minetest.serialize(table)
return output
end
local function mtpts(table)
local output = minetest.pos_to_string(table)
local output = minetest.pos_to_string(table)
return output
end
@ -56,7 +56,7 @@ function witches.grounding(self,vol_vec,required_list,exception_list,replacement
local rlist = required_list or {"group:soil","group:crumbly"}
local elist = exception_list or {}
local minichunk = minetest.find_nodes_in_area(pos1, pos2,rlist)
for i=1, #minichunk do
for n=1, #elist do
if minetest.get_node(minichunk[i].name) == elist[n] then
@ -67,7 +67,7 @@ function witches.grounding(self,vol_vec,required_list,exception_list,replacement
--print(mts(minichunk))
--see that lowest nodes all exist at pos1.y or die
local count = 0
if #minichunk >= (area.x * area.z*1.4) then
print("SUCCESS!".."pos1 = ".. mtpts(pos1).."pos2 = ".. mtpts(pos2).." count = "..#minichunk)
if replacement_node then
@ -78,14 +78,14 @@ function witches.grounding(self,vol_vec,required_list,exception_list,replacement
else
--print("insufficient count = "..#minichunk)
end
end
local cottage_id = nil
local default_params = {
--plan_size = {x=9, y=7 ,z=9}, --general size not including roof
foundation_nodes = {"default:mossycobble"},
foundation_depth = 3,
foundation_depth = 3,
porch_nodes = {"default:tree","default:pine_tree","default:acacia_tree"},
porch_size = 2,
first_floor_nodes = {"default:cobble","default:wood","default:pine_wood","default:acacia_wood","default:junglewood"},
@ -94,7 +94,7 @@ local default_params = {
roof_nodes = {"stairs:stair_wood","stairs:stair_junglewood"},
roof_slabs = {"stairs:slab_wood","stairs:slab_junglewood"},
wall_nodes = {"default:tree","default:pine_tree","default:acacia_tree"},
wall_nodes_ftype = {"wall_wdir"}, --wall_dir, wall_fdir, wall_wdir
wall_nodes_ftype = {"wall_wdir"}, --wall_dir, wall_fdir, wall_wdir
wall_height = 3,
window_nodes = {"default:fence_wood","default:fence_pine_wood","default:fence_acacia_wood","default:fence_junglewood"},
window_dimensions = {1,1,1,2}, --width,height min; width,height max
@ -110,17 +110,17 @@ function witches.generate_cottage(pos1,pos2,params)
local wp = working_parameters
if params then --get defaults for any missing params
for k,v in default_params do
if not params[k] then
if not params[k] then
wp[k] = table.copy(default_params[k])
end
end
else wp = table.copy(default_params)
end
--start with basement
--local od = vector.subtract(pos2,pos1)
local lower_corner_nodes = {
pos1,
{x= pos1.x, y = pos1.y, z = pos2.z},
@ -128,7 +128,7 @@ function witches.generate_cottage(pos1,pos2,params)
{x= pos2.x, y = pos1.y, z = pos1.z},
}
local upper_corner_nodes = {
{x= pos1.x, y = pos2.y, z = pos1.z},
{x= pos1.x, y = pos2.y, z = pos2.z},
pos2,
@ -145,7 +145,7 @@ function witches.generate_cottage(pos1,pos2,params)
local ps = wp.porch_size or math.random(2)
-- clear the area
-- clear the area
local cpos1 = {x = pos1.x-ps, y=pos2.y+5 ,z=pos1.z-ps}
local cpos2 = {x = pos2.x+ps, y=pos2.y+13, z=pos2.z+ps}
local carea = vector.subtract(cpos2,cpos1)
@ -164,10 +164,10 @@ function witches.generate_cottage(pos1,pos2,params)
-- porch
local prnodes = wp.porch_nodes[math.random(#wp.porch_nodes)]
local ppos1 = {x = pos1.x-ps, y=pos2.y ,z=pos1.z-ps}
local ppos2 = {x = pos2.x+ps, y=pos2.y, z=pos2.z+ps}
local ppos2 = {x = pos2.x+ps, y=pos2.y, z=pos2.z+ps}
local parea = vector.subtract(ppos2,ppos1)
for i=1, parea.z+1 do
for j=1, parea.x+1 do
@ -186,7 +186,7 @@ function witches.generate_cottage(pos1,pos2,params)
--first floor!
local ffnodes = wp.first_floor_nodes[math.random(#wp.first_floor_nodes)]
local ffpos1 = {x = pos1.x, y=pos2.y ,z=pos1.z}
local ffpos2 = {x = pos2.x, y=pos2.y, z=pos2.z}
local ffpos2 = {x = pos2.x, y=pos2.y, z=pos2.z}
local area = vector.subtract(pos2,pos1)
for i=1, area.z+1 do
@ -241,7 +241,7 @@ function witches.generate_cottage(pos1,pos2,params)
local pos = {x=ffpos1.x, y=ffpos1.y+1, z=ffpos1.z+i}
local fpos = {x=ffpos1.x, y=ffpos1.y+1, z=ffpos1.z-1}
local dir = vector.direction(fpos,pos) -- the raw dir we can manipulate later
local facedir = minetest.dir_to_facedir(dir) --this facedir
local facedir = minetest.dir_to_facedir(dir) --this facedir
--walldir is for placing tree nodes in wall direction
table.insert(wall_plan, {
pos = pos, dir = dir, facedir = facedir, walldir = 5
@ -279,12 +279,12 @@ function witches.generate_cottage(pos1,pos2,params)
})
end
for h=1, wp.wall_height do
for i=1, #wall_plan do
minetest.set_node(wall_plan[i].pos,{
name=wlnodes,
paramtype2 = "facedir",
param2 = wall_plan[i].walldir
@ -294,37 +294,37 @@ function witches.generate_cottage(pos1,pos2,params)
wall_plan[i].pos.y = wall_plan[i].pos.y+1
end
end
--possible door locations, extra offset data
--possible door locations, extra offset data
local p_door_pos = {
w = {x = ffpos1.x, z = ffpos1.z+math.random(2,area.z-2), y = ffpos1.y+1, p ="z", fp={"x",-1}},
n = {x = ffpos1.x+math.random(2,area.x-2), z = ffpos2.z, y = ffpos1.y+1, p ="x", fp={"z",1}},
e = {x = ffpos2.x, z = ffpos1.z+math.random(2,area.z-2), y = ffpos1.y+1, p ="z", fp={"x",1}},
s = {x = ffpos1.x+math.random(2,area.x-2), z = ffpos1.z, y = ffpos1.y+1, p ="x", fp={"z",-1}}
}
local door_pos = {}
local test = 4
for k,v in pairs(p_door_pos) do
if test >= 1 and math.random(test) == 1 then
door_pos[k]=v
test = 0
test = 0
else
test = test - 1
end
end
--local door_pos= p_door_pos
print("door: "..mts(door_pos))
for k,v in pairs(door_pos) do
print(mts(v))
local f_pos1 = vector.new(v)
--get the offsets
f_pos1[v.fp[1] ] = f_pos1[v.fp[1] ] + v.fp[2]
f_pos1[v.fp[1] ] = f_pos1[v.fp[1] ] + v.fp[2]
local dir=vector.direction(f_pos1,door_pos[k])
local f_facedir = minetest.dir_to_facedir(dir)
@ -335,7 +335,7 @@ function witches.generate_cottage(pos1,pos2,params)
})
local door_pos_t = vector.new(v)
door_pos_t.y = door_pos_t.y+1
minetest.set_node(door_pos_t,{
name=wp.door_top,
@ -350,7 +350,7 @@ function witches.generate_cottage(pos1,pos2,params)
--get wallmount param2
local t_dir = vector.direction(t_pos1,v)
local t_wm = minetest.dir_to_wallmounted(t_dir)
t_pos1.y = t_pos1.y + 1
--offset from door
local t_pos2 = vector.new(t_pos1)
@ -377,18 +377,18 @@ function witches.generate_cottage(pos1,pos2,params)
for k,v in pairs(door_pos) do
for i=v[v.p]+1,v[v.p]-1,-1 do
if window_pos[k] and i == window_pos[k][v.p] then
if window_pos[k] and i == window_pos[k][v.p] then
window_pos[k] = nil
end
end
end
if window_pos then
for _,v in pairs(window_pos) do
print("window set: "..mtpts(v))
minetest.set_node(v,{
name="default:fence_wood"
@ -413,13 +413,13 @@ function witches.generate_cottage(pos1,pos2,params)
--get wallmount param2
local t_dir = vector.direction(t_pos1,v)
local t_wm = minetest.dir_to_wallmounted(t_dir)
--t_pos1.y = t_pos1.y + 1
--offset from window
local t_pos2 = vector.new(t_pos1)
t_pos1[v.p] = t_pos1[v.p] - 1
t_pos2[v.p] = t_pos2[v.p] + 1
if math.random() < .5 then
minetest.set_node(t_pos1,{
@ -446,36 +446,41 @@ function witches.generate_cottage(pos1,pos2,params)
f_pos1 = vector.new(v)
f_pos1[v.fp[1] ] = f_pos1[v.fp[1] ]+v.fp[2]
f_pos1.y = f_pos1.y-1
print("window:"..mtpts(window_pos[k]))
print("furniture:"..mtpts(f_pos1))
local dir1=vector.direction(f_pos1,v)
local dir2=vector.direction(v,f_pos1)
local f_facedir1 = minetest.dir_to_facedir(dir1)
local f_facedir2 = minetest.dir_to_facedir(dir2)
local f_num = math.random(#furniture)
local f_name = furniture[f_num]
if f_name == "beds:bed" then
local f_pos2 = vector.new(f_pos1)
if math.random()<0.001 then
f_pos2[v.fp[1] ] = f_pos2[v.fp[1] ]+v.fp[2]
else
f_pos2[v.p] = f_pos2[v.p] + v.fp[2] --bed along wall_nodes
dir1=vector.direction(f_pos2,f_pos1)
dir2=vector.direction(f_pos1,f_pos2)
f_facedir1 = minetest.dir_to_facedir(dir1)
f_facedir2 = minetest.dir_to_facedir(dir2)
end
minetest.set_node(f_pos1,{
name=f_name,
paramtype2 = "facedir",
param2 = f_facedir2
})
print("bed1:"..mtpts(f_pos1))
local f_pos2 = vector.new(f_pos1)
f_pos2[v.fp[1] ] = f_pos2[v.fp[1] ]+v.fp[2]
print("bed2:"..mtpts(f_pos2))
minetest.set_node(f_pos2,{
name=f_name,
paramtype2 = "facedir",
param2 = f_facedir1
})
elseif f_name == "default:furnace" then
f_pos1[v.fp[1] ] = f_pos1[v.fp[1] ]-v.fp[2]
minetest.set_node(f_pos1,{
@ -484,7 +489,7 @@ function witches.generate_cottage(pos1,pos2,params)
param2 = f_facedir1
})
furnace_pos = vector.new(f_pos1)
elseif f_name ~="beds:bed" then
minetest.set_node(f_pos1,{
name=f_name,
@ -497,12 +502,12 @@ function witches.generate_cottage(pos1,pos2,params)
end
end
end
-- second_floor!
local sfnodes = wp.second_floor_nodes[math.random(#wp.second_floor_nodes)]
local sfpos1 = {x = ffpos1.x, y=ffpos2.y+wp.wall_height,z=ffpos1.z}
local sfpos2 = {x = ffpos2.x, y=ffpos2.y+wp.wall_height, z=ffpos2.z}
local sfpos2 = {x = ffpos2.x, y=ffpos2.y+wp.wall_height, z=ffpos2.z}
local sfarea = vector.subtract(sfpos2,sfpos1)
--
for i=1, sfarea.z+1 do
@ -526,7 +531,7 @@ function witches.generate_cottage(pos1,pos2,params)
end
end
--]]
--gable and roof
--orientation
local rfnum = math.random(#wp.roof_nodes)
@ -543,7 +548,8 @@ function witches.generate_cottage(pos1,pos2,params)
local rfarea = vector.subtract(rfpos2,rfpos1)
local gbarea = vector.subtract(gbpos2,gbpos1)
local l_pos = {}
local rfaz = math.floor(rfarea.z/2)
local rfax = math.floor(rfarea.x/2)
if math.random() < 0.5 then
local midpoint = (rfarea.z+1)/2
@ -559,24 +565,24 @@ function witches.generate_cottage(pos1,pos2,params)
--print("mp "..midpoint)
--both gables are made at the same time
for g=1, gmp do
local gpos = {x=gbpos1.x, y=rfpos2.y+2, z=gbpos1.z+gmp-g}
local gpos = {x=gbpos1.x, y=rfpos2.y+2, z=gbpos1.z+gmp-g}
local gpos2 = {x=gbpos1.x+gbarea.x, y=rfpos2.y+2, z=gbpos1.z+gmp-g}
minetest.bulk_set_node({gpos,gpos2},{
name=gbnodes,
paramtype2="facedir",
param2=0
})
end
end
--transform coords for each step from outer dimension toward midpoint
gmp = gmp -2
gbpos1.z = gbpos1.z+1
gbpos1.z = gbpos1.z+1
rfpos2.y = rfpos2.y+1
end
rfpos2 = vector.new({x = sfpos2.x+1, y=sfpos2.y, z=sfpos2.z+1})--reset rfpos2 for other side of roof
rfarea = vector.subtract(rfpos2,rfpos1)
@ -590,11 +596,11 @@ function witches.generate_cottage(pos1,pos2,params)
param2=2
})
end
rfpos2.y=rfpos2.y+1
end
if rfarea.z % 2 == 0 then
for j=1, rfarea.x+1 do
local pos = {x=rfpos1.x+j-1, y=rfpos2.y, z=rfpos1.z+(rfarea.z/2)}
@ -604,21 +610,22 @@ function witches.generate_cottage(pos1,pos2,params)
end
-- p is positional axis along which it is made
-- fp is the facing axis and direction inward
local wpos1 = {x=rfpos1.x+1, y=rfpos2.y-2, z=rfpos1.z+(rfarea.z/2), p="z", fp={"x",1}}
local wpos1 = {x=rfpos1.x+1, y=rfpos2.y-2, z=rfpos1.z+(rfaz), p="z", fp={"x",1}}
table.insert(l_pos,wpos1)
local wpos2 = {x=rfpos1.x+rfarea.x-1, y=rfpos2.y-2, z=rfpos1.z+(rfarea.z/2), p="z", fp={"x",-1}}
local wpos2 = {x=rfpos1.x+rfarea.x-1, y=rfpos2.y-2, z=rfpos1.z+(rfaz), p="z", fp={"x",-1}}
table.insert(l_pos,wpos2)
minetest.bulk_set_node({wpos1,wpos2},{
name=wp.window_nodes[1]
})
else
local wpos1 = {x=rfpos1.x+1, y=rfpos2.y-2, z=rfpos1.z+(rfarea.z/2)-1, p="z", fp={"x",1}}
local wpos1 = {x=rfpos1.x+1, y=rfpos2.y-2, z=rfpos1.z+(rfaz)+1, p="z", fp={"x",1}}
table.insert(l_pos,wpos1)
local wpos2 = {x=rfpos1.x+1, y=rfpos2.y-2, z=rfpos1.z+(rfarea.z/2), p="z", fp={"x",1}}
local wpos2 = {x=rfpos1.x+1, y=rfpos2.y-2, z=rfpos1.z+(rfaz), p="z", fp={"x",1}}
table.insert(l_pos,wpos2)
local wpos3 = {x=rfpos1.x+rfarea.x-1, y=rfpos2.y-2, z=rfpos1.z+(rfarea.z/2)-1, p="z", fp={"x",-1}}
local wpos3 = {x=rfpos1.x+rfarea.x-1, y=rfpos2.y-2, z=rfpos1.z+(rfaz)+1, p="z", fp={"x",-1}}
table.insert(l_pos,wpos3)
local wpos4 = {x=rfpos1.x+rfarea.x-1, y=rfpos2.y-2, z=rfpos1.z+(rfarea.z/2), p="z", fp={"x",-1}}
local wpos4 = {x=rfpos1.x+rfarea.x-1, y=rfpos2.y-2, z=rfpos1.z+(rfaz), p="z", fp={"x",-1}}
table.insert(l_pos,wpos4)
minetest.bulk_set_node({wpos1,wpos2,wpos3,wpos4},{
name=wp.window_nodes[1]
@ -626,12 +633,12 @@ function witches.generate_cottage(pos1,pos2,params)
end
else --------------------------------------------
local gmp = rfarea.x-1
for j=1, (rfarea.x+1)/2 do
for i=1, rfarea.z+1 do
local pos = {x=rfpos1.x+j-1, y=rfpos2.y+1, z=rfpos1.z+i-1}
minetest.set_node(pos,{
name=rfnodes,
@ -641,18 +648,18 @@ function witches.generate_cottage(pos1,pos2,params)
end
for g=1, gmp do
local gpos = {x=gbpos1.x+gmp-g, y=rfpos2.y+2, z=gbpos1.z}
local gpos = {x=gbpos1.x+gmp-g, y=rfpos2.y+2, z=gbpos1.z}
local gpos2 = {x=gbpos1.x+gmp-g, y=rfpos2.y+2, z=gbpos1.z+gbarea.z}
minetest.bulk_set_node({gpos,gpos2},{
name=gbnodes,
paramtype2="facedir",
param2=0
})
end
gmp = gmp -2
gbpos1.x = gbpos1.x+1
gbpos1.x = gbpos1.x+1
rfpos2.y=rfpos2.y+1
end
@ -670,10 +677,10 @@ function witches.generate_cottage(pos1,pos2,params)
param2=3
})
end
rfpos2.y=rfpos2.y+1
end
if rfarea.x % 2 == 0 then
for i=1,rfarea.z+1 do
local pos = {x=rfpos1.x+(rfarea.x/2), y=rfpos2.y, z=rfpos1.z+i-1}
@ -681,31 +688,31 @@ function witches.generate_cottage(pos1,pos2,params)
name=rfslabs
})
end
local wpos1 = {x=rfpos1.x+(rfarea.x/2), y=rfpos2.y-2, z=rfpos1.z+1, p="x", fp={"z",1}}
local wpos1 = {x=rfpos1.x+(rfax), y=rfpos2.y-2, z=rfpos1.z+1, p="x", fp={"z",1}}
table.insert(l_pos,wpos1)
local wpos2 = {x=rfpos1.x+(rfarea.x/2), y=rfpos2.y-2, z=rfpos1.z+rfarea.z-1, p="x", fp={"z",-1}}
local wpos2 = {x=rfpos1.x+(rfax), y=rfpos2.y-2, z=rfpos1.z+rfarea.z-1, p="x", fp={"z",-1}}
table.insert(l_pos,wpos2)
minetest.bulk_set_node({wpos1,wpos2},{
name=wp.window_nodes[1]
})
else
local wpos1 = {x=rfpos1.x+(rfarea.x/2), y=rfpos2.y-2, z=rfpos1.z+1, p="x", fp={"z",1}}
local wpos1 = {x=rfpos1.x+(rfax), y=rfpos2.y-2, z=rfpos1.z+1, p="x", fp={"z",1}}
table.insert(l_pos,wpos1)
local wpos2 = {x=rfpos1.x+(rfarea.x/2)-1, y=rfpos2.y-2, z=rfpos1.z+1, p="x", fp={"z",1}}
local wpos2 = {x=rfpos1.x+(rfax)+1, y=rfpos2.y-2, z=rfpos1.z+1, p="x", fp={"z",1}}
table.insert(l_pos,wpos2)
local wpos3 = {x=rfpos1.x+(rfarea.x/2), y=rfpos2.y-2, z=rfpos1.z+rfarea.z-1, p="x", fp={"z",-1}}
local wpos3 = {x=rfpos1.x+(rfax), y=rfpos2.y-2, z=rfpos1.z+rfarea.z-1, p="x", fp={"z",-1}}
table.insert(l_pos,wpos3)
local wpos4 = {x=rfpos1.x+(rfarea.x/2)-1, y=rfpos2.y-2, z=rfpos1.z+rfarea.z-1, p="x", fp={"z",-1}}
local wpos4 = {x=rfpos1.x+(rfax)+1, y=rfpos2.y-2, z=rfpos1.z+rfarea.z-1, p="x", fp={"z",-1}}
table.insert(l_pos,wpos4)
minetest.bulk_set_node({wpos1,wpos2,wpos3,wpos4},{
name=wp.window_nodes[1]
})
end
end
print("ladder l_pos: "..mts(l_pos))
--extend the stovepipe
if furnace_pos and furnace_pos.x then
if furnace_pos and furnace_pos.x then
--print("furnace pos: "..mtpts(furnace_pos))
local stovepipe = (rfpos2.y - furnace_pos.y) + 1
--print(rfpos2.y.." "..furnace_pos.y.." "..stovepipe)
@ -738,18 +745,18 @@ function witches.generate_cottage(pos1,pos2,params)
if math.ceil(l.x) == w.x and math.ceil(l.z) == w.z then
print("removing".. mtpts(l_pos[k]))
table.remove(l_pos,k)
end
end
end
end
print("possible ladder: ".. mts(l_pos))
if l_pos and #l_pos >= 1 then
local lpn = math.random(#l_pos)
local lpc = l_pos[lpn]
local ladder_length = lpc.y - 1 - ffpos1.y
local ladder_length = lpc.y - 1 - ffpos1.y
local fpos = vector.new(lpc)
fpos[ lpc.fp[1] ] = fpos[ lpc.fp[1] ] + lpc.fp[2]
@ -769,26 +776,26 @@ function witches.generate_cottage(pos1,pos2,params)
name= "default:ladder_wood",
param2 = dir1_wm
})
end
print("ladder: "..mtpts(lpc))
else
local loftpos1 = {x= sfpos1.x+2, y = sfpos1.y+1, z=sfpos1.z+1}
local loftpos2 = {x= sfpos2.x-2, y = sfpos1.y+1, z=sfpos2.z-1}
else
local loftpos1 = {x= sfpos1.x+2, y = sfpos1.y+1, z=sfpos1.z+1}
local loftpos2 = {x= sfpos2.x-2, y = sfpos1.y+1, z=sfpos2.z-1}
local loftarea = vector.subtract(loftpos2,loftpos1)
print(dump(loftpos1))
print(dump(loftpos2))
print(dump(loftarea))
for i=1, loftarea.z+1 do
for j=1, loftarea.x+1 do
for j=1, loftarea.x+1 do
local pos = {x= loftpos1.x-1 + j, y = loftpos1.y, z = loftpos1.z-1 + i}
print(mts(pos))
minetest.set_node(pos, {name = "air"})
end
end
end
@ -824,8 +831,8 @@ end
--- build the cottage in a defined area
local function place_cottage(cottage_id, pos1,pos2)
if not cottage_id then
if not cottage_id then
return
end
end
end
end

2
witches.lua
View File

@ -80,7 +80,7 @@ witches.witch_types = {
"flowers:mushroom_brown","flowers:mushroom_red"},
do_custom_addendum = function(self)
if witches.cottages then
if math.random() < 0.01 then
if math.random() < 0.1 then
local volume = witches.grounding(self)
if volume then