From: Nathaniel Wesley Filardo <nwfilardo@gmail.com>
Date: Thu, 1 Nov 2018 20:48:03 +0000 (+0000)
Subject: Handle negative flag scores
X-Git-Url: https://hydra-www.ietfng.org/gitweb/?a=commitdiff_plain;h=2c4b5caaa09d535e5382b66ffdf65b3b69a52b6e;p=acmetensortoys-esp-lua_ctfws

Handle negative flag scores
---

diff --git a/ctfws-lfs-strings.lua b/ctfws-lfs-strings.lua
index 847f4e7..58fea80 100644
--- a/ctfws-lfs-strings.lua
+++ b/ctfws-lfs-strings.lua
@@ -37,7 +37,7 @@ local init3load =
   "ctfws/game/message/jail",
   "none",
   "^%s*(%d+)%s+(%d+)%s+(%d+)%s+(%d+)%s+(%d+).*$",
-  "^%s*(%d+)%s+(%d+).*$",
+  "^%s*(%d+)%s+(-?%d+)%s+(-?%d+).*$",
   "^%s*(%d+)%s*(.*)$",
   "^%s*%?.*$",
   "^ctfws/game/message",
diff --git a/init3.lua b/init3.lua
index de0f5a1..39cebd1 100644
--- a/init3.lua
+++ b/init3.lua
@@ -104,7 +104,7 @@ nwfnet.onmqtt["init"] = function(c,t,m)
      if ctfws:setFlags("?","?") then ctfws_lcd:drawFlags() end
      return
    end
-   local ts, fr, fy = m:match("^%s*(%d+)%s+(%d+)%s+(%d+).*$")
+   local ts, fr, fy = m:match("^%s*(%d+)%s+(-?%d+)%s+(-?%d+).*$")
    if ts ~= nil then
      if ctfws:setFlags(tonumber(fr),tonumber(fy)) then ctfws_lcd:drawFlags() end
      return