diff --git a/index.html b/index.html
index f4c8c17c..d7a60bc6 100644
--- a/index.html
+++ b/index.html
@@ -1256,10 +1256,6 @@
| Halo width |
@@ -7878,7 +7874,7 @@
-
+
diff --git a/modules/ui/stylePresets.js b/modules/ui/stylePresets.js
index 7353b067..20e1612c 100644
--- a/modules/ui/stylePresets.js
+++ b/modules/ui/stylePresets.js
@@ -1,14 +1,27 @@
// UI module to control the style presets
"use strict";
-const systemPresets = ["default", "ancient", "gloom", "light", "watercolor", "clean", "atlas", "cyberpunk", "monochrome"];
+const systemPresets = [
+ "default",
+ "ancient",
+ "gloom",
+ "pale",
+ "light",
+ "watercolor",
+ "clean",
+ "atlas",
+ "cyberpunk",
+ "monochrome"
+];
const customPresetPrefix = "fmgStyle_";
// add style presets to list
{
const systemOptions = systemPresets.map(styleName => ``);
const storedStyles = Object.keys(localStorage).filter(key => key.startsWith(customPresetPrefix));
- const customOptions = storedStyles.map(styleName => ``);
+ const customOptions = storedStyles.map(
+ styleName => ``
+ );
const options = systemOptions.join("") + customOptions.join("");
document.getElementById("stylePreset").innerHTML = options;
}
@@ -37,7 +50,8 @@ async function getStylePreset(desiredPreset) {
const isValid = JSON.isValid(storedStyleJSON);
if (isValid) return [desiredPreset, JSON.parse(storedStyleJSON)];
- ERROR && console.error(`Custom style ${desiredPreset} stored in localStorage is not valid. Applying default style`);
+ ERROR &&
+ console.error(`Custom style ${desiredPreset} stored in localStorage is not valid. Applying default style`);
presetToLoad = "default";
}
}
@@ -145,8 +159,31 @@ function addStylePreset() {
"#stateBorders": ["opacity", "stroke", "stroke-width", "stroke-dasharray", "stroke-linecap", "filter"],
"#provinceBorders": ["opacity", "stroke", "stroke-width", "stroke-dasharray", "stroke-linecap", "filter"],
"#cells": ["opacity", "stroke", "stroke-width", "filter", "mask"],
- "#gridOverlay": ["opacity", "scale", "dx", "dy", "type", "stroke", "stroke-width", "stroke-dasharray", "stroke-linecap", "transform", "filter", "mask"],
- "#coordinates": ["opacity", "data-size", "font-size", "stroke", "stroke-width", "stroke-dasharray", "stroke-linecap", "filter", "mask"],
+ "#gridOverlay": [
+ "opacity",
+ "scale",
+ "dx",
+ "dy",
+ "type",
+ "stroke",
+ "stroke-width",
+ "stroke-dasharray",
+ "stroke-linecap",
+ "transform",
+ "filter",
+ "mask"
+ ],
+ "#coordinates": [
+ "opacity",
+ "data-size",
+ "font-size",
+ "stroke",
+ "stroke-width",
+ "stroke-dasharray",
+ "stroke-linecap",
+ "filter",
+ "mask"
+ ],
"#compass": ["opacity", "transform", "filter", "mask", "shape-rendering"],
"#rose": ["transform"],
"#relig": ["opacity", "stroke", "stroke-width", "filter"],
@@ -174,7 +211,17 @@ function addStylePreset() {
"#statesBody": ["opacity", "filter"],
"#statesHalo": ["opacity", "data-width", "stroke-width", "filter"],
"#provs": ["opacity", "fill", "font-size", "font-family", "filter"],
- "#temperature": ["opacity", "font-size", "fill", "fill-opacity", "stroke", "stroke-width", "stroke-dasharray", "stroke-linecap", "filter"],
+ "#temperature": [
+ "opacity",
+ "font-size",
+ "fill",
+ "fill-opacity",
+ "stroke",
+ "stroke-width",
+ "stroke-dasharray",
+ "stroke-linecap",
+ "filter"
+ ],
"#ice": ["opacity", "fill", "stroke", "stroke-width", "filter"],
"#emblems": ["opacity", "stroke-width", "filter"],
"#texture": ["opacity", "filter", "mask"],
@@ -184,16 +231,65 @@ function addStylePreset() {
"#oceanBase": ["fill"],
"#oceanicPattern": ["href", "opacity"],
"#terrs": ["opacity", "scheme", "terracing", "skip", "relax", "curve", "filter", "mask"],
- "#legend": ["data-size", "font-size", "font-family", "stroke", "stroke-width", "stroke-dasharray", "stroke-linecap", "data-x", "data-y", "data-columns"],
+ "#legend": [
+ "data-size",
+ "font-size",
+ "font-family",
+ "stroke",
+ "stroke-width",
+ "stroke-dasharray",
+ "stroke-linecap",
+ "data-x",
+ "data-y",
+ "data-columns"
+ ],
"#legendBox": ["fill", "fill-opacity"],
"#burgLabels > #cities": ["opacity", "fill", "text-shadow", "data-size", "font-size", "font-family"],
- "#burgIcons > #cities": ["opacity", "fill", "fill-opacity", "size", "stroke", "stroke-width", "stroke-dasharray", "stroke-linecap"],
+ "#burgIcons > #cities": [
+ "opacity",
+ "fill",
+ "fill-opacity",
+ "size",
+ "stroke",
+ "stroke-width",
+ "stroke-dasharray",
+ "stroke-linecap"
+ ],
"#anchors > #cities": ["opacity", "fill", "size", "stroke", "stroke-width"],
"#burgLabels > #towns": ["opacity", "fill", "text-shadow", "data-size", "font-size", "font-family"],
- "#burgIcons > #towns": ["opacity", "fill", "fill-opacity", "size", "stroke", "stroke-width", "stroke-dasharray", "stroke-linecap"],
+ "#burgIcons > #towns": [
+ "opacity",
+ "fill",
+ "fill-opacity",
+ "size",
+ "stroke",
+ "stroke-width",
+ "stroke-dasharray",
+ "stroke-linecap"
+ ],
"#anchors > #towns": ["opacity", "fill", "size", "stroke", "stroke-width"],
- "#labels > #states": ["opacity", "fill", "stroke", "stroke-width", "text-shadow", "data-size", "font-size", "font-family", "filter"],
- "#labels > #addedLabels": ["opacity", "fill", "stroke", "stroke-width", "text-shadow", "data-size", "font-size", "font-family", "filter"],
+ "#labels > #states": [
+ "opacity",
+ "fill",
+ "stroke",
+ "stroke-width",
+ "text-shadow",
+ "data-size",
+ "font-size",
+ "font-family",
+ "filter"
+ ],
+ "#labels > #addedLabels": [
+ "opacity",
+ "fill",
+ "stroke",
+ "stroke-width",
+ "text-shadow",
+ "data-size",
+ "font-size",
+ "font-family",
+ "filter"
+ ],
"#fogging": ["opacity", "fill", "filter"]
};
@@ -238,7 +334,8 @@ function addStylePreset() {
if (!styleJSON) return tip("Please provide a style JSON", false, "error");
if (!JSON.isValid(styleJSON)) return tip("JSON string is not valid, please check the format", false, "error");
if (!desiredName) return tip("Please provide a preset name", false, "error");
- if (styleSaverTip.innerHTML === "default") return tip("You cannot overwrite default preset, please change the name", false, "error");
+ if (styleSaverTip.innerHTML === "default")
+ return tip("You cannot overwrite default preset, please change the name", false, "error");
const presetName = customPresetPrefix + desiredName;
applyOption(stylePreset, presetName, desiredName + " [custom]");
diff --git a/styles/light.json b/styles/light.json
index 5663d6c8..fb9b838c 100644
--- a/styles/light.json
+++ b/styles/light.json
@@ -192,18 +192,18 @@
"filter": null
},
"#roads": {
- "opacity": 0.9,
- "stroke": "#3c1d0b",
- "stroke-width": 1.37,
+ "opacity": 0.8,
+ "stroke": "#95481a",
+ "stroke-width": 0.8,
"stroke-dasharray": 2,
"stroke-linecap": "inherit",
"filter": null,
"mask": null
},
"#trails": {
- "opacity": 0.9,
+ "opacity": 0.8,
"stroke": "#95481a",
- "stroke-width": 0.88,
+ "stroke-width": 0.5,
"stroke-dasharray": ".8 1.6",
"stroke-linecap": "butt",
"filter": null,
diff --git a/styles/pale.json b/styles/pale.json
new file mode 100644
index 00000000..e6acdafd
--- /dev/null
+++ b/styles/pale.json
@@ -0,0 +1,389 @@
+{
+ "#map": {
+ "background-color": "#000000",
+ "filter": null,
+ "data-filter": null
+ },
+ "#armies": {
+ "font-size": 9,
+ "box-size": 4.5,
+ "stroke": "#000",
+ "stroke-width": 0,
+ "fill-opacity": 1,
+ "filter": "url(#dropShadow05)"
+ },
+ "#biomes": {
+ "opacity": 0.6,
+ "filter": null,
+ "mask": "url(#land)"
+ },
+ "#stateBorders": {
+ "opacity": 0.6,
+ "stroke": "#4c483e",
+ "stroke-width": 0.8,
+ "stroke-dasharray": "1 2.5",
+ "stroke-linecap": "square",
+ "filter": null
+ },
+ "#provinceBorders": {
+ "opacity": 0.6,
+ "stroke": "#56566d",
+ "stroke-width": 0.2,
+ "stroke-dasharray": 0.5,
+ "stroke-linecap": "butt",
+ "filter": null
+ },
+ "#cells": {
+ "opacity": null,
+ "stroke": "#808080",
+ "stroke-width": 0.1,
+ "filter": null,
+ "mask": null
+ },
+ "#gridOverlay": {
+ "opacity": 0.5,
+ "scale": 1,
+ "dx": 0,
+ "dy": 0,
+ "type": "pointyHex",
+ "stroke": "#808080",
+ "stroke-width": 1,
+ "stroke-dasharray": null,
+ "stroke-linecap": null,
+ "transform": null,
+ "filter": null,
+ "mask": null
+ },
+ "#coordinates": {
+ "opacity": 0.7,
+ "data-size": 15,
+ "font-size": 15,
+ "stroke": "#734d37",
+ "stroke-width": 1.5,
+ "stroke-dasharray": 5,
+ "stroke-linecap": "square",
+ "filter": null,
+ "mask": ""
+ },
+ "#compass": {
+ "opacity": 0.6,
+ "transform": null,
+ "filter": null,
+ "mask": "url(#water)",
+ "shape-rendering": "optimizespeed"
+ },
+ "#rose": {
+ "transform": null
+ },
+ "#relig": {
+ "opacity": 0.5,
+ "stroke": null,
+ "stroke-width": 0,
+ "filter": null
+ },
+ "#cults": {
+ "opacity": 0.5,
+ "stroke": "#777777",
+ "stroke-width": 0,
+ "stroke-dasharray": null,
+ "stroke-linecap": null,
+ "filter": null
+ },
+ "#landmass": {
+ "opacity": 1,
+ "fill": "#f4f2f0",
+ "filter": null
+ },
+ "#markers": {
+ "opacity": null,
+ "rescale": 1,
+ "filter": null
+ },
+ "#prec": {
+ "opacity": null,
+ "stroke": "#000000",
+ "stroke-width": 0.1,
+ "fill": "#2554ef",
+ "filter": null
+ },
+ "#population": {
+ "opacity": null,
+ "stroke-width": 1.6,
+ "stroke-dasharray": null,
+ "stroke-linecap": "butt",
+ "filter": null
+ },
+ "#rural": {
+ "stroke": "#0000ff"
+ },
+ "#urban": {
+ "stroke": "#ff0000"
+ },
+ "#freshwater": {
+ "opacity": 0.8,
+ "fill": "#98b6cd",
+ "stroke": "#718798",
+ "stroke-width": 0.5,
+ "filter": "url(#dropShadow05)"
+ },
+ "#salt": {
+ "opacity": 0.5,
+ "fill": "#409b8a",
+ "stroke": "#388985",
+ "stroke-width": 0.7,
+ "filter": null
+ },
+ "#sinkhole": {
+ "opacity": 1,
+ "fill": "#5bc9fd",
+ "stroke": "#53a3b0",
+ "stroke-width": 0.7,
+ "filter": null
+ },
+ "#frozen": {
+ "opacity": 0.95,
+ "fill": "#cdd4e7",
+ "stroke": "#cfe0eb",
+ "stroke-width": 0,
+ "filter": null
+ },
+ "#lava": {
+ "opacity": 0.7,
+ "fill": "#90270d",
+ "stroke": "#f93e0c",
+ "stroke-width": 2,
+ "filter": "url(#crumpled)"
+ },
+ "#dry": {
+ "opacity": 1,
+ "fill": "#c9bfa7",
+ "stroke": "#8e816f",
+ "stroke-width": 0.7,
+ "filter": null
+ },
+ "#sea_island": {
+ "opacity": 1,
+ "stroke": "#242424",
+ "stroke-width": 0.1,
+ "filter": "url(#dropShadow)",
+ "auto-filter": 1
+ },
+ "#lake_island": {
+ "opacity": 1,
+ "stroke": "#7c8eaf",
+ "stroke-width": 0.1,
+ "filter": null
+ },
+ "#terrain": {
+ "opacity": 0.8,
+ "set": "simple",
+ "size": 0.7,
+ "density": 0.3,
+ "filter": null,
+ "mask": ""
+ },
+ "#rivers": {
+ "opacity": 1,
+ "filter": null,
+ "fill": "#6dabba"
+ },
+ "#ruler": {
+ "opacity": null,
+ "filter": null
+ },
+ "#roads": {
+ "opacity": 0.9,
+ "stroke": "#d06324",
+ "stroke-width": 0.6,
+ "stroke-dasharray": "1 2",
+ "stroke-linecap": "round",
+ "filter": null,
+ "mask": null
+ },
+ "#trails": {
+ "opacity": 0.9,
+ "stroke": "#d06324",
+ "stroke-width": 0.5,
+ "stroke-dasharray": ".5 2",
+ "stroke-linecap": "round",
+ "filter": null,
+ "mask": null
+ },
+ "#searoutes": {
+ "opacity": 1,
+ "stroke": "#e5edff",
+ "stroke-width": 0.5,
+ "stroke-dasharray": "2 3",
+ "stroke-linecap": "round",
+ "filter": null,
+ "mask": null
+ },
+ "#statesBody": {
+ "opacity": 0.15,
+ "filter": null
+ },
+ "#statesHalo": {
+ "opacity": 0.3,
+ "data-width": 10,
+ "stroke-width": 10,
+ "filter": "blur(3.5px)"
+ },
+ "#provs": {
+ "opacity": 0.4,
+ "fill": "#000000",
+ "font-size": 8,
+ "font-family": "Arima Madurai",
+ "filter": null
+ },
+ "#temperature": {
+ "opacity": null,
+ "font-size": "8px",
+ "fill": "#000000",
+ "fill-opacity": 0.3,
+ "stroke": null,
+ "stroke-width": 1.8,
+ "stroke-dasharray": null,
+ "stroke-linecap": null,
+ "filter": null
+ },
+ "#ice": {
+ "opacity": 0.9,
+ "fill": "#e8f0f6",
+ "stroke": "#e8f0f6",
+ "stroke-width": 0.1,
+ "filter": "url(#dropShadow05)"
+ },
+ "#emblems": {
+ "opacity": 0.9,
+ "stroke-width": 1,
+ "filter": null
+ },
+ "#texture": {
+ "opacity": 0.39,
+ "filter": null,
+ "mask": "url(#land)"
+ },
+ "#textureImage": {
+ "x": 0,
+ "y": 0
+ },
+ "#zones": {
+ "opacity": 0.6,
+ "stroke": "#333333",
+ "stroke-width": 0,
+ "stroke-dasharray": null,
+ "stroke-linecap": "butt",
+ "filter": null,
+ "mask": null
+ },
+ "#oceanLayers": {
+ "filter": "url(#dropShadow05)",
+ "layers": "-6,-3,-1"
+ },
+ "#oceanBase": {
+ "fill": "#7ca4b6"
+ },
+ "#oceanicPattern": {
+ "href": "./images/kiwiroo.png",
+ "opacity": 0.3
+ },
+ "#terrs": {
+ "opacity": 0.7,
+ "scheme": "bright",
+ "terracing": 0,
+ "skip": 2,
+ "relax": 1,
+ "curve": 0,
+ "filter": "",
+ "mask": "url(#land)"
+ },
+ "#legend": {
+ "data-size": 13,
+ "font-size": 13,
+ "font-family": "Arima Madurai",
+ "stroke": "#812929",
+ "stroke-width": 2.5,
+ "stroke-dasharray": "0 4 10 4",
+ "stroke-linecap": "round",
+ "data-x": 54.73,
+ "data-y": 62.98,
+ "data-columns": 8
+ },
+ "#burgLabels > #cities": {
+ "opacity": 0.8,
+ "fill": "#3a3a3a",
+ "text-shadow": "white 0px 0px 4px",
+ "data-size": 7,
+ "font-size": 7,
+ "font-family": "Arima Madurai"
+ },
+ "#burgIcons > #cities": {
+ "opacity": 1,
+ "fill": "#ffffff",
+ "fill-opacity": 0.7,
+ "size": 1.5,
+ "stroke": "#4f4f4f",
+ "stroke-width": 0.2,
+ "stroke-dasharray": "",
+ "stroke-linecap": "butt"
+ },
+ "#anchors > #cities": {
+ "opacity": 1,
+ "fill": "#ffffff",
+ "size": 3,
+ "stroke": "#3e3e4b",
+ "stroke-width": 1.2
+ },
+ "#burgLabels > #towns": {
+ "opacity": 0.8,
+ "fill": "#3e3e4b",
+ "text-shadow": "white 0px 0px 4px",
+ "data-size": 4,
+ "font-size": 4,
+ "font-family": "Arima Madurai"
+ },
+ "#burgIcons > #towns": {
+ "opacity": 1,
+ "fill": "#ffffff",
+ "fill-opacity": 0.7,
+ "size": 0.6,
+ "stroke": "#4f4f4f",
+ "stroke-width": 0.12,
+ "stroke-dasharray": "",
+ "stroke-linecap": "butt"
+ },
+ "#anchors > #towns": {
+ "opacity": 1,
+ "fill": "#ffffff",
+ "size": 1.2,
+ "stroke": "#3e3e4b",
+ "stroke-width": 1
+ },
+ "#labels > #states": {
+ "opacity": 0.8,
+ "fill": "#3e3e3e",
+ "stroke": "#000000",
+ "stroke-width": 0,
+ "text-shadow": "white 0px 0px 6px",
+ "data-size": 14,
+ "font-size": 14,
+ "font-family": "Arima Madurai",
+ "filter": null
+ },
+ "#labels > #addedLabels": {
+ "opacity": 1,
+ "fill": "#f24706",
+ "stroke": "#701b05",
+ "stroke-width": 0.1,
+ "text-shadow": "white 0px 0px 4px",
+ "data-size": 6,
+ "font-size": 6,
+ "font-family": "Arima Madurai",
+ "filter": null
+ },
+ "#fogging": {
+ "opacity": 1,
+ "fill": "#30426f",
+ "filter": null
+ }
+}
diff --git a/versioning.js b/versioning.js
index e2c38363..70a25bdb 100644
--- a/versioning.js
+++ b/versioning.js
@@ -1,7 +1,7 @@
"use strict";
// version and caching control
-const version = "1.89.10"; // generator version, update each time
+const version = "1.89.11"; // generator version, update each time
{
document.title += " v" + version;
|