New automatic de-briefing system implemented

game/db.py

@@ -2,6 +2,7 @@ import typing
 import enum
 from datetime import datetime
 
+from dcs.countries import get_by_id, country_dict
 from dcs.vehicles import *
 from dcs.ships import *
 from dcs.planes import *
@@ -836,6 +837,13 @@ def unitdict_from(fd: AssignedUnitsDict) -> Dict:
     return {k: v1 for k, (v1, v2) in fd.items()}
 
 
+def country_id_from_name(name):
+    for k,v in country_dict.items():
+        if v.name == name:
+            return k
+    return -1
+
+
 def _validate_db():
     # check unit by task uniquity
     total_set = set()

game/event/event.py

@@ -130,44 +130,65 @@ class Event:
 
     def commit(self, debriefing: Debriefing):
 
-        for destroyed_unit_name in debriefing.dead_units_name:
+        logging.info("Commiting mission results")
 
-            for cp in self.game.theater.controlpoints:
+        # ------------------------------
+        # Destroyed aircrafts
+        cp_map = {cp.id: cp for cp in self.game.theater.controlpoints}
+        for destroyed_aircraft in debriefing.killed_aircrafts:
+            try:
+                cpid = int(destroyed_aircraft.split("|")[3])
+                type = db.unit_type_from_name(destroyed_aircraft.split("|")[4])
+                if cpid in cp_map.keys():
+                    cp = cp_map[cpid]
+                    if type in cp.base.aircraft.keys():
+                        logging.info("Aircraft destroyed : " + str(type))
+                        cp.base.aircraft[type] = max(0, cp.base.aircraft[type]-1)
+            except Exception as e:
+                print(e)
 
-                for i, ground_object in enumerate(cp.ground_objects):
-                    if ground_object.dcs_identifier == "AA":
-                        for g in ground_object.groups:
-                            for u in g.units:
-                                if u.name == destroyed_unit_name:
-                                    g.units.remove(u)
-                        ucount = sum([len(g.units) for g in ground_object.groups])
-                        print(ucount)
-                        if ucount == 0:
-                            print("SET DEAD")
-                            ground_object.is_dead = True
+        # ------------------------------
+        # Destroyed ground units
+        cp_map = {cp.id: cp for cp in self.game.theater.controlpoints}
+        for killed_ground_unit in debriefing.killed_ground_units:
+            try:
+                cpid = int(killed_ground_unit.split("|")[3])
+                type = db.unit_type_from_name(killed_ground_unit.split("|")[4])
+                if cpid in cp_map.keys():
+                    cp = cp_map[cpid]
+                    if type in cp.base.armor.keys():
+                        logging.info("Ground unit destroyed : " + str(type))
+                        cp.base.armor[type] = max(0, cp.base.armor[type] - 1)
+            except Exception as e:
+                print(e)
 
-        for country, losses in debriefing.destroyed_units.items():
-            if country == self.attacker_name:
-                cp = self.departure_cp
-            else:
-                cp = self.to_cp
-
-            logging.info("base {} commit losses {}".format(cp.base, losses))
-            cp.base.commit_losses(losses)
-
-        for object_identifier in debriefing.destroyed_objects:
+        # ------------------------------
+        # Static ground objects
+        for destroyed_ground_unit_name in debriefing.killed_ground_units:
             for cp in self.game.theater.controlpoints:
                 if not cp.ground_objects:
                     continue
 
+                # -- Static ground objects
                 for i, ground_object in enumerate(cp.ground_objects):
                     if ground_object.is_dead:
                         continue
 
-                    if ground_object.matches_string_identifier(object_identifier):
+                    if ground_object.matches_string_identifier(destroyed_ground_unit_name):
                         logging.info("cp {} killing ground object {}".format(cp, ground_object.string_identifier))
                         cp.ground_objects[i].is_dead = True
 
+                # -- AA Site groups
+                for i, ground_object in enumerate(cp.ground_objects):
+                    if ground_object.dcs_identifier == "AA":
+                        for g in ground_object.groups:
+                            for u in g.units:
+                                if u.name == destroyed_ground_unit_name:
+                                    g.units.remove(u)
+                        ucount = sum([len(g.units) for g in ground_object.groups])
+                        if ucount == 0:
+                            ground_object.is_dead = True
+
     def skip(self):
         pass
 

game/event/frontlineattack.py

