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

Support for Bandit's cloud presets mod (v15)

Browse Source
This commit is contained in:
Raffson 2024-12-26 01:35:30 +01:00
parent f3b1964e06
commit 3ef6ae20c7
No known key found for this signature in database
GPG Key ID: B0402B2C9B764D99
8 changed files with 398 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
changelog.md
View File

@ -42,6 +42,7 @@
* **[UX]** Default settings are now loaded from Default.zip
* **[Autoplanner]** Plan Air-to-Air Escorts for AWACS & Tankers
* **[Package Planning]** Ability to plan recovery tanker flights
* **[Modding]** Support for Bandit's cloud presets mod (v15)
## Fixes
* **[UI/UX]** A-10A flights can be edited again

9
game/settings/settings.py
View File

@ -462,7 +462,7 @@ class Settings:
"range is defined in the helicopter's yaml specification."
),
)
# Campaign management
# General
squadron_random_chance: int = bounded_int_option(
@ -501,6 +501,13 @@ class Settings:
"assigned to their primary task."
),
)
use_bandit_clouds: bool = boolean_option(
"Use Bandit's clouds",
page=CAMPAIGN_MANAGEMENT_PAGE,
section=GENERAL_SECTION,
default=False,
detail=("If checked, Bandit's cloud presets will become available."),
)
# Pilots and Squadrons
ai_pilot_levelling: bool = boolean_option(

7
game/weather/clouds.py
View File

@ -2,9 +2,10 @@ from __future__ import annotations
import random
from dataclasses import dataclass, field
from math import ceil, floor
from typing import Optional
from dcs.cloud_presets import Clouds as PydcsClouds
from dcs.cloud_presets import CLOUD_PRESETS
from dcs.weather import Weather as PydcsWeather, CloudPreset
@ -18,14 +19,14 @@ class Clouds:
@classmethod
def random_preset(cls, rain: bool) -> Clouds:
clouds = (p.value for p in PydcsClouds)
clouds = (p.value for _, p in CLOUD_PRESETS.items())
if rain:
presets = [p for p in clouds if "Rain" in p.name]
else:
presets = [p for p in clouds if "Rain" not in p.name]
preset = random.choice(presets)
return Clouds(
base=random.randint(preset.min_base, preset.max_base),
base=random.randint(ceil(preset.min_base), floor(preset.max_base)),
density=0,
thickness=0,
precipitation=PydcsWeather.Preceptions.None_,

1
pydcs_extensions/__init__.py
View File

@ -2,6 +2,7 @@ from .SWPack import *
from .a4ec import *
from .a7e import *
from .a6a import *
from .bandit_clouds import *
from .ea6b import *
from .f9f import *
from .f100 import *

1
pydcs_extensions/bandit_clouds/__init__.py Normal file
View File

@ -0,0 +1 @@
from .bandit_clouds import *

353
pydcs_extensions/bandit_clouds/bandit_clouds.py Normal file
View File

@ -0,0 +1,353 @@
from enum import unique, Enum
from dcs.weather import CloudPreset
from pydcs_extensions.cloud_injector import inject_cloud_presets, eject_cloud_presets
@unique
class BanditClouds(Enum):
ScatteredShowers1 = CloudPreset(
name="Preset35",
ui_name="Scattered Showers 1 [Bandit648]",
description="35 ##Scattered Showers \nMETAR: RA SCT SCT BKN",
min_base=200.0,
max_base=7000.0,
)
ScatteredShowers2 = CloudPreset(
name="Preset36",
ui_name="Scattered Showers 2 [Bandit648]",
description="36 ##Scattered Showers \nMETAR: RA SCT SCT BKN ",
min_base=200.0,
max_base=14000.0,
)
ScatteredShowers3 = CloudPreset(
name="Preset37",
ui_name="Scattered Showers 3 [Bandit648]",
description="37 ##Scattered Showers \nMETAR: RA SCT BKN ",
min_base=200.0,
max_base=10000.0,
)
ScatteredShowers4 = CloudPreset(
name="Preset38",
ui_name="Scattered Showers 4 [Bandit648]",
description="38 ##Scattered Showers \nMETAR: RA SCT BKN",
min_base=200.0,
max_base=10000.0,
)
ScatteredShowers5 = CloudPreset(
name="Preset39",
ui_name="Scattered Showers 5 [Bandit648]",
description="39 ##Scattered Showers \nMETAR: RA SCT BKN BKN",
min_base=200.0,
max_base=10000.0,
)
OvercastLightRain1 = CloudPreset(
name="Preset40",
ui_name="Overcast Light Rain 1 [Bandit648]",
description="40 ##Overcast light rain \nMETAR: -RA BKN BKN",
min_base=200.0,
max_base=10000.0,
)
OvercastLightRain2 = CloudPreset(
name="Preset41",
ui_name="Overcast Light Rain 2 [Bandit648]",
description="41 ##Overcast light rain \nMETAR: RA OVC BKN",
min_base=200.0,
max_base=10000.0,
)
OvercastAndModerateRain1 = CloudPreset(
name="Preset42",
ui_name="Overcast And Moderate Rain 1 [Bandit648]",
description="42 ##Overcast with Rain \nMETAR: RA OVC BKN OVC",
min_base=200.0,
max_base=10000.0,
)
ScatteredCumulus1 = CloudPreset(
name="Preset43",
ui_name="Scattered Cumulus 1 [Bandit648]",
description="43 ##One Layer Scattered \nMETAR: FEW/SCT ",
min_base=200.0,
max_base=10000.0,
)
ScatteredCumulus2 = CloudPreset(
name="Preset44",
ui_name="Scattered Cumulus 2 [Bandit648]",
description="44 ##One Layer Scattered \nMETAR: SCT 6/10",
min_base=200.0,
max_base=15000.0,
)
ScatteredCumulus3 = CloudPreset(
name="Preset45",
ui_name="Scattered Cumulus 3 [Bandit648]",
description="45 ##Two Layer Scattered \nMETAR: SCT SCT",
min_base=200.0,
max_base=10000.0,
)
ScatteredCumulus4 = CloudPreset(
name="Preset46",
ui_name="Scattered Cumulus 4 [Bandit648]",
description="46 ##Two Layer Scattered \nMETAR: SCT SCT",
min_base=200.0,
max_base=10000.0,
)
ScatteredCumulus5 = CloudPreset(
name="Preset47",
ui_name="Scattered Cumulus 5 [Bandit648]",
description="47 ##Three Layer Scattered \nMETAR: SCT BKN OVC",
min_base=200.0,
max_base=15000.0,
)
OvercastCumulusLightMist = CloudPreset(
name="Preset48",
ui_name="Overcast Cumulus Light Mist [Bandit648]",
description="48 ##Overcast Light Rain \nMETAR: -RA OVC FEW",
min_base=200.0,
max_base=10000.0,
)
Lowlevelstratus1 = CloudPreset(
name="Preset49",
ui_name="Low level stratus 1 [Bandit648]",
description="49 ##Single layer stratus \nMETAR: BKN",
min_base=0.0,
max_base=1524.0,
)
Lowlevelstratus2 = CloudPreset(
name="Preset50",
ui_name="Low level stratus 2 [Bandit648]",
description="50 ##Single layer stratus \nMETAR: BKN",
min_base=0.0,
max_base=1524.0,
)
Lowlevelstratus3 = CloudPreset(
name="Preset51",
ui_name="Low level stratus 3 [Bandit648]",
description="51 ##Single layer stratus \nMETAR: BKN",
min_base=0.0,
max_base=1524.0,
)
Lowlevelstratus4 = CloudPreset(
name="Preset52",
ui_name="Low level stratus 4 [Bandit648]",
description="52 ##Single layer stratus \nMETAR: BKN",
min_base=0.0,
max_base=1524.0,
)
Lowlevelstratus5 = CloudPreset(
name="Preset53",
ui_name="Low level stratus 5 [Bandit648]",
description="53 ##Low stratus with thick overcast clouds \nMETAR: OVC SCT",
min_base=0.0,
max_base=1524.0,
)
Lowlevelstratus6 = CloudPreset(
name="Preset54",
ui_name="Low level stratus 6 [Bandit648]",
description="54 ##Low level stratus with big puffy cumulus \nMETAR: OVC BKN",
min_base=0.0,
max_base=3048.0,
)
Lowlevelstratus7 = CloudPreset(
name="Preset55",
ui_name="Low level stratus 7 [Bandit648]",
description="55 ##Low level stratus with light scattered cumulus \nMETAR: BKN SCT",
min_base=0.0,
max_base=3048.0,
)
Altotratus1 = CloudPreset(
name="Preset56",
ui_name="Altotratus 1 [Bandit648]",
description="56 ##Mid level Altostratus Overcast \nMETAR: OVC/BKN",
min_base=3000.0,
max_base=6096.0,
)
Altostratus2 = CloudPreset(
name="Preset57",
ui_name="Altostratus 2 [Bandit648]",
description="57 ##Altostratus Scattered \nMETAR: OVC/SCT",
min_base=1828.0,
max_base=6096.0,
)
Altostratus3 = CloudPreset(
name="Preset58",
ui_name="Altostratus 3 [Bandit648]",
description="58 ##Altostratus Scattered \nMETAR: OVC/SCT",
min_base=1828.0,
max_base=6096.0,
)
Altostratus4 = CloudPreset(
name="Preset59",
ui_name="Altostratus 4 [Bandit648]",
description="59 ##Altostratus Broken \nMETAR: OVC/BKN",
min_base=1828.0,
max_base=6096.0,
)
Altocumulus1 = CloudPreset(
name="Preset60",
ui_name="Altocumulus 1 [Bandit648]",
description="60 ##Altocumulus scattered \nMETAR: OVC/SCT",
min_base=500.0,
max_base=7620.0,
)
Altocumulus2 = CloudPreset(
name="Preset61",
ui_name="Altocumulus 2 [Bandit648]",
description="61 ##Mid Level Altocumulus Few \nMETAR: SCT/FEW",
min_base=500.0,
max_base=7620.0,
)
Altocumulus3 = CloudPreset(
name="Preset62",
ui_name="Altocumulus 3 [Bandit648]",
description="62 ##Altocumulus broken \nMETAR: OVC/BKN",
min_base=500.0,
max_base=7620.0,
)
Altocumulus4 = CloudPreset(
name="Preset63",
ui_name="Altocumulus 4 [Bandit648]",
description="63 ##Altocumulus broken \nMETAR: OVC/BKN",
min_base=500.0,
max_base=7620.0,
)
Nimbostratuswithheavyrain = CloudPreset(
name="Preset64",
ui_name="Nimbostratus with heavy rain [Bandit648]",
description="64 ##Heavy rain with thick overcast cloud layer \nMETAR: RA OVC BKN",
min_base=609.0,
max_base=6096.0,
)
Cirrocumulus1 = CloudPreset(
name="Preset65",
ui_name="Cirrocumulus 1 [Bandit648]",
description="65 ##High level cirrcumulus clouds \nMETAR: SCT/BKN",
min_base=300.0,
max_base=18288.0,
)
Cirrocumulus2 = CloudPreset(
name="Preset66",
ui_name="Cirrocumulus 2 [Bandit648]",
description="66 ##High level cirrcumulus clouds \nMETAR: SCT/BKN",
min_base=300.0,
max_base=18288.0,
)
Cirrocumulus3 = CloudPreset(
name="Preset67",
ui_name="Cirrocumulus 3 [Bandit648]",
description="67 ##High level cirrocumulus scattered \nMETAR: SCT",
min_base=300.0,
max_base=18288.0,
)
Cirrostratus1 = CloudPreset(
name="Preset68",
ui_name="Cirrostratus 1 [Bandit648]",
description="68 ##High level cirrostratus clouds \nMETAR: SCT/BKN",
min_base=300.0,
max_base=18288.0,
)
Cirrostratus2 = CloudPreset(
name="Preset69",
ui_name="Cirrostratus 2 [Bandit648]",
description="69 ##High level cirrostratus overcast \nMETAR: OVC/BKN",
min_base=0.0,
max_base=18288.0,
)
Cirrostratus3 = CloudPreset(
name="Preset70",
ui_name="Cirrostratus 3 [Bandit648]",
description="70 ##High level cirrostratus overcast \nMETAR: OVC/BKN",
min_base=300.0,
max_base=18288.0,
)
Cirrostratus4 = CloudPreset(
name="Preset71",
ui_name="Cirrostratus 4 [Bandit648]",
description="71 ##High level cirrostratus overcast \nMETAR: OVC/BKN",
min_base=300.0,
max_base=18288.0,
)
@staticmethod
def activate() -> None:
inject_cloud_presets(BANDIT_CLOUDS)
@staticmethod
def deactivate() -> None:
eject_cloud_presets(BANDIT_CLOUDS)
BANDIT_CLOUDS = {
"Preset35": BanditClouds.ScatteredShowers1,
"Preset36": BanditClouds.ScatteredShowers2,
"Preset37": BanditClouds.ScatteredShowers3,
"Preset38": BanditClouds.ScatteredShowers4,
"Preset39": BanditClouds.ScatteredShowers5,
"Preset40": BanditClouds.OvercastLightRain1,
"Preset41": BanditClouds.OvercastLightRain2,
"Preset42": BanditClouds.OvercastAndModerateRain1,
"Preset43": BanditClouds.ScatteredCumulus1,
"Preset44": BanditClouds.ScatteredCumulus2,
"Preset45": BanditClouds.ScatteredCumulus3,
"Preset46": BanditClouds.ScatteredCumulus4,
"Preset47": BanditClouds.ScatteredCumulus5,
"Preset48": BanditClouds.OvercastCumulusLightMist,
"Preset49": BanditClouds.Lowlevelstratus1,
"Preset50": BanditClouds.Lowlevelstratus2,
"Preset51": BanditClouds.Lowlevelstratus3,
"Preset52": BanditClouds.Lowlevelstratus4,
"Preset53": BanditClouds.Lowlevelstratus5,
"Preset54": BanditClouds.Lowlevelstratus6,
"Preset55": BanditClouds.Lowlevelstratus7,
"Preset56": BanditClouds.Altotratus1,
"Preset57": BanditClouds.Altostratus2,
"Preset58": BanditClouds.Altostratus3,
"Preset59": BanditClouds.Altostratus4,
"Preset60": BanditClouds.Altocumulus1,
"Preset61": BanditClouds.Altocumulus2,
"Preset62": BanditClouds.Altocumulus3,
"Preset63": BanditClouds.Altocumulus4,
"Preset64": BanditClouds.Nimbostratuswithheavyrain,
"Preset65": BanditClouds.Cirrocumulus1,
"Preset66": BanditClouds.Cirrocumulus2,
"Preset67": BanditClouds.Cirrocumulus3,
"Preset68": BanditClouds.Cirrostratus1,
"Preset69": BanditClouds.Cirrostratus2,
"Preset70": BanditClouds.Cirrostratus3,
"Preset71": BanditClouds.Cirrostratus4,
}

18
pydcs_extensions/cloud_injector.py Normal file
View File

@ -0,0 +1,18 @@
from typing import Dict
from dcs.cloud_presets import CLOUD_PRESETS, Clouds
def inject_cloud_presets(presets: Dict[str, Clouds]) -> None:
"""
Inject custom cloud presets from mods into pydcs' cloud presets databases via introspection
:param presets: The custom presets to be injected into pydcs' cloud presets database
:return: None
"""
CLOUD_PRESETS.update(presets)
def eject_cloud_presets(presets: Dict[str, Clouds]) -> None:
for preset in presets:
if preset in CLOUD_PRESETS:
del CLOUD_PRESETS[preset]

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

@ -6,7 +6,7 @@ from typing import Callable, Optional, Dict
from PySide6 import QtWidgets
from PySide6.QtCore import QItemSelectionModel, QPoint, QSize, Qt
from PySide6.QtGui import QStandardItem, QStandardItemModel
from PySide6.QtGui import QStandardItem, QStandardItemModel, QCloseEvent
from PySide6.QtWidgets import (
QAbstractItemView,
QCheckBox,
@ -40,6 +40,7 @@ from game.settings import (
)
from game.settings.ISettingsContainer import SettingsContainer
from game.sim import GameUpdateEvents
from pydcs_extensions import BanditClouds
from qt_ui.widgets.QLabeledWidget import QLabeledWidget
from qt_ui.widgets.spinsliders import FloatSpinSlider, TimeInputs
from qt_ui.windows.GameUpdateSignal import GameUpdateSignal
@ -354,6 +355,16 @@ class QSettingsWindow(QDialog):
self.setWindowIcon(CONST.ICONS["Settings"])
self.setMinimumSize(840, 480)
def closeEvent(self, event: QCloseEvent) -> None:
self._handle_mod_settings()
super().closeEvent(event)
def _handle_mod_settings(self) -> None:
if self.game.settings.use_bandit_clouds:
BanditClouds.activate()
else:
BanditClouds.deactivate()
class QSettingsWidget(QtWidgets.QWizardPage, SettingsContainer):
def __init__(self, settings: Settings, game: Optional[Game] = None):