Merge branch 'main' of https://git.pvv.ntnu.no/Projects/minecraft-kartverket
All checks were successful
Build maps / build-mapcrafter (push) Successful in 31s
Build maps / build-bluemap (push) Successful in 34s

Flettet inn endringer.
This commit is contained in:
David Kaasen
2026-01-16 18:54:28 +01:00
3 changed files with 247 additions and 4 deletions

View File

@@ -1,7 +1,24 @@
from lib_marker import MarkerSet
from lib_marker import MarkerSet, Track
MARKER_SET = MarkerSet(
name="Ice tracks",
markers=[],
markers=[
Track(
name="Sentralskøytebane Sør",
points=[
(0, 65, 42),
(0, 65, 821),
(206, 65, 821),
],
),
Track(
name="Sentralskøytebane Mer Sør",
points=[
(232, 46, 814),
(232, 46, 1025),
(397, 46, 1025),
],
),
],
)

View File

@@ -1,7 +1,62 @@
from lib_marker import MarkerSet
from lib_marker import MarkerSet, Track
MARKER_SET = MarkerSet(
name="Railways",
markers=[],
markers=[
Track(
name="Distriktsbane Sør",
points=[
(-24, 90, -112),
(-22, 90, -112),
(-22, 90, -113),
(-22, 78, -126),
(-22, 78, -128),
(-19, 78, -128),
(-19, 78, -127),
(-19, 53, -101),
(-19, 53, -100),
(-18, 53, -100),
(-13, 49, -100),
(-13, 49, -98),
(-13, 16, -64),
(-13, 16, -1610),
(-13, 35, -1630),
(-13, 35, -1641),
(-13, 36, -1643),
(-13, 36, -1646),
],
),
Track(
name="Gruvebane Øst",
points=[
(-11, 16, -61),
(1030, 16, -61),
(1030, 16, -253),
],
),
Track(
name="Distriktsbane Øst",
points=[
(4, 90, -123),
(1352, 90, -123),
(1352, 90, -124),
(1352, 85, -130),
(1355, 85, -130),
(1355, 85, -140),
],
),
Track(
name="Griseruta",
points=[
(4, 64, -366),
(4, 64, -397),
(-823, 64, -397),
(-823, 64, -4),
(-823, 37, 24),
(-823, 37, 31),
(-881, 37, 31),
],
),
],
)

View File

@@ -257,6 +257,177 @@ MARKER_SET = MarkerSet(
(-395, 71, 2406),
],
),
Track(
name="Sentralbane Øst",
points=[
(157, 71, 129),
(230, 71, 129),
(239, 71, 139),
(286, 71, 139),
(325, 71, 179),
(422, 71, 179),
(426, 74, 179),
(437, 74, 179),
(455, 74, 160),
(479, 74, 160),
(515, 74, 123),
(547, 74, 123),
(565, 74, 104),
(636, 74, 104),
(646, 74, 93),
(727, 74, 93),
(748, 74, 71),
(760, 74, 71),
(786, 74, 44),
(811, 74, 44),
(811, 74, 43),
(812, 74, 43),
(814, 73, 43),
(820, 73, 43),
(822, 74, 43),
(826, 74, 43),
(846, 74, 23),
(846, 74, 7),
(886, 74, -33),
(908, 74, -33),
(946, 74, -71),
(946, 74, -83),
(977, 74, -114),
(984, 74, -114),
(1022, 74, -152),
(1022, 74, -164),
(1054, 74, -195),
(1054, 74, -202),
(1079, 74, -227),
(1086, 74, -227),
(1117, 74, -259),
(1124, 74, -259),
(1155, 74, -291),
(1167, 74, -291),
(1188, 74, -313),
(1223, 74, -313),
(1249, 74, -340),
(1257, 74, -340),
],
),
Track(
name="Østbane B",
points=[
(817, 73, 43),
(817, 73, 46),
(817, 74, 48),
(817, 74, 49),
(817, 72, 52),
(828, 72, 62),
(828, 72, 63),
(828, 71, 65),
(828, 71, 71),
(828, 70, 73),
(828, 70, 164),
(830, 70, 166),
(848, 70, 166),
(848, 70, 167),
(851, 70, 167),
(851, 70, 168),
(853, 70, 168),
(857, 70, 173),
(860, 70, 173),
(860, 70, 174),
(940, 70, 174),
(944, 70, 178),
(944, 70, 213),
(944, 69, 215),
(944, 69, 216),
(944, 68, 218),
(944, 67, 220),
(944, 66, 222),
(944, 65, 224),
(944, 65, 473),
],
),
Track(
name="Tosjødalen gruveekspress",
points=[
(943, 65, 473),
(943, 65, 436),
(941, 65, 436),
(941, 64, 438),
(941, 64, 439),
(941, 63, 441),
(941, 62, 443),
(941, 62, 444),
(940, 62, 444),
(938, 61, 444),
(937, 61, 444),
(935, 60, 444),
(934, 60, 444),
(934, 60, 443),
(934, 59, 441),
(934, 58, 439),
(934, 58, 438),
(935, 58, 438),
(937, 57, 438),
(938, 57, 438),
(940, 56, 438),
(942, 56, 438),
(942, 56, 512),
(946, 56, 512),
(954, 63, 512),
(954, 63, 519),
(954, 64, 521),
(954, 64, 522),
(960, 64, 522),
(962, 65, 522),
(969, 65, 522),
(971, 64, 522),
(972, 64, 522),
(974, 63, 522),
(974, 63, 625),
(972, 63, 625),
(970, 64, 625),
(966, 67, 625),
(957, 75, 625),
(956, 75, 625),
(952, 72, 625),
(935, 72, 625),
(935, 72, 621),
(928, 72, 621),
(928, 72, 623),
(929, 72, 623),
(929, 70, 626),
(927, 69, 626),
(927, 68, 624),
(929, 67, 624),
(929, 65, 627),
(928, 65, 627),
(928, 64, 629),
(927, 64, 629),
(927, 64, 628),
(927, 61, 624),
(927, 61, 623),
(931, 61, 623),
(933, 60, 623),
(933, 59, 625),
(932, 59, 625),
(930, 58, 625),
(930, 58, 624),
(930, 57, 622),
(932, 56, 622),
(932, 56, 623),
(933, 56, 623),
(933, 55, 625),
(931, 54, 625),
(931, 53, 623),
(933, 52, 623),
(933, 51, 625),
(932, 51, 625),
(930, 50, 625),
(930, 49, 623),
(932, 48, 623),
# TODO: denne går egentlig lengre, men kartet viser ikke mer.
# Må undersøkes i spillet selv.
],
),
Track(
name="Shiro Monorail",
points=[