weyne/dcs_liberation
1
0
Fork 0
mirror of https://github.com/dcs-liberation/dcs_liberation.git synced 2025-11-10 14:22:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add hit points to unit yamls.

Browse Source 
This PR:

- Introduces a new member of UnitType, hit_points, which is an abstract
representation of the durability of a unit, and loads it in from the
YAML files in the various subclasses (Ship, Ground etc).
- Adds scripts for populating/updating the unit YAML files with hit
point data from DCS. This script also gets the data for static objects,
but I'll leave the plugging in of static object data into Liberation for
another PR.
- Updates the unit YAML files by running the above scripts.

I did toy with the idea of adding this data to the unit definitions in
pydcs via an export from DCS, but it would be a more involved change,
since the current pydcs export script runs in the Hooks Lua environment
in DCS and AFAICT the hit points (via Unit.getLife()) is run in the
mission scripting environment.
This commit is contained in:
zhexu14 2024-01-04 19:49:33 +11:00 committed by GitHub
parent 5b858886c0
commit 5af4e56f30
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
384 changed files with 616 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
game/dcs/aircrafttype.py
View File

@ -517,6 +517,7 @@ class AircraftType(UnitType[Type[FlyingType]]):
LaserCodeConfig.from_yaml(d) for d in data.get("laser_codes", [])
],
use_f15e_waypoint_names=data.get("use_f15e_waypoint_names", False),
hit_points=data.get("hit_points", 1),
)
def __hash__(self) -> int:

1
game/dcs/groundunittype.py
View File

@ -133,4 +133,5 @@ class GroundUnitType(UnitType[Type[VehicleType]]):
data.get("skynet_properties", {})
),
reversed_heading=data.get("reversed_heading", False),
hit_points=data.get("hit_points", 1),
)

1
game/dcs/shipunittype.py
View File

@ -79,4 +79,5 @@ class ShipUnitType(UnitType[Type[ShipType]]):
manufacturer=data.get("manufacturer", "No data."),
role=data.get("role", "No data."),
price=data["price"],
hit_points=data.get("hit_points", 1),
)

1
game/dcs/unittype.py
View File

@ -27,6 +27,7 @@ class UnitType(ABC, Generic[DcsUnitTypeT]):
role: str
price: int
unit_class: UnitClass
hit_points: int
_loaded: ClassVar[bool] = False

1
resources/units/aircraft/A-10A.yaml
View File

@ -20,3 +20,4 @@ tasks:
BAI: 680
CAS: 680
OCA/Aircraft: 680
hit_points: 32

1
resources/units/aircraft/A-10C.yaml
View File

@ -30,3 +30,4 @@ tasks:
OCA/Aircraft: 820
OCA/Runway: 380
Strike: 380
hit_points: 32

1
resources/units/aircraft/A-10C_2.yaml
View File

@ -34,3 +34,4 @@ tasks:
OCA/Aircraft: 830
OCA/Runway: 390
Strike: 390
hit_points: 32

1
resources/units/aircraft/A-20G.yaml
View File

@ -24,3 +24,4 @@ tasks:
OCA/Aircraft: 160
OCA/Runway: 140
Strike: 140
hit_points: 18

1
resources/units/aircraft/A-50.yaml
View File

@ -8,3 +8,4 @@ variants:
A-50: null
tasks:
AEW&C: 10
hit_points: 60

1
resources/units/aircraft/AH-1W.yaml
View File

@ -23,3 +23,4 @@ tasks:
BAI: 480
CAS: 480
OCA/Aircraft: 480
hit_points: 14

1
resources/units/aircraft/AH-64A.yaml
View File

@ -24,3 +24,4 @@ tasks:
BAI: 490
CAS: 490
OCA/Aircraft: 490
hit_points: 14

1
resources/units/aircraft/AH-64D.yaml
View File

@ -25,3 +25,4 @@ tasks:
BAI: 500
CAS: 500
OCA/Aircraft: 500
hit_points: 14

1
resources/units/aircraft/AH-64D_BLK_II.yaml
View File

@ -42,3 +42,4 @@ tasks:
OCA/Aircraft: 510
default_overrides:
FCR_RFI_removed: false
hit_points: 20

1
resources/units/aircraft/AJS37.yaml
View File

@ -43,3 +43,4 @@ tasks:
OCA/Aircraft: 620
OCA/Runway: 620
Strike: 630
hit_points: 18

