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

Merge pull request #343 from walterroach/missed_events

Browse Source 
Missed Debrief Events
This commit is contained in:
walterroach 2020-11-09 15:36:09 -06:00 committed by GitHub
commit ef585c59dd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
game/event/event.py
View File

@ -144,8 +144,12 @@ class Event:
for i, ground_object in enumerate(cp.ground_objects): for i, ground_object in enumerate(cp.ground_objects):
if ground_object.is_dead: if ground_object.is_dead:
continue continue
if ground_object.is_same_group(destroyed_ground_unit_name): if (
(ground_object.group_name == destroyed_ground_unit_name)
or
(ground_object.is_same_group(destroyed_ground_unit_name))
):
logging.info("cp {} killing ground object {}".format(cp, ground_object.group_name)) logging.info("cp {} killing ground object {}".format(cp, ground_object.group_name))
cp.ground_objects[i].is_dead = True cp.ground_objects[i].is_dead = True
@ -161,7 +165,7 @@ class Event:
"", "",
self.game.turn) self.game.turn)
for i, ground_object in enumerate(cp.ground_objects): for i, ground_object in enumerate(cp.ground_objects):
if ground_object.dcs_identifier in ["AA", "CARRIER", "LHA"]: if ground_object.dcs_identifier in ["AA", "CARRIER", "LHA", "EWR"]:
for g in ground_object.groups: for g in ground_object.groups:
if not hasattr(g, "units_losts"): if not hasattr(g, "units_losts"):
g.units_losts = [] g.units_losts = []

3
theater/theatergroundobject.py
View File

@ -25,7 +25,8 @@ NAME_BY_CATEGORY = {
"derrick": "Derrick", "derrick": "Derrick",
"ww2bunker": "Bunker", "ww2bunker": "Bunker",
"village": "Village", "village": "Village",
"allycamp": "Camp" "allycamp": "Camp",
"EWR":"EWR",
} }
ABBREV_NAME = { ABBREV_NAME = {