@@ -46,10 +46,12 @@ class FrontlineAttackEvent(Event):
             attacker_country = self.game.enemy_country
             defender_country = self.game.player_country
 
-        alive_attackers = sum([v for k, v in debriefing.alive_units.get(attacker_country, {}).items() if db.unit_task(k) == PinpointStrike])
-        alive_defenders = sum([v for k, v in debriefing.alive_units.get(defender_country, {}).items() if db.unit_task(k) == PinpointStrike])
+        # TODO : Rework
+        #alive_attackers = sum([v for k, v in debriefing.alive_units.get(attacker_country, {}).items() if db.unit_task(k) == PinpointStrike])
+        #alive_defenders = sum([v for k, v in debriefing.alive_units.get(defender_country, {}).items() if db.unit_task(k) == PinpointStrike])
+        #attackers_success = (float(alive_attackers) / (alive_defenders + 0.01)) > self.SUCCESS_FACTOR
+        attackers_success = True
 
-        attackers_success = (float(alive_attackers) / (alive_defenders + 0.01)) > self.SUCCESS_FACTOR
         if self.from_cp.captured:
             return attackers_success
         else:

game/operation/baseattack.py

@@ -50,7 +50,6 @@ class BaseAttackOperation(Operation):
 
     def generate(self):
         self.armorgen.generate(self.attack, self.defense)
-        self.aagen.generate(self.aa)
 
         self.airgen.generate_defense(*assigned_units_split(self.intercept), at=self.defenders_starting_position)
 

game/operation/infantrytransport.py

@@ -31,7 +31,6 @@ class InfantryTransportOperation(Operation):
         self.airgen.generate_passenger_transport(*assigned_units_split(self.transport), at=self.attackers_starting_position)
 
         self.armorgen.generate_passengers(count=6)
-        self.aagen.generate_at_defenders_location(self.aa)
 
         self.visualgen.generate_transportation_marker(self.conflict.ground_attackers_location)
         self.visualgen.generate_transportation_destination(self.conflict.position)

game/operation/operation.py

@@ -1,8 +1,7 @@
 from dcs.lua.parse import loads
 
-from userdata.debriefing import *
-
 from gen import *
+from userdata.debriefing import *
 
 TANKER_CALLSIGNS = ["Texaco", "Arco", "Shell"]
 
@@ -17,7 +16,6 @@ class Operation:
     conflict = None  # type: Conflict
     armorgen = None  # type: ArmorConflictGenerator
     airgen = None  # type: AircraftConflictGenerator
-    aagen = None  # type: AAConflictGenerator
     extra_aagen = None  # type: ExtraAAConflictGenerator
     shipgen = None  # type: ShipGenerator
     triggersgen = None  # type: TriggersGenerator
@@ -67,7 +65,6 @@ class Operation:
         self.conflict = conflict
         self.armorgen = ArmorConflictGenerator(mission, conflict)
         self.airgen = AircraftConflictGenerator(mission, conflict, self.game.settings)
-        self.aagen = AAConflictGenerator(mission, conflict)
         self.shipgen = ShipGenerator(mission, conflict)
         self.airsupportgen = AirSupportConflictGenerator(mission, conflict, self.game)
         self.triggersgen = TriggersGenerator(mission, conflict, self.game)
@@ -85,8 +82,6 @@ class Operation:
         with open("resources/default_options.lua", "r") as f:
             options_dict = loads(f.read())["options"]
 
-        dcs.Mission.aaa_vehicle_group = aaa.aaa_vehicle_group
-
         self.current_mission = dcs.Mission(terrain)
 
         if is_quick:
@@ -200,7 +195,10 @@ class Operation:
         load_dcs_libe = TriggerStart(comment="Load DCS Liberation Script")
         with open(os.path.abspath("./resources/scripts/dcs_liberation.lua")) as f:
             script = f.read()
-            script = script.replace("{{json_file_abs_location}}", "'"+os.path.abspath("./resources/scripts/json.lua"+"'"))
+            json_location = "[["+os.path.abspath("resources\\scripts\\json.lua")+"]]"
+            state_location = "[[" + os.path.abspath("state.json") + "]]"
+            script = script.replace("{{json_file_abs_location}}", json_location)
+            script = script.replace("{{debriefing_file_location}}", state_location)
             load_dcs_libe.add_action(DoScript(String(script)))
         self.current_mission.triggerrules.triggers.append(load_dcs_libe)