Merge branch 'master' into DCS-UI-Theme

This commit is contained in:
Donnie 2020-06-26 16:18:01 -04:00
commit ac6a106c6a
7 changed files with 13 additions and 4 deletions

View File

@ -1,3 +1,12 @@
# 2.0 RC 9
## Features/Improvements :
* **[UI/UX]** New icons from contributor Deus
## Fixed issues :
* **[Mission Generator]** Carrier TACAN was wrongfully set up as an A/A TACAN
* **[Campaign Generator]** Fixed issue with Russian navy group generator causing a random crash on campaign creation.
# 2.0 RC 8
## Fixed issues :

View File

@ -45,7 +45,7 @@ class GrishaGroupGenerator(DDGroupGenerator):
class MolniyaGroupGenerator(DDGroupGenerator):
def __init__(self, game, ground_object, faction):
super(MolniyaGroupGenerator, self).__init__(game, ground_object, faction, MolniyaGroupGenerator)
super(MolniyaGroupGenerator, self).__init__(game, ground_object, faction, FSG_1241_1MP_Molniya)
class KiloSubGroupGenerator(DDGroupGenerator):

View File

@ -130,7 +130,7 @@ class GroundObjectsGenerator:
# Set UP TACAN and ICLS
modeChannel = "X" if not cp.tacanY else "Y"
sg.points[0].tasks.append(ActivateBeaconCommand(channel=cp.tacanN, modechannel=modeChannel, callsign=cp.tacanI, unit_id=sg.units[0].id))
sg.points[0].tasks.append(ActivateBeaconCommand(channel=cp.tacanN, modechannel=modeChannel, callsign=cp.tacanI, unit_id=sg.units[0].id, aa=False))
if ground_object.dcs_identifier == "CARRIER" and hasattr(cp, "icls"):
sg.points[0].tasks.append(ActivateICLSCommand(cp.icls, unit_id=sg.units[0].id))

View File

@ -1,7 +1,7 @@
from userdata import logging_config
# Logging setup
VERSION_STRING = "2.0RC7"
VERSION_STRING = "2.0RC9"
logging_config.init_logging(VERSION_STRING)
import logging

View File

@ -108,7 +108,7 @@ class NewGameWizard(QtWidgets.QWizard):
game.budget = int(game.budget * multiplier)
game.settings.multiplier = multiplier
game.settings.sams = True
game.settings.version = "2.0RC7"
game.settings.version = "2.0RC9"
if midgame:
game.budget = game.budget * 4 * len(list(conflicttheater.conflicts()))

Binary file not shown.

Before

Width:  |  Height:  |  Size: 363 B

After

Width:  |  Height:  |  Size: 940 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 363 B

After

Width:  |  Height:  |  Size: 934 B