From 2d8efa5a7a7268f1577aa2ee7424f3f5c10bffd7 Mon Sep 17 00:00:00 2001 From: zhexu14 <64713351+zhexu14@users.noreply.github.com> Date: Wed, 19 Jun 2024 20:38:09 +1000 Subject: [PATCH] Add NASAMs to MERAD unit list for campaign template (#3406) (#3410) Adds NASAM launcher B and C to the list of units that can be placed in a campaign template to define a MERAD spawn location. This is needed to maintain compatibility with the new versions of my campaigns. Pull requests should be made against the `develop` branch. Any backports necessary will be handled by the development team. Pull requests should be focused on one task. Multiple bug fixes should be multiple PRs. We cannot merge half a PR, and combined PRs are much more difficult to review. PRs that do not adhere to this will have their review delayed. Prefer rebase to merge, and squash commits as needed to preserve a readable commit history. This project maintains linear history in the develop branch, so we will either rebase or squash your PR when merging. It is much easier for us if your branch already has a readable commit history (ensure that your commit subject lines are clear enough to identify the patch in the git log). An exception to this is made for large PRs that are likely to require multiple rounds of review; in that case it's easier if you **don't** do this (GitHub does not preserve the history of old commits, so we cannot filter a PR for only new changes if a branch is force pushed) and we will squash it when merging. New features and bug fixes are usually worth mentioning in the changelog. Exceptions are fixes for bugs that never shipped (were only present in a canary build), and changes with no intended user observable behavior, such as a refactor. If you're comfortable writing the note yourself, add it to `changelog.md` in the root of the project in the section for the upcoming release. Co-authored-by: Starfire13 <72491792+Starfire13@users.noreply.github.com> --- game/campaignloader/mizcampaignloader.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/game/campaignloader/mizcampaignloader.py b/game/campaignloader/mizcampaignloader.py index 87cc42c26..e0607b899 100644 --- a/game/campaignloader/mizcampaignloader.py +++ b/game/campaignloader/mizcampaignloader.py @@ -61,6 +61,8 @@ class MizCampaignLoader: AirDefence.Hawk_ln.id, AirDefence.S_75M_Volhov.id, AirDefence.X_5p73_s_125_ln.id, + AirDefence.NASAMS_LN_B.id, + AirDefence.NASAMS_LN_C.id, } SHORT_RANGE_SAM_UNIT_TYPES = {