1
resources/units/aircraft/AV8BNA.yaml
View File

@ -63,3 +63,4 @@ tasks:
SEAD: 70
SEAD Escort: 70
Strike: 590
hit_points: 18

1
resources/units/aircraft/An-26B.yaml
View File

@ -5,3 +5,4 @@ variants:
An-26B: null
tasks:
Transport: 110
hit_points: 45

1
resources/units/aircraft/An-30M.yaml
View File

@ -3,3 +3,4 @@ price: 15
variants:
An-30M: null
tasks: {}
hit_points: 45

1
resources/units/aircraft/B-17G.yaml
View File

@ -23,3 +23,4 @@ variants:
tasks:
OCA/Runway: 150
Strike: 150
hit_points: 18

1
resources/units/aircraft/B-1B.yaml
View File

@ -23,3 +23,4 @@ tasks:
OCA/Aircraft: 670
OCA/Runway: 670
Strike: 700
hit_points: 60

1
resources/units/aircraft/B-52H.yaml
View File

@ -17,3 +17,4 @@ tasks:
DEAD: 210
OCA/Runway: 660
Strike: 690
hit_points: 60

1
resources/units/aircraft/Bf-109K-4.yaml
View File

@ -34,3 +34,4 @@ tasks:
OCA/Runway: 20
Strike: 20
TARCAP: 60
hit_points: 18

1
resources/units/aircraft/C-101CC.yaml
View File

@ -30,3 +30,4 @@ tasks:
OCA/Runway: 170
Strike: 170
TARCAP: 130
hit_points: 18

1
resources/units/aircraft/C-130.yaml
View File

@ -5,3 +5,4 @@ variants:
C-130: null
tasks:
Transport: 130
hit_points: 45

1
resources/units/aircraft/C-17A.yaml
View File

@ -5,3 +5,4 @@ variants:
C-17A: null
tasks:
Transport: 150
hit_points: 45

1
resources/units/aircraft/C-47.yaml
View File

@ -13,3 +13,4 @@ variants:
C-47 Dakota: null
tasks:
Transport: 90
hit_points: 18

1
resources/units/aircraft/CH-47D.yaml
View File

@ -10,3 +10,4 @@ variants:
tasks:
Air Assault: 90
Transport: 70
hit_points: 20

1
resources/units/aircraft/CH-53E.yaml
View File

@ -10,3 +10,4 @@ variants:
tasks:
Air Assault: 100
Transport: 80
hit_points: 20

1
resources/units/aircraft/E-2C.yaml
View File

@ -16,3 +16,4 @@ variants:
E-2D Advanced Hawkeye: {}
tasks:
AEW&C: 20
hit_points: 25

1
resources/units/aircraft/E-3A.yaml
View File

@ -8,3 +8,4 @@ variants:
E-3A: null
tasks:
AEW&C: 30
hit_points: 60

1
resources/units/aircraft/F-117A.yaml
View File

@ -20,3 +20,4 @@ variants:
tasks:
Strike: 710
has_built_in_target_pod: true
hit_points: 20

1
resources/units/aircraft/F-14A-135-GR.yaml
View File

@ -59,3 +59,4 @@ tasks:
SEAD Escort: 90
Strike: 550
TARCAP: 520
hit_points: 20

1
resources/units/aircraft/F-14B.yaml
View File

@ -59,3 +59,4 @@ tasks:
SEAD Escort: 100
Strike: 560
TARCAP: 530
hit_points: 20

1
resources/units/aircraft/F-15C.yaml
View File

@ -18,3 +18,4 @@ tasks:
Fighter sweep: 540
Intercept: 540
TARCAP: 540
hit_points: 20

1
resources/units/aircraft/F-15E.yaml
View File

@ -25,3 +25,4 @@ tasks:
Strike: 640
TARCAP: 240
has_built_in_target_pod: true
hit_points: 20

1
resources/units/aircraft/F-15ESE.yaml
View File

@ -51,3 +51,4 @@ laser_codes:
- property:
id: Sta8LaserCode
digits: 3
hit_points: 18

1
resources/units/aircraft/F-16A.yaml
View File

@ -16,3 +16,4 @@ tasks:
OCA/Runway: 570
Strike: 570
TARCAP: 420
hit_points: 14

1
resources/units/aircraft/F-16C_50.yaml
View File

