Commit Graph

4044 Commits

Author SHA1 Message Date
Raffson
801e9efe8c Fix heli spawn/landing at FOB/FARP
Fixes https://github.com/dcs-liberation/dcs_liberation/issues/2719.

(cherry picked from commit 34de855b8f889b72406c101d0cea385988e24bf9)
(cherry picked from commit b41ef0ab13)
6.1.1
2023-02-05 14:41:47 -08:00
Dan Albert
5708fe625b Don't generate runway data for heliports.
Fixes https://github.com/dcs-liberation/dcs_liberation/issues/2710.

(cherry picked from commit c33a0d5deb)
2023-02-05 14:41:47 -08:00
Dan Albert
1dda0c9497 Pin version of black used in GHA.
Black rolls out style changes every year, and using "stable" means that
the check run on PRs might start formatting differently than we do
locally, or require a reformat of the codebase to make a PR submittable.

Pin to the version that we've been using. We should update to 23 at some
point, but we want to do that deliberately.

(cherry picked from commit 937bacacb7)
2023-02-05 12:15:50 -08:00
Dan Albert
56d7641251 Fix line endings.
(cherry-picked from commit e8824e5d03)
2023-02-05 12:15:50 -08:00
Dan Albert
938d6b4bdf Fix invalid tanker planning.
All three refueling missions share a common task type and differentiate
their behavior based on the type and allegiance of the package target.
This means that if the theater commander identifies a carrier as the
best location for a theater refueling task, a recovery tanker will be
planned by mistake.

If this happens on a sunken carrier, mission generation will fail
because a recovery tanker cannot be generated for a sunken carrier.

Fix the crash and the misplanned theater tanker by preventing the
commander from choosing fleet control points as refueling targets.

Fixes https://github.com/dcs-liberation/dcs_liberation/issues/2693.

(cherry picked from commit eea98b01f6)
2023-01-28 14:05:57 -08:00
Dan Albert
5caf07f476 Fix unit ID of the KS-19.
It seems like this unit has never worked because of the unit ID
mismatch.

Fixes https://github.com/dcs-liberation/dcs_liberation/issues/2701.

(cherry picked from commit 0df268f331)
2023-01-28 12:10:38 -08:00
Dan Albert
d1d4fde6a3 Update game version to 6.1.1. 2023-01-28 12:10:38 -08:00
RndName
440fe2e019 Only check for ground units in capture trigger zone
requires pydcs update: https://github.com/pydcs/dcs/pull/279

(cherry picked from commit f9903f1e19)
6.1.0
2022-12-21 13:26:42 -08:00
RndName
c82bc1c211 Change iads command unit type
(cherry picked from commit 4a4935f165)
2022-12-21 13:26:42 -08:00
RndName
f855d2956c Only add skynet iads command unit when advanced iads is in use
(cherry picked from commit 09f92cc5e4)
2022-12-21 13:26:42 -08:00
Dan Albert
24aebf5ff6 Update pydcs.
Includes UnitType parameter of AllOfCoalition in/out zone condition.

(cherry picked from commit 887e5997c2)
2022-12-21 13:26:42 -08:00
Dan Albert
8004dccdb2 Update changelog for Blackshark 3.
Fixes https://github.com/dcs-liberation/dcs_liberation/issues/2657.

(cherry picked from commit f88a50dd07)
2022-12-21 12:43:05 -08:00
Dan Albert
7e7cb4f0bc Add icons and banners for BS3.
https://github.com/dcs-liberation/dcs_liberation/issues/2657
(cherry picked from commit 3f12a5ae3d)
2022-12-21 12:43:05 -08:00
Dan Albert
801e3afb98 Add BS3 loadouts.
https://github.com/dcs-liberation/dcs_liberation/issues/2657
(cherry picked from commit f2946817bf)
2022-12-21 12:43:05 -08:00
Dan Albert
48ea33611d Add BS3 to factions that have BS2.
https://github.com/dcs-liberation/dcs_liberation/issues/2657
(cherry picked from commit 935a9b0631)
2022-12-21 12:43:05 -08:00
Dan Albert
7b588c5437 Add blackshark 3 yaml.
There are no significant notable changes from Blackshark 2, so this is
the same YAML.

