From 44c976948dc0913303a8f74b74b2c9aa18b60e22 Mon Sep 17 00:00:00 2001
From: David Pierron <dpierron@gmail.com>
Date: Tue, 20 Oct 2020 23:02:46 +0200
Subject: [PATCH] bug correction in the JTACautolase LUA config

---
 game/operation/operation.py                     |  6 ------
 .../jtacautolase/jtacautolase-config.lua        | 17 ++++++++---------
 resources/plugins/jtacautolase/plugin.json      |  2 +-
 3 files changed, 9 insertions(+), 16 deletions(-)

diff --git a/game/operation/operation.py b/game/operation/operation.py
index 3284c800..c83f903f 100644
--- a/game/operation/operation.py
+++ b/game/operation/operation.py
@@ -369,12 +369,6 @@ dcsLiberation = {}
 -- the base location for state.json; if non-existent, it'll be replaced with LIBERATION_EXPORT_DIR, TEMP, or DCS working directory
 dcsLiberation.installPath=""" + state_location + """
 
--- you can override dcsLiberation.JTACAutoLase to make it use your own function ; it will be called with these parameters : ({jtac.unit_name}, {jtac.code}, {smoke}, 'vehicle') for all JTACs
-if ctld then
-    dcsLiberation.JTACAutoLase=ctld.JTACAutoLase
-elseif JTACAutoLase then
-    dcsLiberation.JTACAutoLase=JTACAutoLase
-end
 """
         # Process the tankers
         lua += """
diff --git a/resources/plugins/jtacautolase/jtacautolase-config.lua b/resources/plugins/jtacautolase/jtacautolase-config.lua
index 04d0c293..47a88edf 100644
--- a/resources/plugins/jtacautolase/jtacautolase-config.lua
+++ b/resources/plugins/jtacautolase/jtacautolase-config.lua
@@ -9,29 +9,28 @@
 env.info("DCSLiberation|JTACAutolase plugin - configuration")
 
 if dcsLiberation then
-    veaf.logTrace("dcsLiberation")
+    env.info(string.format("DCSLiberation|JTACAutolase plugin - dcsLiberation"))
 
     -- specific options
     local smoke = false
 
     -- retrieve specific options values
     if dcsLiberation.plugins then
-        veaf.logTrace("dcsLiberation.plugins")
+        env.info(string.format("DCSLiberation|JTACAutolase plugin - dcsLiberation.plugins"))
     
         if dcsLiberation.plugins.jtacautolase then
-            veaf.logTrace("dcsLiberation.plugins.jtacautolase")
-            veaf.logTrace(string.format("dcsLiberation.plugins.jtacautolase.smoke=%s",veaf.p(dcsLiberation.plugins.jtacautolase.smoke)))
-    
+            env.info(string.format("DCSLiberation|JTACAutolase plugin - dcsLiberation.plugins.jtacautolase"))
             smoke = dcsLiberation.plugins.jtacautolase.smoke
+            env.info(string.format("DCSLiberation|JTACAutolase plugin - smoke = %s",tostring(smoke)))
         end
     end
     
-    veaf.logTrace(string.format("smoke=%s",veaf.p(smoke)))
-
     -- actual configuration code    
     for _, jtac in pairs(dcsLiberation.JTACs) do
-        if dcsLiberation.JTACAutoLase then 
-            dcsLiberation.JTACAutoLase(jtac.dcsUnit, jtac.code, smoke, 'vehicle') 
+        env.info(string.format("DCSLiberation|JTACAutolase plugin - setting up %s",jtac.dcsUnit))
+        if JTACAutoLase then 
+            env.info(string.format("DCSLiberation|JTACAutolase plugin - calling dcsLiberation.JTACAutoLase"))
+            JTACAutoLase(jtac.dcsUnit, jtac.laserCode, smoke, 'vehicle') 
         end
     end
     
diff --git a/resources/plugins/jtacautolase/plugin.json b/resources/plugins/jtacautolase/plugin.json
index 837311f7..33ce09dd 100644
--- a/resources/plugins/jtacautolase/plugin.json
+++ b/resources/plugins/jtacautolase/plugin.json
@@ -21,7 +21,7 @@
     ],
     "configurationWorkOrders": [
         {
-            "file": "configuration.lua",
+            "file": "jtacautolase-config.lua",
             "mnemonic": "jtacautolase-config"
         }
     ]