Commit Graph

2011 Commits

Author SHA1 Message Date
e308f1fe0c Added logic to check Player- and Game-IDs according to new layout. (#2108)
Backwards compatible to old format.
2020-03-18 22:55:57 +02:00
701ddcb76b Trade offers better sorting with user choice (#2180)
#2152 is nice but sorts by internal key, thus translations are not
    taken into account and cities are sorted by their guid
   Also moving larger amounts to the top may not be everyone's taste
   so this offers the user a choice
2020-03-18 10:21:50 +02:00
076821a181 Fix: Freshly improved resources often do not show up on world screen, overview or trade (#2182)
Issue visible right at start of turn, saving and reloading viable workaround.
2020-03-18 09:55:10 +02:00
6c5f729333 Sorted list of icons for promotions (#2164) 2020-03-16 12:55:48 +02:00
c7d020e32d Filter for the custom maps (#2163) 2020-03-15 21:10:59 +02:00
2cbc0e93e0 Ice is impassible for all except submarines (#2158)
* Ice is impassible for all except submarines

* Using "unique" property + simplified call of functions
2020-03-15 18:24:52 +02:00
feb786c9ee Merge branch '3.6.7-patch2' 2020-03-14 21:50:09 +02:00
fa41e50a33 Resolves #2157 - 3.6.7-patch2 2020-03-14 21:46:45 +02:00
a18d52c82a Sort resources by name and amount (#2152) 2020-03-14 20:13:46 +02:00
1978d7e707 Merge branch 'master' of https://github.com/yairm210/Unciv 2020-03-12 21:16:32 +02:00
d8d74b6873 Resolved #2137 - Fixed worker automation for snow tiles, AND settler automation fix 2020-03-12 21:03:36 +02:00
dd438f16c8 Translation refactoring - part 2 (Tutorials) (#2114)
* Make TranslationFileReader as object class

* Generate strings from Tutorials.json

* Simplified storage and loading of the tutorials

* Transfer existing translations
2020-03-12 16:38:57 +02:00
c7e8dfb8fb Energy saving: music and sounds (#2128) 2020-03-12 08:35:45 +02:00
528392baab Allow selection of non-buildable items (#2126) 2020-03-12 08:34:44 +02:00
e370bbc53b Hide crosshair while city can't attack (#2124) 2020-03-12 08:33:03 +02:00
97a9a0f08c Display an amount of gold when buying the tile (#2127) 2020-03-12 08:32:29 +02:00
1564856391 Turn number of trade changes with game speed. (#2123) 2020-03-11 21:43:59 +02:00
2a67294554 Snow, Ice, Atoll & Map Generation (#1909)
* Snow, Atoll & Ice

* Fix White Hexagon + Small NW refactor

* More Land in Continents #1886

* Atoll can spawn only on Coast

* Added new constants and turned Constant into an object

* Latitude and Longitude utility methods

* New MapGenerator steps

* New MapParameters & MapGenerator cleanup

* Added New Map option to MapEditor menu

* New parameters default values and limits

* archipelagos map type

* Translations & Atlas

* removing unneeded octave displacement

* Fix Archipelago

* Perlin noise parameters & no-elvis in TileMap

* Rebuilt Atlas

Co-authored-by: Eddh <remi.dufour@protonmail.com>
2020-03-11 11:39:37 +02:00
15098d877c Translations refactoring (#2096)
* Rename "translationsByLanguage" folder

* Minor refactoring

* Generate Nations strings

* Use the nations strings while creating the translation files

* Clean up of Nations files

* Transfer existing translations

* Get rid of the nation's translated name

* Transfer just few nations' translations for languages without Nations_Language.json

* Clean up of not used greetings

* Correct marking of not translated strings
2020-03-10 10:17:05 +02:00
30a2eda15f UnitTable no longer scrolls when unnecessary 2020-03-09 22:13:47 +02:00
13def8739e Corrections according to #2101 (#2105)
* College requires Phylosophy

* "Police State" influences the courthouses, not culture borders

* "Autocracy complete" has +20 attack effect

* Translations updates
2020-03-09 00:00:32 +02:00
f769d60826 Do not recreate the window (#2107) 2020-03-08 23:58:32 +02:00
0cf27789e9 Borders made of oriented triangles rather than circles (#2104) 2020-03-08 20:36:50 +02:00
61565c0ee6 Reverted the UnitActions to the old setup (the new sequence yield was unnecesarily confusing),
but kept the merge of canAct and the null action and taking specific actions when necessary and not the entire list
2020-03-08 00:24:19 +02:00
db6031da82 Starting locations work again =) 2020-03-07 23:06:34 +02:00
58f7e06b72 Moving unique abilities to an Enum (#2095)
* Unique abilities moved to enums

* remove diplomatic victory type WIP

* Address review comments. Translations for unique abilities names aren't used anywhere as far as I can tell, but added them to relevant translation files just in case.

Co-authored-by: nmeze <nicolas.mezeret@gmail.com>
2020-03-07 22:22:20 +02:00
2bc590d5b5 Fixed number of strategic resources 2020-03-07 22:07:42 +02:00
296936ae53 Fix/city buy sell exploits (#2094)
* Fix erroneous removal from queue

* Buy/Sell popups disable respective button and force closure of other popups
2020-03-07 20:04:27 +02:00
80ca06afbe ResponsePopup is now working like intended (#2089) 2020-03-06 16:05:42 +02:00
e12f35660f Revert close buttons + usability improvement (#2088)
* Revert changes to the Close buttons from PR #2069

* Better sensivity of diplomacy buttons
2020-03-06 10:31:23 +02:00
585ec2b723 Water units can no longer see over hills etc. 2020-03-05 23:37:58 +02:00
5117a498f9 Resolved #2040 - Moved the turn counter on the top bar to the second level, to even out both levels 2020-03-05 23:29:42 +02:00
978f5bda53 Resolved #2074 - Fixed domination victory 2020-03-05 23:01:39 +02:00
7bd0365a8e Issue#2019 (#2051)
* Issue#2019
Player should not be able to nuke a civilsation that it has a peace treaty with

* wordlscreen is updated when notification shown (#2019)

* Fixed PR comments #2019

* issue #2019

* Fixed PR comments #2019

* Fixed PR comments #2019

* Fixed PR comments #2019
refactoring

* Fixed PR comments #2019
removed unnecessary line
2020-03-05 22:50:23 +02:00
82ab66ad05 Ranking by culture is by number of adopted policies 2020-03-05 22:28:51 +02:00
955dff89b9 fix research agreement button. (#2080) 2020-03-04 20:13:15 +02:00
97a07d3530 Resolved #2071 - AI will wait 20 turns between proposing research agreements if declined 2020-03-03 23:05:56 +02:00
86576e25ae Fixed crash when diplomacy values change while ending the turn 2020-03-03 21:45:39 +02:00
163d4ad347 Ah welp
Good thing the tests caught it =)
2020-03-03 20:34:54 +02:00
1acf337d55 Resolved #2055 - cities bombard melee units once again
Basically undid the change from #1993 and prettified a bit
@Kentalot
2020-03-03 20:18:38 +02:00
a493661aad Merge branch 'master' of https://github.com/yairm210/Unciv 2020-03-03 20:09:52 +02:00
27b9c93d6f Resolved #2035 - Strategic resources are affected by map generation parameters 2020-03-03 20:09:40 +02:00
95354964ba some UI update. (#2069) 2020-03-03 19:54:20 +02:00
8a9bbf4154 City state diplomacy screen cleanup 2020-03-03 17:43:07 +02:00
9721fb66c0 Resolved #2033 - happiness from tiles is always considered correctly in regards to food consumption 2020-03-03 17:25:30 +02:00
78dab67257 [2065] Fix issue when unit can sleep while fortification (#2067) 2020-03-03 14:23:01 +02:00
fc9de6f7fb Fix that when great person creates great improvement great person doesn't disappear. (#2062) 2020-03-02 18:12:17 +02:00
1df0c408aa Fixed Multiplayer Turn Notifier periodically failing with error notification. (#2054) 2020-03-02 06:44:53 +02:00
8cae2fb125 Include Nations in the calculation of a translation`s percentage (#2044)
* Include Nations in the calculation of a translation`s percentage

* Refactoring: Parameter renaming

* Check for empty originals
2020-03-01 23:10:43 +02:00
47065e0384 modify Eiffel Tower effect. translation update. (#1955) 2020-03-01 22:25:59 +02:00