@ -78,3 +78,4 @@ laser_codes:
digit: 1
- id: LaserCode1
digit: 0
hit_points: 20

1
resources/units/aircraft/F-4E.yaml
View File

@ -33,3 +33,4 @@ tasks:
SEAD Escort: 120
Strike: 400
TARCAP: 410
hit_points: 20

1
resources/units/aircraft/F-5E-3.yaml
View File

@ -48,3 +48,4 @@ tasks:
OCA/Runway: 190
Strike: 200
TARCAP: 200
hit_points: 16

1
resources/units/aircraft/F-86F Sabre.yaml
View File

@ -26,3 +26,4 @@ tasks:
OCA/Runway: 180
Strike: 190
TARCAP: 150
hit_points: 15

1
resources/units/aircraft/FA-18C_hornet.yaml
View File

@ -68,3 +68,4 @@ tasks:
SEAD Escort: 160
Strike: 600
TARCAP: 450
hit_points: 20

1
resources/units/aircraft/FW-190A8.yaml
View File

@ -44,3 +44,4 @@ tasks:
OCA/Runway: 0
Strike: 0
TARCAP: 40
hit_points: 18

1
resources/units/aircraft/FW-190D9.yaml
View File

@ -33,3 +33,4 @@ tasks:
OCA/Runway: 10
Strike: 10
TARCAP: 50
hit_points: 18

1
resources/units/aircraft/H-6J.yaml
View File

@ -24,3 +24,4 @@ tasks:
OCA/Aircraft: 380
OCA/Runway: 640
Strike: 650
hit_points: 18

1
resources/units/aircraft/I-16.yaml
View File

@ -28,3 +28,4 @@ tasks:
Intercept: 0
OCA/Aircraft: 60
TARCAP: 0
hit_points: 15

1
resources/units/aircraft/IL-76MD.yaml
View File

@ -4,3 +4,4 @@ variants:
IL-76MD: null
tasks:
Transport: 120
hit_points: 60

1
resources/units/aircraft/IL-78M.yaml
View File

@ -9,3 +9,4 @@ variants:
IL-78M: null
tasks:
Refueling: 30
hit_points: 60

1
resources/units/aircraft/J-11A.yaml
View File

@ -18,3 +18,4 @@ tasks:
Fighter sweep: 500
Intercept: 500
TARCAP: 500
hit_points: 18

1
resources/units/aircraft/JF-17.yaml
View File

@ -53,3 +53,4 @@ tasks:
SEAD Escort: 180
Strike: 580
TARCAP: 440
hit_points: 18

1
resources/units/aircraft/Ju-88A4.yaml
View File

@ -27,3 +27,4 @@ tasks:
OCA/Aircraft: 150
OCA/Runway: 130
Strike: 130
hit_points: 18

1
resources/units/aircraft/KC-135.yaml
View File

@ -17,3 +17,4 @@ variants:
KC-135 Stratotanker: {}
tasks:
Refueling: 50
hit_points: 60

1
resources/units/aircraft/KC130.yaml
View File

@ -15,3 +15,4 @@ variants:
KC-130: {}
tasks:
Refueling: 10
hit_points: 18

1
resources/units/aircraft/KC135MPRS.yaml
View File

@ -17,3 +17,4 @@ variants:
KC-135 Stratotanker MPRS: {}
tasks:
Refueling: 40
hit_points: 18

1
resources/units/aircraft/KJ-2000.yaml
View File

@ -6,3 +6,4 @@ variants:
KJ-2000: null
tasks:
AEW&C: 0
hit_points: 18

1
resources/units/aircraft/Ka-50.yaml
View File

@ -29,3 +29,4 @@ tasks:
CAS: 430
DEAD: 113
OCA/Aircraft: 430
hit_points: 15

1
resources/units/aircraft/Ka-50_3.yaml
View File

@ -29,3 +29,4 @@ tasks:
CAS: 440
DEAD: 114
OCA/Aircraft: 440
hit_points: 15

1
resources/units/aircraft/L-39ZA.yaml
View File

@ -30,3 +30,4 @@ tasks:
OCA/Runway: 160
Strike: 160
TARCAP: 120
hit_points: 15

1
resources/units/aircraft/M-2000C.yaml
View File

@ -48,3 +48,4 @@ tasks:
OCA/Runway: 320
Strike: 320
TARCAP: 230
hit_points: 18

1
resources/units/aircraft/MB-339A.yaml
View File

