Skip to content

Commit

Permalink
V1.8 (#784)
Browse files Browse the repository at this point in the history 
* pump version to 1.8

* resampleDialog UI update

* don't draw markers if not required

* submapOptionsDialog style changes
  • Loading branch information
Azgaar authored Apr 26, 2022
1 parent 8a0fbd1 commit e6dfab4
Show file tree
Hide file tree
Showing 7 changed files with 140 additions and 148 deletions.
1 change: 1 addition & 0 deletions index.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2271,6 +2271,7 @@ svg.button {
user-select: none;
}


.dontAsk {
display: inline-block;
margin: 0.9em 0 0 0.6em;
Expand Down
140 changes: 60 additions & 80 deletions index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -274,7 +274,7 @@
<div id="loading">
<div id="titleName"><t data-t="titleName">Azgaar's</t></div>
<div id="title"><t data-t="title">Fantasy Map Generator</t></div>
<div id="version"><t data-t="version">v. </t>1.73</div>
<div id="version"><t data-t="version">v. </t>1.8</div>
<p id="loading-text"><t data-t="loading">LOADING</t><span>.</span><span>.</span><span>.</span></p>
</div>

Expand Down Expand Up @@ -1247,7 +1247,7 @@
<input id="pointsInput" type="range" min="1" max="13" value="4" data-cells="10000" />
</td>
<td>
<output id="pointsOutput_formatted" style="color: #053305">10K</output>
<output id="pointsOutputFormatted" style="color: #053305">10K</output>
</td>
</tr>

Expand Down Expand Up @@ -1727,9 +1727,9 @@
</div>

<p>Click to create a new map:</p>
<div id="resamplers">
<button data-tip="Click to generate new (sub)map from the current viewport" onclick="UISubmap.openSubmapOptions()">Submap</button>
<button data-tip="Click to resample (transform) your map to different cellcount" onclick="UISubmap.openRemapOptions()">Resample</button>
<div>
<button id="openSubmapMenu" data-tip="Click to generate a submap from the current viewport">Submap</button>
<button id="openResampleMenu" data-tip="Click to transform the map">Resample</button>
</div>
</div>

Expand Down Expand Up @@ -4444,99 +4444,79 @@
<div id="tileStatus" style="background-color: #33333310; font-style: italic"></div>
</div>

<div id="remapOptionsDialog" style="display: none; max-width: 300px" class="dialog">
<p style="font-style: italic; color: red; font-weight: bold">Warning! This operation is destructive and irreversible. Don't forget to save your map!</p>
<table>
<tr>
<td>Points number</td>
<td>
<input
id="submapPointsInput"
autocomplete="off"
type="range"
min="1"
max="13"
value="4"
data-cells="10000"
oninput="document.getElementById('submapPointsOutput').value=cellsDensityConstants[+this.value]/1000 + 'K'; event.stopPropagation()"
/>
</td>
<td>
<output id="submapPointsOutput" style="color: #053305">10K</output>
</td>
</tr>
<tr>
<td>Shift</td>
<td colspan="2">
X: <input id="submapShiftX" autocomplete="off" min="0" size="4" value="0"/>
Y: <input id="submapShiftY" autocomplete="off" min="0" size="4" value="0"/>
</td>
</tr>
<tr>
<td>Rotate <i class="icon-cw"></i></td>
<td>
<input
id="submapRotationAngle"
autocomplete="off"
type="range"
min="0"
max="359"
value="0"
oninput="document.getElementById('submapRotationAngleOutput').value=+this.value + '°'"
/>
</td>
<td>
<output id="submapRotationAngleOutput" style="color: #053305">0°</output>
</td>
</tr>
<tr>
<td>Mirror</td>
<td colspan="2">
<input type="checkbox" class="checkbox" id="submapMirrorH" />
<label for="submapMirrorH" class="checkbox-label" >Horizontally</label>
&nbsp;
<input type="checkbox" class="checkbox" id="submapMirrorV" />
<label for="submapMirrorV" class="checkbox-label">Vertically</label>
</td>
</tr>
</table>
<div id="resampleDialog" style="display: none" class="dialog">
<p style="font-weight: bold">
This operation is destructive and irreversible. It will create a completely new map based on the current one. Don't forget to save the current project
as a .map file first!
</p>
<div style="display: grid; grid-template-columns: 2fr 3fr; grid-template-rows: repeat(4, 1fr); align-items: center; padding-left: 0.5em">
<div>Points number</div>
<div>
<input id="submapPointsInput" type="range" min="1" max="13" value="4" />
<output id="submapPointsOutputFormatted" style="color: #053305">10K</output>
</div>

<div>Shift</div>
<div>
<label>X: <input id="submapShiftX" type="number" min="0" size="4" value="0" /></label>
<label>Y: <input id="submapShiftY" type="number" min="0" size="4" value="0" /></label>
</div>

<div>Rotate</div>
<div>
<input id="submapAngleInput" type="range" min="0" max="359" value="0" />
<output id="submapAngleOutput">0</output>°
</div>

<div>Mirror</div>
<div>
<input type="checkbox" class="checkbox" id="submapMirrorH" />
<label for="submapMirrorH" class="checkbox-label">horizontally</label>
&nbsp;
<input type="checkbox" class="checkbox" id="submapMirrorV" />
<label for="submapMirrorV" class="checkbox-label">vertically</label>
</div>
</div>
</div>
<div id="submapOptionsDialog" style="display: none; max-width: 300px" class="dialog">
<p style="font-style: italic; color: red; font-weight: bold">
Warning! This operation is destructive and irreversible. Don't forget to save your original map!

<div id="submapOptionsDialog" style="display: none" class="dialog">
<p style="font-weight: bold">
This operation is destructive and irreversible. It will create a completely new map based on the current one. Don't forget to save the current project
as a .map file first!
</p>
<p><em>Settings to be changed:</em> Population rate, map pixel size.</p>
<p><em>Data to be copied:</em> Heightmap, Biome, Religion, Population, Precipitation, Cultures, States, Provinces, Regiments (military), Markers.</p>
<p><em>Data to be destroyed (regenerated):</em> Zones, Roads, Rivers (mostly regenerate at the same place).</p>
<p>Remapping Burgs (cities) may be imprecise, you will need to fix missing or wrongly mapped burgs manually.</p>
<p>Lock remapped items for:</p>
<div data-tip="Lock all markers copied from the original map.">

<p>Settings to be changed: population rate, map pixel size</p>
<p>Data to be copied: heightmap, biomes, religions, population, precipitation, cultures, states, provinces, military regiments</p>
<p>Data to be regenerated: zones, roads, rivers</p>
<p>Burgs may be remapped incorrectly, manual change is required</p>

<p>Keep data for:</p>
<div data-tip="Lock all markers copied from the original map">
<input id="submapLockMarkers" class="checkbox" type="checkbox" checked />
<label for="submapLockMarkers" class="checkbox-label">Markers</label>
</div>
<div data-tip="Lock all burgs copied from the original map.">
<div data-tip="Lock all burgs copied from the original map">
<input id="submapLockBurgs" class="checkbox" type="checkbox" checked />
<label for="submapLockBurgs" class="checkbox-label">Burgs (cities)</label>
<label for="submapLockBurgs" class="checkbox-label">Burgs</label>
</div>

<p>Extra / experimental features:</p>
<div data-tip="Rivers on the parent map errode land (helps to get similar river network.)">
<p>Experimental features:</p>
<div data-tip="Rivers on the parent map will errode land (helps to get similar river network)">
<input id="submapDepressRivers" class="checkbox" type="checkbox" />
<label for="submapDepressRivers" class="checkbox-label">Errode riverbeds.</label>
<label for="submapDepressRivers" class="checkbox-label">Errode riverbeds</label>
</div>
<div data-tip="Rescale styles (burg labels, emblem size) to match the new scale.">
<input id="submapRescaleStyles" class="checkbox" type="checkbox" checked/>
<label for="submapRescaleStyles" class="checkbox-label">Rescale Styles</label>
<div data-tip="Rescale styles (burg labels, emblem size) to match the new scale">
<input id="submapRescaleStyles" class="checkbox" type="checkbox" checked />
<label for="submapRescaleStyles" class="checkbox-label">Rescale styles</label>
</div>
<div data-tip="Move all existing towns to the 'largetown' burg group">
<input id="submapPromoteTowns" class="checkbox" type="checkbox" />
<label for="submapPromoteTowns" class="checkbox-label">Promote towns to largetowns</label>
</div>
<div data-tip="Add lakes in depressions. (Can be very slow on big landmasses!)">
<div data-tip="Add lakes in depressions (can be very slow on big landmasses)">
<input id="submapAddLakeInDepression" class="checkbox" type="checkbox" />
<label for="submapAddLakeInDepression" class="checkbox-label">Add lakes in depressions (slow)</label>
</div>
<hr />
</div>

<div id="alert" style="display: none" class="dialog">
Expand Down
6 changes: 3 additions & 3 deletions main.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// https://github.com/Azgaar/Fantasy-Map-Generator

"use strict";
const version = "1.732"; // generator version
const version = "1.8"; // generator version
document.title += " v" + version;

// switches to disable/enable logging features
Expand Down Expand Up @@ -458,15 +458,15 @@ function showWelcomeMessage() {
alertMessage.innerHTML = `The Fantasy Map Generator is updated up to version <strong>${version}</strong>.
This version is compatible with ${changelog}, loaded <i>.map</i> files will be auto-updated.
<ul><strong>Latest changes:</strong>
<li>Submap tool by Goteguru</li>
<li>Resample tool by Goteguru</li>
<li>Pre-defined heightmaps</li>
<li>Advanced notes editor</li>
<li>Zones editor: filter by type</li>
<li>Color picker: new hatchings</li>
<li>New style presets: Cyberpunk and Atlas</li>
<li>Burg temperature graph</li>
<li>4 new textures</li>
<li>Province capture logic rework</li>
<li>Button to release all provinces</li>
</ul>
<p>Join our ${discord} and ${reddit} to ask questions, share maps, discuss the Generator and Worlbuilding, report bugs and propose new features.</p>
Expand Down
2 changes: 1 addition & 1 deletion modules/submap.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -308,7 +308,7 @@ window.Submap = (function () {
if (options.lockMarkers) m.lock = true;
}
}
drawMarkers();
if (layerIsOn("toggleMarkers")) drawMarkers();

stage("Redraw emblems.");
drawEmblems();
Expand Down
42 changes: 25 additions & 17 deletions modules/ui/options.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -335,27 +335,35 @@ function copyMapURL() {
.catch(err => tip("Could not copy URL: " + err, false, "error", 5000));
}

const cellsDensityConstants = {
1: 1000,
2: 2000,
3: 5000,
4: 10000,
5: 20000,
6: 30000,
7: 40000,
8: 50000,
9: 60000,
10: 70000,
11: 80000,
12: 90000,
13: 100000,
const cellsDensityMap = {
1: 1000,
2: 2000,
3: 5000,
4: 10000,
5: 20000,
6: 30000,
7: 40000,
8: 50000,
9: 60000,
10: 70000,
11: 80000,
12: 90000,
13: 100000
};

function changeCellsDensity(value) {
const cells = value in cellsDensityConstants? cellsDensityConstants[value]: 1000;
const cells = cellsDensityMap[value] || 1000;
pointsInput.dataset.cells = cells;
pointsOutput_formatted.value = cells / 1000 + "K";
pointsOutput_formatted.style.color = cells > 50000 ? "#b12117" : cells !== 10000 ? "#dfdf12" : "#053305";
pointsOutputFormatted.value = getCellsDensityValue(cells);
pointsOutputFormatted.style.color = getCellsDensityColor(cells);
}

function getCellsDensityValue(cells) {
return cells / 1000 + "K";
}

function getCellsDensityColor(cells) {
return cells > 50000 ? "#b12117" : cells !== 10000 ? "#dfdf12" : "#053305";
}

function changeCultureSet() {
Expand Down
Loading

0 comments on commit e6dfab4

Please sign in to comment.