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

Restored cottages spawning over dungeons!

master
francisco athens 2022-02-22 21:20:37 -08:00
parent ab655b356b
commit 1a84bae329
6 changed files with 190 additions and 99 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
changelog
View File

@ -1,3 +1,4 @@
2022/02/02: Restored Cottages spawning over dungeons (!) and some related settings.
2022/02/19: Require only default and mobs now, additional checks, cottage generation now optional from game Settings tab > All Settings > Mods > witches
2022/02/14: Dialog updates
2022/02/13: Debug output can be enabled from game Settings tab > All Settings > Mods > witches

174
cottages.lua
View File

@ -1,7 +1,7 @@
--this file is copyright (c) 2020 Francisco Athens licensed under the terms of the MIT license
local witches_dungeon_cellar_chance = tonumber(minetest.settings:get("witches_dungeon_cellar_chance")) or .50
local witches_dungeon_cellar_depth = tonumber(minetest.settings:get("witches_dungeon_cellar_depth")) or -5
local witches_dungeon_cellar_chance = math.abs(tonumber(minetest.settings:get("witches_dungeon_cellar_chance"))) or 2
local witches_dungeon_cellar_depth = math.abs(tonumber(minetest.settings:get("witches_dungeon_cellar_depth"))) or 5
local function mts(table)
local output = minetest.serialize(table)
@ -15,48 +15,94 @@ end
--lets see if any dungeons are near
minetest.set_gen_notify("dungeon")
local dungeon_cellar = {
chance = tonumber(witches_dungeon_cellar_chance), -- chance to try putting cottage over dungeon instead of anywhere else
max_depth = tonumber(witches_dungeon_cellar_depth) -- deepest dungeon depth to check
}
local dungeon_list ={}
--when we are notified check if dungeon is near surface
local dungeons = {}
local d_ladder_pos = {}
minetest.register_on_generated(function(minp, maxp, blockseed)
local dg = minetest.get_mapgen_object("gennotify")
if dg and dg.dungeon and #dg.dungeon > 2 then
for i=1,#dg.dungeon do
if dg.dungeon[i].y >= dungeon_cellar.max_depth then
witches.debug("dungeon found: "..minetest.pos_to_string(dg.dungeon[i]))
if dg and dg.dungeon and #dg.dungeon > 1 then
local cur_dg = vector.new(dg.dungeon[#dg.dungeon])
witches.debug("dungeon registered of size "..#dg.dungeon.." at " ..vector.to_string(cur_dg))
--check depth
local mdd = witches_dungeon_cellar_depth or 5 --max dungeon depth
local pos_ck = vector.new(vector.add(cur_dg,vector.new(0,mdd,0))) --how close does the dungeon need to be?
local pos_alt = vector.new(vector.add(pos_ck,vector.new(0,mdd+20,0))) --ensure we are measuring above ground
local air_check = minetest.find_nodes_in_area(pos_ck, pos_alt, "air")
if air_check then
--print(#air_check.." nodes of air found!")
end
if #dungeons < 1 then
witches.debug("no last dungeon to compare!!")
table.insert(dungeons,vector.new(cur_dg))
--print(#dungeons)
end
witches.debug("current: "..vector.to_string(cur_dg))
witches.debug("last: "..vector.to_string(dungeons[#dungeons]))
local distance = vector.distance(cur_dg, dungeons[#dungeons])
if distance > 50 and air_check and #air_check >= 20 then
--print("Distance: "..math.round(distance).." new surface dungeon (" ..#dungeons..") found at" ..(vector.to_string(cur_dg)))
local surface = vector.new(vector.add(pos_ck,vector.new(0,20+mdd-#air_check,0))) --dropping the cottage on the surface
witches.debug("new surface dungeons found: " ..#dungeons)
table.insert(dungeon_list, dg.dungeon[i])
end
end
end
d_ladder_pos = cur_dg
if math.random(1,witches_dungeon_cellar_chance) == 1 then
witches.place_cottage(surface)
end
table.insert(dungeons,vector.new(cur_dg))
end
end
end)
local dungeon_cellar = {
chance = tonumber(witches_dungeon_cellar_chance), -- chance to try putting cottage over dungeon instead of anywhere else
max_depth = tonumber(witches_dungeon_cellar_depth) -- deepest dungeon depth to check
}
--local vol_vec = {x=5,y=5,z=5}
function witches.grounding(self,vol_vec,required_list,exception_list,replacement_node)
--@for use by notify events
function witches.place_cottage(pos)
--pos,vol_vec,required_list,exception_list
local volume = witches.grounding(pos,nil,nil,{"default:lava_source"})
if volume then
volume[1].y = volume[1].y + 1
volume[2].y = volume[2].y + 1
witches.debug("witches.place_cottage - volume passed: "..dump(volume))
return witches.generate_cottage(volume[1],volume[2])
end
end
--@more checks for placement, especially by witches
function witches.grounding(pos,vol_vec,required_list,exception_list,replacement_node)
local r_tweak = math.random(-1,1)
local area = vol_vec or {x=math.random(5+r_tweak,9),y=1,z=math.random(5-r_tweak,9)}
local pos = vector.round(self.object:get_pos())
--drop checks below sea level
if pos.y < 0 then return end
pos = vector.round(pos)
--drop checks below sea level, undecided if this is necessary...
--if pos.y < 0 then return end
--local yaw = self.object:get_yaw()
--print(mts(self.object:get_yaw()))
if not pos then
print("error: grounding failed pos checks")
return end
local pos1 = {x= pos.x-(area.x/2),y=pos.y-area.y ,z= pos.z-(area.z/2)}
local pos2 = {x= pos.x+(area.x/2),y=pos.y, z= pos.z+(area.z/2)}
local ck_pos1 = vector.subtract(pos1,4)
local ck_pos2 = vector.add(pos2,4)
--ck_pos2.y = ck_pos2.y + 12
--print("pos = ".. mtpts(pos))
--print("pos1 = ".. mtpts(pos1))
--print("pos2 = ".. mtpts(pos2))
@ -74,7 +120,7 @@ function witches.grounding(self,vol_vec,required_list,exception_list,replacement
witches.debug("protected area found at "..mtpts(protected_area))
return
else
witches.debug("SUCCESS!".."pos1 = ".. mtpts(pos1).."pos2 = ".. mtpts(pos2))
witches.debug("witches.grounding - SUCCESS!".."pos1 = ".. mtpts(pos1).."pos2 = ".. mtpts(pos2))
local volume = {pos1,pos2}
local ck_volume = {ck_pos1,ck_pos2}
@ -86,45 +132,51 @@ function witches.grounding(self,vol_vec,required_list,exception_list,replacement
end
local cottage_id = nil
--@cottage layout and materials template
local default_params = {
--plan_size = {x=9, y=7 ,z=9}, --general size not including roof
foundation_nodes = {"default:mossycobble"},
foundation_depth = 3,
foundation_nodes = {"default:mossycobble"},
foundation_depth = 3,
porch_nodes = {"default:tree","default:pine_tree","default:acacia_tree"},
porch_size = 2,
porch_size = 2,
first_floor_nodes = {"default:cobble","default:wood","default:pine_wood","default:acacia_wood","default:junglewood"},
second_floor_nodes = {"default:wood","default:pine_wood","default:acacia_wood","default:junglewood"},
gable_nodes = {"default:wood","default:junglewood"},
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_height = 3,
window_nodes = {"default:fence_wood","default:fence_pine_wood","default:fence_acacia_wood","default:fence_junglewood"},
window_height = {1,2}, --height min, height max
orient_materials = true,
door_bottom = "doors:door_wood_witch_a";
door_top = "doors:hidden";
root_nodes = {"witches:treeroots"};
builder = "none"
wall_nodes_ftype = {"wall_wdir"}, --wall_dir, wall_fdir, wall_wdir
wall_height = 3,
wall_height_add = 2, --randomly added height variation
window_nodes = {"default:fence_wood","default:fence_pine_wood","default:fence_acacia_wood","default:fence_junglewood"},
window_height = {1,2}, --height min, height max
orient_materials = true,
door_bottom = "doors:door_wood_witch_a",
door_top = "doors:hidden",
root_nodes = {"witches:jungleroots"},
tree_types = {witches.acacia_tree,witches.acacia_tree2},
owner = "none"
}
function witches.generate_cottage(secret_name,pos1,pos2,params)
function witches.generate_cottage(pos1,pos2,params,secret_name)
local working_parameters = params or default_params -- if there is nothing then initialize with defs
pos1 = vector.round(pos1)
pos2 = vector.round(pos2)
local wp = working_parameters
if params then --get defaults for any missing params
for k,v in default_params do
--print("default params: "..minetest.serialize(default_params))
for k,v in pairs(default_params) do
if not params[k] then
wp[k] = table.copy(default_params[k])
end
end
else wp = table.copy(default_params)
end
end
--print(minetest.serialize(wp))
local ps = wp.porch_size or math.random(2)
local wall_node = wp.wall_nodes[math.random(#wp.wall_nodes)]
local root_node = wp.root_nodes [math.random(#wp.root_nodes)]
@ -219,8 +271,6 @@ function witches.generate_cottage(secret_name,pos1,pos2,params)
end
end
local function mr(min,max)
local v = math.random(min,max)
return v
@ -233,13 +283,17 @@ function witches.generate_cottage(secret_name,pos1,pos2,params)
{x= pcn[3].x+ps+mr(-1,1), y = pos2.y-1, z = pcn[3].z+ps+mr(-1,1)},
{x= pcn[4].x+ps+mr(-1,1), y = pos2.y-1, z = pcn[4].z-ps+mr(-1,1)},
}
if wp.tree_types and #wp.tree_types >= 1 then
---this check fails without "minetest" game, why!?
local tree_pos = treecn[math.random(#treecn)]
local root_pos = vector.new(tree_pos)
root_pos.y = root_pos.y-1
minetest.spawn_tree(tree_pos,witches.acacia_tree)
minetest.set_node(root_pos,{name =root_node})
local tree_var = wp.tree_types[math.random(#wp.tree_types)]
--print("spawning "..tree_var )
root_pos.y = root_pos.y-1
minetest.spawn_tree(tree_pos,tree_var)
minetest.set_node(root_pos,{name =root_node})
end
--first floor!
local ffnodes = wp.first_floor_nodes[math.random(#wp.first_floor_nodes)]
@ -259,7 +313,7 @@ function witches.generate_cottage(secret_name,pos1,pos2,params)
end
end
wp.wall_height = wp.wall_height + math.random(0,wp.wall_height_add)
--local wall_node = wp.wall_nodes[math.random(#wp.wall_nodes)]
if math.random() < 0.9 then
--wall corners wood
@ -336,8 +390,6 @@ function witches.generate_cottage(secret_name,pos1,pos2,params)
})
end
for h=1, wp.wall_height do
for i=1, #wall_plan do
minetest.set_node(wall_plan[i].pos,{
@ -602,9 +654,13 @@ function witches.generate_cottage(secret_name,pos1,pos2,params)
local meta = minetest.get_meta(f_pos1);
local inv = meta:get_inventory();
meta:set_string("secret_type", "witches_chest")
meta:set_string("secret_name", secret_name)
meta:set_string("owner",secret_name)
meta:set_string("infotext", "Sealed chest of "..secret_name)
if secret_name then
meta:set_string("secret_name", secret_name)
meta:set_string("owner",secret_name)
meta:set_string("infotext", "Sealed chest of "..secret_name)
end
if minetest.get_modpath("fireflies") then
inv:add_item( "main", {name = "fireflies:bug_net"})
end
@ -892,7 +948,13 @@ local stovepipe_pos = {}
local lpn = math.random(#l_pos)
local lpc = l_pos[lpn]
local ladder_length = lpc.y - 1 - ffpos1.y
local ladder_length = nil
if d_ladder_pos and d_ladder_pos.y then
ladder_length = lpc.y - 1 - d_ladder_pos.y
else
ladder_length = lpc.y - 1 - ffpos1.y
end
local fpos = vector.new(lpc)
fpos[ lpc.fp[1] ] = fpos[ lpc.fp[1] ] + lpc.fp[2]
@ -969,14 +1031,16 @@ local stovepipe_pos = {}
local cottage_area = {c_area1,c_area2}
local cottage_va = VoxelArea:new{MinEdge = c_area1, MaxEdge = c_area2}
--print(mts(VoxelArea))
return cottage_area
return l_pos
end
--- build the cottage in a defined area
--[[ build the cottage in a defined area
local function place_cottage(cottage_id, pos1,pos2)
if not cottage_id then
return
end
end
end
]]--

4
init.lua
View File

@ -5,7 +5,7 @@
local path = minetest.get_modpath("witches")
witches = {}
witches.version = "20220219"
witches.version = "20220222"
print("This is Witches "..witches.version.."!")
-- Strips any kind of escape codes (translation, colors) from a string
@ -109,7 +109,7 @@ end
dofile(path .. "/witches.lua")
print("Generating witches! version: "..witches.version)
witches.debug("Generating witches! version: "..witches.version)

65
nodes.lua
View File

@ -79,6 +79,39 @@ witches.acacia_tree={
fruit="default:apple"
}
witches.acacia_tree2={
axiom="FFFFFFccccA",
rules_a = "[B]//[B]//[B]//[B]",
rules_b = "&TTTT&TT^^G&&----GGGGGG++GGG++" -- line up with the "canvas" edge
.."fffffRfGG++G++" -- first layer, drawn in a zig-zag raster pattern
.."Gffffffff--G--"
.."ffffRfffG++G++"
.."fffffffff--G--"
.."fffffffff++G++"
.."ffRffffff--G--"
.."ffffffffG++G++"
.."GffffRfff--G--"
.."fffffffGG"
.."^^G&&----GGGGGGG++GGGGGG++" -- re-align to second layer canvas edge
.."ffffGGG++G++" -- second layer
.."GGfffff--G--"
.."ffRfffG++G++"
.."fffffff--G--"
.."ffffRfG++G++"
.."GGfffff--G--"
.."ffRfGGG",
rules_c = "/",
trunk="default:tree",
leaves="default:leaves",
angle=45,
iterations=5,
random_level=4,
trunk_type="single",
thin_branches=true,
fruit_chance=2,
fruit="default:apple"
}
witches.apple_tree={
axiom="FFFFFAFFBF",
rules_a="[&&&FFFFF&&FFFF][&&&++++FFFFF&&FFFF][&&&----FFFFF&&FFFF]",
@ -86,8 +119,8 @@ witches.apple_tree={
trunk="default:tree",
leaves="default:leaves",
angle=30,
iterations=2,
random_level=0,
iterations=3,
random_level=1,
trunk_type="single",
thin_branches=true,
fruit_chance=10,
@ -162,31 +195,3 @@ minetest.register_node("witches:treeroots", {
--sounds = default.node_sound_water_defaults(),
})
minetest.register_node("witches:treeroots_growing", {
description = S("Tree Roots"),
drawtype = "flowingliquid",
tiles = {{backface_culling = false, name= "default_tree.png"}},
special_tiles = {{backface_culling = false, name= "default_tree.png"},{backface_culling = false, name= "default_tree.png"}},
--alpha = 220,
paramtype = "light",
paramtype2 = "flowingliquid",
walkable = true,
pointable = false,
diggable = true,
buildable_to = true,
is_ground_content = false,
drop = "",
drowning = 0,
liquidtype = "flowing",
liquid_alternative_flowing = "witches:treeroots_growing",
liquid_alternative_source = "witches:treeroots",
liquid_viscosity = 9,
liquid_renewable = false,
liquid_range = 1,
post_effect_color = {a = 200, r = 5, g = 5, b = 0},
groups = { liquid = 3, not_in_creative_inventory = 1,
cools_lava = 1,tree = 1, choppy = 2, oddly_breakable_by_hand = 1, flammable = 2},
--sounds = default.node_sound_water_defaults(),
})

13
settingtypes.txt
View File

@ -5,18 +5,17 @@ witches_debug (enable debug) bool false
#enable cottages
witches_cottages (enable cottages) bool true
#maximum number of houses per mapchunk
#maximum number of houses per mapchunk (unused for now)
witches_house_max_per_mapchunk (maximum number of houses per mapchunk) int 2
#average number of houses to mapchunks over the world
#average number of houses to mapchunks over the world (unused for now)
witches_houses_wanted_per_mapchunk (average number of houses to mapchunks over the world) float .05
# chance (1 or more) of a witch house spawning over a dungeon
witches_dungeon_cellar_chance (chance as 1 in <positive integer> of a witch house spawning over a dungeon) int 2
# chance (1-99) of a witch house spawning over a dungeon instead of anywhere else
witches_dungeon_cellar_chance (chance as decimal like .5 of a witch house spawning over a dungeon instead of anywhere else) float .5
# depth (1-20) maximum depth of a dungeon to spawn a witch house over
witches_dungeon_cellar_depth (maximum depth 0 to -20 of a dungeon to spawn a witch house over) int -5
# depth (5 or more) maximum depth of a dungeon to spawn a witch house over
witches_dungeon_cellar_depth (maximum depth of a dungeon to spawn a witch house over) int 5

32
witches.lua
View File

@ -10,7 +10,7 @@ local spawning = {
min_light = 5,
max_light = 15,
interval = 30,
chance = 10,
chance = 1000,
active_object_count = 2,
min_height = 0,
max_height = 200,
@ -21,13 +21,14 @@ local spawning = {
end,
},
generic = {
nodes = {"group:wood","default:mossycobble","default:cobble"},
neighbors = {"air","default:chest"},
min_light = 5,
max_light = 15,
interval = 300,
chance = 10,
chance = 100,
active_object_count = 1,
min_height = 0,
max_height = 200,
@ -78,6 +79,25 @@ witches.witch_types = {
cottage = {
description = "Eremitant",
lore = "The Eremitant have found homes for themselves, who would bother them?",
additional_properties = {
special_follow = {"default:diamond", "default:gold_lump", "default:apple",
"default:blueberries", "default:torch", "default:stick",
"flowers:mushroom_brown","flowers:mushroom_red"},
do_custom_addendum = function(self)
if witches.cottages then
witches.claim_witches_chest(self)
end
end,
on_spawn_addendum = function(self)
witches.claim_witches_chest(self)
end
},
spawning = spawning.cottage,
},
cottage_builder = {
description = "Eremitant Artifician",
lore = "The Eremitant have found homes for themselves, who would bother them?",
additional_properties = {
special_follow = {"default:diamond", "default:gold_lump", "default:apple",
"default:blueberries", "default:torch", "default:stick",
@ -86,7 +106,7 @@ witches.witch_types = {
if witches.cottages then
if not self.built_house and math.random() < 0.01 then
local volume = witches.grounding(self)
local volume = witches.grounding(self.object:get_pos())
if volume then
witches.debug("volume passed: "..dump(volume))
@ -94,8 +114,9 @@ witches.witch_types = {
pos.y = pos.y+3
self.object:set_pos(pos)
self.built_house = pos
witches.generate_cottage(self.secret_name,volume[1],volume[2])
print("witch placing:"..minetest.serialize(volume[1]).."/n"..minetest.serialize(volume[2]))
witches.generate_cottage(volume[1],volume[2],nil,self.secret_name)
end
end
end
@ -108,6 +129,7 @@ witches.witch_types = {
}
}
witches.witch_template = { --your average witch,
description = "Basic Witch",
lore = "This witch has a story yet to be...",