Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Centcom Shuttle Auto Mapper Fix #527

Merged
merged 2 commits into from
Feb 19, 2024
Merged

Centcom Shuttle Auto Mapper Fix #527

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
891336a
Centcom Shuttle Auto Mapper Fix
Mortisduem Feb 18, 2024
72b33eb
normalized file format
ORCACommander Feb 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
223 changes: 56 additions & 167 deletions _maps/map_files/Birdshot/birdshot.dmm
View file
Open in desktop

Large diffs are not rendered by default.

142 changes: 36 additions & 106 deletions _maps/map_files/NorthStar/north_star.dmm
View file
Open in desktop

Large diffs are not rendered by default.

148 changes: 94 additions & 54 deletions _maps/skyrat/automapper/automapper_config.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,12 +200,12 @@ trait_name = "Station"

# TRAMSTATION MAP EDITS
# Tramstation Arrivals
[templates.tramstation_arrivals]
map_files = ["tramstation_arrivals.dmm"]
directory = "_maps/skyrat/automapper/templates/tramstation/"
required_map = "tramstation.dmm"
coordinates = [8, 96, 2]
trait_name = "Station"
#[templates.tramstation_arrivals]
#map_files = ["tramstation_arrivals.dmm"]
#directory = "_maps/skyrat/automapper/templates/tramstation/"
#required_map = "tramstation.dmm"
#coordinates = [8, 96, 2]
#trait_name = "Station"

# Tramstation Armory
[templates.tramstation_armory]
Expand Down Expand Up @@ -249,12 +249,12 @@ trait_name = "Station"

# BIRDSHOT MAP EDITS
# Birdshot Arrivals
[templates.birdshot_arrivals]
map_files = ["birdshot_arrivals.dmm"]
directory = "_maps/skyrat/automapper/templates/birdshot/"
required_map = "birdshot.dmm"
coordinates = [136, 61, 1]
trait_name = "Station"
#[templates.birdshot_arrivals]
#map_files = ["birdshot_arrivals.dmm"]
#directory = "_maps/skyrat/automapper/templates/birdshot/"
#required_map = "birdshot.dmm"
#coordinates = [136, 61, 1]
#trait_name = "Station"

# Birdshot Armory
[templates.birdshot_armory]
Expand Down Expand Up @@ -322,12 +322,12 @@ coordinates = [137, 132, 3]
trait_name = "Station"

# Northstar Arrivals
[templates.northstar_arrivals]
map_files = ["northstar_arrivals.dmm"]
directory = "_maps/skyrat/automapper/templates/northstar/"
required_map = "north_star.dmm"
coordinates = [90, 100, 1]
trait_name = "Station"
#[templates.northstar_arrivals]
#map_files = ["northstar_arrivals.dmm"]
#directory = "_maps/skyrat/automapper/templates/northstar/"
#required_map = "north_star.dmm"
#coordinates = [90, 100, 1]
#trait_name = "Station"

# Northstar ERT Bay
[templates.northstar_ert_bay]
Expand Down Expand Up @@ -386,12 +386,12 @@ coordinates = [81, 78, 1]
trait_name = "Station"

# Kilostation Arrivals
[templates.kilostation_arrivals]
map_files = ["kilostation_arrivals.dmm"]
directory = "_maps/skyrat/automapper/templates/kilostation/"
required_map = "KiloStation.dmm"
coordinates = [151, 80, 1]
trait_name = "Station"
#[templates.kilostation_arrivals]
#map_files = ["kilostation_arrivals.dmm"]
#directory = "_maps/skyrat/automapper/templates/kilostation/"
#required_map = "KiloStation.dmm"
#coordinates = [151, 80, 1]
#trait_name = "Station"

# Kilostation ERT Bay and Barber
[templates.kilostation_ert_bay]
Expand All @@ -417,6 +417,8 @@ required_map = "KiloStation.dmm"
coordinates = [140, 72, 1]
trait_name = "Station"


