Merge pull request #361 from CWolfs/develop

v1.0.4
CWolfs · May 31, 2020 · 308396a · 308396a
2 parents ad7b684 + 39b51dc
commit 308396a
Show file tree

Hide file tree

Showing 44 changed files with 740 additions and 74 deletions.
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
@@ -5,12 +5,10 @@
       "label": "build",
       "type": "process",
       "command": "dotnet",
-      "args": [
-        "build",
-        "D:/Modding/Battletech/MissionControl/src/MissionControl.csproj"
-      ],
+      "args": ["build", "D:/Modding/Battletech/MissionControl/src/MissionControl.csproj"],
       "problemMatcher": "$msCompile"
     },
+    /*
     {
       "label": "copy",
       "type": "shell",
@@ -29,6 +27,7 @@
         "'C:/Users/Rich/Documents/my games/BattleTech/mods/HBS/MissionControl'"
       ]
     },
+    */
     {
       "label": "copy (assets)",
       "type": "shell",

diff --git a/contractTypeBuilds/Blackout/common.jsonc b/contractTypeBuilds/Blackout/common.jsonc
@@ -164,7 +164,8 @@
           "LanceToUseRegionGuid": "76b654a6-4f2c-4a6f-86e6-d4cf868335fe", // Player lance GUID
           "ProgressFormat": "with [unitsOccupyingSoFar]/[numberOfUnitsToOccupy] unit(s)",
           "Description": "The objective for the player to investigate the blackout",
-          "RequiredTagsOnUnit": ["Player 1"]
+          "RequiredTagsOnUnit": ["Player 1"],
+          "NumberOfUnitsToOccupy": 2
         },
         {
           "Name": "Region_Investigate_Blackout",
@@ -918,9 +919,24 @@
           ]
         },
         {
+          /*
+            If the 'Destroy Invading Lance' objective is completed before the turrets activate
+            Then immediately activate the enemy turret event for Phase 2 OR just end the game.
+            There's no need to have friendly turrets activate then.
+          */
           "Type": "Delay",
           "Name": "Activate 3a Turrets",
-          "Rounds": 3,
+          "Rounds": 2,
+          "SkipIf": {
+            "TriggerOn": "OnObjectiveUpdated",
+            "Conditionals": [
+              {
+                "Type": "ObjectiveStatusConditional",
+                "Guid": "bfa3d339-c304-4fba-87db-ac725acb4c10", // Chunk_Stage_Post_3a Destroy Invading Lance
+                "Status": "Success"
+              }
+            ]
+          },
           "Results": [
             {
               "Type": "SetStateAtRandom",
@@ -930,6 +946,25 @@
               ],
               "State": "Active"
             }
+          ],
+          "ResultsIfSkipped": [
+            {
+              "Type": "TriggerResultAtRandom",
+              "Results": [
+                {
+                  "Type": "SetState",
+                  "EncounterGuid": "1fdeca88-c2d9-46af-b443-cf95aae707b6", // Chunk_Stage_Post_3a_Enemy_Turrets
+                  "State": "Active"
+                },
+                {
+                  "Type": "IgnoreChunks",
+                  "EncounterGuids": [
+                    "1fdeca88-c2d9-46af-b443-cf95aae707b6" // Chunk_Stage_Post_3a_Enemy_Turrets
+                    // "832ae497-f3d3-467f-b4da-8e95a3d757b0" // Chunk_Stage_Post_3a_Friendly_Turrets
+                  ]
+                }
+              ]
+            }
           ]
         }
       ]

diff --git a/contractTypeBuilds/Blackout/story7_lowlands.jsonc b/contractTypeBuilds/Blackout/story7_lowlands.jsonc
@@ -108,10 +108,10 @@
           "413f1124-f7e0-476c-b826-3432078d259f": { "x": 70, "y": 0, "z": -200 }
         },
         "SpawnPointRotations": {
-          "9405bf60-db6c-4ae9-95b0-3c26a6e9fd88": { "x": 0, "y": 270, "z": 0 },
-          "8f1a8422-917c-47c4-ada9-01eaa94499ee": { "x": 0, "y": 0, "z": 0 },
-          "ea0eef6e-1fd0-4a2e-8e26-8692d6a935d4": { "x": 0, "y": 0, "z": 0 },
-          "413f1124-f7e0-476c-b826-3432078d259f": { "x": 0, "y": 180, "z": 0 }
+          "9405bf60-db6c-4ae9-95b0-3c26a6e9fd88": { "x": 0, "y": 90, "z": 0 },
+          "8f1a8422-917c-47c4-ada9-01eaa94499ee": { "x": 0, "y": 180, "z": 0 },
+          "ea0eef6e-1fd0-4a2e-8e26-8692d6a935d4": { "x": 0, "y": 180, "z": 0 },
+          "413f1124-f7e0-476c-b826-3432078d259f": { "x": 0, "y": 0, "z": 0 }
         }
       }
     },
