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

Add Spanish Naval Assets pack v3.2.0 by desdemicabina

Browse Source 
Resolves #119
This commit is contained in:
Raffson 2023-05-20 20:17:54 +02:00
parent 2b89307897
commit a46e32cdf1
No known key found for this signature in database
GPG Key ID: B0402B2C9B764D99
21 changed files with 224 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
changelog.md
View File

@ -12,6 +12,7 @@
* **[Plugins]** Updated 'expl_table' in Splash Damage script.
* **[Mission Generation]** Also save kneeboards in txt-format, found under "kneeboards" within Retribution's installation folder after pressing take-off.
* **[Modding]** Support for SW mod v2.55
* **[Modding]** Support for Spanish & Australian Naval Assets v3.2.0 by desdemicabina
## Fixes
* **[New Game Wizard]** Settings would not persist when going back to a previous page.

8
game/factions/faction.py
View File

@ -431,6 +431,14 @@ class Faction:
self.remove_aircraft("FA-18E")
self.remove_aircraft("FA-18F")
self.remove_aircraft("EA-18G")
# spanish naval assets pack
if not mod_settings.spanishnavypack:
self.remove_ship("L61")
self.remove_ship("F100")
self.remove_ship("F105")
self.remove_ship("L52")
self.remove_ship("L02")
self.remove_ship("DDG39")
# swedish military assets pack
if not mod_settings.swedishmilitaryassetspack:
self.remove_vehicle("BV410_RBS70")

5
game/theater/controlpoint.py
View File

@ -41,7 +41,6 @@ from dcs.ships import (
Hms_invincible,
)
from dcs.terrain.terrain import Airport, ParkingSlot
from dcs.triggers import TriggerZone
from dcs.unitgroup import ShipGroup, StaticGroup
from dcs.unittype import ShipType
@ -61,6 +60,7 @@ from game.sidc import (
)
from game.theater.presetlocation import PresetLocation
from game.utils import Distance, Heading, meters
from pydcs_extensions import L02, L52, L61
from .base import Base
from .frontline import FrontLine
from .interfaces.CTLD import CTLD
@ -1232,6 +1232,9 @@ class NavalControlPoint(
KUZNECOW,
Type_071,
Hms_invincible,
L02,
L52,
L61,
]:
return True
return False

1
game/theater/start_generator.py
View File

@ -73,6 +73,7 @@ class ModSettings:
frenchpack: bool = False
high_digit_sams: bool = False
ov10a_bronco: bool = False
spanishnavypack: bool = False
swedishmilitaryassetspack: bool = False
SWPack: bool = False

17
pydcs_extensions/__init__.py
View File

@ -1,25 +1,26 @@
from .SWPack import *
from .a4ec import *
from .a6a import *
from .a7e import *
from .f4b import *
from .f15d import *
from .f16i_idf import *
from .fa18efg import *
from .f84g import *
from .f100 import *
from .f104 import *
from .f105 import *
from .f15d import *
from .f16i_idf import *
from .f22a import *
from .f4b import *
from .f84g import *
from .fa18efg import *
from .frenchpack import *
from .hercules import *
from .highdigitsams import *
from .jas39 import *
from .ov10a import *
from .spanishnavypack import *
from .su30 import *
from .su57 import *
from .uh60l import *
from .ov10a import *
from .swedishmilitaryassetspack import *
from .SWPack import *
from .uh60l import *
def load_mods() -> None:

1
pydcs_extensions/spanishnavypack/__init__.py Normal file
View File

@ -0,0 +1 @@
from .spanishnavypack import *

71
pydcs_extensions/spanishnavypack/spanishnavypack.py Normal file
View File

@ -0,0 +1,71 @@
from dcs.unittype import ShipType
from game.modsupport import shipmod
@shipmod
class L61(ShipType):
id = "L61"
name = "L61 Juan Carlos I"
plane_num = 40
helicopter_num = 36
parking = 4
detection_range = 300000
threat_range = 150000
air_weapon_dist = 150000
@shipmod
class F100(ShipType):
id = "F100"
name = "F100 Álvaro de Bazán"
helicopter_num = 1
parking = 1
detection_range = 160000
threat_range = 45000
air_weapon_dist = 45000
@shipmod
class F105(ShipType):
id = "F105"
name = "F105 Cristobal Colon"
helicopter_num = 1
parking = 1
detection_range = 160000
threat_range = 45000
air_weapon_dist = 45000
@shipmod
class L52(ShipType):
id = "L52"
name = "L52 Castilla"
helicopter_num = 2
parking = 2
detection_range = 300000
threat_range = 150000
air_weapon_dist = 150000
@shipmod
class L02(ShipType):
id = "L02"
name = "L02 Canberra"
plane_num = 40
helicopter_num = 36
parking = 4
detection_range = 300000
threat_range = 150000
air_weapon_dist = 150000
@shipmod
class DDG39(ShipType):
id = "DDG39"
name = "HMAS HOBART DDG39"
helicopter_num = 1
parking = 1
detection_range = 160000
threat_range = 45000
air_weapon_dist = 45000

