Commit Graph

5392 Commits

Author SHA1 Message Date
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
81a5e15413 chore: Rename CityInfo -> City 2023-01-22 00:24:02 +02:00
82010e8564 chore: Rename TileInfo -> Tile 2023-01-22 00:19:25 +02:00
1d84238dc9 chore: move unit upgrade functions to separate class 2023-01-22 00:12:51 +02:00
af24a03cc9 chore: Moved mapunit turn functions to separate class 2023-01-22 00:05:20 +02:00
4beaaadfc8 Added conditionals for above and below resource amounts 2023-01-21 23:36:53 +02:00
1276036c64 Great general unique accepts conditionals - @SpacedOutChicken #3242 2023-01-21 23:10:37 +02:00
bb62f245c7 Resolved #8422 - Allow placing Barbarian encampments in map editor 2023-01-21 22:59:06 +02:00
efcf91dd19 Resolved #8431 - Do not load updated multiplayer if the user has already gone somewhere else 2023-01-21 22:12:52 +02:00
0f4642e033 Version rollout (#8434)
* Bump version and create initial changelog entry

* Update Russian.properties (#8433)

corrected spelling mistakes

* Added new translations, several minor corrections (#8429)

* Added new translations, several minor corrections

* Update android/assets/jsons/translations/Dutch.properties

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

* Update Korean.properties (#8425)

* Update Korean.properties

* Update Korean.properties

* Updated Brazilian_Portuguese.properties (#8424)

* Update French.properties (#8423)

* Update Simplified_Chinese.properties (#8420)

* Update Simplified_Chinese.properties

* Update Simplified_Chinese.properties

* Update German translation (#8419)

* Update Hungarian.properties (#8418)

* Update Hungarian.properties

* Update Hungarian.properties

* Update Hungarian.properties

* Update Italian.properties (#8417)

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: hotorcelexo <IgorPolyakov@users.noreply.github.com>
Co-authored-by: Lena Bullens <95299589+LenaBullens@users.noreply.github.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: qw142536 <123065131+qw142536@users.noreply.github.com>
Co-authored-by: MartinP <mape6@posteo.de>
Co-authored-by: balazsszalab <balazsszalab@freemail.hu>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
2023-01-21 19:49:09 +02:00
f201799a0f Include forked repos in github search. (#8426)
* Include forked repos in github search.

* Include forked repos in github search, the right way.
2023-01-21 19:35:31 +02:00
29decb5f67 AI doesn't declare war until it's sufficiently built up 2023-01-21 19:30:04 +02:00
35a60d4903 fixed even more warnings (#8428)
* unused parameter `tile`

* unchecked cast KMutableProperty0

* replaced Enum.declaringClass with declaringJavaClass to avoid errors in Kotlin 1.9

* removed unused parameter 'previousScreen'

* removed usages of deprecated `religionEnabled`
2023-01-21 19:22:50 +02:00
be995b3c3e Deprecated 'religion enabled' 2023-01-20 11:14:31 +02:00
63d40e3f8a Better 4-corner maps 2023-01-19 23:39:02 +02:00
e38521f5a9 Chore: Moved map normalization functions from TileInfo into MapEditor where they belong 2023-01-19 22:22:03 +02:00
84fd29b294 Chore: Move map editor tabs to separate folder 2023-01-19 22:13:47 +02:00
801116551b Chore: Moved tile stat functions to separate class 2023-01-19 21:56:44 +02:00
98f64b1fd4 Chore: Moved tile improvement functions to separate class 2023-01-19 21:43:21 +02:00
69393eafce Chore: Moved tile improvement functions to separate class 2023-01-19 21:32:58 +02:00
504a15b9a5 map file reorg 2023-01-19 18:42:24 +02:00
508ce0681d Better generation for all map types
Removed 'smoothed random'
2023-01-19 18:33:32 +02:00
4a3ef08324 Better Pangaea generation, no Default map 2023-01-19 18:17:46 +02:00
8fb2d7363f Version rollout (#8416)
* Bump version and create initial changelog entry

* Update Simplified_Chinese.properties (#8415)

* Update Simplified_Chinese.properties

* Update Simplified_Chinese.properties

* Update Hungarian.properties (#8414)

Add few Hungarian translations, fix several existing ones

* Update French.properties (#8413)

* Update Italian.properties (#8411)

* Updated Brazilian_Portuguese.properties (#8409)

* Update German translation (#8406)

* Update German translation

* Update German translation

* Update Spanish.properties (#8402)

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: CrispyXYZ <64761703+CrispyXYZ@users.noreply.github.com>
Co-authored-by: Zoltán Varga <1575861+vargazol@users.noreply.github.com>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: Vitor Gabriel <59321138+Ranbut@users.noreply.github.com>
Co-authored-by: MartinP <mape6@posteo.de>
Co-authored-by: Caballero Arepa <78449553+Caballero-Arepa@users.noreply.github.com>
2023-01-19 12:24:40 +02:00
2ba79d85db Add options to use random number of players and city states. (#8394)
* Add option to use random number of players and city states.

* Fix spaces after =

* Update clone() and toString() of GameParameters

* Make sure at least one AI player when using random players.

* Fix typo in random players initial values.

* Fix for if user chooses random of 0 or 1 city states.

* Move random player and city state toggles to advanced. Move random city state choice to where it will not cache and reveal on next game. Change random city states to use min and max sliders that can be used inverted.

* Add random players min and max sliders.

* Change random players option to use min and max sliders that can be used inverted.
2023-01-19 12:21:39 +02:00
4267816880 Resolved #8378 - can pick a policy with enough culture even if you have no cities 2023-01-19 12:16:30 +02:00
32772c7f73 Korea's unique applies to Library 2023-01-19 12:01:12 +02:00
668fc04a67 Notifications scroll retains position 2023-01-18 22:03:45 +02:00