diff --git a/Generator/Imports/FARP_DEFAULT_ZONE.miz b/Generator/Imports/FARP_DEFAULT_ZONE.miz index 96bfe5a..8ba07ee 100644 Binary files a/Generator/Imports/FARP_DEFAULT_ZONE.miz and b/Generator/Imports/FARP_DEFAULT_ZONE.miz differ diff --git a/Generator/Imports/FARP_MINIMUM_ROADSIDE_INVULNERABLE.miz b/Generator/Imports/FARP_MINIMUM_ROADSIDE_INVULNERABLE.miz new file mode 100644 index 0000000..b69db01 Binary files /dev/null and b/Generator/Imports/FARP_MINIMUM_ROADSIDE_INVULNERABLE.miz differ diff --git a/Generator/Imports/FARP_MINIMUM_ROADSIDE_STATICS.miz b/Generator/Imports/FARP_MINIMUM_ROADSIDE_STATICS.miz new file mode 100644 index 0000000..b40d8b2 Binary files /dev/null and b/Generator/Imports/FARP_MINIMUM_ROADSIDE_STATICS.miz differ diff --git a/Generator/Imports/FARP_MOBILE_ROADSIDE_INVULNERABLE.miz b/Generator/Imports/FARP_MOBILE_ROADSIDE_INVULNERABLE.miz new file mode 100644 index 0000000..86ced3a Binary files /dev/null and b/Generator/Imports/FARP_MOBILE_ROADSIDE_INVULNERABLE.miz differ diff --git a/Generator/Imports/FARP_MOBILE_ROADSIDE_STATICS.miz b/Generator/Imports/FARP_MOBILE_ROADSIDE_STATICS.miz new file mode 100644 index 0000000..dfae3b3 Binary files /dev/null and b/Generator/Imports/FARP_MOBILE_ROADSIDE_STATICS.miz differ diff --git a/Generator/Imports/FOB_16_SPWN_WIDE.miz b/Generator/Imports/FOB_16_SPWN_WIDE.miz new file mode 100644 index 0000000..f00aa0f Binary files /dev/null and b/Generator/Imports/FOB_16_SPWN_WIDE.miz differ diff --git a/Generator/Imports/FOB_8_SPWN.miz b/Generator/Imports/FOB_8_SPWN.miz new file mode 100644 index 0000000..be862f6 Binary files /dev/null and b/Generator/Imports/FOB_8_SPWN.miz differ diff --git a/Generator/Imports/MARKET_PLACE.miz b/Generator/Imports/MARKET_PLACE.miz new file mode 100644 index 0000000..28ee14c Binary files /dev/null and b/Generator/Imports/MARKET_PLACE.miz differ diff --git a/Generator/Imports/STAGING_LOGISITIC_HUB.miz b/Generator/Imports/STAGING_LOGISTIC_HUB.miz similarity index 100% rename from Generator/Imports/STAGING_LOGISITIC_HUB.miz rename to Generator/Imports/STAGING_LOGISTIC_HUB.miz diff --git a/Generator/Imports/VILLA_GRIMM.miz b/Generator/Imports/VILLA_GRIMM.miz new file mode 100644 index 0000000..ab6d00d Binary files /dev/null and b/Generator/Imports/VILLA_GRIMM.miz differ diff --git a/Generator/MissionGeneratorUI.ui b/Generator/MissionGeneratorUI.ui index 1898384..31aecfe 100644 --- a/Generator/MissionGeneratorUI.ui +++ b/Generator/MissionGeneratorUI.ui @@ -597,6 +597,9 @@ p, li { white-space: pre-wrap; } + + true + 60 @@ -613,6 +616,9 @@ p, li { white-space: pre-wrap; } Defensive Mode + + true + diff --git a/Generator/RotorOpsImport.py b/Generator/RotorOpsImport.py index 4187174..91c9060 100644 --- a/Generator/RotorOpsImport.py +++ b/Generator/RotorOpsImport.py @@ -43,6 +43,8 @@ class ImportObjects: self.source_heading = group.units[0].heading else: logger.warning("Unable to find group for anchor.") + raise Exception( + "Import template file error: " + self.mizfile + " does not contain a group called " + group_name) def extractUnits(self): diff --git a/Generator/RotorOpsMission.py b/Generator/RotorOpsMission.py index 9c6a546..d5bf153 100644 --- a/Generator/RotorOpsMission.py +++ b/Generator/RotorOpsMission.py @@ -257,7 +257,7 @@ class RotorOpsMission: else: staging_position = blue_zones[zone_name].position staging_heading = 0 - i = ImportObjects("STAGING_LOGISITIC_HUB.miz") + i = ImportObjects("STAGING_LOGISTIC_HUB.miz") i.anchorByGroupName("ANCHOR") i.copyAll(self.m, jtf_blue, "Staging Logistics Zone", staging_position, staging_heading) @@ -296,8 +296,6 @@ class RotorOpsMission: self.addResources(self.sound_directory, self.script_directory) RotorOpsConflict.triggerSetup(self, options) - # test adding static objects from a .miz - #self.addStatics() #Save the mission file os.chdir(self.output_dir) diff --git a/MissionGenerator.exe b/MissionGenerator.exe index d3496e6..d75205a 100644 Binary files a/MissionGenerator.exe and b/MissionGenerator.exe differ