Commit Graph

1994 Commits

Author SHA1 Message Date
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
24e4d77453 Civilization rankings (Richest, Strongest, Most Fertile, Largest, etc.) (#2036)
* Initial preparations

* Moving to the separate package

* Calculation and visualization

* Translations

* Using a local function instead of additional class

* Using a local function instead of additional class (part 2)

* Rankings French.properties

* Fixup of the leftover

Co-authored-by: RobertGine <61517798+RobertGine@users.noreply.github.com>
2020-02-29 20:48:55 +02:00
9fbd569e1f Allow to buy buildings from the queue (#2032)
* Allow to buy buildings from the queue

* Minor refactoring
2020-02-29 20:10:24 +02:00
fa61bdfd04 Translations (#2020)
* Update Polish.properties (#1997)

* Update Polish.properties

* Update Polish.properties

This should solve the problem (and correct a small translation error)

* Update Polish.properties

Next corrections, thanks @rprzystasz

Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>

* New french translation (#2014)

* Update Italian.properties (#2016)

* Update German.properties (#2017)

* Update German.properties

* Create Nations_German.json

Start new file for nations translation in german

* Update Nations_German.json

* Extensive correction of French translation (#2022)

* Resolved #1986 - research agreement cost consistency

* Tile stats are shown on a row, rather than on a column (#1946)

* Feature/refactor actions (#2008)

* Fixes Issue #1697 by adding information to the special production constructions.

* Get rid of extra $ sign in the SpecialConstruction tooltips

* Major refactor to use Sequences instead of List to try to improve logic whenever getting a list of tiles at a distance.

* Get rid of extraneous parameter

* get rid of extra exception. slight refactor placeUnitNearTile for readability

* Fix bug of doing intersection instead of union

* Add an extra method to get tiles in distance range

* Refactor the UnitActions to use more sequences and also to grab the actions needed by Automation directly.

* Update based on comments

* Redo to be more easily compared

* use elvis operator for assignment

* resolve merge conflicts

* Fix typo

* Fix one more typo

* Get rid of one more search for great person actions

* Get rid of one more search for pillage action

* Try to realign methods names for better diff

Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>

* Resolved #2012 - manually place starting locations are no longer visible in-game

* Extensive correction of French translation

Many, many several little corrections to the French translation. A few mistakes marred gameplay a little bit, but most of them were simple grammar mistakes. But the details are always important.

* Modifications to resolve conflict

* Modifications to resolve conflict (bus)

* Modifications to resolve conflict MK3

Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
Co-authored-by: Federico Luongo <fluo392@gmail.com>
Co-authored-by: Kentalot <Kentalot@users.noreply.github.com>

* Updates

Co-authored-by: Freshy <60152907+GreenFreshy@users.noreply.github.com>
Co-authored-by: armandberger <hoel@free.fr>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: CarpeLuxNoctem <61473456+CarpeLuxNoctem@users.noreply.github.com>
Co-authored-by: RobertGine <61517798+RobertGine@users.noreply.github.com>
Co-authored-by: Federico Luongo <fluo392@gmail.com>
Co-authored-by: Kentalot <Kentalot@users.noreply.github.com>
2020-02-27 19:57:55 +02:00
3ccd457759 Victory screen shows the viewing player, not the current player, in multiplayer games 2020-02-27 19:30:22 +02:00
f621ed5192 Fix for the wrong placement of purchased and upgraded units (#2006)
* Place the unit at the current position firstly

* More simple solution

* Try to place unit with traceability taken into account

* Return money and notify about the problem

* Popup dialog instead of notification

* Refactoring: Split UI and logic
2020-02-27 09:22:24 +02:00
85ea92cf72 Resolved #2012 - manually place starting locations are no longer visible in-game 2020-02-26 22:00:25 +02:00
0565405fc0 Feature/refactor actions (#2008)
* Fixes Issue #1697 by adding information to the special production constructions.

* Get rid of extra $ sign in the SpecialConstruction tooltips

* Major refactor to use Sequences instead of List to try to improve logic whenever getting a list of tiles at a distance.

* Get rid of extraneous parameter

* get rid of extra exception. slight refactor placeUnitNearTile for readability

* Fix bug of doing intersection instead of union

* Add an extra method to get tiles in distance range

* Refactor the UnitActions to use more sequences and also to grab the actions needed by Automation directly.

* Update based on comments

* Redo to be more easily compared

* use elvis operator for assignment

* resolve merge conflicts

* Fix typo

* Fix one more typo

* Get rid of one more search for great person actions

* Get rid of one more search for pillage action

* Try to realign methods names for better diff

Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
2020-02-26 21:50:36 +02:00
c4375ed4e8 Tile stats are shown on a row, rather than on a column (#1946) 2020-02-26 21:48:24 +02:00
faa204d86f Resolved #1986 - research agreement cost consistency 2020-02-26 21:43:12 +02:00
e062947e7e Trade routes (Railroad) fixes (#2013)
* Changes:
- worker automation to build Railroad overseas (currently they do not improve roads/build new)
- recognize harbor connection and add Railroad production bonus
- extracted and refactored connections to capital lookup

* CR fixes
2020-02-25 15:09:53 +02:00
252f8b23cc Minor cleanups 2020-02-24 19:33:37 +02:00
7b13a48d74 Try to fix bug I introduced (#2009)
* Fixes Issue #1697 by adding information to the special production constructions.

* Get rid of extra $ sign in the SpecialConstruction tooltips

* Try to fix bug I introduced
2020-02-24 19:24:14 +02:00
55a8211be0 Do not allow to buy what can not be built (#2007) 2020-02-24 08:14:21 +02:00
3b4bce780a Arial -> Aerial name refactoring 2020-02-23 22:33:32 +02:00
6009c1b5d3 Continuous rendering is not experimental anymore (#1996)
* Continuous rendering is not experimental anymore

* Better select boxes alignment
2020-02-23 20:22:31 +02:00
3c2cb01169 Earlier version with changes mostly to use Sequences (#1993)
* Fixes Issue #1697 by adding information to the special production constructions.

* Get rid of extra $ sign in the SpecialConstruction tooltips

* Major refactor to use Sequences instead of List to try to improve logic whenever getting a list of tiles at a distance.

* Get rid of extraneous parameter

* get rid of extra exception. slight refactor placeUnitNearTile for readability

* Fix bug of doing intersection instead of union

* Add an extra method to get tiles in distance range

* Update based on comments
2020-02-23 14:22:50 +02:00
9f0e74be1f Display the current amount of gold in the prompt dialog (#1995) 2020-02-23 11:25:11 +02:00