@@ -146,10 +146,10 @@
           "8f8e3dbe-2e1b-4808-a362-fd4f7d6f9eb2": { "x": 20, "y": 0, "z": -110 }
         },
         "SpawnPointRotations": {
-          "ec9b2fd0-15a0-488c-8190-64cea5cce242": { "x": 0, "y": 180, "z": 0 },
-          "993b100b-dc76-44c2-85ac-e50beb0dc9ed": { "x": 0, "y": 180, "z": 0 },
-          "55a83021-479e-4ff2-8104-46fd21c2ce22": { "x": 0, "y": 180, "z": 0 },
-          "8f8e3dbe-2e1b-4808-a362-fd4f7d6f9eb2": { "x": 0, "y": 180, "z": 0 }
+          "ec9b2fd0-15a0-488c-8190-64cea5cce242": { "x": 0, "y": 270, "z": 0 },
+          "993b100b-dc76-44c2-85ac-e50beb0dc9ed": { "x": 0, "y": 270, "z": 0 },
+          "55a83021-479e-4ff2-8104-46fd21c2ce22": { "x": 0, "y": 270, "z": 0 },
+          "8f8e3dbe-2e1b-4808-a362-fd4f7d6f9eb2": { "x": 0, "y": 270, "z": 0 }
         }
       }
     },

diff --git a/copy-assets.sh b/copy-assets.sh
@@ -1,15 +1,20 @@
 #!/bin/bash
 
-rm -rf 'D:/Program Files (x86)/Steam/steamapps/common/BATTLETECH/Mods/MissionControl/contractTypeBuilds'
-rm -rf 'D:/Program Files (x86)/Steam/steamapps/common/BATTLETECH/Mods/MissionControl/overrides'
+rm -rf 'D:/Program Files (x86)/Steam/steamapps/common/BATTLETECH/Mods/MissionControl/cast'
 rm -rf 'D:/Program Files (x86)/Steam/steamapps/common/BATTLETECH/Mods/MissionControl/config'
+rm -rf 'D:/Program Files (x86)/Steam/steamapps/common/BATTLETECH/Mods/MissionControl/contractTypeBuilds'
+rm -rf 'D:/Program Files (x86)/Steam/steamapps/common/BATTLETECH/Mods/MissionControl/dialogue'
 rm -rf 'D:/Program Files (x86)/Steam/steamapps/common/BATTLETECH/Mods/MissionControl/lances'
-rm -rf 'D:/Program Files (x86)/Steam/steamapps/common/BATTLETECH/Mods/MissionControl/cast'
+rm -rf 'D:/Program Files (x86)/Steam/steamapps/common/BATTLETECH/Mods/MissionControl/overrides'
+rm -rf 'D:/Program Files (x86)/Steam/steamapps/common/BATTLETECH/Mods/MissionControl/sprites'
 
+cp -r 'cast' 'D:/Program Files (x86)/Steam/steamapps/common/BATTLETECH/Mods/MissionControl'
+cp -r 'config' 'D:/Program Files (x86)/Steam/steamapps/common/BATTLETECH/Mods/MissionControl'
 cp -r 'contractTypeBuilds/' 'D:/Program Files (x86)/Steam/steamapps/common/BATTLETECH/Mods/MissionControl'
+cp -r 'dialogue/' 'D:/Program Files (x86)/Steam/steamapps/common/BATTLETECH/Mods/MissionControl'
+cp -r 'lances' 'D:/Program Files (x86)/Steam/steamapps/common/BATTLETECH/Mods/MissionControl'
 cp -r 'overrides/' 'D:/Program Files (x86)/Steam/steamapps/common/BATTLETECH/Mods/MissionControl'
