weyne/dcs_liberation
1
0
Fork 0
mirror of https://github.com/dcs-liberation/dcs_liberation.git synced 2025-11-10 14:22:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove more unused code from Base.

Browse Source
This commit is contained in:
Dan Albert 2021-06-07 17:49:55 -07:00
parent 37bb83dfa6
commit 914691eaa7
2 changed files with 4 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
game/db.py
View File

@ -1060,7 +1060,6 @@ UNIT_BY_TASK = {
frenchpack.DIM__TOYOTA_DESERT, frenchpack.DIM__TOYOTA_DESERT,
frenchpack.DIM__KAMIKAZE, frenchpack.DIM__KAMIKAZE,
], ],
AirDefence: [],
Reconnaissance: [ Reconnaissance: [
Unarmed.Truck_M818_6x6, Unarmed.Truck_M818_6x6,
Unarmed.Truck_Ural_375, Unarmed.Truck_Ural_375,

41
game/theater/base.py
View File

@ -1,21 +1,15 @@
import itertools import itertools
import logging import logging
import math
import typing import typing
from typing import Dict, Type from typing import Dict, Type
from dcs.task import AWACS, CAP, CAS, Embarking, PinpointStrike, Task, Transport from dcs.task import AWACS, CAP, CAS, Embarking, PinpointStrike, Transport
from dcs.unittype import FlyingType, UnitType, VehicleType from dcs.unittype import FlyingType, VehicleType
from dcs.vehicles import AirDefence, Armor from dcs.vehicles import AirDefence
from game import db from game import db
from game.db import PRICES from game.db import PRICES
STRENGTH_AA_ASSEMBLE_MIN = 0.2
PLANES_SCRAMBLE_MIN_BASE = 2
PLANES_SCRAMBLE_MAX_BASE = 8
PLANES_SCRAMBLE_FACTOR = 0.3
BASE_MAX_STRENGTH = 1 BASE_MAX_STRENGTH = 1
BASE_MIN_STRENGTH = 0 BASE_MIN_STRENGTH = 0
@ -24,8 +18,6 @@ class Base:
def __init__(self): def __init__(self):
self.aircraft: Dict[Type[FlyingType], int] = {} self.aircraft: Dict[Type[FlyingType], int] = {}
self.armor: Dict[Type[VehicleType], int] = {} self.armor: Dict[Type[VehicleType], int] = {}
# TODO: Appears unused.
self.aa: Dict[AirDefence, int] = {}
self.strength = 1 self.strength = 1
@property @property
@ -46,38 +38,15 @@ class Base:
logging.exception(f"No price found for {unit_type.id}") logging.exception(f"No price found for {unit_type.id}")
return total return total
@property
def total_aa(self) -> int:
return sum(self.aa.values())
def total_units(self, task: Task) -> int:
return sum(
[
c
for t, c in itertools.chain(
self.aircraft.items(), self.armor.items(), self.aa.items()
)
if t in db.UNIT_BY_TASK[task]
]
)
def total_units_of_type(self, unit_type) -> int: def total_units_of_type(self, unit_type) -> int:
return sum( return sum(
[ [
c c
for t, c in itertools.chain( for t, c in itertools.chain(self.aircraft.items(), self.armor.items())
self.aircraft.items(), self.armor.items(), self.aa.items()
)
if t == unit_type if t == unit_type
] ]
) )
@property
def all_units(self):
return itertools.chain(
self.aircraft.items(), self.armor.items(), self.aa.items()
)
def commision_units(self, units: typing.Dict[typing.Any, int]): def commision_units(self, units: typing.Dict[typing.Any, int]):
for unit_type, unit_count in units.items(): for unit_type, unit_count in units.items():
@ -97,8 +66,6 @@ class Base:
target_dict = self.aircraft target_dict = self.aircraft
elif for_task == PinpointStrike: elif for_task == PinpointStrike:
target_dict = self.armor target_dict = self.armor
elif for_task == AirDefence:
target_dict = self.aa
if target_dict is not None: if target_dict is not None:
target_dict[unit_type] = target_dict.get(unit_type, 0) + unit_count target_dict[unit_type] = target_dict.get(unit_type, 0) + unit_count