weyne/dcs-retribution
1
0
Fork 0
mirror of https://github.com/dcs-retribution/dcs-retribution.git synced 2025-11-10 15:41:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

carrier operations WIP

Browse Source
This commit is contained in:
Vasyl Horbachenko
2018-06-07 23:18:10 +03:00
parent 2915287afb
commit 3f80579d04
12 changed files with 69 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
game/event.py
View File

@@ -83,7 +83,7 @@ class GroundInterceptEvent(Event):
defender=self.defender,
attacker_clients=clients,
defender_clients={},
attacker_airport=self.from_cp.at,
from_cp=self.from_cp,
position=position,
target=targets,
strikegroup=strikegroup)
@@ -121,9 +121,8 @@ class InterceptEvent(Event):
defender=self.defender,
attacker_clients=clients,
defender_clients={},
attacker_airport=self.from_cp.at,
destination=self.to_cp,
destination_port=self.to_cp.at,
from_cp=self.from_cp,
to_cp=self.to_cp,
escort=escort,
transport={transport_unit: 1},
airdefense={airdefense_unit: self.AIRDEFENSE_COUNT},
@@ -139,9 +138,8 @@ class InterceptEvent(Event):
defender=self.defender,
attacker_clients={},
defender_clients=clients,
attacker_airport=None,
destination=self.to_cp,
destination_port=self.to_cp.at,
from_cp=self.from_cp,
to_cp=self.to_cp,
escort=escort,
transport={transport_unit: 1},
interceptors=interceptors,
@@ -180,7 +178,6 @@ class CaptureEvent(Event):
defender=self.defender,
attacker_clients={},
defender_clients=clients,
attacker_airport=None,
from_cp=self.from_cp,
to_cp=self.to_cp,
cas=cas,
@@ -198,7 +195,6 @@ class CaptureEvent(Event):
defender=self.defender,
attacker_clients=clients,
defender_clients={},
attacker_airport=self.from_cp.at,
from_cp=self.from_cp,
to_cp=self.to_cp,
cas=cas,

7
game/game.py
View File

@@ -23,8 +23,8 @@ COMMISION_AMOUNTS_FACTORS = {
}
ENEMY_INTERCEPT_PROBABILITY_BASE = 15
ENEMY_CAPTURE_PROBABILITY_BASE = 5
ENEMY_INTERCEPT_PROBABILITY_BASE = 10
ENEMY_CAPTURE_PROBABILITY_BASE = 3
PLAYER_INTERCEPT_PROBABILITY_BASE = 30
PLAYER_GROUNDINTERCEPT_PROBABILITY_BASE = 30
@@ -128,7 +128,8 @@ class Game:
return event
def units_delivery_remove(self, event: Event):
self.events.remove(event)
if event in self.events:
self.events.remove(event)
def initiate_event(self, event: Event):
event.operation.generate()

30
game/operation.py
View File

@@ -43,7 +43,6 @@ class CaptureOperation(Operation):
defender: Country,
attacker_clients: db.PlaneDict,
defender_clients: db.PlaneDict,
attacker_airport: typing.Optional[Airport],
from_cp: ControlPoint,
to_cp: ControlPoint,
cas: db.PlaneDict,
@@ -59,7 +58,6 @@ class CaptureOperation(Operation):
self.to_cp = to_cp
self.attacker_clients = attacker_clients
self.defender_clients = defender_clients
self.attacker_airport = attacker_airport
self.cas = cas
self.escort = escort
self.intercept = intercept
@@ -74,8 +72,8 @@ class CaptureOperation(Operation):
self.aagen.generate(self.aa)
self.airgen.generate_defense(self.intercept, clients=self.defender_clients)
self.airgen.generate_cas(self.cas, clients=self.attacker_clients, at=self.attacker_airport)
self.airgen.generate_cas_escort(self.escort, clients=self.attacker_clients, at=self.attacker_airport)
self.airgen.generate_cas(self.cas, clients=self.attacker_clients, at=self.from_cp.at)
self.airgen.generate_cas_escort(self.escort, clients=self.attacker_clients, at=self.from_cp.at)
class InterceptOperation(Operation):
@@ -85,9 +83,8 @@ class InterceptOperation(Operation):
defender: Country,
attacker_clients: db.PlaneDict,
defender_clients: db.PlaneDict,
attacker_airport: typing.Optional[Airport],
destination: ControlPoint,
destination_port: Airport,
from_cp: ControlPoint,
to_cp: ControlPoint,
escort: db.PlaneDict,
transport: db.PlaneDict,
airdefense: db.AirDefenseDict,
@@ -95,14 +92,14 @@ class InterceptOperation(Operation):
conflict = Conflict.intercept_conflict(
attacker=attacker,
defender=defender,
position=destination.position,
position=to_cp.position,
heading=randint(0, 360),
radials=ALL_RADIALS
)
super(InterceptOperation, self).__init__(mission, conflict)
self.destination_port = destination_port
self.attacker_airport = attacker_airport
self.to_cp = to_cp
self.from_cp = from_cp
self.attacker_clients = attacker_clients
self.defender_clients = defender_clients
self.escort = escort
@@ -111,11 +108,14 @@ class InterceptOperation(Operation):
self.interceptors = interceptors
def generate(self):
self.airgen.generate_transport(self.transport, self.destination_port)
self.airgen.generate_transport(self.transport, self.to_cp.at)
self.airgen.generate_transport_escort(self.escort, clients=self.defender_clients)
self.aagen.generate(self.airdefense)
self.airgen.generate_interception(self.interceptors, clients=self.attacker_clients, airport=self.attacker_airport)
if self.from_cp.is_global:
self.airgen.generate_interception(self.interceptors, clients=self.attacker_clients, at=self.shipgen.generate(self.from_cp.at))
else:
self.airgen.generate_interception(self.interceptors, clients=self.attacker_clients, at=self.from_cp.at)
class GroundInterceptOperation(Operation):
@@ -123,9 +123,9 @@ class GroundInterceptOperation(Operation):
mission: Mission,
attacker: Country,
defender: Country,
from_cp: ControlPoint,
attacker_clients: db.PlaneDict,
defender_clients: db.PlaneDict,
attacker_airport: typing.Optional[Airport],
position: Point,
target: db.ArmorDict,
strikegroup: db.PlaneDict):
@@ -140,10 +140,10 @@ class GroundInterceptOperation(Operation):
super(GroundInterceptOperation, self).__init__(mission, conflict)
self.attacker_clients = attacker_clients
self.defender_clients = defender_clients
self.attacker_airport = attacker_airport
self.from_cp = from_cp
self.strikegroup = strikegroup
self.target = target
def generate(self):
self.airgen.generate_cas(self.strikegroup, clients=self.attacker_clients, at=self.attacker_airport)
self.airgen.generate_cas(self.strikegroup, clients=self.attacker_clients, at=self.from_cp.at)
self.armorgen.generate({}, self.target)