From 48326cbc11107c80431067ecfa8c549d402e092e Mon Sep 17 00:00:00 2001 From: Nick Boughton Date: Sat, 11 Sep 2021 00:31:20 +0100 Subject: [PATCH] gradient cell bgks and icons from loc data --- .prettierrc | 2 +- public/icons/space/alien-bug.svg | 1 - public/icons/space/alien-egg.svg | 1 - public/icons/space/alien-skull.svg | 1 - public/icons/space/asteroid.svg | 1 - public/icons/space/astronaut-helmet.svg | 1 - public/icons/space/black-hole-bolas.svg | 1 - public/icons/space/bubble-field.svg | 1 - public/icons/space/burning-meteor.svg | 1 - public/icons/space/death-star.svg | 1 - public/icons/space/distress-signal.svg | 1 - public/icons/space/double-ringed-orb.svg | 1 - public/icons/space/earth-africa-europe.svg | 1 - public/icons/space/earth-america.svg | 1 - public/icons/space/earth-asia-oceania.svg | 1 - public/icons/space/eclipse.svg | 1 - public/icons/space/exploding-planet.svg | 1 - public/icons/space/explosion-rays.svg | 1 - public/icons/space/forward-field.svg | 1 - public/icons/space/galaxy.svg | 1 - public/icons/space/hypersonic-bolt.svg | 1 - public/icons/space/interceptor-ship.svg | 1 - public/icons/space/jupiter.svg | 1 - public/icons/space/meteor-impact.svg | 1 - public/icons/space/moon-orbit.svg | 1 - public/icons/space/moon.svg | 1 - public/icons/space/nested-eclipses.svg | 1 - public/icons/space/orbit.svg | 1 - public/icons/space/orbital-rays.svg | 1 - public/icons/space/planet-conquest.svg | 1 - public/icons/space/planet-core.svg | 1 - public/icons/space/radar-dish.svg | 1 - public/icons/space/ringed-planet.svg | 1 - public/icons/space/scout-ship.svg | 1 - public/icons/space/solar-system.svg | 1 - public/icons/space/spiky-field.svg | 1 - public/icons/space/spoutnik.svg | 1 - public/icons/space/star-cycle.svg | 1 - public/icons/space/starfighter.svg | 1 - public/icons/space/stars.svg | 224 ++++++++++++++++++++ public/icons/space/strafe.svg | 1 - public/icons/space/transportation-rings.svg | 1 - public/icons/space/vortex.svg | 1 - public/icons/space/world.svg | 1 - src/components/Sector/HexCell.vue | 54 ++++- src/components/Sector/HexMap.vue | 62 ++++-- src/components/Sector/SCreature.vue | 10 +- src/components/Sector/SDerelict.vue | 4 +- src/components/Sector/SNPC.vue | 4 +- src/components/Sector/SPlanet.vue | 8 +- src/components/Sector/SSettlement.vue | 4 +- src/components/Sector/SStar.vue | 5 +- src/components/Sector/SStarship.vue | 4 +- src/components/Sector/SVault.vue | 4 +- src/components/models.ts | 2 +- src/lib/campaign.ts | 2 +- src/lib/icons.ts | 37 ++++ src/pages/Sector.vue | 1 + src/store/campaign.ts | 62 +++++- 59 files changed, 440 insertions(+), 91 deletions(-) delete mode 100644 public/icons/space/alien-bug.svg delete mode 100644 public/icons/space/alien-egg.svg delete mode 100644 public/icons/space/alien-skull.svg delete mode 100644 public/icons/space/asteroid.svg delete mode 100644 public/icons/space/astronaut-helmet.svg delete mode 100644 public/icons/space/black-hole-bolas.svg delete mode 100644 public/icons/space/bubble-field.svg delete mode 100644 public/icons/space/burning-meteor.svg delete mode 100644 public/icons/space/death-star.svg delete mode 100644 public/icons/space/distress-signal.svg delete mode 100644 public/icons/space/double-ringed-orb.svg delete mode 100644 public/icons/space/earth-africa-europe.svg delete mode 100644 public/icons/space/earth-america.svg delete mode 100644 public/icons/space/earth-asia-oceania.svg delete mode 100644 public/icons/space/eclipse.svg delete mode 100644 public/icons/space/exploding-planet.svg delete mode 100644 public/icons/space/explosion-rays.svg delete mode 100644 public/icons/space/forward-field.svg delete mode 100644 public/icons/space/galaxy.svg delete mode 100644 public/icons/space/hypersonic-bolt.svg delete mode 100644 public/icons/space/interceptor-ship.svg delete mode 100644 public/icons/space/jupiter.svg delete mode 100644 public/icons/space/meteor-impact.svg delete mode 100644 public/icons/space/moon-orbit.svg delete mode 100644 public/icons/space/moon.svg delete mode 100644 public/icons/space/nested-eclipses.svg delete mode 100644 public/icons/space/orbit.svg delete mode 100644 public/icons/space/orbital-rays.svg delete mode 100644 public/icons/space/planet-conquest.svg delete mode 100644 public/icons/space/planet-core.svg delete mode 100644 public/icons/space/radar-dish.svg delete mode 100644 public/icons/space/ringed-planet.svg delete mode 100644 public/icons/space/scout-ship.svg delete mode 100644 public/icons/space/solar-system.svg delete mode 100644 public/icons/space/spiky-field.svg delete mode 100644 public/icons/space/spoutnik.svg delete mode 100644 public/icons/space/star-cycle.svg delete mode 100644 public/icons/space/starfighter.svg create mode 100644 public/icons/space/stars.svg delete mode 100644 public/icons/space/strafe.svg delete mode 100644 public/icons/space/transportation-rings.svg delete mode 100644 public/icons/space/vortex.svg delete mode 100644 public/icons/space/world.svg create mode 100644 src/lib/icons.ts diff --git a/.prettierrc b/.prettierrc index 0fca9c1..d98e2e8 100644 --- a/.prettierrc +++ b/.prettierrc @@ -1,5 +1,5 @@ { "singleQuote": true, "semi": true, - "printWidth": 200 + "printWidth": 120 } \ No newline at end of file diff --git a/public/icons/space/alien-bug.svg b/public/icons/space/alien-bug.svg deleted file mode 100644 index 956adce..0000000 --- a/public/icons/space/alien-bug.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/public/icons/space/alien-egg.svg b/public/icons/space/alien-egg.svg deleted file mode 100644 index f42d2a9..0000000 --- a/public/icons/space/alien-egg.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/public/icons/space/alien-skull.svg b/public/icons/space/alien-skull.svg deleted file mode 100644 index 0b1b8b8..0000000 --- a/public/icons/space/alien-skull.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/public/icons/space/asteroid.svg b/public/icons/space/asteroid.svg deleted file mode 100644 index 0b5e269..0000000 --- a/public/icons/space/asteroid.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/public/icons/space/astronaut-helmet.svg b/public/icons/space/astronaut-helmet.svg deleted file mode 100644 index 3b06369..0000000 --- a/public/icons/space/astronaut-helmet.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/public/icons/space/black-hole-bolas.svg b/public/icons/space/black-hole-bolas.svg deleted file mode 100644 index 951dc05..0000000 --- a/public/icons/space/black-hole-bolas.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/public/icons/space/bubble-field.svg b/public/icons/space/bubble-field.svg deleted file mode 100644 index a4cd1a8..0000000 --- a/public/icons/space/bubble-field.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/public/icons/space/burning-meteor.svg b/public/icons/space/burning-meteor.svg deleted file mode 100644 index 674a180..0000000 --- a/public/icons/space/burning-meteor.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/public/icons/space/death-star.svg b/public/icons/space/death-star.svg deleted file mode 100644 index db953a3..0000000 --- a/public/icons/space/death-star.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/public/icons/space/distress-signal.svg b/public/icons/space/distress-signal.svg deleted file mode 100644 index 3a8c57f..0000000 --- a/public/icons/space/distress-signal.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/public/icons/space/double-ringed-orb.svg b/public/icons/space/double-ringed-orb.svg deleted file mode 100644 index ab0d3a4..0000000 --- a/public/icons/space/double-ringed-orb.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/public/icons/space/earth-africa-europe.svg b/public/icons/space/earth-africa-europe.svg deleted file mode 100644 index a24e1f6..0000000 --- a/public/icons/space/earth-africa-europe.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/public/icons/space/earth-america.svg b/public/icons/space/earth-america.svg deleted file mode 100644 index 401a598..0000000 --- a/public/icons/space/earth-america.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/public/icons/space/earth-asia-oceania.svg b/public/icons/space/earth-asia-oceania.svg deleted file mode 100644 index 9691498..0000000 --- a/public/icons/space/earth-asia-oceania.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/public/icons/space/eclipse.svg b/public/icons/space/eclipse.svg deleted file mode 100644 index 24d1341..0000000 --- a/public/icons/space/eclipse.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/public/icons/space/exploding-planet.svg b/public/icons/space/exploding-planet.svg deleted file mode 100644 index f2d421e..0000000 --- a/public/icons/space/exploding-planet.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/public/icons/space/explosion-rays.svg b/public/icons/space/explosion-rays.svg deleted file mode 100644 index eb2fac0..0000000 --- a/public/icons/space/explosion-rays.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/public/icons/space/forward-field.svg b/public/icons/space/forward-field.svg deleted file mode 100644 index d7c398b..0000000 --- a/public/icons/space/forward-field.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/public/icons/space/galaxy.svg b/public/icons/space/galaxy.svg deleted file mode 100644 index a790877..0000000 --- a/public/icons/space/galaxy.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/public/icons/space/hypersonic-bolt.svg b/public/icons/space/hypersonic-bolt.svg deleted file mode 100644 index 346dcea..0000000 --- a/public/icons/space/hypersonic-bolt.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/public/icons/space/interceptor-ship.svg b/public/icons/space/interceptor-ship.svg deleted file mode 100644 index 1687a2f..0000000 --- a/public/icons/space/interceptor-ship.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/public/icons/space/jupiter.svg b/public/icons/space/jupiter.svg deleted file mode 100644 index d9c8c92..0000000 --- a/public/icons/space/jupiter.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/public/icons/space/meteor-impact.svg b/public/icons/space/meteor-impact.svg deleted file mode 100644 index c940372..0000000 --- a/public/icons/space/meteor-impact.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/public/icons/space/moon-orbit.svg b/public/icons/space/moon-orbit.svg deleted file mode 100644 index 98ed6ce..0000000 --- a/public/icons/space/moon-orbit.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/public/icons/space/moon.svg b/public/icons/space/moon.svg deleted file mode 100644 index c413ed4..0000000 --- a/public/icons/space/moon.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/public/icons/space/nested-eclipses.svg b/public/icons/space/nested-eclipses.svg deleted file mode 100644 index 444d843..0000000 --- a/public/icons/space/nested-eclipses.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/public/icons/space/orbit.svg b/public/icons/space/orbit.svg deleted file mode 100644 index 273d159..0000000 --- a/public/icons/space/orbit.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/public/icons/space/orbital-rays.svg b/public/icons/space/orbital-rays.svg deleted file mode 100644 index e1e0933..0000000 --- a/public/icons/space/orbital-rays.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/public/icons/space/planet-conquest.svg b/public/icons/space/planet-conquest.svg deleted file mode 100644 index f39c392..0000000 --- a/public/icons/space/planet-conquest.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/public/icons/space/planet-core.svg b/public/icons/space/planet-core.svg deleted file mode 100644 index ab77a38..0000000 --- a/public/icons/space/planet-core.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/public/icons/space/radar-dish.svg b/public/icons/space/radar-dish.svg deleted file mode 100644 index 59ddc54..0000000 --- a/public/icons/space/radar-dish.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/public/icons/space/ringed-planet.svg b/public/icons/space/ringed-planet.svg deleted file mode 100644 index 99dc0e1..0000000 --- a/public/icons/space/ringed-planet.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/public/icons/space/scout-ship.svg b/public/icons/space/scout-ship.svg deleted file mode 100644 index 0dac931..0000000 --- a/public/icons/space/scout-ship.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/public/icons/space/solar-system.svg b/public/icons/space/solar-system.svg deleted file mode 100644 index d802ee0..0000000 --- a/public/icons/space/solar-system.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/public/icons/space/spiky-field.svg b/public/icons/space/spiky-field.svg deleted file mode 100644 index 32e2f3b..0000000 --- a/public/icons/space/spiky-field.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/public/icons/space/spoutnik.svg b/public/icons/space/spoutnik.svg deleted file mode 100644 index 16f459f..0000000 --- a/public/icons/space/spoutnik.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/public/icons/space/star-cycle.svg b/public/icons/space/star-cycle.svg deleted file mode 100644 index 41bd1b5..0000000 --- a/public/icons/space/star-cycle.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/public/icons/space/starfighter.svg b/public/icons/space/starfighter.svg deleted file mode 100644 index 117d888..0000000 --- a/public/icons/space/starfighter.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/public/icons/space/stars.svg b/public/icons/space/stars.svg new file mode 100644 index 0000000..1f2ad72 --- /dev/null +++ b/public/icons/space/stars.svg @@ -0,0 +1,224 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/public/icons/space/strafe.svg b/public/icons/space/strafe.svg deleted file mode 100644 index 9b86e99..0000000 --- a/public/icons/space/strafe.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/public/icons/space/transportation-rings.svg b/public/icons/space/transportation-rings.svg deleted file mode 100644 index 2b0ff73..0000000 --- a/public/icons/space/transportation-rings.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/public/icons/space/vortex.svg b/public/icons/space/vortex.svg deleted file mode 100644 index 7b5f984..0000000 --- a/public/icons/space/vortex.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/public/icons/space/world.svg b/public/icons/space/world.svg deleted file mode 100644 index 8fa5c91..0000000 --- a/public/icons/space/world.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/components/Sector/HexCell.vue b/src/components/Sector/HexCell.vue index 0f3eeb4..a8400a9 100644 --- a/src/components/Sector/HexCell.vue +++ b/src/components/Sector/HexCell.vue @@ -1,12 +1,19 @@ + + diff --git a/src/components/Sector/HexMap.vue b/src/components/Sector/HexMap.vue index 6c2783a..2076cc2 100644 --- a/src/components/Sector/HexMap.vue +++ b/src/components/Sector/HexMap.vue @@ -4,7 +4,13 @@
- +
+ +
@@ -12,20 +18,32 @@ - -
Edit Cell
+ + Cell Details + +
- Set Location - + Link location: +
-
- Mark as - +
+ +
@@ -40,9 +58,10 @@ import { defineComponent, ref } from 'vue'; import { IHex } from '../models'; import HexCell from './HexCell.vue'; import LocationSelect from 'src/components/LocationSelect.vue'; +import Cell from './Cell.vue'; export default defineComponent({ - components: { HexCell, LocationSelect }, + components: { HexCell, LocationSelect, Cell }, name: 'HexMap', setup() { const campaign = useCampaign(); @@ -50,28 +69,23 @@ export default defineComponent({ const showDialog = ref(false); const selectedHex = ref(0); + const selectedCell = ref({ sector: 0, cell: 0, found: false }); + const clickHex = (o: IHex, i: number) => { selectedHex.value = i; + selectedCell.value = { sector: 0, cell: 0, found: false }; if (!o.isPassage && o.id === '') { campaign.data.sectors[config.data.sector].hexes[i].isPassage = true; return; } if (o.isPassage || o.id !== '') { + if (o.id !== '') { + selectedCell.value = campaign.getCellLocation(o.id); + } showDialog.value = true; } }; - const unlinkCell = (id: string) => { - campaign.data.sectors.forEach((s, sI) => { - s.hexes.forEach((h, hI) => { - if (h.id === id) { - campaign.data.sectors[sI].hexes[hI].id = ''; - return; - } - }); - }); - }; - const linkCell = (args: { sector: number; cell: number }) => { // Unmark as passage campaign.data.sectors[config.data.sector].hexes[selectedHex.value].isPassage = false; @@ -80,7 +94,8 @@ export default defineComponent({ const id = campaign.data.sectors[args.sector].cells[args.cell].id; // unlink cell from any other maps - unlinkCell(id); + campaign.unlinkCell(id); + selectedCell.value = campaign.getCellLocation(id); // Set cell id for item campaign.data.sectors[config.data.sector].hexes[selectedHex.value].id = id; @@ -91,6 +106,7 @@ export default defineComponent({ config, showDialog, selectedHex, + selectedCell, clickHex, linkCell, }; @@ -119,7 +135,7 @@ export default defineComponent({ display: inline-block; font-size: initial; clip-path: polygon(0% 25%, 0% 75%, 50% 100%, 100% 75%, 100% 25%, 50% 0%); - background: white; + background: black; margin-bottom: calc(var(--m) - var(--s) * 0.2885); } /*.container div:nth-child(odd) { @@ -133,6 +149,6 @@ export default defineComponent({ width: calc(var(--s) / 2 + var(--m)); float: left; height: 120%; - shape-outside: repeating-linear-gradient(#0000 0 calc(var(--f) - 3px), #000 0 var(--f)); + shape-outside: repeating-linear-gradient(#0000 0 calc(var(--f) - 1px), #000 0 var(--f)); } diff --git a/src/components/Sector/SCreature.vue b/src/components/Sector/SCreature.vue index 0d3c5ea..1b7360b 100644 --- a/src/components/Sector/SCreature.vue +++ b/src/components/Sector/SCreature.vue @@ -1,6 +1,6 @@