Commit graph

56 commits

Author SHA1 Message Date
Azgaar
95b7ed9ea4 Merge branch 'master' of https://github.com/Azgaar/Fantasy-Map-Generator into burg-groups 2025-03-15 14:49:43 +01:00
Azgaar
d51deffdac feat: make lined icons work for all elements, v1.107.0 2025-02-08 14:05:28 +01:00
Azgaar
2f53a635c8 feat: burg groups - image icons 2025-01-02 14:14:00 +01:00
Azgaar
d7d79ad740 refactor: split states and burgs generators 2024-09-29 14:24:44 +02:00
Azgaar
0b8d3c63fc fix: 1.103.02 - parse old .map - markers data fix 2024-09-04 22:30:24 +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
13449447ba fix: Chrome hides layers with dropShadow... 2023-09-24 02:56:19 +04:00
Azgaar
fbe5f4ad55 feat: random encounters 2023-09-24 00:45:09 +04:00
Azgaar
0c16b1eaf3 fix: getDefaultConfig for markets by default 2023-07-20 19:08:18 +04:00
Azgaar
0b04efc90f feat: new markers types 2023-05-22 03:00:31 +04:00
Azgaar
dada419f20
Add the ability to lock states, provinces, cultures, and religions: refactoring (#910)
* Add the ability to lock states, provinces, cultures, and religions (#902)

* Add the basis for locking everything, code and test the culture locking

* Got the religion generator working, but not the tree. There are cycles being generated

* Religions work now, including the tree view

* Got the states and provinces working as well, all good and ready

* Refresh the province editor when regenerating

* Implement the versioning steps

* Fix the state naming and color changing even when locked

* The fix did not work with loaded maps, fix that too

* Fix a few more bugs and address the PR feedback

* Fix the state expanding event when they're locked bug

* Implement some logic to ignore state being locked when regenerating provinces directly.

* refactor(#902): start with states regenertion

* refactor(#902): locked states cells to be assigned on start

* refactor(#902): lock state - keep label

* refactor(#902): lock provinces

* refactor(#902): regenerate states - update provinces

* refactor(#902): regenerate cultures

* refactor(#902): regenerate religions

Co-authored-by: Guillaume St-Pierre <gstpierre01@gmail.com>
Co-authored-by: Azgaar <maxganiev@yandex.com>
2023-01-08 03:38:52 -08:00
Azgaar
1e4fba3615 fix: religions reference 2022-09-25 22:33:14 +03:00
Azgaar
c9400db3b1 refactor: markers to use helper function, version pump to 1.87.12 2022-09-25 14:34:40 +03:00
carnotcrash
4a079acf56
Markers full stops + some lil changes. (#875)
Grammar policing. Also slight modifications to sofronaspe's sacred tree places (idk what they are called collectively lol) to be slightly more grammatically correct, extending it to sacred peaks, Hot Spring variants, and maybe some other stuff I've forgotten. I have some more ideas for markers as I personally find them super interesting and great for adding depth to a world, just need to gather my thoughts and maybe actully learn how to code.
2022-09-25 04:30:49 -07:00
Peter Sofronas
0653e66971
Marker Generator Changes (#872)
* Added status to Volcano marker legend.

* Modified SacredForest spawn rate and legend

* Modified SacredPinery marker spawn and legend.

* Modified SacredPalmGrove marker spawn and legend.

* Added Cave marker spawn and legend logic.

* addCaves legend logic update and JS code updates.
2022-09-21 14:33:36 -07:00
carnotcrash
bffe46d332
Update markers-generator.js
small grammar changes
2022-07-01 10:55:47 +10:00
Azgaar
0408893db3 markers - adddetails 2022-04-15 15:58:48 +05:00
Azgaar
dcf0d590c6 new markers - cleanup + reducing chances 2022-04-15 15:14:49 +05:00
Azgaar
f6537456ea prettify 2022-04-15 14:53:46 +05:00
doddydad
7efcf65c6a
Additional points of interest (#769)
* A bit variety of points of interest added

* live-server now running, can actually bash things out

* some typos and mirage

* suggestions

* Rarity changes and capitalisation

* Jousts only ever spawn one per map

Co-authored-by: Andrew Rose <andrew.rosed@gmail.com>
Co-authored-by: Azgaar <maxganiev@yandex.ru>
2022-04-15 12:49:50 +03: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
Azgaar
fcda552719 addPortal fix 2022-04-05 00:14:01 +05: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
00f8a62c3b notes - disallow iframe actions 2022-02-15 00:10:55 +03:00
Azgaar
c20bcc1502 ensure marker id is unique 2021-12-29 22:11:45 +03:00
Azgaar
167e2f2c66 fix: restore rescaleLabels on load 2021-10-09 19:25:59 +03:00
M. Aleksandrov
827d488904
Add new marker lore descriptions (#681)
* Add new marker lore descriptions

* Fix errors, expand lore generation
2021-10-09 18:12:05 +03:00
Azgaar
50d440059f fix: marker qty bigger that elements count 2021-10-09 12:48:48 +03:00
Azgaar
648c0ac0c9 markers - add locked to already occupied 2021-10-07 13:00:29 +03:00
Azgaar
7f33c26729 markers - generate campaigns if missing 2021-10-07 12:39:09 +03:00
Azgaar
f7fc3830a0 typo fix 2021-10-06 23:34:08 +03:00
Azgaar
03b5e1d84c markers overview 2021-09-27 01:07:36 +03:00
Azgaar
d2e9e007f7 config generate markers dialog fixes 2021-09-26 18:04:53 +03:00
Azgaar
0c0e37d69b config generate markers dialog 2021-09-26 13:01:11 +03:00
Azgaar
60057c52ed markers - generate from config file 2021-09-25 21:49:34 +03:00
Azgaar
2a9edd2458 markers - generate tool + lock tooltip 2021-09-23 21:07:03 +03:00
Azgaar
95f9d990d9 markers rework - editor functions 2021-09-20 02:29:50 +03:00
Azgaar
def32b7f74 markers rework - editor start, dragging 2021-09-19 16:02:22 +03:00
Azgaar
1023bb0676 markers rework - optional pin shapes 2021-09-19 02:13:40 +03:00
Azgaar
3b47efd9a4 markers data rework - master data object 2021-09-18 16:47:17 +03:00
Azgaar
f5258f6ed0 markers - palm grove fix 2021-09-18 14:48:57 +03:00
Azgaar
f743e649de markers - magic portals fix 2021-09-18 14:15:27 +03:00
Azgaar
54428b32f1 markers - magic portals 2021-09-18 14:09:18 +03:00
Azgaar
c12507e336 markers - statues 2021-09-17 22:32:48 +03:00
Azgaar
a9755dacc8 burg editor - MFCG preview 2021-09-16 10:20:54 +03:00
Azgaar
d176e3188c markers - bandits and pirates 2021-09-15 21:51:37 +03:00
Azgaar
2f2697e60f markers - course generator enhancement 2021-09-14 23:42:44 +03:00
Azgaar
5e7d34e5bd markers - course generator for inns 2021-09-14 22:49:48 +03:00
Azgaar
b0ca9b9705 markers - refactor functions 2021-09-14 21:25:08 +03:00