From 65d48da5661f5cd78051545f368ed00277e08c5c Mon Sep 17 00:00:00 2001
From: Azgaar <maxganiev@yandex.ru>
Date: Wed, 5 May 2021 22:37:06 +0300
Subject: [PATCH] regenerate resources

---
 modules/ui/layers.js           |  5 ++---
 modules/ui/resources-editor.js | 10 ++++++++--
 modules/ui/tools.js            |  7 +++++++
 3 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/modules/ui/layers.js b/modules/ui/layers.js
index 591f9e1a..48dfc959 100644
--- a/modules/ui/layers.js
+++ b/modules/ui/layers.js
@@ -1927,12 +1927,11 @@ function drawResources() {
 function toggleResources(event) {
   if (!layerIsOn("toggleResources")) {
     turnButtonOn("toggleResources");
-    $('#goods').fadeIn();
-    if (!goods.selectAll("*").size()) drawResources();
+    drawResources();
     if (event && isCtrlClick(event)) editStyle("goods");
   } else {
     if (event && isCtrlClick(event)) {editStyle("goods"); return;}
-    $('#goods').fadeOut();
+    goods.selectAll("*").remove();
     turnButtonOff("toggleResources");
   }
 }
diff --git a/modules/ui/resources-editor.js b/modules/ui/resources-editor.js
index 9c1bfb76..62d1d9ee 100644
--- a/modules/ui/resources-editor.js
+++ b/modules/ui/resources-editor.js
@@ -17,6 +17,7 @@ function editResources() {
 
   // add listeners
   document.getElementById("resourcesEditorRefresh").addEventListener("click", resourcesEditorAddLines);
+  document.getElementById("resourcesRegenerate").addEventListener("click", regenerateResources);
   document.getElementById("resourcesLegend").addEventListener("click", toggleLegend);
   document.getElementById("resourcesPercentage").addEventListener("click", togglePercentageMode);
   document.getElementById("resourcesExport").addEventListener("click", downloadResourcesData);
@@ -24,6 +25,11 @@ function editResources() {
   // add line for each resource
   function resourcesEditorAddLines() {
     let lines = "";
+    const categories = [...new Set(pack.resources.map(r => r.category))].sort();
+    const categoryOptions = category => categories.map(c => `<option ${c === category ? "selected" : ""} value="${c}">${c}</option>`).join("");
+
+    const models = [...new Set(pack.resources.map(r => r.model))].sort();
+    const modelOptions = model => models.map(m => `<option ${m === model ? "selected" : ""} value="${m}">${m}</option>`).join("");
 
     // // {i: 33, name: "Saltpeter", icon: "resource-saltpeter", color: "#e6e3e3", value: 8, chance: 2, model: "habitability", bonus: {artillery: 3}}
     for (const r of pack.resources) {
@@ -36,8 +42,8 @@ function editResources() {
           <use href="#${r.icon}" x="10%" y="10%" width="80%" height="80%"/>
         </svg>
         <input data-tip="Resource name. Click and category to change" class="resourceName" value="${r.name}" autocorrect="off" spellcheck="false">
-        <select data-tip="Resource category. Select to change"><option selected>No data</option></select>
-        <input data-tip="Resource spread model. Select to change" value="${r.model}" class="model"/>
+        <select data-tip="Resource category. Select to change">${categoryOptions(r.category)}</select>
+        <select data-tip="Resource spread model. Select to change" class="model">${modelOptions(r.model)}</select>
 
         <input data-tip="Resource basic value. Click and type to change" value="${r.value}" type="number" min=0 max=100 step=1 />
         <input data-tip="Resource generation chance in eligible cell. Click and type to change" value="${r.chance}" type="number" min=0 max=100 step=.1 />
diff --git a/modules/ui/tools.js b/modules/ui/tools.js
index afc38d71..06ca0ff8 100644
--- a/modules/ui/tools.js
+++ b/modules/ui/tools.js
@@ -356,6 +356,13 @@ function regenerateResources() {
   refreshAllEditors();
 }
 
+function regenerateResources() {
+  Resources.generate();
+  goods.selectAll("*").remove();
+  if (layerIsOn("toggleResources")) drawResources();
+  refreshAllEditors();
+}
+
 function regenerateEmblems() {
   // remove old emblems
   document.querySelectorAll("[id^=stateCOA]").forEach(el => el.remove());