Merge branch 'develop' into faction_refactor

This commit is contained in:
Khopa
2020-10-22 13:40:14 +02:00
14 changed files with 354 additions and 139 deletions

View File

@@ -358,7 +358,7 @@ class Operation:
# 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
# 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(".") + "]]"
lua = """
-- setting configuration table
env.info("DCSLiberation|: setting configuration table")

View File

@@ -1,14 +1,14 @@
def meter_to_feet(value_in_meter):
def meter_to_feet(value_in_meter: float) -> int:
return int(3.28084 * value_in_meter)
def feet_to_meter(value_in_feet):
return int(float(value_in_feet)/3.048)
def feet_to_meter(value_in_feet: float) -> int:
return int(value_in_feet / 3.28084)
def meter_to_nm(value_in_meter):
return int(float(value_in_meter)*0.000539957)
def meter_to_nm(value_in_meter: float) -> int:
return int(value_in_meter / 1852)
def nm_to_meter(value_in_nm):
return int(float(value_in_nm)*1852)
def nm_to_meter(value_in_nm: float) -> int:
return int(value_in_nm * 1852)