#------------- Tannhauser Gate Edits -------------
# Tannhauser Gate Overrides go below this line

# ICEBOX MAP EDITS
Expand Down Expand Up @@ -453,21 +455,6 @@ required_map = "IceBoxStation.dmm"
coordinates = [134, 69, 2]
trait_name = "Station"

# CC Shuttle Dock - This is so we can fit the larger Cargo shuttle added by mortisdeum
#[templates.centcom_cargo_dock]
#map_files = ["centcom_cargo_dock.dmm"]
#directory = "_maps/tannhauser/automapper/templates/centcom/"
#required_map = "builtin"
#coordinates = [152, 101, 1]
#trait_name = "CentCom"

# CC Arrivals Dock - This is so we can fit the larger arrivals shuttle added by mortisdeum
#[templates.centcom_arrivals_dock]
#map_files = ["centcom_arrivals_dock.dmm"]
#directory = "_maps/tannhauser/automapper/templates/centcom/"
#required_map = "builtin"
#coordinates = [43, 225, 2]
#trait_name = "CentCom"

# METASTATION MAP TEMPLATES
# Metastation Arrivals
Expand All @@ -478,29 +465,82 @@ required_map = "MetaStation.dmm"
coordinates = [20, 107, 1]
trait_name = "Station"


# VOIDRAPTOR MAP EDITS
# VoidRaptor Arrivals
[templates.voidraptor_arrivals]
map_files = ["voidraptor_arrivals.dmm"]
directory = "_maps/tannhauser/automapper/templates/voidraptor/"
required_map = "VoidRaptor.dmm"
coordinates = [75, 140, 1]
trait_name = "Station"


# CC Cargo Shuttle Dock - This is so we can fit the larger Cargo shuttle added by mortisdeum
[templates.centcom_cargo_dock]
map_files = ["centcom_cargo_dock.dmm"]
directory = "_maps/tannhauser/automapper/templates/centcom/"
required_map = "CentCom.dmm"
coordinates = [152, 101, 1]
trait_name = "CentCom"

# CC Arrivals Dock - This is so we can fit the larger arrivals shuttle added by mortisdeum
[templates.centcom_arrivals_dock]
map_files = ["centcom_arrivals_dock.dmm"]
directory = "_maps/tannhauser/automapper/templates/centcom/"
required_map = "CentCom_skyrat_z2.dmm"
coordinates = [43, 225, 2]
trait_name = "CentCom"

# BIRDSHOT MAP EDITS
# Birdshot Arrivals - This is so we can fit the larger arrivals shuttle added by mortisdeum
[templates.birdshot_arrivals]
map_files = ["birdshot_arrivals.dmm"]
directory = "_maps/tannhauser/automapper/templates/birdshot/"
required_map = "birdshot.dmm"
coordinates = [136, 61, 1]
trait_name = "Station"


# BLUESHIFT MAP EDITS
# BlueShift Arrivals - This is so we can fit the larger arrivals shuttle added by mortisdeum
[templates.blueshift_arrivals]
map_files = ["blueshift_arrivals.dmm"]
directory = "_maps/tannhauser/automapper/templates/blueshift/"
required_map = "Blueshift.dmm"
coordinates = [176, 79, 1]
trait_name = "Station"

# DELTASTATION MAP EDITS
# Deltastation Arrivals
# Deltastation Arrivals - This is so we can fit the larger arrivals shuttle added by mortisdeum
[templates.deltastation_arrivals]
map_files = ["deltastation_arrivals.dmm"]
directory = "_maps/tannhauser/automapper/templates/deltastation/"
required_map = "DeltaStation2.dmm"
coordinates = [126, 195, 1]
trait_name = "Station"

# Kilostation Arrivals
[templates.kilostation_arrivals]
map_files = ["kilostation_arrivals.dmm"]
directory = "_maps/tannhauser/automapper/templates/kilostation/"
required_map = "KiloStation.dmm"
coordinates = [151, 80, 1]
trait_name = "Station"

