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

Formatting...

Browse Source
This commit is contained in:
Raffson 2023-02-02 21:37:53 +01:00
parent a1cc3412e8
commit d410f9d3c4
No known key found for this signature in database
GPG Key ID: B0402B2C9B764D99
34 changed files with 4 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
game/campaignloader/defaultsquadronassigner.py
View File

@ -29,7 +29,6 @@ class DefaultSquadronAssigner:
self.coalition.player
):
for squadron_config in self.config.by_location[control_point]:
squadron_def = self.override_squadron_defaults(
self.find_squadron_for(squadron_config, control_point),
squadron_config,
@ -53,7 +52,6 @@ class DefaultSquadronAssigner:
def find_squadron_for(
self, config: SquadronConfig, control_point: ControlPoint
) -> Optional[SquadronDef]:
for preferred_aircraft in config.aircraft:
squadron_def = self.find_preferred_squadron(
preferred_aircraft, config.primary, control_point
@ -154,7 +152,6 @@ class DefaultSquadronAssigner:
def override_squadron_defaults(
squadron_def: Optional[SquadronDef], config: SquadronConfig
) -> Optional[SquadronDef]:
if squadron_def is None:
return None

2
game/ground_forces/ai_ground_planner.py
View File

@ -89,7 +89,6 @@ class GroundPlanner:
self.reserve: List[CombatGroup] = []
def plan_groundwar(self) -> None:
ground_unit_limit = self.cp.frontline_unit_count_limit
remaining_available_frontline_units = ground_unit_limit
@ -139,7 +138,6 @@ class GroundPlanner:
remaining_available_frontline_units -= available
while available > 0:
if role == CombatGroupRole.SHORAD:
count = 1
else:

1
game/layout/layout.py
View File

@ -238,7 +238,6 @@ class AntiAirLayout(TgoLayout):
location: PresetLocation,
control_point: ControlPoint,
) -> IadsGroundObject:
if GroupTask.EARLY_WARNING_RADAR in self.tasks:
return EwrGroundObject(name, location, control_point)
elif any(tasking in self.tasks for tasking in GroupRole.AIR_DEFENSE.tasks):

1
game/layout/layoutloader.py
View File

@ -132,7 +132,6 @@ class LayoutLoader:
temp_mis.country(country.name).ship_group,
temp_mis.country(country.name).static_group,
):
try:
g_id, u_id, group_name, group_mapping = mapping.group_for_name(
dcs_group.name

1
game/missiongenerator/aircraft/waypoints/joinpoint.py
View File

@ -71,7 +71,6 @@ class JoinPointBuilder(PydcsWaypointBuilder):
max_dist: float = 30.0,
vertical_spacing: float = 2000.0,
) -> None:
rx = (random.random() + 0.1) * 333
ry = feet(vertical_spacing).meters
rz = (random.random() + 0.1) * 50 * random.choice([-1, 1])

1
game/missiongenerator/aircraft/waypoints/splitpoint.py
View File

@ -6,7 +6,6 @@ from .pydcswaypointbuilder import PydcsWaypointBuilder
class SplitPointBuilder(PydcsWaypointBuilder):
def add_tasks(self, waypoint: MovingPoint) -> None:
if not self.flight.flight_type.is_air_to_air:
# Capture any non A/A type to avoid issues with SPJs that use the primary radar such as the F/A-18C.
# You can bully them with STT to not be able to fire radar guided missiles at you,

1
game/missiongenerator/drawingsgenerator.py
View File

@ -59,7 +59,6 @@ class DrawingsGenerator:
if destination in seen:
continue
else:
# Determine path color
if cp.captured and destination.captured:
color = BLUE_PATH_COLOR

4
game/missiongenerator/flotgenerator.py
View File

