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

Fixed a bug where Pretense campaign generation would hang if the campaign had off-map spawns.

Browse Source
This commit is contained in:
MetalStormGhost 2024-06-01 16:59:30 +03:00
parent 28efecc03a
commit 8df77dec2a
1 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
game/pretense/pretenseaircraftgenerator.py
View File

@ -357,10 +357,10 @@ class PretenseAircraftGenerator:
# Then plan SEAD and DEAD, if capable # Then plan SEAD and DEAD, if capable
if sead_capable_cp: if sead_capable_cp:
while num_of_sead < self.game.settings.pretense_sead_flights_per_cp: while num_of_sead < self.game.settings.pretense_sead_flights_per_cp:
# Intentionally don't spawn anything at OffMapSpawns in Pretense
if isinstance(cp, OffMapSpawn):
break
for squadron in random_squadron_list: for squadron in random_squadron_list:
# Intentionally don't spawn anything at OffMapSpawns in Pretense
if isinstance(squadron.location, OffMapSpawn):
continue
if cp.coalition != squadron.coalition: if cp.coalition != squadron.coalition:
continue continue
if num_of_sead >= self.game.settings.pretense_sead_flights_per_cp: if num_of_sead >= self.game.settings.pretense_sead_flights_per_cp:
@ -399,10 +399,10 @@ class PretenseAircraftGenerator:
# Then plan Strike, if capable # Then plan Strike, if capable
if strike_capable_cp: if strike_capable_cp:
while num_of_strike < self.game.settings.pretense_strike_flights_per_cp: while num_of_strike < self.game.settings.pretense_strike_flights_per_cp:
# Intentionally don't spawn anything at OffMapSpawns in Pretense
if isinstance(cp, OffMapSpawn):
break
for squadron in random_squadron_list: for squadron in random_squadron_list:
# Intentionally don't spawn anything at OffMapSpawns in Pretense
if isinstance(squadron.location, OffMapSpawn):
continue
if cp.coalition != squadron.coalition: if cp.coalition != squadron.coalition:
continue continue
if ( if (
@ -426,10 +426,10 @@ class PretenseAircraftGenerator:
# Then plan air-to-air, if capable # Then plan air-to-air, if capable
if patrol_capable_cp: if patrol_capable_cp:
while num_of_cap < self.game.settings.pretense_barcap_flights_per_cp: while num_of_cap < self.game.settings.pretense_barcap_flights_per_cp:
# Intentionally don't spawn anything at OffMapSpawns in Pretense
if isinstance(cp, OffMapSpawn):
break
for squadron in random_squadron_list: for squadron in random_squadron_list:
# Intentionally don't spawn anything at OffMapSpawns in Pretense
if isinstance(squadron.location, OffMapSpawn):
continue
if cp.coalition != squadron.coalition: if cp.coalition != squadron.coalition:
continue continue
if num_of_cap >= self.game.settings.pretense_barcap_flights_per_cp: if num_of_cap >= self.game.settings.pretense_barcap_flights_per_cp:
@ -450,10 +450,10 @@ class PretenseAircraftGenerator:
# Then plan CAS, if capable # Then plan CAS, if capable
if cas_capable_cp: if cas_capable_cp:
while num_of_cas < self.game.settings.pretense_cas_flights_per_cp: while num_of_cas < self.game.settings.pretense_cas_flights_per_cp:
# Intentionally don't spawn anything at OffMapSpawns in Pretense
if isinstance(cp, OffMapSpawn):
break
for squadron in random_squadron_list: for squadron in random_squadron_list:
# Intentionally don't spawn anything at OffMapSpawns in Pretense
if isinstance(squadron.location, OffMapSpawn):
continue
if cp.coalition != squadron.coalition: if cp.coalition != squadron.coalition:
continue continue
if num_of_cas >= self.game.settings.pretense_cas_flights_per_cp: if num_of_cas >= self.game.settings.pretense_cas_flights_per_cp:
@ -475,10 +475,10 @@ class PretenseAircraftGenerator:
# And finally, plan BAI, if capable # And finally, plan BAI, if capable
if bai_capable_cp: if bai_capable_cp:
while num_of_bai < self.game.settings.pretense_bai_flights_per_cp: while num_of_bai < self.game.settings.pretense_bai_flights_per_cp:
# Intentionally don't spawn anything at OffMapSpawns in Pretense
if isinstance(cp, OffMapSpawn):
break
for squadron in random_squadron_list: for squadron in random_squadron_list:
# Intentionally don't spawn anything at OffMapSpawns in Pretense
if isinstance(squadron.location, OffMapSpawn):
continue
if cp.coalition != squadron.coalition: if cp.coalition != squadron.coalition:
continue continue
if num_of_bai >= self.game.settings.pretense_bai_flights_per_cp: if num_of_bai >= self.game.settings.pretense_bai_flights_per_cp: