Merge pull request #325 from CWolfs/develop

v1.0.2
CWolfs · May 20, 2020 · 6e568b1 · 6e568b1
2 parents f483c04 + a11f4b3
commit 6e568b1
Show file tree

Hide file tree

Showing 28 changed files with 1,250 additions and 1,263 deletions.
diff --git a/contractTypeBuilds/Blackout/common.jsonc b/contractTypeBuilds/Blackout/common.jsonc
@@ -510,6 +510,9 @@
       "ControlledByContract": true,
       "Guid": "832ae497-f3d3-467f-b4da-8e95a3d757b0",
       "StartingStatus": "Inactive",
+      "ConflictsWith": [
+        "1fdeca88-c2d9-46af-b443-cf95aae707b6" // Chunk_Stage_Post_3a_Enemy_Turrets
+      ],
       "OnActiveExecute": [
         {
           "Type": "Dialogue",
@@ -532,7 +535,10 @@
       "ControlledByContract": true,
       "Guid": "df31d9e4-762f-4556-bc49-ce8dc1659c0a",
       "StartingStatus": "Inactive",
-      "ConflictsWith": ["38a28d0b-4688-41b5-a9e8-825a55c38c93"], // Chunk_Stage_Post_3a
+      "ConflictsWith": [
+        "38a28d0b-4688-41b5-a9e8-825a55c38c93", // Chunk_Stage_Post_3a
+        "1fdeca88-c2d9-46af-b443-cf95aae707b6" // Chunk_Stage_Post_3a_Enemy_Turrets
+      ],
       "OnActiveExecute": [
         {
           "Type": "Dialogue",

diff --git a/mod.json b/mod.json
@@ -1,7 +1,7 @@
 {
   "Name": "Mission Control",
   "Enabled": true,
-  "Version": "1.0.0",
+  "Version": "1.0.2",
   "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_DugInDeep.json b/overrides/contracts/blackout/Blackout_DugInDeep.json
@@ -11,7 +11,7 @@
   "missionSuccessStatementOverride": null,
   "badFaithStatementOverride": null,
   "goodFaithStatementOverride": null,
-  "shortDescription": "Last week radio coms with a strategic outpost was interrupted mid datastream to one of the remote relays and we've been unable to reestablish contact. Our other units are all tied up so we need you to make contact and get a sitrep.",
+  "shortDescription": "Last week, radio coms with a strategic outpost was interrupted mid datastream to one of the remote relays and we've been unable to reestablish contact. Our other units are all tied up, so we need you to make contact and get a sitrep.",
   "longDescription": "Interrupted mid-stream? Not much does that, Commander. We better be ready for anything down there.",
   "salvagePotential": 8,
   "requirementList": [
@@ -462,7 +462,7 @@
       "overrideDialogueBucketId": "",
       "dialogueContent": [
         {
-          "words": "{COMPANY.CompanyName}! We just watched you waste that invading lance. What a sight for sore eyes. Welcome to the frontlines!",
+          "words": "{COMPANY.CompanyName}! We weren't expecting to see you - in one piece, anyway. What a sight for sore eyes. Welcome to the front lines!",
           "wordsColor": {
             "r": 1,
             "g": 1,
@@ -478,7 +478,7 @@
           "revealRadius": -1
         },
         {
-          "words": "Frontlines? Lucky us. We've been sent by {TEAM_EMP.FactionDef.ShortName} to aid and assist. How are you all doing in there? What's the sitrep?",
+          "words": "Front lines? Lucky us. We've been sent by {TEAM_EMP.FactionDef.ShortName} to aid and assist. How are you all doing in there? What's the sitrep?",
           "wordsColor": {
             "r": 1,
             "g": 1,

diff --git a/overrides/contracts/blackout/Blackout_UnknownCause.json b/overrides/contracts/blackout/Blackout_UnknownCause.json
@@ -366,7 +366,7 @@
           "revealRadius": -1
         },
         {
-          "words": "What out, Commander! Turrets coming online!",
+          "words": "Watch out, Commander! Turrets coming online!",
           "wordsColor": {
             "r": 1,
             "g": 1,

diff --git a/overrides/contracts/duoduel/DuoDuel_AtHighNoon.json b/overrides/contracts/duoduel/DuoDuel_AtHighNoon.json
@@ -350,11 +350,11 @@
         "name": "Lance_Enemy",
         "lanceDefId": "Tagged",
         "lanceTagSet": {
-          "items": ["lance_type_dynamic", "lance_type_light"],
+          "items": ["lance_type_light", "lance_type_mech"],
           "tagSetSourceFile": "tags/LanceTags"
         },
         "lanceExcludedTagSet": {
-          "items": ["lance_type_vehicle"],
+          "items": [],
           "tagSetSourceFile": "tags/LanceTags"
         },
         "spawnEffectTags": {

diff --git a/overrides/contracts/duoduel/DuoDuel_DoubleTrouble.json b/overrides/contracts/duoduel/DuoDuel_DoubleTrouble.json
@@ -341,11 +341,11 @@
         "name": "Lance_Enemy",
         "lanceDefId": "Tagged",
         "lanceTagSet": {
-          "items": ["lance_type_dynamic", "lance_type_heavy"],
+          "items": ["lance_type_heavy", "lance_type_mech"],
           "tagSetSourceFile": "tags/LanceTags"
         },
         "lanceExcludedTagSet": {
-          "items": ["lance_type_vehicle"],
+          "items": [],
           "tagSetSourceFile": "tags/LanceTags"
         },
         "spawnEffectTags": {

diff --git a/overrides/contracts/duoduel/DuoDuel_FestiveCouple.json b/overrides/contracts/duoduel/DuoDuel_FestiveCouple.json
@@ -350,11 +350,11 @@
         "name": "Lance_Enemy",
         "lanceDefId": "Tagged",
         "lanceTagSet": {
-          "items": ["lance_type_dynamic", "lance_type_light"],
+          "items": ["lance_type_light", "lance_type_mech"],
           "tagSetSourceFile": "tags/LanceTags"
         },
         "lanceExcludedTagSet": {
-          "items": ["lance_type_vehicle"],
+          "items": [],
           "tagSetSourceFile": "tags/LanceTags"
         },
         "spawnEffectTags": {

diff --git a/overrides/contracts/duoduel/DuoDuel_LastMinuteReplacements.json b/overrides/contracts/duoduel/DuoDuel_LastMinuteReplacements.json
@@ -350,11 +350,11 @@
         "name": "Lance_Enemy",
         "lanceDefId": "Tagged",
         "lanceTagSet": {
-          "items": ["lance_type_dynamic", "lance_type_assault"],
+          "items": ["lance_type_assault", "lance_type_mech"],
           "tagSetSourceFile": "tags/LanceTags"
         },
         "lanceExcludedTagSet": {
-          "items": ["lance_type_vehicle"],
+          "items": [],
           "tagSetSourceFile": "tags/LanceTags"
         },
         "spawnEffectTags": {

diff --git a/overrides/contracts/duoduel/DuoDuel_WordsHurt.json b/overrides/contracts/duoduel/DuoDuel_WordsHurt.json
@@ -350,11 +350,11 @@
         "name": "Lance_Enemy",
         "lanceDefId": "Tagged",
         "lanceTagSet": {
-          "items": ["lance_type_dynamic", "lance_type_assault"],
+          "items": ["lance_type_assault", "lance_type_mech"],
           "tagSetSourceFile": "tags/LanceTags"
         },
         "lanceExcludedTagSet": {
-          "items": ["lance_type_vehicle"],
+          "items": [],
           "tagSetSourceFile": "tags/LanceTags"
         },
         "spawnEffectTags": {

diff --git a/overrides/contracts/duoduel/DuoDuel_YearlyTussle.json b/overrides/contracts/duoduel/DuoDuel_YearlyTussle.json
@@ -350,11 +350,11 @@
         "name": "Lance_Duelists",
         "lanceDefId": "Tagged",
         "lanceTagSet": {
-          "items": ["lance_type_dynamic", "lance_type_heavy"],
+          "items": ["lance_type_heavy", "lance_type_mech"],
           "tagSetSourceFile": "tags/LanceTags"
         },
         "lanceExcludedTagSet": {
-          "items": ["lance_type_vehicle"],
+          "items": [],
           "tagSetSourceFile": "tags/LanceTags"
         },
         "spawnEffectTags": {