From 89ee6e3b17463e999a6928350a6a92dd47ea2942 Mon Sep 17 00:00:00 2001 From: Imad Razzak Date: Sun, 5 Jul 2020 08:55:47 +0200 Subject: [PATCH 1/8] export json --- src/components/ControlPlanner.vue | 1 + src/use/planner.js | 7 +++++++ 2 files changed, 8 insertions(+) diff --git a/src/components/ControlPlanner.vue b/src/components/ControlPlanner.vue index bad0d88..9ad4b5d 100755 --- a/src/components/ControlPlanner.vue +++ b/src/components/ControlPlanner.vue @@ -17,6 +17,7 @@ + diff --git a/src/use/planner.js b/src/use/planner.js index 36456c4..66aece3 100644 --- a/src/use/planner.js +++ b/src/use/planner.js @@ -140,5 +140,12 @@ export function usePlanner(mapData) { createBookmark: () => createBookmark(ownedRegions, data.common.factions), reset: () => reset(ownedRegions, mapData.startingRegions), clear: () => clear(ownedRegions), + exportJson: () => { + const a = document.createElement('a'); + const json = JSON.stringify(ownedRegions.value, null, 2); + a.href = URL.createObjectURL(new Blob([json], { type: 'text/json' })); + a.download = `export_v${gameDataVersion}.json`; + a.click(); + } }; } From 49cb8526aa097cc7e13468e752160d0d9de0d45b Mon Sep 17 00:00:00 2001 From: Imad Razzak Date: Sun, 5 Jul 2020 08:56:46 +0200 Subject: [PATCH 2/8] update changelog --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0addd2f..5f93667 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,10 @@ # Changelog All notable changes to this project will be documented in this file. +## 2020-07-05 +### Added +- Export planner state as JSON + ## 2020-04-24 ### Changed - Major rewrite using Leaflet.js From f89cae69ccd6f2d60339715245b1150bdd3845a7 Mon Sep 17 00:00:00 2001 From: Imad Razzak Date: Sun, 5 Jul 2020 19:58:21 +0200 Subject: [PATCH 3/8] save export file as 'map.json' --- src/use/planner.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/use/planner.js b/src/use/planner.js index 66aece3..4eaaeba 100644 --- a/src/use/planner.js +++ b/src/use/planner.js @@ -144,7 +144,7 @@ export function usePlanner(mapData) { const a = document.createElement('a'); const json = JSON.stringify(ownedRegions.value, null, 2); a.href = URL.createObjectURL(new Blob([json], { type: 'text/json' })); - a.download = `export_v${gameDataVersion}.json`; + a.download = 'map.json'; a.click(); } }; From 02f2aeb4564abf1c4594770f56a33146407417d3 Mon Sep 17 00:00:00 2001 From: Imad Razzak Date: Mon, 6 Jul 2020 22:28:05 +0200 Subject: [PATCH 4/8] testing with OVN custom factions --- .../flags/_custom_faction_flag/mon_24.png | 3 + .../flags/_custom_faction_flag/mon_256.png | 3 + .../flags/_custom_faction_flag/mon_64.png | 3 + .../_custom_faction_flag/mon_rotated.png | 3 + src/components/MapPlannerLayerFactions.vue | 4 +- src/components/MapPlannerLayerRegions.vue | 4 +- src/components/MapStartposLayerFactions.vue | 4 +- src/components/MapStartposLayerLords.vue | 4 +- src/components/MapStartposLayerRegions.vue | 4 +- src/data/common/custom_factions.json | 62 +++++++++++++++++++ src/data/index.js | 2 +- src/use/planner.js | 6 +- 12 files changed, 91 insertions(+), 11 deletions(-) create mode 100644 src/assets/flags/_custom_faction_flag/mon_24.png create mode 100644 src/assets/flags/_custom_faction_flag/mon_256.png create mode 100644 src/assets/flags/_custom_faction_flag/mon_64.png create mode 100644 src/assets/flags/_custom_faction_flag/mon_rotated.png create mode 100644 src/data/common/custom_factions.json diff --git a/src/assets/flags/_custom_faction_flag/mon_24.png b/src/assets/flags/_custom_faction_flag/mon_24.png new file mode 100644 index 0000000..f9773e8 --- /dev/null +++ b/src/assets/flags/_custom_faction_flag/mon_24.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:61f403c5afa7b56c29c69d5ede81e919337e2ef5aac89ba92027c2ff9bf3f75d +size 4050 diff --git a/src/assets/flags/_custom_faction_flag/mon_256.png b/src/assets/flags/_custom_faction_flag/mon_256.png new file mode 100644 index 0000000..487e3b0 --- /dev/null +++ b/src/assets/flags/_custom_faction_flag/mon_256.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f1d092267c1dedbf88310b1e637ef4c7cde7d1fa69a82fb01177713cc3d6096f +size 63456 diff --git a/src/assets/flags/_custom_faction_flag/mon_64.png b/src/assets/flags/_custom_faction_flag/mon_64.png new file mode 100644 index 0000000..9effabc --- /dev/null +++ b/src/assets/flags/_custom_faction_flag/mon_64.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c83e42f62f1204048870bf94c9c8ba389b9d0d59e9b35b0f7724ad74ffd02034 +size 8604 diff --git a/src/assets/flags/_custom_faction_flag/mon_rotated.png b/src/assets/flags/_custom_faction_flag/mon_rotated.png new file mode 100644 index 0000000..533e27d --- /dev/null +++ b/src/assets/flags/_custom_faction_flag/mon_rotated.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4b8f7f94ddb42ab4a37fea8887846af43a82f8bfda428caf7d69628aa7bcfe15 +size 11396 diff --git a/src/components/MapPlannerLayerFactions.vue b/src/components/MapPlannerLayerFactions.vue index 8b29fcd..2b2c700 100755 --- a/src/components/MapPlannerLayerFactions.vue +++ b/src/components/MapPlannerLayerFactions.vue @@ -16,7 +16,9 @@