Commit graph

88 commits

Author SHA1 Message Date
Azgaar
05de284e02
Refactor layers rendering (#1120)
* feat: render states - use global fn

* feat: render states - separate pole detection from layer render

* feat: render provinces

* chore: unify drawFillWithGap

* refactor: drawIce

* refactor: drawBorders

* refactor: drawHeightmap

* refactor: drawTemperature

* refactor: drawBiomes

* refactor: drawPrec

* refactor: drawPrecipitation

* refactor: drawPopulation

* refactor: drawCells

* refactor: geColor

* refactor: drawMarkers

* refactor: drawScaleBar

* refactor: drawScaleBar

* refactor: drawMilitary

* refactor: pump version to 1.104.00

* refactor: pump version to 1.104.00

* refactor: drawCoastline and createDefaultRuler

* refactor: drawCoastline

* refactor: Features module start

* refactor: features - define distance fields

* feat: drawFeatures

* feat: drawIce don't hide

* feat: detect coastline - fix issue with border feature

* feat: separate labels rendering from generation process

* feat: auto-update and restore layers

* refactor - change layers

* refactor - sort layers

* fix: regenerate burgs to re-render layers

* fix: getColor is not defined

* fix: burgs overview - don't auto-show labels on hover

* fix: redraw population on change

* refactor: improve tooltip logic for burg labels and icons

* chore: pump version to 1.104.0

* fefactor: edit coastline and lake

* fix: minot fixes

* fix: submap

---------

Co-authored-by: Azgaar <azgaar.fmg@yandex.com>
2024-09-20 12:20:27 +02:00
Azgaar
d4aef4920c
Slider-input web component (#1109)
* feat: slider-input web component

* feat: slider-input web component - Brush size

* feat: slider-input - statesGrowthRate

* feat: slider-input - units editor

* feat: slider-input - dissalow invalid numbers

* chore: pump version to v1.99.05

* chore: pump version to v1.99.05

---------

Co-authored-by: Azgaar <azgaar.fmg@yandex.com>
2024-08-22 13:35:36 +02:00
Azgaar
f19b891421
Urquhart routes (#1072)
* feat: routes generation

* feat: routes rendering

* feat: searoutes fix, changing reGraph

* feat: searoute - change pathfinding algo

* feat: routes - cleanup code

* feat: routes - change data format

* feat: routes - add routes to json export

* feat: edit routes - start

* feat: edit routes - main

* feat: edit routes - EP

* feat: edit routes - remove route

* feat: route - generate names

* feat: route - continue

* Refactor route merging logic for improved performance

* feat: routes - show name in tooltip

* feat: routes - create route dialog

* feat: update data on control point remove

* feat: routes editor - split route

* feat: add join route functionality to routes editor

* feat: Add join route functionality to routes editor

* feat: Update join route tooltip in routes editor

* feat: routes overview - sort by length

* feat: routes overview - fix distanceScale value

* feat: routes overview - create route

* Refactor getMiddlePoint function to getCloseToEdgePoint

* feat: routes - change data format, fix issues

* feat: routes - regenerateRoutes

* feat: routes - add route on burg creation

* chore - remove merge conflict markers

* chore - remove merge conflict markers

* feat: routes name - no unnamed burg names

* feat: routes - lock routes

* fix: routes - split routes

* feat: routes - tip correction

* feat: routes - auto-update part 1

* feat: routes - return old rePacj logic to not break auto-update

* feat: routes - auto-update - add connections

---------

Co-authored-by: Azgaar <azgaar.fmg@yandex.com>
2024-08-15 15:46:55 +02:00
Azgaar
d1c09935a9 fix: regenerate burgs - remove burg notes, keep locked notes 2024-06-14 13:09:43 +02:00
Ruichka
36fba3329c
Fix regiments getting bugged when merging states (#1067)
* Fix military bug when merging states

* Update versioning to 1.97.06
2024-04-21 14:16:55 +04:00
Azgaar
d6c3c46a5e
feat: generate watabou preview links for villages (#1056)
Co-authored-by: Azgaar <azgaar.fmg@yandex.com>
2024-03-14 13:56:12 +04:00
Azgaar
1385354adc fix: icons - use textContent insteod of innerHTML to avoid Google translate issues 2024-03-04 21:40:32 +01:00
Azgaar
73b39d217d fix: #1048 2024-03-04 21:04:25 +01:00
Azgaar
14ac83e6f5 fix: uploadCulturesData 2024-02-28 00:16:07 +01:00
Azgaar
374c21b3d7
Ocean heightmap and Scale bar styling change [v1.96] (#1045)
* Scale bar styling (#1025)

* feat: style scale bar

* feat: style scale bar - style presets

---------

Co-authored-by: Azgaar <azgaar.fmg@yandex.com>

* Ocean heightmap to v1.96 (#1044)

* feat: allow to render ocean heightmap

* feat: allow to render ocean heightmap - test

* feat: allow to render ocean heightmap - fix issue

* feat: allow to render ocean heightmap - cleanup

---------

Co-authored-by: Azgaar <azgaar.fmg@yandex.com>

* fix: scale bar size

* fix: remove mask on terrs lavel

* fix: regenerate heigtmap preview to use current graph size

* Add the name of culture and namesbase in the name editor dialog (#1033)

* Add the name of culture and namesbase in the name editor dialog

Added the name of the culture and  namesbase in the dialog "name editor".
This tells information on the "click to generate a culture-specific name"
It tells you the culture before changing name.

* cultureName into cultureId + cultureName

And deleted the incomplete code of showing culture name on datatip

* refactor: leave culture name only

---------

Co-authored-by: Azgaar <azgaar.fmg@yandex.com>

* Added Burgs column to province editor (#1031)

* Added Burgs column to province editor

Added to province editor:
+ Burgs column
+ the number of Burgs, p.burgs.length
+ "icon-dot-circled" to go to overviewBurgs.
+ overviewBurgs Filtered by state id.
+ Fixed some typos.

* fixed code as Azgaar suggested

+ Corrected provincesHeader distance in em.
+ const stateId = pack.provinces[p].state;
- Deleted cell count.

* deleted HTML code for provincesFooter cells

- Deleted Total land cells number HTML from provincesFooter.

* deleting totalCells in the code, maybe i will add provinceCells in the future.

Deleted lines for const totalCells and for (+cells / totalCells) * 100 + "%";

* refactor: cleanup

* refactor: cleanup

---------

Co-authored-by: Azgaar <azgaar.fmg@yandex.com>

* fix: burgs overview - add MFCG link back

* feat: add more details to burgs export

* feat: don't show auto-update dialog

* feat: pump version

* fix: #1041

* feat: update style presets

---------

Co-authored-by: Azgaar <azgaar.fmg@yandex.com>
Co-authored-by: Ángel Montero Lamas <angel.montero1@gmail.com>
2024-02-24 19:12:48 +04:00
Azgaar
52e3088763 fix: cultures editor - don't overwrite border color on color change 2023-12-05 02:45:55 +04:00
Azgaar
2fd58e9d35 feat: click on burgs count to open the overview screen 2023-11-11 21:05:59 +04:00
Azgaar
87599d1530
State labels: new label placing algorithm (#977)
* feat: draw state labels start

* feat: update old .map files

* chore: update version hash

* fear: add change to the user's changelog
2023-08-11 18:56:42 +04:00
Azgaar
1d921c18af fix: (v1.91.00) 2023-08-08 15:25:28 +04:00
Azgaar
3f8ee8d740
Merge states (#962)
* feat: merge states

* chore: update version
2023-07-23 14:25:41 +04:00
Alexander James
47ef8d938b
Religions live update UX (#915)
* preparatory bugfixes

* restructure religion generator for extensibility

* Add culture-like update functions and UI

* Syntax / Typo

* PR Versioning

* Relig Editor UI: hide on brush, limit -> potential

* add / remove Culture creates / removes Folk religion

* Religions UX: stable abbr, Folk non-selectable type & not separately removed

* Folk religions follow cultures through regeneration; extinct religion centers draw, folk centers are immutable and do not

* style

* regenerate bugs fixing

* when cultures regenerate a different number

* ability to lock culture in a easy-defined set

fixes uncaught error in commit dada419 from PR #910

* what is locked folk?

* New Map ignores old locked things

* No auto-update of religion on culture regeneration

* typo

* Bugfixes

* Refactor toward modern style

* Prepare to lock - Further refactor

* Complete locked religions functionality

* Prepare for live updates

* Editors fixing + re-versioning

* Fix merge snafu

* Bugs, toungue-twisting

* indexing bugfix

* Manual Add prefers to create missing Folk

* Locked origin regen; deterministic expansion

* version update; fix add wild folk

---------

Co-authored-by: A C James <james.ander31@gmail.com>
Co-authored-by: Azgaar <maxganiev@yandex.ru>
2023-03-19 02:57:59 -07:00
Azgaar
e0ea578032 style(cultures editor): move regenerate burg names button closer to namesbase 2023-03-05 14:54:23 +04:00
Azgaar
d40cab2e28 fix: clean cultures on regeneration, v1.89.07 2023-02-19 18:11:07 +04:00
Azgaar
eb5d924cbd fix: state expansion to reset on re-generation 2023-02-05 00:49:05 +04:00
Azgaar
660316e4bf fix: culture data change must not ignore lock status 2023-01-22 22:37:18 +04:00
Azgaar
4ab0311d01 fix: hierarchy-tree - make sure nodes have parents not removed 2023-01-02 16:21:13 +03:00
Azgaar
a617dda3ad fix: cultures upload 2022-06-28 22:11:32 +03:00
Azgaar
6cd2419f10 feat(charts): remove on dialog close 2022-06-24 15:51:10 +03:00
Azgaar
03b556ae86 feat(charts): pump version to 1.87.00 2022-06-23 23:11:57 +03:00
Azgaar
434907fa9e feat(hierarchy tree): animate on update 2022-06-12 22:21:34 +03:00
Azgaar
6e5e570c90 feature(hierarchy tree): dynamically load, control dialog 2022-06-12 00:22:39 +03:00
Azgaar
182c6d558d fix: religions and cultures are not highlightable from editor 2022-06-08 21:12:31 +03:00
Azgaar
9215a01548 fix: religion editor toggles culture layer on 2022-06-08 11:53:30 +03:00
Azgaar
21390cf966 chore: update hash for cahnged files 2022-06-06 22:47:01 +03:00
Azgaar
221079321f refactor: load religions editor dynamically 2022-06-06 02:09:38 +03:00
Azgaar
1967dfe661 hotfix: check if states are loaded before refreshing 2022-06-01 02:31:30 +03:00
Azgaar
d5f202ba47 version info and hash update 2022-05-30 00:37:03 +03:00
Azgaar
77430e2dbe Merge branch 'master' of https://github.com/Azgaar/Fantasy-Map-Generator into shortcuts 2022-05-20 22:57:14 +03:00
Azgaar
2d8c5355bb load dynamically cultures editor 2022-05-19 00:19:24 +03:00
Azgaar
fc62143eae add functional shorthands 2022-05-17 22:34:14 +03:00
Azgaar
d488b68226 add listeners to sort by headers 2022-05-15 16:08:25 +03:00
Azgaar
4fcd62bb99 states-editor - dynamic module 2022-05-15 16:03:47 +03:00
Azgaar
aab27ca673 slightly optimize onZoom 2022-05-12 23:54:19 +03:00
Azgaar
02e0669282 Merge branch 'master' of https://github.com/Azgaar/Fantasy-Map-Generator 2022-05-08 19:22:19 +03:00
Azgaar
1573fad58d annotate template strings for syntax hightlight and format 2022-05-08 19:22:15 +03:00
Mészáros Gergely
f53d5810d5 FIX: avoid redirect at watabou 2022-05-07 18:43:47 +02:00
Gergely Mészáros, Ph.D
5703e62177
Dev submaps (#770)
* bioms shouldn't be masked or the style selection box is useless

* fix: misleading comment

* experimental submapping feature

* burg remapping

* Submap with options

* Fix: calculating absolute flux from precipitation normal-value.

* effective distanceScale

* updated resampler

* fix: missing cell

* Fix: River automatic rerender on regeneration.

* FIX: wrong culture migration

* fixed 0 index burg bug, more accurate coast detection for burgs

* FIX: wrong burg cell id

* fix invalid feature number at burg.ports, option to disable regenerations

* Relocate submap

* update height model and scale parameters

* new menu

* Dropbox OAuth implementation and Cloud framework

* add some space

* removing uneccesary logs, defer script load

* map position on planet, fix wrong riverbed generation

* fix:riverbed generation

* better cell sampler

* Auto-Smoothing,dist fix

* FIX: incorrect province copy and minor fix of rebels

* Cleanup

* FIX: water detection bug

* Recompute centers (states, cultures, provinces)

* activating forwardmap

* FIX: port burg relocation algo

* FIX: coast detection (for burgs)

* Fix: invalid html id

* add dot

* update for FMG 1.73

* Update submap gui

* refactored submap ui options

* Copy all visible military units from the old map.

* add info text

* Add Markers.deleteMarker API.

* Lock markers and lock burgs options

* better comment

* submapper gui updates, remove feature mapping on/off

* Fix typo (thx evolvedexperiment)

* fix ugly GUI (2 digit roundoff)

* resample dialog

* Town Promotion to largetown

* don't promote to capitals.

* Fix typo

* round style settings

* do not draw removed burgs

* Fix port cell search algo

* Fix: robust error handling, no error for 0.

* submap: projection moved to options, fix double burg error

* complete rewrite of burg relocation

* findcell by coordinates

* prepare to merge, add comments, remove fluff

* replacing lodash with deepCopy implementation

Co-authored-by: Mészáros Gergely <monk@geotronic.hu>
2022-04-15 12:45:02 +03:00
Gergely Mészáros, Ph.D
4b10b60c69
fix concurency issue at load (#762) 2022-03-30 21:14:51 +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
207b564180 improve MFCG link generation 2022-01-16 14:54:30 +03:00
Azgaar
e06356aa57 allow to edit MFCG link 2022-01-13 00:43:57 +03:00
Azgaar
a55e8d96ff lock burg - values is boolean, not 1/0 2022-01-01 19:09:50 +03:00
Azgaar
165d8e48be add mfcg link to burg overrview csv export 2021-11-10 20:41:23 +03:00
Azgaar
83aef34d45 markers overview - focus on marker 2021-09-28 23:22:16 +03:00
Azgaar
2a9edd2458 markers - generate tool + lock tooltip 2021-09-23 21:07:03 +03:00