diff --git a/game/operation/operation.py b/game/operation/operation.py index 9046cc1a..1253badc 100644 --- a/game/operation/operation.py +++ b/game/operation/operation.py @@ -18,7 +18,6 @@ class Operation: conflict = None # type: Conflict armorgen = None # type: ArmorConflictGenerator airgen = None # type: AircraftConflictGenerator - shipgen = None # type: ShipGenerator triggersgen = None # type: TriggersGenerator airsupportgen = None # type: AirSupportConflictGenerator visualgen = None # type: VisualGenerator @@ -65,7 +64,6 @@ class Operation: self.current_mission = mission self.conflict = conflict self.airgen = AircraftConflictGenerator(mission, conflict, self.game.settings, self.game) - self.shipgen = ShipGenerator(mission, conflict) self.airsupportgen = AirSupportConflictGenerator(mission, conflict, self.game) self.triggersgen = TriggersGenerator(mission, conflict, self.game) self.visualgen = VisualGenerator(mission, conflict, self.game) diff --git a/gen/__init__.py b/gen/__init__.py index ccddeab9..d910a19d 100644 --- a/gen/__init__.py +++ b/gen/__init__.py @@ -3,7 +3,6 @@ from .aircraft import * from .armor import * from .airsupportgen import * from .conflictgen import * -from .shipgen import * from .visualgen import * from .triggergen import * from .environmentgen import * diff --git a/gen/shipgen.py b/gen/shipgen.py deleted file mode 100644 index 110c1fb1..00000000 --- a/gen/shipgen.py +++ /dev/null @@ -1,53 +0,0 @@ -import logging - -from game import db -from .conflictgen import * -from .naming import * - -from dcs.mission import * -from dcs.unitgroup import * -from dcs.task import * - -SHIP_RANDOM_SPREAD = 300 - - -class ShipGenerator: - def __init__(self, mission: Mission, conflict: Conflict): - self.m = mission - self.conflict = conflict - - def generate_carrier(self, for_units: typing.Collection[UnitType], country: str, at: Point) -> ShipGroup: - type = db.find_unittype(Carriage, country)[0] - for unit_type in for_units: - if unit_type in db.CARRIER_TYPE_BY_PLANE: - type = db.CARRIER_TYPE_BY_PLANE[unit_type] - break - - group = self.m.ship_group( - country=self.m.country(country), - name=namegen.next_carrier_name(self.m.country(country)), - _type=type, - position=at) - - group.points[0].tasks.append(ActivateBeaconCommand(unit_id=group.id, channel=20, callsign="SHDW", aa=False)) - group.points[0].tasks.append(ActivateICLSCommand(unit_id=group.id, channel=1)) - return group - - def generate_cargo(self, units: db.ShipDict) -> typing.Collection[ShipGroup]: - groups = [] - offset = 0 - for unit_type, unit_count in units.items(): - for _ in range(unit_count): - offset += 1 - logging.info("shipgen: {} ({}) for {}".format(unit_type, unit_count, self.conflict.defenders_side)) - group = self.m.ship_group( - country=self.conflict.defenders_country, - name=namegen.next_unit_name(self.conflict.defenders_country, unit_type), - _type=unit_type, - position=self.conflict.ground_defenders_location.random_point_within(SHIP_RANDOM_SPREAD, SHIP_RANDOM_SPREAD).point_from_heading(0, offset * SHIP_RANDOM_SPREAD) - ) - - group.add_waypoint(self.conflict.to_cp.position) - groups.append(group) - - return groups