weyne/dcs-retribution
1
0
Fork 0
mirror of https://github.com/dcs-retribution/dcs-retribution.git synced 2025-11-10 15:41:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed JTAC script not working after changes made to lua files

Browse Source
This commit is contained in:
Khopa 2020-10-01 23:17:32 +02:00
parent 44dcdcc8bb
commit f381bf85a4
1 changed files with 31 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
game/operation/operation.py
View File

@ -263,31 +263,38 @@ class Operation:
trigger.add_action(DoScriptFile(fileref)) trigger.add_action(DoScriptFile(fileref))
self.current_mission.triggerrules.triggers.append(trigger) self.current_mission.triggerrules.triggers.append(trigger)
# Inject Ciribob's JTACAutoLase if not done already in the plugins
if not "JTACAutoLase.lua" in listOfPluginsScripts : # don't load the script twice
trigger = TriggerStart(comment="Load JTACAutoLase.lua script")
fileref = self.current_mission.map_resource.add_resource_file("./resources/scripts/JTACAutoLase.lua")
trigger.add_action(DoScriptFile(fileref))
self.current_mission.triggerrules.triggers.append(trigger)
# set a LUA table with data from Liberation that we want to set # set a LUA table with data from Liberation that we want to set
# at the moment it contains Liberation's install path, and an overridable definition for the JTACAutoLase function # at the moment it contains Liberation's install path, and an overridable definition for the JTACAutoLase function
# later, we'll add data about the units and points having been generated, in order to facilitate the configuration of the plugin lua scripts # later, we'll add data about the units and points having been generated, in order to facilitate the configuration of the plugin lua scripts
state_location = "[[" + os.path.abspath("state.json") + "]]" state_location = "[[" + os.path.abspath("state.json") + "]]"
lua = """ lua = """
-- setting configuration table -- setting configuration table
env.info("DCSLiberation|: setting configuration table") env.info("DCSLiberation|: setting configuration table")
-- all data in this table is overridable. -- all data in this table is overridable.
dcsLiberation = {} dcsLiberation = {}
-- the base location for state.json; if non-existent, it'll be replaced with LIBERATION_EXPORT_DIR, TEMP, or DCS working directory -- 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 + """ 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 -- 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 if ctld then
dcsLiberation.JTACAutoLase=ctld.JTACAutoLase dcsLiberation.JTACAutoLase=ctld.JTACAutoLase
elseif JTACAutoLase then elseif JTACAutoLase then
dcsLiberation.JTACAutoLase=JTACAutoLase dcsLiberation.JTACAutoLase=JTACAutoLase
end end
-- later, we'll add more data to the table -- later, we'll add more data to the table
--dcsLiberation.POIs = {} --dcsLiberation.POIs = {}
--dcsLiberation.BASEs = {} --dcsLiberation.BASEs = {}
--dcsLiberation.JTACs = {} --dcsLiberation.JTACs = {}
""" """
trigger = TriggerStart(comment="Set DCS Liberation data") trigger = TriggerStart(comment="Set DCS Liberation data")
@ -301,13 +308,6 @@ end
trigger.add_action(DoScriptFile(fileref)) trigger.add_action(DoScriptFile(fileref))
self.current_mission.triggerrules.triggers.append(trigger) self.current_mission.triggerrules.triggers.append(trigger)
# Inject Ciribob's JTACAutoLase if not done already in the plugins
if not "JTACAutoLase.lua" in listOfPluginsScripts : # don't load the script twice
trigger = TriggerStart(comment="Load JTACAutoLase.lua script")
fileref = self.current_mission.map_resource.add_resource_file("./resources/scripts/JTACAutoLase.lua")
trigger.add_action(DoScriptFile(fileref))
self.current_mission.triggerrules.triggers.append(trigger)
# add a configuration for JTACAutoLase and start lasing for all JTACs # add a configuration for JTACAutoLase and start lasing for all JTACs
smoke = "true" smoke = "true"
if hasattr(self.game.settings, "jtac_smoke_on"): if hasattr(self.game.settings, "jtac_smoke_on"):
@ -315,9 +315,10 @@ end
smoke = "false" smoke = "false"
lua = """ lua = """
-- setting and starting JTACs -- setting and starting JTACs
env.info("DCSLiberation|: setting and starting JTACs") env.info("DCSLiberation|: setting and starting JTACs")
""" """
for jtac in jtacs: for jtac in jtacs:
lua += f"if dcsLiberation.JTACAutoLase then dcsLiberation.JTACAutoLase('{jtac.unit_name}', {jtac.code}, {smoke}, 'vehicle') end\n" lua += f"if dcsLiberation.JTACAutoLase then dcsLiberation.JTACAutoLase('{jtac.unit_name}', {jtac.code}, {smoke}, 'vehicle') end\n"