diff --git a/game/data/radar_db.py b/game/data/radar_db.py index 7cd7403d..1644b98b 100644 --- a/game/data/radar_db.py +++ b/game/data/radar_db.py @@ -1,4 +1,5 @@ from dcs.ships import ( + Forrestal, PIOTR, MOSCOW, VINSON, @@ -85,24 +86,25 @@ UNITS_WITH_RADAR = { AirDefence.FuMG_401, AirDefence.FuSe_65, # Ships - VINSON, - PERRY, - TICONDEROG, ALBATROS, - KUZNECOW, - MOLNIYA, - MOSCOW, - NEUSTRASH, - PIOTR, - REZKY, - CV_1143_5, - Stennis, CVN_71, CVN_72, CVN_73, - USS_Arleigh_Burke_IIa, + CV_1143_5, + Forrestal, + KUZNECOW, LHA_Tarawa, + MOLNIYA, + MOSCOW, + NEUSTRASH, + PERRY, + PIOTR, + REZKY, + Stennis, + TICONDEROG, Type_052B, - Type_054A, Type_052C, + Type_054A, + USS_Arleigh_Burke_IIa, + VINSON, } diff --git a/game/theater/controlpoint.py b/game/theater/controlpoint.py index db8230d3..207a3f4d 100644 --- a/game/theater/controlpoint.py +++ b/game/theater/controlpoint.py @@ -25,6 +25,7 @@ from typing import ( from dcs.mapping import Point from dcs.ships import ( + Forrestal, Stennis, KUZNECOW, LHA_Tarawa, @@ -521,6 +522,7 @@ class ControlPoint(MissionTarget, ABC): for group in g.groups: for u in group.units: if db.unit_type_from_name(u.type) in [ + Forrestal, Stennis, KUZNECOW, ]: @@ -1005,6 +1007,7 @@ class NavalControlPoint(ControlPoint, ABC): for group in self.find_main_tgo().groups: for u in group.units: if db.unit_type_from_name(u.type) in [ + Forrestal, Stennis, LHA_Tarawa, KUZNECOW, diff --git a/resources/factions/usa_1975.json b/resources/factions/usa_1975.json index 83474451..3ca253a3 100644 --- a/resources/factions/usa_1975.json +++ b/resources/factions/usa_1975.json @@ -3,9 +3,7 @@ "name": "USA 1975", "authors": "Khopa", "description": "
US army in the 70s at the end of the war in Vietnam.
", - "locales": [ - "en_US" - ], + "locales": ["en_US"], "aircrafts": [ "B-52H Stratofortress", "C-130", @@ -17,41 +15,27 @@ "S-3B Viking", "UH-1H Iroquois" ], - "awacs": [ - "E-2C Hawkeye" - ], - "tankers": [ - "KC-130", - "KC-135 Stratotanker" - ], + "awacs": ["E-2C Hawkeye"], + "tankers": ["KC-130", "KC-135 Stratotanker"], "frontline_units": [ "M113", "M163 Vulcan Air Defense System", "M48 Chaparral", "M60A3 \"Patton\"" ], - "artillery_units": [ - "M109A6 Paladin" - ], - "logistics_units": [ - "Truck M818 6x6" - ], - "infantry_units": [ - "Infantry M249", - "Infantry M4" - ], + "artillery_units": ["M109A6 Paladin"], + "logistics_units": ["Truck M818 6x6"], + "infantry_units": ["Infantry M249", "Infantry M4"], "air_defenses": [ "ChaparralGenerator", "EarlyColdWarFlakGenerator", "HawkGenerator", "VulcanGenerator" ], - "ewrs": [ - "HawkEwrGenerator" - ], - "navy_generators": [ - "OliverHazardPerryGroupGenerator" - ], + "ewrs": ["HawkEwrGenerator"], + "aircraft_carrier": ["Forrestal"], + "carrier_names": ["CVN-59 Forrestal"], + "navy_generators": ["OliverHazardPerryGroupGenerator"], "requirements": {}, "doctrine": "coldwar" -} \ No newline at end of file +}