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

configure client slots on scramble + fixes

Browse Source
This commit is contained in:
Vasyl Horbachenko
2018-06-05 04:14:39 +03:00
parent 0f569d43b0
commit fb377cb6ca
14 changed files with 183 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
game/event.py
View File

@@ -71,7 +71,7 @@ class GroundInterceptEvent(Event):
else:
pass
def player_attacking(self, position: Point, strikegroup: typing.Dict[PlaneType, int]):
def player_attacking(self, position: Point, strikegroup: db.PlaneDict, clients: db.PlaneDict):
suitable_unittypes = db.find_unittype(CAP, self.defender.name)
random.shuffle(suitable_unittypes)
unittypes = suitable_unittypes[:self.TARGET_VARIETY]
@@ -81,6 +81,8 @@ class GroundInterceptEvent(Event):
self.operation = GroundInterceptOperation(mission=self.mission,
attacker=self.attacker,
defender=self.defender,
attacker_clients=clients,
defender_clients={},
position=position,
target=targets,
strikegroup=strikegroup)
@@ -105,7 +107,7 @@ class InterceptEvent(Event):
if self.to_cp.captured:
self.to_cp.base.affect_strength(-self.STRENGTH_INFLUENCE)
def player_attacking(self, interceptors: typing.Dict[PlaneType, int]):
def player_attacking(self, interceptors: db.PlaneDict, clients: db.PlaneDict):
escort = self.to_cp.base.scramble_sweep(self.to_cp)
transport_unit = random.choice(db.find_unittype(Transport, self.defender.name))
assert transport_unit is not None
@@ -113,13 +115,15 @@ class InterceptEvent(Event):
self.operation = InterceptOperation(mission=self.mission,
attacker=self.attacker,
defender=self.defender,
attacker_clients=clients,
defender_clients={},
destination=self.to_cp,
destination_port=self.to_cp.airport,
escort=escort,
transport={transport_unit: 1},
interceptors=interceptors)
def player_defending(self, escort: typing.Dict[PlaneType, int]):
def player_defending(self, escort: db.PlaneDict, clients: db.PlaneDict):
interceptors = self.from_cp.base.scramble_interceptors_count(self.difficulty * self.ESCORT_AMOUNT_FACTOR)
transport_unit = random.choice(db.find_unittype(Transport, self.defender.name))
assert transport_unit is not None
@@ -127,6 +131,8 @@ class InterceptEvent(Event):
self.operation = InterceptOperation(mission=self.mission,
attacker=self.attacker,
defender=self.defender,
attacker_clients={},
defender_clients=clients,
destination=self.to_cp,
destination_port=self.to_cp.airport,
escort=escort,
@@ -156,7 +162,7 @@ class CaptureEvent(Event):
if self.to_cp.captured:
self.to_cp.captured = False
def player_defending(self, interceptors: typing.Dict[PlaneType, int]):
def player_defending(self, interceptors: db.PlaneDict, clients: db.PlaneDict):
cas = self.from_cp.base.scramble_cas(self.to_cp)
escort = self.from_cp.base.scramble_sweep(self.to_cp)
attackers = self.from_cp.base.assemble_cap(self.to_cp)
@@ -164,6 +170,8 @@ class CaptureEvent(Event):
self.operation = CaptureOperation(mission=self.mission,
attacker=self.attacker,
defender=self.defender,
attacker_clients={},
defender_clients=clients,
from_cp=self.from_cp,
to_cp=self.to_cp,
cas=cas,
@@ -173,12 +181,14 @@ class CaptureEvent(Event):
defense=self.to_cp.base.armor,
aa=self.to_cp.base.aa)
def player_attacking(self, cas: typing.Dict[PlaneType, int], escort: typing.Dict[PlaneType, int], armor: typing.Dict[Armor, int]):
def player_attacking(self, cas: db.PlaneDict, escort: db.PlaneDict, armor: db.ArmorDict, clients: db.PlaneDict):
interceptors = self.to_cp.base.scramble_sweep(for_target=self.to_cp)
self.operation = CaptureOperation(mission=self.mission,
attacker=self.attacker,
defender=self.defender,
attacker_clients=clients,
defender_clients={},
from_cp=self.from_cp,
to_cp=self.to_cp,
cas=cas,

47
game/operation.py
View File

@@ -8,6 +8,7 @@ from dcs.vehicles import *
from theater.controlpoint import *
from theater.conflicttheater import *
from theater.base import *
from shop import *
from gen.armor import *
from gen.aircraft import *
@@ -38,19 +39,23 @@ class CaptureOperation(Operation):
mission: Mission,
attacker: Country,
defender: Country,
attacker_clients: db.PlaneDict,
defender_clients: db.PlaneDict,
from_cp: ControlPoint,
to_cp: ControlPoint,
cas: typing.Dict[PlaneType, int],
escort: typing.Dict[PlaneType, int],
attack: typing.Dict[Armor, int],
intercept: typing.Dict[PlaneType, int],
defense: typing.Dict[Armor, int],
aa: typing.Dict[AirDefence, int]):
cas: db.PlaneDict,
escort: db.PlaneDict,
attack: db.ArmorDict,
intercept: db.PlaneDict,
defense: db.ArmorDict,
aa: db.AADict):
conflict = to_cp.conflict_attack(from_cp, attacker, defender)
super(CaptureOperation, self).__init__(mission, conflict)
self.from_cp = from_cp
self.to_cp = to_cp
self.attacker_clients = attacker_clients
self.defender_clients = defender_clients
self.cas = cas
self.escort = escort
self.intercept = intercept
@@ -62,9 +67,9 @@ class CaptureOperation(Operation):
def generate(self):
self.armorgen.generate(self.attack, self.defense)
self.airgen.generate_cas(self.cas)
self.airgen.generate_cas_escort(self.escort)
self.airgen.generate_defense(self.intercept)
self.airgen.generate_cas(self.cas, clients=self.attacker_clients)
self.airgen.generate_cas_escort(self.escort, clients=self.attacker_clients)
self.airgen.generate_defense(self.intercept, clients=self.defender_clients)
self.aagen.generate(self.aa)
@@ -73,11 +78,13 @@ class InterceptOperation(Operation):
mission: Mission,
attacker: Country,
defender: Country,
attacker_clients: db.PlaneDict,
defender_clients: db.PlaneDict,
destination: ControlPoint,
destination_port: Airport,
escort: typing.Dict[PlaneType, int],
transport: typing.Dict[PlaneType, int],
interceptors: typing.Dict[PlaneType, int]):
escort: db.PlaneDict,
transport: db.PlaneDict,
interceptors: db.PlaneDict):
conflict = Conflict.intercept_conflict(
attacker=attacker,
defender=defender,
@@ -88,14 +95,16 @@ class InterceptOperation(Operation):
super(InterceptOperation, self).__init__(mission, conflict)
self.destination_port = destination_port
self.attacker_clients = attacker_clients
self.defender_clients = defender_clients
self.escort = escort
self.transport = transport
self.interceptors = interceptors
def generate(self):
self.airgen.generate_transport(self.transport, self.destination_port)
self.airgen.generate_transport_escort(self.escort)
self.airgen.generate_interception(self.interceptors)
self.airgen.generate_transport_escort(self.escort, clients=self.defender_clients)
self.airgen.generate_interception(self.interceptors, clients=self.attacker_clients)
class GroundInterceptOperation(Operation):
@@ -103,9 +112,11 @@ class GroundInterceptOperation(Operation):
mission: Mission,
attacker: Country,
defender: Country,
attacker_clients: db.PlaneDict,
defender_clients: db.PlaneDict,
position: Point,
target: typing.Dict[VehicleType, int],
strikegroup: typing.Dict[PlaneType, int]):
target: db.ArmorDict,
strikegroup: db.PlaneDict):
conflict = Conflict.ground_intercept_conflict(
attacker=attacker,
defender=defender,
@@ -115,10 +126,12 @@ class GroundInterceptOperation(Operation):
)
super(GroundInterceptOperation, self).__init__(mission, conflict)
self.attacker_clients = attacker_clients
self.defender_clients = defender_clients
self.strikegroup = strikegroup
self.target = target
def generate(self):
self.airgen.generate_cas(self.strikegroup)
self.airgen.generate_cas(self.strikegroup, clients=self.attacker_clients)
self.armorgen.generate({}, self.target)