renamed some get_fs_ functions to better fitting get_sub_fs_ functions

This commit is contained in:
Sokomine 2023-12-18 05:31:48 +01:00
parent 8396464fcf
commit 3847dda6ee
3 changed files with 15 additions and 15 deletions

View File

@ -267,7 +267,7 @@ end
-- small helper function for the function below
yl_speak_up.get_fs_colorize_table = function(formspec, table_specs, liste, color)
yl_speak_up.get_sub_fs_colorize_table = function(formspec, table_specs, liste, color)
table.insert(formspec, "tablecolumns[color;text]table[")
table.insert(formspec, table_specs)
local tmp = {}
@ -280,7 +280,7 @@ yl_speak_up.get_fs_colorize_table = function(formspec, table_specs, liste, color
end
yl_speak_up.get_fs_show_list_in_box = function(formspec,
yl_speak_up.get_sub_fs_show_list_in_box = function(formspec,
label, field_name, liste, start_x, start_y, width, height, label_ident,
box_color, column_color,
tooltip_text, add_lines)
@ -303,7 +303,7 @@ yl_speak_up.get_fs_show_list_in_box = function(formspec,
table.insert(formspec, ",0.5;")
table.insert(formspec, label)
table.insert(formspec, "]")
yl_speak_up.get_fs_colorize_table(formspec,
yl_speak_up.get_sub_fs_colorize_table(formspec,
"0.1,0.7;"..tostring(width-0.2)..","..tostring(height-0.8)..";"..tostring(field_name)..";",
liste or {}, column_color)
if(tooltip_text and tooltip_text ~= "") then

View File

@ -170,20 +170,20 @@ yl_speak_up.get_fs_manage_quest_steps = function(player, param)
table.insert(formspec, yl_speak_up.get_fs_add_quest_steps(player, nil))
table.insert(formspec, "container_end[]")
local lists = yl_speak_up.quest_step_get_start_end_unconnected_lists(step_data)
yl_speak_up.get_fs_show_list_in_box(formspec,
yl_speak_up.get_sub_fs_show_list_in_box(formspec,
"Start steps:", "select_from_start_steps", lists.start_steps,
"0.1", "2.7", "5.6", "4.3", 0, nil, "#AAFFAA",
"The quest begins with this (or one of these) steps.\n"..
"You need at least one start step.",
nil)
yl_speak_up.get_fs_show_list_in_box(formspec,
yl_speak_up.get_sub_fs_show_list_in_box(formspec,
"Unconnected steps:", "select_from_unconnected_steps", lists.unconnected_steps,
"0.1", "7.0", "5.6", "4.3", 0, nil, "#FFAAAA",
"These steps are not used yet. They are not required\n"..
"by any other step and do not require steps either.\n"..
"Please decide what to do with them!",
nil)
yl_speak_up.get_fs_show_list_in_box(formspec,
yl_speak_up.get_sub_fs_show_list_in_box(formspec,
"Quest ends with steps:", "select_from_end_steps", lists.end_steps,
"24", "2.7", "5.6", "8.5", "0.1", nil, "#AAFFAA",
"This quest ends with these steps. They are not required\n"..
@ -253,7 +253,7 @@ yl_speak_up.get_fs_manage_quest_steps = function(player, param)
"style[insert_before_next_step,insert_after_prev_step,"..
"add_to_one_needed,add_to_all_needed;bgcolor=blue;textcolor=yellow]"..
"button[0.1,0.1;5.6,0.8;show_step_list;Show all quest steps]")
yl_speak_up.get_fs_show_list_in_box(formspec,
yl_speak_up.get_sub_fs_show_list_in_box(formspec,
em("One of").." these quest steps:", "one_step_required",
step_data[selected].one_step_required,
"0.1", "2.7", "5.6", "4.3", 0, nil, "#AAFFAA",
@ -267,7 +267,7 @@ yl_speak_up.get_fs_manage_quest_steps = function(player, param)
"to achieve this current quest step here.",
"button[4.6,0.0;0.94,0.7;add_to_one_needed;Edit]"..
"tooltip[add_to_one_needed;Add or remove a quest step to this list.]")
yl_speak_up.get_fs_show_list_in_box(formspec,
yl_speak_up.get_sub_fs_show_list_in_box(formspec,
em("All of").." these quest steps:", "all_steps_required",
step_data[selected].all_steps_required,
"0.1", "7.0", "5.6", "4.3", 0, nil, "#AAFFAA",
@ -315,7 +315,7 @@ yl_speak_up.get_fs_manage_quest_steps = function(player, param)
"label[0.6,2.0;Achieving this quest step]"..
"label[0.6,2.4;"..em("helps").." the quester to:]"..
"button[0.4,0.1;5.6,0.8;manage_quests;Manage quests]")
yl_speak_up.get_fs_show_list_in_box(formspec,
yl_speak_up.get_sub_fs_show_list_in_box(formspec,
"get these quest step(s) "..em("next")..":", "next_steps_show",
required_for,
-- the label needs to be moved slightly to the right to make room for the > button

View File

@ -173,20 +173,20 @@ yl_speak_up.get_fs_manage_quests = function(player, param)
-- this may also be information about WHERE a quest step shall take place
table.insert(formspec, "button[0.1,0.1;5.6,0.8;show_step_list;Show all quest steps]")
local lists = yl_speak_up.quest_step_get_start_end_unconnected_lists(quest.step_data or {})
yl_speak_up.get_fs_show_list_in_box(formspec,
yl_speak_up.get_sub_fs_show_list_in_box(formspec,
"Start steps:", "select_from_start_steps", lists.start_steps,
"0.1", "1.0", "5.6", "3.5", 0, nil, "#AAFFAA",
"The quest begins with this (or one of these) steps.\n"..
"You need at least one start step.",
nil)
yl_speak_up.get_fs_show_list_in_box(formspec,
yl_speak_up.get_sub_fs_show_list_in_box(formspec,
"Unconnected steps:", "select_from_unconnected_steps", lists.unconnected_steps,
"0.1", "4.5", "5.6", "3.5", 0, nil, "#FFAAAA",
"These steps are not used yet. They are not required\n"..
"by any other step and do not require steps either.\n"..
"Please decide what to do with them!",
nil)
yl_speak_up.get_fs_show_list_in_box(formspec,
yl_speak_up.get_sub_fs_show_list_in_box(formspec,
"Quest ends with steps:", "select_from_end_steps", lists.end_steps,
"0.1", "8.0", "5.6", "3.5", 0, nil, "#AAFFAA",
"This quest ends with these steps. They are not required\n"..
@ -209,7 +209,7 @@ yl_speak_up.get_fs_manage_quests = function(player, param)
local d = yl_speak_up.npc_list[id] or {}
table.insert(npc_names, "n_"..tostring(id).." "..(d.name or "- unknown -"))
end
yl_speak_up.get_fs_show_list_in_box(formspec,
yl_speak_up.get_sub_fs_show_list_in_box(formspec,
"NPC that (may) participate:", "select_from_npcs", npc_names,
"24", "1.0", "5.6", "3.5", 0, nil, "#AAAAFF",
"This is a list of NPC that may be relevant for this quest.\n"..
@ -218,7 +218,7 @@ yl_speak_up.get_fs_manage_quests = function(player, param)
"button[4.6,0.0;0.94,0.7;edit_npcs;Edit]")
-- quest.locations = {}
-- list of locations that *may* contribute to this quest
yl_speak_up.get_fs_show_list_in_box(formspec,
yl_speak_up.get_sub_fs_show_list_in_box(formspec,
"Locations:", "select_from_locations", quest.locations or {},
"24", "4.5", "5.6", "3.5", 0, nil, "#AAAAFF",
"This is a list of locations that may be relevant for this quest.\n"..
@ -226,7 +226,7 @@ yl_speak_up.get_fs_manage_quests = function(player, param)
"button[4.6,0.0;0.94,0.7;edit_locations;Edit]")
-- quest.items = {}
-- data of quest items that *may* be created and/or accepted in this quest
yl_speak_up.get_fs_show_list_in_box(formspec,
yl_speak_up.get_sub_fs_show_list_in_box(formspec,
"Quest items:", "select_from_quest_items", quest.items or {},
"24", "8.0", "5.6", "3.5", 0, nil, "#FFFFFF",
"This is a list of quest items.\n"..