5
qt_ui/windows/newgame/QNewGameWizard.py
View File

@ -203,6 +203,7 @@ class NewGameWizard(QtWidgets.QWizard):
ov10a_bronco=self.field("ov10a_bronco"),
frenchpack=self.field("frenchpack"),
high_digit_sams=self.field("high_digit_sams"),
spanishnavypack=self.field("spanishnavypack"),
swedishmilitaryassetspack=self.field("swedishmilitaryassetspack"),
SWPack=self.field("SWPack"),
)
@ -874,6 +875,8 @@ class GeneratorOptions(QtWidgets.QWizardPage):
self.registerField("swedishmilitaryassetspack", self.swedishmilitaryassetspack)
self.SWPack = QtWidgets.QCheckBox()
self.registerField("SWPack", self.SWPack)
self.spanishnavypack = QtWidgets.QCheckBox()
self.registerField("spanishnavypack", self.spanishnavypack)
modHelpText = QtWidgets.QLabel(
"<p>Select the mods you have installed. If your chosen factions support them, you'll be able to use these mods in your campaign.</p>"
@ -909,6 +912,7 @@ class GeneratorOptions(QtWidgets.QWizardPage):
("Su-57 Felon", self.su57_felon),
("UH-60L Black Hawk (v1.3.1)", self.uh_60l),
("Star Wars Modpack 2.54+", self.SWPack),
("Spanish Naval Assets pack (desdemicabina 3.2.0)", self.spanishnavypack),
]
for i in range(len(mod_pairs)):
@ -963,6 +967,7 @@ class GeneratorOptions(QtWidgets.QWizardPage):
self.ov10a_bronco.setChecked(s.get("ov10a_bronco", False))
self.frenchpack.setChecked(s.get("frenchpack", False))
self.high_digit_sams.setChecked(s.get("high_digit_sams", False))
self.spanishnavypack.setChecked(s.get("spanishnavypack", False))
self.swedishmilitaryassetspack.setChecked(
s.get("swedishmilitaryassetspack", False)
)

4
resources/factions/australia_2005.json
View File

@ -39,7 +39,9 @@
],
"naval_units": [
"DDG Arleigh Burke IIa",
"LHA-1 Tarawa"
"LHA-1 Tarawa",
"L02 Canberra",
"HMAS HOBART DDG39"
],
"missiles": [],
"air_defense_units": [

8
resources/factions/bluefor_modern.json
View File

@ -101,7 +101,13 @@
"DDG Arleigh Burke IIa",
"CG Ticonderoga",
"LHA-1 Tarawa",
"CVN-74 John C. Stennis"
"CVN-74 John C. Stennis",
"L02 Canberra",
"HMAS HOBART DDG39",
"L52 Castilla",
"L61 Juan Carlos I",
"F100 Álvaro de Bazán",
"F105 Cristobal Colon"
],
"missiles": [],
"air_defense_units": [

26
resources/factions/spain_1990.json
View File

@ -10,7 +10,6 @@
"AV-8B Harrier II Night Attack",
"C-130",
"C-101CC Aviojet",
"EF-18A+ Hornet",
"F-5E Tiger II",
"Mirage-F1BE",
"Mirage-F1CE",
@ -27,7 +26,7 @@
"KC-135 Stratotanker"
],
"frontline_units": [
"Leopard 2A4",
"AMX.30B2",
"M1097 Heavy HMMWV Avenger",
"M113",
"M60A3 \"Patton\""
@ -47,9 +46,7 @@
],
"naval_units": [
"FFG Oliver Hazard Perry",
"CG Ticonderoga",
"LHA-1 Tarawa",
"CVN-74 John C. Stennis"
"CG Ticonderoga"
],
"missiles": [],
"air_defense_units": [
@ -64,22 +61,5 @@
"Juan Carlos I"
],
"has_jtac": true,
"jtac_unit": "MQ-9 Reaper",
"liveries_overrides": {
"EF-18A+ Hornet": [
"Spain 111th Escuadron C.15-73",
"Spain 111th Escuadron C.15-88",
"Spain 121th Escuadron C.15-45",
"Spain 121th Escuadron C.15-50",
"Spain 121th Escuadron C.15-60",
"Spain 151th Escuadron C.15-14",
"Spain 151th Escuadron C.15-18",
"Spain 151th Escuadron C.15-23",
"Spain 151th Escuadron C.15-24",
"Spain 211th Escuadron C.15-76",
"Spain 211th Escuadron C.15-77",
"Spain 462th Escuadron C.15-79",
"Spain 462th Escuadron C.15-90"
]
}
"jtac_unit": "MQ-9 Reaper"
}

