From fac770424c81008269ed5a4f0c758d4e657d02f4 Mon Sep 17 00:00:00 2001 From: Simon Clark Date: Wed, 6 Jan 2021 20:39:50 +0000 Subject: [PATCH 1/2] Remove Pyotr Velikiy from the generator for now. It's just too strong to be killed by a reasonable number of Harpoons. DCS needs a fixed ship damage model first. Contributes-to: Khopa/dcs_liberation#567 --- gen/fleet/cn_dd_group.py | 12 +----------- gen/fleet/ru_dd_group.py | 6 +++--- 2 files changed, 4 insertions(+), 14 deletions(-) diff --git a/gen/fleet/cn_dd_group.py b/gen/fleet/cn_dd_group.py index a8fbdc44..8a20ae10 100644 --- a/gen/fleet/cn_dd_group.py +++ b/gen/fleet/cn_dd_group.py @@ -8,7 +8,6 @@ from dcs.ships import ( Type_052C_Destroyer, Type_052B_Destroyer, Type_054A_Frigate, - CGN_1144_2_Pyotr_Velikiy, ) from game.factions.faction import Faction @@ -27,12 +26,7 @@ class ChineseNavyGroupGenerator(ShipGroupGenerator): include_frigate = random.choice([True, True, False]) include_dd = random.choice([True, False]) - if include_dd: - include_cc = random.choice([True, False]) - else: - include_cc = False - - if not any([include_frigate, include_dd, include_cc]): + if not any([include_frigate, include_dd]): include_frigate = True if include_frigate: @@ -44,10 +38,6 @@ class ChineseNavyGroupGenerator(ShipGroupGenerator): self.add_unit(dd_type, "DD1", self.position.x + 2400, self.position.y + 900, self.heading) self.add_unit(dd_type, "DD2", self.position.x + 2400, self.position.y - 900, self.heading) - if include_cc: - cc_type = random.choice([CGN_1144_2_Pyotr_Velikiy]) - self.add_unit(cc_type, "CC1", self.position.x, self.position.y, self.heading) - self.get_generated_group().points[0].speed = 20 diff --git a/gen/fleet/ru_dd_group.py b/gen/fleet/ru_dd_group.py index d67656a7..ee08577f 100644 --- a/gen/fleet/ru_dd_group.py +++ b/gen/fleet/ru_dd_group.py @@ -8,7 +8,6 @@ from dcs.ships import ( FFG_11540_Neustrashimy, FF_1135M_Rezky, CG_1164_Moskva, - CGN_1144_2_Pyotr_Velikiy, SSK_877, SSK_641B ) @@ -49,8 +48,9 @@ class RussianNavyGroupGenerator(ShipGroupGenerator): self.add_unit(dd_type, "DD2", self.position.x + 2400, self.position.y - 900, self.heading) if include_cc: - cc_type = random.choice([CG_1164_Moskva, CGN_1144_2_Pyotr_Velikiy]) - self.add_unit(cc_type, "CC1", self.position.x, self.position.y, self.heading) + # Only include the Moskva for now, the Pyotry Velikiy is an unkillable monster. + # See https://github.com/Khopa/dcs_liberation/issues/567 + self.add_unit(CG_1164_Moskva, "CC1", self.position.x, self.position.y, self.heading) self.get_generated_group().points[0].speed = 20 From 8680e90e3b5e99990270804bb8fed5080bba78c9 Mon Sep 17 00:00:00 2001 From: Simon Clark Date: Wed, 6 Jan 2021 20:42:10 +0000 Subject: [PATCH 2/2] Changelog. --- changelog.md | 1 + 1 file changed, 1 insertion(+) diff --git a/changelog.md b/changelog.md index 5fc245cd..a2ecf05f 100644 --- a/changelog.md +++ b/changelog.md @@ -31,6 +31,7 @@ Saves from 2.3 are not compatible with 2.4. * **[Economy]** Pending unit orders at captured bases will be refunded. * **[Units]** J-11A is no longer spawned with empty loadout. +* **[Units]** Pyotr Velikiy cruiser has been removed for now as it's nearly unkillable. # 2.3.3