From c2e02a12aa9128ac0713884aae3dbd577b47f5a0 Mon Sep 17 00:00:00 2001 From: zhexu14 <64713351+zhexu14@users.noreply.github.com> Date: Sat, 16 Nov 2024 11:50:09 +1100 Subject: [PATCH 1/2] Bump version to 12.1 --- .github/ISSUE_TEMPLATE/bug-report.yml | 2 +- .github/ISSUE_TEMPLATE/new-game-bug.yml | 2 +- game/version.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/bug-report.yml b/.github/ISSUE_TEMPLATE/bug-report.yml index 6daedce32..bc3881c5a 100644 --- a/.github/ISSUE_TEMPLATE/bug-report.yml +++ b/.github/ISSUE_TEMPLATE/bug-report.yml @@ -31,7 +31,7 @@ body: If the bug was found in a development build, select "Development build" and provide a link to the build in the field below. options: - - 11.1.1 + - 12.0.1 - Development build - type: textarea attributes: diff --git a/.github/ISSUE_TEMPLATE/new-game-bug.yml b/.github/ISSUE_TEMPLATE/new-game-bug.yml index 5d1468704..0ea2b32c7 100644 --- a/.github/ISSUE_TEMPLATE/new-game-bug.yml +++ b/.github/ISSUE_TEMPLATE/new-game-bug.yml @@ -39,7 +39,7 @@ body: If the bug was found in a development build, select "Development build" and provide a link to the build in the field below. options: - - 11.1.1 + - 12.0.1 - Development build - type: textarea attributes: diff --git a/game/version.py b/game/version.py index c100d9bb1..6beb9c03d 100644 --- a/game/version.py +++ b/game/version.py @@ -2,7 +2,7 @@ MAJOR_VERSION = 12 -MINOR_VERSION = 0 +MINOR_VERSION = 1 MICRO_VERSION = 0 VERSION_NUMBER = ".".join(str(v) for v in (MAJOR_VERSION, MINOR_VERSION, MICRO_VERSION)) From 378d3acf65a6630b2009d00dd0849127c0f905fd Mon Sep 17 00:00:00 2001 From: zhexu14 <64713351+zhexu14@users.noreply.github.com> Date: Sat, 30 Nov 2024 17:42:38 +1100 Subject: [PATCH 2/2] Add Strike mission to KA-50 and add appropriate payload --- changelog.md | 1 + resources/customized_payloads/Ka-50.lua | 27 ++++++++++++++++++++++- resources/customized_payloads/Ka-50_3.lua | 27 ++++++++++++++++++++++- resources/units/aircraft/Ka-50.yaml | 1 + resources/units/aircraft/Ka-50_3.yaml | 1 + 5 files changed, 55 insertions(+), 2 deletions(-) diff --git a/changelog.md b/changelog.md index eec11d88b..dd6197f8a 100644 --- a/changelog.md +++ b/changelog.md @@ -9,6 +9,7 @@ Saves from 12.x are not compatible with 12.1.0. ## Fixes * **[Data]** Added/updated CBU weapons data. +* **[Data]** Added Strike mission type for KA-50 (all playable variants). * **[Mission Generation]** Fixed crash when using factions that have Eastern callsign conventions. # 12.0.0 diff --git a/resources/customized_payloads/Ka-50.lua b/resources/customized_payloads/Ka-50.lua index 69c3a1925..5930215d8 100644 --- a/resources/customized_payloads/Ka-50.lua +++ b/resources/customized_payloads/Ka-50.lua @@ -97,7 +97,32 @@ local unitPayloads = { }, }, ["tasks"] = { - [1] = 31, + [1] = 29, + }, + }, + [5] = { + ["displayName"] = "Liberation Strike", + ["name"] = "Liberation Strike", + ["pylons"] = { + [1] = { + ["CLSID"] = "{37DCC01E-9E02-432F-B61D-10C166CA2798}", + ["num"] = 1, + }, + [2] = { + ["CLSID"] = "{37DCC01E-9E02-432F-B61D-10C166CA2798}", + ["num"] = 2, + }, + [3] = { + ["CLSID"] = "{37DCC01E-9E02-432F-B61D-10C166CA2798}", + ["num"] = 3, + }, + [4] = { + ["CLSID"] = "{37DCC01E-9E02-432F-B61D-10C166CA2798}", + ["num"] = 4, + }, + }, + ["tasks"] = { + [1] = 32, }, }, }, diff --git a/resources/customized_payloads/Ka-50_3.lua b/resources/customized_payloads/Ka-50_3.lua index 90ea41046..ff2bf3e91 100644 --- a/resources/customized_payloads/Ka-50_3.lua +++ b/resources/customized_payloads/Ka-50_3.lua @@ -129,7 +129,32 @@ local unitPayloads = { }, }, ["tasks"] = { - [1] = 31, + [1] = 29, + }, + }, + [5] = { + ["displayName"] = "Liberation Strike", + ["name"] = "Liberation Strike", + ["pylons"] = { + [1] = { + ["CLSID"] = "{37DCC01E-9E02-432F-B61D-10C166CA2798}", + ["num"] = 1, + }, + [2] = { + ["CLSID"] = "{37DCC01E-9E02-432F-B61D-10C166CA2798}", + ["num"] = 2, + }, + [3] = { + ["CLSID"] = "{37DCC01E-9E02-432F-B61D-10C166CA2798}", + ["num"] = 3, + }, + [4] = { + ["CLSID"] = "{37DCC01E-9E02-432F-B61D-10C166CA2798}", + ["num"] = 4, + }, + }, + ["tasks"] = { + [1] = 32, }, }, }, diff --git a/resources/units/aircraft/Ka-50.yaml b/resources/units/aircraft/Ka-50.yaml index 25fd993a1..be78356cc 100644 --- a/resources/units/aircraft/Ka-50.yaml +++ b/resources/units/aircraft/Ka-50.yaml @@ -28,5 +28,6 @@ tasks: BAI: 430 CAS: 430 DEAD: 113 + Strike: 200 OCA/Aircraft: 430 hit_points: 15 diff --git a/resources/units/aircraft/Ka-50_3.yaml b/resources/units/aircraft/Ka-50_3.yaml index 433ea6c30..d9508f3b8 100644 --- a/resources/units/aircraft/Ka-50_3.yaml +++ b/resources/units/aircraft/Ka-50_3.yaml @@ -28,5 +28,6 @@ tasks: BAI: 440 CAS: 440 DEAD: 114 + Strike: 200 OCA/Aircraft: 440 hit_points: 15