backups/Fantasy-Map-Generator
1
0
Fork 0
mirror of https://github.com/Azgaar/Fantasy-Map-Generator.git synced 2025-12-22 20:11:24 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Import resource-editor correctly

Browse source
This commit is contained in:
Peter 2022-11-25 13:41:52 -05:00
parent bcbb670f00
commit 51542ac7be
3 changed files with 9 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

1
index.html
View file

@ -8174,6 +8174,7 @@
<script defer src="modules/ui/markers-overview.js"></script> <script defer src="modules/ui/markers-overview.js"></script>
<script defer src="modules/ui/regiment-editor.js"></script> <script defer src="modules/ui/regiment-editor.js"></script>
<script defer src="modules/ui/battle-screen.js"></script> <script defer src="modules/ui/battle-screen.js"></script>
<script defer src="modules/ui/resource-editor.js"></script>
<script defer src="modules/ui/emblems-editor.js"></script> <script defer src="modules/ui/emblems-editor.js"></script>
<script defer src="modules/ui/markers-editor.js"></script> <script defer src="modules/ui/markers-editor.js"></script>
<script defer src="modules/ui/3d.js"></script> <script defer src="modules/ui/3d.js"></script>

14
modules/ui/layers.js
View file

@ -1897,11 +1897,11 @@ function toggleResources(event) {
} }
function drawResources() { function drawResources() {
console.time('drawResources'); console.time("drawResources");
const someArePinned = pack.resources.some((resource) => resource.pinned); const someArePinned = pack.resources.some((resource) => resource.pinned);
const drawCircle = +goods.attr('data-circle'); const drawCircle = +goods.attr("data-circle");
let resourcesHTML = ''; let resourcesHTML = "";
for (const i of pack.cells.i) { for (const i of pack.cells.i) {
if (!pack.cells.resource[i]) continue; if (!pack.cells.resource[i]) continue;
const resource = Resources.get(pack.cells.resource[i]); const resource = Resources.get(pack.cells.resource[i]);
@ -1909,10 +1909,10 @@ function drawResources() {
const [x, y] = pack.cells.p[i]; const [x, y] = pack.cells.p[i];
const stroke = Resources.getStroke(resource.color); const stroke = Resources.getStroke(resource.color);
if (!drawCircle) { // if (!drawCircle) {
resourcesHTML += `<use data-i="${resource.i}" href="#${resource.icon}" x="${x - 3}" y="${y - 3}" width="6" height="6"/>`; // resourcesHTML += `<use data-i="${resource.i}" href="#${resource.icon}" x="${x - 3}" y="${y - 3}" width="6" height="6"/>`;
continue; // continue;
} // }
resourcesHTML += `<g> resourcesHTML += `<g>
<circle data-i="${resource.i}" cx=${x} cy=${y} r="3" fill="${resource.color}" stroke="${stroke}" /> <circle data-i="${resource.i}" cx=${x} cy=${y} r="3" fill="${resource.color}" stroke="${stroke}" />

2
modules/ui/resource-editor.js
View file

@ -1,4 +1,4 @@
'use strict'; "use strict";
function editResources() { function editResources() {
if (customization) return; if (customization) return;
closeDialogs('#resourcesEditor, .stable'); closeDialogs('#resourcesEditor, .stable');