Selectable factions wip

game/operation/baseattack.py

@@ -37,6 +37,8 @@ class BaseAttackOperation(Operation):
             self.attackers_starting_position = None
 
         conflict = Conflict.capture_conflict(
+            attacker_name=self.attacker_name,
+            defender_name=self.defender_name,
             attacker=self.current_mission.country(self.attacker_country),
             defender=self.current_mission.country(self.defender_country),
             from_cp=self.from_cp,

game/operation/convoystrike.py

@@ -17,6 +17,8 @@ class ConvoyStrikeOperation(Operation):
         super(ConvoyStrikeOperation, self).prepare(terrain, is_quick)
 
         conflict = Conflict.convoy_strike_conflict(
+            attacker_name=self.attacker_name,
+            defender_name=self.defender_name,
             attacker=self.current_mission.country(self.attacker_country),
             defender=self.current_mission.country(self.defender_country),
             from_cp=self.from_cp,

game/operation/frontlineattack.py

@@ -34,6 +34,8 @@ class FrontlineAttackOperation(Operation):
             self.defenders_starting_position = None
 
         conflict = Conflict.frontline_cas_conflict(
+            attacker_name=self.attacker_name,
+            defender_name=self.defender_name,
             attacker=self.current_mission.country(self.attacker_country),
             defender=self.current_mission.country(self.defender_country),
             from_cp=self.from_cp,

game/operation/frontlinepatrol.py

@@ -32,6 +32,8 @@ class FrontlinePatrolOperation(Operation):
         self.defenders_starting_position = None
 
         conflict = Conflict.frontline_cap_conflict(
+            attacker_name=self.attacker_name,
+            defender_name=self.defender_name,
             attacker=self.current_mission.country(self.attacker_country),
             defender=self.current_mission.country(self.defender_country),
             from_cp=self.from_cp,

game/operation/infantrytransport.py

@@ -15,6 +15,8 @@ class InfantryTransportOperation(Operation):
         super(InfantryTransportOperation, self).prepare(terrain, is_quick)
 
         conflict = Conflict.transport_conflict(
+            attacker_name=self.attacker_name,
+            defender_name=self.defender_name,
             attacker=self.current_mission.country(self.attacker_country),
             defender=self.current_mission.country(self.defender_country),
             from_cp=self.from_cp,

game/operation/insurgentattack.py

@@ -17,6 +17,8 @@ class InsurgentAttackOperation(Operation):
         super(InsurgentAttackOperation, self).prepare(terrain, is_quick)
 
         conflict = Conflict.ground_attack_conflict(
+            attacker_name=self.attacker_name,
+            defender_name=self.defender_name,
             attacker=self.current_mission.country(self.attacker_country),
             defender=self.current_mission.country(self.defender_country),
             from_cp=self.from_cp,

game/operation/intercept.py

@@ -31,6 +31,8 @@ class InterceptOperation(Operation):
             self.attackers_starting_position = None
 
         conflict = Conflict.intercept_conflict(
+            attacker_name=self.attacker_name,
+            defender_name=self.defender_name,
             attacker=self.current_mission.country(self.attacker_country),
             defender=self.current_mission.country(self.defender_country),
             position=self.location,

game/operation/navalintercept.py

@@ -26,6 +26,8 @@ class NavalInterceptionOperation(Operation):
             self.attackers_starting_position = None
 
         conflict = Conflict.naval_intercept_conflict(
+            attacker_name=self.attacker_name,
+            defender_name=self.defender_name,
             attacker=self.current_mission.country(self.attacker_country),
             defender=self.current_mission.country(self.defender_country),
             position=self.location,

game/operation/operation.py

@@ -43,9 +43,9 @@ class Operation:
                  to_cp: ControlPoint = None):
         self.game = game
         self.attacker_name = attacker_name
-        self.attacker_country = db.UNIT_BY_COUNTRY[attacker_name]["country"]
+        self.attacker_country = db.FACTIONS[attacker_name]["country"]
         self.defender_name = defender_name
-        self.defender_country = db.UNIT_BY_COUNTRY[defender_name]["country"]
+        self.defender_country = db.FACTIONS[defender_name]["country"]
         print(self.defender_country, self.attacker_country)
         self.from_cp = from_cp
         self.departure_cp = departure_cp
@@ -137,7 +137,7 @@ class Operation:
         self.extra_aagen.generate()
 
         # triggers
-        if self.game.is_player_attack(self.conflict.attackers_side):
+        if self.game.is_player_attack(self.conflict.attackers_country):
             cp = self.conflict.from_cp
         else:
             cp = self.conflict.to_cp

game/operation/strike.py

@@ -29,6 +29,8 @@ class StrikeOperation(Operation):
             self.attackers_starting_position = None
 
         conflict = Conflict.strike_conflict(
+            attacker_name=self.attacker_name,
+            defender_name=self.defender_name,
             attacker=self.current_mission.country(self.attacker_country),
             defender=self.current_mission.country(self.defender_country),
             from_cp=self.from_cp,