Commit Graph

5823 Commits

Author SHA1 Message Date
b9a7925285 Order defeated civs after alive civs even if the alive civs score is negative (e.g. for happiness) (#9203) 2023-04-17 07:38:43 +03:00
dbb46545f5 Fix golden age length action text (#9204)
Thanks SomeTroglodyte (https://github.com/yairm210/Unciv/issues/9166#issuecomment-1503593954)
2023-04-17 07:37:56 +03:00
4f30d27d0b Notifications can be "selected" (#9182)
* Allow "selecting" notifications

* NotificationsScroll remembers position relative to topRight

* NotificationsScroll tries to scroll selection into view

* Fix notification selection and scroll-into-view

* User option to control enlarging selected notifications

* Post-merge missed changes

* Move, flip and reword "Enlarge" option
2023-04-16 21:20:56 +03:00
ab1d823477 4.6.2 2023-04-16 15:01:43 +03:00
4c6c6e91fd Version rollout (#9199)
* Bump version and create initial changelog entry

* Update Simplified_Chinese.properties (#9195)

* Update Turkish.properties (#9193)

* Update Spanish.properties (#9192)

* Update French.properties (#9190)

* Update Hungarian.properties (#9187)

* Update Polish.properties (#9180)

---------

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: CrispyXYZ <64761703+CrispyXYZ@users.noreply.github.com>
Co-authored-by: Enesb852 <130827350+Enesb852@users.noreply.github.com>
Co-authored-by: Caballero Arepa <78449553+Caballero-Arepa@users.noreply.github.com>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
Co-authored-by: balazsszalab <balazsszalab@freemail.hu>
Co-authored-by: Lesiakower <125187776+Lesiakower@users.noreply.github.com>
2023-04-16 14:52:41 +03:00
2586e59638 Hide icons in game file names - see #9194 2023-04-16 14:48:58 +03:00
eb79e77a26 Removed icons from city names, removed icons from notifications for performance reasons 2023-04-16 14:43:34 +03:00
a81dd03fcf Added "in this city", "in other cities" conditionals for city-based uniques 2023-04-16 14:43:34 +03:00
dea3256c93 Unhappiness effects (#9188)
* Block growth if Unique says so - even with full stores

* Display unhappiness rejection reason for Settlers

* Display unhappiness effects in Overview Stats

* Display unhappiness effects in Overview Stats - simplify
2023-04-16 14:21:58 +03:00
90cac15c7f Fix more leaks of the actual Player count in random mode (#9196) 2023-04-16 14:20:08 +03:00
bc5e486b20 Resolves #9186
Atilla's Court -> Attila's Court, Guten tag -> Guten Tag
2023-04-15 21:00:17 +03:00
3b3db71fd8 Allow city- or tile- related conditionals on PerpetualStatConversion enabling unique (#9183) 2023-04-14 08:28:07 +03:00
26d16fc1cc 4.6.1-patch2
Fixed multiplayer games not starting because player ID was being lost on the way @SomeTroglodyte
2023-04-13 23:58:41 +03:00
fd9284f8a3 4.6.1-patch1 2023-04-13 23:21:42 +03:00
5232984bd9 More UI cleanup 2023-04-13 23:19:57 +03:00
d542fbc0af Removed more double icons 2023-04-13 23:01:48 +03:00
0d6aa82540 Resolved #9169 - Return error when cannot upload game to Dropbox 2023-04-13 18:17:21 +03:00
e7653bd53d Resolved #9163 - Can again spectate games where not an original participant 2023-04-13 17:51:11 +03:00
2fbd24231f Resolved #9177 - Tileset no longer reverts to default on Android after restarting game 2023-04-13 17:41:59 +03:00
f98f4e8c9b Retreat chance is savescum-safe - #9178 2023-04-13 16:55:16 +03:00
ebfda6ffc0 Resolved #9178 - 'unit gain from defeating unit' takes attacking/defending units into account for randomness 2023-04-13 16:50:24 +03:00
28f5043fcb 4.6.1 2023-04-13 16:26:43 +03:00
2ce145be1e Version rollout (#9179)
* Bump version and create initial changelog entry

* Updated Brazilian_Portuguese.properties (#9170)

* Updated Brazilian_Portuguese.properties

* Update Brazilian_Portuguese.properties

* Update Brazilian_Portuguese.properties

* Update Hungarian.properties (#9161)

* Update Hungarian.properties

* Update Hungarian.properties

* Update Italian.properties (#9160)

* update Simplified_Chinese translation (#9159)

Co-authored-by: chr_56 <_>

* Update Ukrainian.properties (#9153)

* Update French.properties (#9152)

* Update Czech.properties (#9151)

translated some of the yet untranslated texts

---------

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: Vitor Gabriel <59321138+Ranbut@users.noreply.github.com>
Co-authored-by: balazsszalab <balazsszalab@freemail.hu>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: chr_56 <30681738+chr56@users.noreply.github.com>
Co-authored-by: Gualdimar <Gualdimar@users.noreply.github.com>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
Co-authored-by: brmaku <46785630+brmaku@users.noreply.github.com>
2023-04-13 16:20:25 +03:00
e05c561f68 Added parameter type for stockpiled resources specifically 2023-04-13 16:07:11 +03:00
4d3b2845fd Fix "Instantly consumes [amount] [resource]" 2023-04-13 16:02:46 +03:00
36a8b368c8 Arbitrary images in font!!! (#9167)
* Arbitrary images in font!!!

* Added unit, promotion, and improvement icons to text

* Fixed icons in notifications

* Removed icons from formatted lines to avoid double-icons

* Removed nation icon from next to menu to not have double-icons

* Removed nation icon from next to menu to not have double-icons

* Icons do not appear in Civilopedia twice

* Better Nation texts
2023-04-13 16:00:50 +03:00
193114078b Show a highlight for the tile that seems most suitable to found a cit… (#9099)
* Show a highlight for the tile that seems most suitable to found a city (can be turned off in settings)

* Don't allow players to cheat through highlighting suggested map tiles for city founding.

* Don't pass whether cheating is allowed, but just decide based on whether civ is AI or not. That way it will also work correctly for automated settlers (by human players). Also show it in the first round, because why not. If the map generator puts us on a shitty starting tile, why not tell the player?

* Address comments

* Address comments
2023-04-13 15:43:46 +03:00
b0f4e42e99 Show replay after 50 turns, but only the discovered part of it. (#9172) 2023-04-13 15:39:26 +03:00
e0533e994f Fix startBias regional assignments (#9171) 2023-04-13 15:38:19 +03:00
9ea135fba8 Charts improvements (#9168)
* Let spectator see civ groups in VictoryScreen

* Display defeated players normally for charts. Otherwise it's difficult to see which line belongs to them.

* Don't show a 0 for defeated civs.

* Delete dead code.

* Show the civ icon on the last data point within the chart, not next to it and simplify some computations with now obsolete paddings.

* Support negative values in the chart

* Remove TODO for negative values
2023-04-13 11:55:59 +03:00
e72591e470 Highlight non-available wonders in tech picker (#9173)
* Show wonders in tech tree with a blue color and also show which wonders have already been built for technologies not yet researched with a red circle around them.

* Only show red circle.
2023-04-13 11:54:35 +03:00
0500f73770 Victory screen and victory detection use VictoryData (#9175)
* VictoryScreen uses VictoryData

* Victory detection no longer circumvents VictoryData
2023-04-13 11:54:11 +03:00
2e61023248 Close immediate win loophole (playing alone) (#9176) 2023-04-13 11:52:16 +03:00
19b243abfe 'Display' options organized into subcatagories - kudos @Ouaz 2023-04-11 11:28:24 +03:00
46a9a7251e Fix incorrect relationship level comparison (#9156) 2023-04-11 11:04:31 +03:00
6efb4926af Fix map editor resource label wrapped to about 1 char width (#9162)
* Fix potential problems with making ColorMarkupLabel wrappable

* Fix map editor resource label wrapped to about 1 char width
2023-04-11 09:09:07 +03:00
e7d091197f Fix issue #7792 (#9164)
The issue was caused by Latin-Civs Mixed Militias being considered workers in ConstructionAutomation.addWorkerChoice() but not beign counted as one in ConstructionAutomation.workers. Now, any unit that can build improvements counts as a worker in it. In addition, the AI simulates military units that can found city, build improvements or are religious as civilians in peacetime and as soldiers in wartime.
2023-04-11 07:55:15 +03:00
a363edaa6a 4.6.0 2023-04-09 18:15:53 +03:00
52f288be05 Version rollout (#9149)
* Bump version and create initial changelog entry

* Update Simplified_Chinese.properties (#9145)

* Update Italian.properties (#9143)

* Update Spanish.properties (#9142)

---------

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: qw142536 <123065131+qw142536@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: Caballero Arepa <78449553+Caballero-Arepa@users.noreply.github.com>
2023-04-09 18:07:03 +03:00
adb51d9264 Resource stockpiles! (#9147)
* Resource stockpiles!

* toString extension including sign (+/-)

* Trigger uniques to provide/consume stockpiled resources

* Fixed build

* Display 'per turn' for stockpiled resources that are consumed per turn

* "Costs [amount] [resource]" works!

* Stockpile unique costs are displayed in construction button

* Added unique to prevert certain resources from being traded
2023-04-09 18:01:26 +03:00
0c60f87b27 User option to control NotificationScroll behaviour (#9148) 2023-04-09 17:58:39 +03:00
32a76fd359 4.5.17-patch1
Solved "cannot start single player game"
2023-04-09 17:27:17 +03:00
a691066b05 Resolved #9146 - crash screen '
copy to clipboard' no longer causes crashes itself
2023-04-09 17:23:22 +03:00
338c4bd7e4 toString extension including sign (+/-) 2023-04-09 14:11:42 +03:00
29c647e0f7 Actually implemented nation filter conditional 2023-04-09 10:27:34 +03:00
065f434fb6 Code Reorg AlertPopup (#9140) 2023-04-09 01:47:38 +03:00
711655c786 Better wrapping for long construction item names 2023-04-09 01:20:17 +03:00
0d9cff0922 "<for [nationFilter]>" conditional added 2023-04-08 22:46:49 +03:00
d339de1929 Version rollout (#9139)
* Bump version and create initial changelog entry

* Added 112 dutch translations (#9131)

* Update Polish.properties (#9129)

* Update Polish.properties

* Update Polish.properties

* Update Polish.properties

* Update Hungarian.properties (#9107)

* Update Hungarian.properties

* Update Hungarian.properties

* Update Hungarian.properties

* Update Hungarian.properties

* Update Hungarian.properties

* Update Hungarian.properties

* Update Hungarian.properties

* Update Italian.properties (#9102)

---------

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: Abe van der Wielen <abevanderwielen@gmail.com>
Co-authored-by: Lesiakower <125187776+Lesiakower@users.noreply.github.com>
Co-authored-by: balazsszalab <balazsszalab@freemail.hu>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
2023-04-08 22:09:54 +03:00
77f230ff1a Fixed json loading errors in latest version due to tab names changing 2023-04-08 22:03:22 +03:00