forked from your-land-mirror/yl_speak_up
		
	renamed get_fs_quest_edit_error function to build_fs_quest_edit_error as that is more appropriate
This commit is contained in:
		
							parent
							
								
									067744981b
								
							
						
					
					
						commit
						eb6cf0f031
					
				@ -35,7 +35,7 @@ end
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
-- show the error message created above
 | 
			
		||||
yl_speak_up.get_fs_quest_edit_error = function(error_msg, back_button_name)
 | 
			
		||||
yl_speak_up.build_fs_quest_edit_error = function(error_msg, back_button_name)
 | 
			
		||||
	return "size[10,3]"..
 | 
			
		||||
		"label[0.2,0.5;Error:]"..
 | 
			
		||||
		"label[0.5,1.0;"..minetest.colorize("#FFFF00",
 | 
			
		||||
@ -117,7 +117,7 @@ yl_speak_up.input_routing_show_a_quest_step = function(player, formname, fields,
 | 
			
		||||
	if(res.error_msg) then
 | 
			
		||||
		yl_speak_up.show_fs(player, "msg", {
 | 
			
		||||
			input_to = formname,
 | 
			
		||||
			formspec = yl_speak_up.get_fs_quest_edit_error(error_msg, back_field_name)
 | 
			
		||||
			formspec = yl_speak_up.build_fs_quest_edit_error(error_msg, back_field_name)
 | 
			
		||||
		})
 | 
			
		||||
		return true
 | 
			
		||||
	end
 | 
			
		||||
 | 
			
		||||
@ -13,7 +13,7 @@ end
 | 
			
		||||
local show_error_fs = function(player, text)
 | 
			
		||||
	yl_speak_up.show_fs(player, "msg", {
 | 
			
		||||
		input_to = "yl_speak_up:add_quest_steps",
 | 
			
		||||
		formspec = yl_speak_up.get_fs_quest_edit_error(text, "back_from_error_msg")})
 | 
			
		||||
		formspec = yl_speak_up.build_fs_quest_edit_error(text, "back_from_error_msg")})
 | 
			
		||||
end
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
@ -533,7 +533,7 @@ end
 | 
			
		||||
yl_speak_up.get_fs_add_quest_steps = function(player, param)
 | 
			
		||||
	local res = yl_speak_up.player_is_working_on_quest(player)
 | 
			
		||||
	if(res.error_msg) then
 | 
			
		||||
		return yl_speak_up.get_fs_quest_edit_error(res.error_msg, "back")
 | 
			
		||||
		return yl_speak_up.build_fs_quest_edit_error(res.error_msg, "back")
 | 
			
		||||
        end
 | 
			
		||||
	local pname = res.pname
 | 
			
		||||
	local step_data = res.step_data or {}
 | 
			
		||||
 | 
			
		||||
@ -5,7 +5,7 @@
 | 
			
		||||
local show_error_fs = function(player, text)
 | 
			
		||||
        yl_speak_up.show_fs(player, "msg", {
 | 
			
		||||
                input_to = "yl_speak_up:assign_quest_step",
 | 
			
		||||
                formspec = yl_speak_up.get_fs_quest_edit_error(text, "back_from_error_msg")})
 | 
			
		||||
                formspec = yl_speak_up.build_fs_quest_edit_error(text, "back_from_error_msg")})
 | 
			
		||||
end
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
@ -89,7 +89,7 @@ yl_speak_up.input_fs_assign_quest_step = function(player, formname, fields)
 | 
			
		||||
	elseif(fields and fields.store_show_until and fields.select_show_until) then
 | 
			
		||||
		local res = yl_speak_up.player_is_working_on_quest(player)
 | 
			
		||||
		if(res.error_msg) then
 | 
			
		||||
			return yl_speak_up.get_fs_quest_edit_error(res.error_msg, "back")
 | 
			
		||||
			return yl_speak_up.build_fs_quest_edit_error(res.error_msg, "back")
 | 
			
		||||
		end
 | 
			
		||||
		local choose_until_step = yl_speak_up.get_choose_until_step_list(
 | 
			
		||||
				res.pname, res.q_id, yl_speak_up.speak_to[pname].quest_step)
 | 
			
		||||
 | 
			
		||||
@ -16,7 +16,7 @@ yl_speak_up.input_fs_export = function(player, formname, fields)
 | 
			
		||||
		if(not(minetest.check_player_privs(player, {privs=true}))) then
 | 
			
		||||
			return yl_speak_up.show_fs(player, "msg", {
 | 
			
		||||
				input_to = "yl_speak_up:export",
 | 
			
		||||
				formspec = yl_speak_up.get_fs_quest_edit_error(
 | 
			
		||||
				formspec = yl_speak_up.build_fs_quest_edit_error(
 | 
			
		||||
					"You need the \"privs\" priv in order to import NPC data.",
 | 
			
		||||
					"back_from_error_msg")})
 | 
			
		||||
		end
 | 
			
		||||
@ -30,7 +30,7 @@ yl_speak_up.input_fs_export = function(player, formname, fields)
 | 
			
		||||
		if(not(new_dialog)) then
 | 
			
		||||
			return yl_speak_up.show_fs(player, "msg", {
 | 
			
		||||
				input_to = "yl_speak_up:export",
 | 
			
		||||
				formspec = yl_speak_up.get_fs_quest_edit_error(
 | 
			
		||||
				formspec = yl_speak_up.build_fs_quest_edit_error(
 | 
			
		||||
					"Failed to parse the .json data.",
 | 
			
		||||
					"back_from_error_msg")})
 | 
			
		||||
		end
 | 
			
		||||
 | 
			
		||||
@ -131,7 +131,7 @@ yl_speak_up.get_fs_manage_quest_steps = function(player, param)
 | 
			
		||||
 | 
			
		||||
	local res = yl_speak_up.player_is_working_on_quest(player)
 | 
			
		||||
	if(res.error_msg) then
 | 
			
		||||
		return yl_speak_up.get_fs_quest_edit_error(res.error_msg, "back")
 | 
			
		||||
		return yl_speak_up.build_fs_quest_edit_error(res.error_msg, "back")
 | 
			
		||||
	end
 | 
			
		||||
	local step_data = res.step_data
 | 
			
		||||
	local quest_step_list = yl_speak_up.get_sorted_quest_step_list(res.pname)
 | 
			
		||||
 | 
			
		||||
		Loading…
	
		Reference in New Issue
	
	Block a user