Commit graph

1439 commits

Author SHA1 Message Date
Peter
9d18e962ac Merge synchronizations with the master branch 2022-11-27 16:18:19 -05:00
Peter
f3396941e4 post-merge fixes 2022-11-27 14:46:31 -05:00
Peter
c24a786519 Merge economics with current 2022-11-27 14:11:46 -05:00
Azgaar
f17bc1e3af feat(names): name colonies using New constuct 2022-11-27 14:09:24 -05:00
Thomas Robert
7c10fd7b6c UI improvement for hierarchy tree (#834)
* style(hierarchy tree): improve responsivness

Fix details on the bottom of the dialog
Make the tree view take the rest of the available space of the dialog

* style(hierarchy tree): distinguish buttons

Distinguish between action buttons and remove origins tags-like button

* typo(hierarchy tree): change button label and tips

* fix(hierarchy tree): disable top node interactions

* chore: update version/hash to v1.86.07

* chore: update version/hash to v1.86.08

* fix: bad hash versions

* fix: update index.html to correct versions
2022-11-27 14:08:10 -05:00
Azgaar
acd9531bb8 feat(charts): add quantization types 2022-11-27 14:07:32 -05:00
Azgaar
14fc0dcfeb feature(hierarchy tree): dynamically load, control dialog 2022-11-27 14:06:56 -05:00
Azgaar
3d26c12740 chore: update hash for cahnged files 2022-11-27 14:06:07 -05:00
Azgaar
7d08aa132f refactor: load religions editor dynamically 2022-11-27 14:05:52 -05:00
Azgaar
fbb2d71f58 refactor - create types array to have named attributes 2022-11-27 14:04:30 -05:00
Azgaar
82c5a173b5 hotfix: reGraph to no override pack object 2022-11-27 14:03:54 -05:00
Azgaar
22cc273981 version info and hash update 2022-11-27 14:03:21 -05:00
Azgaar
b6a1012753 heightmap selection - refactor, make generation immutable to get predictable result 2022-11-27 14:02:59 -05:00
Azgaar
8ea89111fc central store for heightmap configs 2022-11-27 14:02:32 -05:00
Azgaar
451392b743 tooltip - get shortcut from its own attribute 2022-11-27 14:02:13 -05:00
Azgaar
8b4530ad25 heightmap select - open edit tools 2022-11-27 14:01:59 -05:00
Azgaar
7c4f685a57 refactor dialogs to be mobile-friendly 2022-11-27 14:01:45 -05:00
Azgaar
48e36fa26c heightmap select - style fixes 2022-11-27 14:01:26 -05:00
Azgaar
e1cbca2546 generation flow for heightmap select 2022-11-27 14:01:04 -05:00
Azgaar
bc3c5d2b86 heightmap - fix issues 2022-11-27 14:00:47 -05:00
Azgaar
fc4f4827c1 pump version to 1.83.0 2022-11-27 14:00:29 -05:00
Azgaar
17baa09a78 Fractious template 2022-11-27 14:00:13 -05:00
Azgaar
69823ceeb0 load dynamically cultures editor 2022-11-27 13:57:07 -05:00
Azgaar
877ae096bd states-editor - dynamic module 2022-11-27 13:56:18 -05:00
Azgaar
fd450a20c1 hasCoadjacentSameStateCells checks 2022-11-27 13:56:05 -05:00
Azgaar
6fc9b75e00 get rid of jquery for don't ask box 2022-11-27 13:54:59 -05:00
Azgaar
929d85a335 slightly optimize onZoom 2022-11-27 13:51:03 -05:00
Azgaar
a06e55d618 annotate template strings for syntax hightlight and format 2022-11-27 13:44:11 -05:00
Azgaar
bb65aca3ac supporters update 2022-11-27 13:43:34 -05:00
Mészáros Anna Veronika
9b445a1d0d restoring inappropriate fix (#785)
* restoring inappropriate fix

* removing culture cell data on import
2022-11-27 13:43:21 -05:00
Azgaar
aae22ec1e5 V1.8 (#784)
* pump version to 1.8

* resampleDialog UI update

* don't draw markers if not required

* submapOptionsDialog style changes
2022-11-27 13:43:07 -05:00
Azgaar
365db354c9 prettify 2022-11-27 13:42:12 -05:00
Gergely Mészáros, Ph.D
26ce225071 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-11-27 13:34:12 -05:00
Mészáros Anna Veronika
97a059bbbb Dev csv (#761)
* import cultures feature

* remove debug messages

* code cleanup
2022-11-27 13:32:27 -05:00
Azgaar
72278362b6 set size for pre-defined maps 2022-11-27 13:28:42 -05:00
Azgaar
c306d2fb2e predefined-heightmaps 2022-11-27 13:28:01 -05:00
Azgaar
dd407e8be5 notes editor - use tiny cloud editor 2022-11-27 13:26:52 -05:00
Azgaar
d49ecd209f load auto-update sctipt dynamically 2022-11-27 13:25:25 -05:00
Azgaar
08a9d75bc9 zone editor - restore init state + type display 2022-11-27 13:20:53 -05:00
Ángel Montero Lamas
61d4d52589 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-11-27 13:20:32 -05:00
Azgaar
3e353e98cc add only used hatchings on export 2022-11-27 13:20:18 -05:00
Ángel Montero Lamas
cf17d51910 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-11-27 13:20:03 -05:00
Azgaar
21f95d4b1f dissalow local run 2022-11-27 13:19:41 -05:00
Azgaar
845245130f burg temperature graph - corrections 2022-11-27 13:18:14 -05:00
Ilia Pushkin
536f9d7470 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-11-27 13:17:57 -05:00
Azgaar
7c09d7376e Supporters update 2022-11-27 13:14:10 -05:00
Ángel Montero Lamas
a51d2e6403 religions-generator.js (#724)
Sorted the lists, arrays and weighted arrays of items in alphabetical order. Some remain in the order assigned by weighted random.
I think this helps people spot missing items on the list if they check by name.
The number of items is the same, they just got reordered.
2022-11-27 13:12:43 -05:00
Ángel Montero Lamas
0f1e86fab6 Update main.js (#722) 2022-11-27 13:06:24 -05:00
Azgaar
3306ff2265 lock all burgs - optimization 2022-11-27 13:06:01 -05:00
Ángel Montero Lamas
142351c6ef Added lock/unlock all (#713)
* Added lock/unlock all

Lock All , Unlock All as separate buttons. Additionally to InvertLock.

* Update burgs-overview.js

Updated the syntax to the one suggested by Azgaar.

* Lock/unlock in one button

Unlock all burgs and lock all burgs in just one button.
Additionally to invert lock.

* lock unlock in burgs-overview.js

Added a way to check if burgs are locked or unlocked with the lock all button, so it works in any situations about locking.

* burgs-overview.js lock all

Changed burgsonoff to setLockBurgs, also put setLockIcon.

* index.html burgsonoff to burgsLockAll

* Update burgs-overview.js

spacing
2022-11-27 13:04:07 -05:00