From 72d124d95d2ea790ada8d7e4aa8528322620a680 Mon Sep 17 00:00:00 2001 From: Azgaar Date: Thu, 23 Apr 2020 19:44:32 +0300 Subject: [PATCH] v1.4.01 --- icons.css | 3 +- index.css | 31 +--- index.html | 69 +++++++-- libs/jquery-ui.min.js | 2 +- libs/lineclip.js | 102 +++++++++++++ main.js | 153 ++++++++------------ modules/burgs-and-states.js | 18 +-- modules/military-generator.js | 25 ++-- modules/ocean-layers.js | 6 +- modules/save-and-load.js | 52 ++++++- modules/ui/battle-screen.js | 50 +++++++ modules/ui/biomes-editor.js | 2 + modules/ui/burg-editor.js | 30 +++- modules/ui/editors.js | 40 ++++++ modules/ui/general.js | 2 + modules/ui/heightmap-editor.js | 2 +- modules/ui/ice-editor.js | 105 ++++++++++++++ modules/ui/layers.js | 93 ++++++++---- modules/ui/markers-editor.js | 246 ++------------------------------ modules/ui/military-overview.js | 27 ++-- modules/ui/regiment-editor.js | 104 ++++++++------ modules/ui/style.js | 20 +-- modules/ui/tools.js | 9 +- modules/utils.js | 11 +- run_php_server.bat | 3 + upload.php | 6 + 26 files changed, 713 insertions(+), 498 deletions(-) create mode 100644 libs/lineclip.js create mode 100644 modules/ui/battle-screen.js create mode 100644 modules/ui/ice-editor.js create mode 100644 run_php_server.bat create mode 100644 upload.php diff --git a/icons.css b/icons.css index b3c0e074..45c212bc 100644 --- a/icons.css +++ b/icons.css @@ -263,4 +263,5 @@ margin-left: 1px; width: .6em; font-family: monospace; -} \ No newline at end of file +} +.icon-die:before {content:'🎲';} \ No newline at end of file diff --git a/index.css b/index.css index ffe0ca04..1d538f85 100644 --- a/index.css +++ b/index.css @@ -60,13 +60,6 @@ textarea { pointer-events: none; } -#preview { - position: absolute; - bottom: 1em; - left: 1em; - cursor: pointer; -} - #pickerContainer { position: absolute; z-index: 100; @@ -101,7 +94,7 @@ button, select, a, .pointer { fill-rule: evenodd; } -#lakes, #coastline, #armies { +#lakes, #coastline, #armies, #ice { cursor: pointer; } @@ -1151,6 +1144,7 @@ div.slider .ui-slider-handle { .table { max-height: 75vh; + max-width: 75vw; overflow-x: hidden; overflow-y: auto; } @@ -1657,7 +1651,6 @@ rect.fillRect { #militaryOptionsTable input { width: 9em; - padding-left: 3px; border: 1px solid #d4d4d4; } @@ -1760,24 +1753,6 @@ div.textual span, .textual legend { vertical-align: top; } -#markerIconTable { - font-size: 1.6em; - cursor: pointer; -} - -#markerIconTable td:hover { - transition: .1s; - color: #3c3ca9; -} - -#markerIconTable td:active { - transform: translate(0px, 1px); -} - -#markerIconTable td.selected { - outline: 1px solid #9b9b9b; -} - .highlighted { outline-width: 2px; outline-style: dashed; @@ -2025,7 +2000,7 @@ svg.button { left: 50%; top: 50%; transform: translate(-50%, -50%); - max-width: 21em; + max-width: 22em; background-color: #fff; padding: 1.2em; border: solid 1px #000; diff --git a/index.html b/index.html index 7117c6c0..c3b0d294 100644 --- a/index.html +++ b/index.html @@ -34,11 +34,11 @@ #loading-text span:nth-child(3), #mapOverlay > span:nth-child(3) {animation-delay: 2s;} @keyframes blink {0% {opacity: 0;} 20% {opacity: 1;} 100% {opacity: .1;}} - - + + - - + + @@ -899,7 +899,7 @@
Azgaar's
Fantasy Map Generator
-
v. 1.3
+
v. 1.4

LOADING...

@@ -960,6 +960,7 @@
  • Routes
  • Temperature
  • Population
  • +
  • Ice
  • Precipitation
  • Labels
  • Icons
  • @@ -1002,6 +1003,7 @@ + @@ -1022,7 +1024,6 @@ - @@ -1857,6 +1858,7 @@ + @@ -2160,6 +2162,14 @@ + + + +