diff --git a/LICENSE b/LICENSE index 45f950ac..4b0e677e 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ MIT License -Copyright 2017-2021 Max Haniyeu (Azgaar), azgaar.fmg@yandex.com +Copyright 2017-2024 Max Haniyeu (Azgaar), azgaar.fmg@yandex.com Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal @@ -14,6 +14,7 @@ copies or substantial portions of the Software. You can produce, without restrictions, any derivative works from the original software and even reap commercial benefits from the sale of the secondary product. +The derivates include created maps, map images, screenshots, videos, and other materials. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, @@ -21,4 +22,4 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. \ No newline at end of file +SOFTWARE. diff --git a/README.md b/README.md index efd8224e..3ab245b2 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,3 @@ -[![Stand With Ukraine](https://raw.githubusercontent.com/vshymanskyy/StandWithUkraine/main/badges/StandWithUkraine.svg)](https://stand-with-ukraine.pp.ua) - # Fantasy Map Generator Azgaar's _Fantasy Map Generator_ is a free web application that helps fantasy writers, game masters, and cartographers create and edit fantasy maps. @@ -8,19 +6,17 @@ Link: [azgaar.github.io/Fantasy-Map-Generator](https://azgaar.github.io/Fantasy- Refer to the [project wiki](https://github.com/Azgaar/Fantasy-Map-Generator/wiki) for guidance. The current progress is tracked in [Trello](https://trello.com/b/7x832DG4/fantasy-map-generator). Some details are covered in my old blog [_Fantasy Maps for fun and glory_](https://azgaar.wordpress.com). -[![preview](https://cdn.discordapp.com/attachments/587406457725779968/594840629213659136/preview1.png)](https://i.redd.it/8bf81ir2cy631.png) +[![preview](https://github.com/Azgaar/Fantasy-Map-Generator/assets/26469650/9502eae9-92e0-4d0d-9f17-a2ba4a565c01)](https://github.com/Azgaar/Fantasy-Map-Generator/assets/26469650/11a42446-4bd5-4526-9cb1-3ef97c868992) -[![preview](https://cdn.discordapp.com/attachments/587406457725779968/594840633911279636/preview2.png)](https://cdn.discordapp.com/attachments/515359185664344071/593888810782162964/The_Wichin_Island_sepia.png) +[![preview](https://github.com/Azgaar/Fantasy-Map-Generator/assets/26469650/e751a9e5-7986-4638-b8a9-362395ef7583)](https://github.com/Azgaar/Fantasy-Map-Generator/assets/26469650/e751a9e5-7986-4638-b8a9-362395ef7583) -[![preview](https://cdn.discordapp.com/attachments/587406457725779968/594840632296734720/preview3.png)](https://cdn.discordapp.com/attachments/515359096925454350/593891237984206848/The_Wichin_Island_-_diplomacy.png) +[![preview](https://github.com/Azgaar/Fantasy-Map-Generator/assets/26469650/b0d0efde-a0d1-4e80-8818-ea3dd83c2323)](https://github.com/Azgaar/Fantasy-Map-Generator/assets/26469650/b0d0efde-a0d1-4e80-8818-ea3dd83c2323) Join our [Discord server](https://discordapp.com/invite/X7E84HU) and [Reddit community](https://www.reddit.com/r/FantasyMapGenerator) to share your creations, discuss the Generator, suggest ideas and get the most recent updates. -Contact me via [email](mailto:azgaar.fmg@yandex.by) if you have non-public suggestions. For bug reports please use [GitHub issues](https://github.com/Azgaar/Fantasy-Map-Generator/issues) or _#bugs_ channel on Discord. If you are facing performance issues, please read [the tips](https://github.com/Azgaar/Fantasy-Map-Generator/wiki/Tips#performance-tips). +Contact me via [email](mailto:azgaar.fmg@yandex.com) if you have non-public suggestions. For bug reports please use [GitHub issues](https://github.com/Azgaar/Fantasy-Map-Generator/issues) or _#fmg-bugs_ channel on Discord. If you are facing performance issues, please read [the tips](https://github.com/Azgaar/Fantasy-Map-Generator/wiki/Tips#performance-tips). -Electron desktop application is available in [releases](https://github.com/Azgaar/Fantasy-Map-Generator/releases). Download archive for your architecture, unzip and run. - -Pull requests are highly welcomed. The codebase is messy and requires re-design, but I will appreciate if you start with minor changes. Check out the [data model](https://github.com/Azgaar/Fantasy-Map-Generator/wiki/Data-model) before contributing. +Pull requests are highly welcomed. The codebase is messy and requires re-design. I will appreciate if you start with minor changes. Check out the [data model](https://github.com/Azgaar/Fantasy-Map-Generator/wiki/Data-model) before contributing. You can support the project on [Patreon](https://www.patreon.com/azgaar). diff --git a/index.css b/index.css index 558728b7..555b650c 100644 --- a/index.css +++ b/index.css @@ -258,7 +258,6 @@ i.icon-lock { cursor: pointer; } -#routeEditor > *, #labelEditor div { display: inline-block; } @@ -437,6 +436,14 @@ button.options:hover { margin: 0.8em 0 0 0; } +#options .tip { + color: #444; + font-size: 0.9em; + font-family: sans-serif; + font-style: italic; + margin-left: 0.5em; +} + #aboutContent { text-align: justify; } @@ -734,7 +741,7 @@ input[type="color"]::-webkit-color-swatch-wrapper { background-color: var(--header-active); } -#toolsContent div { +#toolsContent > .grid { display: grid; grid-template-columns: repeat(4, 1fr); margin: 0.2em 0; @@ -758,7 +765,7 @@ input[type="color"]::-webkit-color-swatch-wrapper { #viewMode > button { padding: 0.35em; - margin: 0.2em 0.3em 0.6em 0.3em; + margin: 0.3em 0.3em 0.6em 0.3em; float: left; width: 30.7%; } @@ -1610,6 +1617,7 @@ div.states > .riverType { #burgBody > div > div, #riverBody > div, +#routeBody > div, #lakeBody > div { padding: 0.1em; } @@ -1617,6 +1625,7 @@ div.states > .riverType { #riverBody div.label, #riverBody input, #riverBody select, +#routeBody div.label, #lakeBody div.label, #lakeBody input, #lakeBody select { @@ -1624,6 +1633,12 @@ div.states > .riverType { width: 7em; } +#routeBody input, +#routeBody select { + display: inline-block; + width: 10em; +} + #stateNameEditor div.label, #provinceNameEditor div.label, #regimentBody div.label, @@ -1876,12 +1891,6 @@ div.editorLine { margin: 0.4em 0 0 -0.9em; } -#barBackColor { - width: 3.5em; - padding: 0px; - height: 1.2em; -} - #ruler { cursor: move; fill: none; @@ -1921,18 +1930,6 @@ div.editorLine { stroke: #737373; } -#scaleBar { - stroke: none; - fill: none; - cursor: pointer; -} - -#scaleBar text { - fill: #353540; - text-anchor: middle; - font-family: var(--serif); -} - #militaryOptionsTable select { border: 1px solid #d4d4d4; } @@ -2199,7 +2196,7 @@ svg.button { #worldControls input[type="number"] { border: 1px solid #e5e5e5; padding: 0px; - width: 3.2em; + width: 4em; } #worldControls i.icon-lock-open, @@ -2258,10 +2255,6 @@ svg.button { fill: blue; } -#globeOutline { - fill: url(#temperatureGradient); -} - #globeArea { fill: white; fill-opacity: 0.3; @@ -2272,6 +2265,11 @@ svg.button { stroke-width: 0.2; } +#globePrimeMeridian { + stroke: blue; + stroke-width: 1.4; +} + #globeEquator { stroke: red; stroke-width: 1.4; @@ -2393,6 +2391,29 @@ svg.button { background: #ccc; } +.separator { + display: flex; + align-items: center; + text-align: center; + + font-style: italic; + font-weight: bold; + color: #222; + margin: 0.8em 0 0 0; +} +.separator::before, +.separator::after { + content: ""; + flex: 1; + border-bottom: 1px solid #333; +} +.separator:not(:empty)::before { + margin-right: 0.25em; +} +.separator:not(:empty)::after { + margin-left: 0.25em; +} + @media print { div, canvas { diff --git a/index.html b/index.html index 7f1cbeb2..33c9e3d3 100644 --- a/index.html +++ b/index.html @@ -138,7 +138,7 @@ } - + @@ -366,7 +366,9 @@ - + + + @@ -378,7 +380,7 @@ - +
Azgaar's
@@ -467,9 +469,7 @@ onclick="removePreset()" > -

- Displayed layers and layers order: -

+

Displayed layers and layers order:

+
Click to toggle, drag to raise or lower the layer
+
Ctrl + click to edit layer style

View mode:

@@ -799,6 +802,7 @@ + @@ -824,6 +828,63 @@ + + + + + + + + + + Terracing + + + 0 + + + + + Reduce layers + + + 5 + + + + + Simplify line + + + 0 + + + + + Line style + + + + + + + Color scheme + + + + + + + Opacity @@ -1256,6 +1317,12 @@ - 0 - - - - - Reduce layers - - - 5 - - - - - Simplify line - - - 0 - - - - - Line style - - - - - - - Color scheme - - - - - - - Fill opacity @@ -1446,6 +1463,84 @@ + + + + Size + + Bar + + Font + + + + + + Position + + x + + y + + + + + + Label + + + + + + + Back opacity + + + + + + + + Back fill + + + + + + + + Back stroke + + + + + Width + + + + + + Back padding + + + + + + + + + + Back filter + + 10K @@ -1964,23 +2069,16 @@
-

Click to configure:

-
- +
Edit
+
- - - - - - - - -
- -

Click to overview:

-
- - - - + + + + + + +
-

Click to regenerate:

-
+
Regenerate
+
+ + + + - - - - - - - - - +
-

Click to add:

-
+
Add
+
- - + +
-

Click to create a new map:

-
+
Show
+
+ + +
+ +
Create
+
@@ -2219,8 +2327,7 @@

- Fantasy Map Generator is a - free + Fantasy Map Generator is an open source @@ -2239,7 +2346,7 @@

Join our Discord server and Reddit community to ask - questions, get help and share maps. + questions, get help and share maps. The created maps can be used for free, even for commercial purposes.

@@ -2437,15 +2544,15 @@

-
-
+ +
+
+ +
+ Presets: + + + + +
-
-
- See in City Generator by Watabou. -
- Seed: +
+
+ Burg preview: +
+
-
- +
@@ -3344,10 +3526,10 @@ - +
@@ -3372,7 +3554,7 @@
- + @@ -3496,7 +3678,7 @@
- + @@ -5057,6 +5263,8 @@ + +
@@ -5132,49 +5340,6 @@
-
- -
Scale bar:
-
- -
-
Bar size:
- - -
- -
-
Bar label:
- -
- -
-
Bar background:
- - -
- -
-
Bar position:
- x: y: -
-
Population:
@@ -5294,12 +5459,6 @@ Population
Type 
-
@@ -5347,6 +5506,47 @@
+ +