mirror of
https://github.com/dcs-retribution/dcs-retribution.git
synced 2025-11-10 15:41:24 +00:00
Adds Marianas Islands support (#1406)
* Implements #1399 * Reverting accidental change in generate_landmap.py * Changelog update * Import beacon data for Marianas. Co-authored-by: Dan Albert <dan@gingerhq.net>
This commit is contained in:
135
resources/dcs/beacons/marianaislands.json
Normal file
135
resources/dcs/beacons/marianaislands.json
Normal file
@@ -0,0 +1,135 @@
|
||||
[
|
||||
{
|
||||
"name": "MTMACAJNA",
|
||||
"callsign": "AJA",
|
||||
"beacon_type": 9,
|
||||
"hertz": 385000,
|
||||
"channel": null
|
||||
},
|
||||
{
|
||||
"name": "Nimitz",
|
||||
"callsign": "UNZ",
|
||||
"beacon_type": 6,
|
||||
"hertz": 115800000,
|
||||
"channel": 105
|
||||
},
|
||||
{
|
||||
"name": "SAIPAN",
|
||||
"callsign": "SN",
|
||||
"beacon_type": 9,
|
||||
"hertz": 312000,
|
||||
"channel": null
|
||||
},
|
||||
{
|
||||
"name": "ANDERSEN",
|
||||
"callsign": "UAM",
|
||||
"beacon_type": 5,
|
||||
"hertz": null,
|
||||
"channel": 54
|
||||
},
|
||||
{
|
||||
"name": "",
|
||||
"callsign": "IPMY",
|
||||
"beacon_type": 15,
|
||||
"hertz": 110150000,
|
||||
"channel": null
|
||||
},
|
||||
{
|
||||
"name": "",
|
||||
"callsign": "IUAM",
|
||||
"beacon_type": 15,
|
||||
"hertz": 110100000,
|
||||
"channel": null
|
||||
},
|
||||
{
|
||||
"name": "",
|
||||
"callsign": "IYIG",
|
||||
"beacon_type": 15,
|
||||
"hertz": 109350000,
|
||||
"channel": null
|
||||
},
|
||||
{
|
||||
"name": "",
|
||||
"callsign": "IAND",
|
||||
"beacon_type": 15,
|
||||
"hertz": 109300000,
|
||||
"channel": null
|
||||
},
|
||||
{
|
||||
"name": "",
|
||||
"callsign": "IUAM",
|
||||
"beacon_type": 14,
|
||||
"hertz": 110100000,
|
||||
"channel": null
|
||||
},
|
||||
{
|
||||
"name": "",
|
||||
"callsign": "IAND",
|
||||
"beacon_type": 14,
|
||||
"hertz": 109300000,
|
||||
"channel": null
|
||||
},
|
||||
{
|
||||
"name": "",
|
||||
"callsign": "IYIG",
|
||||
"beacon_type": 14,
|
||||
"hertz": 109350000,
|
||||
"channel": null
|
||||
},
|
||||
{
|
||||
"name": "",
|
||||
"callsign": "IPMY",
|
||||
"beacon_type": 14,
|
||||
"hertz": 110150000,
|
||||
"channel": null
|
||||
},
|
||||
{
|
||||
"name": "",
|
||||
"callsign": "IGUM",
|
||||
"beacon_type": 14,
|
||||
"hertz": 110300000,
|
||||
"channel": null
|
||||
},
|
||||
{
|
||||
"name": "",
|
||||
"callsign": "PGUM",
|
||||
"beacon_type": 15,
|
||||
"hertz": 110300000,
|
||||
"channel": null
|
||||
},
|
||||
{
|
||||
"name": "",
|
||||
"callsign": "IAWD",
|
||||
"beacon_type": 14,
|
||||
"hertz": 110900000,
|
||||
"channel": null
|
||||
},
|
||||
{
|
||||
"name": "",
|
||||
"callsign": "PGUM",
|
||||
"beacon_type": 15,
|
||||
"hertz": 110900000,
|
||||
"channel": null
|
||||
},
|
||||
{
|
||||
"name": "ROTA",
|
||||
"callsign": "GRO",
|
||||
"beacon_type": 9,
|
||||
"hertz": 332000,
|
||||
"channel": null
|
||||
},
|
||||
{
|
||||
"name": "",
|
||||
"callsign": "IGSN",
|
||||
"beacon_type": 14,
|
||||
"hertz": 109900000,
|
||||
"channel": null
|
||||
},
|
||||
{
|
||||
"name": "",
|
||||
"callsign": "PGSN",
|
||||
"beacon_type": 15,
|
||||
"hertz": 109900000,
|
||||
"channel": null
|
||||
}
|
||||
]
|
||||
BIN
resources/marianaislandslandmap.p
Normal file
BIN
resources/marianaislandslandmap.p
Normal file
Binary file not shown.
BIN
resources/marianasislands.gif
Normal file
BIN
resources/marianasislands.gif
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 13 KiB |
@@ -39,6 +39,7 @@ from dcs.terrain.persiangulf import PersianGulf
|
||||
from dcs.terrain.syria import Syria
|
||||
from dcs.terrain.terrain import Terrain
|
||||
from dcs.terrain.thechannel import TheChannel
|
||||
from dcs.terrain.marianaislands import MarianaIslands
|
||||
from dcs.triggers import TriggerStart
|
||||
from pyproj import CRS, Transformer
|
||||
|
||||
@@ -59,6 +60,7 @@ ARG_TO_TERRAIN_MAP = {
|
||||
"persiangulf": PersianGulf(),
|
||||
"thechannel": TheChannel(),
|
||||
"syria": Syria(),
|
||||
"marianaislands": MarianaIslands(),
|
||||
}
|
||||
|
||||
# https://gisgeography.com/central-meridian/
|
||||
@@ -71,6 +73,7 @@ CENTRAL_MERIDIANS = {
|
||||
"persiangulf": 57,
|
||||
"thechannel": 3,
|
||||
"syria": 39,
|
||||
"marianaislands": 147,
|
||||
}
|
||||
|
||||
|
||||
|
||||
@@ -5,10 +5,20 @@ import argparse
|
||||
from pathlib import Path
|
||||
from typing import List, Tuple, Union, Dict
|
||||
|
||||
from dcs.terrain import Caucasus, PersianGulf, Syria, Nevada, Normandy, TheChannel
|
||||
from dcs.terrain import (
|
||||
Caucasus,
|
||||
PersianGulf,
|
||||
Syria,
|
||||
Nevada,
|
||||
Normandy,
|
||||
TheChannel,
|
||||
MarianaIslands,
|
||||
)
|
||||
from dcs import Mission
|
||||
|
||||
Terrain = Union[Caucasus, PersianGulf, Syria, Nevada, Normandy, TheChannel]
|
||||
Terrain = Union[
|
||||
Caucasus, PersianGulf, Syria, Nevada, Normandy, TheChannel, MarianaIslands
|
||||
]
|
||||
|
||||
SAVE_PATH = Path("resources/frontlines")
|
||||
|
||||
|
||||
@@ -32,7 +32,7 @@ def _geometry_collection_to_multipoly(obj: GeometryCollection) -> MultiPolygon:
|
||||
raise RuntimeError(f"Not sure how to convert collection to multipoly: {obj.wkt}")
|
||||
|
||||
|
||||
for terrain in ["cau", "nev", "syria", "channel", "normandy", "gulf"]:
|
||||
for terrain in ["cau", "nev", "syria", "channel", "normandy", "gulf", "marianaislands"]:
|
||||
print("Terrain " + terrain)
|
||||
m = Mission()
|
||||
m.load_file("./{}_terrain.miz".format(terrain))
|
||||
|
||||
BIN
resources/tools/marianaislands_terrain.miz
Normal file
BIN
resources/tools/marianaislands_terrain.miz
Normal file
Binary file not shown.
BIN
resources/ui/terrain_marianas.gif
Normal file
BIN
resources/ui/terrain_marianas.gif
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 1.1 KiB |
Reference in New Issue
Block a user