README.txt

@@ -12,9 +12,6 @@ If you want to install this mod only in one world create the folder
 worldmods/ in your worlddirectory.
 For further information or help see:
 http://wiki.minetest.com/wiki/Installing_Mods
-!!!Important!!!
-Unzip the sounds folder before you use the mod or you wont hear
-anything.
 
 Configuration:
 To add your own sounds copy them into the ambience/sounds/ folder and

init.lua

@@ -2,14 +2,13 @@ local night = {
 	handler = {},
 	frequency = 10,
 	{name="horned_owl", length=3},
-	{name="Wolves_Howling", length=11},
-	{name="ComboWind", length=17},
+	{name="Wolves_Howling", length=11}
 }
 
 local night_frequent = {
 	handler = {},
 	frequency = 25,
-	{name="Crickets_At_NightCombo", length=69},
+	{name="Crickets_At_NightCombo", length=69}
 }
 
 local day = {
@@ -17,8 +16,7 @@ local day = {
 	frequency = 5,
 	{name="Best Cardinal Bird", length=4},
 	{name="craw", length=3},
-	{name="bluejay", length=18},
-	{name="ComboWind", length=17},
+	{name="bluejay", length=18}
 }
 
 local day_frequent = {
@@ -26,13 +24,13 @@ local day_frequent = {
 	frequency = 25,
 	{name="robin2", length=16},
 	{name="birdsongnl", length=12.5},
-	{name="bird", length=30},
+	{name="bird", length=30}
 }
 
 local cave = {
 	handler = {},
 	frequency = 5,
-	{name="Bats_in_Cave", length=5},
+	{name="Bats_in_Cave", length=5}
 }
 
 local cave_frequent = {
@@ -42,14 +40,14 @@ local cave_frequent = {
 	{name="drippingwater_drip_b", length=2},
 	{name="drippingwater_drip_c", length=2},
 	{name="Single_Water_Droplet", length=3},
-	{name="Spooky_Water_Drops", length=7},
+	{name="Spooky_Water_Drops", length=7}
 }
 
 local water = {
 	handler = {},
 	frequency = 0,--dolphins dont fit into small lakes
 	{name="dolphins", length=6},
-	{name="dolphins_screaming", length=16.5},
+	{name="dolphins_screaming", length=16.5}
 }
 	
 local water_frequent = {
@@ -60,13 +58,7 @@ local water_frequent = {
 	{name="scuba1calm", length=10},
 	{name="scuba1calm2", length=8.5},
 	{name="scuba1interestingbubbles", length=11},
-	{name="scuba1tubulentbubbles", length=10.5},
-}
-
-local splash = {
-	handler = {},
-	frequency = 100,
-	{name="Splash", length=1.5},
+	{name="scuba1tubulentbubbles", length=10.5}
 }
 
 local play_music = minetest.setting_getbool("music") or false
@@ -77,9 +69,7 @@ local music = {
 	{name="music_1", length=1*60+52, gain=0.3},
 	{name="ambiance", length=19, gain=0.3},
 	{name="dark_ambiance", length=46, gain=0.3},
-	{name="eastern_feeling", length=3*60+51, gain=0.3},
-	{name="echos", length=2*60+26, gain=0.3},
-	{name="FoamOfTheSea", length=1*60+50, gain=0.3},
+	{name="eastern_feeling", lenght=3*60+51}
 }
 
 local is_daytime = function()
@@ -87,56 +77,36 @@ local is_daytime = function()
 end
 
 local get_ambience = function(player)
-	local table = {}
-	
-	local play_water = false
-	local play_splash = false
-	local play_day = false
-	local play_cave = false
-	local play_night = false
-	
 	local pos = player:getpos()
 	pos.y = pos.y+1.5
 	local nodename = minetest.env:get_node(pos).name
 	if string.find(nodename, "default:water") then
-		play_water = true
-	elseif nodename == "air" then
-		pos.y = pos.y-1.5
-		local nodename = minetest.env:get_node(pos).name
-		if string.find(nodename, "default:water") then
-			play_splash = true
+		if music then
+			return {water=water, water_frequent=water_frequent, music=music}
+		else
+			return {water=water, water_frequent=water_frequent}
 		end
 	end
 	if player:getpos().y < 0 then
-		play_cave = true
-	elseif is_daytime() then
-		play_day = true
+		if music then
+			return {cave=cave, cave_frequent=cave_frequent, music=music}
+		else
+			return {cave=cave, cave_frequent=cave_frequent}
+		end
+	end
+	if is_daytime() then
+		if music then
+			return {day=day, day_frequent=day_frequent, music=music}
+		else
+			return {day=day, day_frequent=day_frequent}
+		end
 	else
-		play_night = true
+		if music then
+			return {night=night, night_frequent=night_frequent, music=music}
+		else
+			return {night=night, night_frequent=night_frequent}
+		end
 	end
-	
-	if play_music then
-		table.music = music
-	end
-	if play_water then
-		table.water = water
-		table.water_frequent = water_frequent
-		return table
-	end
-	if play_splash then
-		table.splash = splash
-	end
-	if play_day then
-		table.day = day
-		table.day_frequent = day_frequent
-	elseif play_night then
-		table.night = night
-		table.night_frequent = night_frequent
-	elseif play_cave then
-		table.cave = cave
-		table.cave_frequent = cave_frequent
-	end
-	return table
 end
 
 -- start playing the sound, set the handler and delete the handler after sound is played
@@ -255,16 +225,6 @@ local stop_sound = function(still_playing, player)
 			list.handler[player_name] = nil
 		end
 	end
-	if still_playing.splash == nil then
-		local list = splash
-		if list.handler[player_name] ~= nil then
-			if list.on_stop ~= nil then
-				minetest.sound_play(list.on_stop, {to_player=player:get_player_name()})
-			end
-			minetest.sound_stop(list.handler[player_name])
-			list.handler[player_name] = nil
-		end
-	end
 end
 
 local timer = 0

sounds/SoundLicenses.txt

@@ -1,62 +0,0 @@
---------------Music Lic:
-- Jordach:
---mtest
---dark_ambiance
---eastern_feeling
-These sounds are used for the Mod for Minetest; Ambiance.
-The included sounds are http://creativecommons.org/licenses/by-nc-sa/3.0/ 
-
- 313hummer (Jordan Craige)  
---FoamOfTheSea http://soundcloud.com/jordan-craige/foam-of-the-sea
---echos  http://soundcloud.com/jordan-craige/echos-1
-Creative Commons Attribution license (reuse allowed)  Attribution 3.0 Unported (CC BY 3.0)
-
------------Sound Lic:
---Nightime Sound, Recorded by Mike Koenig, License: Attribution 3.0 http://soundbible.com/951-Nightime.html
---Crickets At Night Sound, License: Attribution 3.0 | Recorded by Mike Koenig |http://soundbible.com/365-Crickets-At-Night.html
-
---Medium Pack Of Wolves Howling, License: Public Domain | Recorded by fws.gov, http://soundbible.com/277-Medium-Pack-Of-Wolves-Howling.html
-
---Horned Owl Sound, License: Attribution 3.0 | Recorded by Mike Koenig , http://soundbible.com/1851-Horned-Owl.html
---Bats In Cave Sound, License: Attr-Noncommercial 3.0 | Recorded by Mike Koenig , http://soundbible.com/1939-Bats-In-Cave.html
-
---Spooky Water Drops Sound, License: Attribution 3.0 | Recorded by Mike Koenig, http://soundbible.com/380-Spooky-Water-Drops.html
-
-
--- Single Water Droplet Sound, License: Attribution 3.0 | Recorded by Mike Koenig, http://soundbible.com/384-Single-Water-Droplet.html
-
---HollowWind, Black Boe, Creative Commons 0 License, http://www.freesound.org/people/Black%20Boe/sounds/22331/
-
---drippingwater*.ogg sounds: CC0, Dripping Water Mod, by kddekadenz, http://minetest.net/forum/viewtopic.php?id=1688
-
---best cardinal bird: License: Attribution 3.0 | Recorded by PsychoBird,  http://soundbible.com/1515-Best-Cardinal-Bird.html
-
---birdsongnl: the Attribution License, HerbertBoland, http://www.freesound.org/people/HerbertBoland/sounds/28312/  (end)
-
---robin2:  Attribution License, reinsamba, http://www.freesound.org/people/reinsamba/sounds/32479/  (end)
-
---Craw.WAV, Attribution License, inchadney, http://www.freesound.org/people/inchadney/sounds/52450/
-
---bluejay.wav,  Creative Commons 0 License,  UncleSigmund, http://www.freesound.org/people/UncleSigmund/sounds/42382/
-
---scuba1*.ogg- digifishmusic, Attribution License, http://www.freesound.org/people/digifishmusic/sounds/45521/
-
---Underwater Pool - Attribution 3.0 | Recorded by Mike Koenig, http://soundbible.com/1660-Underwater-Pool.html
-
---dolphin_screaming - Creative Commons 0 License, felix.blume, http://www.freesound.org/people/felix.blume/sounds/161691/
-
---dolphins - Attribution Noncommercial License,  acclivity, http://www.freesound.org/people/acclivity/sounds/13691/
-
-ComboWind uses:
---wind-in-the-trees -Attribution License, laurent, http://www.freesound.org/people/laurent/sounds/16995/
---drygrassInWind- Creative Commons 0 License, felix.blume, http://www.freesound.org/people/felix.blume/sounds/146436/
-
---Splash: Attribution 3.0 | Recorded by BlastwaveFx.com, http://soundbible.com/546-Fish-Splashing.html
-
-----------------Not used yet:
---natural night sounds in Boquete.wav,  Attribution License, laurent, http://www.freesound.org/people/laurent/sounds/15851/
-http://www.freesound.org/people/Dynamicell/sounds/17553/
-http://www.freesound.org/people/juskiddink/sounds/78955/ aspen tree in wind
-http://www.freesound.org/people/Benboncan/sounds/69761/ wind in hedge birds animals
-
-