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

Merge pull request #738 from SimonC6R/remove-pyotr-velikiy

Browse Source 
Remove Pyotr Velikiy from the generator for now.
This commit is contained in:
Dan Albert 2021-01-06 12:43:59 -08:00 committed by GitHub
commit 40956a4042
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
changelog.md
View File

@ -31,6 +31,7 @@ Saves from 2.3 are not compatible with 2.4.
* **[Economy]** Pending unit orders at captured bases will be refunded. * **[Economy]** Pending unit orders at captured bases will be refunded.
* **[Units]** J-11A is no longer spawned with empty loadout. * **[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 # 2.3.3

12
gen/fleet/cn_dd_group.py
View File

@ -8,7 +8,6 @@ from dcs.ships import (
Type_052C_Destroyer, Type_052C_Destroyer,
Type_052B_Destroyer, Type_052B_Destroyer,
Type_054A_Frigate, Type_054A_Frigate,
CGN_1144_2_Pyotr_Velikiy,
) )
from game.factions.faction import Faction from game.factions.faction import Faction
@ -27,12 +26,7 @@ class ChineseNavyGroupGenerator(ShipGroupGenerator):
include_frigate = random.choice([True, True, False]) include_frigate = random.choice([True, True, False])
include_dd = random.choice([True, False]) include_dd = random.choice([True, False])
if include_dd: if not any([include_frigate, include_dd]):
include_cc = random.choice([True, False])
else:
include_cc = False
if not any([include_frigate, include_dd, include_cc]):
include_frigate = True include_frigate = True
if include_frigate: 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, "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) 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 self.get_generated_group().points[0].speed = 20

6
gen/fleet/ru_dd_group.py
View File

@ -8,7 +8,6 @@ from dcs.ships import (
FFG_11540_Neustrashimy, FFG_11540_Neustrashimy,
FF_1135M_Rezky, FF_1135M_Rezky,
CG_1164_Moskva, CG_1164_Moskva,
CGN_1144_2_Pyotr_Velikiy,
SSK_877, SSK_877,
SSK_641B 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) self.add_unit(dd_type, "DD2", self.position.x + 2400, self.position.y - 900, self.heading)
if include_cc: if include_cc:
cc_type = random.choice([CG_1164_Moskva, CGN_1144_2_Pyotr_Velikiy]) # Only include the Moskva for now, the Pyotry Velikiy is an unkillable monster.
self.add_unit(cc_type, "CC1", self.position.x, self.position.y, self.heading) # 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 self.get_generated_group().points[0].speed = 20