Skip to content

Commit

Permalink
Issue 3154 (#3447)
Browse files Browse the repository at this point in the history
This PR addresses #3154 by removing LHAs, CVNs and off map spawn control
points from the transit network.
  • Loading branch information
zhexu14 authored Oct 6, 2024
1 parent 25b93b5 commit 5d0ddea
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 4 deletions.
5 changes: 3 additions & 2 deletions changelog.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,14 @@ Saves from 11.x are not compatible with 12.0.0.
## Features/Improvements

* **[Engine]** Support for DCS 2.9.8.1214.
* **[Campaign]** Flights are assigned different callsigns appropriate to the faction.
* **[Campaign]** Removed deprecated settings for generating persistent and invulnerable AWACs and tankers.
* **[Campaign]** Do not allow aircraft from a captured control point to retreat if the captured control point has a damaged runway.
* **[Mods]** F/A-18 E/F/G Super Hornet mod version updated to 2.3.

## Fixes

* **[Campaign]** Flights are assigned different callsigns appropriate to the faction.
* **[Campaign]** Do not allow aircraft from a captured control point to retreat if the captured control point has a damaged runway.
* **[Campaign]** Do not allow ground units to be transferred to LHAs, CVNs or off map spawns.

# 11.1.1

Expand Down
11 changes: 9 additions & 2 deletions game/theater/transitnetwork.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
from typing import Dict, Iterator, List, Optional, Set, Tuple

from .conflicttheater import ConflictTheater
from .controlpoint import ControlPoint
from .controlpoint import ControlPoint, ControlPointType


class NoPathError(RuntimeError):
Expand Down Expand Up @@ -160,7 +160,14 @@ def __init__(self, theater: ConflictTheater, for_player: bool) -> None:
self.airports: Set[ControlPoint] = {
cp
for cp in self.control_points
if cp.is_friendly(for_player) and cp.runway_is_operational()
if cp.is_friendly(for_player)
and cp.runway_is_operational()
and cp.cptype
not in [
ControlPointType.LHA_GROUP,
ControlPointType.AIRCRAFT_CARRIER_GROUP,
ControlPointType.OFF_MAP,
] # TransitNetwork is for ground units, so do not consider LHAs, CVNs or off map spawns.
}

def build(self) -> TransitNetwork:
Expand Down

0 comments on commit 5d0ddea

Please sign in to comment.