(station) Fix another demo layout; also, change the demo order

ahyangyi · Oct 4, 2024 · b8309bd · b8309bd
1 parent 1d280a7
commit b8309bd
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 8 deletions.
diff --git a/station/stations/dovemere_2018.py b/station/stations/dovemere_2018.py
@@ -57,10 +57,10 @@
         demos.big_demo,
         demos.big_half_demo,
         demos.real_yard_demo,
-        demos.full_auto_demo,
-        demos.full_np_auto_demo,
         demos.semi_auto_demo,
         demos.semi_np_auto_demo,
+        demos.full_auto_demo,
+        demos.full_np_auto_demo,
         demos.side_auto_demo,
         demos.side_np_auto_demo,
         demos.side_third_auto_demo,

diff --git a/station/stations/dovemere_2018_lib/demos/semi_np_auto.py b/station/stations/dovemere_2018_lib/demos/semi_np_auto.py
@@ -1,23 +1,26 @@
 from station.lib import Demo
-from station.stations.dovemere_2018_lib.layouts import globalize_all, concourse_tiles
+from station.stations.dovemere_2018_lib.layouts import globalize_all
 from station.lib.utils import get_1cc_remap
 from agrf.graphics.palette import CompanyColour
 from station.stations.dovemere_2018_lib.flexible_stations import semitraversable
 from .utils import h_merge
 
 globalize_all(platform_class="concrete", shelter_class="shelter_2")
 
-row_4 = h_merge([semitraversable.demo_2(i, 4) for i in range(1, 5)], [[concourse], [cns], [cns.T], [concourse]])
-v_sep = [[concourse_tiles.none] * len(row_4[0])] * 2
+row_4 = h_merge(
+    [semitraversable.demo_2(i, 4) for i in range(1, 5)], [[concourse_none], [cns], [cns.T], [concourse_none]]
+)
+v_sep = [[concourse_none] * len(row_4[0])] * 2
 row_5 = h_merge(
-    [semitraversable.demo_2(i, 5) for i in range(1, 5)], [[concourse], [cns], [cns_d], [cns.T], [concourse]]
+    [semitraversable.demo_2(i, 5) for i in range(1, 5)], [[concourse_none], [cns], [cns_d], [cns.T], [concourse_none]]
 )
 row_6 = h_merge(
-    [semitraversable.demo_2(i, 6) for i in range(1, 5)], [[concourse], [cns], [cns.T], [cns], [cns.T], [concourse]]
+    [semitraversable.demo_2(i, 6) for i in range(1, 5)],
+    [[concourse_none], [cns], [cns.T], [cns], [cns.T], [concourse_none]],
 )
 row_7 = h_merge(
     [semitraversable.demo_2(i, 7) for i in range(1, 5)],
-    [[concourse], [cns], [cns_d], [cns_d], [cns_d], [cns.T], [concourse]],
+    [[concourse_none], [cns], [cns_d], [cns_d], [cns_d], [cns.T], [concourse_none]],
 )
 
 semi_np_auto_demo = Demo(