459 Commits

Author SHA1 Message Date
Raffson
6965133a33
Filter "self" when ground units retreat from CP
Fixes an infinite loop in case a connection to the same CP is made in the template miz file of the campaign. It's basically wrong input, but suppose we'd have a use-case for it in the future, it would still make sense to have ground units retreat to a CP that's different from their origin...
2025-01-12 16:04:52 +01:00
Druss99
f07cc83c5b
CurrentHill Russian Military Assets Pack (#448) 2025-01-07 20:54:50 +01:00
Astro
4c9dba2fe5
Vietnam War Vessels Mod v0.9.0 integration (#435)
* vietnamwarvessels first batch

* Ship YAMLs

* aircraft yamls initial version, need more work

* initial helicopter yamls

* update aircraft yamls

* Added DDs Fletcher and Sullivans

* ship icons

* aircraft banners and icons

* no huts

* update py files to VWV v0.9.0

* update aircraft yamls, add vigilante

* added 2 ships for VWV v0.9.0

* mig-21mf yaml

* icons and banners additional units v0.9.0

* added VWV units to USA_1970 and Vietnam_1970 JSONs

* Revert "added VWV units to USA_1970 and Vietnam_1970 JSONs"

This reverts commit ed0b28dc36c0d9c1a45a10689a3c419bd23ff258.

* A-1H yaml update

* mig-17 yaml update

* update helicopter yamls

* extension init

* weapon injections

* icon filenames _24 added

* removed tasks 0 from yamls

* hh2d yaml fix

* added VWV v0.9.0 to factions USA and Vietnam

* added max_range to aircraft yamls

* housekeeping

* Flyable to False - not available in mod version

* minor edits

* ignore test campaign

* deleted tasks

* weapon luas blue air

* added task numbers from task.py

* weapon luas red air

* task id numbers in comment

* switched weapon lua from aim-9J to aim-9D

* removed test campaigns

* update payload luas with payload names from flighttype.py

* Changed AIM-9D to 9B, 9D does not work

* removed air assault task for HH-2D

* Cva_31 added to runway_is_operational()

* CVA-31 added to naval_units in faction jsons

* add strike and cas tasks to ra-5c

* correct typo

* Added Armed Recon as task and payload to most a/c

* ignore pre-commit-config.yaml

* pre-commit-config

* black reformat controlpoint.py

* Added tasks to Vigilante (next to Recon) containing attack subtasks, which allow it to be scheduled for missions

* added ships to UNITS_WITH_RADAR

* remove pre-commit-config from gitignore

* added red aircraft to nva_1970 faction

* fixed black's complaint (two empty lines, should be one)
2025-01-05 13:50:01 +01:00
Druss99
bc157630e9
China military assets support (#440) 2025-01-03 19:19:10 +01:00
Druss99
dd408f392b
Fix airwing config not properly saving or loading (#437)
* fix airwing config not properly saving or loading

* add helper message to save function

* bugfixes

* remove unnecessary import used during testing

* yet another forgotten import

* change raise error to log warning
2025-01-01 15:56:08 +01:00
Raffson
f36526b5de
Fix mismatch between terrain names
Pydcs & Retribution don't always match up...
2024-12-28 20:46:41 +01:00
Raffson
592b1a7833
Don't allow carrier's path over land in UI 2024-12-28 01:06:08 +01:00
Raffson
cf38113cde
Only remove landmap before saving and immediately restore 2024-12-28 00:32:32 +01:00
Raffson
f2eec530db
Load landmap data on the fly
Avoids saving unnecessary data to the save-file
2024-12-27 23:32:21 +01:00
Raffson
9c50c062e9
Support for Iraq 2024-12-27 23:30:57 +01:00
Druss99
dd7e4c908e
Recovery tanker support (#429)
* fix conflict

* squash bugs and reuse patrol layout

* fix tanker tacan and formatting

* fix unlimited fuel option

* update pretense for tanker changes

* reuse refueling flight plan and bugfix for sunken carrier

changelog

* remove unitmap dependency

* formatting and more unit map removal

* more formatting

* typing and black

* keep tanker out of clouds

* fix if there are no clouds

* better cloud handling

* groundwork for recovery task

* remove changes to game/commander

* Finishing up recovery tankers

---------

Co-authored-by: Raffson <Raffson@users.noreply.github.com>
2024-12-23 04:39:10 +00:00
Raffson
84c4b992e0
Improve AGL to AMSL transition for naval waypoints
Some maps have inaccurate bounds for sea-zones, thus waypoints that end up being too close to the shore may keep using AGL which could still lead to trouble. Adding a condition to check whether a point is "not on land" will likely fix this issue for maps that have gaps between sea-zones and inclusion-zones around the shoreline...
2024-11-09 14:49:38 +01:00
Raffson
5fdf38c663
Format with updated black 2024-10-12 17:33:01 +02:00
Raffson
ff2ec07d83
Move constants from laypout.py to theathergroup.py
Should fix the "FIXED_POS_ARG not defined" error
2024-10-12 16:35:04 +02:00
Raffson
4c3b16e1da
Support for fixed position & heading in layouts 2024-10-06 22:27:51 +02:00
Raffson
65e529aa55
Merge branch 'dev' into pr/204 2024-07-28 15:57:38 +02:00
Raffson
3b360cfcf5
Pull up AEWC & Refueling mission types to NavalControlPoint 2024-07-27 22:58:43 +02:00
MetalStormGhost
140410f1ed
OH-6 Cayuse mod v1.2 support (#346)
Resolves #313

* Initial commit of OH-6 Modpack v1.2 + Vietnam Asset Pack v1 support.

* Added OH-6 Mod loadouts by @Starfire13

* Modified   pydcs_extensions/oh6_vietnamassetpack/oh6_vietnamassetpack.py
Added      resources/units/ground_units/vap_m35_truck.yaml
Added      resources/units/ground_units/vap_mule.yaml
Added      resources/units/ground_units/vap_mutt.yaml
Added      resources/units/ground_units/vap_mutt_gun.yaml
Added      resources/units/ground_units/vap_type63_mlrs.yaml
Added      resources/units/ground_units/vap_vc_bicycle_ak.yaml
Added      resources/units/ground_units/vap_vc_zis.yaml

* Modified   changelog.md
Modified   resources/factions/USA 1970 Vietnam War.json
Modified   resources/factions/USA 1971 Vietnam War.json
Modified   resources/units/ground_units/vap_mule.yaml
Added      resources/units/aircraft/OH-6A.yaml

* Added the OH-6 to factions and implemented the mod selection in the new game wizard. Added an icon an a banner.

* Modified   resources/units/aircraft/OH-6A.yaml

* Added icons for the Vietnam Asset Pack ground units. Also added an icon for the PT-76 since it was missing. Added a Viet Cong 1970s faction.

* Added      resources/units/ships/vap_us_seafloat.yaml

* Adjust tasking for OH-6A

OH-6A is only capable of Transport & Reconnaissance, but we can ignore this if the lead slot is a client. AI however will most likely not support this, but we can add Transport & Air Assault instead...

* Fix bug in configure task + client override fallback

---------

Co-authored-by: Raffson <Raffson@users.noreply.github.com>
2024-07-22 20:53:14 +02:00
Raffson
1c9b4b2317
Remove STRIKE as mission type from FOBs 2024-07-21 22:42:32 +02:00
Raffson
f405ffdfe2
Initial support for Armed Recon flight plan 2024-07-21 02:22:14 +02:00
MetalStormGhost
69b828ddf4 Merge remote-tracking branch 'remotes/dcs-retribution/dcs-retribution/dev' into pretense-generator 2024-07-17 19:40:57 +03:00
Raffson
f9e7772e09
Fine-tune TGO-purchasability logic 2024-07-16 21:46:22 +02:00
Raffson
d9788148c2
Formatting 2024-07-16 20:51:52 +02:00
Raffson
8918d4e64f
Preliminary support for Afghanistan 2024-07-16 00:19:58 +02:00
MetalStormGhost
19f6bafff1
Cold War assets mod v1.0 support (#343)
Implemented support for the Cold War assets mod (ex Tu-16) v1.0 by tripod3
2024-07-14 16:41:19 +03:00
MetalStormGhost
8e8bc3f907 Merge remote-tracking branch 'remotes/dcs-retribution/dcs-retribution/dev' into pretense-generator 2024-07-09 19:09:58 +03:00
Turbolious
eb5cceff16
Sk 60 mod support (#360) 2024-07-07 12:47:07 -05:00
MetalStormGhost
1a6d73f055 Merge remote-tracking branch 'remotes/dcs-retribution/dcs-retribution/dev' into pretense-generator 2024-07-05 12:06:53 +03:00
MetalStormGhost
07cc85f6fa
Large aircraft ground spawns (#237)
* Large aircraft ground spawns

Added the ability to add separate ground spawns for C-130 and other large aircraft to campaigns. Implemented on @holyorangejuice 's request.

Large aircraft ground spawns are added to the campaign by placing a C-130 on the ramp, just like an A-10 or AJS37 previously. Note: use the stock DCS C-130, so the campaign miz can be safely opened without the C-130 mod (or any other mod) installed. Not the C-130J player-flyable transport, not the KC-130J tanker included in the UH-60L mod etc.

Large planes (wingspan more than 40 meters, such as the C-130):
- First try spawning on large ground spawns
- Then try the regular airfield ramp spawns

Below 40 meter wingspan aircraft:
- First try spawning on regular or roadbase ground spawns
- Then try the regular airfield ramp spawns
- Then, if both of the above fail, use the large ground spawns

* Specify explicit black version 23.9.1 to fix lint error.

* Update lint.yml

---------

Co-authored-by: Raffson <Raffson@users.noreply.github.com>
2024-07-01 20:26:50 +00:00
MetalStormGhost
4762b490c0
Su-15 Flagon mod v1.0 support (#345)
* Su-15 Flagon mod v1.0 support

Implemented support for Su-15 Flagon mod version 1.0 by Marco1985_IT.

* Replaced the external fuel tanks with gunpods in Su-15 loadouts and added gunfighter: true
2024-06-30 22:05:45 +02:00
Raffson
6dc5296130
Disband squadrons sinking with ship + Sink/Resurrect cheat 2024-06-30 02:09:08 +02:00
Raffson
c22f7cbff3
Overhaul redeployment of units after base-capture(s) 2024-06-15 23:40:16 +02:00
MetalStormGhost
00356ea3ec
EA-6B Prowler mod version 2.9.4.102 support (#337) 2024-06-09 20:02:04 +02:00
MetalStormGhost
9775d3b97c Merge remote-tracking branch 'remotes/dcs-retribution/dcs-retribution/dev' into pretense-generator 2024-05-26 22:06:19 +03:00
Raffson
c09a5b68d5
Pydcs update for Phantom II
Save compat changes included
2024-05-24 21:30:48 +02:00
M Chimiste
c947ac0ef1
Support for VSN F-106 Delta Dart (#319)
* Add Delta Dart

* Added Banners and Icons

* Add loadouts

* Update f106.py

* Update f106.py

* Update VSN_F106A.yaml

* Update VSN_F106B.yaml

* Added the F-106 Delta Dart to factions. Also, replaced the banner with one by datoneslav, used with permission. Includes the official VSN logo (also used with permission). Also tweaked the backgrounds of the icons to blue to match the other aircraft.

* Added changelog entry.

* Add files via upload

---------

Co-authored-by: MetalStormGhost <ghosti@smytky.org>
2024-05-21 23:03:53 +02:00
MetalStormGhost
c4d2f0e833 Merge remote-tracking branch 'remotes/dcs-retribution/dcs-retribution/dev' into pretense-generator 2024-05-19 19:04:37 +03:00
Raffson
0f612ac9d9
Final preparations for Lappi 2024-05-18 20:15:43 +02:00
MetalStormGhost
c795ed01a0 Merge remote-tracking branch 'remotes/dcs-retribution/dcs-retribution/dev' into pretense-generator 2024-05-03 11:19:48 +03:00
Raffson
327c934ed3
Properly determine Carrier/LHA TGO in apply_carrier_config
The first ground object of a naval control-point isn't always the CV or LHA, but can also be a different TGO if 1 or more TGOs are linked to the naval control point.
2024-04-07 17:15:41 +02:00
Raffson
d2fd7bbb4e
Configurable carriers 2024-04-07 00:12:08 +02:00
Raffson
c5897950b6
Skip dead connections in IADS network
The "no skynet usable units" exception would get triggered when an IADS-node would form its connections. If one of those connections contained an IADS unit that was dead, the exception would get triggered since we weren't skipping "dead connections".
2024-04-06 17:39:27 +02:00
MetalStormGhost
e9832b5d82
Super Étendard mod support v2.5.5 (#273)
* Implemented support for the VSN Super Étendard v2.5.5

* Updated changelog and renamed the banner.

---------

Co-authored-by: Raffson <Raffson@users.noreply.github.com>
2024-03-16 14:55:50 +00:00
MetalStormGhost
6204dd4e72
F9F Panther mod support (version v2.8.7.101) (#226)
* Added F9F Panther mod support (version v2.8.7.101). Still missing loadouts and icon+banner.

* Added missing import in pydcs_extensions/__init__.py

* Added a banner and icon for the F9F Panther, credit for the banner to Jim over at the Century Series Discord. VSN Century Series logo used with permission. Also added loadouts for the F9F Panther and fixed the mod settings for it.
2024-03-16 15:47:04 +01:00
Raffson
bcf8ee9d42
Fine-tune release of parking slots 2024-03-03 12:51:27 +01:00
Raffson
2fdc9bbb2d
Free parking slots when passing turn 2024-03-03 00:01:27 +01:00
MetalStormGhost
b99a719d1c Converted closest_friendly_control_points_to from returning a tuple of the two closest control points to returning a list of all in sorted order. 2024-02-25 12:39:38 +02:00
MetalStormGhost
0b8fa9099c Disabled the base Retribution plugin in pretenseluagenerator.py and disabled adding zones for OffMapSpawns. 2024-02-25 12:39:37 +02:00
MetalStormGhost
13e7e976c3 Now connects more isolated zones in Pretense. 2024-02-25 12:39:36 +02:00
MetalStormGhost
a869c2a758 Also connect carrier and LHA control points to adjacent friendly points in Pretense. Enlarged the carrier trigger zones. 2024-02-25 12:39:35 +02:00