87
resources/factions/spain_2010.json Normal file
View File

@ -0,0 +1,87 @@
{
"country": "Spain",
"name": "Spain 2010",
"authors": "Raffson",
"description": "<p>Spain +/- 2010</p>",
"locales": [
"es_ES"
],
"aircrafts": [
"AV-8B Harrier II Night Attack",
"C-130",
"C-101CC Aviojet",
"F/A-18C Hornet (Lot 20)",
"EF-18A+ Hornet",
"F-5E Tiger II",
"Mirage-F1EE",
"Mirage-F1M-CE",
"Mirage-F1M-EE",
"UH-1H Iroquois"
],
"awacs": [
"E-3A"
],
"tankers": [
"KC-130",
"KC-135 Stratotanker"
],
"frontline_units": [
"Leopard 2A4",
"M1097 Heavy HMMWV Avenger",
"M1126 Stryker ICV (M2 HMG)",
"Leopard 2"
],
"artillery_units": [],
"logistics_units": [
"Truck M818 6x6"
],
"infantry_units": [
"Infantry M249",
"Infantry M4"
],
"preset_groups": [
"Hawk",
"Roland",
"Patriot"
],
"naval_units": [
"FFG Oliver Hazard Perry",
"CG Ticonderoga",
"LHA-1 Tarawa",
"L52 Castilla",
"L61 Juan Carlos I",
"F100 Álvaro de Bazán",
"F105 Cristobal Colon"
],
"missiles": [],
"air_defense_units": [
"SAM Patriot STR",
"M1097 Heavy HMMWV Avenger"
],
"requirements": {},
"carrier_names": [
"Principe de Asturias"
],
"helicopter_carrier_names": [
"Juan Carlos I"
],
"has_jtac": true,
"jtac_unit": "MQ-9 Reaper",
"liveries_overrides": {
"EF-18A+ Hornet": [
"Spain 111th Escuadron C.15-73",
"Spain 111th Escuadron C.15-88",
"Spain 121th Escuadron C.15-45",
"Spain 121th Escuadron C.15-50",
"Spain 121th Escuadron C.15-60",
"Spain 151th Escuadron C.15-14",
"Spain 151th Escuadron C.15-18",
"Spain 151th Escuadron C.15-23",
"Spain 151th Escuadron C.15-24",
"Spain 211th Escuadron C.15-76",
"Spain 211th Escuadron C.15-77",
"Spain 462th Escuadron C.15-79",
"Spain 462th Escuadron C.15-90"
]
}
}

BIN
resources/ui/units/ships/L02.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 164 KiB

BIN
resources/ui/units/ships/L52.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 164 KiB

BIN
resources/ui/units/ships/L61.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 171 KiB

4
resources/units/ships/DDG39.yaml Normal file
View File

@ -0,0 +1,4 @@
class: Destroyer
price: 0
variants:
HMAS HOBART DDG39: null

4
resources/units/ships/F100.yaml Normal file
View File

@ -0,0 +1,4 @@
class: Frigate
price: 0
variants:
F100 Álvaro de Bazán: null

4
resources/units/ships/F105.yaml Normal file
View File

@ -0,0 +1,4 @@
class: Frigate
price: 0
variants:
F105 Cristobal Colon: null

4
resources/units/ships/L02.yaml Normal file
View File

@ -0,0 +1,4 @@
class: HelicopterCarrier
price: 0
variants:
L02 Canberra: null

4
resources/units/ships/L52.yaml Normal file
View File

@ -0,0 +1,4 @@
class: LandingShip
price: 0
variants:
L52 Castilla: null

4
resources/units/ships/L61.yaml Normal file
View File

@ -0,0 +1,4 @@
class: HelicopterCarrier
price: 0
variants:
L61 Juan Carlos I: null