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

Fixed weapons names in pdcs extensions, removed deprecated rafale mod, fixed many other compilation issues with pydcs 2.7+

Browse Source
This commit is contained in:
Khopa
2021-04-17 02:13:52 +02:00
parent 1e468cd3e0
commit 8091051bb4
77 changed files with 1017 additions and 3797 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gen/coastal/silkworm.py
View File

@@ -32,7 +32,7 @@ class SilkwormGenerator(GroupGenerator):
# Commander
self.add_unit(
Unarmed.Transport_KAMAZ_43101,
Unarmed.Truck_KAMAZ_43101,
"KAMAZ#0",
self.position.x - 35,
self.position.y - 20,

14
gen/fleet/carrier_group.py
View File

@@ -2,7 +2,7 @@ import random
from gen.sam.group_generator import ShipGroupGenerator
from dcs.ships import USS_Arleigh_Burke_IIa, Ticonderoga_class
from dcs.ships import DDG_Arleigh_Burke_IIa, CG_Ticonderoga
class CarrierGroupGenerator(ShipGroupGenerator):
@@ -22,7 +22,7 @@ class CarrierGroupGenerator(ShipGroupGenerator):
# Add Arleigh Burke escort
self.add_unit(
USS_Arleigh_Burke_IIa,
DDG_Arleigh_Burke_IIa,
"USS Ramage",
self.position.x + 6482,
self.position.y + 6667,
@@ -30,7 +30,7 @@ class CarrierGroupGenerator(ShipGroupGenerator):
)
self.add_unit(
USS_Arleigh_Burke_IIa,
DDG_Arleigh_Burke_IIa,
"USS Mitscher",
self.position.x - 7963,
self.position.y + 7037,
@@ -38,7 +38,7 @@ class CarrierGroupGenerator(ShipGroupGenerator):
)
self.add_unit(
USS_Arleigh_Burke_IIa,
DDG_Arleigh_Burke_IIa,
"USS Forrest Sherman",
self.position.x - 7408,
self.position.y - 7408,
@@ -46,7 +46,7 @@ class CarrierGroupGenerator(ShipGroupGenerator):
)
self.add_unit(
USS_Arleigh_Burke_IIa,
DDG_Arleigh_Burke_IIa,
"USS Lassen",
self.position.x + 8704,
self.position.y - 6296,
@@ -56,7 +56,7 @@ class CarrierGroupGenerator(ShipGroupGenerator):
# Add Ticonderoga escort
if self.heading >= 180:
self.add_unit(
Ticonderoga_class,
CG_Ticonderoga,
"USS Hué City",
self.position.x + 2222,
self.position.y - 3333,
@@ -64,7 +64,7 @@ class CarrierGroupGenerator(ShipGroupGenerator):
)
else:
self.add_unit(
Ticonderoga_class,
CG_Ticonderoga,
"USS Hué City",
self.position.x - 3333,
self.position.y + 2222,

6
gen/fleet/dd_group.py
View File

@@ -6,7 +6,7 @@ from game.theater.theatergroundobject import TheaterGroundObject
from gen.sam.group_generator import ShipGroupGenerator
from dcs.unittype import ShipType
from dcs.ships import Oliver_Hazzard_Perry_class, USS_Arleigh_Burke_IIa
from dcs.ships import FFG_Oliver_Hazzard_Perry, DDG_Arleigh_Burke_IIa
if TYPE_CHECKING:
from game.game import Game
@@ -46,7 +46,7 @@ class OliverHazardPerryGroupGenerator(DDGroupGenerator):
self, game: Game, ground_object: TheaterGroundObject, faction: Faction
):
super(OliverHazardPerryGroupGenerator, self).__init__(
game, ground_object, faction, Oliver_Hazzard_Perry_class
game, ground_object, faction, FFG_Oliver_Hazzard_Perry
)
@@ -55,5 +55,5 @@ class ArleighBurkeGroupGenerator(DDGroupGenerator):
self, game: Game, ground_object: TheaterGroundObject, faction: Faction
):
super(ArleighBurkeGroupGenerator, self).__init__(
game, ground_object, faction, USS_Arleigh_Burke_IIa
game, ground_object, faction, DDG_Arleigh_Burke_IIa
)

28
gen/fleet/ru_dd_group.py
View File

@@ -3,13 +3,13 @@ import random
from typing import TYPE_CHECKING
from dcs.ships import (
FFL_1124_4_Grisha,
FSG_1241_1MP_Molniya,
FFG_11540_Neustrashimy,
FF_1135M_Rezky,
CG_1164_Moskva,
SSK_877,
SSK_641B,
Corvette_1124_4_Grisha,
Corvette_1241_1_Molniya,
Frigate_11540_Neustrashimy,
Frigate_1135M_Rezky,
Cruiser_1164_Moskva,
SSK_877V_Kilo,
SSK_641B_Tango,
)
from gen.fleet.dd_group import DDGroupGenerator
@@ -37,7 +37,7 @@ class RussianNavyGroupGenerator(ShipGroupGenerator):
include_frigate = True
if include_frigate:
frigate_type = random.choice([FFL_1124_4_Grisha, FSG_1241_1MP_Molniya])
frigate_type = random.choice([Corvette_1124_4_Grisha, Corvette_1241_1_Molniya])
self.add_unit(
frigate_type,
"FF1",
@@ -54,7 +54,7 @@ class RussianNavyGroupGenerator(ShipGroupGenerator):
)
if include_dd:
dd_type = random.choice([FFG_11540_Neustrashimy, FF_1135M_Rezky])
dd_type = random.choice([Frigate_11540_Neustrashimy, Frigate_1135M_Rezky])
self.add_unit(
dd_type,
"DD1",
@@ -74,7 +74,7 @@ class RussianNavyGroupGenerator(ShipGroupGenerator):
# 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
Cruiser_1164_Moskva, "CC1", self.position.x, self.position.y, self.heading
)
self.get_generated_group().points[0].speed = 20
@@ -85,7 +85,7 @@ class GrishaGroupGenerator(DDGroupGenerator):
self, game: Game, ground_object: TheaterGroundObject, faction: Faction
):
super(GrishaGroupGenerator, self).__init__(
game, ground_object, faction, FFL_1124_4_Grisha
game, ground_object, faction, Corvette_1124_4_Grisha
)
@@ -94,7 +94,7 @@ class MolniyaGroupGenerator(DDGroupGenerator):
self, game: Game, ground_object: TheaterGroundObject, faction: Faction
):
super(MolniyaGroupGenerator, self).__init__(
game, ground_object, faction, FSG_1241_1MP_Molniya
game, ground_object, faction, Corvette_1241_1_Molniya
)
@@ -103,7 +103,7 @@ class KiloSubGroupGenerator(DDGroupGenerator):
self, game: Game, ground_object: TheaterGroundObject, faction: Faction
):
super(KiloSubGroupGenerator, self).__init__(
game, ground_object, faction, SSK_877
game, ground_object, faction, SSK_877V_Kilo
)
@@ -112,5 +112,5 @@ class TangoSubGroupGenerator(DDGroupGenerator):
self, game: Game, ground_object: TheaterGroundObject, faction: Faction
):
super(TangoSubGroupGenerator, self).__init__(
game, ground_object, faction, SSK_641B
game, ground_object, faction, SSK_641B_Tango
)