# Northstar Arrivals
[templates.northstar_arrivals]
map_files = ["northstar_arrivals.dmm"]
directory = "_maps/tannhauser/automapper/templates/northstar/"
required_map = "north_star.dmm"
coordinates = [90, 100, 1]
trait_name = "Station"

# TRAMSTATION MAP EDITS
# Tramstation Arrivals
#[templates.tramstation_arrivals]
#map_files = ["tramstation_arrivals.dmm"]
#directory = "_maps/tannhauser/automapper/templates/tramstation/"
#required_map = "tramstation.dmm"
#coordinates = [8, 97, 2]
#trait_name = "Station"

# VOIDRAPTOR MAP EDITS
# VoidRaptor Arrivals
[templates.voidraptor_arrivals]
map_files = ["voidraptor_arrivals.dmm"]
directory = "_maps/tannhauser/automapper/templates/voidraptor/"
required_map = "VoidRaptor.dmm"
coordinates = [75, 140, 1]
[templates.tramstation_arrivals]
map_files = ["tramstation_arrivals.dmm"]
directory = "_maps/tannhauser/automapper/templates/tramstation/"
required_map = "tramstation.dmm"
coordinates = [8, 96, 2]
trait_name = "Station"
120 changes: 87 additions & 33 deletions _maps/tannhauser/automapper/automapper_config.toml.bak
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,51 +9,108 @@
# Traits - Station (for station relatied edits), CentCom (for edits on the CC map), Mining (for edits on Lavaland)
# More can be found in code\__DEFINES\maps.dm

# CC Shuttle Dock - This is so we can fit the larger Cargo shuttle added by mortisdeum
#------------- Tannhauser Gate Edits -------------
# Tannhauser Gate Overrides go below this line

# ICEBOX MAP EDITS

# Icebox Arrivals
#[templates.icebox_arrivals]
#map_files = ["icebox_arrivals.dmm"]
#directory = "_maps/tannhauser/automapper/templates/icebox/"
#required_map = "IceBoxStation.dmm"
#coordinates = [10, 116, 3]
#trait_name = "Station"

# Manaforge Jade Dragon
[templates.manaforge_jade]
map_files = ["jade_dragon.dmm"]
directory = "_maps/tannhauser/automapper/manaforge/"
required_map = "IceBoxStation.dmm"
coordinates = [156, 62, 3]
trait_name = "Station"

# Manaforge Warpstone Laboratry
[templates.warpstone_lab]
map_files = ["warpstone_lab.dmm"]
directory = "_maps/tannhauser/automapper/manaforge/"
required_map = "IceBoxStation.dmm"
coordinates = [184, 99, 2]
trait_name = "Station"

# Manaforge Warpstone Laboratry
[templates.mana_arcade]
map_files = ["arcade.dmm"]
directory = "_maps/tannhauser/automapper/manaforge/"
required_map = "IceBoxStation.dmm"
coordinates = [134, 69, 2]
trait_name = "Station"


# METASTATION MAP TEMPLATES
# Metastation Arrivals
[templates.metastaton_arrivals]
map_files = ["metastation_arrivals.dmm"]
directory = "_maps/tannhauser/automapper/templates/metastation/"
required_map = "MetaStation.dmm"
coordinates = [20, 107, 1]
trait_name = "Station"


# VOIDRAPTOR MAP EDITS
# VoidRaptor Arrivals
[templates.voidraptor_arrivals]
map_files = ["voidraptor_arrivals.dmm"]
directory = "_maps/tannhauser/automapper/templates/voidraptor/"
required_map = "VoidRaptor.dmm"
coordinates = [75, 140, 1]
trait_name = "Station"


