From b4e999c42c49a99666d8552b69125688b1bf967a Mon Sep 17 00:00:00 2001
From: Gunnar Omander <gunnar.omander@gmail.com>
Date: Fri, 6 Oct 2023 15:23:02 +0200
Subject: [PATCH] Merge seasonal power data into season data

---
 client/src/data/power-levels.ts          | 238 -----------------------
 client/src/data/seasons.ts               |  16 +-
 client/src/pages/HistoricalPowerPage.vue |  16 +-
 3 files changed, 20 insertions(+), 250 deletions(-)
 delete mode 100644 client/src/data/power-levels.ts

diff --git a/client/src/data/power-levels.ts b/client/src/data/power-levels.ts
deleted file mode 100644
index 21ee9f7..0000000
--- a/client/src/data/power-levels.ts
+++ /dev/null
@@ -1,238 +0,0 @@
-const levels = [
-  {
-    year: 'Destiny 2 (1)',
-    name: 'The Red War',
-    season: 1,
-    base: 10,
-    soft: 260,
-    powerful: 300,
-    pinnacle: 305
-  },
-  {
-    year: 'Destiny 2 (1)',
-    name: 'Curse of Osiris',
-    season: 2,
-    base: 10,
-    soft: 290,
-    powerful: 330,
-    pinnacle: 335
-  },
-  {
-    year: 'Destiny 2 (1)',
-    name: 'Warmind',
-    season: 3,
-    base: 10,
-    soft: 340,
-    powerful: 380,
-    pinnacle: 385
-  },
-  {
-    year: 'Forsaken (2)',
-    name: 'Season of the Outlaw',
-    season: 4,
-    base: 340,
-    soft: 500,
-    powerful: 600,
-    pinnacle: null
-  },
-  {
-    year: 'Forsaken (2)',
-    name: 'Season of the Forge',
-    season: 5,
-    base: 340,
-    soft: 600,
-    powerful: 650,
-    pinnacle: null
-  },
-  {
-    year: 'Forsaken (2)',
-    name: 'Season of the Drifter',
-    season: 6,
-    base: 340,
-    soft: 650,
-    powerful: 700,
-    pinnacle: null
-  },
-  {
-    year: 'Forsaken (2)',
-    name: 'Season of Opulence',
-    season: 7,
-    base: 340,
-    soft: 700,
-    powerful: 750,
-    pinnacle: null
-  },
-  {
-    year: 'Shadowkeep (3)',
-    name: 'Season of the Undying',
-    season: 8,
-    base: 750,
-    soft: 900,
-    powerful: 950,
-    pinnacle: 960
-  },
-  {
-    year: 'Shadowkeep (3)',
-    name: 'Season of Dawn',
-    season: 9,
-    base: 750,
-    soft: 910,
-    powerful: 960,
-    pinnacle: 970
-  },
-  {
-    year: 'Shadowkeep (3)',
-    name: 'Season of the Worthy',
-    season: 10,
-    base: 750,
-    soft: 950,
-    powerful: 1000,
-    pinnacle: 1010
-  },
-  {
-    year: 'Shadowkeep (3)',
-    name: 'Season of Arrivals',
-    season: 11,
-    base: 750,
-    soft: 1000,
-    powerful: 1050,
-    pinnacle: 1060
-  },
-  {
-    year: 'Beyond Light (4)',
-    name: 'Season of the Hunt',
-    season: 12,
-    base: 1050,
-    soft: 1200,
-    powerful: 1250,
-    pinnacle: 1260
-  },
-  {
-    year: 'Beyond Light (4)',
-    name: 'Season of the Chosen',
-    season: 13,
-    base: 1050,
-    soft: 1250,
-    powerful: 1300,
-    pinnacle: 1310
-  },
-  {
-    year: 'Beyond Light (4)',
-    name: 'Season of the Splicer',
-    season: 14,
-    base: 1050,
-    soft: 1260,
-    powerful: 1310,
-    pinnacle: 1320
-  },
-  {
-    year: 'Beyond Light (4)',
-    name: 'Season of the Lost',
-    season: 15,
-    base: 1050,
-    soft: 1270,
-    powerful: 1320,
-    pinnacle: 1330
-  },
-  {
-    year: 'Witch Queen (5)',
-    name: 'Season of the Risen',
-    season: 16,
-    base: 1350,
-    soft: 1500,
-    powerful: 1550,
-    pinnacle: 1560
-  },
-  {
-    year: 'Witch Queen (5)',
-    name: 'Season of the Haunted',
-    season: 17,
-    base: 1350,
-    soft: 1510,
-    powerful: 1560,
-    pinnacle: 1570
-  },
-  {
-    year: 'Witch Queen (5)',
-    name: 'Season of Plunder',
-    season: 18,
-    base: 1350,
-    soft: 1520,
-    powerful: 1570,
-    pinnacle: 1580
-  },
-  {
-    year: 'Witch Queen (5)',
-    name: 'Season of the Seraph',
-    season: 19,
-    base: 1350,
-    soft: 1530,
-    powerful: 1580,
-    pinnacle: 1590
-  },
-  {
-    year: 'Lightfall (6)',
-    name: 'Season of Defiance',
-    season: 20,
-    base: 1600,
-    soft: 1750,
-    powerful: 1800,
-    pinnacle: 1810
-  },
-  {
-    year: 'Lightfall (6)',
-    name: 'Season of the Deep',
-    season: 21,
-    base: 1600,
-    soft: 1750,
-    powerful: 1800,
-    pinnacle: 1810
-  },
-  {
-    year: 'Lightfall (6)',
-    name: 'Season of the Witch',
-    season: 22,
-    base: 1600,
-    soft: 1750,
-    powerful: 1800,
-    pinnacle: 1810
-  },
-  {
-    year: 'Lightfall (6)',
-    name: 'Season of ???',
-    season: 23,
-    base: 1600,
-    soft: null,
-    powerful: null,
-    pinnacle: null
-  },
-  {
-    year: 'The Final Shape (7)',
-    name: 'Echoes',
-    season: 24,
-    base: null,
-    soft: null,
-    powerful: null,
-    pinnacle: null
-  },
-  {
-    year: 'The Final Shape (7)',
-    name: 'Revenant',
-    season: 25,
-    base: null,
-    soft: null,
-    powerful: null,
-    pinnacle: null
-  },
-  {
-    year: 'The Final Shape (7)',
-    name: 'Heresy',
-    season: 26,
-    base: null,
-    soft: null,
-    powerful: null,
-    pinnacle: null
-  },
-]
-
-export default levels
diff --git a/client/src/data/seasons.ts b/client/src/data/seasons.ts
index 8976bbb..1a65e62 100644
--- a/client/src/data/seasons.ts
+++ b/client/src/data/seasons.ts
@@ -1,43 +1,43 @@
 interface AnnualRelease {
   title: string
-  year: number
+  value: number
   subdivisions: number
 }
 
 const annualReleases = new Map<number, AnnualRelease>([
   [1, {
     title: 'Destiny 2',
-    year: 1,
+    value: 1,
     subdivisions: 3
   }],
   [2, {
     title: 'Forsaken',
-    year: 2,
+    value: 2,
     subdivisions: 4
   }],
   [3, {
     title: 'Shadowkeep',
-    year: 3,
+    value: 3,
     subdivisions: 4
   }],
   [4, {
     title: 'Beyond Light',
-    year: 4,
+    value: 4,
     subdivisions: 4
   }],
   [5, {
     title: 'Witch Queen',
-    year: 5,
+    value: 5,
     subdivisions: 4
   }],
   [6, {
     title: 'Lightfall',
-    year: 6,
+    value: 6,
     subdivisions: 4
   }],
   [7, {
     title: 'The Final Shape',
-    year: 7,
+    value: 7,
     subdivisions: 3
   }]
 ])
diff --git a/client/src/pages/HistoricalPowerPage.vue b/client/src/pages/HistoricalPowerPage.vue
index 6260445..8f9e433 100644
--- a/client/src/pages/HistoricalPowerPage.vue
+++ b/client/src/pages/HistoricalPowerPage.vue
@@ -13,7 +13,7 @@
 </template>
 
 <script setup lang="ts">
-import levels from 'src/data/power-levels'
+import seasons from 'src/data/seasons'
 
 const columns = [
   {
@@ -60,7 +60,15 @@ const columns = [
   }
 ]
 
-const rows = structuredClone(levels)
-
-rows.reverse()
+const rows = Array.from(seasons).filter(
+  season => typeof season[0] === 'number'
+).map(season => season[1]).map(season => ({
+  year: `${season.year?.title} - ${season.year?.value}`,
+  name: season.title,
+  season: season.value,
+  base: season.power?.base,
+  soft: season.power?.soft,
+  powerful: season.power?.powerful,
+  pinnacle: season.power?.hard
+})).reverse()
 </script>