your-land-mirror/yl_speak_up
15
0
Fork 1
mirror of https://gitea.your-land.de/Sokomine/yl_speak_up.git synced 2025-06-24 16:18:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

show_fs: talk

Browse Source
This commit is contained in:
Sokomine 2024-02-09 21:59:41 +01:00
parent 7ddf97d49d
commit db2f401322
2 changed files with 22 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
fs/fs_talkdialog.lua
View File

@ -566,3 +566,19 @@ yl_speak_up.get_fs_talkdialog = function(player, n_id, d_id, alternate_text, rec
left_window_fs, bottom_window_fs, left_window_fs, bottom_window_fs,
active_dialog, h) active_dialog, h)
end end
yl_speak_up.get_fs_talk_wrapper = function(player, param)
if(not(param)) then
param = {}
end
-- recursion depth from autoanswer: 0 (the player selected manually)
return yl_speak_up.get_fs_talkdialog(player, param.n_id, param.d_id, param.alternate_text,0)
end
yl_speak_up.register_fs("talk",
yl_speak_up.input_talk,
yl_speak_up.get_fs_talk_wrapper,
-- no special formspec required:
nil
)

21
show_fs.lua
View File

@ -37,9 +37,6 @@ yl_speak_up.input_handler = function(player, formname, fields)
elseif formname == "yl_speak_up:setdialog" then elseif formname == "yl_speak_up:setdialog" then
yl_speak_up.input_setdialog(player, formname, fields) yl_speak_up.input_setdialog(player, formname, fields)
return true return true
elseif formname == "yl_speak_up:talk" then
yl_speak_up.input_talk(player, formname, fields)
return true
-- handled in fs_initial_config.lua -- handled in fs_initial_config.lua
elseif formname == "yl_speak_up:initial_config" then elseif formname == "yl_speak_up:initial_config" then
yl_speak_up.input_fs_initial_config(player, formname, fields) yl_speak_up.input_fs_initial_config(player, formname, fields)
@ -157,6 +154,12 @@ yl_speak_up.show_fs = function(player, fs_name, param)
yl_speak_up.speak_to[pname].last_fs_param = param yl_speak_up.speak_to[pname].last_fs_param = param
end end
-- abort talk if we hit d_end
if(fs_name == "talk" and param and param.d_id and param.d_id == "d_end") then
yl_speak_up.stop_talking(pname)
return
end
local fun = yl_speak_up.registered_forms_get_fs[fs_name] local fun = yl_speak_up.registered_forms_get_fs[fs_name]
if(fun) then if(fun) then
yl_speak_up.show_fs_ver(pname, "yl_speak_up:"..fs_name, yl_speak_up.show_fs_ver(pname, "yl_speak_up:"..fs_name,
@ -192,18 +195,6 @@ yl_speak_up.show_fs = function(player, fs_name, param)
yl_speak_up.show_fs_ver(pname, "yl_speak_up:setdialog", yl_speak_up.show_fs_ver(pname, "yl_speak_up:setdialog",
yl_speak_up.get_fs_setdialog(player, param.n_id, param.d_id)) yl_speak_up.get_fs_setdialog(player, param.n_id, param.d_id))
elseif(fs_name == "talk") then
if(not(param)) then
param = {}
end
if(param.d_id and param.d_id == "d_end") then
yl_speak_up.stop_talking(pname)
return
end
yl_speak_up.show_fs_ver(pname, "yl_speak_up:talk",
-- recursion depth from autoanswer: 0 (the player selected manually)
yl_speak_up.get_fs_talkdialog(player, param.n_id, param.d_id, param.alternate_text,0))
elseif(fs_name == "initial_config") then elseif(fs_name == "initial_config") then
if(not(param)) then if(not(param)) then
param = {} param = {}