@ -204,7 +204,6 @@ class FlotGenerator:
side: Country,
forward_heading: Heading,
) -> None:
infantry_position = self.conflict.find_ground_position(
group.points[0].position.random_point_within(250, 50),
500,
@ -344,7 +343,6 @@ class FlotGenerator:
# Artillery will fall back when under attack
if stance != CombatStance.RETREAT:
# Hold position
dcs_group.points[1].tasks.append(Hold())
retreat = self.find_retreat_point(
@ -522,12 +520,10 @@ class FlotGenerator:
from_cp: ControlPoint,
to_cp: ControlPoint,
) -> None:
if not self.game.settings.perf_moving_units:
return
for dcs_group, group in ally_groups:
if group.role == CombatGroupRole.ARTILLERY:
if self.game.settings.perf_artillery:
target = self.get_artillery_target_in_range(

2
game/missiongenerator/kneeboard.py
View File

@ -192,7 +192,6 @@ class NumberedWaypoint:
class FlightPlanBuilder:
WAYPOINT_DESC_MAX_LEN = 25
def __init__(self, start_time: datetime.datetime, units: UnitSystem) -> None:
@ -544,7 +543,6 @@ class SupportPage(KneeboardPage):
aewc_ladder = []
for single_aewc in self.awacs:
if single_aewc.depature_location is None:
dep = "-"
arr = "-"

1
game/procurement.py
View File

@ -41,7 +41,6 @@ class ProcurementAi:
manage_front_line: bool,
manage_aircraft: bool,
) -> None:
self.game = game
self.is_player = for_player
self.air_wing = game.air_wing_for(for_player)

1
game/scenery_group.py
View File

@ -31,7 +31,6 @@ class SceneryGroup:
def __init__(
self, zone_def: TriggerZone, zones: Iterable[TriggerZone], category: str
) -> None:
self.zone_def = zone_def
self.zones = zones
self.position = zone_def.position

1
game/server/eventstream/models.py
View File

@ -50,7 +50,6 @@ class GameUpdateEventsJs(BaseModel):
def from_events(
cls, events: GameUpdateEvents, game: Game | None
) -> GameUpdateEventsJs:
# We still need to be able to send update events when there is no game loaded
# because we need to send the unload event.
new_combats = []

1
game/sim/missionresultsprocessor.py
View File

@ -235,7 +235,6 @@ class MissionResultsProcessor:
delta = DEFEAT_INFLUENCE
status_msg = f"Enemy casualties outnumber allied casualties along the {cp.name}-{enemy_cp.name} frontline. Allied forces claim a victory."
elif ally_casualties > enemy_casualties:
if (
ally_units_alive > 2 * enemy_units_alive
and player_aggresive

3
game/theater/theatergroup.py
View File

@ -195,7 +195,8 @@ class TheaterGroup:
def max_threat_range(self, radar_only: bool = False) -> Distance:
"""Calculate the maximum threat range of the TheaterGroup.
This also checks for Launcher and Tracker Pairs and if they are functioning or not. Allows to also use only radar emitting units for the calculation with the parameter."""
This also checks for Launcher and Tracker Pairs and if they are functioning or not. Allows to also use only radar emitting units for the calculation with the parameter.
"""
max_non_radar = meters(0)
max_telar_range = meters(0)
max_tel_range = meters(0)

1
game/transfers.py
View File

@ -717,7 +717,6 @@ class PendingTransfers:
self.order_airlift_assets_at(control_point)
def desired_airlift_capacity(self, control_point: ControlPoint) -> int:
if control_point.has_factory:
is_major_hub = control_point.total_aircraft_parking > 0
# Check if there is a CP which is only reachable via Airlift

1
game/weather.py
View File

@ -299,7 +299,6 @@ class Weather:
def interpolate_solar_activity(
time_of_day: TimeOfDay, high: float, low: float
) -> float:
scale: float = 0
match time_of_day:

4
qt_ui/liberation_theme.py
View File

@ -32,7 +32,7 @@ def init():
if os.path.isfile(THEME_PREFERENCES_FILE_PATH):
try:
with (open(THEME_PREFERENCES_FILE_PATH)) as prefs:
with open(THEME_PREFERENCES_FILE_PATH) as prefs:
pref_data = json.loads(prefs.read())
__theme_index = pref_data["theme_index"]
set_theme_index(__theme_index)
@ -83,5 +83,5 @@ def get_theme_css_file():
# save current theme index to json file
def save_theme_config():
pref_data = {"theme_index": get_theme_index()}
with (open(THEME_PREFERENCES_FILE_PATH, "w")) as prefs:
with open(THEME_PREFERENCES_FILE_PATH, "w") as prefs:
prefs.write(json.dumps(pref_data))

1
qt_ui/uiconstants.py
View File

@ -24,7 +24,6 @@ ICONS: Dict[str, QPixmap] = {}
def load_icons():
ICONS["New"] = QPixmap("./resources/ui/misc/" + get_theme_icons() + "/new.png")
ICONS["Open"] = QPixmap("./resources/ui/misc/" + get_theme_icons() + "/open.png")
ICONS["Save"] = QPixmap("./resources/ui/misc/" + get_theme_icons() + "/save.png")

1
qt_ui/widgets/QFrequencyWidget.py
View File

@ -14,7 +14,6 @@ from qt_ui.windows.QRadioFrequencyDialog import QRadioFrequencyDialog
class QFrequencyWidget(QWidget):
freq_changed = Signal(QWidget)
def __init__(

1
qt_ui/widgets/QLink4Widget.py
View File

@ -13,7 +13,6 @@ from qt_ui.windows.QRadioFrequencyDialog import QRadioFrequencyDialog
class QLink4Widget(QWidget):
freq_changed = Signal(QWidget)
def __init__(self, cp: NavalControlPoint, game_model: GameModel) -> None:

1
qt_ui/widgets/combos/QPredefinedWaypointSelectionComboBox.py
View File

@ -54,7 +54,6 @@ class QPredefinedWaypointSelectionComboBox(QFilteredComboBox):
return waypoints
def find_possible_waypoints(self):
self.wpts = []
model = QStandardItemModel()
i = 0

1
qt_ui/windows/GameUpdateSignal.py
View File

@ -10,7 +10,6 @@ from game.game import TurnState
class GameUpdateSignal(QObject):
instance = None
gameupdated = Signal(Game)
budgetupdated = Signal(Game)

1
qt_ui/windows/QWaitingForMissionResultWindow.py
View File

@ -30,7 +30,6 @@ from qt_ui.windows.GameUpdateSignal import GameUpdateSignal
class DebriefingFileWrittenSignal(QObject):
instance = None
debriefingReceived = Signal(Debriefing)

2
qt_ui/windows/groundobject/QGroundObjectMenu.py
View File

@ -57,7 +57,6 @@ class QGroundObjectMenu(QDialog):
self.init_ui()
def init_ui(self):
self.mainLayout = QVBoxLayout()
self.budget = QBudgetBox(self.game)
self.budget.setGame(self.game)
@ -92,7 +91,6 @@ class QGroundObjectMenu(QDialog):
self.setLayout(self.mainLayout)
def doLayout(self):
self.update_total_value()
self.intelBox = QGroupBox("Units :")
self.intelLayout = QGridLayout()

1
qt_ui/windows/intel.py
View File

@ -160,7 +160,6 @@ class IntelWindow(QDialog):
self.refresh_layout()
def refresh_layout(self) -> None:
# Clear the existing layout
if self.layout():
idx = 0

1
qt_ui/windows/mission/flight/waypoints/QFlightWaypointInfoBox.py
View File

@ -14,7 +14,6 @@ class QFlightWaypointInfoBox(QGroupBox):
self.init_ui()
def init_ui(self) -> None:
layout = QVBoxLayout()
x_pos_layout = QHBoxLayout()

1
qt_ui/windows/mission/flight/waypoints/QFlightWaypointTab.py
View File

@ -60,7 +60,6 @@ class QFlightWaypointTab(QFrame):
self.recreate_buttons.clear()
for task in self.package.target.mission_types(for_player=True):
if task == FlightType.AIR_ASSAULT and not self.game.settings.plugin_option(
"ctld"
):

1
qt_ui/windows/mission/flight/waypoints/QPredefinedWaypointSelectionWindow.py
View File

@ -27,7 +27,6 @@ PREDEFINED_WAYPOINT_CATEGORIES = [
class QPredefinedWaypointSelectionWindow(QDialog):
# List of FlightWaypoint
waypoints_added = Signal(list)

1
qt_ui/windows/newgame/QNewGameWizard.py
View File

@ -442,7 +442,6 @@ class FactionSelection(QtWidgets.QWizardPage):
self.updateUnitRecap()
def updateUnitRecap(self):
red_faction = FACTIONS[self.redFactionSelect.currentText()]
blue_faction = FACTIONS[self.blueFactionSelect.currentText()]

1
qt_ui/windows/preferences/QLiberationPreferences.py
View File

@ -87,7 +87,6 @@ class QLiberationPreferences(QFrame):
self.edit_dcs_install_dir.setText(install_dir)
def apply(self):
print("Applying changes")
self.saved_game_dir = self.edit_saved_game_dir.text()
self.dcs_install_dir = self.edit_dcs_install_dir.text()

1
qt_ui/windows/settings/QSettingsWindow.py
View File

@ -331,7 +331,6 @@ class QSettingsWindow(QDialog):
self.setLayout(self.layout)
def initCheatLayout(self):
self.cheatPage = QWidget()
self.cheatLayout = QVBoxLayout()
self.cheatPage.setLayout(self.cheatLayout)

1
qt_ui/windows/stats/QAircraftChart.py
View File

@ -18,7 +18,6 @@ class QAircraftChart(QFrame):
self.setLayout(self.layout)
def generateUnitCharts(self):
self.alliedAircraft = [
d.allied_units.aircraft_count for d in self.game.game_stats.data_per_turn
]

1
qt_ui/windows/stats/QArmorChart.py
View File

@ -18,7 +18,6 @@ class QArmorChart(QFrame):
self.setLayout(self.layout)
def generateUnitCharts(self):
self.alliedArmor = [
d.allied_units.vehicles_count for d in self.game.game_stats.data_per_turn
]

1
tests/test_factions.py
View File

@ -106,7 +106,6 @@ class TestFactionLoader(unittest.TestCase):
@pytest.mark.skip(reason="Faction unit names in the json files are outdated")
def test_load_valid_faction_with_invalid_country(self) -> None:
with (RESOURCES_DIR / "invalid_faction_country.json").open("r") as data:
try:
Faction.from_json(json.load(data))