4
gen/fleet/schnellboot.py
View File

@@ -1,6 +1,6 @@
import random
from dcs.ships import Schnellboot_type_S130
from dcs.ships import Boat_Schnellboot_type_S130
from gen.sam.group_generator import ShipGroupGenerator
@@ -10,7 +10,7 @@ class SchnellbootGroupGenerator(ShipGroupGenerator):
for i in range(random.randint(2, 4)):
self.add_unit(
Schnellboot_type_S130,
Boat_Schnellboot_type_S130,
"Schnellboot" + str(i),
self.position.x + i * random.randint(100, 250),
self.position.y + (random.randint(100, 200) - 100),

4
gen/fleet/uboat.py
View File

@@ -1,6 +1,6 @@
import random
from dcs.ships import Uboat_VIIC_U_flak
from dcs.ships import U_boat_VIIC_U_flak
from gen.sam.group_generator import ShipGroupGenerator
@@ -10,7 +10,7 @@ class UBoatGroupGenerator(ShipGroupGenerator):
for i in range(random.randint(1, 4)):
self.add_unit(
Uboat_VIIC_U_flak,
U_boat_VIIC_U_flak,
"Uboat" + str(i),
self.position.x + i * random.randint(100, 250),
self.position.y + (random.randint(100, 200) - 100),

13
gen/flights/ai_flight_planner_db.py
View File

@@ -59,7 +59,6 @@ from dcs.planes import (
MiG_27K,
MiG_29A,
MiG_29G,
MiG_29K,
MiG_29S,
MiG_31,
Mirage_2000_5,
@@ -97,7 +96,6 @@ from pydcs_extensions.a4ec.a4ec import A_4E_C
from pydcs_extensions.f22a.f22a import F_22A
from pydcs_extensions.hercules.hercules import Hercules
from pydcs_extensions.mb339.mb339 import MB_339PAN
from pydcs_extensions.rafale.rafale import Rafale_A_S, Rafale_B, Rafale_M
from pydcs_extensions.su57.su57 import Su_57
# All aircraft lists are in priority order. Aircraft higher in the list will be
@@ -115,14 +113,12 @@ CAP_CAPABLE = [
F_14B,
F_14A_135_GR,
MiG_25PD,
Rafale_M,
Su_33,
Su_30,
Su_27,
J_11A,
F_15C,
MiG_29S,
MiG_29K,
MiG_29G,
MiG_29A,
F_16C_50,
@@ -169,8 +165,6 @@ CAS_CAPABLE = [
F_15E,
F_16C_50,
FA_18C_hornet,
Rafale_A_S,
Rafale_B,
Tornado_GR4,
Tornado_IDS,
JF_17,
@@ -232,8 +226,6 @@ SEAD_CAPABLE = [
Tornado_IDS,
Su_25T,
Su_25TM,
Rafale_A_S,
Rafale_B,
F_4E,
A_4E_C,
AV8BNA,
@@ -281,8 +273,6 @@ STRIKE_CAPABLE = [
Tu_22M3,
F_15E,
AJS37,
Rafale_A_S,
Rafale_B,
Tornado_GR4,
F_16C_50,
FA_18C_hornet,
@@ -301,7 +291,6 @@ STRIKE_CAPABLE = [
Su_30,
Su_27,
MiG_29S,
MiG_29K,
MiG_29G,
MiG_29A,
JF_17,
@@ -338,8 +327,6 @@ ANTISHIP_CAPABLE = [
AJS37,
Tu_22M3,
FA_18C_hornet,
Rafale_A_S,
Rafale_B,
Su_24M,
Su_17M4,
JF_17,

30
gen/ground_forces/ai_ground_planner_db.py
View File

@@ -86,7 +86,7 @@ TYPE_APC = [
Armor.APC_M2A1_Halftrack,
Armor.APC_Cobra__Scout,
Armor.APC_Sd_Kfz_251_Halftrack,
Armor.APC_AAV_7,
Armor.APC_AAV_7_Amphibious,
Armor.APC_TPz_Fuchs,
Armor.IFV_BRDM_2,
Armor.APC_BTR_RD,
@@ -111,7 +111,7 @@ TYPE_ARTILLERY = [
Artillery.SPH_2S9_Nona_120mm_M,
Artillery.SPH_Dana_vz77_152mm,
Artillery.SPH_2S19_Msta_152mm,
Artillery.MLRS_FDDM,
Artillery.MLRS_9A52_Smerch_CM_300mm,
# WW2
Artillery.SPG_Sturmpanzer_IV_Brummbar,
Artillery.SPG_M12_GMC_155mm,
@@ -119,20 +119,20 @@ TYPE_ARTILLERY = [
TYPE_LOGI = [
Unarmed.Truck_M818_6x6,
Unarmed.Transport_KAMAZ_43101,
Unarmed.Truck_KAMAZ_43101,
Unarmed.Truck_Ural_375,
Unarmed.Transport_GAZ_66,
Unarmed.Transport_GAZ_3307,
Unarmed.Transport_GAZ_3308,
Unarmed.Transport_Ural_4320_31_Armored,
Unarmed.Transport_Ural_4320T,
Unarmed.Blitz_3_6_6700A,
Unarmed.Kübelwagen_82,
Unarmed.Sd_Kfz_7,
Unarmed.Sd_Kfz_2,
Unarmed.Willys_MB,
Unarmed.Land_Rover_109_S3,
Unarmed.Land_Rover_101_FC,
Unarmed.Truck_GAZ_66,
Unarmed.Truck_GAZ_3307,
Unarmed.Truck_GAZ_3308,
Unarmed.Truck_Ural_4320_31_Arm_d,
Unarmed.Truck_Ural_4320T,
Unarmed.Truck_Opel_Blitz,
Unarmed.LUV_Kubelwagen_82,
Unarmed.Carrier_Sd_Kfz_7_Tractor,
Unarmed.LUV_Kettenrad,
Unarmed.Car_Willys_Jeep,
Unarmed.LUV_Land_Rover_109,
Unarmed.Truck_Land_Rover_101_FC,
# Mods
frenchpack.VBL,
frenchpack.VAB,

2
gen/locations/preset_control_point_locations.py
View File

@@ -9,7 +9,7 @@ from gen.locations.preset_locations import PresetLocation
class PresetControlPointLocations:
"""A repository of preset locations for a given control point"""
# List of possible ashore locations to generate objects (Represented in miz file by an APC_AAV_7)
# List of possible ashore locations to generate objects (Represented in miz file by an APC_AAV_7_Amphibious)
ashore_locations: List[PresetLocation] = field(default_factory=list)
# List of possible offshore locations to generate ship groups (Represented in miz file by an Oliver Hazard Perry)

2
gen/locations/preset_location_finder.py
View File

@@ -44,7 +44,7 @@ class MizDataLocationFinder:
for ship_group in m.country("USA").ship_group:
if (
len(ship_group.units) > 0
and ship_group.units[0].type == ships.Oliver_Hazzard_Perry_class.id
and ship_group.units[0].type == ships.FFG_Oliver_Hazzard_Perry.id
):
offshore_locations.append(
PresetLocation(

6
gen/missiles/scud_site.py
View File

@@ -14,21 +14,21 @@ class ScudGenerator(GroupGenerator):
# Scuds
self.add_unit(
MissilesSS.SRBM_SS_1C_Scud_B_9K72_LN_9P117M,
MissilesSS.SSM_SS_1C_Scud_B,
"V1#0",
self.position.x,
self.position.y + random.randint(1, 8),
self.heading,
)
self.add_unit(
MissilesSS.SRBM_SS_1C_Scud_B_9K72_LN_9P117M,
MissilesSS.SSM_SS_1C_Scud_B,
"V1#1",
self.position.x + 50,
self.position.y + random.randint(1, 8),
self.heading,
)
self.add_unit(
MissilesSS.SRBM_SS_1C_Scud_B_9K72_LN_9P117M,
MissilesSS.SSM_SS_1C_Scud_B,
"V1#2",
self.position.x + 100,
self.position.y + random.randint(1, 8),

10
gen/missiles/v1_group.py
View File

@@ -14,21 +14,21 @@ class V1GroupGenerator(GroupGenerator):
# Ramps
self.add_unit(
MissilesSS.V_1_ramp,
MissilesSS.SSM_V_1_Launcher,
"V1#0",
self.position.x,
self.position.y + random.randint(1, 8),
self.heading,
)
self.add_unit(
MissilesSS.V_1_ramp,
MissilesSS.SSM_V_1_Launcher,
"V1#1",
self.position.x + 50,
self.position.y + random.randint(1, 8),
self.heading,
)
self.add_unit(
MissilesSS.V_1_ramp,
MissilesSS.SSM_V_1_Launcher,
"V1#2",
self.position.x + 100,
self.position.y + random.randint(1, 8),
@@ -37,7 +37,7 @@ class V1GroupGenerator(GroupGenerator):
# Commander
self.add_unit(
Unarmed.Kübelwagen_82,
Unarmed.LUV_Kubelwagen_82,
"Kubel#0",
self.position.x - 35,
self.position.y - 20,
@@ -58,7 +58,7 @@ class V1GroupGenerator(GroupGenerator):
)
self.add_unit(
Unarmed.Blitz_3_6_6700A,
Unarmed.Truck_Opel_Blitz,
"Blitz#0",
self.position.x + 200,
self.position.y + 15,

4
gen/sam/aaa_flak.py
View File

@@ -78,7 +78,7 @@ class FlakGenerator(AirDefenseGroupGenerator):
# Commander
self.add_unit(
Unarmed.Kübelwagen_82,
Unarmed.LUV_Kubelwagen_82,
"Kubel#",
self.position.x - 35,
self.position.y - 20,
@@ -89,7 +89,7 @@ class FlakGenerator(AirDefenseGroupGenerator):
for i in range(int(max(1, grid_x / 2))):
for j in range(int(max(1, grid_x / 2))):
self.add_unit(
Unarmed.Blitz_3_6_6700A,
Unarmed.Truck_Opel_Blitz,
"BLITZ#" + str(index),
self.position.x + 125 + 15 * i + random.randint(1, 5),
self.position.y + 15 * j + random.randint(1, 5),

2
gen/sam/aaa_flak18.py
View File

@@ -34,7 +34,7 @@ class Flak18Generator(AirDefenseGroupGenerator):
# Add a commander truck
self.add_unit(
Unarmed.Blitz_3_6_6700A,
Unarmed.Truck_Opel_Blitz,
"Blitz#",
self.position.x - 35,
self.position.y - 20,

4
gen/sam/aaa_ww2_ally_flak.py
View File

@@ -50,7 +50,7 @@ class AllyWW2FlakGenerator(AirDefenseGroupGenerator):
# Add a commander truck
self.add_unit(
Unarmed.Willys_MB,
Unarmed.Car_Willys_Jeep,
"CMD#1",
self.position.x,
self.position.y - 20,
@@ -71,7 +71,7 @@ class AllyWW2FlakGenerator(AirDefenseGroupGenerator):
random.randint(0, 360),
)
self.add_unit(
Unarmed.Bedford_MWD,
Unarmed.Truck_Bedford,
"LOG#3",
self.position.x - 20,
self.position.y,

2
gen/sam/cold_war_flak.py
View File

@@ -55,7 +55,7 @@ class EarlyColdWarFlakGenerator(AirDefenseGroupGenerator):
# Add a truck
self.add_unit(
Unarmed.Transport_KAMAZ_43101,
Unarmed.Truck_KAMAZ_43101,
"Truck#",
self.position.x - 60,
self.position.y - 20,

6
gen/sam/freya_ewr.py
View File

@@ -47,21 +47,21 @@ class FreyaGenerator(AirDefenseGroupGenerator):
# Command/Logi
self.add_unit(
Unarmed.Kübelwagen_82,
Unarmed.LUV_Kubelwagen_82,
"Kubel#1",
self.position.x - 20,
self.position.y - 20,
self.heading,
)
self.add_unit(
Unarmed.Sd_Kfz_7,
Unarmed.Carrier_Sd_Kfz_7_Tractor,
"Sdkfz#1",
self.position.x + 20,
self.position.y + 22,
self.heading,
)
self.add_unit(
Unarmed.Sd_Kfz_2,
Unarmed.LUV_Kettenrad,
"Sdkfz#2",
self.position.x - 22,
self.position.y + 20,

6
gen/sam/sam_patriot.py
View File

@@ -76,7 +76,11 @@ class PatriotGenerator(AirDefenseGroupGenerator):
)
for i, (x, y, heading) in enumerate(positions):
self.add_unit_to_group(
aa_group, AirDefence.SPAAA_Vulcan_M163, f"SPAAA#{i}", Point(x, y), heading
aa_group,
AirDefence.SPAAA_Vulcan_M163,
f"SPAAA#{i}",
Point(x, y),
heading,
)
@classmethod

1
gen/sam/sam_sa10.py
View File

@@ -1,7 +1,6 @@
import random
from dcs.mapping import Point
from dcs.unittype import VehicleType
from dcs.vehicles import AirDefence
from game import Game

2
gen/sam/sam_sa13.py
View File

@@ -25,7 +25,7 @@ class SA13Generator(AirDefenseGroupGenerator):
self.heading,
)
self.add_unit(
Unarmed.Transport_KAMAZ_43101,
Unarmed.Truck_KAMAZ_43101,
"TRUCK",
self.position.x + 40,
self.position.y,

2
gen/sam/sam_sa15.py
View File

@@ -30,7 +30,7 @@ class SA15Generator(AirDefenseGroupGenerator):
self.heading,
)
self.add_unit(
Unarmed.Transport_KAMAZ_43101,
Unarmed.Truck_KAMAZ_43101,
"TRUCK",
self.position.x + 80,
self.position.y,

6
gen/sam/sam_sa2.py
View File

@@ -18,7 +18,11 @@ class SA2Generator(AirDefenseGroupGenerator):
def generate(self):
self.add_unit(
AirDefence.SAM_P19_Flat_Face_SR__SA_2_3, "SR", self.position.x, self.position.y, self.heading
AirDefence.SAM_P19_Flat_Face_SR__SA_2_3,
"SR",
self.position.x,
self.position.y,
self.heading,
)
self.add_unit(
AirDefence.SAM_SA_2_S_75_Fan_Song_TR,

6
gen/sam/sam_sa3.py
View File

@@ -18,7 +18,11 @@ class SA3Generator(AirDefenseGroupGenerator):
def generate(self):
self.add_unit(
AirDefence.SAM_P19_Flat_Face_SR__SA_2_3, "SR", self.position.x, self.position.y, self.heading
AirDefence.SAM_P19_Flat_Face_SR__SA_2_3,
"SR",
self.position.x,
self.position.y,
self.heading,
)
self.add_unit(
AirDefence.SAM_SA_3_S_125_Low_Blow_TR,

2
gen/sam/sam_sa9.py
View File

@@ -25,7 +25,7 @@ class SA9Generator(AirDefenseGroupGenerator):
self.heading,
)
self.add_unit(
Unarmed.Transport_KAMAZ_43101,
Unarmed.Truck_KAMAZ_43101,
"TRUCK",
self.position.x + 40,
self.position.y,