@ -26,3 +26,4 @@ tasks:
OCA/Aircraft: 240
OCA/Runway: 200
Strike: 180
hit_points: 18

1
resources/units/aircraft/MQ-9 Reaper.yaml
View File

@ -5,3 +5,4 @@ tasks:
BAI: 10
CAS: 10
OCA/Aircraft: 10
hit_points: 18

1
resources/units/aircraft/Mi-24P.yaml
View File

@ -31,3 +31,4 @@ tasks:
BAI: 410
CAS: 410
OCA/Aircraft: 410
hit_points: 20

1
resources/units/aircraft/Mi-24V.yaml
View File

@ -30,3 +30,4 @@ tasks:
BAI: 400
CAS: 400
OCA/Aircraft: 400
hit_points: 16

1
resources/units/aircraft/Mi-26.yaml
View File

@ -7,3 +7,4 @@ variants:
tasks:
Air Assault: 30
Transport: 0
hit_points: 30

1
resources/units/aircraft/Mi-28N.yaml
View File

@ -19,3 +19,4 @@ tasks:
BAI: 420
CAS: 420
OCA/Aircraft: 420
hit_points: 15

1
resources/units/aircraft/Mi-8MT.yaml
View File

@ -21,3 +21,4 @@ tasks:
CAS: 390
OCA/Aircraft: 390
Transport: 10
hit_points: 18

1
resources/units/aircraft/MiG-15bis.yaml
View File

@ -33,3 +33,4 @@ tasks:
OCA/Runway: 210
Strike: 210
TARCAP: 140
hit_points: 15

1
resources/units/aircraft/MiG-19P.yaml
View File

@ -44,3 +44,4 @@ tasks:
Intercept: 170
OCA/Aircraft: 370
TARCAP: 170
hit_points: 18

1
resources/units/aircraft/MiG-21Bis.yaml
View File

@ -39,3 +39,4 @@ tasks:
OCA/Runway: 220
Strike: 220
TARCAP: 350
hit_points: 20

1
resources/units/aircraft/MiG-23MLD.yaml
View File

@ -25,3 +25,4 @@ tasks:
Fighter sweep: 360
Intercept: 360
TARCAP: 360
hit_points: 16

1
resources/units/aircraft/MiG-25PD.yaml
View File

@ -34,3 +34,4 @@ tasks:
Fighter sweep: 390
Intercept: 390
TARCAP: 390
hit_points: 24

1
resources/units/aircraft/MiG-25RBT.yaml
View File

@ -29,3 +29,4 @@ max_range: 500
variants:
MiG-25RBT Foxbat-B: {}
tasks: {}
hit_points: 24

1
resources/units/aircraft/MiG-27K.yaml
View File

@ -25,3 +25,4 @@ tasks:
SEAD: 10
SEAD Escort: 10
Strike: 230
hit_points: 18

1
resources/units/aircraft/MiG-29A.yaml
View File

@ -40,3 +40,4 @@ tasks:
OCA/Runway: 410
Strike: 410
TARCAP: 370
hit_points: 16

1
resources/units/aircraft/MiG-29G.yaml
View File

@ -37,3 +37,4 @@ tasks:
OCA/Runway: 420
Strike: 420
TARCAP: 380
hit_points: 16

1
resources/units/aircraft/MiG-29S.yaml
View File

@ -40,3 +40,4 @@ tasks:
OCA/Runway: 430
Strike: 430
TARCAP: 470
hit_points: 16

1
resources/units/aircraft/MiG-31.yaml
View File

@ -24,3 +24,4 @@ tasks:
Fighter sweep: 400
Intercept: 400
TARCAP: 400
hit_points: 24

1
resources/units/aircraft/Mirage 2000-5.yaml
View File

@ -21,3 +21,4 @@ tasks:
Fighter sweep: 340
Intercept: 340
TARCAP: 340
hit_points: 16

1
resources/units/aircraft/Mirage-F1B.yaml
View File

@ -25,3 +25,4 @@ tasks:
OCA/Runway: 310
Strike: 310
TARCAP: 330
hit_points: 18

1
resources/units/aircraft/Mirage-F1BE.yaml
View File

@ -22,3 +22,4 @@ tasks:
OCA/Runway: 300
Strike: 300
TARCAP: 320
hit_points: 18

1
resources/units/aircraft/Mirage-F1C-200.yaml
View File

