diff --git a/FFTools_ACT_Plugin.cs b/FFTools_ACT_Plugin.cs index b94713c..d235566 100644 --- a/FFTools_ACT_Plugin.cs +++ b/FFTools_ACT_Plugin.cs @@ -29,7 +29,7 @@ using Advanced_Combat_Tracker; [assembly: AssemblyTitle("FFTools")] -[assembly: AssemblyDescription("Extends FFXIV parsing with Lua scripts that support TTS callouts, web views, and more.")] +[assembly: AssemblyDescription("Extends FFXIV parsing with Lua scripts that support TTS callouts, web UI, and more.")] [assembly: AssemblyCompany("Chompy#3436")] [assembly: AssemblyVersion("0.03")] @@ -53,7 +53,7 @@ public class FFTools : UserControl, IActPluginV1 const byte DATA_TYPE_PLAYER = 205; // Data type, request to send last player log line const byte DATA_TYPE_ACT_SAY = 206; // Data type, speak with TTS const byte DATA_TYPE_ACT_END = 207; // Data type, flag to end encounter - const byte DATA_TYPE_ACT_ERR = 208; // Data type, flag that an error has occured + const byte DATA_TYPE_ACT_UPDATE = 208; // Data type, flag that an update is ready const long TTS_TIMEOUT = 500; // Time in miliseconds to timeout TTS @@ -406,6 +406,11 @@ void udpListen() } break; } + case DATA_TYPE_ACT_UPDATE: + { + DialogResult result = MessageBox.Show("An updated version of the FFTools plugin is ready. Please restart ACT for the changes to take effect.", "New Version", MessageBoxButtons.OK, MessageBoxIcon.Asterisk); + break; + } } } catch (SocketException) { diff --git a/config/_app.yaml b/config/_app.yaml index 80855fd..629c2d8 100644 --- a/config/_app.yaml +++ b/config/_app.yaml @@ -5,10 +5,12 @@ # enable proxy to allow sharing of web views with other people # this will make all your web views available at https://proxy.fftools.net/[your id]/[script name]/ -enable_proxy: true +enable_proxy: false # port to run web server on for web views, most users should not need to change this web_port: 31594 # port to transmit data on from ACT to the fftools daemon, most users should not need to change this port_data: 31593 + +enable_key_press: false \ No newline at end of file diff --git a/scripts/uwu_jails/main.lua b/scripts/uwu_jails/main.lua index a98c8ea..be4eae3 100644 --- a/scripts/uwu_jails/main.lua +++ b/scripts/uwu_jails/main.lua @@ -44,6 +44,7 @@ local function on_log(l) if #jail_list == 3 and not has_called then table.sort(jail_list, jail_sort) for n, v in ipairs(jail_list) do + fft_log_info("Jail #" .. n .. " is " .. v .. ".") fft_say_if(n, {name=v}) fft_event_dispatch("am:mark", v) end diff --git a/src/daemon/log.go b/src/daemon/log.go index 2338a37..78223d3 100644 --- a/src/daemon/log.go +++ b/src/daemon/log.go @@ -64,7 +64,3 @@ func logLuaWarn(L *lua.LState, msg string, args ...interface{}) { func logLuaDebug(L *lua.LState, msg string, data interface{}) { //logLua(L, "[DEBUG] "+msg+" %s", data) } - -/*func logFile(msg string) error { - -}*/ diff --git a/src/daemon/lua_func_act_say.go b/src/daemon/lua_func_act_say.go index 67beab1..7926749 100644 --- a/src/daemon/lua_func_act_say.go +++ b/src/daemon/lua_func_act_say.go @@ -71,6 +71,9 @@ func luaFuncActSayIf(L *lua.LState) int { (id != 0 && localPlayerID != id) { return 0 } + if name == "" && role == "" && job == "" && id == 0 { + return 0 + } return luaFuncActSay(L) } diff --git a/src/daemon/main.go b/src/daemon/main.go index 1f55ea2..ad6b555 100644 --- a/src/daemon/main.go +++ b/src/daemon/main.go @@ -27,7 +27,7 @@ import ( "gopkg.in/natefinch/lumberjack.v2" ) -const version = "0.03" +const version = "0.02" func main() { // set log output diff --git a/src/daemon/tester.go b/src/daemon/tester.go index fed74e2..51b00f8 100644 --- a/src/daemon/tester.go +++ b/src/daemon/tester.go @@ -70,14 +70,19 @@ func testerParse(data io.Reader) []LogLine { func testerReplay(logLines []LogLine) { logInfo("Replay %d log lines.", len(logLines)) // generate encounter + newEnc := Encounter{ + ID: logLines[0].EncounterID, + StartTime: time.Now(), + Active: true, + Zone: "Test Area", + } eventListenerDispatch( "act:encounter", - Encounter{ - ID: logLines[0].EncounterID, - StartTime: time.Now(), - Active: true, - Zone: "Test Area", - }, + newEnc, + ) + eventListenerDispatch( + "act:encounter:change", + newEnc, ) // read combatants combatants := make([]Combatant, 0)