Commit graph

777 commits

Author SHA1 Message Date
Gergely Mészáros, Ph.D
4b10b60c69
fix concurency issue at load (#762) 2022-03-30 21:14:51 +03:00
Azgaar
8473b9ed01 update supporters 2022-03-19 20:04:06 +03:00
Azgaar
fc971e4902 rivers: if points data is wrong, ignore points 2022-03-19 20:03:16 +03:00
Azgaar
ab3c8c9e04 Merge branch 'master' of https://github.com/Azgaar/Fantasy-Map-Generator 2022-03-18 23:13:19 +03:00
Azgaar
94871b21bc remove premium tinymce tools 2022-03-18 23:13:14 +03:00
evolvedexperiment
d19ea0896d
Old World template by ReneHP (#758) 2022-03-15 11:50:48 +03:00
Azgaar
bc02850cf7 split array to separate functions 2022-03-07 22:59:43 +03:00
Basile Clement
edfcad4e8c
Generate a legend for manually added markers (#753)
Markers added by procedural generation have custom notes depending on
the type of marker (e.g. dungeons have a procedurally generated map);
however, the notes for markers manually added by the user are empty.

This patch separates the cell selection logic from the legend and name
generation logic in markers-generator.js, so that the latter can be
shared with manually added markers.  There is some additional
simplifications such as storing the dx/dy/px/min/each values directly in
the markers table to simplify the writing of the generic "list and add"
loop in `generateTypes()`.

Currently, the legend is only generated when adding a marker of the same
type as an existing marker, and only when a legend generation function
is available for that type.  To generate a marker of a type that is not
currently present on the map, one must first change the type field of an
existing marker (which will not get a procedural note), then use "Add
additional marker of that type".  The UI for this can be improved later.

Co-authored-by: Basile Clement <basile-github@clement.pm>
2022-03-07 22:29:08 +03:00
Azgaar
8b3b64626f fix scaleBar change 2022-02-23 23:34:31 +03:00
Azgaar
c2ceb227ad select template correctly 2022-02-23 22:14:25 +03:00
Azgaar
395a7c28a9 Merge branch 'master' of https://github.com/Azgaar/Fantasy-Map-Generator 2022-02-23 10:40:47 +03:00
Azgaar
d51ec465ac supporters update 2022-02-23 10:40:44 +03:00
juacom99
e1b0688615
Fix Height Map preview download image size (#746) 2022-02-21 23:32:06 +03:00
Azgaar
4978db4d1e increase number of states by default 2022-02-19 22:28:03 +03:00
Azgaar
5b6ec0cc2e set size for pre-defined maps 2022-02-19 21:18:02 +03:00
Azgaar
7f13f1c367 predefined-heightmaps 2022-02-19 19:29:05 +03:00
Azgaar
389df14cef supporters update 2022-02-15 23:58:54 +03:00
Azgaar
0c6f98070e notes editor - add separator 2022-02-15 00:15:42 +03:00
Azgaar
00f8a62c3b notes - disallow iframe actions 2022-02-15 00:10:55 +03:00
Azgaar
3c72a2908d notes editor - reorganize buttons 2022-02-14 23:56:28 +03:00
Azgaar
b970ea12ad notes editor - dynamically load 'tiny' script 2022-02-14 23:53:15 +03:00
Azgaar
fe8457ac4c notes editor - use tiny cloud editor 2022-02-14 22:51:31 +03:00
Azgaar
ff669fca50 round numbers 2022-02-12 21:37:06 +03:00
Azgaar
02f36de6d9 type fix + supporters update 2022-02-11 21:52:30 +03:00
Azgaar
b151e95bc7 supporters update 2022-02-08 10:15:00 +03:00
Azgaar
aee78071c6 dropbox - load script dynamically 2022-02-08 00:47:17 +03:00
Azgaar
8e480be704 load auto-update sctipt dynamically 2022-02-07 22:17:16 +03:00
Azgaar
ab5cb82390 zone editor - add type check on load 2022-02-07 00:24:34 +03:00
Azgaar
2c269d5d2c zone editor - hide filtered zone 2022-02-07 00:20:20 +03:00
Azgaar
f8d2719218 zone editor - filter by type 2022-02-07 00:05:04 +03:00
Azgaar
5acc3b156b zone editor - restore init state + type display 2022-02-06 23:36:44 +03:00
Ángel Montero Lamas
8e7ccbd50d
Zone filter (#728)
* Adding zone type dropdown to index.html

* added zone type filter to zones-editor.js

* zoneTypes dialog

add and delete types, dialog

* filtering types

* correct filter button and prompt

The filter button now works on click with an added zonesEditorAddLines(); on function toggleFilterTable().

If the table is empty, a message appears on a line giving advice.

* Amount of types and fixes

Fixed some spacing in zoneTypes dialog, and made a count for the amount of zones per type.

* Minor changes for zone types

* dialog for types on a button

New button for the zone Types dialog.

* typo in index.html

* update on click add type

Co-authored-by: Evolvedexperiment <evolvedexperiment@gmail.com>
Co-authored-by: Azgaar <maxganiev@yandex.ru>
2022-02-06 23:09:30 +03:00
Azgaar
451cd60d4d add only used hatchings on export 2022-02-06 22:38:58 +03:00
Ángel Montero Lamas
81f037004c
Color picker hatches 14-60 (#726)
* Color picker hatches 14-60

Added hatches to number 14 to 60.
Updated the code of the color picker to accept multiples rows of hatches.

Changed the size of fillRectPointer from 0.9 em to 1.5 em.

Added an Update code to upgrade maps to 1.72 to have a grid of 60 svg hatches. Without the update, loaded files appeared with the rectangles for hatches 14-60 empty.

* Hatches ordered

Reworked the code to put back rows of 14 hatches. Reordered the first 14 hatches to defaault.
Made 3 rows, so 42 hatches.

* Cleaned code and fixes

Cleaned </pattern> in index.html line 152.
Put back: width=".9em" height=".9em" style="margin-bottom:-1px"> for fill.

* mouseover hatches

Fixed some typos. Changed mousemove for mouseover and moved the calling of the function tip from the each function to the original place at 519.
The arrow function changed to one that tells the id.

* Copies hatching from defElements into map svg, and hatching removed from saved map files.

* Removed haching completely from map svg

* Hatching copy for clone is now done before unused pattern removal

* Added back code that removes the unused hatching group

Co-authored-by: Evolvedexperiment <evolvedexperiment@gmail.com>
Co-authored-by: Azgaar <maxganiev@yandex.ru>
2022-02-06 21:56:16 +03:00
Azgaar
8537cb1c76 altas style by LordGnome 2022-02-06 21:45:00 +03:00
Azgaar
5428a058c8 hotfix: change path - relative 2022-02-06 03:08:35 +03:00
Azgaar
040244a186 hotfix: change path 2022-02-06 02:36:04 +03:00
Azgaar
70b1086c50 upload old saved styles 2022-02-06 01:20:08 +03:00
Azgaar
37598994cb dissalow local run 2022-02-06 01:04:11 +03:00
Azgaar
8c41639839 style creator rework 2022-02-05 23:05:35 +03:00
Azgaar
49a8a9f7c7 style - fetch local json files 2022-02-05 21:23:10 +03:00
Azgaar
79c1e2abd9 new style - styleCyberpunk 2022-02-05 19:19:49 +03:00
Azgaar
b414bae705 supporters update 2022-02-05 17:46:42 +03:00
Azgaar
65409a9d97 set width to auto 2022-02-05 17:13:54 +03:00
Azgaar
6abed0cdf4 burg temperature graph - UI and data corrections 2022-02-05 16:54:59 +03:00
Azgaar
d99c24e0de burg temperature graph - clean up 2022-02-04 01:40:41 +03:00
Azgaar
6beb262e91 burg temperature graph - clean up 2022-02-04 01:33:11 +03:00
Azgaar
5f0be0401e burg temperature graph - corrections 2022-02-04 00:13:10 +03:00
Ilia Pushkin
ccb75570da
Graph of temperature changes for the year in the burg (#733)
* Option for exporting grid cell (#731)

* Added Save Option for Api-like json export.
Will be updated and set to a scheme

* Save Option for Api-like added

* Moved UI of json export to export dialog.
Moved json export to another file named export-json.js

* Added Seperated json export selections
- all JSON : exports all json data.
- minimal JSON : exports json data without cells data.
- cells JSON : exports json data only with pack.cells data.

* More Stable Cell Export...

* Grid cells export option.

* Graph of temperature changes for the year in the burg

I'm bad at writing in English. Please excuse me for this.
It seems illogical to me the parameter of the average temperature for the year in the burg.
Therefore, I found a database of meteorological measurements at https://ru.climate-data.org/
And I analyzed it. With the help of a neural network. I approximately established the dependence of Dy[X] and Dd[X], Md[X] = f(t,p,l).
Dy[X] - how much the temperature in winter differs from the temperature in summer
Md[X] - how much the temperature during the day differs from the temperature at night, on average per year
Dd[X] - how much the temperature difference between day and night is not constant in winter and summer
t - average temperature for the year
p - average rainfall for the year
l - latitude
Now, for each city, you can plot the temperature change. Based on t,p and l.

ATTENTION!!!
The characteristics of the planet and its orbit coincide with those of the earth!

Further, I will use the Russian language, if you want to know my reasoning, please use the Google Translate capabilities.

Я изменил свою первоначальную идею и доработал её. Что касается качества и используемых функций - жду критики. JavaScript - не знакомый мне язык и я не уверен, что выполнил всё верно.
Что касается самой идеи - её реализация пока далека от совершенства. Я понял, что если установить в настройках мира температуру на экваторе ниже, чем на Земле, то графики получаются слишком далекими от реальности. Эта ошибка связана с тем, что Dy[X] зависит от широты, а не среднегодовой температуры. К сожалению добиться хорошей сходимости удалось только расширением нейросети - ещё больше магических чисел.
Теперь, на основе прошлой выборки из 899 городов, попущенных через нейросеть миллион раз среднеквадратичная ошибка стала 3%.
Входными данными для сети являются широта и влажность, а средняя температура иcпользуется только как ориентир при построении графиков.

* Add legnd in graph

* Editing Coefficients

The coefficients have been changed so that the sign of the latitude does not affect the result

Co-authored-by: Efruz Yıldırır <30903352+yldrefruz@users.noreply.github.com>
2022-02-03 10:21:50 +03:00
Azgaar
3fe225e293 export json cleanup 2022-01-26 18:13:32 +03:00