@ -17,3 +17,4 @@ tasks:
Fighter sweep: 260
Intercept: 260
TARCAP: 260
hit_points: 18

1
resources/units/aircraft/Mirage-F1CE.yaml
View File

@ -31,3 +31,4 @@ tasks:
OCA/Runway: 290
Strike: 290
TARCAP: 310
hit_points: 18

1
resources/units/aircraft/Mirage-F1CT.yaml
View File

@ -32,3 +32,4 @@ tasks:
OCA/Runway: 240
Strike: 240
TARCAP: 250
hit_points: 18

1
resources/units/aircraft/Mirage-F1EE.yaml
View File

@ -23,3 +23,4 @@ tasks:
OCA/Runway: 280
Strike: 280
TARCAP: 300
hit_points: 18

1
resources/units/aircraft/Mirage-F1EQ.yaml
View File

@ -22,3 +22,4 @@ tasks:
OCA/Runway: 270
Strike: 270
TARCAP: 290
hit_points: 18

1
resources/units/aircraft/Mirage-F1M-CE.yaml
View File

@ -27,3 +27,4 @@ tasks:
OCA/Runway: 260
Strike: 260
TARCAP: 280
hit_points: 18

1
resources/units/aircraft/Mirage-F1M-EE.yaml
View File

@ -27,3 +27,4 @@ tasks:
OCA/Runway: 250
Strike: 250
TARCAP: 270
hit_points: 18

1
resources/units/aircraft/MosquitoFBMkVI.yaml
View File

@ -24,3 +24,4 @@ tasks:
OCA/Runway: 30
Strike: 30
TARCAP: 70
hit_points: 48

1
resources/units/aircraft/OH-58D.yaml
View File

@ -24,3 +24,4 @@ tasks:
BAI: 470
CAS: 470
OCA/Aircraft: 470
hit_points: 12

1
resources/units/aircraft/P-47D-30.yaml
View File

@ -44,3 +44,4 @@ tasks:
OCA/Runway: 80
Strike: 80
TARCAP: 30
hit_points: 24

1
resources/units/aircraft/P-47D-30bl1.yaml
View File

@ -44,3 +44,4 @@ tasks:
OCA/Runway: 90
Strike: 90
TARCAP: 20
hit_points: 24

1
resources/units/aircraft/P-47D-40.yaml
View File

@ -44,3 +44,4 @@ tasks:
OCA/Runway: 100
Strike: 100
TARCAP: 10
hit_points: 24

1
resources/units/aircraft/P-51D-30-NA.yaml
View File

@ -43,3 +43,4 @@ tasks:
OCA/Runway: 70
Strike: 70
TARCAP: 110
hit_points: 18

1
resources/units/aircraft/P-51D.yaml
View File

@ -43,3 +43,4 @@ tasks:
OCA/Runway: 60
Strike: 60
TARCAP: 100
hit_points: 18

1
resources/units/aircraft/RQ-1A Predator.yaml
View File

@ -5,3 +5,4 @@ tasks:
BAI: 0
CAS: 0
OCA/Aircraft: 0
hit_points: 5

1
resources/units/aircraft/S-3B Tanker.yaml
View File

@ -26,3 +26,4 @@ variants:
S-3B Tanker: {}
tasks:
Refueling: 0
hit_points: 25

1
resources/units/aircraft/S-3B.yaml
View File

@ -26,3 +26,4 @@ tasks:
OCA/Aircraft: 570
OCA/Runway: 370
Strike: 370
hit_points: 25

1
resources/units/aircraft/SA342L.yaml
View File

@ -24,3 +24,4 @@ tasks:
BAI: 450
CAS: 450
OCA/Aircraft: 450
hit_points: 18

1
resources/units/aircraft/SA342M.yaml
View File

@ -27,3 +27,4 @@ tasks:
BAI: 460
CAS: 460
OCA/Aircraft: 460
hit_points: 18

1
resources/units/aircraft/SA342Minigun.yaml
View File

@ -6,3 +6,4 @@ variants:
SA342Minigun: null
kneeboard_units: "metric"
tasks: {}
hit_points: 18

1
resources/units/aircraft/SA342Mistral.yaml
View File

@ -21,3 +21,4 @@ variants:
SA 342M Gazelle Mistral: {}
kneeboard_units: "metric"
tasks: {}
hit_points: 18

Some files were not shown because too many files have changed in this diff Show More