mirror of
https://github.com/spencershepard/RotorOps.git
synced 2025-11-10 15:45:30 +00:00
Merge branch 'develop' into feature/imports
This commit is contained in:
commit
125c5f9262
@ -760,8 +760,7 @@ class RotorOpsMission:
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
def importObjects(self):
|
def importObjects(self):
|
||||||
os.chdir(self.imports_dir)
|
os.chdir(self.imports_dir)
|
||||||
logger.info("Looking for import .miz files in '" + os.getcwd())
|
logger.info("Looking for import .miz files in '" + os.getcwd())
|
||||||
@ -776,7 +775,7 @@ class RotorOpsMission:
|
|||||||
logger.error(
|
logger.error(
|
||||||
group.units[0].name + " IMPORT group's unit name cannot start with 'IMPORT'. Check the scenario template.")
|
group.units[0].name + " IMPORT group's unit name cannot start with 'IMPORT'. Check the scenario template.")
|
||||||
raise Exception("Scenario file error: " + group.units[0].name + " IMPORT group's unit name cannot start with 'IMPORT'")
|
raise Exception("Scenario file error: " + group.units[0].name + " IMPORT group's unit name cannot start with 'IMPORT'")
|
||||||
|
|
||||||
# trim the groupname to our filename convention
|
# trim the groupname to our filename convention
|
||||||
filename = group.name.removeprefix(prefix)
|
filename = group.name.removeprefix(prefix)
|
||||||
i = filename.find('-')
|
i = filename.find('-')
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user