Commit Graph

5519 Commits

Author SHA1 Message Date
296a2f689f Update CityScreenCityPickerTable.kt (#8533) 2023-02-01 19:18:03 +02:00
adde5c2bda Refactor Construction Rejection Reasons (#8526)
* Refactor Rejection Reasons to use Sequences

* Renaming

* Rework some functions
2023-02-01 10:41:36 +02:00
087d100887 Version rollout (#8523)
* Bump version and create initial changelog entry

* Update Hungarian.properties (#8504)

* Update Hungarian.properties

* Update Hungarian.properties

* Update Hungarian.properties

* Update Hungarian.properties

* Update Hungarian.properties

* Update Hungarian.properties

* Update Hungarian.properties

* Update Hungarian.properties

* Update Hungarian.properties

* Update Hungarian.properties

* Update Hungarian.properties

* Update German translation (#8498)

* Update German translation

* Update German translation

* Update German translation

* Update Ukrainian.properties (#8474)

* Update Ukrainian.properties

* Update Ukrainian.properties

* Update Ukrainian.properties

* Update Ukrainian.properties

* Update Ukrainian.properties

* Fixed test

---------

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: balazsszalab <balazsszalab@freemail.hu>
Co-authored-by: MartinP <mape6@posteo.de>
Co-authored-by: Gualdimar <Gualdimar@users.noreply.github.com>
2023-01-31 23:46:36 +02:00
c3da760c3b Notification log fix (#8509)
* Fix ruin notification and broken conditional check

* Translate idle production description
2023-01-31 23:08:17 +02:00
913cb3cf00 Fix Faith Healers healing enemies (#8522)
* Fix faith healers belief and add Friendly/Enemy mapUnitFilter support

* Use Ally instead of Friendly since Ally denotes the ally of a CS and not necessarily a friendly civ

* Fewer words

* Remove mapFilter implementation

* Remove nullability
2023-01-31 23:07:12 +02:00
03d5ba0f07 Add next-turn-progress bar for growth/production on CityButtons (#8506)
* Add next-turn-progress bar for growth/production on CityButtons

* Small nitpicks

---------

Co-authored-by: tunerzinc@gmail.com <vfylfhby>
2023-01-31 22:44:57 +02:00
02e10b1000 Only heal when pillaging Improvements (#8511)
* Only Pillaging Improvements (not Roads) Heal 25HP

* Block repairs in Hostile Tiles

* Revert "Block repairs in Hostile Tiles"

This reverts commit ae1a2e9ece.
2023-01-31 22:35:53 +02:00
898d312109 Fix incorrect dimming (#8505)
Co-authored-by: tunerzinc@gmail.com <vfylfhby>
2023-01-31 22:26:13 +02:00
7258507088 Autosave fix (#8517)
* Update UncivFiles.kt

* Update WorldScreen.kt
2023-01-31 22:24:04 +02:00
dc6d1cb9f5 Remember "Show autosaves" setting state (#8518)
* Update GameSettings.kt

* Update LoadOrSaveScreen.kt
2023-01-31 22:22:21 +02:00
f00ce4b1f7 Version rollout (#8497)
* Bump version and create initial changelog entry

* Some simple translates (#8493)

Co-authored-by: GutorovMikhail <mgutorov@phoenixit.ru>

* Update Traditional_Chineses.properties (#8491)

* Update Spanish.properties (#8486)

* Update Korean.properties (#8485)

* Update Korean.properties

* Update Korean.properties

* Update Dutch.properties (#8484)

* Update Filipino.properties (#8481)

* Update Catalan.properties (#8478)

* Update Brazilian_Portuguese.properties (#8475)

* Update Hungarian.properties (#8473)

* Update Hungarian.properties

* Update Hungarian.properties

* Update Hungarian.properties

* Update Hungarian.properties

* Update Hungarian.properties

* Update Hungarian.properties

* Update Hungarian.properties

* Update Hungarian.properties

* Update Hungarian.properties

* Update Hungarian.properties

* Update Hungarian.properties

* Update Hungarian.properties

* Update Hungarian.properties

* Update Hungarian.properties

* Update Hungarian.properties

* Update Hungarian.properties

* Update Hungarian.properties

* Update Hungarian.properties

* Update Hungarian.properties

* Update Hungarian.properties

* Update Hungarian.properties

* Update Hungarian.properties

* Update Hungarian.properties

* Update Hungarian.properties

* Update Hungarian.properties

* Update Hungarian.properties

* Update Hungarian.properties

* Update Hungarian.properties

* Update Hungarian.properties

---------

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

* fix translation

---------

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: Гуторов Михаил <79066966780@yandex.ru>
Co-authored-by: GutorovMikhail <mgutorov@phoenixit.ru>
Co-authored-by: nacro711072 <nacro711072@yahoo.com.tw>
Co-authored-by: Caballero Arepa <78449553+Caballero-Arepa@users.noreply.github.com>
Co-authored-by: Yattong the Mackerel <saud2410@naver.com>
Co-authored-by: Lena Bullens <95299589+LenaBullens@users.noreply.github.com>
Co-authored-by: Shann Aurelle Ripalda <shannaurelleg@gmail.com>
Co-authored-by: Joan Josep <juanjo.ng.83@gmail.com>
Co-authored-by: Vitor Gabriel <59321138+Ranbut@users.noreply.github.com>
Co-authored-by: balazsszalab <balazsszalab@freemail.hu>
2023-01-30 09:21:00 +02:00
e3f7e42b00 Resolved #8489 - modded notifications for ruins providing stats 2023-01-30 09:10:47 +02:00
f92f72bc1b Optimized BorderedTable, refactored CityButton, new air table for units + misc (#8487)
* Optimized BorderedTable, refactored CityButton, new air table for units + misc

* Fix city plate not moving up on deselect + minor nitpicks

* Fix: add forgotten bg

---------

Co-authored-by: tunerzinc@gmail.com <vfylfhby>
2023-01-30 09:05:37 +02:00
ee2bd20abe Fix division by zero crash (#8495) 2023-01-30 07:43:38 +02:00
4ea644aa8d Resolved #8490 - missionaries check if inquisitors block their religion, and not the religion of the unit's owner 2023-01-29 18:31:35 +02:00
072f08d440 Allow unique ruins stat gain notifications 2023-01-29 18:26:30 +02:00
3119bdb005 AI automation: Don't nuke cities that we're already winning against 2023-01-28 20:27:23 +02:00
544cc0b17d AI battle automation vastly improved for taking over cities 2023-01-28 19:53:14 +02:00
33b2c11b6a chore: unit automation org 2023-01-28 19:23:53 +02:00
f02ea68942 Resolved #8483 - wonder overview uses viewing civ, not current player 2023-01-28 19:00:35 +02:00
86fd874ac5 Rework of TileGroup: split into dedicated layers, initial preparation for slot-mechanics (#8470)
Co-authored-by: tunerzinc@gmail.com <vfylfhby>
2023-01-26 23:05:50 +02:00
b62188169c Version rollout (#8468)
* Bump version and create initial changelog entry

* Update Indonesian.properties (#8467)

* Update Korean.properties (#8464)

* Updated Brazilian_Portuguese.properties (#8460)

* Updated Brazilian_Portuguese.properties

* Updated Brazilian_Portuguese.properties

* Update French.properties (#8458)

* Update French.properties

* Update French.properties

* Update Hungarian.properties (#8455)

* Update Hungarian.properties

* Update Hungarian.properties

* Update Hungarian.properties

* Update Hungarian.properties

* Update Hungarian.properties

* Update Hungarian.properties

* Update Hungarian.properties

* Update Hungarian.properties

* Update Hungarian.properties

* Update Hungarian.properties

* Update Hungarian.properties

* Update Hungarian.properties

* Update Hungarian.properties

* Update Hungarian.properties

* Update Hungarian.properties

* Update Hungarian.properties

* Update Hungarian.properties

* Update Hungarian.properties

* Update Hungarian.properties

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

* Update Czech.properties (#8454)

* Update Czech.properties

* Update Czech.properties

* Update Czech.properties

* Update Simplified_Chinese.properties (#8451)

* Update Simplified_Chinese.properties

* Update Simplified_Chinese.properties

* Update Simplified_Chinese.properties

* Optimize Simplified Chinese translation

* Update Italian.properties (#8450)

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: kensvin <kensvin28@gmail.com>
Co-authored-by: Yattong the Mackerel <saud2410@naver.com>
Co-authored-by: Vitor Gabriel <59321138+Ranbut@users.noreply.github.com>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
Co-authored-by: balazsszalab <balazsszalab@freemail.hu>
Co-authored-by: jahodovykolac <79529669+jahodovykolac@users.noreply.github.com>
Co-authored-by: CrispyXYZ <64761703+CrispyXYZ@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
2023-01-25 21:37:03 +02:00
d91c10cb50 Resolved #8281 - Modding: allow roads/railroads with no required tech 2023-01-25 21:04:54 +02:00
18c6c9c91a Resolved #8398 - Fixed spawn ignoring i/4 of the map 2023-01-25 20:52:58 +02:00
11a0ef52d1 Resolved #8461, Resolved #8462 - Fixed 'infinite stat' from city-states 2023-01-25 20:34:15 +02:00
ff696a9272 Resolved #8463 - tutorial task mistake 2023-01-25 20:30:08 +02:00
dcdcc3bc8c Modification of the random part of Prize Ship to avoid save scumming (#8448)
* Modification of the random part of Prize Ship to avoid save scumming

* Update core/src/com/unciv/logic/battle/Battle.kt

Code modification for readability

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

* Added conversion to Long

Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
2023-01-23 23:56:14 +02:00
c9a10bccb3 Population icon before unit image in city tiles 2023-01-23 22:12:03 +02:00
cbf989ce91 Fade units and improvements in city 2023-01-23 21:39:13 +02:00
b76cd34513 Do not allow placing of 'repair' in map editor 2023-01-23 21:25:29 +02:00
37c656fcb4 "Extension mods:" -> "Extension mods" 2023-01-23 21:10:16 +02:00
291237a2eb Better main menu map 2023-01-23 20:14:54 +02:00
5bec368452 chore: moved cost and description functions out of BaseUnit 2023-01-23 19:52:14 +02:00
3ef18a696e Mods without unittype for a unit will trigger correct warnings 2023-01-23 15:01:17 +02:00
a3799d9ec7 Version rollout (#8449)
* Bump version and create initial changelog entry

* Update Czech.properties (#8445)

* Update Portuguese.properties (#8442)

Did translation for half the properties (roughly 4000 lines). Some may need verification from another portuguese person since they are hard to translate directly.
Will try to translate the rest when I have time.

* Update Polish.properties (#8440)

* Update Simplified_Chinese.properties (#8439)

* Update Simplified_Chinese.properties

* Update Simplified_Chinese.properties

* Update Hungarian translation (#8437)

* Update Hungarian.properties

* Update Hungarian.properties

* Update Hungarian.properties

* Update Hungarian.properties

* Update Spanish.properties (#8436)

* Fixed tests

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: jahodovykolac <79529669+jahodovykolac@users.noreply.github.com>
Co-authored-by: bernardoamorim7 <106557598+bernardoamorim7@users.noreply.github.com>
Co-authored-by: pyotr_p <pyotr.pietrzak@gmail.com>
Co-authored-by: qw142536 <123065131+qw142536@users.noreply.github.com>
Co-authored-by: balazsszalab <balazsszalab@freemail.hu>
Co-authored-by: Caballero Arepa <78449553+Caballero-Arepa@users.noreply.github.com>
2023-01-23 11:31:57 +02:00
c9a4f59566 Added option to allow players to choose randomly selected civs (#8430)
* Added UI

* random nations are now chosen from the specified random pool

* refactoring

* translations

* compareBy(getCollatorFromLocale) instead of just sorting by english names

* fixed nation popup not remembering the selected nations

* added blacklist feature

fixed bug which made the feature not work if random civilization nr was disabled

* addCheckbox function

* blacklist translation

* added function for textButton

* changed if in gameStarter

* moved button and checkboxes to the GameParameters
2023-01-23 11:10:14 +02:00
c5667d1685 Fix crash in Tactical Analysis Map (#8441)
* Fix crash due to out of looking at index == array length

* Fix dimension and swap x and y

* Some more cleanup

* Rewrite loop

* Even more cleanup

* Set function back to private

* Half total number of iterations needed
2023-01-23 11:09:54 +02:00
d565bf8f64 Fixed tests 2023-01-23 11:04:32 +02:00
b9299ac50d Pangaea maps are always largely land connected 2023-01-23 00:52:40 +02:00
783a469da5 chore: separated unit actions into several files 2023-01-23 00:42:45 +02:00
35399eb74c Resolved #8444 - rulesets without modern strategic resources no longer fail on city-state generation 2023-01-22 23:53:28 +02:00
2e5d1bf591 Resolved #8435 - rivers remain visible after founding city 2023-01-22 19:33:27 +02:00
2a3e707f24 When exchanging peace for cities, units no longer teleport out of cities you traded for 2023-01-22 19:22:17 +02:00
39e88d3a1a Added "upon discovering a Natural Wonder" trigger - @letstalkaboutdune 2023-01-22 19:05:17 +02:00
2b879e14d4 Added "upon founding a city" trigger 2023-01-22 18:59:23 +02:00
83ff2d12d9 Trigger notifications can go in either direction, for better translations 2023-01-22 16:06:42 +02:00
87dfe2e2bf Notifications for stat gain unique 2023-01-22 12:31:07 +02:00
587b1f40f1 Notifications for triggered uniques 2023-01-22 12:19:34 +02:00
7382da5bdf Merge fix (#8393)
Co-authored-by: tunerzinc@gmail.com <vfylfhby>
2023-01-22 01:39:37 +02:00
d662df9e2f chore: Rename CivilizationInfo -> Civilization 2023-01-22 00:28:15 +02:00