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

Fix unit type comparisons.

Browse Source 
When comparing UnitType against a pydcs type, use .dcs_unit_type.

(cherry picked from commit 30763b5401)
This commit is contained in:
Mike Jones
2021-06-21 15:03:18 +01:00
committed by Dan Albert
parent c227923bdf
commit 2bcff5a5c2
2 changed files with 17 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
gen/flights/flightplan.py
View File

@@ -1093,13 +1093,13 @@ class FlightPlanBuilder:
orbit_location = self.aewc_orbit(location)
# As high as possible to maximize detection and on-station time.
if flight.unit_type == E_2C:
if flight.unit_type.dcs_unit_type == E_2C:
patrol_alt = feet(30000)
elif flight.unit_type == E_3A:
elif flight.unit_type.dcs_unit_type == E_3A:
patrol_alt = feet(35000)
elif flight.unit_type == A_50:
elif flight.unit_type.dcs_unit_type == A_50:
patrol_alt = feet(33000)
elif flight.unit_type == KJ_2000:
elif flight.unit_type.dcs_unit_type == KJ_2000:
patrol_alt = feet(40000)
else:
patrol_alt = feet(25000)
@@ -1680,23 +1680,23 @@ class FlightPlanBuilder:
builder = WaypointBuilder(flight, self.game, self.is_player)
tanker_type = flight.unit_type
if tanker_type is KC_135:
if tanker_type.dcs_unit_type is KC_135:
# ~300 knots IAS.
speed = knots(445)
altitude = feet(24000)
elif tanker_type is KC135MPRS:
elif tanker_type.dcs_unit_type is KC135MPRS:
# ~300 knots IAS.
speed = knots(440)
altitude = feet(23000)
elif tanker_type is KC130:
elif tanker_type.dcs_unit_type is KC130:
# ~210 knots IAS, roughly the max for the KC-130 at altitude.
speed = knots(370)
altitude = feet(22000)
elif tanker_type is S_3B_Tanker:
elif tanker_type.dcs_unit_type is S_3B_Tanker:
# ~265 knots IAS.
speed = knots(320)
altitude = feet(12000)
elif tanker_type is IL_78M:
elif tanker_type.dcs_unit_type is IL_78M:
# ~280 knots IAS.
speed = knots(400)
altitude = feet(21000)