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

New Caucasus campaign in Russia

Browse Source
This commit is contained in:
Khopa 2020-08-04 01:17:26 +02:00
parent 9d4d3d0523
commit f0350b7045
2 changed files with 20 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
qt_ui/windows/QNewGameWizard.py
View File

@ -37,7 +37,7 @@ class NewGameWizard(QtWidgets.QWizard):
isTerrainPg = self.field("isTerrainPg") isTerrainPg = self.field("isTerrainPg")
isTerrainNttr = self.field("isTerrainNttr") isTerrainNttr = self.field("isTerrainNttr")
isTerrainCaucasusSmall = self.field("isTerrainCaucasusSmall") isTerrainCaucasusSmall = self.field("isTerrainCaucasusSmall")
isTerrainCaucasusSmallInverted = self.field("isTerrainCaucasusSmallInverted") isTerrainRussia = self.field("isTerrainRussia")
isTerrainCaucasusNorth= self.field("isTerrainCaucasusNorth") isTerrainCaucasusNorth= self.field("isTerrainCaucasusNorth")
isIranianCampaignTheater = self.field("isIranianCampaignTheater") isIranianCampaignTheater = self.field("isIranianCampaignTheater")
isTerrainNormandy = self.field("isTerrainNormandy") isTerrainNormandy = self.field("isTerrainNormandy")
@ -64,8 +64,8 @@ class NewGameWizard(QtWidgets.QWizard):
conflicttheater = nevada.NevadaTheater() conflicttheater = nevada.NevadaTheater()
elif isTerrainCaucasusSmall: elif isTerrainCaucasusSmall:
conflicttheater = caucasus.WesternGeorgia() conflicttheater = caucasus.WesternGeorgia()
elif isTerrainCaucasusSmallInverted: elif isTerrainRussia:
conflicttheater = caucasus.WesternGeorgiaInverted() conflicttheater = caucasus.RussiaSmall()
elif isTerrainCaucasusNorth: elif isTerrainCaucasusNorth:
conflicttheater = caucasus.NorthCaucasus() conflicttheater = caucasus.NorthCaucasus()
elif isIranianCampaignTheater: elif isIranianCampaignTheater:
@ -267,8 +267,8 @@ class TheaterConfiguration(QtWidgets.QWizardPage):
terrainGroup = QtWidgets.QGroupBox("Terrain") terrainGroup = QtWidgets.QGroupBox("Terrain")
terrainCaucasusSmall = QtWidgets.QRadioButton("Caucasus - Western Georgia [RECOMMENDED - Early Cold War Era]") terrainCaucasusSmall = QtWidgets.QRadioButton("Caucasus - Western Georgia [RECOMMENDED - Early Cold War Era]")
terrainCaucasusSmall.setIcon(QtGui.QIcon(CONST.ICONS["Terrain_Caucasus"])) terrainCaucasusSmall.setIcon(QtGui.QIcon(CONST.ICONS["Terrain_Caucasus"]))
terrainCaucasusSmallInverted = QtWidgets.QRadioButton("Caucasus - Western Georgia Inverted [RECOMMENDED - Early Cold War Era]") terrainRussia = QtWidgets.QRadioButton("Caucasus - Russia Small")
terrainCaucasusSmallInverted.setIcon(QtGui.QIcon(CONST.ICONS["Terrain_Caucasus"])) terrainRussia.setIcon(QtGui.QIcon(CONST.ICONS["Terrain_Caucasus"]))
terrainCaucasus = QtWidgets.QRadioButton("Caucasus - Full map [NOT TESTED]") terrainCaucasus = QtWidgets.QRadioButton("Caucasus - Full map [NOT TESTED]")
terrainCaucasus.setIcon(QtGui.QIcon(CONST.ICONS["Terrain_Caucasus"])) terrainCaucasus.setIcon(QtGui.QIcon(CONST.ICONS["Terrain_Caucasus"]))
terrainCaucasusNorth = QtWidgets.QRadioButton("Caucasus - North - [RECOMMENDED - Modern Era]") terrainCaucasusNorth = QtWidgets.QRadioButton("Caucasus - North - [RECOMMENDED - Modern Era]")
@ -313,7 +313,7 @@ class TheaterConfiguration(QtWidgets.QWizardPage):
# Register fields # Register fields
self.registerField('isTerrainCaucasus', terrainCaucasus) self.registerField('isTerrainCaucasus', terrainCaucasus)
self.registerField('isTerrainCaucasusSmall', terrainCaucasusSmall) self.registerField('isTerrainCaucasusSmall', terrainCaucasusSmall)
self.registerField('isTerrainCaucasusSmallInverted', terrainCaucasusSmallInverted) self.registerField('isTerrainRussia', terrainRussia)
self.registerField('isTerrainCaucasusNorth', terrainCaucasusNorth) self.registerField('isTerrainCaucasusNorth', terrainCaucasusNorth)
self.registerField('isTerrainPg', terrainPg) self.registerField('isTerrainPg', terrainPg)
self.registerField('isIranianCampaignTheater', terrainIran) self.registerField('isIranianCampaignTheater', terrainIran)
@ -328,7 +328,7 @@ class TheaterConfiguration(QtWidgets.QWizardPage):
# Build layout # Build layout
terrainGroupLayout = QtWidgets.QVBoxLayout() terrainGroupLayout = QtWidgets.QVBoxLayout()
terrainGroupLayout.addWidget(terrainCaucasusSmall) terrainGroupLayout.addWidget(terrainCaucasusSmall)
terrainGroupLayout.addWidget(terrainCaucasusSmallInverted) terrainGroupLayout.addWidget(terrainRussia)
terrainGroupLayout.addWidget(terrainCaucasusNorth) terrainGroupLayout.addWidget(terrainCaucasusNorth)
terrainGroupLayout.addWidget(terrainCaucasus) terrainGroupLayout.addWidget(terrainCaucasus)
terrainGroupLayout.addWidget(terrainIran) terrainGroupLayout.addWidget(terrainIran)

