Commit graph

807 commits

Author SHA1 Message Date
Azgaar
7982aea194 fix merge conflicts 2022-11-27 18:36:28 -05:00
Azgaar
84965cf0ca burgs placement change + resource style 2022-11-27 18:34:50 -05:00
Azgaar
1e227642c8 fix some merge issues 2022-11-27 18:34:10 -05:00
Azgaar
f8bc33ba29 resource icon upload + save/load 2022-11-27 18:33:45 -05:00
Azgaar
f88d263e68 burgs overview - icon upload basic 2022-11-27 18:33:24 -05:00
Azgaar
9c02906c88 burgs overview - shift icon 2022-11-27 18:32:56 -05:00
Azgaar
3b2216f668 Resource editor - ability to add bonus if no bonuses 2022-11-27 18:32:35 -05:00
Azgaar
4bf901e849 generic confirmationDialog for all files 2022-11-27 18:31:10 -05:00
Azgaar
556e651d52 generic confirmationDialog 2022-11-27 18:22:54 -05:00
Azgaar
5477e5ca1e Resources editor - assign cells 2022-11-27 18:22:39 -05:00
Azgaar
2e84654477 resource bonus UI 2022-11-27 18:22:11 -05:00
Azgaar
c3f102656d resource bonus UI 2022-11-27 18:22:11 -05:00
Azgaar
6bcd0d3aad resource bonus UI basic 2022-11-27 18:21:57 -05:00
Azgaar
787a830d92 custom spread models 2022-11-27 18:21:44 -05:00
Azgaar
68cf5c5d1c custom spread models 2022-11-27 18:21:28 -05:00
Azgaar
10acdce50a regenerate resources 2022-11-27 18:20:59 -05:00
Azgaar
d0500f19d6 color picker behavior update 2022-11-27 18:20:20 -05:00
Azgaar
df1ee1b5a3 resources ("goods") layers 2022-11-27 18:19:31 -05:00
Azgaar
9b1ae25129 new resources 2022-11-27 18:16:17 -05:00
Azgaar
b9db7edf43 econonics - restore from feb 2022-11-27 18:13:27 -05:00
Peter
5beb497026 remove unused files 2022-11-27 17:23:26 -05:00
Peter
a6a8acbd1e merge module uis 2022-11-27 17:05:47 -05:00
Peter
112e78f40a merge module ui 2022-11-27 16:56:11 -05:00
Peter
8875f5d10a merge editor uis 2022-11-27 16:35:40 -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
acd9531bb8 feat(charts): add quantization types 2022-11-27 14:07:32 -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
22cc273981 version info and hash update 2022-11-27 14:03:21 -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
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
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
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
dd407e8be5 notes editor - use tiny cloud editor 2022-11-27 13:26:52 -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
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
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
Azgaar
25a43996fd scale previpitation layer circles 2022-11-27 13:03:33 -05:00