Merge pull request #527 from Sea-of-Lost-Souls/Centcom-Shuttle-Fixxes

Centcom Shuttle Auto Mapper Fix
Sea-of-Lost-Souls · Feb 19, 2024 · 212e66e · 212e66e
2 parents 849192c + 72b33eb
commit 212e66e
Show file tree

Hide file tree

Showing 13 changed files with 6,565 additions and 5,077 deletions.
diff --git a/_maps/map_files/Birdshot/birdshot.dmm b/_maps/map_files/Birdshot/birdshot.dmm
diff --git a/_maps/map_files/NorthStar/north_star.dmm b/_maps/map_files/NorthStar/north_star.dmm
diff --git a/_maps/skyrat/automapper/automapper_config.toml b/_maps/skyrat/automapper/automapper_config.toml
@@ -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]
@@ -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]
@@ -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]
@@ -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]
@@ -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
@@ -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
@@ -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"
diff --git a/_maps/tannhauser/automapper/automapper_config.toml.bak b/_maps/tannhauser/automapper/automapper_config.toml.bak
@@ -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"]
@@ -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"