From 6158a5d4dcddb91b9304c7d27325cd587b4047cd Mon Sep 17 00:00:00 2001
From: FaceDeer <derksenmobile@gmail.com>
Date: Sat, 13 Aug 2022 22:57:58 -0600
Subject: [PATCH] make tower cap caves less chirpy, fix bigger goblin hut
 schematic, allow glowing spindlestem extract bottles

---
 df_ambience/soundsets.lua                     |  6 +++---
 df_trees/schematics/goblin_cap_bigger_hut.lua |  8 --------
 df_trees/spindlestem.lua                      | 12 ++++++------
 3 files changed, 9 insertions(+), 17 deletions(-)

diff --git a/df_ambience/soundsets.lua b/df_ambience/soundsets.lua
index 086fd19..6dd3895 100644
--- a/df_ambience/soundsets.lua
+++ b/df_ambience/soundsets.lua
@@ -1,13 +1,13 @@
 if minetest.get_modpath("chasms") then
 df_ambience.add_set({
-	frequency = 0.05,
+	frequency = 0.03,
 	sounds = {
 		{name = "dfcaverns_long_bird_song_slow", gain = 0.5},
 		{name = "dfcaverns_crow_slow", gain = 0.5},
 		{name = "dfcaverns_bird_noise", gain = 0.5},
 	},
 	sound_check = function(def)
-		if chasms.is_in_chasm_without_taper(def.pos) then return true end
+		if chasms.is_in_chasm(def.pos) then return true end
 	end,
 })
 end
@@ -26,7 +26,7 @@ df_ambience.add_set({
 })
 
 df_ambience.add_set({
-	frequency = 0.075,
+	frequency = 0.025,
 	nodes = {"df_mapitems:dirt_with_cave_moss", "df_trees:tower_cap_stem", "df_trees:tower_cap_gills", "df_trees:tower_cap"},
 	sounds = {
 		{name = "dfcaverns_exotic_creature_song", gain = 0.5},
diff --git a/df_trees/schematics/goblin_cap_bigger_hut.lua b/df_trees/schematics/goblin_cap_bigger_hut.lua
index c7e5b22..43bfe8b 100644
--- a/df_trees/schematics/goblin_cap_bigger_hut.lua
+++ b/df_trees/schematics/goblin_cap_bigger_hut.lua
@@ -27,14 +27,6 @@ if df_dependencies.node_name_shelf then
 	n15 = { name = df_dependencies.node_name_shelf, param2 = 3, force_place = true }
 end
 
-if not minetest.get_modpath("stairs") then
-	-- replace stairs with air
-	n12 = nil
-	n20 = nil
-	n21 = nil
-	n22 = nil
-end
-
 local schematic = {
 	yslice_prob = {},
 	size = {y = 10, x = 13, z = 13},
diff --git a/df_trees/spindlestem.lua b/df_trees/spindlestem.lua
index 1f02d38..bc9194c 100644
--- a/df_trees/spindlestem.lua
+++ b/df_trees/spindlestem.lua
@@ -1,6 +1,6 @@
 local S = minetest.get_translator(minetest.get_current_modname())
 
-local vessels = minetest.get_modpath("vessels")
+local glass_bottle = df_dependencies.node_name_glass_bottle
 
 -- pre-declare
 local get_spindlestem_cap_type
@@ -205,7 +205,7 @@ local register_spindlestem_type = function(item_suffix, colour_name, colour_code
 		burntime = 10,
 	})
 	
-	if vessels and light_level > 0 then
+	if glass_bottle and light_level > 0 then
 		local tex = "dfcaverns_vessels_glowing_liquid.png^[multiply:#"..colour_code.."^"..df_dependencies.texture_glass_bottle
 		local new_light = light_level + math.floor((minetest.LIGHT_MAX-light_level)/2)
 		
@@ -240,15 +240,15 @@ local register_spindlestem_type = function(item_suffix, colour_name, colour_code
 			output = "df_trees:glowing_bottle_"..item_suffix.." 3",
 			type = "shapeless",
 			recipe = {
-				"vessels:glass_bottle",
-				"vessels:glass_bottle",
-				"vessels:glass_bottle",
+				glass_bottle,
+				glass_bottle,
+				glass_bottle,
 				cap_item_harvested,
 			}
 		})
 
 		minetest.register_craft( {
-			output = "vessels:glass_bottle",
+			output = glass_bottle,
 			type = "shapeless",
 			recipe = {
 				"df_trees:glowing_bottle_"..item_suffix,