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

Stats view now has a tab for vehicles forces. Display waypoint coordinates in waypoint tab.

Browse Source
This commit is contained in:
Khopa
2019-10-19 13:12:21 +02:00
parent 7fbc75b375
commit 48a40f2511
16 changed files with 187 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
game/event/frontlineattack.py
View File

@@ -76,7 +76,7 @@ class FrontlineAttackEvent(Event):
self.to_cp.base.affect_strength(-0.1)
def player_attacking(self, flights: db.TaskForceDict):
assert CAS in flights and CAP in flights and len(flights) == 2, "Invalid flights"
# assert CAS in flights and CAP in flights and len(flights) == 2, "Invalid flights"
op = FrontlineAttackOperation(game=self.game,
attacker_name=self.attacker_name,
@@ -97,7 +97,7 @@ class FrontlineAttackEvent(Event):
self.operation = op
def player_defending(self, flights: db.TaskForceDict):
assert CAP in flights and len(flights) == 1, "Invalid flights"
# assert CAP in flights and len(flights) == 1, "Invalid flights"
op = FrontlineAttackOperation(game=self.game,
attacker_name=self.attacker_name,

2
game/game.py
View File

@@ -307,8 +307,6 @@ class Game:
self.events = [] # type: typing.List[Event]
self._generate_events()
#self._generate_globalinterceptions()
# Update statistics
self.game_stats.update(self)

6
game/operation/frontlineattack.py
View File

@@ -47,11 +47,11 @@ class FrontlineAttackOperation(Operation):
conflict=conflict)
def generate(self):
if self.is_player_attack:
self.prepare_carriers(db.unitdict_from(self.strikegroup))
#if self.is_player_attack:
# self.prepare_carriers(db.unitdict_from(self.strikegroup))
# ground units
self.armorgen.generate_vec(self.attackers, self.defenders)
# self.armorgen.generate_vec(self.attackers, self.defenders)
## strike group w/ heli support
#planes_flights = {k: v for k, v in self.strikegroup.items() if k in plane_map.values()}

17
game/operation/operation.py
View File

@@ -149,16 +149,13 @@ class Operation:
self.airgen.generate_flights(cp, country, self.game.planners[cp.id])
# Generate ground units on frontline everywhere
for cp in self.game.theater.controlpoints:
if cp.captured:
for cp_enn in cp.connected_points:
if not cp_enn.captured:
conflict = Conflict.frontline_cas_conflict(self.attacker_name, self.defender_name,
self.current_mission.country(self.attacker_country),
self.current_mission.country(self.defender_country),
cp, cp_enn, self.game.theater)
armorgen = ArmorConflictGenerator(self.current_mission, conflict)
armorgen.generate_vec(cp.base.armor, cp_enn.base.armor)
for player_cp, enemy_cp in self.game.theater.conflicts(True):
conflict = Conflict.frontline_cas_conflict(self.attacker_name, self.defender_name,
self.current_mission.country(self.attacker_country),
self.current_mission.country(self.defender_country),
player_cp, enemy_cp, self.game.theater)
armorgen = ArmorConflictGenerator(self.current_mission, conflict)
armorgen.generate_vec(player_cp.base.armor, enemy_cp.base.armor)
#Setup combined arms parameters
self.current_mission.groundControl.pilot_can_control_vehicles = self.ca_slots > 0