+cp -r 'sprites/' 'D:/Program Files (x86)/Steam/steamapps/common/BATTLETECH/Mods/MissionControl'
 cp -r 'mod.json' 'D:/Program Files (x86)/Steam/steamapps/common/BATTLETECH/Mods/MissionControl'
 cp -r 'settings.json' 'D:/Program Files (x86)/Steam/steamapps/common/BATTLETECH/Mods/MissionControl'
-cp -r 'config' 'D:/Program Files (x86)/Steam/steamapps/common/BATTLETECH/Mods/MissionControl'
-cp -r 'lances' 'D:/Program Files (x86)/Steam/steamapps/common/BATTLETECH/Mods/MissionControl'
-cp -r 'cast' 'D:/Program Files (x86)/Steam/steamapps/common/BATTLETECH/Mods/MissionControl'
+cp -r 'src/bin/Debug/net471/MissionControl.dll' 'D:/Program Files (x86)/Steam/steamapps/common/BATTLETECH/Mods/MissionControl'
diff --git a/mod.json b/mod.json
@@ -1,10 +1,11 @@
 {
   "Name": "Mission Control",
   "Enabled": true,
-  "Version": "1.0.3",
+  "Version": "1.0.4",
   "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]",
+  "Website": "https://www.missioncontrolmod.com/",
 
   "DLL": "MissionControl.dll",
   "DLLEntryPoint": "MissionControl.Main.Init",

diff --git a/overrides/contracts/blackout/Blackout_DugInDeep.json b/overrides/contracts/blackout/Blackout_DugInDeep.json
@@ -736,7 +736,7 @@
         "name": "Turrets",
         "lanceDefId": "Tagged",
         "lanceTagSet": {
-          "items": ["lance_type_turret", "lance_bracket_low"],
+          "items": ["lance_type_turret"],
           "tagSetSourceFile": "Tags/LanceTags"
         },
         "lanceExcludedTagSet": {
@@ -870,7 +870,7 @@
         "name": "Lance_Enemy_RoamingForce",
         "lanceDefId": "Tagged",
         "lanceTagSet": {
-          "items": ["lance_type_dynamic", "lance_type_light"],
+          "items": ["lance_type_dynamic_difficulty"],
           "tagSetSourceFile": "tags/LanceTags"
         },
         "lanceExcludedTagSet": {
@@ -1026,7 +1026,7 @@
         "name": "Lance_Enemy_OpposingForce",
         "lanceDefId": "Tagged",
         "lanceTagSet": {
-          "items": ["lance_type_dynamic", "lance_type_light"],
+          "items": ["lance_type_dynamic_difficulty"],
           "tagSetSourceFile": "tags/LanceTags"
         },
         "lanceExcludedTagSet": {
@@ -1182,7 +1182,7 @@
         "name": "Lance_Enemy_OccupyingForce",
         "lanceDefId": "Tagged",
         "lanceTagSet": {
-          "items": ["lance_type_dynamic", "lance_type_light"],
+          "items": ["lance_type_dynamic_difficulty"],
           "tagSetSourceFile": "tags/LanceTags"
         },
         "lanceExcludedTagSet": {
@@ -1338,7 +1338,7 @@
         "name": "Lance_Enemy_Ambushers",
         "lanceDefId": "Tagged",
         "lanceTagSet": {
-          "items": ["lance_type_dynamic", "lance_type_light"],
+          "items": ["lance_type_dynamic_difficulty"],
           "tagSetSourceFile": "tags/LanceTags"
         },
         "lanceExcludedTagSet": {
@@ -1515,7 +1515,7 @@
         "name": "Turrets",
         "lanceDefId": "Tagged",
         "lanceTagSet": {
-          "items": ["lance_type_turret", "lance_bracket_low"],
+          "items": ["lance_type_turret"],
           "tagSetSourceFile": "Tags/LanceTags"
         },
         "lanceExcludedTagSet": {

diff --git a/overrides/contracts/blackout/Blackout_HeavyStatic.json b/overrides/contracts/blackout/Blackout_HeavyStatic.json
@@ -114,7 +114,7 @@
         "EncounterObjectGuid": "bfa3d339-c304-4fba-87db-ac725acb4c10"
       },
       "title": "Destroy occupying lance",
-      "description": "Destroy the lance that is occuping the base",
+      "description": "Destroy the lance that is occupying the base",
       "isPrimary": true,
       "OnSuccessResults": [],
       "OnFailureResults": [],
@@ -514,7 +514,7 @@
           "revealRadius": -1
         },
         {
-          "words": "Everythings fi..***STATIC***",
+          "words": "Everything's fi..***STATIC***",
           "wordsColor": {
             "r": 1,
             "g": 1,
@@ -911,7 +911,7 @@
         "name": "Turrets",
         "lanceDefId": "Tagged",
         "lanceTagSet": {
-          "items": ["lance_type_turret", "lance_bracket_low"],
+          "items": ["lance_type_turret"],
           "tagSetSourceFile": "Tags/LanceTags"
         },
         "lanceExcludedTagSet": {
@@ -1045,7 +1045,7 @@
         "name": "Lance_Enemy_RoamingForce",
         "lanceDefId": "Tagged",
         "lanceTagSet": {
-          "items": ["lance_type_dynamic", "lance_type_light"],
+          "items": ["lance_type_dynamic_difficulty"],
           "tagSetSourceFile": "tags/LanceTags"
         },
         "lanceExcludedTagSet": {
@@ -1201,7 +1201,7 @@
         "name": "Lance_Enemy_OpposingForce",
         "lanceDefId": "Tagged",
         "lanceTagSet": {
-          "items": ["lance_type_dynamic", "lance_type_heavy"],
+          "items": ["lance_type_dynamic_difficulty"],
           "tagSetSourceFile": "tags/LanceTags"
         },
         "lanceExcludedTagSet": {
@@ -1357,7 +1357,7 @@
         "name": "Lance_Enemy_OccupyingForce",
         "lanceDefId": "Tagged",
         "lanceTagSet": {
-          "items": ["lance_type_dynamic", "lance_type_heavy"],
+          "items": ["lance_type_dynamic_difficulty"],
           "tagSetSourceFile": "tags/LanceTags"
         },
         "lanceExcludedTagSet": {
@@ -1513,7 +1513,7 @@
         "name": "Lance_Enemy_Ambushers",
         "lanceDefId": "Tagged",
         "lanceTagSet": {
-          "items": ["lance_type_dynamic", "lance_type_medium"],
+          "items": ["lance_type_dynamic_difficulty"],
           "tagSetSourceFile": "tags/LanceTags"
         },
         "lanceExcludedTagSet": {
@@ -1690,7 +1690,7 @@
         "name": "Turrets",
         "lanceDefId": "Tagged",
         "lanceTagSet": {
-          "items": ["lance_type_turret", "lance_bracket_low"],
+          "items": ["lance_type_turret"],
           "tagSetSourceFile": "Tags/LanceTags"
         },
         "lanceExcludedTagSet": {

diff --git a/overrides/contracts/blackout/Blackout_UnknownCause.json b/overrides/contracts/blackout/Blackout_UnknownCause.json
@@ -114,7 +114,7 @@
         "EncounterObjectGuid": "bfa3d339-c304-4fba-87db-ac725acb4c10"
       },
       "title": "Destroy occupying lance",
-      "description": "Destroy the lance that is occuping the base",
+      "description": "Destroy the lance that is occupying the base",
       "isPrimary": true,
       "OnSuccessResults": [],
       "OnFailureResults": [],
@@ -863,7 +863,7 @@
         "name": "Turrets",
         "lanceDefId": "Tagged",
         "lanceTagSet": {
-          "items": ["lance_type_turret", "lance_bracket_low"],
+          "items": ["lance_type_turret"],
           "tagSetSourceFile": "Tags/LanceTags"
         },
         "lanceExcludedTagSet": {
@@ -997,7 +997,7 @@
         "name": "Lance_Enemy_RoamingForce",
         "lanceDefId": "Tagged",
         "lanceTagSet": {
-          "items": ["lance_type_dynamic", "lance_type_heavy"],
+          "items": ["lance_type_dynamic_difficulty"],
           "tagSetSourceFile": "tags/LanceTags"
         },
         "lanceExcludedTagSet": {
@@ -1153,7 +1153,7 @@
         "name": "Lance_Enemy_OpposingForce",
         "lanceDefId": "Tagged",
         "lanceTagSet": {
-          "items": ["lance_type_dynamic", "lance_type_assault"],
+          "items": ["lance_type_dynamic_difficulty"],
           "tagSetSourceFile": "tags/LanceTags"
         },
         "lanceExcludedTagSet": {
@@ -1309,7 +1309,7 @@
         "name": "Lance_Enemy_OccupyingForce",
         "lanceDefId": "Tagged",
         "lanceTagSet": {
-          "items": ["lance_type_dynamic", "lance_type_medium"],
+          "items": ["lance_type_dynamic_difficulty"],
           "tagSetSourceFile": "tags/LanceTags"
         },
         "lanceExcludedTagSet": {
@@ -1465,7 +1465,7 @@
         "name": "Lance_Enemy_Ambushers",
         "lanceDefId": "Tagged",
         "lanceTagSet": {
-          "items": ["lance_type_dynamic", "lance_type_heavy"],
+          "items": ["lance_type_dynamic_difficulty"],
           "tagSetSourceFile": "tags/LanceTags"
         },
         "lanceExcludedTagSet": {
@@ -1642,7 +1642,7 @@
         "name": "Turrets",
         "lanceDefId": "Tagged",
         "lanceTagSet": {
-          "items": ["lance_type_turret", "lance_bracket_low"],
+          "items": ["lance_type_turret"],
           "tagSetSourceFile": "Tags/LanceTags"
         },
         "lanceExcludedTagSet": {

diff --git a/overrides/contracts/soloduel/SoloDuel_AllEyesOn.json b/overrides/contracts/soloduel/SoloDuel_AllEyesOn.json
@@ -11,7 +11,7 @@
   "missionSuccessStatementOverride": null,
   "badFaithStatementOverride": null,
   "goodFaithStatementOverride": null,
-  "shortDescription": "Commander, you've been very active. Active and succesful. We're developing a new type of BattleMech simulator and we need new and improved data. Sound interesting? Good, because we want to analyse how you fight {TEAM_TAR.FactionDef.Demonym} forces. We've arranged for an ex-{TEAM_TAR.FactionDef.Demonym} pilot to fight you for a data gathering exercise. What do you say? You'll be well rewarded.",
+  "shortDescription": "Commander, you've been very active. Active and successful. We're developing a new type of BattleMech simulator and we need new and improved data. Sound interesting? Good, because we want to analyse how you fight {TEAM_TAR.FactionDef.Demonym} forces. We've arranged for an ex-{TEAM_TAR.FactionDef.Demonym} pilot to fight you for a data gathering exercise. What do you say? You'll be well rewarded.",
   "longDescription": "There's worse ways to make money than influencing a whole new generation of pilot's fighting styles. Sounds fun!",
   "salvagePotential": 4,
   "requirementList": [

diff --git a/overrides/contracts/soloduel/SoloDuel_ChallengeAccepted.json b/overrides/contracts/soloduel/SoloDuel_ChallengeAccepted.json
@@ -155,7 +155,7 @@
       "overrideDialogueBucketId": "",
       "dialogueContent": [
         {
-          "words": "We're coming in to pick you up fast, Commander. Hold on. We'll sort out the polical fallout from this later.",
+          "words": "We're coming in to pick you up fast, Commander. Hold on. We'll sort out the political fallout from this later.",
           "wordsColor": {
             "r": 1,
             "g": 1,

diff --git a/overrides/contracts/soloduel/SoloDuel_CorneredRevenge.json b/overrides/contracts/soloduel/SoloDuel_CorneredRevenge.json
@@ -11,7 +11,7 @@
   "missionSuccessStatementOverride": null,
   "badFaithStatementOverride": null,
   "goodFaithStatementOverride": null,
-  "shortDescription": "We have a BattleMech causing us trouble in {TGT_SYSTEM.name} who refuses to backdown until you, Commander, show up and fight them in a duel. They call themselves Killbox. I don't know what their problem is with you but we'll pay you to get here and just deal with them. It's causing us a headache.",
+  "shortDescription": "We have a BattleMech causing us trouble in {TGT_SYSTEM.name} who refuses to back down until you, Commander, show up and fight them in a duel. They call themselves Killbox. I don't know what their problem is with you but we'll pay you to get here and just deal with them. It's causing us a headache.",
   "longDescription": "'Killbox'? Haven't heard that name for a long time. Do you think she's still upset after all these years?",
   "salvagePotential": 3,
   "requirementList": [