36
theater/caucasus.py
View File

@ -19,7 +19,7 @@ class CaucasusTheater(ConflictTheater):
"night": (0, 5), "night": (0, 5),
} }
carrier_1 = ControlPoint.carrier("Carrier", mapping.Point(-305810.6875, 406399.1875), 1001)
def __init__(self, load_ground_objects=True): def __init__(self, load_ground_objects=True):
super(CaucasusTheater, self).__init__() super(CaucasusTheater, self).__init__()
@ -41,6 +41,7 @@ class CaucasusTheater(ConflictTheater):
self.nalchik = ControlPoint.from_airport(caucasus.Nalchik, LAND, SIZE_REGULAR, 1.1) self.nalchik = ControlPoint.from_airport(caucasus.Nalchik, LAND, SIZE_REGULAR, 1.1)
self.mineralnye = ControlPoint.from_airport(caucasus.Mineralnye_Vody, LAND, SIZE_BIG, 1.3) self.mineralnye = ControlPoint.from_airport(caucasus.Mineralnye_Vody, LAND, SIZE_BIG, 1.3)
self.mozdok = ControlPoint.from_airport(caucasus.Mozdok, LAND, SIZE_BIG, 1.1) self.mozdok = ControlPoint.from_airport(caucasus.Mozdok, LAND, SIZE_BIG, 1.1)
self.carrier_1 = ControlPoint.carrier("Carrier", mapping.Point(-305810.6875, 406399.1875), 1001)
self.vaziani.frontline_offset = 0.5 self.vaziani.frontline_offset = 0.5
self.vaziani.base.strength = 1 self.vaziani.base.strength = 1
@ -121,12 +122,12 @@ class WesternGeorgia(ConflictTheater):
Georgian Theather [inverted starting position] Georgian Theather [inverted starting position]
Ideal for smaller scale campaign Ideal for smaller scale campaign
""" """
class WesternGeorgiaInverted(ConflictTheater): class RussiaSmall(ConflictTheater):
terrain = caucasus.Caucasus() terrain = caucasus.Caucasus()
overview_image = "caumap.gif" overview_image = "caumap.gif"
reference_points = {(-317948.32727306, 635639.37385346): (278.5 * 4, 319 * 4), reference_points = {(-317948.32727306, 635639.37385346): (278.5 * 4, 319 * 4),
(-355692.3067714, 617269.96285781): (263 * 4, 352 * 4), } (-355692.3067714, 617269.96285781): (263 * 4, 352 * 4), }
landmap = load_landmap("resources\\caulandmap.p") landmap = load_landmap("resources\\caulandmap.p")
daytime_map = { daytime_map = {
"dawn": (6, 9), "dawn": (6, 9),
@ -135,28 +136,19 @@ class WesternGeorgiaInverted(ConflictTheater):
"night": (0, 5), "night": (0, 5),
} }
def __init__(self, load_ground_objects=True): def __init__(self, load_ground_objects=True):
super(WesternGeorgiaInverted, self).__init__() super(RussiaSmall, self).__init__()
self.kutaisi = ControlPoint.from_airport(caucasus.Kutaisi, LAND, SIZE_SMALL, IMPORTANCE_LOW) self.maykop = ControlPoint.from_airport(caucasus.Maykop_Khanskaya, LAND, SIZE_LARGE, IMPORTANCE_HIGH)
self.senaki = ControlPoint.from_airport(caucasus.Senaki_Kolkhi, LAND, SIZE_REGULAR, IMPORTANCE_LOW) self.mineralnye = ControlPoint.from_airport(caucasus.Mineralnye_Vody, LAND, SIZE_BIG, 1.3)
self.kobuleti = ControlPoint.from_airport(caucasus.Kobuleti, COAST_A_E, SIZE_SMALL, 1.1) self.mozdok = ControlPoint.from_airport(caucasus.Mozdok, LAND, SIZE_BIG, 1.1)
self.sukhumi = ControlPoint.from_airport(caucasus.Sukhumi_Babushara, COAST_DR_E, SIZE_REGULAR, 1.2)
self.gudauta = ControlPoint.from_airport(caucasus.Gudauta, COAST_DR_E, SIZE_REGULAR, 1.2)
self.sochi = ControlPoint.from_airport(caucasus.Sochi_Adler, COAST_DR_E, SIZE_BIG, IMPORTANCE_HIGH)
self.carrier_1 = ControlPoint.carrier("Carrier", mapping.Point(-285810.6875, 496399.1875), 1001)
self.add_controlpoint(self.kutaisi, connected_to=[self.senaki]) self.add_controlpoint(self.mozdok, connected_to=[self.mineralnye])
self.add_controlpoint(self.senaki, connected_to=[self.kobuleti, self.sukhumi, self.kutaisi]) self.add_controlpoint(self.mineralnye, connected_to=[self.mozdok, self.maykop])
self.add_controlpoint(self.kobuleti, connected_to=[self.senaki]) self.add_controlpoint(self.maykop, connected_to=[self.mineralnye])
self.add_controlpoint(self.sukhumi, connected_to=[self.gudauta, self.senaki])
self.add_controlpoint(self.gudauta, connected_to=[self.sochi, self.sukhumi])
self.add_controlpoint(self.sochi, connected_to=[self.gudauta])
self.add_controlpoint(self.carrier_1)
self.carrier_1.captured = True self.mozdok.captured = True
self.sochi.captured = True self.maykop.captured_invert = True
class NorthCaucasus(ConflictTheater): class NorthCaucasus(ConflictTheater):
@ -173,8 +165,6 @@ class NorthCaucasus(ConflictTheater):
"night": (0, 5), "night": (0, 5),
} }
carrier_1 = ControlPoint.carrier("Carrier", mapping.Point(-305810.6875, 406399.1875), 1001)
def __init__(self, load_ground_objects=True): def __init__(self, load_ground_objects=True):
super(NorthCaucasus, self).__init__() super(NorthCaucasus, self).__init__()