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

Reworked payloads, factions, map display, carrier. Re-added Tarawa support, many minor bug fixes. UI changes.

Browse Source
This commit is contained in:
Khopa
2020-05-27 21:45:58 +02:00
parent 3f2aafcd28
commit 6dec5ea8f8
93 changed files with 8799 additions and 474 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
gen/fleet/carrier_group.py
View File

@@ -13,7 +13,11 @@ class CarrierGroupGenerator(GroupGenerator):
# Add carrier
if "aircraft_carrier" in self.faction.keys():
carrier_type = random.choice(self.faction["aircraft_carrier"])
if "supercarrier" in self.faction.keys() and self.game.settings.supercarrier:
carrier_type = random.choice(self.faction["supercarrier"])
else:
carrier_type = random.choice(self.faction["aircraft_carrier"])
self.add_unit(carrier_type, "Carrier", self.position.x, self.position.y, self.heading)
else:
return
@@ -24,4 +28,6 @@ class CarrierGroupGenerator(GroupGenerator):
self.add_unit(dd_type, "DD2", self.position.x + 250, self.position.y - 450, self.heading)
self.add_unit(dd_type, "DD3", self.position.x + 450, self.position.y + 850, self.heading)
self.add_unit(dd_type, "DD4", self.position.x + 450, self.position.y - 850, self.heading)
self.add_unit(dd_type, "DD4", self.position.x + 450, self.position.y - 850, self.heading)
self.get_generated_group().points[0].speed = 20

11
gen/fleet/heli_carrier_group.py → gen/fleet/lha_group.py
View File

@@ -3,23 +3,22 @@ import random
from gen.sam.group_generator import GroupGenerator
class HelicopterCarrierGroupGenerator(GroupGenerator):
class LHAGroupGenerator(GroupGenerator):
def __init__(self, game, ground_object, faction):
super(HelicopterCarrierGroupGenerator, self).__init__(game, ground_object)
super(LHAGroupGenerator, self).__init__(game, ground_object)
self.faction = faction
def generate(self):
# Add carrier
if self.faction["aircraft_carrier"]:
if "helicopter_carrier" in self.faction.keys():
carrier_type = random.choice(self.faction["helicopter_carrier"])
self.add_unit(carrier_type, "Carrier", self.position.x, self.position.y, self.heading)
self.add_unit(carrier_type, "LHA", self.position.x, self.position.y, self.heading)
# Add destroyers escort
dd_type = random.choice(self.faction["destroyer"])
self.add_unit(dd_type, "DD1", self.position.x + 50, self.position.y + 150, self.heading)
self.add_unit(dd_type, "DD2", self.position.x + 50, self.position.y - 150, self.heading)
self.add_unit(dd_type, "DD3", self.position.x + 150, self.position.y + 250, self.heading)
self.add_unit(dd_type, "DD4", self.position.x + 150, self.position.y - 250, self.heading)
self.get_generated_group().points[0].speed = 20

21
gen/fleet/ship_group_generator.py
View File

@@ -1,15 +1,11 @@
import random
from dcs.vehicles import Armor
from game import db
from gen.defenses.armored_group_generator import ArmoredGroupGenerator
from gen.fleet.carrier_group import CarrierGroupGenerator
from gen.fleet.lha_group import LHAGroupGenerator
def generate_carrier_group(faction:str, game, ground_object):
"""
This generate a ship group
This generate a carrier group
:param parentCp: The parent control point
:param ground_object: The ground object which will own the ship group
:param country: Owner country
@@ -18,3 +14,16 @@ def generate_carrier_group(faction:str, game, ground_object):
generator = CarrierGroupGenerator(game, ground_object, db.FACTIONS[faction])
generator.generate()
return generator.get_generated_group()
def generate_lha_group(faction:str, game, ground_object):
"""
This generate a lha carrier group
:param parentCp: The parent control point
:param ground_object: The ground object which will own the ship group
:param country: Owner country
:return: Nothing, but put the group reference inside the ground object
"""
generator = LHAGroupGenerator(game, ground_object, db.FACTIONS[faction])
generator.generate()
return generator.get_generated_group()