From 0d1b52e538ce646d4a7f12bb763ba1fa12db3d00 Mon Sep 17 00:00:00 2001
From: Azgaar <maxganiev@yandex.com>
Date: Mon, 5 Sep 2022 21:14:35 +0300
Subject: [PATCH] refactor: don'r store events globally

---
 public/libs/define-globals.js        | 1 -
 src/scripts/generation/generation.ts | 3 +--
 src/scripts/generation/pack/pack.ts  | 9 ++++++---
 src/types/globals.d.ts               | 1 -
 src/types/pack/pack.d.ts             | 1 +
 5 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/public/libs/define-globals.js b/public/libs/define-globals.js
index fb1890a0..35226285 100644
--- a/public/libs/define-globals.js
+++ b/public/libs/define-globals.js
@@ -5,7 +5,6 @@ let grid = {}; // initial graph based on jittered square grid and data
 let pack = {}; // packed graph and data
 
 let notes = [];
-let events = {};
 
 let seed;
 let mapId;
diff --git a/src/scripts/generation/generation.ts b/src/scripts/generation/generation.ts
index 209afeb2..5d90ff9a 100644
--- a/src/scripts/generation/generation.ts
+++ b/src/scripts/generation/generation.ts
@@ -53,14 +53,13 @@ async function generate(options?: IGenerationOptions) {
     window.mapCoordinates = calculateMapCoordinates();
 
     const newGrid = await createGrid(grid, precreatedGraph);
-    const {pack: newPack, conflicts} = createPack(newGrid);
+    const newPack = createPack(newGrid);
 
     // TODO: draw default ruler
 
     // redefine global grid and pack
     grid = newGrid;
     pack = newPack;
-    events = {conflicts};
 
     // temp rendering for debug
     // renderLayer("cells");
diff --git a/src/scripts/generation/pack/pack.ts b/src/scripts/generation/pack/pack.ts
index f5be5c3c..df1969ef 100644
--- a/src/scripts/generation/pack/pack.ts
+++ b/src/scripts/generation/pack/pack.ts
@@ -18,7 +18,7 @@ import {generateReligions} from "./religions/generateReligions";
 const {LAND_COAST, WATER_COAST, DEEPER_WATER} = DISTANCE_FIELD;
 const {Biomes} = window;
 
-export function createPack(grid: IGrid): {pack: IPack; conflicts: IConflict[]} {
+export function createPack(grid: IGrid): IPack {
   const {temp, prec} = grid.cells;
   const {vertices, cells} = repackGrid(grid);
 
@@ -168,6 +168,8 @@ export function createPack(grid: IGrid): {pack: IPack; conflicts: IConflict[]} {
   // drawScaleBar(window.scale);
   // Names.getMapName();
 
+  const events: IEvents = {conflicts};
+
   const pack: IPack = {
     vertices,
     cells: {
@@ -196,10 +198,11 @@ export function createPack(grid: IGrid): {pack: IPack; conflicts: IConflict[]} {
     states,
     burgs,
     routes,
-    religions
+    religions,
+    events
   };
 
-  return {pack, conflicts};
+  return pack;
 }
 
 // repack grid cells: discart deep water cells, add land cells along the coast
diff --git a/src/types/globals.d.ts b/src/types/globals.d.ts
index 15f81616..c65e7859 100644
--- a/src/types/globals.d.ts
+++ b/src/types/globals.d.ts
@@ -2,7 +2,6 @@ declare let grid: IGrid;
 declare let pack: IPack;
 
 declare let notes: INote[];
-declare let events: IEvents;
 
 declare let seed: string;
 declare let mapId: number;
diff --git a/src/types/pack/pack.d.ts b/src/types/pack/pack.d.ts
index 71bbe374..39491bf8 100644
--- a/src/types/pack/pack.d.ts
+++ b/src/types/pack/pack.d.ts
@@ -8,6 +8,7 @@ interface IPack extends IGraph {
   rivers: TRivers;
   religions: TReligions;
   routes: TRoutes;
+  events: IEvents;
 }
 
 interface IPackCells {