planes db updates: fixed loadouts & tasks

This commit is contained in:
Vasyl Horbachenko
2018-06-17 04:35:10 +03:00
parent 45dbb37d50
commit 002ee75a26
12 changed files with 75 additions and 37 deletions

View File

@@ -116,9 +116,9 @@ class Base:
for_task = db.unit_task(unit_type)
target_dict = None
if for_task == CAS or for_task == FighterSweep:
if for_task == CAS or for_task == CAP:
target_dict = self.aircraft
elif for_task == CAP:
elif for_task == PinpointStrike:
target_dict = self.armor
elif for_task == AirDefence:
target_dict = self.aa
@@ -160,19 +160,19 @@ class Base:
return int(self.total_aa * (self.strength > 0.2 and self.strength or 0))
def scramble_sweep(self) -> typing.Dict[PlaneType, int]:
return self._find_best_planes(FighterSweep, self.scramble_count())
return self._find_best_planes(CAP, self.scramble_count())
def scramble_cas(self) -> typing.Dict[PlaneType, int]:
return self._find_best_planes(CAS, self.scramble_count())
def scramble_interceptors(self) -> typing.Dict[PlaneType, int]:
return self._find_best_planes(FighterSweep, self.scramble_count())
return self._find_best_planes(CAP, self.scramble_count())
def assemble_cap(self) -> typing.Dict[Armor, int]:
return self._find_best_armor(CAP, self.assemble_count())
return self._find_best_armor(PinpointStrike, self.assemble_count())
def assemble_defense(self) -> typing.Dict[Armor, int]:
return self._find_best_armor(CAP, self.assemble_count())
return self._find_best_armor(PinpointStrike, self.assemble_count())
def assemble_aa(self) -> typing.Dict[AirDefence, int]:
return self._find_best_unit(self.aa, AirDefence, self.assemble_aa_count())

View File

@@ -7,8 +7,8 @@ UNIT_VARIETY = 3
UNIT_AMOUNT_FACTOR = 16
COUNT_BY_TASK = {
CAP: 12,
FighterSweep: 16,
PinpointStrike: 12,
CAP: 16,
CAS: 8,
AirDefence: 0.5,
}
@@ -19,7 +19,7 @@ def generate_initial(theater: ConflictTheater, enemy: str, sams: bool):
if cp.captured:
continue
for task in [CAP, FighterSweep, CAS, AirDefence]:
for task in [PinpointStrike, CAP, CAS, AirDefence]:
assert cp.importance <= IMPORTANCE_HIGH, "invalid importance {}".format(cp.importance)
assert cp.importance >= IMPORTANCE_LOW, "invalid importance {}".format(cp.importance)