Reinjected into Data.lua

Author: Quaggles

DCS-Input-Command-Injector-Quaggles/DCS-Input-Command-Injector-Quaggles/Scripts/Input/Data.lua

@@ -557,19 +557,19 @@ local wizard_assigments
 --[[
 	Insert this code into "DCSWorld\Scripts\Input\Data.lua" above the function "loadDeviceProfileFromFile"
 	Then add the line:
-		QuagglesInputCommandInjector(filename, folder, env, result)
+		QuagglesInputCommandInjector(deviceGenericName, filename, folder, env, result)
 	into the "loadDeviceProfileFromFile" function below the line:
 		status, result = pcall(f)
 ]]--
 local quagglesLogName = 'Quaggles.InputCommandInjector'
 local quagglesLoggingEnabled = false
-local function QuagglesInputCommandInjector(filename, folder, env, result)
+local function QuagglesInputCommandInjector(deviceGenericName, filename, folder, env, result)
 	-- Returns true if string starts with supplied string
 	local function StartsWith(String,Start)
 		return string.sub(String,1,string.len(Start))==Start
 	end
 
-	if quagglesLoggingEnabled then log.write(quagglesLogName, log.INFO, 'Detected loading of: '..filename) end
+	if quagglesLoggingEnabled then log.write(quagglesLogName, log.INFO, 'Detected loading of type: "'..deviceGenericName..'", filename: "'..filename..'"') end
 	-- Only operate on files that are in this folder
 	local targetPrefixForAircrafts = "./Mods/aircraft/"
 	local targetPrefixForDotConfig = "./Config/Input/"
@@ -585,15 +585,15 @@ local function QuagglesInputCommandInjector(filename, folder, env, result)
 	if targetPrefix then
 		-- Transform path to user folder
 		local newFileName = filename:gsub(targetPrefix, lfs.writedir():gsub('\\','/').."InputCommands/")
-		if quagglesLoggingEnabled then log.write(quagglesLogName, log.INFO, '--Translated path: '..newFileName) end
+		if quagglesLoggingEnabled then log.write(quagglesLogName, log.INFO, '--Translated path: "'..newFileName..'"') end
 
 		-- If the user has put a file there continue
 		if lfs.attributes(newFileName) then
-			if quagglesLoggingEnabled then log.write(quagglesLogName, log.INFO, '----Found merge at: '..newFileName) end
+			if quagglesLoggingEnabled then log.write(quagglesLogName, log.INFO, '----Found merge at: "'..newFileName..'"') end
 			--Configure file to run in same environment as the default command entry file
 			local f, err = loadfile(newFileName)
 			if err ~= nil then
-				log.write(quagglesLogName, log.ERROR, '------Failure loading: '..tostring(newFileName).." Error: "..tostring(err))
+				log.write(quagglesLogName, log.ERROR, '------Failure loading: "'..tostring(newFileName)..'"'..' Error: "'..tostring(err)..'"')
 				return
 			else
 				setfenv(f, env)
@@ -602,11 +602,21 @@ local function QuagglesInputCommandInjector(filename, folder, env, result)
 
 				-- Merge resulting tables
 				if statusInj then
-					if resultInj.keyCommands then env.join(result.keyCommands, resultInj.keyCommands) end
-					if resultInj.axisCommands then env.join(result.axisCommands, resultInj.axisCommands) end
+					if result.axisCommands and resultInj.keyCommands then -- If both exist then join
+						env.join(result.keyCommands, resultInj.keyCommands)
+					elseif resultInj.keyCommands then -- If just the injected one exists then use it
+						result.keyCommands = resultInj.keyCommands
+					end
+					if deviceGenericName ~= "Keyboard" then -- Don't add axisCommands for keyboard
+						if result.axisCommands and resultInj.axisCommands then -- If both exist then join
+							env.join(result.axisCommands, resultInj.axisCommands)
+						elseif resultInj.axisCommands then  -- If just the injected one exists then use it
+							result.axisCommands = resultInj.axisCommands
+						end
+					end
 					if quagglesLoggingEnabled then log.write(quagglesLogName, log.INFO, '------Merge successful') end
 				else
-					if quagglesLoggingEnabled then log.write(quagglesLogName, log.INFO, '------Merge failed: '..tostring(statusInj)) end
+					if quagglesLoggingEnabled then log.write(quagglesLogName, log.INFO, '------Merge failed: "'..tostring(statusInj)..'"') end
 				end
 			end
 		end
@@ -826,7 +836,7 @@ local function loadDeviceProfileFromFile(filename, deviceGenericName, folder,kee
 		local status
 
 		status, result = pcall(f)
-		QuagglesInputCommandInjector(filename, folder, env, result)
+		QuagglesInputCommandInjector(deviceGenericName, filename, folder, env, result)
 		if status then
 			if nonLocalized then
 				for i, keyCommand in ipairs(result.keyCommands or {}) do
@@ -1245,10 +1255,8 @@ local function createProfile(profileInfo)
 		-- например Spitfire
         -- InputProfiles = {
             -- ["SpitfireLFMkIX"]			= current_mod_path .. '/Input/SpitfireLFMkIX',
-            -- ["SpitfireLFMkIX_easy"]		= current_mod_path .. '/Input/SpitfireLFMkIX_easy',  
             -- ["SpitfireLFMkIXCW"]			= current_mod_path .. '/Input/SpitfireLFMkIX',
-            -- ["SpitfireLFMkIXCW_easy"]	= current_mod_path .. '/Input/SpitfireLFMkIX_easy',  
-        -- },
+         -- },
 		if getProfileUnitName_(profile) ~= profileInfo.unitName then
 			aliases_[profileInfo.unitName] = profile
 		end