Merge branch 'develop' into fob

This commit is contained in:
walterroach
2020-11-30 12:18:38 -06:00
49 changed files with 172 additions and 146 deletions

View File

@@ -1234,7 +1234,7 @@ def find_unittype(for_task: Task, country_name: str) -> List[Type[UnitType]]:
return [x for x in UNIT_BY_TASK[for_task] if x in FACTIONS[country_name].units]
def find_infantry(country_name: str) -> List[UnitType]:
def find_infantry(country_name: str, allow_manpad: bool = False) -> List[UnitType]:
inf = [
Infantry.Paratrooper_AKS, Infantry.Paratrooper_AKS, Infantry.Paratrooper_AKS, Infantry.Paratrooper_AKS,
Infantry.Paratrooper_AKS,
@@ -1253,6 +1253,10 @@ def find_infantry(country_name: str) -> List[UnitType]:
Infantry.Infantry_M1_Garand, Infantry.Infantry_M1_Garand, Infantry.Infantry_M1_Garand,
Infantry.Infantry_Soldier_Insurgents, Infantry.Infantry_Soldier_Insurgents, Infantry.Infantry_Soldier_Insurgents
]
if allow_manpad:
inf.append(AirDefence.SAM_SA_18_Igla_MANPADS)
inf.append(AirDefence.SAM_SA_18_Igla_S_MANPADS)
inf.append(AirDefence.Stinger_MANPADS)
return [x for x in inf if x in FACTIONS[country_name].infantry_units]

View File

@@ -26,6 +26,7 @@ class Settings:
multiplier: float = 1.0
generate_marks: bool = True
sams: bool = True # Legacy parameter do not use
manpads: bool = True
cold_start: bool = False # Legacy parameter do not use
version: Optional[str] = None