api/custom_functions_you_can_override.lua

@@ -24,6 +24,9 @@ yl_speak_up.replace_vars_in_text = function(text, dialog, pname)
 		PLAYER_NAME = pname,
 	}
 
+	if(not(text) or text == "") then
+		return ""
+	end
 	-- only try to replace variables if there are variables inside the text
 	if(string.find(text, "$VAR ")) then
 		local varlist = yl_speak_up.get_quest_variables(dialog.npc_owner, true)
@@ -32,7 +35,7 @@ yl_speak_up.replace_vars_in_text = function(text, dialog, pname)
 			-- only allow to replace unproblematic variable names
 			if(not(string.find(v_name, "[^%w^%s^_^%-^%.]"))) then
 				-- remove leading $ from   $ var_owner_name var_name
-				subs["VAR "..v_name] = yl_speak_up.get_quest_variable_value(dialog.npc_owner, v) or "- not set -"
+				subs["VAR "..v_name] = yl_speak_up.get_quest_variable_value(pname, v) or "- not set -"
 			end
 		end
 	end
@@ -511,6 +514,9 @@ yl_speak_up.custom_functions_r_[ "set_variable_to_random_number" ] = {
 		-- set the value of the variable
 		local n1 = tonumber(r.r_param2)
 		local n2 = tonumber(r.r_param3)
+		if(n1 == nil or n2 == nil) then
+			return false
+		end
 		if(n2 < n1) then
 			local tmp = n1
 			n1 = n2
@@ -530,6 +536,7 @@ yl_speak_up.custom_functions_r_[ "set_variable_to_random_number" ] = {
 	end
 }
 
+
 yl_speak_up.custom_functions_r_[ "set_variable_to_random_value_from_list" ] = {
 	description = "Set a variable to a random value from a list.",
 	param1_text = "Name of the variable:",
@@ -560,6 +567,136 @@ yl_speak_up.custom_functions_r_[ "set_variable_to_random_value_from_list" ] = {
 	end
 }
 
+
+yl_speak_up.custom_functions_r_[ "var0_eq_var1_op_var2" ] = {
+	description = "Set a <variable0> to the value of <variable1> <operator> <variable2>.",
+	param1_text = "Name of the variable0 to set:",
+	param1_desc = "Which variable do you want to set to the new value?",
+	param2_text = "Name of variable1:",
+	param2_desc = "Which variable holds the value of the first operand?",
+	param3_text = "Operand (+ - * / % ^ and or):",
+	param3_desc = "Choose operand: Add, subtract, multiply, divide, modulo, exponent, and, or.",
+	param4_text = "Name of variable2:",
+	param4_desc = "Which variable holds the value of the second operand?",
+	code = function(player, n_id, r)
+		if(not(r) or not(r.r_param1) or r.r_param1 == ""
+		  or not(r.r_param2) or r.r_param2 == ""
+		  or not(r.r_param3) or r.r_param3 == ""
+		  or not(r.r_param4) or r.r_param4 == "") then
+			return false
+		end
+		-- the owner is already encoded in the variable name
+		local pname = player:get_player_name()
+		local owner = yl_speak_up.npc_owner[ n_id ]
+		local prefix = "$ "..tostring(owner).." "
+		local v_1 = yl_speak_up.get_quest_variable_value(pname, prefix..r.r_param2)
+		local v_2 = yl_speak_up.get_quest_variable_value(pname, prefix..r.r_param4)
+		local new_value = nil
+		local op = r.r_param3
+		if(op == 'and') then
+			new_value = v_1 and v_2
+		elseif(op == 'or') then
+			new_value = v_1 or v_2
+		else
+			v_1 = tonumber(v_1)
+			v_2 = tonumber(v_2)
+			if(v_1 == nil or v_2 == nil) then
+				new_value = nil
+			elseif(op == '+') then
+				new_value = v_1 + v_2
+			elseif(op == '-') then
+				new_value = v_1 - v_2
+			elseif(op == '*') then
+				new_value = v_1 * v_2
+			elseif(op == '/') then
+				if(v_2 ~= 0) then
+					new_value = v_1 / v_2
+				else
+					new_value = nil
+				end
+			elseif(op == '%') then
+				if(v_2 ~= 0) then
+					new_value = v_1 % v_2
+				else
+					new_value = nil
+				end
+			elseif(op == '^') then
+				new_value = v_1 ^ v_2
+			end
+		end
+		if(new_value == nil) then
+			return false
+		end
+		local ret = yl_speak_up.set_quest_variable_value(pname, prefix..r.r_param1, new_value)
+
+		local o_id = yl_speak_up.speak_to[pname].o_id or "?"
+		yl_speak_up.debug_msg(player, n_id, o_id, tostring(r.r_id).." "..
+			"state: Success: "..tostring(ret).." for setting "..tostring(r.r_param1).." to "..
+			tostring(new_value)..".")
+		return ret
+	end
+}
+
+
+yl_speak_up.custom_functions_r_[ "play_sound" ] = {
+	description = "Plays a sound.",
+	param1_text = "Name of the sound(file):",
+	param1_desc = "How is the sound(file) called?\n"..
+			"It has to be provided by another mod.\n"..
+			"Example: default_dirt_footstep",
+	param2_text = "Gain:",
+	param2_desc = "Number between 1 and 10. Default: 10.",
+	param3_text = "Pitch:",
+	param3_desc = "Applies a pitch-shift to the sound.\n"..
+			"Each factor of 20 results in a pitch-shift of +12 semitones.\n"..
+			"Default is 10.",
+	param4_text = "Max hear distance:",
+	param4_desc = "Default: 32 m. Can be set to a value between 3 and 64.",
+	code = function(player, n_id, r)
+		if(not(r) or not(r.r_param1) or r.r_param1 == "") then
+			return false
+		end
+		if(not(player)) then
+			return false
+		end
+		local pname = player:get_player_name()
+
+		sound_param = {}
+		if(r.r_param2 and r.r_param2 ~= "") then
+			sound_param.gain = math.floor(tonumber(r.r_param2) or 0)
+			if(sound_param.gain < 1 or sound_param.gain > 10) then
+				sound_param.gain = 10
+			end
+			sound_param.gain = sound_param.gain / 10
+		end
+		if(r.r_param3 and r.r_param3 ~= "") then
+			sound_param.pitch = math.floor(tonumber(r.r_pitch) or 0)
+			if(sound_param.pitch < 1) then
+				sound_param.pitch = 10
+			end
+			sound_param.pitch = sound_param.pitch / 10
+		end
+		if(r.r_param4 and r.r_param4 ~= "") then
+			sound_param.max_hear_distance = math.min(tonumber(r.r_pitch) or 1, 32)
+			if(sound_param.max_hear_distance < 3) then
+				sound_param.max_hear_distance = 3
+			end
+			if(sound_param.max_hear_distance > 64) then
+				sound_param.max_hear_distance = 64
+			end
+		end
+		sound_param.loop = false
+		-- located at the NPC
+		sound_param.object = yl_speak_up.speak_to[pname].obj
+		if(not(sound_param.object)) then
+			return false
+		end
+		-- actually play the sound
+		core.sound_play(r.r_param1, sound_param, true)
+		return true
+	end
+}
+
 -----------------------------------------------------------------------------
 -- Custom handling of special properties
 -----------------------------------------------------------------------------

exec_apply_effects.lua

@@ -197,7 +197,7 @@ yl_speak_up.execute_all_relevant_effects = function(player, effects, o_id, actio
 			end
 			if(r and r.r_type and r.r_type == "deal_with_offered_item") then
 				refuse_items = true
-				if(not(r.r_value) or r.r_value == "do_nothing") then
+				if(not(r.r_value) or r.r_value == "do_nothing" or r.r_value == "take_as_wanted") then
 					refuse_items = false
 				end
 			end
@@ -456,7 +456,7 @@ yl_speak_up.execute_effect = function(player, n_id, o_id, r)
 		local amount = 0
 		if(r.r_value == "take_all") then
 			amount = stack_got:get_count()
-		elseif(r.r_value == "takeas_wanted") then
+		elseif(r.r_value == "take_as_wanted") then
 			amount = stack_wanted:get_count()
 			-- the NPC didn't get enough
 			if(amount > stack_got:get_count()) then
@@ -465,6 +465,16 @@ yl_speak_up.execute_effect = function(player, n_id, o_id, r)
 					"is smaller than what the NPC wanted: \""..
 					tostring(stack_wanted).."\".")
 				return false
+			elseif(amount < stack_got:get_count()) then
+				local rest = stack_got:get_count() - amount
+				local player_inv = player:get_inventory()
+				if(player_inv) then
+					local rest_stack = ItemStack(stack_got:to_table())
+					rest_stack:set_count(rest)
+					player_inv:add_item("main", rest_stack)
+					stack_got:set_count(amount)
+					inv:set_stack("npc_wants", 1, stack_got)
+				end
 			end
 		end
 		local take_stack = stack_got:get_name().." "..tostring(amount)

exec_eval_preconditions.lua

@@ -382,8 +382,11 @@ yl_speak_up.eval_precondition = function(player, n_id, p, other_options_true_or_
 		if(p.p_match_stack_size and p.p_match_stack_size ~= "") then
 			local c_got = stack_got:get_count()
 			local c_wanted = stack_wanted:get_count()
+
 			if(    p.p_match_stack_size == "exactly" and c_got ~= c_wanted) then
 				return false -- not exactly the same amount as the wanted one
+			elseif(p.p_match_stack_size == "at_least" and c_got < c_wanted) then
+				return false -- didn't get at least the wanted amount
 			elseif(p.p_match_stack_size == "less"    and c_got >= c_wanted) then
 				return false -- didn't get less than the given number
 			elseif(p.p_match_stack_size == "more"    and c_got <= c_wanted) then

fs/fs_do_trade_simple.lua

@@ -265,7 +265,8 @@ yl_speak_up.get_fs_do_trade_simple = function(player, trade_id)
 				"button[0.2,1.0;2.0,0.9;show_trade_list_dialog_options;Back to list]"..
 				"tooltip[show_trade_list_dialog_options;"..
 					"Click here to get back to the list of all trades\n"..
-					"associated with dialog options (like this one).]"
+					"associated with dialog options (like this one).\n"..
+					"This button is only shown if you can edit this NPC.]"
 			local dialog = yl_speak_up.speak_to[pname].dialog
 			local tr = dialog.trades[ trade_id ]
 			if( tr and tr.d_id and tr.o_id) then

fs/fs_initial_config.lua

@@ -151,6 +151,7 @@ yl_speak_up.input_fs_initial_config = function(player, formname, fields)
 			ent.yl_speak_up.npc_name = dialog.n_npc
 			ent.yl_speak_up.npc_description = dialog.n_description
 			ent.owner = yl_speak_up.npc_owner[ n_id ] or dialog.npc_owner
+			ent.yl_speak_up.real_owner = ent.owner
 			local i_text = dialog.n_npc .. "\n" .. 
 					dialog.n_description .. "\n" ..
 					yl_speak_up.infotext

fs/fs_talkdialog.lua

@@ -374,7 +374,8 @@ yl_speak_up.apply_autoanswer_and_random_and_d_got_item = function(player, pname,
 		-- show the new target dialog and exit
 		-- the recursion_depth will be increased by one (we did autoselect here and need to
 		-- avoid infinite loops)
-		return yl_speak_up.get_fs_talkdialog(player, n_id, target_dialog, res.alternate_text,
+		return yl_speak_up.get_fs_talkdialog(player,
+			yl_speak_up.speak_to[pname].n_id, target_dialog, res.alternate_text,
 			recursion_depth + 1)
 	end
 

quest_api.lua

@@ -26,13 +26,26 @@ yl_speak_up.player_vars = {}
 -- store when player_vars was last saved to disc
 yl_speak_up.player_vars_last_save_time = 0
 
+-- do not save this data every time it's changed - reduce disk writes
+yl_speak_up.quest_var_saving_pending = 0
+
 -- save the data to disc; either if force_save is set or enough time has passed
 yl_speak_up.save_quest_variables = function(force_save)
-	if(not(force_save)
-	  and (yl_speak_up.player_vars_last_save_time + yl_speak_up.player_vars_min_save_time >
-	       math.floor(minetest.get_us_time()/1000000))) then
+	if(not(force_save)) then
+		if(yl_speak_up.quest_var_saving_pending > minetest.get_us_time()) then
+			-- we are waiting a bit, hoping to catch more changes before next write
+			return
+		end
+		if(yl_speak_up.player_vars_min_save_time < 10) then
+			yl_speak_up.player_vars_min_save_time = 10
+		end
+		-- save in yl_speak_up.player_vars_min_save_time seconds
+		yl_speak_up.quest_var_saving_pending = minetest.get_us_time() +
+			yl_speak_up.player_vars_min_save_time * 1000000
+		core.after(yl_speak_up.player_vars_min_save_time, yl_speak_up.save_quest_variables, true)
 		return
 	end
+	yl_speak_up.quest_var_saving_pending = 0
 	local json = minetest.write_json( yl_speak_up.player_vars )
 	-- actually store it on disk
 	minetest.safe_file_write(yl_speak_up.worldpath..yl_speak_up.player_vars_save_file..".json", json)
@@ -185,6 +198,10 @@ yl_speak_up.set_quest_variable_value = function(player_name, variable_name, new_
 	if(new_value ~= nil) then
 		new_value = tostring(new_value)
 	end
+	-- no need to change anything if the value is unchanged
+	if(yl_speak_up.player_vars[ k ][ player_name ] == new_value) then
+		return true
+	end
 	yl_speak_up.player_vars[ k ][ player_name ] = new_value
 	-- a quest variable was changed - save that to disc (but no need to force it)
 	yl_speak_up.save_quest_variables(false)
@@ -198,6 +215,7 @@ yl_speak_up.get_quest_variable_value = function(player_name, variable_name)
 	-- the owner name is alrady encoded in the variable name
 	local k = tostring(variable_name)
 	if(not(variable_name) or not(player_name) or not(yl_speak_up.player_vars[ k ])) then
+		local k_long =  yl_speak_up.add_pname_to_var(k, player_name or "")
 		yl_speak_up.get_variable_metadata(k_long, "default_value", true)
 		return nil
 	end
@@ -363,28 +381,42 @@ yl_speak_up.set_variable_metadata = function(k, pname, meta_name, entry_name, ne
 	if(not(yl_speak_up.player_vars[ k ])) then
 		return false
 	end
+	local changed = nil
 	-- make sure all the necessary tables exist
 	if( not(yl_speak_up.player_vars[ k ][ "$META$" ])) then
 		yl_speak_up.player_vars[ k ][ "$META$" ] = { meta_name = {} }
+		changed = true
 	end
 
 	-- var_type (the type of the variable) is a single string
 	if(meta_name == "var_type") then
-		yl_speak_up.player_vars[ k ][ "$META$"][ meta_name ] = new_value
+		if(yl_speak_up.player_vars[ k ][ "$META$"][ meta_name ] ~= new_value) then
+			yl_speak_up.player_vars[ k ][ "$META$"][ meta_name ] = new_value
+			changed = true
+		end
 	elseif(meta_name == "default_value") then
 		-- reset default value to nil with empty string:
 		if(new_value == "") then
 			new_value = nil
 		end
-		yl_speak_up.player_vars[ k ][ "$META$"][ meta_name ] = new_value
+		if(yl_speak_up.player_vars[ k ][ "$META$"][ meta_name ] ~= new_value) then
+			yl_speak_up.player_vars[ k ][ "$META$"][ meta_name ] = new_value
+			changed = true
+		end
 	else
 		if( not(yl_speak_up.player_vars[ k ][ "$META$" ][ meta_name ])
 		or type(yl_speak_up.player_vars[ k ][ "$META$" ][ meta_name ]) ~= "table") then
 			yl_speak_up.player_vars[ k ][ "$META$" ][ meta_name ] = {}
+			changed = true
+		end
+		if(yl_speak_up.player_vars[ k ][ "$META$"][ meta_name ][ entry_name ] ~= new_value) then
+			yl_speak_up.player_vars[ k ][ "$META$"][ meta_name ][ entry_name ] = new_value
+			changed = true
 		end
-		yl_speak_up.player_vars[ k ][ "$META$"][ meta_name ][ entry_name ] = new_value
 	end
-	yl_speak_up.save_quest_variables(true)
+	if(changed) then
+		yl_speak_up.save_quest_variables(true)
+	end
 	return true
 end
 

show_fs.lua

@@ -74,6 +74,10 @@ yl_speak_up.show_fs = function(player, fs_name, param)
 		return
 	end
 
+	-- this formspec was renamed; make it usable again
+	if(fs_name == "trade_simple") then
+		fs_name = "do_trade_simple"
+	end
 	local fun = yl_speak_up.registered_forms_get_fs[fs_name]
 	if(fun) then
 		yl_speak_up.show_fs_ver(pname, "yl_speak_up:"..fs_name,