https://github.com/dcs-liberation/dcs_liberation/issues/2657
(cherry picked from commit c0dc411102)
2022-12-21 12:43:05 -08:00
Dan Albert
e85b1a3195 Add Blackshark 3 to the mission planning DB.
https://github.com/dcs-liberation/dcs_liberation/issues/2657
(cherry picked from commit 55037626a4)
2022-12-21 12:43:05 -08:00
Dan Albert
8132b9a080 Fix type-only import that needs to be real.
Fixes https://github.com/dcs-liberation/dcs_liberation/issues/2660.

(cherry picked from commit fc3e72bacf)
2022-12-21 12:43:05 -08:00
Dan Albert
8e0cf2284b Update changelog for pydcs update.
(cherry picked from commit 66523301aa)
2022-12-21 12:43:05 -08:00
Dan Albert
87405ba58a Expand gitattributes to cover common files.
Specifically adding this so that yaml changes stop being uploaded as
CRLF, but the rest is likely useful too.

(cherry picked from commit 54546aaefb)
2022-12-21 12:43:05 -08:00
Dan Albert
0952cf4c75 Update bug templates to 6.0.0.
We're not fixing 5.x bugs any more.

(cherry picked from commit ded5fc8b1d)
2022-12-21 12:43:05 -08:00
SnappyComebacks
5bf5b41f2d Add Recovery Tankers (#2661)
Add support for recovery tankers at aircraft carriers.

Cherry picked from 9a81121ac1 and
0fd0f0e7c0
2022-12-21 05:17:02 +00:00
Dan Albert
715c60583a Save the last turn for bug reports.
We often get save games uploaded with bug reports that are already in a
broken state with nothing we can do about it. This saves that turn to
`last_turn.liberation` so users are less likely to have clobbered the
useful data before filing the report.

(cherry picked from commit 22503d4e95)
2022-12-20 14:09:25 -08:00
Dan Albert
5dcd1e9360 Fix the channel's landmap.
Caused by a bad rename when I did the migration. The landmap in 6.0.0
was actually a GIF...

Fixes https://github.com/dcs-liberation/dcs_liberation/issues/2612.

(cherry picked from commit de9236e93a)
2022-12-20 13:06:15 -08:00
SnappyComebacks
ef7978e887 Update F-15E loadouts.
(cherry picked from commit a245ba80c3)
2022-12-14 22:00:06 -07:00
Dan Albert
8cfb1790b2 Add new British navy units to the UK faction.
I haven't removed the old US navy stuff from this faction, since all the
new UK ships are frigates, and removing the US stuff would deprive the
faction of cruisers and destroyers, which might break generation (I'm
not familiar enough with the new system to say for sure).

Fixes https://github.com/dcs-liberation/dcs_liberation/issues/2571.

(cherry picked from commit 9a1860fc5e)
2022-12-13 00:14:48 -08:00
Dan Albert
41203b9bed Add HMS Invincible as a valid runway.
(cherry picked from commit f3f5ab70ea)
2022-12-13 00:14:48 -08:00
ColonelAkirNakesh
50fb1f5d97 Add HMS Invincible.
(cherry picked from commit 7f916d55e7)
2022-12-13 00:14:48 -08:00
Dan Albert
e041fa3c70 Fix changelog formatting.
(cherry picked from commit 6ce7638fdc)
2022-12-12 23:43:09 -08:00
Dan Albert
f358c1c0b2 Add missing changelog note.
(cherry picked from commit 43ea019091)
2022-12-12 21:33:12 -08:00
ColonelAkirNakesh
a18dbe0a72 Add support for Leander class HMS Andromeda.
https://github.com/dcs-liberation/dcs_liberation/issues/2571
(cherry picked from commit 7673ca5481)
2022-12-12 19:30:26 -08:00
ColonelAkirNakesh
00e7a1fe55 Add support for Leander class HMS Ariadne.
https://github.com/dcs-liberation/dcs_liberation/issues/2571
(cherry picked from commit 774a37a7d2)
2022-12-12 19:30:26 -08:00
ColonelAkirNakesh
b664a8cac5 Add support for Castle Class.
https://github.com/dcs-liberation/dcs_liberation/issues/2571
(cherry picked from commit 905094f63f)
2022-12-12 19:30:26 -08:00
ColonelAkirNakesh
2c4678aa48 Add support for Leander class HMS Achilles.
https://github.com/dcs-liberation/dcs_liberation/issues/2571
(cherry picked from commit fd5b7ba49d)
2022-12-12 19:30:26 -08:00
Dan Albert
eafc70a5e5 Fix livery for VF-33 F-14A squadron.
Fixes https://github.com/dcs-liberation/dcs_liberation/issues/2610.

(cherry picked from commit 6025cad716)
2022-12-12 19:30:26 -08:00
Dan Albert
7fb1d25887 Add changelog notes that were missed in PRs.
(cherry picked from commit 28859a8a9c)
2022-12-12 19:30:26 -08:00
Dan Albert
d9491c47b8 Fix encoding issues with the Peru faction.
Not really sure what's going on here, but presumably it's UTF-16 and
UTF-8 fighting.

(cherry picked from commit 9365aea724)
2022-12-12 19:30:26 -08:00
DillieKoe
2c26f366a8 Add Peru faction.
A new Peru faction with a mirage squadon

(cherry picked from commit 304fd7ea80)
2022-12-12 19:30:26 -08:00
ColonelAkirNakesh
c30636b4d2 Override liveries for Russian aircraft in bluefor faction.
(cherry picked from commit 5e345263a7)
2022-12-12 18:47:44 -08:00
dependabot[bot]
a3a91c5771 Bump certifi from 2022.6.15 to 2022.12.7
Bumps [certifi](https://github.com/certifi/python-certifi) from 2022.6.15 to 2022.12.7.
- [Release notes](https://github.com/certifi/python-certifi/releases)
- [Commits](https://github.com/certifi/python-certifi/compare/2022.06.15...2022.12.07)

---
updated-dependencies:
- dependency-name: certifi
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
(cherry picked from commit 445ee25bbf)
2022-12-12 17:50:19 -08:00
Dan Albert
3d64619481 Fix CAS not having landing waypoints.
Fixes https://github.com/dcs-liberation/dcs_liberation/issues/2611.

(cherry picked from commit 20937815f8)
2022-12-03 17:01:26 -08:00
RndName
3b97f7a2ba Fix manual debrief submit not ending mission
cherry-pick from 3863b8ef40
2022-11-30 13:29:40 +01:00
SnappyComebacks
6779ee96be Add F-15E to DEAD_CAPABLE in AI flight planner.
(cherry picked from commit 1b828b95b3)
2022-11-27 22:16:30 -07:00
Dan Albert
d9134650dc Branch for 6.1. 2022-11-27 21:07:47 -08:00
Dan Albert
4ef2cc26c8 Remove incompatible campaigns.
Fixes https://github.com/dcs-liberation/dcs_liberation/issues/2558.
6.0.0
2022-11-25 15:29:49 -08:00
Starfire13
a03cfdf305 Updates Khopa's Normandy and Channel campaign to 10.0
Note that Operation Dynamo only requires a yaml file update. The .miz file is fine and is not included here.
2022-11-25 15:29:49 -08:00
Dan Albert
9777e5e432 Remove dead code. 2022-11-25 15:29:49 -08:00
Dan Albert
5f74fd81eb Unfilter the custom waypoint targets.
There doesn't appear to be any reason for us to be poking at
implementation details here aside from changing the name from "unit" to
"building" for that case. Just iterate over the known strike targets.

Making this change uncovered some latent type errors.

Fixes https://github.com/dcs-liberation/dcs_liberation/issues/2564.

(cherry picked from commit 5e7e5e2636)
2022-11-25 14:22:11 -08:00
Dan Albert
b57e30a13c Add radios for the MB-339A.
Fixes https://github.com/dcs-liberation/dcs_liberation/issues/2511.

(cherry picked from commit e208df16b2)
2022-11-25 14:15:23 -08:00
Dan Albert
789c863922 Update RoleplayingPleb's campaigns.
https://github.com/dcs-liberation/dcs_liberation/issues/2558
Fixes https://github.com/dcs-liberation/dcs_liberation/issues/2561.

(cherry picked from commit 11632b0ef1)
2022-11-25 13:15:50 -08:00