# CC Cargo Shuttle Dock - This is so we can fit the larger Cargo shuttle added by mortisdeum
[templates.centcom_cargo_dock]
map_files = ["centcom_cargo_dock.dmm"]
directory = "_maps/tannhauser/automapper/templates/centcom/"
required_map = "builtin"
required_map = "CentCom.dmm"
coordinates = [152, 101, 1]
trait_name = "CentCom"

# CC Arrivals Dock - This is so we can fit the larger arrivals shuttle added by mortisdeum
[templates.centcom_arrivals_dock]
map_files = ["centcom_arrivals_dock.dmm"]
directory = "_maps/tannhauser/automapper/templates/centcom/"
required_map = "builtin"
required_map = "CentCom_skyrat_z2.dmm"
coordinates = [43, 225, 2]
trait_name = "CentCom"

# METASTATION MAP TEMPLATES
# Metastation Arrivals
[templates.metastaton_arrivals]
map_files = ["metastation_arrivals.dmm"]
directory = "_maps/tannhauser/automapper/templates/metastation/"
required_map = "MetaStation.dmm"
coordinates = [20, 107, 1]
# BIRDSHOT MAP EDITS
# Birdshot Arrivals - This is so we can fit the larger arrivals shuttle added by mortisdeum
[templates.birdshot_arrivals]
map_files = ["birdshot_arrivals.dmm"]
directory = "_maps/tannhauser/automapper/templates/birdshot/"
required_map = "birdshot.dmm"
coordinates = [136, 61, 1]
trait_name = "Station"


# BLUESHIFT MAP EDITS
# BlueShift Arrivals - This is so we can fit the larger arrivals shuttle added by mortisdeum
[templates.blueshift_arrivals]
map_files = ["blueshift_arrivals.dmm"]
directory = "_maps/tannhauser/automapper/templates/blueshift/"
required_map = "Blueshift.dmm"
coordinates = [176, 79, 1]
trait_name = "Station"

# DELTASTATION MAP EDITS
# Deltastation Arrivals
# Deltastation Arrivals - This is so we can fit the larger arrivals shuttle added by mortisdeum
[templates.deltastation_arrivals]
map_files = ["deltastation_arrivals.dmm"]
directory = "_maps/tannhauser/automapper/templates/deltastation/"
required_map = "DeltaStation2.dmm"
coordinates = [126, 195, 1]
trait_name = "Station"


# ICEBOX MAP EDITS
# Icebox Arrivals
[templates.icebox_arrivals]
map_files = ["icebox_arrivals.dmm"]
directory = "_maps/tannhauser/automapper/templates/icebox/"
required_map = "IceBoxStation.dmm"
coordinates = [10, 116, 3]
trait_name = "Station"

# KILOSTATION MAP EDITS
# Kilostation Arrivals
[templates.kilostation_arrivals]
map_files = ["kilostation_arrivals.dmm"]
Expand All @@ -62,22 +119,19 @@ required_map = "KiloStation.dmm"
coordinates = [151, 80, 1]
trait_name = "Station"

# Northstar Arrivals
[templates.northstar_arrivals]
map_files = ["northstar_arrivals.dmm"]
directory = "_maps/tannhauser/automapper/templates/northstar/"
required_map = "north_star.dmm"
coordinates = [90, 100, 1]
trait_name = "Station"

# TRAMSTATION MAP EDITS
# Tramstation Arrivals
[templates.tramstation_arrivals]
map_files = ["tramstation_arrivals.dmm"]
directory = "_maps/tannhauser/automapper/templates/tramstation/"
required_map = "tramstation.dmm"
coordinates = [14, 96, 2]
trait_name = "Station"


# BLUESHIFT MAP EDITS
# BlueShift Arrivals
[templates.blueshift_arrivals]
map_files = ["blueshift_arrivals.dmm"]
directory = "_maps/tannhauser/automapper/templates/blueshift/"
required_map = "BlueShift_lower.dmm"
coordinates = [154, 87, 1]
coordinates = [8, 96, 2]
trait_name = "Station"
Loading
Loading