Merge remote-tracking branch 'khopa/develop' into helipads

game/db.py

@@ -87,6 +87,14 @@ vehicle_map["Toyota_bleu"] = frenchpack.DIM__TOYOTA_BLUE
 vehicle_map["Toyota_vert"] = frenchpack.DIM__TOYOTA_GREEN
 vehicle_map["Toyota_desert"] = frenchpack.DIM__TOYOTA_DESERT
 vehicle_map["Kamikaze"] = frenchpack.DIM__KAMIKAZE
+vehicle_map["AMX1375"] = frenchpack.AMX_13_75mm
+vehicle_map["AMX1390"] = frenchpack.AMX_13_90mm
+vehicle_map["VBCI"] = frenchpack.VBCI
+vehicle_map["T62"] = frenchpack.Char_T_62
+vehicle_map["T64BV"] = frenchpack.Char_T_64BV
+vehicle_map["T72M"] = frenchpack.Char_T_72A
+vehicle_map["KORNET"] = frenchpack.KORNET_ATGM
+
 
 vehicle_map[highdigitsams.AAA_SON_9_Fire_Can.id] = highdigitsams.AAA_SON_9_Fire_Can
 vehicle_map[highdigitsams.AAA_100mm_KS_19.id] = highdigitsams.AAA_100mm_KS_19

game/factions/faction.py

@@ -301,6 +301,13 @@ class Faction:
             self.remove_vehicle("Toyota_vert")
             self.remove_vehicle("Toyota_desert")
             self.remove_vehicle("Kamikaze")
+            self.remove_vehicle("AMX1375")
+            self.remove_vehicle("AMX1390")
+            self.remove_vehicle("VBCI")
+            self.remove_vehicle("T62")
+            self.remove_vehicle("T64BV")
+            self.remove_vehicle("T72M")
+            self.remove_vehicle("KORNET")
         # high digit sams
         if not mod_settings.high_digit_sams:
             self.remove_air_defenses("SA10BGenerator")

game/settings.py

@@ -41,7 +41,7 @@ class Settings:
     #: the campaign has started will have no immediate effect; pilots already in the
     #: squadron will not be removed if the limit is lowered and pilots will not be
     #: immediately created if the limit is raised.
-    squadron_pilot_limit: int = 4
+    squadron_pilot_limit: int = 12
 
     #: The number of pilots a squadron can replace per turn.
     squadron_replenishment_rate: int = 4

game/transfers.py

@@ -158,15 +158,17 @@ class TransferOrder:
             )
         return self.transport.destination
 
-    def proceed(self) -> None:
-        if self.transport is None:
-            return
+    def find_escape_route(self) -> Optional[ControlPoint]:
+        if self.transport is not None:
+            return self.transport.find_escape_route()
+        return None
 
+    def proceed(self) -> None:
         if not self.destination.is_friendly(self.player):
             logging.info(f"Transfer destination {self.destination} was captured.")
             if self.position.is_friendly(self.player):
                 self.disband_at(self.position)
-            elif (escape_route := self.transport.find_escape_route()) is not None:
+            elif (escape_route := self.find_escape_route()) is not None:
                 self.disband_at(escape_route)
             else:
                 logging.info(
@@ -176,6 +178,9 @@ class TransferOrder:
                 self.kill_all()
             return
 
+        if self.transport is None:
+            return
+
         self.position = self.next_stop
         self.transport = None