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

Merge pull request #1248 from jsjlewis96/dot-neutral

Browse Source 
#987 Neutral dot labels in options
This commit is contained in:
C. Perreau 2021-06-18 18:13:09 +02:00 committed by GitHub
commit cea970f065
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
changelog.md
View File

@ -20,6 +20,7 @@ Saves from 3.x are not compatible with 4.0.
* **[Campaign AI]** Fix procurement for factions that lack some unit types. * **[Campaign AI]** Fix procurement for factions that lack some unit types.
* **[Mission Generation]** Fixed problem with mission load when control point name contained an apostrophe. * **[Mission Generation]** Fixed problem with mission load when control point name contained an apostrophe.
* **[UI]** Made non-interactive map elements less obstructive. * **[UI]** Made non-interactive map elements less obstructive.
* **[UI]** Added support for Neutral Dot difficulty label
# 3.0.0 # 3.0.0

2
gen/forcedoptionsgen.py
View File

@ -32,6 +32,8 @@ class ForcedOptionsGenerator:
self.mission.forced_options.labels = ForcedOptions.Labels.Abbreviate self.mission.forced_options.labels = ForcedOptions.Labels.Abbreviate
elif self.game.settings.labels == "Dot Only": elif self.game.settings.labels == "Dot Only":
self.mission.forced_options.labels = ForcedOptions.Labels.DotOnly self.mission.forced_options.labels = ForcedOptions.Labels.DotOnly
elif self.game.settings.labels == "Neutral Dot":
self.mission.forced_options.labels = ForcedOptions.Labels.NeutralDot
elif self.game.settings.labels == "Off": elif self.game.settings.labels == "Off":
self.mission.forced_options.labels = ForcedOptions.Labels.None_ self.mission.forced_options.labels = ForcedOptions.Labels.None_

2
qt_ui/uiconstants.py
View File

@ -13,7 +13,7 @@ URLS: Dict[str, str] = {
"Issues": "https://github.com/dcs-liberation/dcs_liberation/issues", "Issues": "https://github.com/dcs-liberation/dcs_liberation/issues",
} }
LABELS_OPTIONS = ["Full", "Abbreviated", "Dot Only", "Off"] LABELS_OPTIONS = ["Full", "Abbreviated", "Dot Only", "Neutral Dot", "Off"]
SKILL_OPTIONS = ["Average", "Good", "High", "Excellent"] SKILL_OPTIONS = ["Average", "Good", "High", "Excellent"]
AIRCRAFT_BANNERS: Dict[str, QPixmap] = {} AIRCRAFT_BANNERS: Dict[str, QPixmap] = {}