From 1b4087bd3322a2e2ba84271c8fcc013e6b641a58 Mon Sep 17 00:00:00 2001 From: Daniel Olsen Date: Mon, 2 Sep 2024 13:47:45 +0200 Subject: [PATCH] port markers to bluemap structure --- flake.nix | 7 ++ map-markers/default.nix | 6 ++ map-markers/lib.nix | 11 +++ {maps => map-markers}/mapcrafter/markers.js | 0 map-markers/vanillaSurvival/default.nix | 7 ++ .../vanillaSurvival/underverden/byer.nix | 8 ++ .../vanillaSurvival/underverden/default.nix | 6 ++ .../vanillaSurvival/underverden/spesial.nix | 12 +++ map-markers/vanillaSurvival/verden/byer.nix | 76 +++++++++++++++++++ .../vanillaSurvival/verden/default.nix | 6 ++ .../vanillaSurvival/verden/spesial.nix | 12 +++ 11 files changed, 151 insertions(+) create mode 100644 flake.nix create mode 100644 map-markers/default.nix create mode 100644 map-markers/lib.nix rename {maps => map-markers}/mapcrafter/markers.js (100%) create mode 100644 map-markers/vanillaSurvival/default.nix create mode 100644 map-markers/vanillaSurvival/underverden/byer.nix create mode 100644 map-markers/vanillaSurvival/underverden/default.nix create mode 100644 map-markers/vanillaSurvival/underverden/spesial.nix create mode 100644 map-markers/vanillaSurvival/verden/byer.nix create mode 100644 map-markers/vanillaSurvival/verden/default.nix create mode 100644 map-markers/vanillaSurvival/verden/spesial.nix diff --git a/flake.nix b/flake.nix new file mode 100644 index 0000000..e7784aa --- /dev/null +++ b/flake.nix @@ -0,0 +1,7 @@ +{ + inputs = { }; + outputs = inputs@{ self, ...}: { + map-markers = import ./map-markers; + map-lib = import ./map-markers/lib.nix; + }; +} diff --git a/map-markers/default.nix b/map-markers/default.nix new file mode 100644 index 0000000..180d065 --- /dev/null +++ b/map-markers/default.nix @@ -0,0 +1,6 @@ +let + lib = import ./lib.nix; + icons = import ./icons; +in { + vanillaSurvival = import ./vanillaSurvival { inherit lib icons; }; +} diff --git a/map-markers/lib.nix b/map-markers/lib.nix new file mode 100644 index 0000000..c6dd773 --- /dev/null +++ b/map-markers/lib.nix @@ -0,0 +1,11 @@ +rec { + mkPoi = label: pos: attr: { + type = "poi"; + position = { + x = builtins.elemAt pos 0; + y = builtins.elemAt pos 2; + z = builtins.elemAt pos 1; + }; + label = label; + } // attr; +} diff --git a/maps/mapcrafter/markers.js b/map-markers/mapcrafter/markers.js similarity index 100% rename from maps/mapcrafter/markers.js rename to map-markers/mapcrafter/markers.js diff --git a/map-markers/vanillaSurvival/default.nix b/map-markers/vanillaSurvival/default.nix new file mode 100644 index 0000000..78836f0 --- /dev/null +++ b/map-markers/vanillaSurvival/default.nix @@ -0,0 +1,7 @@ +{ lib, icons, ... }: + +{ + verden = import ./verden { inherit lib icons; }; + underverden = import ./underverden { inherit lib icons; }; + # enden = import ./enden { inherit lib icons; }; +} diff --git a/map-markers/vanillaSurvival/underverden/byer.nix b/map-markers/vanillaSurvival/underverden/byer.nix new file mode 100644 index 0000000..d8239b0 --- /dev/null +++ b/map-markers/vanillaSurvival/underverden/byer.nix @@ -0,0 +1,8 @@ +{ lib, icons }: + +{ + "Grisebukta" = lib.mkPoi "Grisebukta" [(-900) (27) (64)] { }; + "Hemmelig mesabiom, ca." = lib.mkPoi "Hemmelig mesabiom, ca." [(-120) (510) (64)] { }; + "Biosfæren, ca." = lib.mkPoi "Biosfæren, ca." [(120) (-420) (64)] { }; + "Holmgard, ca." = lib.mkPoi "Holmgard, ca." [(520) (220) (64)] { }; +} diff --git a/map-markers/vanillaSurvival/underverden/default.nix b/map-markers/vanillaSurvival/underverden/default.nix new file mode 100644 index 0000000..78a934f --- /dev/null +++ b/map-markers/vanillaSurvival/underverden/default.nix @@ -0,0 +1,6 @@ +{ lib, icons }: + +{ + byer = import ./byer.nix { inherit lib icons; }; + spesial = import ./spesial.nix { inherit lib icons; }; +} diff --git a/map-markers/vanillaSurvival/underverden/spesial.nix b/map-markers/vanillaSurvival/underverden/spesial.nix new file mode 100644 index 0000000..78d086c --- /dev/null +++ b/map-markers/vanillaSurvival/underverden/spesial.nix @@ -0,0 +1,12 @@ +{ lib, icons }: + +{ + label = "Spesielle steder"; + toggleable = true; + default-hidden = false; + sorting = 100; + + markers = { + nullpunkt = lib.mkPoi "Nullpunkt" [0 0 64] { /*icon = icons.green*/ }; + }; +} diff --git a/map-markers/vanillaSurvival/verden/byer.nix b/map-markers/vanillaSurvival/verden/byer.nix new file mode 100644 index 0000000..ca5c0ec --- /dev/null +++ b/map-markers/vanillaSurvival/verden/byer.nix @@ -0,0 +1,76 @@ +{ lib, ... }: + +{ + label = "Byer og steder"; + toggleable = true; + default-hidden = false; + sorting = 0; + markers = { + "Vestlandet" = lib.mkPoi "Vestlandet" [(-2204) (447) (64)] { }; + "Vestsumpland" = lib.mkPoi "Vestsumpland" [(-1818) (98) (64)] { }; + "Smedby" = lib.mkPoi "Smedby" [(-1760) (-2440) (64)] { }; + "Snøklippan" = lib.mkPoi "Snøklippan" [(-1654) (-654) (64)] { }; + "Dypskiferhytta" = lib.mkPoi "Dypskiferhytta" [(-1563) (-1966) (64)] { }; + "England" = lib.mkPoi "England" [(-1189) (1556) (75)] { }; + "Hemmelig mesabiom" = lib.mkPoi "Hemmelig mesabiom" [(-980) (4090) (64)] { }; + "Vestisødet" = lib.mkPoi "Vestisødet" [(-800) (0) (64)] { }; + "Isjungelkatedralen" = lib.mkPoi "Isjungelkatedralen" [(-378) (153) (64)] { }; + "Svartskoghavn" = lib.mkPoi "Svartskoghavn" [(-370) (2390) (64)] { }; + "Kystbasen" = lib.mkPoi "Kystbasen" [(-334) (473) (116)] { }; + "Langstrand" = lib.mkPoi "Langstrand" [(-305) (535) (64)] { }; + "Summefjord" = lib.mkPoi "Summefjord" [(-220) (2890) (64)] { }; + "Slimegruva" = lib.mkPoi "Slimegruva" [(-206) (-35) (64)] { }; + "Turrikkelmyra" = lib.mkPoi "Turrikkelmyra" [(-160) (1480) (64)] { }; + "Akasienborg" = lib.mkPoi "Akasienborg" [(-128) (-1460) (64)] { }; + "Summevatn" = lib.mkPoi "Summevatn" [(-110) (3465) (64)] { }; + "Tegltårnet" = lib.mkPoi "Tegltårnet" [(-99) (1025) (99)] { }; + "Huløyeid" = lib.mkPoi "Huløyeid" [(-54) (234) (64)] { }; + "Trangdalen" = lib.mkPoi "Trangdalen" [(-47) (146) (64)] { }; + "Tårnodden" = lib.mkPoi "Tårnodden" [(-22) (67) (76)] { }; + "Nordørkenen" = lib.mkPoi "Nordørkenen" [(0) (-485) (67)] { }; + "Naturreservat" = lib.mkPoi "Naturreservat" [(4) (800) (64)] { }; + "Sandsteingruva" = lib.mkPoi "Sandsteingruva" [(56) (-266) (67)] { }; + "Tangen" = lib.mkPoi "Tangen" [(58) (-2860) (63)] { }; + "Smalelvbro" = lib.mkPoi "Smalelvbro" [(77) (-348) (69)] { }; + "Ittoqqortoormiit" = lib.mkPoi "Ittoqqortoormiit" [(100) (-3830) (64)] { }; + "Bjerkepalasset" = lib.mkPoi "Bjerkepalasset" [(102) (37) (77)] { }; + "Piratbukta" = lib.mkPoi "Piratbukta" [(150) (80) (64)] { }; + "Heimfjell" = lib.mkPoi "Heimfjell" [(177) (177) (64)] { }; + "Hulevatna" = lib.mkPoi "Hulevatna" [(240) (3070) (64)] { }; + "Hodeskallegrotten" = lib.mkPoi "Hodeskallegrotten" [(267) (-496) (89)] { }; + "Jesus Christ Superstore" = lib.mkPoi "Jesus Christ Superstore" [(280) (-2800) (64)] { }; + "NPC-landsby nord" = lib.mkPoi "NPC-landsby nord" [(337) (-853) (64)] { }; + "Vikingelandsbyen" = lib.mkPoi "Vikingelandsbyen" [(360) (-460) (64)] { }; + "Bjørnebukten" = lib.mkPoi "Bjørnebukten" [(473) (-3043) (78)] { }; + "Leirhavn" = lib.mkPoi "Leirhavn" [(512) (-3320) (64)] { }; + "Grensebuelvbu" = lib.mkPoi "Grensebuelvbu" [(550) (-1480) (64)] { }; + "Storvatnet" = lib.mkPoi "Storvatnet" [(675) (362) (64)] { }; + "Kløfteby" = lib.mkPoi "Kløfteby" [(695) (2812) (64)] { }; + "Isbjørnby" = lib.mkPoi "Isbjørnby" [(723) (-2380) (64)] { }; + "Lille isbjørnelv" = lib.mkPoi "Lille isbjørnelv" [(730) (-1900) (64)] { }; + "Gammelleirnes" = lib.mkPoi "Gammelleirnes" [(800) (-3300) (64)] { }; + "Biosfæren" = lib.mkPoi "Biosfæren" [(834) (-3089) (65)] { }; + "Nyverdenhytta" = lib.mkPoi "Nyverdenhytta" [(848) (1583) (70)] { }; + "Store isbjørnelv" = lib.mkPoi "Store isbjørnelv" [(850) (-2130) (64)] { }; + "Blindodden" = lib.mkPoi "Blindodden" [(874) (160) (65)] { }; + "Ulveelva" = lib.mkPoi "Ulveelva" [(910) (3050) (64)] { }; + "Tosjødalen" = lib.mkPoi "Tosjødalen" [(960) (460) (64)] { }; + "Storhavskanalen" = lib.mkPoi "Storhavskanalen" [(1005) (1335) (64)] { }; + "NPC-landsby" = lib.mkPoi "NPC-landsby" [(1278) (-397) (64)] { }; + "SuperTheodors fiskehus" = lib.mkPoi "SuperTheodors fiskehus" [(1570) (3285) (64)] { }; + "Lamafjellet" = lib.mkPoi "Lamafjellet" [(1810) (-1630) (64)] { }; + "SuperTheodors strand" = lib.mkPoi "SuperTheodors strand" [(2111) (3777) (64)] { }; + "Andøya" = lib.mkPoi "Andøya" [(2300) (250) (64)] { }; + "Grantrebukta" = lib.mkPoi "Grantrebukta" [(2350) (-136) (64)] { }; + "Hestelandsby" = lib.mkPoi "Hestelandsby" [(2734) (-984) (64)] { }; + "Bikkjeby" = lib.mkPoi "Bikkjeby" [(2950) (270) (64)] { }; + "Storhavet i øst" = lib.mkPoi "Storhavet i øst" [(3000) (1000) (64)] { }; + "Fyret" = lib.mkPoi "Fyret" [(3085) (424) (64)] { }; + "Vinterstranda hotel & resort" = lib.mkPoi "Vinterstranda hotel & resort" [(3481) (210) (75)] { }; + "Holmgard" = lib.mkPoi "Holmgard" [(4468) (1337) (64)] { }; + "Der Kölner Dom" = lib.mkPoi "Der Kölner Dom" [(4630) (270) (64)] { }; + "Storsnøfjella" = lib.mkPoi "Storsnøfjella" [(5470) (-270) (64)] { }; + "Bondeby" = lib.mkPoi "Bondeby" [(6200) (-300) (64)] { }; + "Kirkemyr" = lib.mkPoi "Kirkemyr" [(6880) (-465) (64)] { }; + }; +} diff --git a/map-markers/vanillaSurvival/verden/default.nix b/map-markers/vanillaSurvival/verden/default.nix new file mode 100644 index 0000000..78a934f --- /dev/null +++ b/map-markers/vanillaSurvival/verden/default.nix @@ -0,0 +1,6 @@ +{ lib, icons }: + +{ + byer = import ./byer.nix { inherit lib icons; }; + spesial = import ./spesial.nix { inherit lib icons; }; +} diff --git a/map-markers/vanillaSurvival/verden/spesial.nix b/map-markers/vanillaSurvival/verden/spesial.nix new file mode 100644 index 0000000..78d086c --- /dev/null +++ b/map-markers/vanillaSurvival/verden/spesial.nix @@ -0,0 +1,12 @@ +{ lib, icons }: + +{ + label = "Spesielle steder"; + toggleable = true; + default-hidden = false; + sorting = 100; + + markers = { + nullpunkt = lib.mkPoi "Nullpunkt" [0 0 64] { /*icon = icons.green*/ }; + }; +}