Merge pull request #328 from CWolfs/develop

v1.0.3
CWolfs · May 21, 2020 · f3ccb40 · f3ccb40
2 parents 70a2066 + ff96c2f
commit f3ccb40
Show file tree

Hide file tree

Showing 3 changed files with 159 additions and 1 deletion.
diff --git a/README.md b/README.md
@@ -32,6 +32,8 @@ Richard Griffiths (CWolf)
 ## Contributors
 
 - [@17783](https://github.com/17783) / Spectre (Added better friendly lance portraits)
+- [@NickAragua](https://github.com/NickAragua) (Fixed contract dialogue)
+- [@CargoVroom](https://github.com/CargoVroom) (Fixed contract dialogue, contract tags advice)
 
 ## Special Thanks
 

diff --git a/mod.json b/mod.json
@@ -1,7 +1,7 @@
 {
   "Name": "Mission Control",
   "Enabled": true,
-  "Version": "1.0.2",
+  "Version": "1.0.3",
   "Description": "A HBS BattleTech mod that adds custom contract types and varies the encounter specifics such as encounter boundary size, spawn locations, lance numbers and objectives",
   "Author": "CWolf",
   "Contact": "[email protected]",

diff --git a/overrides/contracts/blackout/Blackout_UnknownCause.json b/overrides/contracts/blackout/Blackout_UnknownCause.json
@@ -1302,6 +1302,162 @@
           }
         ]
       },
+      {
+        "lanceSpawner": {
+          "EncounterObjectGuid": "f5714221-5fc6-41e5-a369-c8aa2b6d1bcf"
+        },
+        "name": "Lance_Enemy_OccupyingForce",
+        "lanceDefId": "Tagged",
+        "lanceTagSet": {
+          "items": ["lance_type_dynamic", "lance_type_medium"],
+          "tagSetSourceFile": "tags/LanceTags"
+        },
+        "lanceExcludedTagSet": {
+          "items": [],
+          "tagSetSourceFile": "tags/LanceTags"
+        },
+        "spawnEffectTags": {
+          "items": [],
+          "tagSetSourceFile": "tags/SpawnEffectTags"
+        },
+        "lanceDifficultyAdjustment": 2,
+        "selectedLanceDefId": "",
+        "selectedLanceDifficulty": 0,
+        "unitSpawnPointOverrideList": [
+          {
+            "unitSpawnPoint": {
+              "EncounterObjectGuid": "ec9b2fd0-15a0-488c-8190-64cea5cce242"
+            },
+            "customUnitName": null,
+            "customHeraldryDefId": "",
+            "unitType": "Mech",
+            "unitDefId": "mechDef_InheritLance",
+            "unitTagSet": {
+              "items": [],
+              "tagSetSourceFile": "tags/UnitTags"
+            },
+            "unitExcludedTagSet": {
+              "items": [],
+              "tagSetSourceFile": "tags/UnitTags"
+            },
+            "spawnEffectTags": {
+              "items": [],
+              "tagSetSourceFile": "tags/SpawnEffectTags"
+            },
+            "pilotDefId": "pilotDef_InheritLance",
+            "pilotTagSet": {
+              "items": [],
+              "tagSetSourceFile": "tags/PilotTags"
+            },
+            "pilotExcludedTagSet": {
+              "items": [],
+              "tagSetSourceFile": "tags/PilotTags"
+            },
+            "selectedUnitType": "UNDEFINED",
+            "selectedUnitDefId": "",
+            "selectedPilotDefId": ""
+          },
+          {
+            "unitSpawnPoint": {
+              "EncounterObjectGuid": "993b100b-dc76-44c2-85ac-e50beb0dc9ed"
+            },
+            "customUnitName": null,
+            "customHeraldryDefId": "",
+            "unitType": "Mech",
+            "unitDefId": "mechDef_InheritLance",
+            "unitTagSet": {
+              "items": [],
+              "tagSetSourceFile": "tags/UnitTags"
+            },
+            "unitExcludedTagSet": {
+              "items": [],
+              "tagSetSourceFile": "tags/UnitTags"
+            },
+            "spawnEffectTags": {
+              "items": [],
+              "tagSetSourceFile": "tags/SpawnEffectTags"
+            },
+            "pilotDefId": "pilotDef_InheritLance",
+            "pilotTagSet": {
+              "items": [],
+              "tagSetSourceFile": "tags/PilotTags"
+            },
+            "pilotExcludedTagSet": {
+              "items": [],
+              "tagSetSourceFile": "tags/PilotTags"
+            },
+            "selectedUnitType": "UNDEFINED",
+            "selectedUnitDefId": "",
+            "selectedPilotDefId": ""
+          },
+          {
+            "unitSpawnPoint": {
+              "EncounterObjectGuid": "55a83021-479e-4ff2-8104-46fd21c2ce22"
+            },
+            "customUnitName": null,
+            "customHeraldryDefId": "",
+            "unitType": "Mech",
+            "unitDefId": "mechDef_InheritLance",
+            "unitTagSet": {
+              "items": [],
+              "tagSetSourceFile": "tags/UnitTags"
+            },
+            "unitExcludedTagSet": {
+              "items": [],
+              "tagSetSourceFile": "tags/UnitTags"
+            },
+            "spawnEffectTags": {
+              "items": [],
+              "tagSetSourceFile": "tags/SpawnEffectTags"
+            },
+            "pilotDefId": "pilotDef_InheritLance",
+            "pilotTagSet": {
+              "items": [],
+              "tagSetSourceFile": "tags/PilotTags"
+            },
+            "pilotExcludedTagSet": {
+              "items": [],
+              "tagSetSourceFile": "tags/PilotTags"
+            },
+            "selectedUnitType": "UNDEFINED",
+            "selectedUnitDefId": "",
+            "selectedPilotDefId": ""
+          },
+          {
+            "unitSpawnPoint": {
+              "EncounterObjectGuid": "8f8e3dbe-2e1b-4808-a362-fd4f7d6f9eb2"
+            },
+            "customUnitName": null,
+            "customHeraldryDefId": "",
+            "unitType": "Mech",
+            "unitDefId": "mechDef_InheritLance",
+            "unitTagSet": {
+              "items": [],
+              "tagSetSourceFile": "tags/UnitTags"
+            },
+            "unitExcludedTagSet": {
+              "items": [],
+              "tagSetSourceFile": "tags/UnitTags"
+            },
+            "spawnEffectTags": {
+              "items": [],
+              "tagSetSourceFile": "tags/SpawnEffectTags"
+            },
+            "pilotDefId": "pilotDef_InheritLance",
+            "pilotTagSet": {
+              "items": [],
+              "tagSetSourceFile": "tags/PilotTags"
+            },
+            "pilotExcludedTagSet": {
+              "items": [],
+              "tagSetSourceFile": "tags/PilotTags"
+            },
+            "selectedUnitType": "UNDEFINED",
+            "selectedUnitDefId": "",
+            "selectedPilotDefId": ""
+          }
+        ]
+      },
       {
         "lanceSpawner": {
           "EncounterObjectGuid": "b60da416-495c-474d-8b58-1678966835df"