Commit Graph

4528 Commits

Author SHA1 Message Date
Yair Morgenstern
bc5e486b20 Resolves #9186
Atilla's Court -> Attila's Court, Guten tag -> Guten Tag
2023-04-15 21:00:17 +03:00
Yair Morgenstern
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
WhoIsJohannes
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
Yair Morgenstern
19b243abfe 'Display' options organized into subcatagories - kudos @Ouaz 2023-04-11 11:28:24 +03:00
Ouaz
bc9f75d6e4
Make new "notifications" option translatable (#9154) 2023-04-11 11:07:25 +03:00
letstalkaboutdune
f31d2a9a2a
AbsoluteUnits - Turtle Ship, Ship of the Line, Sea Beggar (#9165) 2023-04-11 07:55:31 +03:00
Yair Morgenstern
a363edaa6a 4.6.0 2023-04-09 18:15:53 +03:00
Vitor Gabriel
974d27667b
Updated Brazilian_Portuguese.properties (#9150) 2023-04-09 18:14:03 +03:00
Yair Morgenstern
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
Yair Morgenstern
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
Yair Morgenstern
7748ef42ab 4.5.17 2023-04-08 22:16:35 +03:00
Yair Morgenstern
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
SomeTroglodyte
6b084f0e6b
Victory screen score charts (#9121)
* VictoryScreen with Charts by WhoIsJohannes

* VictoryScreen with Charts by WhoIsJohannes - atlas

* VictoryScreen with Charts by WhoIsJohannes - lost icon attribution
2023-04-08 21:38:27 +03:00
letstalkaboutdune
735a0f6f40
AbsoluteUnits - Mandekalu Cavalry, Conquistador, Inquisitor (Post-Industrial) (#9115) 2023-04-04 22:06:39 +03:00
AdityaMH
ad080b4dc6
Fix missing desert (again) in wheat farm in flood plains in hexarealm (#9113)
* Fix missing desert for flood plains in hexarealm tileset

* fix typo

* Fix missing desert (again) in wheat farm in flood plains
2023-04-04 16:42:32 +03:00
SomeTroglodyte
4c88fbb996
Change map resource controls presentation (#9104) 2023-04-04 10:52:42 +03:00
SomeTroglodyte
cd4e25a4f1
Victory screen reorg/cleanup (#9111)
* VictoryScreen reorg

* VictoryScreen reorg - use TabbedPager

* VictoryScreen reorg - make helpers reusable

* VictoryScreen reorg - fixed headers

* VictoryScreen reorg - debug access to Replay

* Victories reorg - more cleanup

* VictoryScreen reorg - icons and keys

* VictoryScreen reorg - RankingType

* VictoryScreen reorg - RecreateOnResize

* VictoryScreen reorg - Avoid floating text overlapping buttons

* VictoryScreen reorg - remove obsolete todo
2023-04-04 10:49:58 +03:00
Yair Morgenstern
3c595c8952 4.5.16 2023-04-03 14:56:28 +03:00
Yair Morgenstern
35d5b8c43c
Version rollout (#9100)
* Bump version and create initial changelog entry

* Updated Brazilian_Portuguese.properties (#9094)

* Update Ukrainian.properties (#9093)

* Update Catalan.properties (#9090)

* Update Spanish.properties (#9088)

All tutorial page text

* Update Hungarian.properties (#9084)

* 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 Simplified_Chinese.properties (#9083)

- add more translation

* Update French.properties (#9082)

* Update Turkish.properties (#9081)

Add and revise translations

* Update Bulgarian.properties (#9080)

---------

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: Vitor Gabriel <59321138+Ranbut@users.noreply.github.com>
Co-authored-by: Gualdimar <Gualdimar@users.noreply.github.com>
Co-authored-by: Joan Josep <juanjo.ng.83@gmail.com>
Co-authored-by: Caballero Arepa <78449553+Caballero-Arepa@users.noreply.github.com>
Co-authored-by: balazsszalab <balazsszalab@freemail.hu>
Co-authored-by: Tim <2884320+tim-hub@users.noreply.github.com>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
Co-authored-by: omerfaruk-cakmak <32402595+omerfaruk-cakmak@users.noreply.github.com>
Co-authored-by: Bogomil Stefanov <101423783+vynaaa@users.noreply.github.com>
2023-04-03 14:53:35 +03:00
SomeTroglodyte
a4c4c5f93e
Music player controls (#9087)
* Music controls cleanup

* Music controls cleanup - assets

* Music controls cleanup - fix incorrect attribution
2023-04-01 22:06:46 +03:00
Yair Morgenstern
36b90075da 4.5.15 2023-03-31 16:17:52 +03:00
Yair Morgenstern
9f521895aa
Version rollout (#9079)
* Bump version and create initial changelog entry

* Update Simplified_Chinese.properties (#9078)

- for screen orientation part translation
- and a few due-to missed translation
- and borderless

* Update Ukrainian.properties (#9076)

* Update Hungarian.properties (#9074)

* Update Indonesian.properties (#9071)

* Update Indonesian.properties

* Update Indonesian.properties

---------

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: Tim <2884320+tim-hub@users.noreply.github.com>
Co-authored-by: Gualdimar <Gualdimar@users.noreply.github.com>
Co-authored-by: balazsszalab <balazsszalab@freemail.hu>
Co-authored-by: kensvin <kensvin28@gmail.com>
2023-03-31 15:52:29 +03:00
SomeTroglodyte
45d66f0580
Civilopedia Welcome, moddable (#8940) 2023-03-31 14:58:07 +03:00
Yair Morgenstern
6a153f61dd 4.5.14 2023-03-29 12:21:57 +03:00
Yair Morgenstern
223494fa52
Version rollout (#9069)
* Bump version and create initial changelog entry

* Update for Russian localization (#9068)

Translation for most of lines of text. There are some left as it's impossible to translate those correctly without context, which is not provided in a nice way, so only way to understand their meaning is finding them in-game (Which I couldn't do, unfortunately.)

* Update Spanish.properties (#9066)

* Update Filipino.properties (#9062)

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Italian.properties (#9061)

* Update Brazilian_Portuguese.properties (#9060)

* Update Bulgarian.properties (#9053)

* Update German translation (#9049)

* Update French.properties (#9046)

* Fixed russian translation errors

---------

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: Alex <64156241+Alex-1000@users.noreply.github.com>
Co-authored-by: Caballero Arepa <78449553+Caballero-Arepa@users.noreply.github.com>
Co-authored-by: Shann Aurelle Ripalda <shannaurelleg@gmail.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: Bogomil Stefanov <101423783+vynaaa@users.noreply.github.com>
Co-authored-by: mape6 <mape6@posteo.de>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
2023-03-29 12:19:57 +03:00
letstalkaboutdune
f32bf4a7a4
AbsoluteUnits - Hwach'a, Camel Archer (#9063) 2023-03-29 07:39:12 +03:00
Yair Morgenstern
837833e450 4.5.13 2023-03-26 21:55:23 +03:00
Yair Morgenstern
3047335db1
Version rollout (#9041)
* Bump version and create initial changelog entry

* Update Hungarian.properties (#9028)

* Update Hungarian.properties

* Update Hungarian.properties

* Update French.properties (#9024)

* Updated Brazilian_Portuguese.properties (#9022)

* Update Spanish.properties (#9021)

* Update Spanish.properties

Mini update

* Update Spanish.properties

* Update German translation (#9019)

* Update Polish.properties (#9017)

* Update Filipino.properties (#9015)

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Italian.properties (#9012)

* Update Dutch.properties (#9010)

---------

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: balazsszalab <balazsszalab@freemail.hu>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
Co-authored-by: Vitor Gabriel <59321138+Ranbut@users.noreply.github.com>
Co-authored-by: Hello200000 <98656089+Hello200000@users.noreply.github.com>
Co-authored-by: mape6 <mape6@posteo.de>
Co-authored-by: Lesiakower <125187776+Lesiakower@users.noreply.github.com>
Co-authored-by: Shann Aurelle Ripalda <shannaurelleg@gmail.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: dutchwolfgirl <110766475+dutchwolfgirl@users.noreply.github.com>
2023-03-26 21:50:15 +03:00
Yair Morgenstern
7bc28c4588 Returned Perlin map type 2023-03-25 21:58:10 +03:00
SomeTroglodyte
90c295dc1c
Map scroll speed (#8958)
* Allow mouse panning in map editor too

* User control over map panning speed

* User control over map panning speed - german
2023-03-23 23:58:18 +02:00
Yair Morgenstern
df879b1c02 4.5.12 2023-03-23 22:05:00 +02:00
Yair Morgenstern
4d573b627c
Version rollout (#9009)
* Bump version and create initial changelog entry

* Update Dutch.properties (#9006)

* Update Hungarian.properties (#9000)

* Update Hungarian.properties

* Update Hungarian.properties

* Update Spanish.properties (#8999)

* Update French.properties (#8997)

* Update Italian.properties (#8988)

* Update Polish.properties (#8987)

* Updated Brazilian_Portuguese.properties (#8984)

* Update German translation (#8983)

* Update Ukrainian.properties (#8982)

* Update Ukrainian.properties

* Update Ukrainian.properties

* Update Ukrainian.properties

* Update Ukrainian.properties

---------

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: dutchwolfgirl <110766475+dutchwolfgirl@users.noreply.github.com>
Co-authored-by: balazsszalab <balazsszalab@freemail.hu>
Co-authored-by: Caballero Arepa <78449553+Caballero-Arepa@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: Lesiakower <125187776+Lesiakower@users.noreply.github.com>
Co-authored-by: Vitor Gabriel <59321138+Ranbut@users.noreply.github.com>
Co-authored-by: mape6 <mape6@posteo.de>
Co-authored-by: Gualdimar <Gualdimar@users.noreply.github.com>
2023-03-23 21:58:56 +02:00
Gualdimar
51f37af1a2
Improvements in science display (#8990)
* Displaying science overflow

* The amount of science from research agreement notification

* Check tech progress at the start of a turn

* Fixed exception

* Better remainingScienceToTech calculation

* Multiple technologies can be researched in one turn

* Small improvements
2023-03-22 21:59:35 +02:00
letstalkaboutdune
d24d8b3d84
AbsoluteUnits - Landsknecht, Knight_v2, Missionary (post-Industrial) (#8993) 2023-03-22 10:20:24 +02:00
Yair Morgenstern
4c694be94b 4.5.11 2023-03-21 14:51:53 +02:00
Yair Morgenstern
af333b214a
Version rollout (#8981)
* Bump version and create initial changelog entry

* Minor swedish update (#8978)

* Minor swedish update

* Update Swedish.properties

* Update Ukrainian.properties (#8975)

* Update Belarusian.properties (#8972)

Edited by MonoDx

* Update Spanish.properties (#8969)

* Update Hungarian.properties (#8965)

* Update Hungarian.properties

* Update Hungarian.properties

* Update Hungarian.properties

* Update Hungarian.properties

---------

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: Mr-Bajs <93934125+Mr-Bajs@users.noreply.github.com>
Co-authored-by: Gualdimar <Gualdimar@users.noreply.github.com>
Co-authored-by: MonoDx <87523240+monodevx@users.noreply.github.com>
Co-authored-by: Caballero Arepa <78449553+Caballero-Arepa@users.noreply.github.com>
Co-authored-by: balazsszalab <balazsszalab@freemail.hu>
2023-03-21 14:47:03 +02:00
SomeTroglodyte
ba15c9c91f
Key binding simpler widget (#8946)
* Keyboard Bindings: Simpler Widget

* Keyboard Bindings: Reset binding

* Keyboard Bindings: Reset binding - patch

* Keyboard Bindings: Simpler Widget - revert opening feature

* Keyboard Bindings: Simpler Widget - improved
2023-03-21 14:08:03 +02:00
Yair Morgenstern
f66076c2a4 4.5.10 2023-03-19 19:00:26 +02:00
Yair Morgenstern
3768932b93
Version rollout (#8963)
* Bump version and create initial changelog entry

* Update Bulgarian.properties (#8955)

* Update Japanese translation (#8950)

* tutorial

* small addition

* Update Filipino.properties (#8949)

* Update Filipino.properties

* Update Filipino.properties

* Update Hungarian.properties (#8943)

* 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 French.properties (#8942)

* Update Polish.properties (#8941)

* Update Polish.properties

* Update Polish.properties

* Update Polish.properties

* Update Polish.properties

* Update Italian.properties (#8939)

* Update German translation (#8937)

* Update Ukrainian.properties (#8936)

* Update Ukrainian.properties

* Update Ukrainian.properties

* Updated Brazilian_Portuguese.properties (#8934)

---------

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: Bogomil Stefanov <101423783+vynaaa@users.noreply.github.com>
Co-authored-by: yuracla <89312848+yuracla@users.noreply.github.com>
Co-authored-by: Shann Aurelle Ripalda <shannaurelleg@gmail.com>
Co-authored-by: balazsszalab <balazsszalab@freemail.hu>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
Co-authored-by: Lesiakower <125187776+Lesiakower@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: mape6 <mape6@posteo.de>
Co-authored-by: Gualdimar <Gualdimar@users.noreply.github.com>
Co-authored-by: Vitor Gabriel <59321138+Ranbut@users.noreply.github.com>
2023-03-19 18:55:54 +02:00
Yair Morgenstern
c3b8eaa6d2 4.5.9 2023-03-16 22:59:52 +02:00
Yair Morgenstern
26e292ab11
Version rollout (#8930)
* Bump version and create initial changelog entry

* Update Polish.properties (#8922)

* Update Spanish.properties (#8918)

* Update French.properties (#8916)

* Update Hungarian.properties (#8915)

* Update Ukrainian.properties (#8914)

* Update Ukrainian.properties

* Update Ukrainian.properties

* Update Ukrainian.properties

* Update Italian.properties (#8913)

* Updated Brazilian_Portuguese.properties (#8911)

* Update Filipino.properties (#8910)

* Update German translation (#8909)

---------

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: Lesiakower <125187776+Lesiakower@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: Gualdimar <Gualdimar@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: Shann Aurelle Ripalda <shannaurelleg@gmail.com>
Co-authored-by: mape6 <mape6@posteo.de>
2023-03-16 22:53:35 +02:00
SomeTroglodyte
5a58d8c39c
Harden and improve "Download Mod from Url" parser (#8924) 2023-03-16 22:43:16 +02:00
Gualdimar
ba63f9a62b
Fixed the positioning of popups after changing the screen orientation on Android (#8927) 2023-03-16 20:48:24 +02:00
Gualdimar
5ee3df96c8
Trade ending notification (#8925)
* Notification of the end of a trade in 3 and 1 turns

* Notification about the loss of an alliance is not shown if the city state is captured.

* Shortened
2023-03-16 14:30:12 +02:00
Caballero Arepa
a4aa5b7b5a
Improved Minimap colors (#8919)
* Improved minimap colors

G&Ks change

* Improved minimap colors

Changes for Vanilla
2023-03-16 14:29:37 +02:00
Yair Morgenstern
9a112728c1 translation fix 2023-03-15 22:28:58 +02:00
Yair Morgenstern
6aef2ff3c6 Resolved #8888 - Added trigger condition notification for several unit triggers 2023-03-15 19:08:50 +02:00
Yair Morgenstern
0a50f6deec 4.5.8 2023-03-15 10:45:19 +02:00
Yair Morgenstern
445bcf9701
Version rollout (#8908)
* Bump version and create initial changelog entry

* Update German translation (#8907)

* Update German translation

* Update German translation

* Update Hungarian.properties (#8902)

* Update Hungarian.properties

* Update Hungarian.properties

* Update Hungarian.properties

* Update Hungarian.properties

* Update Hungarian.properties

* Update Polish.properties (#8898)

* Update Polish.properties

* Update Polish.properties

* Update Polish.properties

* Update Simplified_Chinese.properties (#8895)

* Update Ukrainian.properties (#8893)

* Update French.properties (#8890)

* Updated Brazilian_Portuguese.properties (#8887)

* Update Swedish.properties (#8886)

small update

* Update Italian.properties (#8884)

---------

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: mape6 <mape6@posteo.de>
Co-authored-by: balazsszalab <balazsszalab@freemail.hu>
Co-authored-by: Lesiakower <125187776+Lesiakower@users.noreply.github.com>
Co-authored-by: pdt012 <54163911+pdt012@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: Vitor Gabriel <59321138+Ranbut@users.noreply.github.com>
Co-authored-by: Mr-Bajs <93934125+Mr-Bajs@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
2023-03-15 10:42:29 +02:00
SomeTroglodyte
aab975a61b
Key bindings Step 3 - Better UI (#8891)
* Configurable key bindings - better Widget step 2

* Configurable key bindings - step 2 updated help
2023-03-15 09:05:50 +02:00
SomeTroglodyte
f1c891252e
Fix SelectBox ScrollPane being transparent (#8889)
and make Skin.json conform to JSON standard
2023-03-15 09:04:51 +02:00
Yair Morgenstern
a2da1ff7ee Resolved translation errors at #6131 2023-03-13 23:26:32 +02:00
Yair Morgenstern
860d9425ce 4.5.7 2023-03-13 17:19:43 +02:00
Yair Morgenstern
cad179c701
Version rollout (#8882)
* Bump version and create initial changelog entry

* Updated Brazilian_Portuguese.properties (#8881)

* Minor fixes to the translations (#8879)

* Update Swedish.properties (#8878)

Small update swedish translation

* Update French.properties (#8875)

* Update Polish.properties (#8874)

* Update Bulgarian.properties (#8873)

* Update Spanish.properties (#8870)

* Update Czech.properties (#8868)

* Update Czech.properties

* Update Czech.properties

* Update Ukrainian.properties (#8869)

* Update Ukrainian.properties

* Update Ukrainian.properties

---------

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

---------

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: Vitor Gabriel <59321138+Ranbut@users.noreply.github.com>
Co-authored-by: Jack Rainy <JackRainy@users.noreply.github.com>
Co-authored-by: Mr-Bajs <93934125+Mr-Bajs@users.noreply.github.com>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
Co-authored-by: Lesiakower <125187776+Lesiakower@users.noreply.github.com>
Co-authored-by: Bogomil Stefanov <101423783+vynaaa@users.noreply.github.com>
Co-authored-by: Caballero Arepa <78449553+Caballero-Arepa@users.noreply.github.com>
Co-authored-by: jahodovykolac <79529669+jahodovykolac@users.noreply.github.com>
Co-authored-by: Gualdimar <Gualdimar@users.noreply.github.com>
2023-03-13 17:12:54 +02:00
SomeTroglodyte
db08c30363
Make City center minimum tile yields moddable (#8804)
* Slight cleanup of TileStatFunctions

* Make City center minimum tile yields moddable

* Make City center minimum tile yields moddable - patch1

* Make City center minimum tile yields moddable - patch1
2023-03-13 17:02:08 +02:00
Yair Morgenstern
cd8b68253b All units can be automated
Modders can choose which units get it as a primary action
2023-03-13 16:55:50 +02:00
SomeTroglodyte
10caf8e93e
Key bindings Step 2 (#8872)
* Configurable key bindings - Enable via Hidden debug-option

* Configurable key bindings - better Help

* Configurable key bindings - better Widget step 1
2023-03-12 22:45:06 +02:00
WhoIsJohannes
f4dca2281e
Add Replay feature in VictoryScreen (#8844)
* Add Replay feature in VictoryScreen.

* Add Replay feature in VictoryScreen.

* Support for i18n

* Extract year to text conversion into common util to be used from VictoryScreen.kt and WorldScreenTopBar.kt

* Remove ReplayMapTile and modify MinimapTile so that it can support both use cases.

* Reuse code for spreading out tiles onto tile layer between Minimap and ReplayMap by factoring it out into a new MinimapTileUtil

* Revert "Reuse code for spreading out tiles onto tile layer between Minimap and ReplayMap by factoring it out into a new MinimapTileUtil"

This reverts commit d4cddb4312.

* Add Replay feature in VictoryScreen.

* Add Replay feature in VictoryScreen.

* Support for i18n

* Extract year to text conversion into common util to be used from VictoryScreen.kt and WorldScreenTopBar.kt

* Remove ReplayMapTile and modify MinimapTile so that it can support both use cases.

* Revert some unintentional indentation changes

* Refactor some common logic of Minimap and ReplayMap into MinimapTileUtil

* Slightly increase ReplayMap size and simplify logic to calculate tile size since input is static.

* Indentation again... :|

* Unify isCityCenter & isCapital into an enum in TileHistory and shorten identifiers

* Use city.getTiles() instead of city.tiles in CityInfoConquestFunctions.kt

* Improve tileSize calculation in ReplayMap.kt

* Remove extra padding in VictoryScreen -> Replay to prevent WorldScreenTopBar from acting up on the next turn.

* Make return value of MinimapTileUtil.spreadOutMinimapTiles more useful to callers

* Cancel Replay timer when VictoryScreen is disposed or when Replay is opened again.

* Cancel replay map timer task whenever tab is switched in VictoryScreen

* Improve serialization for TileHistory by using a custom serializer. This removes the need for holding two copies of the same thing and to use String based keys.

* Add backwards compatibility for replay. The replay will start at the turn where it came into play.

* Remove debugging code :|

* Use gameInfo field rather than going throug the global UncivGame...
2023-03-12 19:59:48 +02:00
Yair Morgenstern
22da4b29c8 4.5.6 2023-03-11 20:37:35 +02:00
Yair Morgenstern
42778b6d1c
Version rollout (#8867)
* Bump version and create initial changelog entry

* Update Belarusian.properties (#8858)

* Update Hungarian.properties (#8855)

* Update Hungarian.properties

* Update Hungarian.properties

* Update Hungarian.properties

* Update Hungarian.properties

* Update German translation (#8853)

* Update German translation

* Update German translation

* Updated Brazilian_Portuguese.properties (#8852)

* Update Polish.properties (#8851)

* Update Italian.properties (#8849)

* Update Ukrainian.properties (#8848)

* Update Ukrainian.properties

* Update Ukrainian.properties

* Update french translations. (#8847)

* Complete missing translation.

* Update French.properties

---------

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: MonoDx <87523240+monodevx@users.noreply.github.com>
Co-authored-by: balazsszalab <balazsszalab@freemail.hu>
Co-authored-by: mape6 <mape6@posteo.de>
Co-authored-by: Vitor Gabriel <59321138+Ranbut@users.noreply.github.com>
Co-authored-by: Lesiakower <125187776+Lesiakower@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: Gualdimar <Gualdimar@users.noreply.github.com>
Co-authored-by: HydrolienF <71718798+HydrolienF@users.noreply.github.com>
2023-03-11 20:29:00 +02:00
SomeTroglodyte
793d3387bf
Custom key bindings (#8802)
* Configurable key bindings - linting

* Configurable key bindings - move keyboardAvailable

* Configurable key bindings - separate KeyShortcutDispatcher

* Configurable key bindings - framework

* Configurable key bindings - save and load

* Configurable key bindings - activation

* Configurable key bindings - UI

* Configurable key bindings - more linting

* Configurable key bindings - Separate SettingsSelect

* Configurable key bindings - translation tested

* Configurable key bindings - disclaimer

* Configurable key bindings - disclaimer
2023-03-11 20:12:00 +02:00
letstalkaboutdune
3826a4b7c3
AbsoluteUnits - Great Prophet, Settler (Industrial Era) (#8856)
Also fixed the shadows on numerous vehicle units.
2023-03-10 10:09:34 +02:00
Yair Morgenstern
3e43e03e43 4.5.5 2023-03-08 11:31:28 +02:00
Yair Morgenstern
67bfd6c4e5
Version rollout (#8846)
* Bump version and create initial changelog entry

* update Belarusian.properties (#8843)

* Update Brazilian_Portuguese.properties (#8842)

* Update Spanish.properties (#8838)

* Update Polish.properties (#8837)

* Update Ukrainian.properties (#8833)

* Update French.properties (#8832)

* Update Bulgarian.properties (#8831)

* Update Italian.properties (#8829)

---------

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: MonoDx <87523240+monodevx@users.noreply.github.com>
Co-authored-by: Vitor Gabriel <59321138+Ranbut@users.noreply.github.com>
Co-authored-by: Caballero Arepa <78449553+Caballero-Arepa@users.noreply.github.com>
Co-authored-by: Lesiakower <125187776+Lesiakower@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: Bogomil Stefanov <101423783+vynaaa@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
2023-03-08 11:28:17 +02:00
vegeta1k95
b57232c992
Android: selectable orientation (#8822)
* Android: selectable orientation

* Fix visible rectangle bug, fix auto-rotate behaviour, add translations

* Fix translation

---------

Co-authored-by: vegeta1k95 <vfylfhby>
2023-03-06 10:35:14 +02:00
Yair Morgenstern
d3c084f89f Added 'additional times' to limited actions 2023-03-05 20:03:54 +02:00
Yair Morgenstern
2526a7f835 4.5.4 2023-03-05 19:07:19 +02:00
Yair Morgenstern
35f33cd373
Version rollout (#8827)
* Bump version and create initial changelog entry

* Update Polish.properties (#8825)

* update Simplified_Chinese translation (#8821)

Co-authored-by: chr_56 <_>

* Update Filipino.properties (#8820)

* Update Filipino.properties

* Update Filipino.properties

* Update Brazilian_Portuguese.properties (#8819)

* Update French.properties (#8813)

* Update Hungarian.properties (#8812)

* Update Hungarian.properties

* Update Hungarian.properties

* Update Hungarian.properties

* Update Hungarian.properties

* Update Hungarian.properties

* Update Ukrainian.properties (#8810)

* Update Ukrainian.properties

* Update Ukrainian.properties

---------

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: Lesiakower <125187776+Lesiakower@users.noreply.github.com>
Co-authored-by: chr_56 <30681738+chr56@users.noreply.github.com>
Co-authored-by: Shann Aurelle Ripalda <shannaurelleg@gmail.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: Gualdimar <Gualdimar@users.noreply.github.com>
2023-03-05 19:03:58 +02:00
Ouaz
2175eefcb2
Make "Borderless" display option translatable (#8814) 2023-03-05 09:29:10 +02:00
Yair Morgenstern
911c9ef3c2 4.5.3 2023-03-04 21:08:02 +02:00
Yair Morgenstern
b921898217
Version rollout (#8809)
* Bump version and create initial changelog entry

* Update Simplified_Chinese.properties (#8805)

* Update Simplified_Chinese.properties

* Update Simplified_Chinese.properties

* Update Catalan.properties (#8803)

* Update Catalan.properties

* Update Catalan.properties

* Update Japanese translation (#8799)

* Update Japanese translation

* fix

* Update German translation (#8798)

* Update Filipino.properties (#8797)

* Update Polish.properties (#8792)

* Update Polish.properties

* Update Polish.properties

* Update Bulgarian.properties (#8791)

* Update Ukrainian.properties (#8788)

* Update Ukrainian.properties

* Update Ukrainian.properties

* Update Spanish.properties (#8784)

* Update French.properties (#8783)

* Update Italian.properties (#8782)

* Updated Brazilian_Portuguese.properties (#8781)

---------

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: qw142536 <123065131+qw142536@users.noreply.github.com>
Co-authored-by: Joan Josep <juanjo.ng.83@gmail.com>
Co-authored-by: yuracla <89312848+yuracla@users.noreply.github.com>
Co-authored-by: mape6 <mape6@posteo.de>
Co-authored-by: Shann Aurelle Ripalda <shannaurelleg@gmail.com>
Co-authored-by: Lesiakower <125187776+Lesiakower@users.noreply.github.com>
Co-authored-by: Bogomil Stefanov <101423783+vynaaa@users.noreply.github.com>
Co-authored-by: Gualdimar <Gualdimar@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: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: Vitor Gabriel <59321138+Ranbut@users.noreply.github.com>
2023-03-04 21:02:02 +02:00
MonoDx
8b61e33cf2
I would to maintain bel lang. (#8801)
Created by monodx.
2023-03-04 20:50:27 +02:00
vegeta1k95
f55e010451
Android: "Screen Mode" option (#8785)
* Android: "Screen Mode" option

* Fix broken tests, code cleanup

* Fix broken tests, code cleanup

* Fix broken tests, code cleanup

---------

Co-authored-by: vegeta1k95 <vfylfhby>
2023-03-04 19:22:09 +02:00
SomeTroglodyte
c40b6159df
Better Religion info and some moddability (#8807)
* Make maximum number of religions moddable

* Explain remaining religion count in Empire Overview
2023-03-04 19:20:23 +02:00
Yair Morgenstern
253c669ba9 Added 'after which this unit is consumed' for units whose only purpose is limited actions 2023-03-03 16:37:11 +02:00
SomeTroglodyte
29982eba9e
Show terrain overriding yields in Civilopedia (#8796) 2023-03-03 16:07:42 +02:00
Yair Morgenstern
608e0dfb71 Added limited usage for actions! 2023-03-03 14:47:50 +02:00
Yair Morgenstern
c3a4a18bba Replace unit action for timed golden ages with a generic triggered unique
Triggered uniques display side effects
2023-03-03 14:13:00 +02:00
Yair Morgenstern
a1453a8b37 chore: Added explicit unit consumption to Settlers' Found City unique 2023-03-02 22:07:34 +02:00
Yair Morgenstern
3e4edaff8a 4.5.2 2023-03-01 21:30:53 +02:00
Yair Morgenstern
0a4066f9c4
Version rollout (#8780)
* Bump version and create initial changelog entry

* Updated Brazilian_Portuguese.properties (#8775)

* Update French.properties (#8774)

* Update Polish.properties (#8772)

* Update Bulgarian.properties (#8771)

* Added some Bulgarian translations

* Removed unnecessary comments

When adding the translations, I forgot to remove some "# Requires translation!" comments

* Update Bulgarian.properties

* Update Ukrainian.properties (#8768)

* Update Ukrainian.properties

* Update Ukrainian.properties

* Update German translation (#8767)

* Update German translation

* Update German translation

* Update Italian.properties (#8765)

---------

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: Vitor Gabriel <59321138+Ranbut@users.noreply.github.com>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
Co-authored-by: Lesiakower <125187776+Lesiakower@users.noreply.github.com>
Co-authored-by: Bogomil Stefanov <101423783+vynaaa@users.noreply.github.com>
Co-authored-by: Gualdimar <Gualdimar@users.noreply.github.com>
Co-authored-by: mape6 <mape6@posteo.de>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
2023-03-01 21:21:42 +02:00
Leonard Günther
50da1ee90a
Fixed wrong implementation of Basic auth (#8779)
* Fixed wrong implementation of Basic auth

+ added min length for passwords

* Fixed basic auth being compressed

+ added function to get auth header from settings
2023-03-01 21:12:12 +02:00
Yair Morgenstern
e1c5953389 Show death symbol next to actions that expend the unit 2023-03-01 20:55:02 +02:00
Yair Morgenstern
5e85c3ca72 "by consuming this unit" is better 2023-03-01 16:35:06 +02:00
Yair Morgenstern
ae501c3750 'create improvement' action, <consuming this unit> and <as an action> modifiers 2023-03-01 16:09:44 +02:00
vegeta1k95
494fde53cf
Cleaning: platform specifics and UncivGame (#8773)
* Cleanup: platform specifics + UncivGame

* Fix tests

* Fix requests not clearing

---------

Co-authored-by: vegeta1k95 <vfylfhby>
2023-02-28 18:56:57 +02:00
AdityaMH
81c4057488
Fix missing desert for flood plains in hexarealm tileset (#8776)
* Fix missing desert for flood plains in hexarealm tileset

* fix typo
2023-02-28 18:56:44 +02:00
Leonard Günther
8f7fcb2e3e
Fixed TurnChecker can not authenticate (#8770) 2023-02-27 16:51:27 +02:00
Yair Morgenstern
51ef8c3ccf 4.5.1 2023-02-27 11:26:48 +02:00
Yair Morgenstern
36ea383c2f
Version rollout (#8764)
* Bump version and create initial changelog entry

* Update French.properties (#8761)

* Update Italian.properties (#8757)

* Added some bulgarian translations (#8756)

* Added some Bulgarian translations

* Removed unnecessary comments

When adding the translations, I forgot to remove some "# Requires translation!" comments

* Update Catalan.properties (#8754)

* Update Polish.properties (#8752)

* Update Polish.properties

* Update Polish.properties

* Update Brazilian_Portuguese.properties (#8750)

* Update Spanish.properties (#8749)

---------

Co-authored-by: yairm210 <yairm210@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: vynaaa <101423783+vynaaa@users.noreply.github.com>
Co-authored-by: Joan Josep <juanjo.ng.83@gmail.com>
Co-authored-by: Lesiakower <125187776+Lesiakower@users.noreply.github.com>
Co-authored-by: Vitor Gabriel <59321138+Ranbut@users.noreply.github.com>
Co-authored-by: Caballero Arepa <78449553+Caballero-Arepa@users.noreply.github.com>
2023-02-27 11:24:31 +02:00
Yair Morgenstern
44399e770c Added triggered uniques to grant specific tech / policy 2023-02-27 10:58:08 +02:00
Yair Morgenstern
8e17c9ed98 4.5.0-patch2
Lazy loading of system fonts so startup is fast
2023-02-26 09:33:02 +02:00
letstalkaboutdune
fd9fc914bc
AbsoluteUnits - Chu-Ko-Nu, Longbowman, Crossbowman v2 (#8751) 2023-02-26 09:05:36 +02:00
Yair Morgenstern
ad9942c532 4.5.0 2023-02-25 21:03:52 +02:00
Yair Morgenstern
b6942abbd9
Version rollout (#8746)
* Bump version and create initial changelog entry

* Updated Brazilian_Portuguese.properties (#8745)

* Update French.properties (#8743)

* Update Catalan.properties (#8742)

* Update Italian.properties (#8740)

* Update Spanish.properties (#8735)

---------

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: Vitor Gabriel <59321138+Ranbut@users.noreply.github.com>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
Co-authored-by: Joan Josep <juanjo.ng.83@gmail.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-02-25 20:54:41 +02:00
Leonard Günther
a3f511efd2
Added password authentication as server feature (#8716)
* Added authenticate and setPassword

* Added AuthPopup

* Added auth endpoint to UncivServer

* Fixed merge confict

* Added close button to AuthPopup

+ Fixed crash if no server is available

* Added entries to template properties

* Fixed setting password does not work

if authentication is required

+ Added server check on game startup in case the server has changed its feature set

* Added support for different passwords

on different servers

+ Cleanup for MultiplayerTab

* Added current password as hint

+ removed character hiding in auth popup
+ added popup to indicate auth success on connection check
2023-02-25 20:42:36 +02:00
SomeTroglodyte
5d80f50d93
Show UnitTypes in Civilopedia (#8729)
* Show UnitTypes in Civilopedia

* Show UnitTypes in Civilopedia - polish
2023-02-25 20:40:59 +02:00
Yair Morgenstern
3278cbc904 4.4.19 2023-02-23 23:11:30 +02:00
Yair Morgenstern
1eba9bb4d9
Version rollout (#8732)
* Bump version and create initial changelog entry

* Update French.properties (#8726)

* Update Italian.properties (#8722)

* Updated Brazilian_Portuguese.properties (#8720)

* Updated Brazilian_Portuguese.properties

* Updated Brazilian_Portuguese.properties

* Update Spanish.properties (#8719)

---------

Co-authored-by: yairm210 <yairm210@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: Caballero Arepa <78449553+Caballero-Arepa@users.noreply.github.com>
2023-02-23 23:05:16 +02:00
vegeta1k95
b5ce086860
Android: use best possible device frame rate (#8728)
* Android: use best possible device frame rate

* Add support for devices with Android 6.0+

---------

Co-authored-by: vegeta1k95 <vfylfhby>
2023-02-23 22:40:58 +02:00
Yair Morgenstern
7b1a5e296c modding: Added "upon gaining a [unitFilter] unit" trigger condition 2023-02-22 09:32:50 +02:00
Caballero Arepa
5da46e727c
Add 'neutral' Flood plains (#8721) 2023-02-22 09:15:05 +02:00
Yair Morgenstern
980dc6b6c8 4.4.18 2023-02-21 23:55:12 +02:00
Yair Morgenstern
cb8d75d23b
Version rollout (#8718)
* Bump version and create initial changelog entry

* Update French.properties (#8714)

* Update Ukrainian.properties (#8712)

* Update Italian.properties (#8710)

* Update German translation (#8709)

* Update German translation

* Update German translation

* Update German translation

---------

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
Co-authored-by: Gualdimar <Gualdimar@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: mape6 <mape6@posteo.de>
2023-02-21 23:24:03 +02:00
vegeta1k95
c593056e42
Modding: allow mods to supply custom fonts (#8715)
* Modding: allow mods to supply custom fonts

* Cleanup

* Code cleanup

---------

Co-authored-by: vegeta1k95 <vfylfhby>
2023-02-21 23:09:11 +02:00
Yair Morgenstern
2530039c80 Civilopedia entry for policy links to units and buildings that it enables/disables 2023-02-20 13:34:59 +02:00
Yair Morgenstern
985867ed95 4.4.17 2023-02-20 09:01:17 +02:00
Yair Morgenstern
a4ab0f7f16
Version rollout (#8708)
* Bump version and create initial changelog entry

* Update French.properties (#8703)

* Update Spanish.properties (#8698)

* Updated Brazilian_Portuguese.properties (#8697)

* Update Ukrainian.properties (#8696)

* Update Ukrainian.properties

* Update Ukrainian.properties

* Update Hungarian.properties (#8695)

* 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: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
Co-authored-by: Caballero Arepa <78449553+Caballero-Arepa@users.noreply.github.com>
Co-authored-by: Vitor Gabriel <59321138+Ranbut@users.noreply.github.com>
Co-authored-by: Gualdimar <Gualdimar@users.noreply.github.com>
Co-authored-by: balazsszalab <balazsszalab@freemail.hu>
2023-02-20 08:44:49 +02:00
Yair Morgenstern
c6b888e6ed Fix android build 2023-02-19 16:35:20 +02:00
Yair Morgenstern
0b5ded98c9 chore: diplomatic modifier text auto-translated 2023-02-19 11:20:19 +02:00
Yair Morgenstern
ccec56e2c7 4.4.16 2023-02-18 20:38:37 +02:00
Yair Morgenstern
a244c4f50d
Version rollout (#8694)
* Bump version and create initial changelog entry

* Update Hungarian.properties (#8692)

* Update Hungarian.properties

* Update Hungarian.properties

* Update Polish.properties (#8691)

* Update Simplified_Chinese.properties (#8690)

* Minor corrections to translations (#8688)

* Minor corrections

* Additional translations

* Original known translation of the quota

* Update Ukrainian.properties (#8685)

* Update Ukrainian.properties

* Update Ukrainian.properties

* Update French.properties (#8683)

* Update French.properties

* Update French.properties

* Update Spanish.properties (#8680)

* Update Spanish.properties

* Update Spanish.properties

* #8679

* Updated Brazilian_Portuguese.properties (#8678)

* Updated Brazilian_Portuguese.properties

* Updated Brazilian_Portuguese.properties

---------

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: balazsszalab <balazsszalab@freemail.hu>
Co-authored-by: Lesiakower <125187776+Lesiakower@users.noreply.github.com>
Co-authored-by: qw142536 <123065131+qw142536@users.noreply.github.com>
Co-authored-by: Jack Rainy <JackRainy@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: Caballero Arepa <78449553+Caballero-Arepa@users.noreply.github.com>
Co-authored-by: Vitor Gabriel <59321138+Ranbut@users.noreply.github.com>
2023-02-18 20:21:07 +02:00
Yair Morgenstern
bfaae54890 Mod sizes larger than 2 MB are displayed in MB 2023-02-18 19:25:07 +02:00
vegeta1k95
01204f5aee
Desktop: world camera autoscroll, selectable window mode (#8679)
* Desktop: world camera autoscroll, selectable window mode

* Map auto-scroll is optional

* Fix option update, more scroll speed

* Fix translation

---------

Co-authored-by: vegeta1k95 <vfylfhby>
2023-02-17 02:12:32 +02:00
Gualdimar
7114a67d2c
Pending trades (#8681)
* Added pending trade offers to the trade overview screen

* Fixed offer trade button state

* Fixed space

* Small fixes
2023-02-17 00:46:21 +02:00
Yair Morgenstern
6a70026fee 4.4.15 2023-02-14 22:21:26 +02:00
Yair Morgenstern
d1b47199b7
Version rollout (#8677)
* Bump version and create initial changelog entry

* Update Ukrainian.properties (#8676)

* Update Spanish.properties (#8675)

* Update Polish.properties (#8672)

* Update Hungarian.properties (#8668)

* Update Hungarian.properties

* Update Hungarian.properties

* Update Hungarian.properties

* Update Hungarian.properties

* Updated Brazilian_Portuguese.properties (#8667)

* Update Filipino.properties (#8666)

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

---------

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: Gualdimar <Gualdimar@users.noreply.github.com>
Co-authored-by: Caballero Arepa <78449553+Caballero-Arepa@users.noreply.github.com>
Co-authored-by: Lesiakower <125187776+Lesiakower@users.noreply.github.com>
Co-authored-by: balazsszalab <balazsszalab@freemail.hu>
Co-authored-by: Vitor Gabriel <59321138+Ranbut@users.noreply.github.com>
Co-authored-by: Shann Aurelle Ripalda <shannaurelleg@gmail.com>
2023-02-14 22:16:37 +02:00
vegeta1k95
a8a458ab48
Blockade mechanics (#8654)
* Fix centering of unit HP bar

* Blockade mechanics: land tiles

* Blockade mechanics: water tiles

* Don't blockade water tile if it has friendly military unit

* Blockade mechanics: cities

* Added tile/city blockade tutorials. Added city blockade status icon.

---------

Co-authored-by: vegeta1k95 <vfylfhby>
2023-02-14 22:13:25 +02:00
Yair Morgenstern
d9b259c7fc Added Farm-Pillaged image 2023-02-13 23:24:40 +02:00
Yair Morgenstern
8db7f6d720 Resolved #7476 - added option for pillaged improvements 2023-02-13 23:11:05 +02:00
Yair Morgenstern
cc2d1bf6f2 Resolved #8614 - trades evaluated correctly 2023-02-13 20:34:09 +02:00
vegeta1k95
1b22d810c5
Experimental: mitigate texture swapping with TextureArraySpriteBatch (#8604)
* Performance optimization: less texture swapping

* Added experimental setting to Options-Display

---------

Co-authored-by: tunerzinc@gmail.com <vfylfhby>
2023-02-13 09:45:05 +02:00
Yair Morgenstern
03bb0b3b79
Version rollout (#8663)
* Bump version and create initial changelog entry

* Update Polish.properties (#8662)

* Update Filipino.properties (#8659)

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Czech.properties (#8657)

* Update Hungarian.properties (#8642)

---------

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: Lesiakower <125187776+Lesiakower@users.noreply.github.com>
Co-authored-by: Shann Aurelle Ripalda <shannaurelleg@gmail.com>
Co-authored-by: Weverak <74535809+Weverak@users.noreply.github.com>
Co-authored-by: balazsszalab <balazsszalab@freemail.hu>
2023-02-12 20:04:50 +02:00
Yair Morgenstern
6bcaed7947 Resolved #8647 - fixed Guruship belief 2023-02-12 19:34:40 +02:00
letstalkaboutdune
47bbd996ae
AbsoluteUnits - Berserker, Samurai, Longswordsman_v2 (#8652) 2023-02-11 21:52:16 +02:00
Yair Morgenstern
312f308060 4.4.13 2023-02-09 19:37:51 +02:00
Yair Morgenstern
5477a62a10
Version rollout (#8638)
* Bump version and create initial changelog entry

* Update Filipino.properties (#8635)

* Update Filipino.properties

* Update Filipino.properties

* Update Ukrainian.properties (#8632)

* Update Hungarian.properties (#8626)

---------

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: Shann Aurelle Ripalda <shannaurelleg@gmail.com>
Co-authored-by: Gualdimar <Gualdimar@users.noreply.github.com>
Co-authored-by: balazsszalab <balazsszalab@freemail.hu>
2023-02-09 19:33:36 +02:00
vegeta1k95
ca86e6fde7
Enemy indicator, city culture hex outline + misc (#8629)
* Rework of UnitGroup, City culture tile hex-outline, tweak enemy indicators

* Rework of UnitGroup, City culture tile hex-outline, tweak enemy indicators

* Better embarked selection sprite

* Small fixes

* Hotfix fog

---------

Co-authored-by: tunerzinc@gmail.com <vfylfhby>
2023-02-09 18:46:02 +02:00
Yair Morgenstern
c2c03d8202 4.4.12 2023-02-07 22:31:56 +02:00
Yair Morgenstern
fac8fbc6d2
Version rollout (#8617)
* Bump version and create initial changelog entry

* Update Filipino.properties (#8609)

* Update Ukrainian translation (#8607)

* Update Ukrainian.properties

* Update Ukrainian.properties

* Update Hungarian.properties (#8606)

* 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 Italian.properties (#8605)

---------

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: Shann Aurelle Ripalda <shannaurelleg@gmail.com>
Co-authored-by: Gualdimar <Gualdimar@users.noreply.github.com>
Co-authored-by: balazsszalab <balazsszalab@freemail.hu>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
2023-02-07 22:25:18 +02:00
Yair Morgenstern
c171376479 4.4.11 2023-02-06 16:40:17 +02:00
Yair Morgenstern
040fcd10d3
Version rollout (#8603)
* Bump version and create initial changelog entry

* Update German translation (#8597)

* Update French.properties (#8590)

* Update Czech.properties (#8587)

* Update Spanish.properties (#8581)

* Updated Brazilian_Portuguese.properties (#8580)

* Updated Brazilian_Portuguese.properties

* Updated Brazilian_Portuguese.properties

* Updated Brazilian_Portuguese.properties

* Update Ukrainian.properties (#8577)

---------

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: MartinP <mape6@posteo.de>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
Co-authored-by: jahodovykolac <79529669+jahodovykolac@users.noreply.github.com>
Co-authored-by: Caballero Arepa <78449553+Caballero-Arepa@users.noreply.github.com>
Co-authored-by: Vitor Gabriel <59321138+Ranbut@users.noreply.github.com>
Co-authored-by: Gualdimar <Gualdimar@users.noreply.github.com>
2023-02-06 16:23:57 +02:00
vegeta1k95
4e15a1581b
City Screen improvements (#8598)
* City Screen improvements

* Buy icon reverted to Gold icon

---------

Co-authored-by: tunerzinc@gmail.com <vfylfhby>
2023-02-06 15:22:36 +02:00
lishaoxia1985
4b2d4a3877
Gradle update, offerButton.isEnabled = false in initial (#8600) 2023-02-06 14:21:46 +02:00
Yair Morgenstern
78bd9693a1 4.4.10 2023-02-04 23:31:44 +02:00
Yair Morgenstern
902b08e38f
Version rollout (#8576)
* Bump version and create initial changelog entry

* Update Traditional_Chinese.properties (#8562)

* Update Ukrainian.properties (#8557)

* Update Ukrainian.properties

* Update Ukrainian.properties

* Update Ukrainian.properties

* Update Ukrainian.properties

* Update Ukrainian.properties

* Update Ukrainian.properties

* Update Spanish.properties (#8555)

* Update French.properties (#8554)

* Update Hungarian.properties (#8553)

* 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: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: LibertyBell <72909724+iamlibertybell@users.noreply.github.com>
Co-authored-by: Gualdimar <Gualdimar@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>
2023-02-04 23:26:58 +02:00
letstalkaboutdune
8e94998106
AbsoluteUnits - Cataphract, Companion Cavalry, Horseman_v2 (#8567) 2023-02-04 19:35:56 +02:00
Yair Morgenstern
662b3a5e08 Fixed unique buildings and units not replacing originals 2023-02-03 13:12:00 +02:00
alexban011
3180fce94d
Fix UX of random nations pool && keep advanced tab open when updating the screen (#8452)
* added feature to select specific city states

created MultiNationSelectPopup to reuse for the city states

* keep advanced tab open when update() is called

* Revert "added feature to select specific city states"

This reverts commit 4a1e6964b0.

* improved UX

* translations

* fix checks
2023-02-03 09:51:18 +02:00
Yair Morgenstern
3600654f00 4.4.9 2023-02-02 17:19:13 +02:00
Yair Morgenstern
ccabc6164c
Version rollout (#8546)
* Bump version and create initial changelog entry

* Update Korean.properties (#8544)

* Update Ukrainian.properties (#8528)

* Update Ukrainian.properties

* Update Ukrainian.properties

* Update Ukrainian.properties

* Update Ukrainian.properties

* Update German translation (#8527)

* Update German translation

* Fixed manufactory

* Update Hungarian.properties (#8525)

* Update Hungarian.properties

* Update Hungarian.properties

* Update Hungarian.properties

* Update Hungarian.properties

---------

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: Yattong the Mackerel <saud2410@naver.com>
Co-authored-by: Gualdimar <Gualdimar@users.noreply.github.com>
Co-authored-by: MartinP <mape6@posteo.de>
Co-authored-by: balazsszalab <balazsszalab@freemail.hu>
2023-02-02 17:15:35 +02:00
Gualdimar
5a267e436c
Add Reset tutorials button (#8536)
* Add Reset tutorials button

* Fix typo
2023-02-02 13:33:07 +02:00
Yair Morgenstern
fc4317975f 4.4.8 2023-01-31 23:49:06 +02:00
Yair Morgenstern
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
Yair Morgenstern
3376a71dc7 Resolved #8499 - removed duplicate translation line 2023-01-31 23:18:22 +02:00
Yair Morgenstern
191ea76129 4.4.7 2023-01-30 09:31:31 +02:00
Yair Morgenstern
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
Yair Morgenstern
90f3aee2eb 4.4.6 2023-01-25 22:14:45 +02:00
Yair Morgenstern
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
Yair Morgenstern
ff696a9272 Resolved #8463 - tutorial task mistake 2023-01-25 20:30:08 +02:00
Yair Morgenstern
a4fde1ae3c Resolved #8158 - Fallback images for all major objects 2023-01-24 23:52:34 +02:00
Yair Morgenstern
04cb4bd2a9 Resolved #7177 - Android custom location save 2023-01-23 23:55:21 +02:00
Ouaz
dd9f946de9
Fix missing ' = ' (#8459) 2023-01-23 22:39:46 +02:00
Yair Morgenstern
37c656fcb4 "Extension mods:" -> "Extension mods" 2023-01-23 21:10:16 +02:00
Yair Morgenstern
52c3f14bde 4.4.5 2023-01-23 11:35:17 +02:00
Yair Morgenstern
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
alexban011
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
letstalkaboutdune
2167f65c1b
AbsoluteUnits - Mohawk Warrior, Swordsman_v2 (#8447) 2023-01-23 11:05:04 +02:00
Yair Morgenstern
783a469da5 chore: separated unit actions into several files 2023-01-23 00:42:45 +02:00
Yair Morgenstern
39e88d3a1a Added "upon discovering a Natural Wonder" trigger - @letstalkaboutdune 2023-01-22 19:05:17 +02:00
Yair Morgenstern
2b879e14d4 Added "upon founding a city" trigger 2023-01-22 18:59:23 +02:00
Yair Morgenstern
83ff2d12d9 Trigger notifications can go in either direction, for better translations 2023-01-22 16:06:42 +02:00
Yair Morgenstern
87dfe2e2bf Notifications for stat gain unique 2023-01-22 12:31:07 +02:00
Yair Morgenstern
587b1f40f1 Notifications for triggered uniques 2023-01-22 12:19:34 +02:00
Yair Morgenstern
fbdf980365 4.4.4 2023-01-21 19:52:30 +02:00
Yair Morgenstern
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
Yair Morgenstern
508ce0681d Better generation for all map types
Removed 'smoothed random'
2023-01-19 18:33:32 +02:00
Yair Morgenstern
e57831ff0b 4.4.3 2023-01-19 12:29:41 +02:00
Yair Morgenstern
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
Philip Keiter
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
Yair Morgenstern
211a637e31 Fixed Android build, hopefully 2023-01-18 19:28:16 +02:00
Bamboolord
1a64184600
Remove China's faith boost when reaching classical era (#8410)
Removes the instant faith boost upon reaching Classical era from China's Unique ability. This is to match Civ5 again and because it probably wasn't supposed to be there in the first place.
2023-01-18 16:38:15 +02:00
Yair Morgenstern
62c03d9545 4.4.2 2023-01-17 23:06:45 +02:00
Yair Morgenstern
e758c9bad7
Version rollout (#8401)
* Bump version and create initial changelog entry

* Update Catalan.properties (#8397)

* Update German translation (#8392)

* Update Italian.properties (#8391)

* Patch 1 (#1) (#8390)

* New Hungarian translations of descriptions

Edited entries are:
StartWithCapitalLetter
Fastlane_short_description
Fastlane_full_description

* Fixed Catalan translation error

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: Joan Josep <juanjo.ng.83@gmail.com>
Co-authored-by: MartinP <mape6@posteo.de>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: balazsszalab <balazsszalab@freemail.hu>
2023-01-17 23:05:08 +02:00
Yair Morgenstern
7c52e25a1d Added trigger conditional for capturing city 2023-01-16 22:39:52 +02:00
Yair Morgenstern
358f01079c Added 'upon adopting policy' trigger 2023-01-16 21:20:14 +02:00
Yair Morgenstern
2593c35e30 Added 'upon declaring war' trigger 2023-01-16 21:13:40 +02:00
Yair Morgenstern
cbd7f7ac5c Added trigger conditions framework! 2023-01-16 21:05:59 +02:00
Yair Morgenstern
59a7300c43 Reverted Himeji Castle change - see #6131 2023-01-16 15:43:33 +02:00
Yair Morgenstern
fe1d258c05 4.4.1 2023-01-15 23:43:28 +02:00
Yair Morgenstern
9d149fb2cf
Version rollout (#8386)
* Bump version and create initial changelog entry

* Update French.properties (#8385)

* Provide missing Ukrainian translations (#8384)

Co-authored-by: Kostiantyn Kolesnichenko <mormat.iam@gmail.com>

* Update Korean.properties (#8380)

* Updated Brazilian_Portuguese.properties (#8379)

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
Co-authored-by: Kostiantyn Kolesnichenko <test9@mormat.name>
Co-authored-by: Kostiantyn Kolesnichenko <mormat.iam@gmail.com>
Co-authored-by: Yattong the Mackerel <saud2410@naver.com>
Co-authored-by: Vitor Gabriel <59321138+Ranbut@users.noreply.github.com>
2023-01-15 23:36:32 +02:00
Yair Morgenstern
d1a9caaa88 New tile visibility framework! 2023-01-15 10:54:41 +02:00
Yair Morgenstern
b5281e20c9 4.4.0 2023-01-14 21:27:11 +02:00
itanasi
22f9936a34
Add Transform Action for mods (#8120)
* Initial version of code

* Enable cost=0 for buttons

* Add Conditional to Transform

* Fix translation file

* Add icon
Allow other Conditionals

* Updated icon

* Add credit

* switch hotkey

* Fix icon

* Remove Conditional Costs

* Remove vestigal Stats costs for Transform

* Minor cleanup
2023-01-14 20:43:48 +02:00
Yair Morgenstern
9fee185f5d
Version rollout (#8377)
* Bump version and create initial changelog entry

* Update Spanish.properties (#8370)

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: Caballero Arepa <78449553+Caballero-Arepa@users.noreply.github.com>
2023-01-14 20:37:22 +02:00
Yair Morgenstern
d43716ea90 Resolved #8374 - Better Himeji Castle unique text 2023-01-14 19:02:05 +02:00
letstalkaboutdune
61d3bdead4
Fixed Huns nation color (#8369) 2023-01-12 23:39:14 +02:00
letstalkaboutdune
3c47dd4a31
AbsoluteUnits - Unique Romans (#8365) 2023-01-12 20:20:01 +02:00
Yair Morgenstern
54a192558f Changed nation's colors according to poll results 2023-01-12 15:14:55 +02:00
Yair Morgenstern
fa3296d3bc Fixed nation contrast issues 2023-01-12 10:19:20 +02:00
Yair Morgenstern
2251824d94 Recognize uncontrasting colors for nations according to WCAG guidelines, and suggest tinted versions to conform 2023-01-12 10:06:37 +02:00
Yair Morgenstern
9d2915b37b 4.3.20 2023-01-11 19:14:27 +02:00
Yair Morgenstern
fb4029e5d4
Version rollout (#8358)
* Bump version and create initial changelog entry

* Update Traditional_Chinese.properties (#8356)

Fullwidth "(" and halfwidth  "(" are both exist at this file. Not sure which one to choose. Need to clean up. Adjust some translate to match each other.

* Update Filipino.properties (#8355)

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update French.properties (#8349)

* Complete Ukrainian transation (#8348)

Co-authored-by: Kostiantyn Kolesnichenko <mormat.iam@gmail.com>

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: LibertyBell <72909724+iamlibertybell@users.noreply.github.com>
Co-authored-by: Shann Aurelle Ripalda <shannaurelleg@gmail.com>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
Co-authored-by: Kostiantyn Kolesnichenko <test9@mormat.name>
Co-authored-by: Kostiantyn Kolesnichenko <mormat.iam@gmail.com>
2023-01-11 19:10:40 +02:00
letstalkaboutdune
e417c67ced
AbsoluteUnits - Unique Triremes (#8354)
* AbsoluteUnits - Unique Triremes

Also increased banner size (2x each dimension) and fixed a typo in a Steam asset filename

* Update banner.png
2023-01-11 09:16:24 +02:00
Yair Morgenstern
587e9b7686 Changed Windows icon for Unciv to new icon 2023-01-09 23:36:48 +02:00
Yair Morgenstern
7fe2b9e99b Resolved #8350 - unit icons no longer overlap unit action images, improved render time for unit images 2023-01-09 23:30:23 +02:00
Yair Morgenstern
8cd9bca7bf MoveTo image visible - #8350 2023-01-09 22:17:28 +02:00
vegeta1k95
0006aaef55
Modding: allow custom ResourcePortraits (#8330)
* Modding: allow custom ResourcePortraits

* Modding: big generification of the icons/portraits mechanism

* Resolve conflict

* Fix background fallback, remove dimming of improvement icons

Co-authored-by: tunerzinc@gmail.com <vfylfhby>
2023-01-09 21:03:00 +02:00
Yair Morgenstern
506d9e65ff 4.3.19 2023-01-09 19:37:35 +02:00
Yair Morgenstern
a7b45251d4
Version rollout (#8347)
* Bump version and create initial changelog entry

* Update Italian.properties (#8345)

* Update German translation (#8344)

* Update Catalan.properties (#8342)

* Update Korean.properties (#8341)

* Update Korean.properties

* Update Korean.properties

* Update Korean.properties

* Update Brazilian_Portuguese.properties (#8340)

* Update Simplified_Chinese.properties (#8339)

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: MartinP <mape6@posteo.de>
Co-authored-by: Joan Josep <juanjo.ng.83@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: xk730 <40309144+xk730@users.noreply.github.com>
2023-01-09 19:30:31 +02:00
letstalkaboutdune
9600a254d4
Platform Graphical Asset Update (#8343)
* Platform Graphical Asset Update

Updated repository graphical assets to match latest versions being used on all storefronts

* Update banner.png

* Reverted GH, resized banner
2023-01-09 19:08:46 +02:00
Yair Morgenstern
2b0bd6a5f9 Updated Unciv Android icons 2023-01-08 19:58:12 +02:00
Yair Morgenstern
f9da3204b6 Resolve #8336 - Remove 'incorrect area' code for super-old maps 2023-01-08 19:09:17 +02:00
Yair Morgenstern
37cfc12a64 4.3.18 2023-01-08 15:11:45 +02:00
Yair Morgenstern
2863143122
Version rollout (#8338)
* Bump version and create initial changelog entry

* fix SimplifiedChinese translation (#8331)

Co-authored-by: chr56 <_>

* Fixed 'ConditionalsPlacement' with 'after' (#8319)

* Update Simplified_Chinese.properties (#8318)

* Update Simplified_Chinese.properties

* A little modification

* Update Korean.properties (#8317)

* Update Italian.properties (#8316)

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: chr_56 <30681738+chr56@users.noreply.github.com>
Co-authored-by: Vitor Gabriel <59321138+Ranbut@users.noreply.github.com>
Co-authored-by: CrispyXYZ <64761703+CrispyXYZ@users.noreply.github.com>
Co-authored-by: Yattong the Mackerel <saud2410@naver.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
2023-01-08 15:05:00 +02:00
Yair Morgenstern
fe6c19532a UI: Better unit table 2023-01-07 22:12:31 +02:00
Yair Morgenstern
a233cbc43a Resolve #8322 - fix Faith tutorial text 2023-01-07 21:13:15 +02:00
vegeta1k95
a5f68612ad
Better visibility for city status icons (#8329)
Co-authored-by: tunerzinc@gmail.com <vfylfhby>
2023-01-07 19:27:55 +02:00
Yair Morgenstern
bdad914b87 4.3.17 2023-01-05 16:26:22 +02:00
Yair Morgenstern
52e3540936
Version rollout (#8315)
* Bump version and create initial changelog entry

* Update German translation (#8313)

* Update Spanish.properties (#8311)

* Update Brazilian_Portuguese.properties (#8310)

* Fill in missing Ukrainian translations (#8309)

Co-authored-by: Kostiantyn Kolesnichenko <mormat.iam@gmail.com>

* Update French.properties (#8308)

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: MartinP <mape6@posteo.de>
Co-authored-by: Caballero Arepa <78449553+Caballero-Arepa@users.noreply.github.com>
Co-authored-by: Vitor Gabriel <59321138+Ranbut@users.noreply.github.com>
Co-authored-by: Kostiantyn Kolesnichenko <test9@mormat.name>
Co-authored-by: Kostiantyn Kolesnichenko <mormat.iam@gmail.com>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
2023-01-05 16:16:44 +02:00
Yattong the Mackerel
d69c645035
Fixing duplocation (#8314)
[0516] It looks like your map can't be saved! = 
[0685] Multiplayer = 
[1155] National ability = 
[1357] Version = 
[1508] Location = 
[1599] Filter: = 
[1600] Enter search text =
2023-01-05 15:39:05 +02:00
Yair Morgenstern
a47984dad6 4.3.16 2023-01-04 15:59:23 +02:00
Yair Morgenstern
81b08dd73f
Version rollout (#8306)
* Bump version and create initial changelog entry

* Update Simplified_Chinese.properties (#8303)

* Update Korean.properties (#8299)

* Update Korean.properties

* Update Korean.properties

* Update Brazilian_Portuguese.properties (#8292)

* Update German translation (#8290)

* Update German translation

* Update German translation

* Update Italian.properties (#8289)

* Update French.properties (#8287)

* Update Indonesian.properties (#8286)

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: xk730 <40309144+xk730@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: MartinP <mape6@posteo.de>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
Co-authored-by: kensvin <kensvin28@gmail.com>
2023-01-04 15:51:18 +02:00
Yattong the Mackerel
0be1794e94
Update template.properties (#8305) 2023-01-04 15:42:00 +02:00
Philip Keiter
1532216335
Add new game option to randomly select from map options. (#8271)
* Add new game option to randomly select from map options.

* Remove unused isPortrait.

* Remove unused isPortrait.

* Make other settings collapsable when using random generated.

* Make Random Generated settings start collapsed. Make padding consistent.

* Remove colons from ExpanderTab titles.

* Append "Enabled" before random map options.

* Append missing = in template.

* DRY the world wrap warning.

* Update JavaDoc of MultiCheckboxTable.
2023-01-03 21:56:41 +02:00
Ouaz
1c85388ee8
Translate "Sell" in city screen (#8297) 2023-01-03 00:40:34 +02:00
vegeta1k95
3b7b54aab6
Barbarian Civ icon (#8295)
Co-authored-by: tunerzinc@gmail.com <vfylfhby>
2023-01-02 19:20:51 +02:00
vegeta1k95
72eb9504b8
Fixed PolicyScreen branches requirements text (#8280)
* Fixed PolicyScreen branches requirements text

* Generify conditionals text pattern

* Remove GlobalAlert uniques from displaying in Policy descriptions

* Fix translations

* Fix freeze on "Tiny" displays

Co-authored-by: tunerzinc@gmail.com <vfylfhby>
2023-01-02 18:48:11 +02:00
Yair Morgenstern
f2ad07a96c 4.3.15 2023-01-01 16:25:29 +02:00
Yair Morgenstern
2ce16696bd
Version rollout (#8285)
* Bump version and create initial changelog entry

* Update Korean.properties (#8284)

* Updated Brazilian_Portuguese.properties (#8275)

* Update Spanish.properties (#8270)

* Update French.properties (#8269)

* Update Italian.properties (#8267)

* Update Polish.properties (#8266)

* Fixed Polish translations

Co-authored-by: yairm210 <yairm210@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: Caballero Arepa <78449553+Caballero-Arepa@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: pyotr_p <pyotr.pietrzak@gmail.com>
2023-01-01 16:22:34 +02:00
Yair Morgenstern
d20f8a53f8 Validate unique parameters for mods 2023-01-01 15:55:41 +02:00
letstalkaboutdune
b5a021cc16
SFX Update - Arrow, Crossbow (New), Metal Hit (#8262)
* Arrow, Crossbow, Metal Hit sound updates

Sourced from pixabay.com
https://pixabay.com/service/license/

* Update Credits.md
2022-12-29 23:20:33 +02:00
alexban011
0273f8a38b
added buttons for controlling music (#8256)
* added buttons for controlling music

* translations

* checks

* added `Music` to translations
2022-12-29 21:20:45 +02:00
Yair Morgenstern
fb62ddb711 4.3.14 2022-12-29 15:51:13 +02:00
Yair Morgenstern
deef19b5bb
Version rollout (#8265)
* Bump version and create initial changelog entry

* Update Catalan.properties (#8264)

* Update French.properties (#8259)

* Update Korean.properties (#8254)

* Update Italian.properties (#8253)

* Update Italian.properties

* Update Italian.properties

* Update Simplified_Chinese.properties (#8245)

* Update Spanish.properties (#8244)

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: Joan Josep <juanjo.ng.83@gmail.com>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
Co-authored-by: Yattong the Mackerel <saud2410@naver.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: CrispyXYZ <64761703+CrispyXYZ@users.noreply.github.com>
Co-authored-by: Caballero Arepa <78449553+Caballero-Arepa@users.noreply.github.com>
2022-12-29 15:46:53 +02:00
vegeta1k95
8fd561de50
Added WLTKD status icon (#8257)
* Added WTLKD status icon

* Credits

Co-authored-by: tunerzinc@gmail.com <vfylfhby>
2022-12-29 13:52:35 +02:00
CrispyXYZ
68c6c60f77
Show CrashScreen instead of quit when crash on Android (#8263) 2022-12-29 13:51:53 +02:00
vegeta1k95
be573f2b76
Big rework of City plates (#8239)
* Big rework of City plates

* New city plates design, new status icons

* A little bit of padding for construction icon

* Better border for defence counter

* Better border for defence counter

* Solid colored icons

* Solid colored icons

* Credits

* Credits

Co-authored-by: tunerzinc@gmail.com <vfylfhby>
2022-12-28 17:32:26 +02:00
Philip Keiter
37250cc65d
Add checkbox to Settings AdvancedTab to enable or disable easter eggs. (#8248) 2022-12-28 08:17:27 +02:00
Yair Morgenstern
f45d23d8d5 Revert "Demographics removed - resolves #8215"
This reverts commit c7f5a34c04.
2022-12-28 08:10:27 +02:00
Yair Morgenstern
e06b2be623 4.3.13 2022-12-27 22:58:24 +02:00
Yair Morgenstern
c784e13112
Version rollout (#8242)
* Bump version and create initial changelog entry

* Update Traditional_Chinese.properties (#8241)

* Update French.properties (#8233)

* Create Afrikaans.properties (#8231)

* Update Simplified_Chinese.properties (#8228)

* Update Simplified_Chinese.properties

* Update Simplified_Chinese.properties

* Update Simplified_Chinese.properties

* Update Simplified_Chinese.properties

* Update Simplified_Chinese.properties

* Updated Brazilian_Portuguese.properties (#8225)

* Updated Brazilian_Portuguese.properties

* Updated Brazilian_Portuguese.properties

* Update Korean.properties (#8220)

* Update Korean.properties

* Update Korean.properties

* Fix afrikaans and add icon

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: nacro711072 <nacro711072@yahoo.com.tw>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
Co-authored-by: LifeCanvasDev <93025509+LifeCanvasDev@users.noreply.github.com>
Co-authored-by: xk730 <40309144+xk730@users.noreply.github.com>
Co-authored-by: Vitor Gabriel <59321138+Ranbut@users.noreply.github.com>
Co-authored-by: Yattong the Mackerel <saud2410@naver.com>
2022-12-27 22:52:25 +02:00
Yair Morgenstern
c7f5a34c04 Demographics removed - resolves #8215 2022-12-27 22:33:07 +02:00
Yair Morgenstern
d1cb47054c World wrap available by default for all players 2022-12-27 22:30:27 +02:00
Yattong the Mackerel
e4264213c7
Update template.properties (#8236) 2022-12-26 17:05:25 +02:00
vegeta1k95
42a17aab5b
Corrected Civilizations colors (#8224)
Co-authored-by: tunerzinc@gmail.com <vfylfhby>
2022-12-25 10:01:40 +02:00
Yair Morgenstern
0c58488e42 4.3.12 2022-12-24 20:02:11 +02:00
Yair Morgenstern
d612286d81
Version rollout (#8219)
* Bump version and create initial changelog entry

* Update Spanish.properties (#8217)

* Update traditional_chinese.properties (#8213)

* Update German translation (#8205)

* Update French.properties (#8204)

* Updated Brazilian_Portuguese.properties (#8201)

* Updated Brazilian_Portuguese.properties

* Update Brazilian_Portuguese.properties

* Update Italian.properties (#8199)

* Update Indonesian.properties (#8196)

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: Caballero Arepa <78449553+Caballero-Arepa@users.noreply.github.com>
Co-authored-by: nacro711072 <nacro711072@yahoo.com.tw>
Co-authored-by: MartinP <mape6@posteo.de>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
Co-authored-by: Vitor Gabriel <59321138+Ranbut@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: kensvin <kensvin28@gmail.com>
2022-12-24 19:52:05 +02:00
itanasi
bc483e8984
G&K Neutral Tile Road Maintenance (#8138)
* Redo

* New parameterized and actually used Road Unique

* Remove unneeded

* Update CURRENT_COMPATIBILITY_NUMBER since adding new serialization data

* Make neutralRoads for CivilizationInfo.kt Transient
2022-12-24 19:43:37 +02:00
letstalkaboutdune
8d0acd0647
Added keyboard shortcut to toggle World Screen UI elements (#8211)
* AbsoluteUnits - Mongolian Uniques

* Added keyboard shortcut to toggle World Screen UI elements

Ctrl+U to toggle

* Update WorldScreen.kt

* Added a pesky space

* Remove "Experimental" warning text

* Revert "Remove "Experimental" warning text"

This reverts commit 3c8456db95.
2022-12-24 19:41:35 +02:00
alexban011
994169944a
showed unknown civs as Unknown civilization in GP and Diplomacy screens (#8184)
* added mod topics to wiki

* fixed stats from revealing unknown civs and cityStates

* Revert "added mod topics to wiki"

This reverts commit 5528950a96.

* used knows() instead of getKnownCivs().contains()

* showed politics when you don't know the civ in GlobalPoliticsOverviewTable

* Replaced unknown civs name with `Unknown civilization` in DiplomacyScreen

* forgot to remove a couple lines

* translated the strings for the protectors

* reviews

* made function and tested translations
2022-12-24 19:40:36 +02:00
vegeta1k95
78c4f6de68
Big rework of Policy Picker UI, added new ninepatch RoundedEdgeRectangleSmall (#8218)
Co-authored-by: tunerzinc@gmail.com <vfylfhby>
2022-12-24 19:17:00 +02:00
letstalkaboutdune
1fdbea0a45
Trim Nuke SFX (#8216) 2022-12-24 18:55:21 +02:00
vegeta1k95
0aa7c0e79b
Added gradle task of Atlas texture packing for Android build (#8208)
* Added gradle task of Atlas texture packing for Android build

* ImagePackers check also for creation date

Co-authored-by: tunerzinc@gmail.com <vfylfhby>
2022-12-23 14:49:08 +02:00
Philip Keiter
9f6aa4b90f
Add new game option: No City Razing. (#8203) 2022-12-22 07:41:08 +02:00
Yair Morgenstern
01309be510 4.3.11 2022-12-21 12:02:05 +02:00
Yair Morgenstern
3a91a99143
Version rollout (#8195)
* Bump version and create initial changelog entry

* Update Japanese.properties (#8194)

* Update Japanese.properties

* Update Japanese.properties

* Update Japanese.properties

* Update Japanese.properties

* Update Japanese.properties

* Update Japanese.properties

* Update Japanese.properties

* Update Japanese.properties

* Update Japanese.properties

* Update Japanese.properties

* Update Japanese.properties

* Update Spanish.properties (#8190)

* Update Catalan.properties (#8183)

* Update German translation (#8181)

* Provide Ukrainian translations for the lately introduced original strings (#8177)

Co-authored-by: Kostiantyn Kolesnichenko <mormat.iam@gmail.com>

* Update Korean.properties (#8176)

* Update Korean.properties

* Update Korean.properties

* Update Korean.properties

* Update Korean.properties

* Updated Brazilian_Portuguese.properties (#8175)

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: K0baU <63403741+K0baU@users.noreply.github.com>
Co-authored-by: Caballero Arepa <78449553+Caballero-Arepa@users.noreply.github.com>
Co-authored-by: Joan Josep <juanjo.ng.83@gmail.com>
Co-authored-by: MartinP <mape6@posteo.de>
Co-authored-by: Kostiantyn Kolesnichenko <test9@mormat.name>
Co-authored-by: Kostiantyn Kolesnichenko <mormat.iam@gmail.com>
Co-authored-by: Yattong the Mackerel <saud2410@naver.com>
Co-authored-by: Vitor Gabriel <59321138+Ranbut@users.noreply.github.com>
2022-12-21 11:51:45 +02:00
vegeta1k95
2bc91f1216
Rework of City Screen: new Great People list + misc changes (#8180)
* Rework of City Screen: new Great People list + misc changes

* Added a bit of padding

* Buildings are united under one tabs, GP font icons replaced by tinted UnitIcons

* Fix color of separators

* Big update to "Detailed stats" UI

* Rebuild pngs

Co-authored-by: tunerzinc@gmail.com <vfylfhby>
Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
2022-12-21 11:46:35 +02:00
vegeta1k95
1346eea4ca
Huge update of Technology Picker screen UI (Civ 5), new original icons + misc changes (#8188)
* Huge update of Technology Picker screen UI, new original icons + misc changes

* Fix possible memory leak

* Fix lines Z-Depth, shifted era boundary lines, thicker queue-path lines

* Fix lines Z-Depth more correctly

* Size checks replaced by truncation

* Icons credits

Co-authored-by: tunerzinc@gmail.com <vfylfhby>
2022-12-21 11:25:10 +02:00
Yattong the Mackerel
68fc0487c1
Update template.properties (#8189) 2022-12-20 11:39:18 +02:00
Philip Keiter
f974c3a8a5
Continent and Islands (#8187)
* Update comments that got outdated.

* Add map type: Continent and Islands
2022-12-20 08:35:13 +02:00
letstalkaboutdune
6192de325e
AbsoluteUnits - Mongolian Uniques (#8186) 2022-12-20 08:26:16 +02:00
Yair Morgenstern
107edeab1f Fallback image for modded buildings - see #8158 2022-12-18 22:12:05 +02:00
Yair Morgenstern
6b4da20d85 Fallback image for modded buildings - see #8158 2022-12-18 22:11:56 +02:00
Yair Morgenstern
81f3ecd998 Fallback image for modded techs - see #8158 2022-12-18 22:05:17 +02:00
Ouaz
f331ac69e4
Fix new "temperature" map setting not translatable (#8173) 2022-12-18 21:23:05 +02:00
Yair Morgenstern
cf8e6b39e2 4.3.10 2022-12-18 19:42:45 +02:00
Yair Morgenstern
0a3f1c6384
Version rollout (#8172)
* Bump version and create initial changelog entry

* Update Traditional_Chinese.properties (#8171)

* Update French.properties (#8160)

* Update Korean.properties (#8157)

* Update Korean.properties

* Update Korean.properties

* Update Korean.properties

* Update Simplified_Chinese.properties (#8156)

* Update Italian.properties (#8155)

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: nacro711072 <nacro711072@yahoo.com.tw>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
Co-authored-by: Yattong the Mackerel <saud2410@naver.com>
Co-authored-by: CrispyXYZ <64761703+CrispyXYZ@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
2022-12-18 19:36:04 +02:00
Yair Morgenstern
b44ac9eaa4 Better unit action icons 2022-12-17 20:06:43 +02:00
Yair Morgenstern
c95befaf1b 4.3.9 2022-12-16 11:20:50 +02:00
Yair Morgenstern
889a2c5946 Added thin line around tech icons in tech screen 2022-12-16 11:15:36 +02:00
Yair Morgenstern
0d19bf9cef Better icons for 'next turn' button
@vegeta1k95 sorry about this, but the way this works without resizing is simply not up to the standards of the current UI :/
2022-12-16 11:15:36 +02:00
Yair Morgenstern
e4a7f7e131
Version rollout (#8154)
* Bump version and create initial changelog entry

* Update Filipino.properties (#8153)

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Italian.properties (#8146)

* Update Korean.properties (#8145)

* Update German translation (#8142)

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: Shann Aurelle Ripalda <shannaurelleg@gmail.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: Yattong the Mackerel <saud2410@naver.com>
Co-authored-by: MartinP <mape6@posteo.de>
2022-12-16 11:15:19 +02:00
Philip Keiter
02f9176f78
Flat Earth Hexagonal (#8140)
* Add new map shape: Flat Earth Hexagonal.

* Make flat earth logic easier to read.

* Make flat earth set temperature based on tile distance from center.

* Make flat earth waste less space on the ice ring.

* Add variety to the flat earth ice ring.

* Use baseTerrain for snow on flat earth edge instead of addTerrainFeature.

* Ensure flat earth center tiles and edge tiles are ocean not coast.

* Give flat earth ice ring some random juts and dips.

* Make 3rd continent smaller when flat earth.

* Enable more continent positions for three continents when flat earth.

* Add parens around or statement.

* Refactor flat earth temperature code into functions.

* Invert some flat earth if statements to reduce nesting.

* Allow coast near flat earth ice walls.

* Make flat earth ice wall generation more efficient.

* Stop adding ice to flat earth mountains.

* Move flat earth ice wall generation to its own function.

* Improve flat earth water placement comments.

* Move flat earth extra water generation to its own function.

* Move flat earth center ice spawn to its own function.

* Move flat earth edge ice spawn to its own function.

* Minor efficiency tweak.

* Add Flat Earth Hexagonal to template.
2022-12-16 11:08:04 +02:00
Yattong the Mackerel
20062c1c3a
Update Nations.json (#8151) 2022-12-16 10:05:32 +02:00
vegeta1k95
bf81bb25e1
Change styles and behaviour of Unit flags as in Civ 5 (#8128)
* Change styles and behaviour of Unit flags as in Civ 5

* Make shadow mask an optional (removed from default atlas)

* Make shadow mask an optional (removed from default atlas)

* Remove magical numbers, scaling dependent on a ratio of the source

Co-authored-by: tunerzinc@gmail.com <vfylfhby>
2022-12-15 21:51:46 +02:00
vegeta1k95
dc3809de84
"Auto Unit Cycle" and "Automated units move on turn start" options implemented (Civ 5) (#8144)
* "Auto Unit Cycle" and "Automated units move on turn start" options implemented (Civ 5)

* Removed threading, added translation template for strings

Co-authored-by: tunerzinc@gmail.com <vfylfhby>
2022-12-15 21:51:17 +02:00
alexban011
d7c11cc990
added icon for Conduct Trade Mission button (#8125)
* added icon

* rescaled image to 100px
2022-12-15 21:02:45 +02:00
vegeta1k95
e1afa1e10e
NextTurnActions (pick tech/policy/etc) now can have icons (#8119)
* NextTurnActions (pick tech/policy/etc) now can have icons

* Remove default NextTurn notification icons

* Added default notification icons. "Next unit" action priority is lowered (as in Civ 5)

* Added missing files

Co-authored-by: tunerzinc@gmail.com <vfylfhby>
2022-12-15 08:41:43 +02:00
Ouaz
65c5ce52ec
New map options translatable (#8135) 2022-12-15 07:20:52 +02:00
Yair Morgenstern
b67fc7d030 4.3.8 2022-12-15 00:26:51 +02:00
Yair Morgenstern
662141d661 Resolved #7479 - Removed copyrighted intro texts 2022-12-15 00:23:57 +02:00
Yair Morgenstern
0d9c6c105f
Version rollout (#8132)
* Bump version and create initial changelog entry

* Update Bulgarian.properties (#8130)

* Update Spanish.properties (#8121)

* Update Korean.properties (#8113)

* Update Korean.properties

* Update Korean.properties

* Update Korean.properties

* Update Korean.properties

* Updated Brazilian_Portuguese.properties (#8106)

* Update French.properties (#8105)

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: excessmind <52409643+excessmind@users.noreply.github.com>
Co-authored-by: Caballero Arepa <78449553+Caballero-Arepa@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>
2022-12-15 00:13:50 +02:00
Yair Morgenstern
d3f8f680d1 4.3.7 2022-12-09 12:56:34 +02:00
Yair Morgenstern
32d46b24df
Version rollout (#8103)
* Bump version and create initial changelog entry

* Update Italian.properties (#8100)

* Update German translations (#8097)

* Update French.properties (#8096)

* Update Spanish.properties (#8095)

* Updated Brazilian_Portuguese.properties (#8094)

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: MartinP <mape6@posteo.de>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
Co-authored-by: Caballero Arepa <78449553+Caballero-Arepa@users.noreply.github.com>
Co-authored-by: Vitor Gabriel <59321138+Ranbut@users.noreply.github.com>
2022-12-09 12:52:38 +02:00
vegeta1k95
58c57d6626
UnitActions seprated into own atlas (#8102)
Co-authored-by: tunerzinc@gmail.com <vfylfhby>
2022-12-09 12:46:46 +02:00
alexban011
ccb1d769f1
added button to paste from clipboard when downloading a mod (#8101) 2022-12-07 21:14:54 +02:00
Yair Morgenstern
faf1b66a88 4.3.6 2022-12-05 19:24:25 +02:00
Yair Morgenstern
0063b92e07
Version rollout (#8093)
* Bump version and create initial changelog entry

* update traditional_chinese.properties (#8092)

* Update German translation (#8089)

* Update Filipino.properties (#8082)

* Update Simplified_Chinese.properties (#8079)

* Update Simplified_Chinese.properties

* Update Simplified_Chinese.properties

* Update Brazilian_Portuguese.properties (#8078)

* Update Italian.properties (#8076)

* Update French.properties (#8075)

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: nacro711072 <nacro711072@yahoo.com.tw>
Co-authored-by: MartinP <mape6@posteo.de>
Co-authored-by: Shann Aurelle Ripalda <shannaurelleg@gmail.com>
Co-authored-by: CrispyXYZ <64761703+CrispyXYZ@users.noreply.github.com>
Co-authored-by: Vitor Gabriel <59321138+Ranbut@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
2022-12-05 19:20:36 +02:00
Yair Morgenstern
454f999948 Resolved #8090 - Replaces misunderstood 'virtual resolutions' with more intuitive 'screen size' 2022-12-05 18:56:47 +02:00
itanasi
bb1e8dc10d
Volley only for Siege in G&K (#8086) 2022-12-05 18:23:00 +02:00
Yair Morgenstern
1d5d445c19 After-combat notification for promotable units - see #4697 2022-12-03 23:12:01 +02:00
Yair Morgenstern
c9ed9d5d74 modding: Double Happiness from Natural Wonders -> [stats] from every known Natural Wonder 2022-12-02 11:50:11 +02:00
Yair Morgenstern
94605911a2 4.3.5 2022-11-30 18:06:28 +02:00
Yair Morgenstern
dceaf832b9
Version rollout (#8074)
* Bump version and create initial changelog entry

* Updated Brazilian_Portuguese.properties (#8072)

* Update Filipino.properties (#8071)

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Dutch.properties (#8067)

* Update Dutch.properties

* Update Dutch.properties

* Update Simplified_Chinese.properties (#8066)

* Update Spanish.properties (#8062)

* Update French.properties (#8060)

* Fix tests

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: Vitor Gabriel <59321138+Ranbut@users.noreply.github.com>
Co-authored-by: Shann Aurelle Ripalda <shannaurelleg@gmail.com>
Co-authored-by: MartijnCBV <49876349+MartijnCBV@users.noreply.github.com>
Co-authored-by: CrispyXYZ <64761703+CrispyXYZ@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>
2022-11-30 18:03:20 +02:00
letstalkaboutdune
4d025caf61
AbsoluteUnits - Unique Chariot Archers (#8073) 2022-11-30 09:59:49 +02:00
itanasi
37d808936a
Fix Repair Crash (#8065)
* Add Hammer Icon to Repair Civilopedia Entry

* Fix crash from logic bug in getRepairTurns
2022-11-28 16:11:26 +02:00
Yair Morgenstern
d1225377e0 4.3.4 2022-11-27 19:24:17 +02:00
itanasi
16a7eed4ff
Add Repair and Pillaging Roads (#8015)
* Reapply Changes

* Logic clean up

* Adding getImprovementToPillage() and getRepairableImprovement()

* Cleaning up Unit Actions

* getImprovementToPillage() needs to check for Unpillagable

* Remove redundant logic since canBuildImprovement() returns true if currently repairing

* More redundant logic

* Prevent City Center from being Pillage status
addRepairAction will not show a Repair Action
Adding the improvement to be repaired/pillaged in button text
Utilizing getImprovementToPillage() more

* Some import cleanup
Add Irremovable to blockers
More consolidation of code

* More translation files

* When improvements/roads are built/removed, pillaged flag set to False

* Better and more consistent logic

* Fix dumb logic bug
2022-11-27 19:12:26 +02:00
Yair Morgenstern
545b4afc5a Generalized "Stats per policies" unique 2022-11-26 21:39:26 +02:00
letstalkaboutdune
683c3483b4
AbsoluteUnits - Unique Elephants (#8053) 2022-11-26 20:33:48 +02:00
The Bucketeer
10e8f3169d
HexaRealm units are here, finally! (#8052)
* Initial upload of HexaRealm units

(Just to get folder created

* Add files via upload

* Add files via upload
2022-11-26 18:46:45 +02:00
Yair Morgenstern
59c2f4bb09 4.3.3 2022-11-24 11:43:28 +02:00
Yair Morgenstern
98900d9162
Version rollout (#8048)
* Bump version and create initial changelog entry

* Update Spanish.properties (#8043)

?

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: Caballero Arepa <78449553+Caballero-Arepa@users.noreply.github.com>
2022-11-24 11:33:25 +02:00
Yair Morgenstern
551c6c562e 4.3.2 2022-11-22 23:39:07 +02:00
Yair Morgenstern
ee8c190c06
Version rollout (#8042)
* Bump version and create initial changelog entry

* Update Indonesian.properties (#8039)

* Update Greek.properties (#8038)

* Update Greek.properties

* Translating to Greek for unciv.

* Update Simplified_Chinese.properties (#8037)

* Update German.properties (#8035)

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: Hello200000 <98656089+Hello200000@users.noreply.github.com>
Co-authored-by: RA1DEN-cyborg <73561839+RA1DEN-cyborg@users.noreply.github.com>
Co-authored-by: CrispyXYZ <64761703+CrispyXYZ@users.noreply.github.com>
2022-11-22 23:11:57 +02:00
Yair Morgenstern
19d591dd89 Fixed json tests 2022-11-22 00:17:10 +02:00
Yair Morgenstern
e83e733104 Added validations for city-state uniques 2022-11-21 23:03:52 +02:00
Yair Morgenstern
ee2ab74715 Converted all era uniques to conditional uniques for city-states 2022-11-21 22:46:32 +02:00
Yair Morgenstern
2e5e221158 CityStateType overhaul!!!! 2022-11-21 20:30:52 +02:00
Yair Morgenstern
6976360da6 Added CityStateTypes into rulesets! Not in use yet 2022-11-21 19:59:55 +02:00
Yair Morgenstern
3dfdcd1cbf 4.3.1 2022-11-20 23:27:02 +02:00
Yair Morgenstern
2d37f3c473
Version rollout (#8034)
* Bump version and create initial changelog entry

* Update Simplified_Chinese.properties (#8033)

* Update Simplified_Chinese.properties

* Update Simplified_Chinese.properties

* Update French.properties (#8032)

* Update Catalan.properties (#8031)

* Update Catalan.properties

* ca-ES: Change some hyphens with dashes.

* Update Italian.properties (#8030)

* Update Italian.properties

* Update Italian.properties

* "Updated Brazilian Translation" (#8029)

* Update German translation (#8027)

* Update Indonesian.properties (#8025)

* Update Spanish.properties (#8024)

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: CrispyXYZ <64761703+CrispyXYZ@users.noreply.github.com>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
Co-authored-by: Joan Josep <juanjo.ng.83@gmail.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: kensvin <kensvin28@gmail.com>
Co-authored-by: Caballero Arepa <78449553+Caballero-Arepa@users.noreply.github.com>
2022-11-20 23:22:31 +02:00
Yair Morgenstern
c5bde45c5d Moved city state icons to separate folder 2022-11-20 18:48:28 +02:00
Yair Morgenstern
e5fbb472b0 Moddable quest weighting for city-states 2022-11-19 23:54:16 +02:00
letstalkaboutdune
694e0d33fc
AbsoluteUnits - Unique Spearmen (#8026) 2022-11-19 18:01:13 +02:00
Yair Morgenstern
ac614c3a44 4.3.0 2022-11-17 22:28:25 +02:00
Yair Morgenstern
4038d75035
Version rollout (#8023)
* Bump version and create initial changelog entry

* Update German translation (#8020)

* Update Spanish.properties (#8019)

* Update French.properties (#8018)

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: MartinP <mape6@posteo.de>
Co-authored-by: Caballero Arepa <78449553+Caballero-Arepa@users.noreply.github.com>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
2022-11-17 22:22:33 +02:00
Yair Morgenstern
0b864cd2d2 Resolved #8016 - fixed civilopedia text that says city-states don't conquer other cities 2022-11-16 17:53:00 +02:00
Yair Morgenstern
0a13e58bde 4.2.20 2022-11-15 19:02:22 +02:00
Yair Morgenstern
bf4172dba0
Version rollout (#8014)
* Bump version and create initial changelog entry

* Update Simplified_Chinese.properties (#8013)

* Update Filipino.properties (#8012)

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Italian.properties (#8009)

* Update German translation (#8008)

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: CrispyXYZ <64761703+CrispyXYZ@users.noreply.github.com>
Co-authored-by: Shann Aurelle Ripalda <shannaurelleg@gmail.com>
Co-authored-by: Hello200000 <98656089+Hello200000@users.noreply.github.com>
Co-authored-by: MartinP <mape6@posteo.de>
2022-11-15 18:58:13 +02:00
Ouaz
5dc46c3ad5
New "Unitset" option translatable (#8006)
Makes "Unitset" translatable (related to #7980)
2022-11-13 07:26:58 +02:00
Yair Morgenstern
67f33c8ac6 Renamed AbsoluteUnits unitset @letstalkaboutdune - see #7980 2022-11-13 00:34:51 +02:00
Yair Morgenstern
705cbb79b5 4.2.19 2022-11-12 21:26:24 +02:00
Yair Morgenstern
76f25e5fde
Version rollout (#8004)
* Bump version and create initial changelog entry

* Update Catalan.properties (#8002)

* update (#7999)

* Update Spanish.properties (#7998)

* Update French.properties (#7997)

* Update Italian.properties (#7996)

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: Joan Josep <juanjo.ng.83@gmail.com>
Co-authored-by: vvinam <vvinam@gmail.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: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
2022-11-12 21:22:45 +02:00
letstalkaboutdune
d1ccdfdba5
AbsoluteUnits - Unique Archers (#8000)
* AbsoluteUnits - Unique Archers

Also fixes bug with Spanish unique embarked sprite.

* Unique Archers - Tilesets.atlas/png update
2022-11-10 08:54:05 +02:00
Yair Morgenstern
f3d7524dcd 4.2.18 2022-11-09 14:06:41 +02:00
Yair Morgenstern
83f2c7825f
Version rollout (#7995)
* Bump version and create initial changelog entry

* Update Filipino.properties (#7993)

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: Shann Aurelle Ripalda <shannaurelleg@gmail.com>
2022-11-09 14:01:01 +02:00
Yair Morgenstern
c98a36c10f Added before/after X turns conditionals - see #3242 2022-11-07 22:56:58 +02:00
Yair Morgenstern
3e05b875bd Added before/after Pantheon conditionals - see #3242 2022-11-07 22:39:55 +02:00
Yair Morgenstern
b0c84f5eea 4.2.17 2022-11-07 18:20:19 +02:00
Yair Morgenstern
01d95652c0
Version rollout (#7992)
* Bump version and create initial changelog entry

* Update Filipino.properties (#7983)

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Catalan.properties (#7979)

* little amend

* Update Catalan.properties

* Translate vietnamese (#7978)

* update vietnam

* update Vietnamese.properties

* Update Bulgarian.properties (#7974)

Co-authored-by: yairm210 <yairm210@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: vvinam <vvinam@gmail.com>
Co-authored-by: Dob <100198047+dobval@users.noreply.github.com>
2022-11-07 18:15:36 +02:00
Yair Morgenstern
803062781c
Resolves #7985 - Added layout for promotions (#7991)
* Converted existing promotions to table layout

* Added col/row to G&K promotions

* Added ruleset error tests for promotion locations
2022-11-07 17:53:42 +02:00
Yair Morgenstern
0858f8c038 Added AbsoluteUnits as default units for Hexarealm tileset :D 2022-11-02 23:10:40 +02:00
Yair Morgenstern
039d0b3540 4.2.16 2022-10-29 22:27:13 +03:00
Yair Morgenstern
4a3da8fcfd
Version rollout (#7973)
* Bump version and create initial changelog entry

* Update German translation (#7961)

* Update Filipino.properties (#7960)

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Provide some of the missing Ukrainian translations (#7958)

Co-authored-by: Kostiantyn Kolesnichenko <mormat.iam@gmail.com>

* Update French.properties (#7955)

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: MartinP <mape6@posteo.de>
Co-authored-by: Shann Aurelle Ripalda <shannaurelleg@gmail.com>
Co-authored-by: Kostiantyn Kolesnichenko <test9@mormat.name>
Co-authored-by: Kostiantyn Kolesnichenko <mormat.iam@gmail.com>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
2022-10-29 22:16:01 +03:00
Yair Morgenstern
731e9f5815 4.2.15 2022-10-24 20:54:04 +03:00
Yair Morgenstern
2f693547b4 Fixed spearman not being to be able to upgrade to anything after Gunpowder and before Metallurgy 2022-10-24 20:51:52 +03:00
Yair Morgenstern
3246b82531
Version rollout (#7954)
* Bump version and create initial changelog entry

* Update Filipino.properties (#7950)

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Improve Ukrainian translations a tad (#7949)

Co-authored-by: Kostiantyn Kolesnichenko <mormat.iam@gmail.com>

* Update Brazilian_Portuguese.properties (#7948)

* Update Polish.properties (#7945)

* Update Spanish.properties (#7943)

* Update Indonesian.properties (#7942)

* Update Italian.properties (#7941)

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: Shann Aurelle Ripalda <shannaurelleg@gmail.com>
Co-authored-by: Kostiantyn Kolesnichenko <test9@mormat.name>
Co-authored-by: Kostiantyn Kolesnichenko <mormat.iam@gmail.com>
Co-authored-by: Vitor Gabriel <59321138+Ranbut@users.noreply.github.com>
Co-authored-by: pyotr_p <pyotr.pietrzak@gmail.com>
Co-authored-by: Caballero Arepa <78449553+Caballero-Arepa@users.noreply.github.com>
Co-authored-by: kensvin <kensvin28@gmail.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
2022-10-24 20:16:17 +03:00
The Bucketeer
55908cb115
Unit era variants added to FantasyHex tileset (#7944)
* Add files via upload

* Add files via upload
2022-10-23 19:57:43 +03:00
Yair Morgenstern
a450ddbb2c 4.2.14 2022-10-22 20:32:30 +03:00
Yair Morgenstern
7c6df3db7e
Version rollout (#7940)
* Bump version and create initial changelog entry

* Update Vietnamese.properties (#7932)

* One hungarian update (#7928)

I'm back, tried my best with this one.

* Update German translation (#7927)

* Update Spanish.properties (#7924)

* Update Japanese.properties (#7923)

* Update Japanese.properties

* Update Japanese.properties

* Update Japanese.properties

* update Vietnamese (#7922)

* Update Traditional_Chinese.properties (#7921)

* Update Traditional_Chinese.properties

* Update Traditional_Chinese.properties

* Update French.properties (#7919)

* Update Filipino.properties (#7918)

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Russian.properties (#7917)

* Update Russian.properties

* Update Russian.properties

* Update Traditional_Chinese.properties (#7916)

* Update Brazilian_Portuguese.properties (#7915)

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: Thienanbad <89069988+Thienanbad@users.noreply.github.com>
Co-authored-by: JurDan | Led Cut <80947706+JurDan775@users.noreply.github.com>
Co-authored-by: MartinP <mape6@posteo.de>
Co-authored-by: Caballero Arepa <78449553+Caballero-Arepa@users.noreply.github.com>
Co-authored-by: K0baU <63403741+K0baU@users.noreply.github.com>
Co-authored-by: vvinam <vvinam@gmail.com>
Co-authored-by: 羅少希 <83118946+Tab-Etuc@users.noreply.github.com>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
Co-authored-by: Shann Aurelle Ripalda <shannaurelleg@gmail.com>
Co-authored-by: deqtodo <94169613+deqtodo@users.noreply.github.com>
Co-authored-by: Vitor Gabriel <59321138+Ranbut@users.noreply.github.com>
2022-10-22 20:24:46 +03:00
itanasi
55e6541ee0
Add Temperature Offset Slider (#7891)
* Add slider
Align spawnIce latitude and offset code to applyHumidityAndTemperature

* A bunch of debug code
Make default Water Level -0.05 for Default

* Remove debug println
Fix Desert at 0.9-1.0 temp and <0.2 humidity

* Disable reseed for debug comparison
Reset Plains/Grassland for high temp. Adjust max humidity for safety of Grasslands
Humidity debugger
Better slider

* Remove all debug code

* Undo Desert temp setting
2022-10-22 20:12:57 +03:00
itanasi
c39aca7a31
Change Default Map Generation to Perlin (#7856)
* Changes

* Slight adjustment to MainMenuScreen

* Make default waterThreshold for Default to be -0.05

* blip

* blip

* Rename cellular automata to Smoothed Random
2022-10-22 20:11:55 +03:00
Yair Morgenstern
984e91a73e Resolved #7934 - Fixed Temple of Artemis production bonuses 2022-10-21 16:14:43 +03:00
Yair Morgenstern
4526b0f17d 4.2.13 2022-10-13 20:10:19 +03:00
Yair Morgenstern
fdd5d0c796
Version rollout (#7914)
* Bump version and create initial changelog entry

* Update Traditional_Chinese.properties (#7913)

* Update Brazilian_Portuguese.properties (#7911)

fixing brazilian portuguese wrong translation

* Update Lithuanian.properties (#7909)

* Update Catalan.properties (#7908)

* Update Indonesian.properties (#7907)

* Update Italian.properties (#7906)

* Update Ukrainian.properties (#7905)

* Update Ukrainian.properties

* Update Ukrainian.properties

* Update Ukrainian.properties

smol fix

* Update Ukrainian.properties

* Update Ukrainian.properties

* Update Ukrainian.properties

* Update Ukrainian.properties

* Update Ukrainian.properties

* Update Ukrainian.properties

* Update Ukrainian.properties

* Update Ukrainian.properties

* Update French.properties (#7903)

* update (#7902)

* Update Filipino.properties (#7900)

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update German translation (#7899)

* Update Brazilian_Portuguese.properties (#7897)

* Update Spanish.properties (#7896)

* Update Russian.properties (#7895)

* Update Russian.properties

* Update Russian.properties

* tests fixed by removing bad translation

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: 羅少希 <83118946+Tab-Etuc@users.noreply.github.com>
Co-authored-by: David Wesley <david.moura12@hotmail.com>
Co-authored-by: MindaugasRumsa51 <107413099+MindaugasRumsa51@users.noreply.github.com>
Co-authored-by: Joan Josep <juanjo.ng.83@gmail.com>
Co-authored-by: kensvin <kensvin28@gmail.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: Marerjh <40261003+Marerjh@users.noreply.github.com>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
Co-authored-by: vvinam <vvinam@gmail.com>
Co-authored-by: Shann Aurelle Ripalda <shannaurelleg@gmail.com>
Co-authored-by: MartinP <77325495+Mape6@users.noreply.github.com>
Co-authored-by: Vitor Gabriel <59321138+Ranbut@users.noreply.github.com>
Co-authored-by: Caballero Arepa <78449553+Caballero-Arepa@users.noreply.github.com>
Co-authored-by: deqtodo <94169613+deqtodo@users.noreply.github.com>
2022-10-13 20:06:49 +03:00
nacro711072
ad72c42911
fix untranslated string about politics (#7901)
* fix untranslated string about politics

* update shortcut about textbutton

* check all usage of template "[numberOfTurns] Truns Left"

* revert textbotton and add click event by chain.
2022-10-07 12:36:00 +03:00
Yair Morgenstern
a45c5cfa92 Resolved #7881 - Thron->Throne 2022-10-05 23:15:55 +03:00
Yair Morgenstern
2ef0284235 4.2.12 2022-10-05 23:13:32 +03:00
Yair Morgenstern
07acbee9ad
Version rollout (#7894)
* Bump version and create initial changelog entry

* Update Vietnamese.properties (#7885)

* Update Filipino.properties (#7874)

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Fix grammar mistake (#7873)

* Fix grammar mistake

"Abandonada"?? Quién puso eso?? No pudo ser yo... o_o

* Update Spanish.properties

* update traditional_chinese.properties (#7872)

* Update Traditional_Chinese.properties (#7871)

* Update Traditional_Chinese.properties

* Update Traditional_Chinese.properties

* Update Spanish.properties (#7868)

* Update Czech.properties (#7867)

* Update Czech.properties

* Update Czech.properties

* Update Czech.properties

* Update Lithuanian.properties (#7866)

* Update Vietnamese.properties (#7865)

* update

* update

* Updated Brazilian_Portuguese.properties (#7864)

* Updated Brazilian_Portuguese.properties

* Updated Brazilian_Portuguese.properties

* Update French.properties (#7861)

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: Thienanbad <89069988+Thienanbad@users.noreply.github.com>
Co-authored-by: Shann Aurelle Ripalda <shannaurelleg@gmail.com>
Co-authored-by: Caballero Arepa <78449553+Caballero-Arepa@users.noreply.github.com>
Co-authored-by: nacro711072 <nacro711072@yahoo.com.tw>
Co-authored-by: Chia-Hung Ni <jameseses@gmail.com>
Co-authored-by: Chris <cmanlove1234@outlook.com>
Co-authored-by: jahodovykolac <79529669+jahodovykolac@users.noreply.github.com>
Co-authored-by: MindaugasRumsa51 <107413099+MindaugasRumsa51@users.noreply.github.com>
Co-authored-by: vvinam <vvinam@gmail.com>
Co-authored-by: Vitor Gabriel <59321138+Ranbut@users.noreply.github.com>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
2022-10-05 23:10:52 +03:00
Yair Morgenstern
6ba98c82ac 4.2.11 2022-09-25 16:44:34 +03:00
Yair Morgenstern
6623991079
Version rollout (#7859)
* Bump version and create initial changelog entry

* Update Catalan.properties (#7858)

* Update Catalan.properties

* Update Catalan.properties

* Update Simplified_Chinese.properties (#7845)

* Update Simplified_Chinese.properties

Small fixes

* Update Simplified_Chinese.properties

* Update Traditional_Chinese.properties (#7841)

* translate some unit & beliefs.

* translate buildings

* translate some character name.

* Update Filipino.properties (#7840)

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Spanish.properties (#7837)

* update Vietnamese (#7836)

* update

* update Vietnamese

* update Vietnamese.properties

* update Vietnamese

* Update Italian.properties (#7835)

* Update Simplified_Chinese.properties (#7834)

* Update Lithuanian.properties (#7831)

* Update German translation (#7829)

* Update German translation

* Update German translation

* Update French.properties (#7827)

* Update Brazilian_Portuguese.properties (#7824)

* Update Indonesian.properties (#7823)

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: Joan Josep <juanjo.ng.83@gmail.com>
Co-authored-by: heipizhu4 <100454479+heipizhu4@users.noreply.github.com>
Co-authored-by: nacro711072 <nacro711072@yahoo.com.tw>
Co-authored-by: Shann Aurelle Ripalda <shannaurelleg@gmail.com>
Co-authored-by: Caballero Arepa <78449553+Caballero-Arepa@users.noreply.github.com>
Co-authored-by: vvinam <vvinam@gmail.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: xk730 <40309144+xk730@users.noreply.github.com>
Co-authored-by: MindaugasRumsa51 <107413099+MindaugasRumsa51@users.noreply.github.com>
Co-authored-by: MartinP <77325495+Mape6@users.noreply.github.com>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
Co-authored-by: Vitor Gabriel <59321138+Ranbut@users.noreply.github.com>
Co-authored-by: kensvin <kensvin28@gmail.com>
2022-09-25 16:37:56 +03:00
Yair Morgenstern
11de54d8d5 4.2.10 2022-09-19 16:24:11 +03:00
Yair Morgenstern
55c7183160
Version rollout (#7822)
* Bump version and create initial changelog entry

* Update Polish.properties (#7818)

* Update Traditional_Chinese.properties (#7815)

* translate policy/technology/tile/building

* correct typo

* Update French.properties (#7813)

* Update Indonesian.properties (#7812)

* Translate vietnamese (#7810)

* dịch thêm

thêm fanpage và group UnCiv Việt Nam

* update Vietnamese.properties

#update đã dịch tới dòng 3000

* update Vietnamese

add new line

* update Vietnamese.properties

dịch full 4.2.9

* Update Vietnamese.properties

* Update Vietnamese.properties

* fix

* fix

* f

* Update Brazilian_Portuguese.properties (#7808)

* Update Brazilian_Portuguese.properties

* Update Brazilian_Portuguese.properties

* Update Brazilian_Portuguese.properties

* Update Brazilian_Portuguese.properties

* Update Japanese.properties (#7803)

Few translations added

* Update Simplified_Chinese.properties (#7802)

* Update Simplified_Chinese.properties

* Update Simplified_Chinese.properties

* Update Simplified_Chinese.properties

* Update Simplified_Chinese.properties (#7801)

Two small fix

* Updated dutch translations (#7796)

* Updated dutch translations

* Fixed translation typos

* Used a better translation in dutch translation

Co-authored-by: Mark ter Maat <livestockmanagement@nedap.com>

* Update Vietnamese.properties (#7780)

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

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: pyotr71 <pyotr.pietrzak@gmail.com>
Co-authored-by: nacro711072 <nacro711072@yahoo.com.tw>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
Co-authored-by: kensvin <kensvin28@gmail.com>
Co-authored-by: vvinam <vvinam@gmail.com>
Co-authored-by: Vitor Gabriel <59321138+Ranbut@users.noreply.github.com>
Co-authored-by: BJiggers <113617818+BJiggers@users.noreply.github.com>
Co-authored-by: xk730 <40309144+xk730@users.noreply.github.com>
Co-authored-by: heipizhu4 <100454479+heipizhu4@users.noreply.github.com>
Co-authored-by: marktermaat <mark.termaat+github@gmail.com>
Co-authored-by: Mark ter Maat <livestockmanagement@nedap.com>
Co-authored-by: Thienanbad <89069988+Thienanbad@users.noreply.github.com>
2022-09-19 16:18:09 +03:00
Xander Lenstra
7f365423e1
Spies now show their current action and take time to move and set up (#7776)
* Spies now show their current action and take time to move and set up

* Fixed tests

* Reviews

* More reviews
2022-09-19 16:13:57 +03:00
The Bucketeer
a75a157dff
Add files via upload (#7820) 2022-09-19 16:12:58 +03:00
alexban011
d980b0d9ff
Global politics overview screen (#7469)
* getting the data

* finished getting the data

* optimization + separator

* vrtical separators

* more functions

* made it look good

* reverted debug variables

* cleanup

* added icon

* credits

* translations

* removed redundant equalizeColumns

* removed redundant separator

* column headers

* reviews

* removed redundant function

* latest translations

* latest review

* checks 1

* removed space

* removed vars and used DiplomacyManager instead

* combined overview screens

* 2 more translations

* little cleanup and fix
2022-09-19 16:12:24 +03:00
Yair Morgenstern
d5134f84cd 4.2.9 2022-09-15 16:21:23 +03:00
Yair Morgenstern
2bd705d43e
Version rollout (#7800)
* Bump version and create initial changelog entry

* translate opening statement of civ. (#7798)

* Update Catalan.properties (#7789)

* Update German translation (#7786)

* Update Indonesian.properties (#7779)

* Update Simplified_Chinese.properties (#7778)

* Update Simplified_Chinese.properties

* Update Simplified_Chinese.properties

* Update Simplified_Chinese.properties

* Update Simplified_Chinese.properties

* Update Simplified_Chinese.properties

* Update Simplified_Chinese.properties

* Update Simplified_Chinese.properties

* Update Simplified_Chinese.properties

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

Co-authored-by: heipizhu4 <100454479+heipizhu4@users.noreply.github.com>

Co-authored-by: heipizhu4 <100454479+heipizhu4@users.noreply.github.com>

* Translate vietnamese (#7774)

* dịch thêm

thêm fanpage và group UnCiv Việt Nam

* update Vietnamese.properties

#update đã dịch tới dòng 3000

* update Vietnamese

add new line

* Update Brazilian_Portuguese.properties (#7773)

* Updated Lines from Unique Types

* Update Brazilian_Portuguese.properties

* Update Brazilian_Portuguese.properties

* Delete Brazilian_Portuguese.properties

* updated

* Update Brazilian_Portuguese.properties

* Update Brazilian_Portuguese.properties

* Update Brazilian_Portuguese.properties

* Update French.properties (#7767)

* Update Italian.properties (#7765)

* Update Spanish.properties (#7764)

* Update Spanish.properties

* Update Spanish.properties

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: nacro711072 <nacro711072@yahoo.com.tw>
Co-authored-by: Joan Josep <juanjo.ng.83@gmail.com>
Co-authored-by: MartinP <77325495+Mape6@users.noreply.github.com>
Co-authored-by: kensvin <kensvin28@gmail.com>
Co-authored-by: xk730 <40309144+xk730@users.noreply.github.com>
Co-authored-by: heipizhu4 <100454479+heipizhu4@users.noreply.github.com>
Co-authored-by: vvinam <vvinam@gmail.com>
Co-authored-by: Vitor Gabriel <59321138+Ranbut@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: Caballero Arepa <78449553+Caballero-Arepa@users.noreply.github.com>
2022-09-15 16:09:08 +03:00
Xander Lenstra
8fd3b3194e
Enabled vietnamese (#7772)
* Enabled vietnamese

* Fixed tests

* Fix tests (again)
2022-09-15 16:02:14 +03:00
OptimizedForDensity
291b962f97
Generalize Great Wall unique (#7660)
* Generalize Great Wall unique

* Update JSON entries

* And movement calculation too

* Rename other functions

* Cache movement penalty uniques

* Check destination tile instead of unit type
2022-09-15 16:00:19 +03:00
Yair Morgenstern
8fec196db1 Got rid of uppercase C in Unciv in ALL places! 2022-09-12 23:26:28 +03:00
Yair Morgenstern
74d8d79a74 Added Macedonian flag 2022-09-12 21:22:54 +03:00
Yair Morgenstern
04ee2b716e Updated preview images and added guide to doing so 2022-09-12 20:58:27 +03:00
xk730
452d152176
Added missing translatables (#7770)
* Update template.properties

Add the ’No space to place this unit‘

* Update template.properties

Add the "Couldn't connect to Multiplayer Server!"
2022-09-10 08:00:17 -07:00
The Bucketeer
16253407de
Add files via upload (#7766) 2022-09-09 10:08:12 +03:00
Yair Morgenstern
2cc6594df2 4.2.8 2022-09-08 23:55:36 +03:00
Yair Morgenstern
9a95825ed7
Version rollout (#7763)
* Bump version and create initial changelog entry

* dịch thêm (#7760)

thêm fanpage và group UnCiv Việt Nam

* Update Simplified_Chinese.properties (#7753)

* Update Simplified_Chinese.properties

* Update Simplified_Chinese.properties

* Update Simplified_Chinese.properties

* update traditional_chinese.properties (#7752)

* update chinese.properties.

* update chinese.properties.

* Update Spanish.properties (#7751)

* Update Indonesian.properties (#7750)

* Update Filipino.properties (#7746)

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Catalan.properties (#7744)

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: vvinam <vvinam@gmail.com>
Co-authored-by: xk730 <40309144+xk730@users.noreply.github.com>
Co-authored-by: nacro711072 <nacro711072@yahoo.com.tw>
Co-authored-by: Caballero Arepa <78449553+Caballero-Arepa@users.noreply.github.com>
Co-authored-by: kensvin <kensvin28@gmail.com>
Co-authored-by: Shann Aurelle Ripalda <shannaurelleg@gmail.com>
Co-authored-by: Joan Josep <juanjo.ng.83@gmail.com>
2022-09-08 23:51:13 +03:00
Yair Morgenstern
b11c01bfdc
Resolve #7625 - show Unciv icon when loading game, instead of happy face (#7756) 2022-09-08 16:17:05 +03:00
Ouaz
81d2320824
Add "UI Skin" to make it translatable (#7748) 2022-09-06 10:27:14 +03:00
Yair Morgenstern
b4bbcfb458 4.2.7 2022-09-04 17:12:59 +03:00
Leonard Günther
f4dc138186
Moddable UI Skins [Basics] (#7714)
* Made UI skins selectable

This allows mods to provide alternative skin pngs without overriding the default skin purely by being downloaded

* Added UI Skin loading from NinePatches

This allows mod creators to define the stretch region and padding directly in the png

* Update baseScreen skin on skin reload

* Merged displayTab onChange functions

As all of them are equal anyway
2022-09-04 17:09:14 +03:00
Yair Morgenstern
30ed0f544d
Version rollout (#7742)
* Bump version and create initial changelog entry

* Update Lithuanian.properties (#7736)

* update traditional chinese. (#7735)

* Update Korean.properties (#7731)

* Update Romanian.properties (#7729)

* Update Italian.properties (#7728)

* Update French.properties (#7724)

* Update Simplified_Chinese.properties (#7723)

* Update Simplified_Chinese.properties

* Update Simplified_Chinese.properties

* Update German translation (#7722)

* Update German translation

* Update German translation

* Update Indonesian.properties (#7719)

* Update Romanian.properties (#7725)

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

* Removed invalid translation

* Fixed tests

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: MindaugasRumsa51 <107413099+MindaugasRumsa51@users.noreply.github.com>
Co-authored-by: nacro711072 <nacro711072@yahoo.com.tw>
Co-authored-by: Auvergne <97716654+ARPD-release@users.noreply.github.com>
Co-authored-by: MihaiTurlea <111897551+MihaiTurlea@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
Co-authored-by: heipizhu4 <100454479+heipizhu4@users.noreply.github.com>
Co-authored-by: MartinP <77325495+Mape6@users.noreply.github.com>
Co-authored-by: kensvin <kensvin28@gmail.com>
Co-authored-by: Xander Lenstra <71121390+xlenstra@users.noreply.github.com>
2022-09-04 17:06:17 +03:00
nacro711072
df2f0a3185 4.2.6 2022-08-28 23:55:01 +03:00
Yair Morgenstern
71c5177c34
Version rollout (#7716)
* Bump version and create initial changelog entry

* Ukrainian translations (#7711)

* Update Traditional_Chinese.properties (#7709)

* add basic and notification translative sentence.

* update missing placeholder.

* Upadate Catalan.properties (#7704)

* Update Indonesian.properties (#7703)

* Update Indonesian.properties

* Update Indonesian.properties

* Update Czech.properties (#7702)

* Update Czech.properties

* Update Czech.properties

Wrong translation

* Update Czech.properties

* Update Polish.properties (#7700)

* Update Vietnamese.properties (#7699)

* Update Simplified_Chinese.properties (#7698)

* Update Simplified_Chinese.properties

* Update Simplified_Chinese.properties

* Update Simplified_Chinese.properties

* Update Simplified_Chinese.properties

* Update Simplified_Chinese.properties

* Update Simplified_Chinese.properties

* Update German translation (#7697)

* Update Spanish.properties (#7693)

* Update Spanish.properties

* Update Spanish.properties

* Update Italian.properties (#7692)

* Update French.properties (#7690)

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: Jack Rainy <JackRainy@users.noreply.github.com>
Co-authored-by: nacro711072 <nacro711072@yahoo.com.tw>
Co-authored-by: Joan Josep <juanjo.ng.83@gmail.com>
Co-authored-by: kensvin <kensvin28@gmail.com>
Co-authored-by: jahodovykolac <79529669+jahodovykolac@users.noreply.github.com>
Co-authored-by: pyotr71 <pyotr.pietrzak@gmail.com>
Co-authored-by: persinger <63961560+Weltzer@users.noreply.github.com>
Co-authored-by: xk730 <40309144+xk730@users.noreply.github.com>
Co-authored-by: MartinP <77325495+Mape6@users.noreply.github.com>
Co-authored-by: Caballero Arepa <78449553+Caballero-Arepa@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
2022-08-28 23:40:04 +03:00
Xander Lenstra
a19fed5d28
Added a screen to move spies between cities (#7665)
* Added a screen to move spies between cities

* Fixed tests

* Reviews

* Avoid labels blinking

Co-authored-by: JackRainy <JackRainy@users.noreply.github.com>
2022-08-28 23:25:14 +03:00
alexban011
f64c5b36d0
added game option to disable unwanted spectators from a multiplayer game (#7290)
* feature

* only display option if onlineMultiplayer is enabled

* translatable

* no more negativity

* 1

* threw UncivShowableException

* reviews

* reviewed myself
2022-08-22 21:11:12 +03:00
Yair Morgenstern
121bda2833 4.2.5 2022-08-22 21:09:04 +03:00
Yair Morgenstern
87a4b57bf0
Version rollout (#7688)
* Bump version and create initial changelog entry

* Update Vietnamese.properties (#7686)

* Update Filipino.properties (#7677)

* Update Filipino.properties

* Update Filipino.properties

* update traditional_chinese for Maya. (#7675)

* update traditional_chinese for Maya.

* update

Co-authored-by: heipizhu4 <100454479+heipizhu4@users.noreply.github.com>

Co-authored-by: heipizhu4 <100454479+heipizhu4@users.noreply.github.com>

* Update Catalan.properties (#7667)

* Update Catalan.properties

* Update Catalan.properties (names of spies)

* Update Catalan.properties

* Update Indonesian.properties (#7664)

* Update Indonesian.properties

* Update Indonesian.properties

* Ukrainian translations (#7659)

* Ukrainian translations

* Misprints corrected

* New strings from a master branch

* Translations for the spy names

* More names translated

* Update German translation (#7657)

* Update French.properties (#7654)

* Update Simplified_Chinese.properties (#7652)

* Update Simplified_Chinese.properties

* Fix error

* Update Simplified_Chinese.properties

* Update Simplified_Chinese.properties

* Update Simplified_Chinese.properties

* Update Italian.properties (#7651)

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: Weltzer <63961560+Weltzer@users.noreply.github.com>
Co-authored-by: Shann Aurelle Ripalda <shannaurelleg@gmail.com>
Co-authored-by: nacro711072 <nacro711072@yahoo.com.tw>
Co-authored-by: heipizhu4 <100454479+heipizhu4@users.noreply.github.com>
Co-authored-by: Joan Josep <juanjo.ng.83@gmail.com>
Co-authored-by: kensvin <kensvin28@gmail.com>
Co-authored-by: Jack Rainy <JackRainy@users.noreply.github.com>
Co-authored-by: MartinP <77325495+Mape6@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>
2022-08-22 21:02:45 +03:00
Leonard Günther
18ef8fc20e
Removed legacy tileset code (#7658)
* Removed legacy tileset code

which was only used for the "Default" tileset

* Updated "Default" tileset to support new rendering

* Updated docs

* Fixed fogOfWar coloring bug

* Removed cityImage variable completely

* Renamed variable out to baseHexagon

* Moved color lerp out of for loop

* Renamed "Default" tileset to "Minimal"

* Made "HexaRealm" the games fallback tileset

* Implemented requested changes

* Readded accidentally removed variable

* Reverted updateTileImage back to foreach loop

Since indices are not needed anymore

* Regenerated game.atlas and game.png
2022-08-22 13:02:52 +02:00
Ouaz
c5c0f24a5f
Add "Wait" command in "Idle Units" tutorial (#7672)
* Add "Wait" command in "Idle Units" tutorial

* Improve wording for "Wait" command tutorial
2022-08-18 16:16:13 +03:00
Ouaz
90e582a0c3
Add an icon for "Wait" unit action (#7668) 2022-08-16 12:30:37 +02:00
Yair Morgenstern
87c1662462
Hopefully resolved #7663 by upgrading androidx.work version 2022-08-14 14:36:12 +03:00
Xander Lenstra
202e0bcf47
Basic version of EspionageManger, added a unique to gain spies (#7641)
* Handfull of comment questions, small refactorings

* Code changes

* Reworded a unique, removed a file

* Added spy names for all nations, minor consistency change

* Removed debug output

* Added an empty constructor so gdx can reconstruct it
2022-08-13 22:45:16 +03:00
Ouaz
9326f47cdf
Fix an untranslated string (#7656)
when trying to launch a new game on a map that is not compatible with the ruleset.
2022-08-13 13:08:53 +02:00
Yair Morgenstern
9898789772 4.2.4 2022-08-12 14:36:01 +03:00
Yair Morgenstern
afa2327828
Version rollout (#7650)
* Bump version and create initial changelog entry

* Update Simplified_Chinese.properties(2nd attempt) (#7646)

* Update Simplified_Chinese.properties

* A checkpoint for undoing commits

* Update Simplified_Chinese.properties

* Fix error

* Update Simplified_Chinese.properties

* Update Simplified_Chinese.properties

* Update Simplified_Chinese.properties

* Update Simplified_Chinese.properties

* Update Simplified_Chinese.properties

* Update Indonesian.properties (#7644)

* Update German translation (#7642)

* Update German translations

* Updat German translations

* Update German translation

* Update German translation

* Update German translation

* Update German translation

* Update Polish.properties (#7640)

* Update Spanish.properties (#7639)

* Update Spanish.properties

* Update Spanish.properties

* Update Spanish.properties

* Update Italian.properties (#7636)

* Perform housekeeping for Ukrainian translations - symbols, word order, and extra translations (#7626)

Co-authored-by: Kostiantyn Kolesnichenko <mormat.iam@gmail.com>

* Update Catalan.properties (#7614)

* Update Catalan.properties

* Update Catalan.properties. Change verbal periphrases and apostrophe symbol.

* Update Catalan.properties

* Update French.properties (#7608)

* Update French.properties

* Update French.properties

Update translation to 4.2.3

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: heipizhu4 <100454479+heipizhu4@users.noreply.github.com>
Co-authored-by: kensvin <63847755+Kensvin28@users.noreply.github.com>
Co-authored-by: MartinP <77325495+Mape6@users.noreply.github.com>
Co-authored-by: pyotr71 <pyotr.pietrzak@gmail.com>
Co-authored-by: Caballero Arepa <78449553+Caballero-Arepa@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: Kostiantyn Kolesnichenko <test9@mormat.name>
Co-authored-by: Kostiantyn Kolesnichenko <mormat.iam@gmail.com>
Co-authored-by: Joan Josep <juanjo.ng.83@gmail.com>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
2022-08-12 14:30:26 +03:00
OptimizedForDensity
8f23ae52cc
List which city owns each tile in the city screen UI (#7631) 2022-08-12 14:26:09 +03:00
OptimizedForDensity
28f65a7599
Add free belief unique + refactor a few religion functions (#7612)
* Free belief unique

* Fix edge case

* Another edge case

* Bug fixes

* Fix some conditions

* Refactor another function

* Handle edge case where the civ has enough faith for a pantheon but also gets a free pantheon pick on the same turn (allow civ to have both picks)

* Fix the edge case handling

* Cleanup

* Reviews + more refactoring and cleanup

* Update comments

* Unnecessary comment

* Improvements

* Typo
2022-08-12 14:24:42 +03:00
Yair Morgenstern
0df499b9fe Increment sdk version to 32, to see if it passes Github build 2022-08-08 14:02:49 +03:00
Ouaz
9ca5b0f850
Fix missing "HP" in battle notifications (#7638)
These two missing "HP" caused these two lines to not be translated in the notification log.
2022-08-08 08:50:02 +03:00
Yair Morgenstern
cf44f41372 Increment sdk version to 31, to see if it passes Github build 2022-08-08 00:02:15 +03:00
Yair Morgenstern
068d903ee5 Revert ktx version 2022-08-07 23:59:28 +03:00
Yair Morgenstern
b296d014b5 4.2.3 2022-08-07 23:51:02 +03:00
Yair Morgenstern
29b6b35f56
Version rollout (#7635)
* Bump version and create initial changelog entry

* Update German translation (#7634)

* Update Korean.properties (#7630)

* fix a few style issues in the German translation (#7621)

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: MartinP <77325495+Mape6@users.noreply.github.com>
Co-authored-by: Yattong the Mackerel <saud2410@naver.com>
Co-authored-by: Kristian Rother <krother@academis.eu>
2022-08-07 23:48:01 +03:00
OptimizedForDensity
b630388984
Add unit type to Civilopedia (#7620) 2022-08-07 17:37:11 +03:00
itanasi
69e6093e2e
Update Damage Notifications (#7623)
* Minor Compile change

* Update to -[amount] HP for battle notifications
Update Unseen Interceptor Notification

* Update to -[amount] HP for battle notifications
Update Unseen Interceptor Notification

* Revert "Update to -[amount] HP for battle notifications"

This reverts commit 63961029da.

* Rename variables

* Even if you can't see the Interceptor Tile, still get full info if not killed
2022-08-06 13:23:42 -04:00
Kostiantyn Kolesnichenko
7a30e29e07
Add missing string to the translations template file (#7627)
Co-authored-by: Kostiantyn Kolesnichenko <mormat.iam@gmail.com>
2022-08-06 09:14:21 -04:00
Yair Morgenstern
b14870fbc5 Reinstated desugaring since it broke the build 2022-08-05 16:11:02 +03:00
Yair Morgenstern
1dc7c6bfa8 Android gradle update - explicitly state build tools version, update to 32.0.0, remove desugaring. 2022-08-05 11:00:04 +03:00
Yair Morgenstern
948b95a9dc Android gradle update - explicitly state build tools version, remove desugaring 2022-08-05 10:49:38 +03:00
Yair Morgenstern
a1357414a0 4.2.2 2022-08-04 18:37:23 +03:00
Yair Morgenstern
7473213d77
Version rollout (#7601)
* Bump version and create initial changelog entry

* Update Ukrainian translations - add missing, correct existing (#7597)

Co-authored-by: Kostiantyn Kolesnichenko <mormat.iam@gmail.com>

* Update Simplified_Chinese.properties (#7590)

* Update Simplified_Chinese.properties

* Update Simplified_Chinese.properties

* Update Simplified_Chinese.properties

* Update Simplified_Chinese.properties

* Update Simplified_Chinese.properties

* Update Simplified_Chinese.properties

* Update Simplified_Chinese.properties

* Update Simplified_Chinese.properties

* Update Simplified_Chinese.properties

* Update Simplified_Chinese.properties

Co-authored-by: Xander Lenstra <71121390+xlenstra@users.noreply.github.com>

* Update Korean.properties (#7585)

* Update Catalan.properties (#7583)

* Update French.properties (#7575)

* Update Spanish.properties (#7574)

Co-authored-by: Caballero Arepa <78449553+ArchDuque-Pancake@users.noreply.github.com>

* Update Italian.properties (#7572)

* Update Dutch.properties (#7547)

* Update Dutch.properties

* Paar spellingsdingetjes eruit gehaald

* Vertalingen toegevoegd

Verwarrend: speler-ID en gebruiker-ID worden door elkaar gebruikt! vb regel 675
Mag het pull request worden geamendeerd of moet er een apart pull request gemaakt worden?

* Paar spellingsdingetjes

* Nieuwe vertalingen

* Fixed tests not working

Co-authored-by: Xander Lenstra <71121390+xlenstra@users.noreply.github.com>

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: Kostiantyn Kolesnichenko <test9@mormat.name>
Co-authored-by: Kostiantyn Kolesnichenko <mormat.iam@gmail.com>
Co-authored-by: xk730 <40309144+xk730@users.noreply.github.com>
Co-authored-by: Xander Lenstra <71121390+xlenstra@users.noreply.github.com>
Co-authored-by: Yattong the Mackerel <saud2410@naver.com>
Co-authored-by: Joan Josep <juanjo.ng.83@gmail.com>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
Co-authored-by: Caballero Arepa <78449553+Caballero-Arepa@users.noreply.github.com>
Co-authored-by: Caballero Arepa <78449553+ArchDuque-Pancake@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: TPunkiee <110175928+TPunkiee@users.noreply.github.com>
2022-08-04 18:32:20 +03:00
Nika Kasradze
33ca2d8ef9
fix #7565: Remove duplicate "Consumes ..." lines of city screen (#7592)
* fix #7565: Delete one "Consumes ..." lines of city screen

* fix #7565: Delete one "Consumes ..." lines of city screen

* fix #7565: Delete one "Consumes ..." lines of city screen
2022-08-03 13:38:35 -04:00
itanasi
61d48a5c37
Add Damage numbers to Battle Notifications (#7587)
* Initial changes

* Adding damage numbers
2022-08-03 20:24:19 +03:00
OptimizedForDensity
67fbc07552
Add translation for XP on World Screen (#7595) 2022-08-03 20:22:46 +03:00
Xander Lenstra
01cc67cee4
Reworded a tutorial, deleted unused line (#7594)
* Reworded a tutorial, deleted unused line

* Fixed faith symbol
2022-08-03 20:22:29 +03:00
itanasi
2671babefd
Fix Air Sweep Notification Translations (#7577)
* Fix Air Sweep Notification Translations

* Modify all translation files

* Fix a missing space
2022-08-03 17:34:21 +03:00
xk730
ebafe97e67
Updated the interface introduction content in the Encyclopedia of civilization (#7586)
* Add files via upload

* Upload the World_Screen.png

This will match the latest presentation

* Upload the World_Screen.png

because it is so old

* Update Tutorials.json

The Tutorials.json add the :
㉑: The Multiplayer Button - Here will help you easily check your current multiplayer game",
This will match the latest presentation
and
ⓗ: Here you will see what you currently have ☮Faith quantity, of course, if you don't open it ☮Faith Before starts the game, this will be ‘Off’
2022-08-03 17:33:37 +03:00
Ouaz
7f1c91ddaf
Update template.properties (#7576)
Fix untranslatable strings (issue #6131)
2022-08-02 22:57:10 +02:00
Yair Morgenstern
a3e7d5ccb6 fastlane cleanup for bad translations 2022-08-01 23:39:03 +03:00
Yair Morgenstern
1d83d16e85 4.2.1 2022-08-01 19:50:30 +03:00
Yair Morgenstern
99cda99f41
Version rollout (#7571)
* Bump version and create initial changelog entry

* Update Korean.properties (#7569)

* Update Korean.properties

Checking every 10~20 lines...

* Update Korean.properties

* Update Korean.properties

* Update Korean.properties

* Update Korean.properties

* Update Korean.properties

* Update Korean.properties

* Update Korean.properties

* Update Korean.properties

* Update Korean.properties

* Ukrainian translations (#7560)

* Update Ukrainian.properties - add missing translations

* Missing translations are added

* Trailing spaces are restored

* More translations are added

* More translations are added

Co-authored-by: Kostiantyn Kolesnichenko <mormat.iam@gmail.com>

* Hungarian translation #idk (#7558)

Another translation coming up from here ^^

* Update Polish.properties (#7556)

* Update Italian.properties (#7555)

* Update Italian.properties

* Update Italian.properties

* Update Italian.properties

* Update Italian.properties

* Update Italian.properties

* Update French.properties (#7553)

* Update Spanish.properties (#7552)

* Update Spanish.properties

Woah, I got fuzzy with so many "Interceptor" conjugations 0_o\

* Update Spanish.properties

* Improve Spread Religion tutorial

Co-authored-by: OptimizedForDensity <105244635+OptimizedForDensity@users.noreply.github.com>

* Update Catalan.properties (#7551)

* Update Catalan.properties

* Update Catalan.properties

* Update Catalan.properties

* Update Turkish.properties (#7548)

`Domalan` is too local a translation and has other meanings. `Yermantarı"` is better.

* Update Simplified_Chinese.properties (#7546)

* Update Simplified_Chinese.properties

* Update Simplified_Chinese.properties

* Update Simplified_Chinese.properties

* Update Indonesian.properties (#7541)

* Update Indonesian.properties

* Fixed tests

Co-authored-by: Xander Lenstra <71121390+xlenstra@users.noreply.github.com>

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: Yattong the Mackerel <saud2410@naver.com>
Co-authored-by: Jack Rainy <JackRainy@users.noreply.github.com>
Co-authored-by: Kostiantyn Kolesnichenko <mormat.iam@gmail.com>
Co-authored-by: JurDan | Led Cut <80947706+JurDan775@users.noreply.github.com>
Co-authored-by: pyotr71 <pyotr.pietrzak@gmail.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
Co-authored-by: Caballero Arepa <78449553+ArchDuque-Pancake@users.noreply.github.com>
Co-authored-by: OptimizedForDensity <105244635+OptimizedForDensity@users.noreply.github.com>
Co-authored-by: Joan Josep <juanjo.ng.83@gmail.com>
Co-authored-by: Selim <slmyldz41@gmail.com>
Co-authored-by: xk730 <40309144+xk730@users.noreply.github.com>
Co-authored-by: kensvin <63847755+Kensvin28@users.noreply.github.com>
Co-authored-by: Xander Lenstra <71121390+xlenstra@users.noreply.github.com>
2022-08-01 19:48:09 +03:00
Joan Josep
6a943bb46f
Rename "Show minimap" to "Minimap size" (#7567) 2022-07-31 15:56:45 -04:00
Xander Lenstra
8331b87f64
Removed duplicate placeholders (#7544) 2022-07-28 16:18:01 +03:00
Yair Morgenstern
c738da892c 4.2.0 2022-07-28 09:12:57 +03:00
Yair Morgenstern
a6b55ca14a
Version rollout (#7538)
* Bump version and create initial changelog entry

* Translate a few missing lines to Ukrainian (#7537)

Co-authored-by: Kostiantyn Kolesnichenko <mormat.iam@gmail.com>

* Update Finnish.properties (#7535)

* Update Finnish.properties

* Update Finnish.properties

* Update Korean.properties (#7531)

* Update Traditional_Chinese.properties (#7527)

* Update Polish.properties (#7525)

* Update Catalan.properties (#7524)

* Update Catalan.properties

* Update Catalan.properties

* Update Catalan.properties

* Update Catalan.properties

* Update Catalan.properties

* Update Russian.properties (#7520)

* Update Lithuanian.properties (#7518)

* Update Traditional_Chinese.properties (#7516)

* Update Traditional_Chinese.properties

* Update Traditional_Chinese.properties

* Update German translation (#7511)

* Update German translation

* Update German translation

* Update German translation

* Update German translation

* Update German translation

* Update Simplified_Chinese.properties (#7509)

* Update Simplified_Chinese.properties

* Update Simplified_Chinese.properties

* Update Indonesian.properties (#7506)

* Update Filipino.properties (#7505)

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Spanish.properties (#7503)

* Update French.properties (#7501)

* Update Swedish.properties (#7500)

* Update Italian.properties (#7498)

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: Kostiantyn Kolesnichenko <test9@mormat.name>
Co-authored-by: Kostiantyn Kolesnichenko <mormat.iam@gmail.com>
Co-authored-by: Securetux <110048962+Securetux@users.noreply.github.com>
Co-authored-by: Yattong the Mackerel <saud2410@naver.com>
Co-authored-by: Chia-Hung Ni <jameseses@gmail.com>
Co-authored-by: pyotr71 <pyotr.pietrzak@gmail.com>
Co-authored-by: Joan Josep <juanjo.ng.83@gmail.com>
Co-authored-by: deqtodo <94169613+deqtodo@users.noreply.github.com>
Co-authored-by: MindaugasRumsa51 <107413099+MindaugasRumsa51@users.noreply.github.com>
Co-authored-by: MartinP <77325495+Mape6@users.noreply.github.com>
Co-authored-by: heipizhu4 <100454479+heipizhu4@users.noreply.github.com>
Co-authored-by: kensvin <63847755+Kensvin28@users.noreply.github.com>
Co-authored-by: Shann Aurelle Ripalda <shannaurelleg@gmail.com>
Co-authored-by: Caballero Arepa <78449553+ArchDuque-Pancake@users.noreply.github.com>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
Co-authored-by: SimonCeder <63475501+SimonCeder@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
2022-07-28 09:06:46 +03:00
Xander Lenstra
4eb0038d10
Allows inquisitors to block holy cities (#7521)
* Inquisitors can disable holy cities

* Templates and notifications

* Combined with changes of previous religious PR

* Reviews
2022-07-27 22:18:04 +03:00
itanasi
af6ab8e4e5
Add Air Sweep (#7484)
* Add Air Sweep Unique
Enable Dogfighting Promotion
Add Air Sweep mode button and crosshair overlay

* Adding Air Sweep Battle Table

* Add airSweep to Battle
Remove double XP
While in AirSweep can't select other units on tile

* initial airsweep code

* Implement airSweep

* BattleTable indicates tile you're AirSweeping

* some notifications

* Clean up notifications.
Add icons

* Revert game.atlas and game.png

* Fix selection properly

* Update Vanilla UnitPromotions.json

* Better handling of movement use
comment cleanup

* missing credit

* Proper code so that Seas units also deal no damage
Adding Tutorials!

* Remove Intercept Bonus Damage/Protection

* Remove chance of Interceptor missing

* Battle Table a bit more consistent

* Defender also gets Air Sweep Modifiers

* Defender doesn't get bonus

* Remove unused getInterceptBonus
Combine logic

* Show damage in notifications for Air Sweep

* Randomize intercepting Civ and prioritize Air Units

* Remove debug code

* Updated atlas

* Clean up Uniques

* Object-ify DamageDealt for ease of reference

* code clean up

Co-authored-by: itanasi <spellman23@gmail.com>
2022-07-27 22:16:53 +03:00
SimonCeder
9fa00a9fa9 change wording 2022-07-22 23:12:55 +02:00
SimonCeder
0e00ec22c6 workers will replace city ruins 2022-07-22 20:53:01 +02:00
Caballero Arepa
0e0e245365
Allow HexaRealm to render jungles on hills (#7502) 2022-07-22 14:30:58 +02:00
Yair Morgenstern
2f8acff08c 4.1.21 2022-07-21 09:33:35 +03:00
Yair Morgenstern
5b50106ea5
Version rollout (#7496)
* Bump version and create initial changelog entry

* Update Russian.properties (#7493)

* Update Filipino.properties (#7487)

* Update Simplified_Chinese.properties (#7480)

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: deqtodo <94169613+deqtodo@users.noreply.github.com>
Co-authored-by: Shann Aurelle Ripalda <shannaurelleg@gmail.com>
Co-authored-by: heipizhu4 <100454479+heipizhu4@users.noreply.github.com>
2022-07-21 09:19:22 +03:00
alexban011
06096eaa8e
Mod categories (#7298)
* feature

* more categories

* added categories

* filter installed part1

* display vanilla rulesets in rulesets category + fix download from URL not showing

* filter installed mods

* removed isVanilla variable

* only look at second topic

* same but for online mdos as well

* replaced tilesets with graphics

* translations

* code duplication

* removed vanilla content from rulesets

* combined the function into one

* revert amountPerPage even tough its already on master

* Filter class

* 1

* mutableListOf<>()

* mutableListOf<>() again

* getFilterText removed

* !categoryFilter(filter)

* matchesCategory

* if (modTopic.size < 2) return false
2022-07-21 09:15:26 +03:00
Yair Morgenstern
aa8cbb49a3 4.1.20 2022-07-18 19:19:39 +03:00
Yair Morgenstern
d95cf13a41
Version rollout (#7481)
* Bump version and create initial changelog entry

* Update Turkish.properties (#7473)

* Ukrainian translations (#7472)

* Update Spanish.properties (#7471)

* Update Catalan.properties (#7467)

* Update French.properties (#7466)

* Update Italian.properties (#7464)

* Update German translation (#7463)

* Update German translation

* Update German translation

* Update Lithuanian.properties (#7462)

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: HasChad <58506555+HasChad@users.noreply.github.com>
Co-authored-by: Jack Rainy <JackRainy@users.noreply.github.com>
Co-authored-by: Caballero Arepa <78449553+ArchDuque-Pancake@users.noreply.github.com>
Co-authored-by: Joan Josep <juanjo.ng.83@gmail.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: MartinP <77325495+Mape6@users.noreply.github.com>
Co-authored-by: MindaugasRumsa51 <107413099+MindaugasRumsa51@users.noreply.github.com>
2022-07-18 19:17:36 +03:00
OptimizedForDensity
1287eb2c05
Minor reweight of AI policy selection (#7252)
* Reweight AI policy selection

* Vanilla ideological weights updated

* Update science victory weights
2022-07-17 11:21:12 +03:00
Yair Morgenstern
d9389b3c4e 4.1.19 2022-07-15 12:04:41 +03:00
Yair Morgenstern
9d20f991d0
Version rollout (#7460)
* Bump version and create initial changelog entry

* Update Catalan.properties (#7446)

* Update Spanish.properties (#7445)

* Ukrainian translations (#7439)

* Update German translation (#7435)

* Update French.properties (#7431)

* Update Traditional_Chinese.properties (#7430)

* Update Filipino.properties (#7428)

* Update Filipino.properties

* Update Filipino.properties

* Update Indonesian.properties (#7425)

* Update Italian.properties (#7424)

* Update Italian.properties

* Update Italian.properties

* Update Lithuanian.properties (#7423)

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: Joan Josep <juanjo.ng.83@gmail.com>
Co-authored-by: Caballero Arepa <78449553+ArchDuque-Pancake@users.noreply.github.com>
Co-authored-by: Jack Rainy <JackRainy@users.noreply.github.com>
Co-authored-by: MartinP <77325495+Mape6@users.noreply.github.com>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
Co-authored-by: Chia-Hung Ni <jameseses@gmail.com>
Co-authored-by: Shann Aurelle Ripalda <shannaurelleg@gmail.com>
Co-authored-by: kensvin <63847755+Kensvin28@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: MindaugasRumsa51 <107413099+MindaugasRumsa51@users.noreply.github.com>
2022-07-15 12:01:15 +03:00
OptimizedForDensity
2a2b4bc531
Better era-specific tile image support (#7453)
* Better era specific tile images

* Use ImageAttempter to reuse code

* Redundant code

* Unify era-specific image loading

* Revert change

* I guess I'll commit these
2022-07-15 10:51:46 +03:00
Xander Lenstra
160b51d578
Added more unit tests (#7448) 2022-07-14 10:27:06 +03:00
Ouaz
0f3fb48ebe
Remove all in-game mentions of 1.5x unhappiness for puppeted cities (#7420)
* Update Tutorials.json

Remove mention in the "After conquering" tutorial of 1.5x unhappiness for puppeted cities (according 87aa5bc)

* Update template.properties

Remove mention when conquering a city of 1.5x unhappiness for puppeted cities (according 87aa5bc)

* Remove mention of unhappiness for puppeted cities

* Modify "After Conquering" tutorial

Remove mention of unhappiness for puppeted cities
2022-07-11 21:44:29 -04:00
Yair Morgenstern
23026202ec 4.1.18 2022-07-11 10:43:49 +03:00
Yair Morgenstern
5c1ca900b7
Version rollout (#7422)
* Bump version and create initial changelog entry

* Update Simplified_Chinese.properties (#7415)

* Update Traditional_Chinese.properties (#7413)

* Update French.properties (#7406)

* Update French.properties

* Update French.properties

Revert bad (idea) changes

* Update German translation (#7405)

* Update Spanish.properties (#7401)

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: heipizhu4 <100454479+heipizhu4@users.noreply.github.com>
Co-authored-by: Chia-Hung Ni <jameseses@gmail.com>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
Co-authored-by: MartinP <77325495+Mape6@users.noreply.github.com>
Co-authored-by: Caballero Arepa <78449553+ArchDuque-Pancake@users.noreply.github.com>
2022-07-11 10:35:56 +03:00
Xander Lenstra
ae5a0221ed
Refactorings & three more unit tests for uniques (#7412) 2022-07-10 23:19:45 +02:00
OptimizedForDensity
cdecb3f52d
Fix monastery purchase cost (#7417) 2022-07-10 19:15:43 +03:00
Yair Morgenstern
f2365568d4
Fix multiple capture uniques resulting in double-capture (#7403) 2022-07-10 01:12:59 +02:00
Yair Morgenstern
6c533d63fb Hopefully resolved ANRs caused by available fonts taking too long to load 2022-07-08 16:54:21 +03:00
Yair Morgenstern
550ac30bff 4.1.17 2022-07-08 16:06:59 +03:00
Yair Morgenstern
f08dedea31
Version rollout (#7400)
* Bump version and create initial changelog entry

* Update Indonesian.properties (#7398)

* Update Simplified_Chinese.properties (#7397)

* Herbad patch 1 (#7395)

* Update Persian_(Pinglish-UN).properties

* Update Persian_(Pinglish-UN).properties

Edit the problem

* Update German translation (#7391)

* Update Catalan.properties (#7389)

* Update Lithuanian.properties (#7385)

* Update Filipino.properties (#7384)

* Update French.properties (#7383)

* Update Spanish.properties (#7381)

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: kensvin <63847755+Kensvin28@users.noreply.github.com>
Co-authored-by: heipizhu4 <100454479+heipizhu4@users.noreply.github.com>
Co-authored-by: Herbad <108671374+Herbad@users.noreply.github.com>
Co-authored-by: MartinP <77325495+Mape6@users.noreply.github.com>
Co-authored-by: Joan Josep <juanjo.ng.83@gmail.com>
Co-authored-by: MindaugasRumsa51 <107413099+MindaugasRumsa51@users.noreply.github.com>
Co-authored-by: Shann Aurelle Ripalda <shannaurelleg@gmail.com>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
Co-authored-by: Caballero Arepa <78449553+ArchDuque-Pancake@users.noreply.github.com>
2022-07-08 16:00:38 +03:00
OptimizedForDensity
9fd85edb72
Fix latest untranslated strings (#7382) 2022-07-07 17:52:33 +03:00
Yair Morgenstern
fe2d3243fc 4.1.16 2022-07-05 22:12:27 +03:00
Yair Morgenstern
99367c2212
Version rollout (#7366)
* Bump version and create initial changelog entry

* Update Persian_(Pinglish-UN).properties (#7365)

Translate some English words

* Update Persian_(Pinglish-UN).properties (#7364)

* Update Spanish.properties (#7362)

Improve unique understanding, not even I could really understand xDDD

* Update French.properties (#7361)

* Update Simplified_Chinese.properties (#7356)

* Update Simplified_Chinese.properties

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

* Some buttons were just filled (Brazillian Portuguese)! (#7355)

* Yet another section filled!

Just translated some menu options and buttons. I feel nice.

* Removed 'Requires translation' text

* new translations (#7352)

* Update Lithuanian.properties (#7350)

* Update German translation (#7349)

* Update Spanish.properties (Floating Gardens) (#7346)

In Mexico they are called "Chinampas"

* Revert "Update Persian_(Pinglish-UN).properties (#7365)" (#7367)

This reverts commit bb09098ce9.

* Revert "Update Persian_(Pinglish-UN).properties (#7364)" (#7368)

This reverts commit 6e337127ab.

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: Herbad <108671374+Herbad@users.noreply.github.com>
Co-authored-by: Caballero Arepa <78449553+ArchDuque-Pancake@users.noreply.github.com>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
Co-authored-by: heipizhu4 <100454479+heipizhu4@users.noreply.github.com>
Co-authored-by: Pssstr <85759927+Pssstr@users.noreply.github.com>
Co-authored-by: HasChad <58506555+HasChad@users.noreply.github.com>
Co-authored-by: MindaugasRumsa51 <107413099+MindaugasRumsa51@users.noreply.github.com>
Co-authored-by: MartinP <77325495+Mape6@users.noreply.github.com>
Co-authored-by: KESMGAMA <108433075+KESMGAMA@users.noreply.github.com>
2022-07-05 22:04:28 +03:00
OptimizedForDensity
76d1c0b4c9
Add missing Plains Hill Forest Lumber mill image for FantasyHex (#7372)
* Add missing lumber camp for FantasyHex

* Update atlas

* Update image

* Add missing plains hill forest camp

* Update image and remove added camp tile

* Remove redundant image

* Undelete atlas

* Delete extra GrasslandsHillForestLumbermill image
2022-07-05 08:06:09 +03:00
OptimizedForDensity
8b4bb89995
Fix duplicate version in string (#7374) 2022-07-05 08:05:06 +03:00
OptimizedForDensity
9477b319bc
Generalize production-to-stat conversion uniques (#7342)
* Generalize production to stat conversion enabling uniques

* Remove unnecessary code

* Rename class

* Update sound
2022-07-04 16:38:24 +03:00
letstalkaboutdune
716d5d3214
Unit icon alpha control (#7343)
* Unit icon alpha/size control

Implemented sliders in Options -> Display to give user control over unit icon opacity and size.

* Simplified sliders and re-added idle 50% transparency

* Minor fixes from PR review

* Removed unit icon size adjustment
2022-07-04 16:35:36 +03:00
Yair Morgenstern
21f0f9255d
Version rollout (#7348)
* Bump version and create initial changelog entry

* Update in Hungarian (#7341)

After all this time.... I'm back with a translating. Tried my best.

* More translations to Portuguese-Brazilian (#7340)

* More translations to Brazilian Portuguese

* Adding more translations to Brazilian Portuguese

* Translations to Brazilian Portuguese

* Update Turkish.properties (#7338)

* Update Spanish.properties (#7327)

* Update Catalan.properties (#7324)

* Update Filipino.properties (#7320)

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Indonesian.properties (#7319)

* Update German translation (#7318)

* Update German translation

* Update German translation

* Update German translation

* Update Lithuanian.properties (#7317)

* Update Simplified_Chinese.properties (#7315)

* Update Simplified_Chinese.properties

* Apply suggestions from code review

Co-authored-by: heipizhu4 <100454479+heipizhu4@users.noreply.github.com>

Co-authored-by: heipizhu4 <100454479+heipizhu4@users.noreply.github.com>

* Update French.properties (#7308)

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: JurDan775 <80947706+JurDan775@users.noreply.github.com>
Co-authored-by: André Lucas C. da Silva <andr9310@gmail.com>
Co-authored-by: HasChad <58506555+HasChad@users.noreply.github.com>
Co-authored-by: Caballero Arepa <78449553+ArchDuque-Pancake@users.noreply.github.com>
Co-authored-by: Joan Josep <juanjo.ng.83@gmail.com>
Co-authored-by: Shann Aurelle Ripalda <shannaurelleg@gmail.com>
Co-authored-by: kensvin <63847755+Kensvin28@users.noreply.github.com>
Co-authored-by: MartinP <77325495+Mape6@users.noreply.github.com>
Co-authored-by: MindaugasRumsa51 <107413099+MindaugasRumsa51@users.noreply.github.com>
Co-authored-by: xk730 <40309144+xk730@users.noreply.github.com>
Co-authored-by: heipizhu4 <100454479+heipizhu4@users.noreply.github.com>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
2022-07-01 10:07:48 +03:00
SomeTroglodyte
64ab79faf3
Moddable prettier Tutorials - Step 1 (#7326)
* Moddable prettier Tutorials - Step 1

* Moddable prettier Tutorials - TranslationFileWriter

* Moddable prettier Tutorials - Kdoc

* Moddable prettier Tutorials - UX for open options task
2022-07-01 09:36:11 +03:00
Timo T
57ed61af41
Save compatibility handling (#7255)
* Add serialization version to GameInfo

* Add handling of incompatible saves due to a dfiferent save version

* Fix compilation?

* Fix ios compilation

* Refactor: Make it clearer that GameInfo serialization version is only supposed to be incremented when it's guaranteed to cause issues & rename to compatibility version

* Update initial version

* Update initial version

* Fix merge mistake
2022-07-01 09:34:41 +03:00
alexban011
119440ccec
fixing translatable (#7277)
* 1 - speeds not translatable

* 2 - start year:
2022-07-01 09:34:13 +03:00
OptimizedForDensity
b3cd36c70e
Fix translation issues caused by nested brackets and braces (#7242)
* Fix translation issues

* Readd comment

* Reviews

* Update translation line
2022-07-01 09:32:56 +03:00
Yair Morgenstern
8f0e64e02d 4.1.14 2022-06-25 22:47:35 +03:00
Yair Morgenstern
250ab4010f
Version rollout (#7305)
* Bump version and create initial changelog entry

* Update Russian.properties (#7303)

* Update Portuguese.properties (#7300)

* Update Romanian.properties (#7294)

* Update Romanian.properties

* Update Romanian.properties

* oopsie

* Update Swedish.properties (#7286)

* Update Catalan.properties (#7274)

* Update Catalan.properties

* Update Catalan.properties

* Update Catalan.properties

* Update Spanish.properties (#7273)

* French.properties: update translation (#7272)

* French.properties: fix grammatical mistake

Multiplayer, not multiplayers, as the subject of the adjective is a
single game, server, etc. but never players themselves.

* French.properties: Update French translation

* Update Simplified_Chinese.properties (#7270)

* Update Simplified_Chinese.properties

* Update Simplified_Chinese.properties

* Update Simplified_Chinese.properties

* Update Simplified_Chinese.properties

* Update Swedish.properties (#7269)

* Update Italian.properties (#7266)

* Update Filipino.properties (#7265)

* Update Filipino.properties

* Update Filipino.properties

* Update German translation (#7263)

* Update German translation

* Update German translation

* Update German translation

* Update Lithuanian.properties (#7262)

* Update Indonesian.properties (#7260)

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: deqtodo <94169613+deqtodo@users.noreply.github.com>
Co-authored-by: Amarques-UCSD <77080462+Amarques-UCSD@users.noreply.github.com>
Co-authored-by: alexban011 <alexban011@gmail.com>
Co-authored-by: Baapity <62382567+Baapity@users.noreply.github.com>
Co-authored-by: Joan Josep <juanjo.ng.83@gmail.com>
Co-authored-by: Caballero Arepa <78449553+ArchDuque-Pancake@users.noreply.github.com>
Co-authored-by: Mayeul Cantan <oss+github@mayeul.net>
Co-authored-by: heipizhu4 <100454479+heipizhu4@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: Shann Aurelle Ripalda <shannaurelleg@gmail.com>
Co-authored-by: MartinP <77325495+Mape6@users.noreply.github.com>
Co-authored-by: MindaugasRumsa51 <107413099+MindaugasRumsa51@users.noreply.github.com>
Co-authored-by: kensvin <63847755+Kensvin28@users.noreply.github.com>
2022-06-25 22:38:41 +03:00
Timo T
bc9a42e452
Save uncaught exception to file (#7247)
* Refactor: Rename GameSaver to UncivFiles

* Save last uncaught exception to file

Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
2022-06-25 22:30:27 +03:00
OptimizedForDensity
98af4207ec
Make mounted vs city penalties only for attacking (#7296)
* Make horse vs city penalties only for attacking

* Reorder conditions

Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
2022-06-25 22:30:04 +03:00
OptimizedForDensity
efc095eaa1
Logistics allows move after attack (#7291) 2022-06-25 22:19:41 +03:00
alexban011
56812f0297
added gameParameter option to disable start bias (#7241)
* disable start bias

* better indentation

* improved

* improvedx2

* now for generated maps too

* made it choose a random location instead of the last one

* -||-

* checks

* forgot I can write directly on github :)
2022-06-25 22:14:32 +03:00
OptimizedForDensity
03ee03d99b
Fix cataphract not requiring horses (#7292)
* Fix cataphract not requiring horses

* Spacing
2022-06-25 22:12:09 +03:00
Azzurite
9d6a945a91 Regenerate atlas 2022-06-25 15:11:39 +02:00
alexban011
51ba657b75
Added option to select font size (#7238) 2022-06-25 13:46:12 +02:00
alexban011
8047278d80
Add Notifications Log (#7122) 2022-06-25 13:40:42 +02:00
OptimizedForDensity
4f6a2eb2f4
Add notification when a civ is resurrected through liberation (#7276) 2022-06-24 01:24:29 +02:00
alexban011
ccf9f1c8b0
Improve city ambient sounds (#7275) 2022-06-23 20:43:41 +02:00
Yair Morgenstern
315adb7648 4.1.13 2022-06-22 09:47:51 +03:00
Yair Morgenstern
147b73fad2
Version rollout (#7259)
* Bump version and create initial changelog entry

* Update French.properties (#7258)

* translation (#7253)

* Update Simplified_Chinese.properties (#7251)

* Update Simplified_Chinese.properties

Imcomplete. A save commit only.

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

* Update Italian.properties (#7245)

* Update Filipino.properties (#7235)

* Improve German.properties (#7231)

* Update Lithuanian.properties (#7229)

* Update Catalan.properties (#7225)

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
Co-authored-by: alexban011 <alexban011@gmail.com>
Co-authored-by: heipizhu4 <100454479+heipizhu4@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: Shann Aurelle Ripalda <shannaurelleg@gmail.com>
Co-authored-by: Timo T <azzurite@gmail.com>
Co-authored-by: MindaugasRumsa51 <107413099+MindaugasRumsa51@users.noreply.github.com>
Co-authored-by: Joan Josep <juanjo.ng.83@gmail.com>
2022-06-22 09:36:33 +03:00
Timo T
68cc4303ec
Make popups and text fields nicer to interact with on Android (#7211)
* Make popups and text fields nicer to interact with on Android

* Refactor: Rename createTextField to UncivTextField.create

* Fix multiplayer save delete text
2022-06-22 09:32:20 +03:00
alexban011
8f53262fc4
CityScreen plays a sound when opened (#7163)
* added sounds to cityScreen

* changes? ..don't know how to name this commit

* removed try block

* improved era1 sound and added slider for city enter sounds

* added Information Era sound

* added Future Era sound

* better option name + translation

* added Atomic Era sound

* normalized sounds

* prevent spam + better era 0 and 1 sounds

* cleanup

* sound improvements to medieval and atomic

* volume now tied to sound effects

* improved information sound

* improved future sound

* sounds now stop if you exit the city screen

* improved Renaissance sound

* now in separate function

* now using the music controller

* better file names

* WLTK day sound + sounds are now configurable in Eras.json

* removed redundant setting and fixed comment

* added PlaySingle

* musicController no longer used

* Gdx.audio.newMusic is now used

* function name

* function are now in their own class

* CitySoundPlayer now has 1 instance in UncivGame and is hooked

* credits

* sounds loop

* loopable sounds

* updated credits

* fixed sound not stopping when changing city without leaving cityScreen

* changed WLTKNew sound

* added toggle for the sounds

* changed WLTK sound, removed music and made all tracks have the same volume

* addressed some of the issues

* addressed more issues

* increased sounds volume + volume slider

* made WLTK sound slightly quieter

* removed entry from Vanilla eras

* revert back to CitySoundPlayer.kt

* no more hooks

* removed unused stuff

* changees

* completly reverted MusicController

* and the MusicTrackChooserFlags

* fixed ESC not stopping sounds

* updated credits to mention the sounds are modified

* dispose()

* removed try block
2022-06-22 09:11:03 +03:00
Yair Morgenstern
8d742eef38 4.1.12 2022-06-19 21:55:28 +03:00
Yair Morgenstern
806135586d
Version rollout (#7222)
* Bump version and create initial changelog entry

* Update Catalan.properties (#7204)

* Update Catalan.properties

* Update Catalan.properties

* Update Catalan.properties

* Update Catalan.properties

* Update Lithuanian.properties (#7203)

* Update Filipino.properties (#7192)

* Update Filipino.properties

* Update Filipino.properties

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: Joan Josep <juanjo.ng.83@gmail.com>
Co-authored-by: MindaugasRumsa51 <107413099+MindaugasRumsa51@users.noreply.github.com>
Co-authored-by: Shann Aurelle Ripalda <shannaurelleg@gmail.com>
2022-06-19 21:49:20 +03:00
SomeTroglodyte
9683e27526
Civilopedia tweaks (#7051)
* Civilopedia Files Split

* Central showReligionInCivilopedia function

* ConstructImprovementConsumingUnit with Conditional for Prophet

* Show Units capable of building an Improvement

* "Needs removal of terrain features to be built"
2022-06-19 02:29:07 +02:00
Timo T
197241b2e0
Various UX improvements (#7207)
* Refactor: Format JSON

* Change button hover color to be darker

* Refactor: Change disabled buttons to always look disabled, even if they don't have the default style

* Make disabled style a little grayer

* Refactor: Make addCloseButton not start a new row

* Refactor: Remove "...inRow" popup button methods & add button style parameter

* Reorder "ok/cancel" popups to have "ok" on the right side

* Fix pointer enter/exit events being disabled by default

* Fix equalizeLastTwoButtonWidths not setting the cells to be equal size

* Change YesNoPopup to ConfirmPopup

* Add ConfirmPopup to deletion of save files
2022-06-19 00:53:30 +02:00
Azzurite
35c68b47d5 Regenerate atlas & update uniques.md 2022-06-18 23:39:08 +02:00
OptimizedForDensity
c922f134e6
Moddable game speeds (#6856)
* Move GameSpeed definition to JSON files

* Add game speeds civilopedia page
2022-06-18 23:27:46 +02:00
Joan Josep
1facd97782
Translated strings after generating translation files from Adv Opt. (#7209)
* Translated strings after generating translation files from Adv Opt.

* Amend missing space at the end of the line
2022-06-18 21:43:30 +03:00
Yair Morgenstern
f48bc94f87 4.1.11 2022-06-16 21:28:20 +03:00
Yair Morgenstern
192bc9eb46
Version rollout (#7185)
* Bump version and create initial changelog entry

* Update French.properties (#7174)

* Update Catalan.properties (#7173)

* Update Catalan.properties

* Update Catalan.properties

* Update Spanish.properties (#7172)

* Update Filipino.properties (#7166)

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Italian.properties (#7165)

* Update Italian.properties

* Update Italian.properties

* Update Brazilian_Portuguese.properties (#7149)

* Update Brazilian_Portuguese.properties

* Fixed Floodfill_Abbreviation mistake

* Update Brazilian_Portuguese.properties

* Update Brazilian_Portuguese.properties

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
Co-authored-by: Joan Josep <juanjo.ng.83@gmail.com>
Co-authored-by: Caballero Arepa <78449553+ArchDuque-Pancake@users.noreply.github.com>
Co-authored-by: Shann Aurelle Ripalda <shannaurelleg@gmail.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: Kalil <kalilcamera67@gmail.com>
2022-06-16 21:20:06 +03:00
SomeTroglodyte
e2b7891248
Two new Unit Tests (#7001)
* MapGenerator fixes

* MainMenu Background Map scaled to Screen

* Easter Eggs - Code only

* Easter Eggs - Graphics
2022-06-16 21:07:30 +03:00
alexban011
564f7b476c
small fixes (#7181)
* fixes

* relaced translations with _

* better displayCutout
2022-06-16 18:56:18 +03:00
Timo T
0585194eaf
Fix cutout options crash (#7169) 2022-06-15 15:59:58 +02:00
Yair Morgenstern
d562eb2dd2 4.1.10 2022-06-14 21:03:20 +03:00
Yair Morgenstern
c710b83a0d
Version rollout (#7162)
* Bump version and create initial changelog entry

* Update Lithuanian.properties (#7153)

* Update French.properties (#7142)

* Update Catalan.properties (#7140)

* Update Romanian.properties (#7139)

* Update Traditional_Chinese.properties (#7137)

* Update Traditional_Chinese.properties

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

Co-authored-by: heipizhu4 <100454479+heipizhu4@users.noreply.github.com>

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

Co-authored-by: heipizhu4 <100454479+heipizhu4@users.noreply.github.com>

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

Co-authored-by: heipizhu4 <100454479+heipizhu4@users.noreply.github.com>

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

Co-authored-by: heipizhu4 <100454479+heipizhu4@users.noreply.github.com>

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

Co-authored-by: heipizhu4 <100454479+heipizhu4@users.noreply.github.com>

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

Co-authored-by: heipizhu4 <100454479+heipizhu4@users.noreply.github.com>

* Update Traditional_Chinese.properties

Co-authored-by: heipizhu4 <100454479+heipizhu4@users.noreply.github.com>

* Update Simplified_Chinese.properties (#7136)

* Update Simplified_Chinese.properties

* Update Simplified_Chinese.properties

* Update Simplified_Chinese.properties

* Update Indonesian.properties (#7134)

* Update Indonesian.properties

* Update Indonesian.properties

* Fetch upstream and more translations to brazilian portuguese (#7133)

* More translations to Brazilian Portuguese

* Adding more translations to Brazilian Portuguese

* Translations to Brazilian Portuguese

* Update German translation (#7132)

* Update German translation

* Update German translation

* Update Filipino.properties (#7131)

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Spanish.properties (#7127)

* Update Spanish.properties

* fix some vainas

* Update Spanish.properties

* Update Spanish.properties

* Update Spanish.properties

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: MindaugasRumsa51 <107413099+MindaugasRumsa51@users.noreply.github.com>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
Co-authored-by: Joan Josep <juanjo.ng.83@gmail.com>
Co-authored-by: alexban011 <alexban011@gmail.com>
Co-authored-by: Jia <31085601+Jia35@users.noreply.github.com>
Co-authored-by: heipizhu4 <100454479+heipizhu4@users.noreply.github.com>
Co-authored-by: kensvin <63847755+Kensvin28@users.noreply.github.com>
Co-authored-by: André Lucas C. da Silva <andr9310@gmail.com>
Co-authored-by: MartinP <77325495+Mape6@users.noreply.github.com>
Co-authored-by: Shann Aurelle Ripalda <shannaurelleg@gmail.com>
Co-authored-by: Caballero Arepa <78449553+ArchDuque-Pancake@users.noreply.github.com>
2022-06-14 20:52:56 +03:00
alexban011
fc926420e8
added cutout support (#7044)
* added support

* now toggleable in settings

* translation

* added note that it requires restart

* made it enabled by default

* padded buttons to the right if there is a cutout

* checking for cutout instead of android

* reverted button changes

* moved option to advancedTab
2022-06-14 20:34:30 +03:00
Timo T
9bd8750739
Refactor: Consistent & correct usage of coroutines (#7077)
* Refactor: Consistent usage of coroutines

* Add usage comments to the different threads

* Refactor: Properly separate crash handling into its platform-specific parts

* Fix autoSave never finishing

* Correctly handle coroutines when the GL thread is not accepting runnables anymore

Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
2022-06-12 00:13:49 +03:00
Timo T
9008d242a3
Refactor: Change UncivGame.worldScreen and UncivGame.gameInfo to be of nullable type (#7114)
* Refactor: Make Popups work on Stages instead of BaseScreens

* Refactor: Change UncivGame.worldScreen and UncivGame.gameInfo to be of nullable type

* Fix "Resume" game loading not fully handling exceptions

* Fix one missed refactoring

* Refactor: remove useless postRunnable
2022-06-11 22:14:44 +03:00
Yair Morgenstern
d34fa7db3d 4.1.9 2022-06-10 16:56:19 +03:00
Yair Morgenstern
19e0537e8c
Version rollout (#7126)
* Bump version and create initial changelog entry

* Update Filipino.properties (#7124)

* Update Filipino.properties

* Update Filipino.properties

* Update French.properties (#7112)

* Update Simplified_Chinese.properties (#7107)

* Update Catalan.properties (#7105)

* Update Catalan.properties

* Update Catalan.properties

* Update Catalan.properties

* Update Spanish.properties (#7104)

* Update Italian.properties (#7102)

* Update German translation (#7101)

* Update Indonesian.properties (#7100)

* Update Lithuanian properties (#7099)

* Update Lithuanian.properties

* Update Lithuanian.properties

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: Shann Aurelle Ripalda <shannaurelleg@gmail.com>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
Co-authored-by: heipizhu4 <100454479+heipizhu4@users.noreply.github.com>
Co-authored-by: Joan Josep <juanjo.ng.83@gmail.com>
Co-authored-by: Caballero Arepa <78449553+ArchDuque-Pancake@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: MartinP <77325495+Mape6@users.noreply.github.com>
Co-authored-by: kensvin <63847755+Kensvin28@users.noreply.github.com>
Co-authored-by: MindaugasRumsa <106827940+MindaugasRumsa@users.noreply.github.com>
2022-06-10 16:49:05 +03:00
Timo T
3e6fc0e22a
Add multiplayer turn sound notification (#6995)
* Refactor: Extract methods & reduce code duplication

* Refactor: Rename Sounds to SoundPlayer

* Refactor: Make UncivSound a data class

As far as I can see, UncivSoundConstants served no purpose

* Refactor: Reorder sounds

* Refactor: Split up ExtensionFunctions and move into own package

* Add multiplayer turn sound notification

* Refactor: Remove unnecessary double translation

* Refactor: Reduce code duplication

* Refactor: No if for boolean logic
2022-06-10 16:44:29 +03:00
Xander Lenstra
9558b79653
Removed incorrectly translated strings from indonesian translation (#7108)
They should not be translated literally, but the link above should be followed to find what should be translated instead.
2022-06-10 00:27:58 +02:00
Yair Morgenstern
d795c56d58 4.1.8 2022-06-08 10:30:04 +03:00
Yair Morgenstern
32e93a32e2
Version rollout (#7098)
* Bump version and create initial changelog entry

* Update French.properties (#7093)

* Update Italian.properties (#7092)

* Update German translation (#7087)

* Update Japanese.properties (#7086)

* Update Japanese.properties

Added about 20 lines of Japanese translation.

Didn't know where the 'fastlane_full_description' so good so put one there commented out for now.

* Update Japanese.properties

Replaced the commented out fastlane_full_description with appropriate \n for line breaks

* Update Japanese.properties

Various easy one line translations

* Update Spanish.properties (#7082)

* Update Catalan.properties (#7081)

* Update Indonesian.properties (#7079)

Co-authored-by: yairm210 <yairm210@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: MartinP <77325495+Mape6@users.noreply.github.com>
Co-authored-by: itmaru <34495311+itmaru@users.noreply.github.com>
Co-authored-by: Caballero Arepa <78449553+ArchDuque-Pancake@users.noreply.github.com>
Co-authored-by: Joan Josep <juanjo.ng.83@gmail.com>
Co-authored-by: kensvin <63847755+Kensvin28@users.noreply.github.com>
2022-06-08 10:25:11 +03:00
OptimizedForDensity
b79246ee02
Certain projects cannot be hurried by great engineer (#7076) 2022-06-08 10:20:45 +03:00
MindaugasRumsa
b05072d0c9
Fix "Free technology" allowing you to get a technology you're not supposed to be able to get (#7083) 2022-06-08 02:16:46 +02:00
The Bucketeer
47c7026dad
Update ManuallyBlockedMods.json (#7089)
Deciv repository has been transferred recently and it has been updated with same standard as Deciv Redux.
2022-06-07 20:23:11 +03:00
Yair Morgenstern
ea3b1bb612 4.1.7 2022-06-06 10:02:02 +03:00
Yair Morgenstern
120c41dd15 Revert "Moddable prettier Tutorials - Step 1 (#7064)"
This reverts commit e91c0ff212.
2022-06-06 09:59:21 +03:00
Yair Morgenstern
6d50169c14
Version rollout (#7078)
* Bump version and create initial changelog entry

* Update Romanian.properties (#7069)

* Update Romanian.properties

* Update Romanian.properties

* Update Japanese.properties (#7068)

* Update Japanese.properties

Added about 20 lines of Japanese translation.

Didn't know where the 'fastlane_full_description' so good so put one there commented out for now.

* Update Japanese.properties

Replaced the commented out fastlane_full_description with appropriate \n for line breaks

* Update Traditional_Chinese.properties (#7066)

* Update Traditional_Chinese.properties

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

Co-authored-by: heipizhu4 <100454479+heipizhu4@users.noreply.github.com>

Co-authored-by: heipizhu4 <100454479+heipizhu4@users.noreply.github.com>

* Update Simplified_Chinese.properties  (#7065)

* Update Simplified_Chinese.properties

Complete easy stuff.

* Update Simplified_Chinese.properties

* Update Simplified_Chinese.properties

* [ZH]Fix typo

* Update Simplified_Chinese.properties

* Update Lithuanian.properties (#7060)

* Update Lithuanian.properties

* Update Lithuanian.properties

* Update Lithuanian.properties

* Update Lithuanian.properties

* Update French.properties (#7053)

* Update Filipino.properties (#7050)

* Update German translation (#7048)

* Add missing Spanish translations (#7043)

* Add multiplayer translations

* Other translations

"Fastlane_full_description"([this](8fbcad47a4/android/assets/jsons/translations/Spanish.properties (L23))) cannot be translated

* Add confuse but not so translation

* merge?

* Update Catalan.properties (#7041)

* Update Catalan.properties

* Amend a string missing [beliefType]

* Update Catalan.properties

* Update Catalan.properties

* Amend some Catalan localisation strings.

# Conflicts:
#	android/assets/jsons/translations/Catalan.properties

* Update Catalan.properties

* Update Catalan.properties

* Update Catalan.properties

* Update Catalan.properties

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: alexban011 <alexban011@gmail.com>
Co-authored-by: itmaru <34495311+itmaru@users.noreply.github.com>
Co-authored-by: Jia <31085601+Jia35@users.noreply.github.com>
Co-authored-by: heipizhu4 <100454479+heipizhu4@users.noreply.github.com>
Co-authored-by: MindaugasRumsa <106827940+MindaugasRumsa@users.noreply.github.com>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
Co-authored-by: Shann Aurelle Ripalda <shannaurelleg@gmail.com>
Co-authored-by: MartinP <77325495+Mape6@users.noreply.github.com>
Co-authored-by: RIMOPA <97112832+RIMOPA@users.noreply.github.com>
Co-authored-by: Joan Josep <juanjo.ng.83@gmail.com>
2022-06-06 09:37:29 +03:00
OptimizedForDensity
1312140793
More rankings & demographics screen icons (#7063)
* Add icons to demographics/rankings screen

* Unused import

* Some simplification

* Reviews

* Undelete atlas
2022-06-06 09:33:34 +03:00
SomeTroglodyte
e91c0ff212
Moddable prettier Tutorials - Step 1 (#7064) 2022-06-06 09:32:23 +03:00
SomeTroglodyte
bbe74854b4
Fix current list of un-translatables (#7057)
* Fix current list of un-translatables

* Fix current list of un-translatables - revert tr() change and tweak map editor map parameter display
2022-06-06 07:43:28 +03:00
alexban011
13da7c1b9e
Better friends list UI (#7054) 2022-06-06 03:02:45 +02:00
alexban011
a7e8b1a252
Translated notifications into Romanian (#7045) 2022-06-04 15:31:42 +02:00
The Bucketeer
56f11ccdca
HexaRealm tileset update (#7017)
* Delete Oil WellC.png

Since now offshore platform is back again, the "coastal" oil rig is obsolete now.

* Adding spaceship parts sprites for FantasyHex tileset

* Add files via upload

* Add files via upload
2022-06-02 08:49:09 +03:00
Yair Morgenstern
8fbcad47a4 4.1.6 2022-06-01 22:54:14 +03:00
Yair Morgenstern
ae13a87987
Version rollout (#7038)
* Bump version and create initial changelog entry

* Update Traditional_Chinese.properties (#7037)

* Update Traditional_Chinese.properties (#7024)

* Update Italian.properties (#7023)

* Update Traditional_Chinese.properties (#7016)

* Update German translation (#7015)

* Update German translation

* Update German translation

* Update French.properties (#7012)

* Translation PTBR (#7011)

* fastlane ptbr wip

* fastlane ptbr done

* add fastlane translation to main ptbr

* Update Brazilian_Portuguese.properties

* tabs and multiplayer

* Update Brazilian_Portuguese.properties

* Update Brazilian_Portuguese.properties

* Update Brazilian_Portuguese.properties

* Update Brazilian_Portuguese.properties

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: Chia-Hung Ni <jameseses@gmail.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: MartinP <77325495+Mape6@users.noreply.github.com>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
Co-authored-by: Lincoln V Schreiber <lincolnschreiber@gmail.com>
2022-06-01 22:47:54 +03:00
alexban011
e4e2696160
Friends list (#7020)
* created files for friends list screen

* redone #3

* fixed some crashes and more additions

* changelog in the comment below

* Update .gitignore

included the FriendsList.json file

* changelog in the comment below, again

* optimized imports to hopefully fix the error in github build check

* replaced imports with the ones from master since OnlineMultiplayer.kt no longer exists

* imported ViewFriendsList

* used the right package for all friendsList related files and a little bit of cleanup

* check if friends list is empty before adding the select friend button

* check if the ID is correct when adding a new friend

* don't set null as playerID if no friend is selected

* added messageTexts for the input TextFields

* don't show already selected friends

* fixed checkmark not updating after selecting a friend

* you can't be your own friend! and other checks for edit button

* fix error

* replaced error type with enum, replaced nested ifs with when loop, added additional checks when editing friends

* fixed error, can't really tell how I managed to do this

* reorganized checks for adding and created settings variable to hopefully fix the github build error

* actually fixed github error

* it now removes selected friends from the list of selectable friends

* fixed not being able to change only the id of a friend

* made it look half decent

* cleanup + improved help button

* updated template.properties

* renamed variable

* some tweaks

* moved friends list to GameSettings

* tested every feature and fixed what didn't work

* removed redundant variables and final cleanup

* little improvements

* string improvements

* removed rightSideButton from ViewFriendsListScreen

* removed unnecesary uniformX and decreased padding to allow seeing more friends in ViewFriendsListScreen
2022-06-01 22:47:43 +03:00
Timo T
5a4f1b0903
Allow non-SSL-encrypted HTTP traffic & warn Dropbox users (#7013)
* Add usesCleartextTrafic permission to Android manifest

* Add warning for starting a multiplayer game with the default Dropbox server

* Improve multiplayer server documentation

* Only update the current game if we're using a custom server or it's not our turn

* Refactor: Nicer variable name

* Fix compilation

* Fix type

Don't know what happened there
2022-06-01 22:40:20 +03:00
Timo T
1abc65163d
Fix multiplayer sometimes duplicating games (#6999)
* Fix multiplayer sometimes duplicating games

* Fix test compilation
2022-06-01 22:24:44 +03:00
OptimizedForDensity
afce951724
Pillaging certain improvements may loot gold or other stat resources (#6993)
* Pillaging loots gold on certain improvements

* Add warning if improvement pillageGold > 0 and has UniqueType.Unpillagable

* Pillage yields as a UniqueType

* Forgot to undo demonstration

* Remove unused line

* Eliminate some redundancy

* Reword unique text

* Slight cleanup and add notification for pillage victim

* Reviews

* Made pillaging notifications more consistent with other hostile action notifications

* Missed a line
2022-06-01 19:13:04 +02:00
MartinP
98d189384c
Update template to add 'wait' (#7021) 2022-05-31 16:33:47 +03:00
SomeTroglodyte
1b008905f6
Save and load reorg and keyboard handling (#6929)
* Load and Save Game Screens rework - Linting

* Load and Save Game Screens rework - Modularize and Keyboard

* Load and Save Game Screens rework - error handling

* Load and Save Game Screens rework - Move other save/load code

* Load and Save Game Screens rework - More Keyboard

* Load and Save Game Screens rework - Increase clipboard limit

* Load and Save Game Screens rework - Post-merge patch

* Load and Save Game Screens rework - Home, End, harden

* Load and Save Game Screens rework - Post-merge patch again

* Load and Save Game Screens rework - reviews
2022-05-31 16:31:19 +03:00
Yair Morgenstern
ad7397de66 Territory steal rewording 2022-05-30 21:59:32 +03:00
Yair Morgenstern
efa2168784 4.1.5 2022-05-30 21:50:56 +03:00
Yair Morgenstern
44ee9efd94
Version rollout (#7007)
* Bump version and create initial changelog entry

* Update Simplified_Chinese.properties (#7005)

* Update German translation (#6997)

* Update French.properties (#6987)

* Update Romanian.properties (#6982)

* Update Spanish.properties (#6981)

* Update Traditional_Chinese.properties (#6973)

* Update Indonesian.properties (#6972)

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: heipizhu4 <100454479+heipizhu4@users.noreply.github.com>
Co-authored-by: MartinP <77325495+Mape6@users.noreply.github.com>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
Co-authored-by: alexban011 <alexban011@gmail.com>
Co-authored-by: Caballero Arepa <78449553+ArchDuque-Pancake@users.noreply.github.com>
Co-authored-by: hhpy123 <100397618+hhpy123@users.noreply.github.com>
Co-authored-by: kensvin <63847755+Kensvin28@users.noreply.github.com>
2022-05-30 21:43:33 +03:00
Paul Pogonyshev
8ab686cb14
Improve suggestions when constructing an improvement is not possible (#6947)
* Improve suggestions when constructing an improvement is not possible

* Reimplement getImprovementBuildingProblems() as a generator function

* Update documentation of getImprovementBuildingProblems(); forgotten in the last commit

* ImprovementPickerScreen - tr

* Rename a variable for clarity

Co-authored-by: SomeTroglodyte <63000004+SomeTroglodyte@users.noreply.github.com>
2022-05-29 22:16:04 +03:00
Joan Josep
a17797a709
Add Catalan translation and provide some strings. (#6992) 2022-05-29 16:50:47 +02:00
OptimizedForDensity
09195d6b62
More UniqueType unit tests and correct some broken uniques in JSON files (#6965)
* Add ruin reward unique check plus fix broken unique
2022-05-29 16:08:15 +02:00
alexban011
ea31bd164f
Add optional on-screen buttons to zoom in and out (#6933) 2022-05-29 15:32:36 +02:00
Timo T
e4e6b842cb
Refactor: Remove superfluous postCrashHandlingRunnable (#6974) 2022-05-28 00:11:14 +02:00
Timo T
a942c961b5
Fix multiplayer turn check worker writing game data to wrong locations (#6976)
The fix in #6901 caused `arrayIndex` to go out of sync, because the `continue` happened before `arrayIndex` was incremented. This caused a later game preview to be saved to the previous game name, overwriting and duplicating it.
2022-05-27 16:34:24 +02:00
Timo T
3a03799074
Refactor: Extract all cross-platform code from CustomSaveLocationHelpers into core module (#6962)
* Also fixes the GameInfo.customSaveLocation to work for Android
2022-05-27 15:53:18 +02:00
Yair Morgenstern
c01d2a8893 4.1.4 2022-05-27 14:06:38 +03:00
Yair Morgenstern
82efebf1c8
Version rollout (#6971)
* Bump version and create initial changelog entry

* Update German translation (#6967)

* Update German translation

* Update German translation

* Update German translation

* Update Simplified_Chinese.properties (#6960)

* Update Simplified_Chinese.properties

* Update Simplified_Chinese.properties

* Check passing

Kind of embarrassing. A double fault.

* Update French.properties (#6943)

* Update Italian.properties (#6941)

* Update Traditional_Chinese.properties (#6921)

* Update Traditional_Chinese.properties

* Update Traditional_Chinese.properties

* Update Traditional_Chinese.properties

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

I think this is better

Co-authored-by: heipizhu4 <100454479+heipizhu4@users.noreply.github.com>

* Update Traditional_Chinese.properties

* Update Traditional_Chinese.properties

* Update Traditional_Chinese.properties

* Update Traditional_Chinese.properties

* Update Traditional_Chinese.properties

Co-authored-by: heipizhu4 <100454479+heipizhu4@users.noreply.github.com>

* Update Spanish.properties (#6944)

* Update Spanish.properties

Question: Can translated lines have <" "> in them? Or does it break something?
I ask because in spanish the hierarchy of quotation marks is: «First order “Second ‘third order’ order”».
As probably most fonts don't have <« »> (neither does my keyboard), these (" ") are the "correct" ones to use instead of < ' ' >.

* Update Spanish.properties

* Change  <' '> for <" ">

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: MartinP <77325495+Mape6@users.noreply.github.com>
Co-authored-by: heipizhu4 <100454479+heipizhu4@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: hhpy123 <100397618+hhpy123@users.noreply.github.com>
Co-authored-by: Caballero Arepa <78449553+ArchDuque-Pancake@users.noreply.github.com>
2022-05-27 14:00:11 +03:00
Timo T
214fae6f59
Add simple logging solution (#6952)
* Add simple logging solution

* Fix Android compilation

For some reason I stashed this and didn't unstash.

* Add better logging explanation
2022-05-27 13:45:13 +03:00
OptimizedForDensity
c48c6df22a
Fix piety complete faith discount (#6961) 2022-05-27 00:44:16 +03:00
Timo T
ea03b97639
#6914 Multiplayer Status Display (#6916)
* Handle subclassing of Events properly

Previously, you could only listen to the exact class

* Add relevant parent classes for the multiplayer events

* Refactor: use the old name as the main name in MultiplayerGameNameChanged event

* Add being able to stop listening to events in the EventBus

* Add tests for EventBus

* Refactor: Extract GameList into standalone file

* Refactor: safeUpdateIf to more generic throttle function

* Refactor: Extract multiplayer UI helper functions into separate file

* Refactor: Extract load/download multiplayer game into logic class from UI

* Make loading a multiplayer game automatically update the in-memory game in OnlineMultiplayer

* Refactor: Extract multiplayer settings into separate object

* Add multiplayer status display

* Fix error with multiplayer games not correctly being cleaned up after successful update

* Prevent loadLatestMultiplayerState() while next turn update is running

* Show "Working..." while waiting for next turn calculations instead of "Waiting for [civ]..."

* Fix race condition while updating online game state
2022-05-25 22:22:58 +02:00
Yair Morgenstern
8dadab872c 4.1.3 2022-05-25 19:53:45 +03:00
Yair Morgenstern
1ffbaa668a
Version rollout (#6938)
* Bump version and create initial changelog entry

* Update Traditional_Chinese.properties (#6935)

* Update Italian.properties (#6934)

* Update French.properties (#6926)

* Update Traditional_Chinese.properties (#6924)

* Update Traditional_Chinese.properties

* Update Traditional_Chinese.properties

* Update Spanish.properties (#6923)

* Update Traditional_Chinese.properties (#6920)

* Update German translation (#6919)

* Update Indonesian.properties (#6918)

* Update Simplified_Chinese.properties (#6917)

* Update Simplified_Chinese.properties

* Update Simplified_Chinese.properties

* Update Simplified_Chinese.properties

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: Chia-Hung Ni <jameseses@gmail.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
Co-authored-by: Caballero Arepa <78449553+ArchDuque-Pancake@users.noreply.github.com>
Co-authored-by: hhpy123 <100397618+hhpy123@users.noreply.github.com>
Co-authored-by: MartinP <77325495+Mape6@users.noreply.github.com>
Co-authored-by: kensvin <63847755+Kensvin28@users.noreply.github.com>
Co-authored-by: xk730 <40309144+xk730@users.noreply.github.com>
2022-05-25 19:45:56 +03:00
SomeTroglodyte
e1b76e776d
Fix floodfill abbreviation translation showing on fortify key tooltips (#6909)
* Fix floodfill abbreviation translation showing on fortify key tooltips

* Fix floodfill abbreviation translation - fix case

* Fix floodfill abbreviation translation - existing and comment
2022-05-25 19:39:08 +03:00
SomeTroglodyte
0f63000ac8
Show required resource for upgrades, rework upgrade logic (#6849)
* Show required resource for upgrades, rework upgrade logic

* Show required resource for upgrades - reviews
2022-05-25 19:35:27 +03:00
alexban011
93afb26c62
Added option for confirmation when clicking "next turn" button (#6925) 2022-05-24 21:32:35 +02:00
Azzurite
4eaf3c8355 Regenerate atlas for e672ca6bf4 2022-05-24 17:34:02 +02:00
The Bucketeer
e672ca6bf4
Adding the missing spaceship parts unit sprites for FantasyHex tileset (#6928) 2022-05-24 17:32:20 +02:00
Timo T
b59b890ced
Fix multiplayer turn check worker exception (#6915) 2022-05-23 10:48:08 +03:00
Yair Morgenstern
6836038252 4.1.2 2022-05-22 20:40:51 +03:00
Yair Morgenstern
39adaed6b1
Version rollout (#6911)
* Bump version and create initial changelog entry

* Translations to Brazilian Portuguese (#6900)

* More translations to Brazilian Portuguese

* Adding more translations to Brazilian Portuguese

* Translations to Brazilian Portuguese

* Update Russian.properties (#6898)

* Update Spanish.properties (#6885)

* Update Spanish.properties

* Update Spanish.properties

* Update Italian.properties (#6883)

* Update German translation (#6878)

* Update French.properties (#6874)

* Update Traditional_Chinese.properties (#6872)

* Update Filipino.properties (#6864)

* Update Filipino.properties

* Update Filipino.properties

* Update Indonesian.properties (#6863)

* Update Simplified_Chinese.properties (#6861)

* Correct translation of 'keep it'

* Update Simplified_Chinese.properties

Computer fixed :D

* Fix error

Player report . F not only appers here, but also affects the Fortify's F

* Update Traditional_Chinese.properties (#6858)

* Translation rebuild and fix

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: André Lucas C. da Silva <andr9310@gmail.com>
Co-authored-by: deqtodo <94169613+deqtodo@users.noreply.github.com>
Co-authored-by: Caballero Arepa <78449553+ArchDuque-Pancake@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: MartinP <77325495+Mape6@users.noreply.github.com>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
Co-authored-by: Chia-Hung Ni <jameseses@gmail.com>
Co-authored-by: Shann Aurelle Ripalda <shannaurelleg@gmail.com>
Co-authored-by: kensvin <63847755+Kensvin28@users.noreply.github.com>
Co-authored-by: heipizhu4 <100454479+heipizhu4@users.noreply.github.com>
2022-05-22 20:36:49 +03:00
Timo T
fc9668f2d0
Refactor: change GameSaver from singleton to single instance pattern & move autosave logic into GameSaver (#6846)
* Refactor: change GameSaver from singleton to single instance pattern & move autosave logic info GameSaver

Singleton just doesn't make sense anymore when we have to `init(..)` with different arguments, then we should just make a normal class out of it

* Fix not correctly checking for missing external files dir

* Refactor: use more appropriate library method

* Add logging for external files dir
2022-05-22 19:51:35 +03:00
SomeTroglodyte
740886c890
Refactor UncivShowableException (#6899) 2022-05-22 13:55:19 +02:00
Timo T
f34b97a421
Fix multiplayer turn checker potentially stopping turn checks for everyone that plays that game if a file was not found remotely (#6901) 2022-05-22 00:13:48 -07:00
Timo T
244f9477df
Initial Event Bus implementation & Event-based multiplayer updates (#6826)
* Add EventBus

* Refactor: Extract multiplayer logic into their own classes & make updates event-based instead of throwaway+rebuild
2022-05-22 00:05:33 +02:00
itanasi
a2bc1a1a29
Assign Population Improvements (#6650)
City management UI to allow focusing automatic worker placement

Improvements to worker / specialist assignment routines
2022-05-20 00:12:23 +02:00
Timo T
07593d7034
Fix turn check worker exception (#6867)
AndroidFileHandle uses Gdx.files internally
2022-05-19 13:43:28 +03:00
SomeTroglodyte
3d6a01d633
Build warnings cleanup (#6827) 2022-05-19 02:12:18 +02:00
Yair Morgenstern
f464ac2544 4.1.1 2022-05-18 23:03:29 +03:00
Yair Morgenstern
c990c6338b
Version rollout (#6855)
* Bump version and create initial changelog entry

* Update Polish.properties a little (#6853)

* Add some random translations

* Translate the abbreviaation WLTK as DUK (Dzień Uwielbiania Króla)

* Add antoher random translation

* Update Simplified_Chinese.properties (#6852)

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: Anton <antek@sniec.pl>
Co-authored-by: xk730 <40309144+xk730@users.noreply.github.com>
2022-05-18 21:02:55 +03:00
The Bucketeer
08138c5de7
HexaRealm update (#6850)
* Delete Oil WellC.png

Since now offshore platform is back again, the "coastal" oil rig is obsolete now.

* Add files via upload

* Add files via upload

* Add files via upload

* Update HexaRealm.json
2022-05-18 20:46:03 +03:00
Yair Morgenstern
4513ddb75a
Version rollout (#6851)
* Update Filipino.properties (#6842)

* Ukrainian translations (#6840)

* Update Spanish.properties (#6839)

* Update Spanish.properties

* Update Spanish.properties

* Update French.properties (#6836)

* Update Italian.properties (#6835)

* Update Traditional_Chinese.properties (#6833)

* Update Traditional_Chinese.properties

* Update Traditional_Chinese.properties

* Update Traditional_Chinese.properties

* Update Indonesian.properties (#6831)

Co-authored-by: Shann Aurelle Ripalda <shannaurelleg@gmail.com>
Co-authored-by: Jack Rainy <JackRainy@users.noreply.github.com>
Co-authored-by: Caballero Arepa <78449553+ArchDuque-Pancake@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: xk730 <40309144+xk730@users.noreply.github.com>
Co-authored-by: kensvin <63847755+Kensvin28@users.noreply.github.com>
2022-05-18 08:23:28 +03:00
Timo T
5353f3337c
Fix Gdx.files being garbage collected in MultiplayerTurnCheckWorker (#6817)
* Add logging to MultiplayerTurnCheckWorker

* Fix NullPointerException in turn check worker: Gdx.files is null
2022-05-18 07:35:00 +03:00
Jack Rainy
4986505363
Great General typed uniques and improved moddability (#6818)
* Great General UniqueTyped and improved moddability - draft

* Great General UniqueTyped and improved moddability - reviews

* Great General UniqueTyped and improved moddability - no reason not to cache another

* Integration with JackRainy's solution

* Integration with JackRainy's solution - part 2

* Revert of maxGreatGeneralBonusRadius logic

* Minor refactoring

* Code review: minor refactoring

* Keep the warning for the modders about the obsolete unique

* Code review: Better wording for the unique

Co-authored-by: SomeTroglodyte <63000004+SomeTroglodyte@users.noreply.github.com>
2022-05-18 00:02:53 +03:00
Xander Lenstra
7079619fe2
Great improvements can again be constructed on forest (#6823)
* Great improvements can again be constructed on forest
This PR fixes a bug where great improvements couldn't be build on 
forests/marshes/jungles/etc. It does so by creating a unique which 
specifically allows for removing features, and checking for that.
Additionally, we only remove these features when we have the tech to 
remove them. For example, you can no longer plonk an Academy down over a 
forest without having researched mining.

* Missed the file for vanilla

* Reviews

* Fixed logic
2022-05-17 20:04:49 +03:00
Timo T
df9b62ff6f
Fix coroutines not being added to desktop:dist (#6822)
* Use kotlin coroutines instead of raw threads (+ refactorings)

Equal to f8e0f572

* Fix coroutine class files not being added to desktop:dist
2022-05-17 08:37:12 -07:00
SomeTroglodyte
8329d56131
Allow generation of "Default" Deciv redux maps (#6821) 2022-05-16 13:03:06 +03:00
Yair Morgenstern
b5a2aa59b6 4.1.0 2022-05-15 20:44:18 +03:00
Yair Morgenstern
01497a14ec
Version rollout (#6820)
* Bump version and create initial changelog entry

* More translations to Brazilian Portuguese (#6814)

* Update Brazilian_Portuguese.properties

* Adding translations to Brazilian Portuguese

* Adding more translations to Brazilian Portuguese

* Adding more Brazilian Portuguese translations

* Update Simplified_Chinese.properties (#6811)

* Update Simplified_Chinese.properties

Fix 2 errors & fill in the space

* Complete translations for Civilopedia

* Update French.properties (#6794)

* Update Indonesian.properties (#6791)

* Update Italian.properties (#6790)

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: André Lucas C. da Silva <andr9310@gmail.com>
Co-authored-by: heipizhu4 <100454479+heipizhu4@users.noreply.github.com>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
Co-authored-by: kensvin <63847755+Kensvin28@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
2022-05-15 19:34:50 +03:00
Timo T
e53303b249
Mark Unciv as an application that may use more memory than usual (#6819) 2022-05-15 19:30:48 +03:00
Yair Morgenstern
7ef2bbc56c Revert "Use kotlin coroutines instead of raw threads (+ refactorings) (#6801)"
This reverts commit f8e0f572
2022-05-15 19:20:23 +03:00
Jack Rainy
c4de3530f6
Possibility to liberate a traded city (#6797) 2022-05-15 17:57:29 +03:00
Timo T
f8e0f572e4
Use kotlin coroutines instead of raw threads (+ refactorings) (#6801)
* Refactor: Move classes into their own files

* Handle 404 FileNotFound in UncivServer

* Refactor: Rename method

* Make GameSaver.saveGame throw the exception by default if it is not handled

* Add possibility to work with FileHandles in GameSaver

* Make OnlineMultiplayerGameSaver load the multiplayerServer setting each time it does something

This theoretically makes it unnecessary for the OnlineMultiplayerGameSaver to be re-instantiated each time it is used

* Refactor: Remove duplicated code

* Refactor: Extract NextTurnButton from WorldScreen

* Refactor: Remove WorldScreen-specific code from OptionsPopup

* Use kotlin coroutines everywhere instead of plain threads

This probably also cuts down on our raw thread usage, improving performance, since we now use a cached thread pool (in addition to coroutines being able to reuse threads anyway)

* Improve deep load from notification

* Refactor: Give music download coroutine the proper name
2022-05-15 00:52:45 +03:00
SomeTroglodyte
816e542e1c
Notifications not scrollable far enough after in-turn notifications got added (#6796) 2022-05-14 23:19:02 +03:00
Yair Morgenstern
e94d109166 4.0.16 2022-05-13 13:00:20 +03:00
Yair Morgenstern
66abc2f779
Version rollout (#6789)
* Bump version and create initial changelog entry

* Update Russian.properties (#6787)

* Update Russian.properties

* Fix translation

* Update Spanish.properties (#6782)

511 - Yes, the double space is intentional

* Add Fastlane_short_description translations (#6781)

Also added Civ V - Vanilla and Civ V - Gods and Kings translation.

* Update German translation (#6778)

* Update French.properties (#6769)

* Update Indonesian.properties (#6768)

* Update Simplified_Chinese.properties (#6766)

* Update Simplified_Chinese.properties

* Make 2 translation together (#1)

* Fetch the latest update
* Update Simplified_Chinese.properties

Correct language defects and ambiguities and fill in gaps

Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
Co-authored-by: Xander Lenstra <71121390+xlenstra@users.noreply.github.com>
Co-authored-by: xk730 <40309144+xk730@users.noreply.github.com>

Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
Co-authored-by: Xander Lenstra <71121390+xlenstra@users.noreply.github.com>
Co-authored-by: xk730 <40309144+xk730@users.noreply.github.com>

* Update Italian.properties (#6765)

* Update Korean.properties (#6754)

* Update Korean.properties

* Update Korean.properties

* Update Korean.properties

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

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: deqtodo <94169613+deqtodo@users.noreply.github.com>
Co-authored-by: Caballero Arepa <78449553+ArchDuque-Pancake@users.noreply.github.com>
Co-authored-by: nilleh <72703236+niltok64@users.noreply.github.com>
Co-authored-by: MartinP <77325495+Mape6@users.noreply.github.com>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
Co-authored-by: kensvin <63847755+Kensvin28@users.noreply.github.com>
Co-authored-by: heipizhu4 <100454479+heipizhu4@users.noreply.github.com>
Co-authored-by: Xander Lenstra <71121390+xlenstra@users.noreply.github.com>
Co-authored-by: xk730 <40309144+xk730@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: Auvergne <97716654+ARPD-release@users.noreply.github.com>
2022-05-13 12:52:53 +03:00
SomeTroglodyte
345ca0ec25
Pedia from mainmenu (#6788)
* Make Civilopedia independent of worldScreen or gameInfo

* Make Civilopedia callable from Main Menu

* Era category for Civilopedia

* Era category for Civilopedia - atlas
2022-05-13 12:36:06 +03:00
Leonard Günther
09b4e82589
Rate limit handling for Dropbox (#6416)
* Added rate limit handling to dropbox

+ some refactor to make the whole file one object

* Added error messages on rate limit reached

+ refactored some popup code to reduce repetition

* Fixed merge error

* Made variables private

* Fixed file upload not working

because of missing override flag for dropbox

* Stop multiplayer refresher if rate limit reached

* Fixed typo

* Various code changes/fixes

- ErrorResponse var name has to be `error` because that's how DropBox's json property is named
- Change FileStorageRateLimitReached exception to store the seconds remaining as its own property instead of in the message
- Use toIntOrNull to avoid setting defaults in two places

* Fixed missed exception message

Co-authored-by: Azzurite <azzurite@gmail.com>
2022-05-13 09:16:52 +03:00
Yair Morgenstern
3e63be5376 4.0.15-patch1
Extra images fixed and HexaRealm added :)
2022-05-11 17:58:30 +03:00
The Bucketeer
e9ffe7667c
Proposal to add the current HexaRealm tileset as the built-in tileset. (for serious this time.) (#6756)
* Create posh

* HexaRealm tile sprites upload (part 1)

* HexaRealm tile sprites upload (part2)

* HexaRealm tile sprites upload (part 3)

* Upload HexaRealm.json

Should have no problem in terms of most of the layering!

* Delete posh

* Delete bana.png
2022-05-11 17:34:46 +03:00
Yair Morgenstern
cd002699f3 4.0.15 2022-05-11 17:22:31 +03:00
Yair Morgenstern
97b8bd106a
Version rollout (#6762)
* Bump version and create initial changelog entry

* Update Simplified_Chinese.properties (#6753)

Correct some translation errors

* Update Romanian.properties (#6748)

* 1

* 2 - most city names don't have a translation

* 3 - more cities

* Update Turkish.properties (#6746)

* Update French.properties (#6738)

* Update Italian.properties (#6734)

* Update Indonesian.properties (#6733)

* Update German translation (#6732)

* Update Filipino.properties (#6729)

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: xk730 <40309144+xk730@users.noreply.github.com>
Co-authored-by: alexban011 <alexban011@gmail.com>
Co-authored-by: omerfaruk-cakmak <32402595+omerfaruk-cakmak@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: kensvin <63847755+Kensvin28@users.noreply.github.com>
Co-authored-by: MartinP <77325495+Mape6@users.noreply.github.com>
Co-authored-by: Shann Aurelle Ripalda <shannaurelleg@gmail.com>
2022-05-11 17:05:17 +03:00
alexban011
dc8dadfcab
Fixed proxy issues when starting a new multiplayer game (#6757)
* vpn/proxy issues when creating new mp game

replaced redundant ping with opening a connection to dropbox to fix the proxy issue

* updated error message to include dropbox

* check multiplayerServer url if the user is playing on it

* use `https://content.dropboxapi.com` instead of `https://www.dropbox.com`

* fixed proxy issues on android

if connected to proxy but no internet access it will freeze for a couple seconds (until it finishes the for loop) but it works

* forgot to add the imports

* removed android sdk network check to fix proxy issues

* check for internet now separate from check for multiplayerServer
removed frunctions from PlatformSpecificHelpers__

* added improvements made by touhidurrr

* removed unused imports and replaced setter with property access syntax

Co-authored-by: Md. Touhidur Rahman <46617994+touhidurrr@users.noreply.github.com>
2022-05-11 16:58:20 +03:00
Yair Morgenstern
e348a20d2e Extracted policies, religions, nations and promotions to separate png files in order to fit HexaRealm tileset into the main file - see #6756 2022-05-11 16:57:39 +03:00
SomeTroglodyte
eb5e8ae226
Switchable gzipping of saved games (#6735)
* Switchable gzipping of saved games

* Switchable gzipping of saved games - consensus says default off
2022-05-11 16:23:11 +03:00
Xander Lenstra
8fcfbf752b
Improved clarity and moddability of building improvements (#6712)
* Renamed tile.hasUnique, deprecated `Indestructable`, unique for citadels
Also refactored the consumption of (great) people out of UnitActions.

* Reworked when improvements can be build somewhere for more clarity

* Made resources improvable by multiple improvements; Offshore Platform

* Fix compatability

* WIP

* Fixed the tests, but better

* I suppose I might as well update this now that we're a version later
2022-05-11 00:35:21 +02:00
SomeTroglodyte
7b4833741d
Fix missing translatables, again (#6705) 2022-05-11 00:21:38 +03:00
Yair Morgenstern
ba96bea556 4.0.14 2022-05-08 21:42:19 +03:00
Yair Morgenstern
4fe775c0f5
Version rollout (#6726)
* Bump version and create initial changelog entry

* Update Filipino.properties (#6714)

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Romanian.properties (#6713)

* Fixed issue #6649 by checking for internet connection before starting the game if "online multiplayer" is selected
Many thanks to @SomeTroglodyte for most of the code and for explanations

* Revert "Fixed issue #6649 by checking for internet connection before starting the game if "online multiplayer" is selected"

This reverts commit bae7d7c07f.

* some translations

* merging with 4.0.13

* fixed a little error

* fixed github check error

* Update German translation (#6710)

* Update German translation

* Update German translation

* Update German translation

* Update Italian.properties (#6708)

* Update French.properties (#6697)

* Update French.properties

* Update French.properties to 4.0.13

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: Shann Aurelle Ripalda <shannaurelleg@gmail.com>
Co-authored-by: alexban011 <alexban011@gmail.com>
Co-authored-by: MartinP <77325495+Mape6@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
2022-05-08 21:29:33 +03:00
SomeTroglodyte
3ea9c6503b
Font choice rework (#6670)
* Font choice rework

* Font choice rework - naming

* Font choice rework - fix default font selection
2022-05-08 21:22:23 +03:00
SomeTroglodyte
4b7edca7a8
Rework of the "Creates improvement on a specific tile" Unique (#6687)
* Make Citadel tile takeover a unique

* CreatesOneImprovement unique overhaul step 1

* CreatesOneImprovement unique overhaul - increase highlights alpha

* Fix missing translatables, again

* CreatesOneImprovement unique overhaul - review suggestions

Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
2022-05-08 21:22:01 +03:00
Jack Rainy
d00b72806b
Leftovers from previous PRs (#6725)
* Leftovers from #6698

* Leftovers from #6718

* Better naming
2022-05-08 21:19:55 +03:00
Timo T
86d5011da1
In-depth serialization improvement, fixes Barbarian Camps revealed by Honor not showing immediately in multiplayer
* Fix Barbarian Camp Spawned notification not revealing the camp on the map in multiplayer

* Fix lastSeenImprovement not being cloned

* Use HashMapVector2 in BarbarianManager

* Fix value not having its class written out for proper deserializing

* Refactor: various code improvements
2022-05-08 12:35:41 +02:00
Yair Morgenstern
806d58074c 4.0.13 2022-05-06 10:15:38 +03:00
Yair Morgenstern
621099b315
Version rollout (#6707)
* Bump version and create initial changelog entry

* Update Filipino.properties (#6703)

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Italian.properties (#6693)

* Update German translation (#6691)

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: Shann Aurelle Ripalda <shannaurelleg@gmail.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: MartinP <77325495+Mape6@users.noreply.github.com>
2022-05-06 10:07:20 +03:00
Ouaz
822ce5e041
Update healing values in "Injured Units" article (#6704)
- Based on merged commit "Healing parity" (c8be00b)
2022-05-05 21:07:11 +02:00
letstalkaboutdune
035b6528a7
New Demographics Scoreboard (#6645)
* Healing parity

Adjusted healing values for parity with CV

* New Demographics system for victory screen rankings

Added a new game setup checkbox option to use a ranking system on the victory screen which is more in line with the Civ V Demographics window. Created the UI element and game parameter but the demographics screen still needs to be implemented.

Also removed unnecessary comments from adjustments to healing values in a previous update.

* Demographics table init

Beginning to build structure of Demographics rankings table.

* Update VictoryScreen.kt

Attempt at getting more of the Demographics table implemented

* Update VictoryScreen.kt

Continued building the structure of the Demographics table

* Demographics first implementation

Finished first pass of Demographics screen.

* Minor text formatting

Improved some text formatting in code and comments.

* Update MapUnit.kt

Minor comment cleanup.

* SomeTroglodyte's Feedback, pt. 1

Implemented feedback given by SomeTroglodyte in PR #6645.

* Organized into functions

Split up Rankings table creation and Demographics table creation into new functions

* Update template.properties

Fixed missing space.

* Implementing more PR #6645 feedback

Added needed translation templates, used enum class instead of array for headers, moved checkbox to Options -> Display instead of new game

* Implemented rest of PR #6645 feedback

Simplified logic for finding player's rank, value, best/worst civ value, and filtered out defeated civs from the display and calculations

* Dead Civs get 0 in all categories

Added simple check if a civ is dead when computing score. If they are dead then they get 0 and go to the bottom of the scoreboard.

* Update VictoryScreen.kt

Further cleaned up code for better reuse and simpler logic with fewer loops.

* Update CivilizationInfo.kt

Simplified implementation of return 0 for stats when civ is defeated.

* Update CivilizationInfo.kt

Removed commented-out line of code.

* Fixed duplicate rank bug

Adjusted method of determining best and worst civs so that duplicates don't occur.

* Update VictoryScreen.kt

One-lined the handling of logic in buildDemographicsTable()

* Update VictoryScreen.kt

Moved static header row to new function.
2022-05-05 14:42:35 +02:00
MartinP
342367c72c
Fix typo in new translation line (#6692) 2022-05-05 01:23:22 +03:00
Yair Morgenstern
760aace923 4.0.12 2022-05-04 10:56:17 +03:00
Yair Morgenstern
204d80fbe2
Version rollout (#6689)
* Bump version and create initial changelog entry

* Rework German descriptions for F-Droid (#6688)

* Update French.properties (#6678)

* Update German translation (#6674)

* Update Traditional_Chinese.properties (#6673)

* Update Indonesian.properties (#6663)

* Update Simplified_Chinese.properties (#6660)

* Update Simplified_Chinese.properties

* Fix errors

I wonder who translated 'wonder ' into “奇迹”. I bet he/she used machine translating. Pretty annoying

* Update Simplified_Chinese.properties

* Update Simplified_Chinese.properties

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: MartinP <77325495+Mape6@users.noreply.github.com>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
Co-authored-by: Chia-Hung Ni <jameseses@gmail.com>
Co-authored-by: kensvin <63847755+Kensvin28@users.noreply.github.com>
Co-authored-by: heipizhu4 <100454479+heipizhu4@users.noreply.github.com>
2022-05-04 10:48:41 +03:00
SomeTroglodyte
cec9975b4d
Implement fastlane step 2: Translating (#6643)
* Implement fastlane step 2: Translating

* Placing the Font family Label before the Thread is nicer
2022-05-03 09:16:22 +02:00
heipizhu4
0d80929945
Make 'Followers of this religion" translatable (#6662)
First time editing the template. Is this the correct way to do so?
2022-05-03 08:07:41 +03:00
SomeTroglodyte
515c9bbcae
Show available resources from CityScreen (bottom right info only) (#6667) 2022-05-03 07:59:42 +03:00
Xander Lenstra
c55b14eaa7
Implemented most easy things from comments on moddable victory PR (#6600)
* Implemented most easy things from comments on moddable victory PR
Also added religious victory condition

* Fixed tests

* Fixed compile problems & missing string

* Fixed typo
2022-05-03 07:56:24 +03:00
SomeTroglodyte
345114ed93
Unciv Adaptive Android Icon (#6672)
* Use both icon and roundIcon properties

* Studio-generated Android Icon

* Studio-generated Android Icon to fastlane

Co-authored-by: JackRainy <JackRainy@users.noreply.github.com>
2022-05-03 07:55:55 +03:00
alexban011
898b1ca056
check for internet before starting a mp game to avoid freeze (#6679)
* Fixed issue #6649 by checking for internet connection before starting the game if "online multiplayer" is selected
Many thanks to SomeTroglodyte for most of the code and for explanations

* check for internet before starting a mp game to avoid freeze

Fixed issue #6649 by checking for internet connection before starting the game if "online multiplayer" is selected.

Many thanks to SomeTroglodyte for most of the code and for explanations. A slight modification has been done to the code to catch an error caused by InetAddress

* Revert "Merge remote-tracking branch 'origin/master-noInternet' into master-noInternet"

This reverts commit bd6474b50d, reversing
changes made to f52ad60b51.
2022-05-02 23:41:08 +02:00
Yair Morgenstern
3eb3324848 4.0.11 2022-05-01 00:23:18 +03:00
Yair Morgenstern
058a3e8211
Version rollout (#6658)
* Bump version and create initial changelog entry

* Update Filipino.properties (#6655)

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update French.properties (#6642)

* Update Italian.properties (#6629)

* Update Simplified_Chinese.properties (#6628)

* Update Simplified_Chinese.properties

* Update Simplified_Chinese.properties

* Update Indonesian.properties (#6626)

* Update Indonesian.properties

* Update Indonesian.properties

* Update Indonesian.properties

* Update Indonesian.properties

* Update German translation (#6625)

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: Shann Aurelle Ripalda <shannaurelleg@gmail.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: heipizhu4 <100454479+heipizhu4@users.noreply.github.com>
Co-authored-by: kensvin <63847755+Kensvin28@users.noreply.github.com>
Co-authored-by: MartinP <77325495+Mape6@users.noreply.github.com>
2022-05-01 00:17:32 +03:00
SomeTroglodyte
52586a2101
Map editor2.2 (#6641)
* Readability overloads for `getComplexRuleset`

* Enable loading maps containing missing ruleset objects with fix and message

* Fix bungled `noMapsAvailable` and follow minor criticism
2022-04-30 23:58:03 +03:00
Yair Morgenstern
3d9a53329e 4.0.10 2022-04-27 09:23:45 +03:00
Yair Morgenstern
0a6bdaa54d
Version rollout (#6624)
* Bump version and create initial changelog entry

* Update translation for Simplified_Chinese (#6616)

* Update Simplified_Chinese.properties

* Fix errors in Simplified_Chinsese translation

Including several accidentally deleted space & add 2 translation

* Update French.properties (#6607)

* Update French.properties

* Fix placeholder

* Update Spanish.properties (#6605)

* Update Italian.properties (#6603)

* Update German translation (#6598)

* Update German translation

* Update German translation

* Update German translation

* Update Filipino.properties (#6595)

* Update Filipino.properties

* Update Filipino.properties

* Translations for the Ukrainian language (#6593)

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: heipizhu4 <100454479+heipizhu4@users.noreply.github.com>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
Co-authored-by: Caballero Arepa <78449553+ArchDuque-Pancake@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: MartinP <77325495+Mape6@users.noreply.github.com>
Co-authored-by: Shann Aurelle Ripalda <shannaurelleg@gmail.com>
Co-authored-by: Jack Rainy <JackRainy@users.noreply.github.com>
2022-04-27 09:19:11 +03:00
SomeTroglodyte
8891883998
Resources UI (#6596)
* More info for Resources in Civilopedia

* Remove duplicates for Resource requirements in Civilopedia

* Resource overview link resource label to Civilopedia

* Resource overview stay if clicking can't notify (resources not existing on map)

* Resource overview display of resources produced by buildings
2022-04-27 09:15:49 +03:00
Xander Lenstra
933e769d8e
Changed milestone build globally text to make it more understandable (#6613)
* Changed milestone build globally text to make it more understandable

* Actually this is probably just as clear, gramatically more correct and
more imperative like the other milestones

* Fixed tests

* Reworded again
2022-04-27 09:15:33 +03:00
SomeTroglodyte
996c58e1fb
Some improvements to Map Editor - step 1 (#6622) 2022-04-27 08:19:04 +03:00
Md. Touhidur Rahman
c23387981a
Fix typo in vanilla (#6621)
https://yairm210.github.io/Unciv/Modders/uniques/
2022-04-26 22:37:14 +03:00
MartinP
00b1feb2c2
Added missing "s" (#6599) 2022-04-25 23:13:01 +03:00
Yair Morgenstern
0792d58434 4.0.9 2022-04-24 23:00:59 +03:00
Yair Morgenstern
6b2629c5b9
Version rollout (#6592)
* Bump version and create initial changelog entry

* Update Turkish.properties (#6591)

* Update French.properties (#6581)

* Translations for Ukrainian language (#6580)

* Translations for Ukrainian language

* Revert of accidental renaming of the placeholder

* Additional translations

* More additional translations

* Simplified_Chinese translation update  (#6578)

* translation update 4.0.8 part1

* Simplified_Chinsese translation 4.0.8 part2

* Update Simplified_Chinese.properties

Fix errors

* Update Spanish.properties (#6574)

* Update German translation (#6573)

* Update Filipino.properties (#6572)

* Update Italian.properties (#6571)

* Update Italian.properties

* Update Italian.properties

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: BerAfk <98158661+BerAfk@users.noreply.github.com>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
Co-authored-by: Jack Rainy <JackRainy@users.noreply.github.com>
Co-authored-by: heipizhu4 <100454479+heipizhu4@users.noreply.github.com>
Co-authored-by: Caballero Arepa <78449553+ArchDuque-Pancake@users.noreply.github.com>
Co-authored-by: MartinP <77325495+Mape6@users.noreply.github.com>
Co-authored-by: Shann Aurelle Ripalda <shannaurelleg@gmail.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
2022-04-24 22:54:47 +03:00
Xander Lenstra
34105efdda
Moddable victories (#6161)
* Added a moddable (but not yet functional) file for victories

* Spaceship parts are units now

* Fixed tests

* Added milestone objects

* Made 'our status' table in VictoryScreen dependend on file

* Updated VictoryManager to use the new Milestone system

* Fixed bug where in vanilla too many spaceship parts could beb uild

* Whoops

* Updated global victory table to use the jsons

* Updated the new game screen to show the new victory types
Also started with the deprecation of VictorType

* Did some translation stuff, also finally fixed the tests

* Removed VictoryType and reworked AI to use Milestones instead

* Add some checks for the victory file; tested that custom victories work
Also moves some code to a better spot and fixes compilation errors

* Fixed some things I thought about while falling asleep
Most notably: built -> build; fixed spaceship part construction 
priority; removed more code for the old system

* Fixed translation issues on the victory screen
2022-04-24 22:45:38 +03:00
Xander Lenstra
382707a6a5
Fixed a problem with the ordering of the vanilla policies (#6582) 2022-04-24 22:44:41 +03:00
Yair Morgenstern
e1363d92f9 4.0.8 2022-04-19 15:32:45 +03:00
Yair Morgenstern
88e9d9c618
Version rollout (#6570)
* Bump version and create initial changelog entry

* Update Simplified_Chinese.properties (#6568)

* Update French.properties (#6567)

* Update Italian.properties (#6566)

* Update Filipino.properties (#6562)

* Update German translation (#6561)

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: heipizhu4 <100454479+heipizhu4@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: Shann Aurelle Ripalda <shannaurelleg@gmail.com>
Co-authored-by: MartinP <77325495+Mape6@users.noreply.github.com>
2022-04-19 15:27:17 +03:00
Yair Morgenstern
1069b0933e
Added "Vegetation" unique so that vegetation spawn is not limited to just jungle and forest (#6569) 2022-04-19 15:25:33 +03:00
SomeTroglodyte
9e3df8605e
Request for take-over: Rewritten Map Editor (#5694)
* New Map editor - attempts 1

* New Map editor - attempts 2

* New Map editor - attempts 3

* New Map editor - attempts 4

* New Map editor - attempts 5

* New Map editor - attempts 6

* New Map editor - attempts 7

* New Map editor - attempts 8

* New Map editor - attempts 9

* New Map editor - attempts 10

* New Map editor - merge

* Revert included Stat icons in favour of #f90b22a

* Adapt to renamed TileGroup methods

* Manual merge of some baseruleset code for the map loader only

* Kludge for disappeared `getBaseRuleset`

* Fix after-merge conflicts, run convertTerrains in stepwise map generation

* Fix merge error

* Adapt to latest merge

* Baseruleset control - unpolished draft + max zoom out

* MapEditorV2 - merge fixes, base ruleset and mod control, texture loader fix, pedia links, translation, load mod maps, continent visualization, minor improvements and fixes

* MapEditorV2 - removed old editor
2022-04-19 13:17:44 +03:00
Xander Lenstra
a92057eed5
Made 'go to on map' translatable & fixed crash (#6565) 2022-04-18 11:48:03 +03:00
Yair Morgenstern
06569e6c5f Clearer "owned" resource 2022-04-17 14:18:16 +03:00
Yair Morgenstern
0f70d8360d 4.0.7 2022-04-17 13:45:59 +03:00
Yair Morgenstern
dedd19cff8
Version rollout (#6557)
* Bump version and create initial changelog entry

* Update Spanish.properties (#6550)

* Update Spanish.properties

* Update Spanish.properties

Maybe I have left some grammar mistakes. I have to go, hopefully I'll fix them before the update.

* fix typos

* Update Simplified_Chinese translation (#6545)

* 4.0.6 translation 1

* 4.0.6 translation 2

* Update Simplified_Chinese.properties

* Update Filipino.properties (#6539)

* Update Filipino.properties

* Update Filipino.properties

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: Caballero Arepa <78449553+ArchDuque-Pancake@users.noreply.github.com>
Co-authored-by: heipizhu4 <100454479+heipizhu4@users.noreply.github.com>
Co-authored-by: Shann Aurelle Ripalda <shannaurelleg@gmail.com>
2022-04-17 13:41:22 +03:00
Xander Lenstra
7ced78f6a2
Fixed vanilla policies regression (#6552)
* Fixed the vanilla piety tree

* Fixed more regression errors

* Removed unique
2022-04-16 23:04:28 +03:00
Yair Morgenstern
8a32be0ca2 4.0.6 2022-04-13 18:53:46 +03:00
Yair Morgenstern
9d0c4c117c
Version rollout (#6538)
* Bump version and create initial changelog entry

* Update Italian.properties (#6535)

* Update Filipino.properties (#6532)

* Update Filipino.properties

* Update Filipino.properties

* Update Simplified_Chinese.properties (#6529)

* Update Simplified_Chinese.properties

v4.0.5 translation 1

* 4.0.5 Simpified_Chinese translation 2

4.0.5 Simpified_Chinese translation 2

* Update French.properties (#6524)

* Update Polish.properties (#6523)

* Update Spanish.properties (#6517)

Several rewordings, fixes and homogeneization of terms.

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: Shann Aurelle Ripalda <shannaurelleg@gmail.com>
Co-authored-by: heipizhu4 <100454479+heipizhu4@users.noreply.github.com>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
Co-authored-by: Derdotox <103372983+Derdotox@users.noreply.github.com>
Co-authored-by: Phoenix7g <102632435+Phoenix7g@users.noreply.github.com>
2022-04-13 18:48:10 +03:00
Yair Morgenstern
9fa3d8de2f 4.0.5 2022-04-09 22:41:12 +03:00
Yair Morgenstern
5447f01f1d
Version rollout (#6514)
* Bump version and create initial changelog entry

* Update Spanish.properties (#6505)

* Update French.properties (#6503)

* Update German translation (#6501)

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: Caballero Arepa <78449553+ArchDuque-Pancake@users.noreply.github.com>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
Co-authored-by: MartinP <77325495+Mape6@users.noreply.github.com>
2022-04-09 22:37:23 +03:00
SomeTroglodyte
fe82f773da
Make Icons clickable in religions per city display (#6497)
* Make Icons clickable in religions per city display

* Add tutorial mention of the religious icon click feature

* Fix merge import mistakes
2022-04-09 22:18:19 +03:00
Yair Morgenstern
286e800b96 Resolved #6492 - package reorg 2022-04-08 13:01:37 +03:00
Leonard Günther
a2a8c0aab5
Fixed turn checker crashes (#6508)
* Fixed turn checker failure

when UncivGame.current goes out of scope

* Cleanup

* Less changed lines

* Added documentation
2022-04-08 12:26:29 +03:00
Yair Morgenstern
b728748cfa 4.0.4 2022-04-06 23:43:29 +03:00
Yair Morgenstern
4080718cc3
Version rollout (#6498)
* Bump version and create initial changelog entry

* Update Filipino.properties (#6496)

* Update Filipino.properties

Added a few

* Update Filipino.properties

* Update Filipino.properties

fixed errors

* Update Simplified_Chinese.properties (#6494)

4.0.3 translation 1

* Update Dutch.properties (#6489)

Added some missing translations
Changed the translations of Mercantile and Cultured as those translations did not fit in the context

* Update Indonesian.properties (#6487)

* Update French.properties (#6482)

* Update Russian.properties (#6480)

* Update Russian.properties

* Update Russian.properties

* Update Italian.properties (#6477)

* Update German translation (#6476)

* Update Spanish.properties (#6475)

General grammar improvement and some rewordings.

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: Shann Aurelle Ripalda <shannaurelleg@gmail.com>
Co-authored-by: heipizhu4 <100454479+heipizhu4@users.noreply.github.com>
Co-authored-by: SrirachaGamer87 <58479947+SrirachaGamer87@users.noreply.github.com>
Co-authored-by: kensvin <63847755+Kensvin28@users.noreply.github.com>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
Co-authored-by: deqtodo <94169613+deqtodo@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: MartinP <77325495+Mape6@users.noreply.github.com>
Co-authored-by: Phoenix7g <102632435+Phoenix7g@users.noreply.github.com>
2022-04-06 23:25:24 +03:00
Ouaz
b65d30a8ae
Update template.properties (#6484)
* Update template.properties

- Fix untranslatable entry "Revoke protection for" (see comment in #6131)

* Fix capitalization for "protection"
2022-04-06 23:20:02 +03:00
Yair Morgenstern
360d739b97 Resolved ANRs when opening Options menu
Was due to system fonts taking a long time to load
2022-04-06 22:57:27 +03:00
SomeTroglodyte
83327dabe8
Fix Goddess of Protection - maybe (#6493)
* Fix Goddess of Protection - maybe

* Improve TextSimilarity for case-only differences
2022-04-06 20:24:35 +03:00
Yair Morgenstern
73b6ee9af0 4.0.3 2022-03-31 23:17:09 +03:00
SomeTroglodyte
357800a80e
Missing translations cleanup (#6452) 2022-03-31 23:14:35 +03:00
Yair Morgenstern
443a15dd9b
Version rollout (#6473)
* Bump version and create initial changelog entry

* Update Finnish.properties (#6472)

* Update Indonesian.properties (#6462)

* Update Spanish.properties (#6461)

Some unpleasing grammar mistakes fixed.

* Update French.properties (#6459)

* Update Spanish.properties (#6457)

* Update German translation (#6450)

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: Tom K <tom.kostiainen@andritz.com>
Co-authored-by: kensvin <63847755+Kensvin28@users.noreply.github.com>
Co-authored-by: Phoenix7g <102632435+Phoenix7g@users.noreply.github.com>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
Co-authored-by: ArchDuque-Pancake <78449553+ArchDuque-Pancake@users.noreply.github.com>
Co-authored-by: MartinP <77325495+Mape6@users.noreply.github.com>
2022-03-31 23:14:04 +03:00
Xander Lenstra
72b4d2069e
Typed denmarks unique and generalized it (#6463)
* Typed denmarks unique and generalized it

* Added support for deprecated unique
2022-03-31 23:05:37 +03:00
SomeTroglodyte
90a172ab02
Remove re-orientation for OptionsPopup (#6466) 2022-03-31 23:03:57 +03:00
Yair Morgenstern
6315a16d98 Changed server connection to URL-based to allow connection to uncivserver.xyz 2022-03-31 23:03:14 +03:00
Yair Morgenstern
5ab44dd945 4.0.2 2022-03-28 22:03:23 +03:00
Yair Morgenstern
69603bc528 4.0.2 2022-03-28 17:55:36 +03:00
Yair Morgenstern
7abb982657
Version rollout (#6449)
* Bump version and create initial changelog entry

* Update Simplified_Chinese.properties (#6444)

4.0.1 translation 1

* Update Spanish.properties (#6431)

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

* Update Filipino.properties (#6429)

* Update Japanese.properties (#6422)

* Update Russian.properties (#6432)

* Update Russian.properties

* Update Russian.properties

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

* Update French.properties (#6440)

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

* Update Indonesian.properties (#6436)

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

* Update Simplified_Chinese.properties (#6428)

* Simplified_Chinese.properties

* Update Simplified_Chinese.properties

4.0.1 translation 1

* Remove `# Requires translation!`.

Co-authored-by: heipizhu4 <100454479+heipizhu4@users.noreply.github.com>
Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: heipizhu4 <100454479+heipizhu4@users.noreply.github.com>
Co-authored-by: ArchDuque-Pancake <78449553+ArchDuque-Pancake@users.noreply.github.com>
Co-authored-by: IDontHaveANam3 <92687952+IDontHaveANam3@users.noreply.github.com>
Co-authored-by: kobon2015 <63530082+kobon2015@users.noreply.github.com>
Co-authored-by: deqtodo <94169613+deqtodo@users.noreply.github.com>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
Co-authored-by: kensvin <63847755+Kensvin28@users.noreply.github.com>
Co-authored-by: Tang <1024830255@qq.com>
2022-03-28 17:50:28 +03:00
Xander Lenstra
8820ae6dad
Generalized a few nation uniques (#6443)
* Generalized a few nation uniques

* Fixed a bug and made random less random

* Implemented requested changes
2022-03-28 17:33:31 +03:00
SomeTroglodyte
7526114281
Empire overview resources (#6442)
* Empire Overview Resources: Vertical option

* Empire Overview Resources: Extra Info

* Empire Overview Resources: Tweaks

Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
2022-03-28 17:31:19 +03:00
SomeTroglodyte
870659d142
Translation writer conditionals (#6433)
* TranslationFileWriter processes Conditionals

* TranslationFileWriter processes Conditionals - wiki and reprocessed language files
2022-03-28 17:30:16 +03:00
Yair Morgenstern
2ef8581b52 4.0.1 2022-03-25 17:48:12 +03:00
Yair Morgenstern
926d3bcf4c
Version rollout (#6426)
* Bump version and create initial changelog entry

* Update Japanese.properties (#6417)

* Update Japanese.properties (#6410)

* Update Filipino.properties (#6409)

* Update Filipino.properties

* Update Filipino.properties

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: kobon2015 <63530082+kobon2015@users.noreply.github.com>
Co-authored-by: IDontHaveANam3 <92687952+IDontHaveANam3@users.noreply.github.com>
2022-03-25 17:45:31 +03:00
청하늘
84561e7ad4
Add Moddable Policy Priorities (#6390)
* Fixed G&K policy eras

Patronage should be Medieval and Freedom should be Industrial in G&K

* Added 'priorities' object to policy branch entries

* Fixed Vanilla policy eras

Also set testing priorities in advance

* Partial code formatting

* Reworked how the AI chooses a policy to newly adopt

* Removed debugging codes

* Update Civilization-related-JSON-files.md

Added Branch priorities

* Assigned actual priorities to each branch

Also fixed a debugging value in Ruleset.kt (-1 -> 0)
2022-03-25 17:33:42 +03:00
SomeTroglodyte
0b50715fb3
Improve TranslationFileWriter (less hardcoding, fixes PolicyBranch) (#6421)
* Allow TranslationFileWriter to follow several superclass levels (fixes PolicyBranch names)

* Bring German and template up to par as baseline

* Framework to feed TranslationFileWriter from UniqueParameterType, also fixes Fountain of Youth

* TranslationFileWriter legacy guessing now _much_ simpler

* Fix "chance to be destroyed by nukes" case

* Fix tests (allTranslationsHaveCorrectPlaceholders goes cross-language)
2022-03-25 17:27:25 +03:00
Yair Morgenstern
5fa10348b5 4.0.0 2022-03-21 21:29:55 +02:00
Yair Morgenstern
7a337dea4d
Version rollout (#6399)
* Bump version and create initial changelog entry

* Update Indonesian.properties (#6386)

* Update French.properties (#6371)

* Update Italian.properties (#6370)

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: kensvin <63847755+Kensvin28@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>
2022-03-21 21:18:37 +02:00
Tang
c1737b6183
Custom desktop font (#6377)
* Custom desktop font

* Add `getDesktopAllFonts` to setting custom desktop font.

* Custom font.
`desktopFontFamily` change to `fontFamily`.
Add GameSettings.getSettingsForPlatformLaunchers().

* Add `Custom font` setting UI.

* Add `Custom font` on Android.

* `Default Font` use translations.

* format

* remove open fun.

Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
2022-03-21 21:12:16 +02:00
SomeTroglodyte
cf21ade76e
Moddable Ice generation (any impassable feature on Water possible) (#6329)
Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
2022-03-21 21:08:25 +02:00
Xander Lenstra
367a427436
Unified two uniques into one more descriptive unique (#6380)
* Unified two uniques into one more descriptive unique

* Fixed fallout generation & typo
2022-03-21 21:05:54 +02:00
Xander Lenstra
984c4d9b2d
Unified & generalized a few uniques (#6379)
* Generalized trade route percent bonuses

* Unified two uniques using populationFilter; deprecated a deprecated uniq

* Made some renamings to improve clarity & fixed tests

* Fixed tests again

* Fixed typo
2022-03-21 21:05:20 +02:00
Yair Morgenstern
2b1251258c
Unciv server (#6384)
* Background implementation for Unciv server with ktor.

Server ip in settings, able to copy your own ip and copy ip from clipboard for easy sharing, created stub for the client-server data transfer. No actual data storage or server implementation.

* Unciv server round 2 - implementing crud for files and it works!
metadata seems to only be in use for mutex, which is currently unused
That's all for today

* When starting a new multiplayer game the files are correctly saved in the server, and the server can return the files, but the function in the game to retrieve the game info is non-blocking so it doesn't work. Still, progress!

* Changed the Gdx http to basic Java http, as used for Dropbox, and now everything works!!!!

* Documentation for running and using the server

* Better texts, translations, etc

* Trog is right this should be a PUT not POST
2022-03-21 21:05:02 +02:00
Xander Lenstra
1df49749f2
Split 6 tiles visible unique into its parts, making it more moddable (#6389)
* Split sight unique into its parts, making it more moddable

* Standardized unique ordering
2022-03-21 21:03:33 +02:00
Yair Morgenstern
4b55882019 3.19.18 2022-03-17 23:37:33 +02:00
Yair Morgenstern
635d588711 More untranslated items fixed - #6131 2022-03-17 23:34:39 +02:00
Yair Morgenstern
bf0a44413f
Version rollout (#6365)
* Bump version and create initial changelog entry

* Update Simplified_Chinese.properties (#6359)

* Update Filipino.properties (#6358)

* Update Spanish.properties (#6356)

* Update French.properties (#6352)

* Update Indonesian.properties (#6351)

* Update Italian.properties (#6350)

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: heipizhu4 <100454479+heipizhu4@users.noreply.github.com>
Co-authored-by: SOULTAKER1011 <90161631+SOULTAKER1011@users.noreply.github.com>
Co-authored-by: ArchDuque-Pancake <78449553+ArchDuque-Pancake@users.noreply.github.com>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
Co-authored-by: kensvin <63847755+Kensvin28@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
2022-03-17 22:52:03 +02:00
Yair Morgenstern
f66930ed68 3.19.17 2022-03-13 22:57:55 +02:00
Yair Morgenstern
b8ef6725eb
Version rollout (#6349)
* Commit from GitHub Actions (UncivBot)

* Update Spanish.properties (#6348)

* Update Simplified_Chinese.properties (#6338)

translation2

* Update French.properties (#6336)

* Update Italian.properties (#6334)

* Update Simplified_Chinese.properties (#6331)

3.19.16 translation1

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: ArchDuque-Pancake <78449553+ArchDuque-Pancake@users.noreply.github.com>
Co-authored-by: heipizhu4 <100454479+heipizhu4@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>
2022-03-13 22:53:45 +02:00
Yair Morgenstern
97787bd397
Resolved #6335 - now shows conditionals precluding construction of units (#6346)
* Resolved #6335 - now shows conditionals precluding construction of units

Built simply so that if we decide to expand the conditionals that should be shown it will simply be building a hashset of conditionalsToShow

* Added an instance wrapper, so the enum has the default values and the class has the actual values

* minor lint
2022-03-13 22:45:39 +02:00
Leonard Günther
cea63eb114
Multiplayer code cleanup (#6330)
* Fixed reviewed comments of PR 6273

* Cleanup of Dropbox.kt

- moved Dropbox.kt from ui\worldscreen\mainmenu to logic\multiplayer
- moved ServerMutex and OnlineMultiplayer to own files
- changed DropBoxFileConflictException to FileStorageConflictException to match FileStorage scheme
- merged FolderListEntry with DropboxMetaData as they were basicly the same
- introduced IFileMetaData to match FileStorage scheme and modified DropboxMetaData to use it
- removed some unused imports
2022-03-13 22:44:02 +02:00
SomeTroglodyte
d8e9563a7c
Religion overview improved (#6303)
* Improve handling of Religion PickerScreen with long lists

* Fix mouseover graying Labels bug

* Update Pantheon chooser visuals

* Some Color.lerp simplification

* Religion pickers - Merge common stuff of Pantheon and Religion Pickers

* Religion pickers - Linting

* Religion pickers - Move ReligionOverviewTable extra lines capability to Belief, Fix FormattedLine link+center

* Religion pickers - Belief Civilopedia linked description

* Religion overview tweaked

* Religion overview tweaked - patch1
2022-03-13 22:43:40 +02:00
SomeTroglodyte
ae0628a55e
Add Filipino.png since the Translation file is already there (#6343) 2022-03-12 22:36:23 +02:00
Yair Morgenstern
f73916ac3b 3.19.16 2022-03-10 19:52:29 +02:00
ArchDuque-Pancake
3ea8e8bd60
Update Spanish.properties (#6308)
* Update Spanish.properties

* Update Spanish.properties
2022-03-10 19:49:16 +02:00
Yair Morgenstern
dbca233a45
Version rollout (#6326)
* Commit from GitHub Actions (UncivBot)

* Update Brazillian_Portuguese.properties (#6325)

* Tradução mais avançada para português

* Update Brazilian_Portuguese.properties

* Add files via upload

* Update Indonesian.properties (#6324)

* Update French.properties (#6322)

* Update Czech.properties (#6321)

* Update German translation (#6311)

* Update Spanish.properties (#6307)

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: RivolviOcelot <73536178+Lufims@users.noreply.github.com>
Co-authored-by: kensvin <63847755+Kensvin28@users.noreply.github.com>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
Co-authored-by: jahodovykolac <79529669+jahodovykolac@users.noreply.github.com>
Co-authored-by: MartinP <77325495+Mape6@users.noreply.github.com>
Co-authored-by: Hello200000 <98656089+Hello200000@users.noreply.github.com>
2022-03-10 19:48:53 +02:00
SomeTroglodyte
e5b36f5b9f
Unique units abilities that should be inherited by upgrades (#6304)
* Unique units abilities that should be inherited by upgrades

* Unique units abilities that should be inherited by upgrades - xlt

* Unique units abilities that should be inherited by upgrades - wiki
2022-03-10 19:45:32 +02:00
SpacedOutChicken
44b4cb7e9b
Add Amphibious promotion to Songhai units (#6306)
* Destroy Arsenal when city is captured

* Update vanilla Songhai

* Add Amphibious promotion to all Songhai units

In Gods and Kings, all Songhai Land units have the Amphibious promotion. This brings our Gods and Kings up to speed with the original.
2022-03-10 19:43:34 +02:00
Yair Morgenstern
83e9aaf1d3
testy (#6312) (#6313) 2022-03-09 14:31:17 +02:00
SpacedOutChicken
43ebab9050
Petra fix (#6305)
* Destroy Arsenal when city is captured

* Fix Petra culture wiht city filter

Change Petra's culture bonus to city-specific bonus instead of empire-wide bonus
2022-03-08 20:21:41 +02:00
Yair Morgenstern
eaf5e453ba 3.19.15 2022-03-08 14:32:01 +02:00
ArchDuque-Pancake
05869e8ec7
Translation: Update Spanish.Properties (#6299) 2022-03-08 14:25:02 +02:00
Yair Morgenstern
fef2797341 3.19.14-patch1 2022-03-07 13:06:58 +02:00
Yair Morgenstern
5bae8d37b3
Translations update (#6295)
* Update French.properties (#6283)

* Update Indonesian.properties (#6280)

* Update Simplified_Chinese.properties (#6278)

* Update Italian.properties (#6276)

* Adding more polish translations (#6250)

* adding more polish translations

* Update Polish.properties

* Update Polish.properties

Fixed typo in line 189

Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
Co-authored-by: kensvin <63847755+Kensvin28@users.noreply.github.com>
Co-authored-by: heipizhu4 <100454479+heipizhu4@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: simur407 <szymon.bartczak@op.pl>
2022-03-07 13:03:08 +02:00
SomeTroglodyte
28ab45ae40
Fix Mughal Fort using UniqueType Stats instead of StatsPerCity (#6289) 2022-03-07 10:22:01 +02:00
Yair Morgenstern
03aa489dca 3.19.14 2022-03-05 20:26:01 +02:00
Yair Morgenstern
490fb3314c
Translations update (#6275)
* Update Simplified_Chinese.properties (#6274)

* Update Czech.properties (#6272)

* Update Indonesian.properties (#6269)

* Update German translation (#6258)

* Update Italian.properties (#6257)

* Update Japanese.properties (#6256)

* Update French.properties (#6252)

* Update Spanish.properties (#6251)

* Update Polish.properties - translation (#6268)

* Update Polish.properties

* Update Polish.properties

Previous ones were made bad 'cause of my mistake, but this one should be okay as for first day:)

Co-authored-by: heipizhu4 <100454479+heipizhu4@users.noreply.github.com>
Co-authored-by: jahodovykolac <79529669+jahodovykolac@users.noreply.github.com>
Co-authored-by: kensvin <63847755+Kensvin28@users.noreply.github.com>
Co-authored-by: MartinP <77325495+Mape6@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: Mic <100757255+Mic0217@users.noreply.github.com>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
Co-authored-by: ArchDuque-Pancake <78449553+ArchDuque-Pancake@users.noreply.github.com>
Co-authored-by: FancyDot <100958790+FancyDot@users.noreply.github.com>
2022-03-05 20:17:52 +02:00
SomeTroglodyte
fb7cb707e0
WLTK decorations (#6253)
* WLTK decoration png's and atlas

* UncivTooltip anchor to stage so tips won't get clipped by some ScrollPane

* Empire Overview Cities add WLTK column

* Make WLTK line on CityScreen stats box link to Civilopedia

* Make Civilopedia return to previous screen for _both_ ESC/Back and the Close Button

* Revive Civilopedia links in WorldScreen.TileInfoTable

* Festive decoration for WLTK day on CityScreen
2022-03-05 20:10:03 +02:00
SomeTroglodyte
2f980abd72
Locate Mod Errors choose base ruleset to do complex check against (#6263)
* Some Ruleset linting

* Mod-check display remove unnecessary FormattedLine

* Mod-check can run on selectable base ruleset instead of Vanilla only

* Mod-check show final severity on Expander

* Mod-check base selectbox translatable
2022-03-05 20:03:28 +02:00
Leonard Günther
0e26ea2cc8
Added deep link to multiplayer games (#6273) 2022-03-05 20:00:56 +02:00
Yair Morgenstern
00c5ecb6a6 3.19.13 2022-02-28 22:49:11 +02:00
Yair Morgenstern
c9dfd4062d 3.19.13 2022-02-28 19:49:50 +02:00
Yair Morgenstern
a96934dc7c
Translations update (#6248)
* Translation: Update Spanish.Properties (#6243)

* Translation: Update Spanish.Properties

Mosaicos? Pero si yá está el estandar de "Casilla"?...

* Update Spanish.properties

* Update Spanish.properties

* Create Spanish.properties

* Update Spanish.properties

* Update German translation (#6242)

* Update Indonesian.properties (#6241)

* Update French.properties (#6236)

* Update Simplified_Chinese.properties (#6233)

* Update Simplified_Chinese.properties

I have translated all I can, but there're still some of them out of my ability. Note: How to translate ID?

* Update Simplified_Chinese.properties

* Update Italian.properties (#6228)

Co-authored-by: ArchDuque-Pancake <78449553+ArchDuque-Pancake@users.noreply.github.com>
Co-authored-by: MartinP <77325495+Mape6@users.noreply.github.com>
Co-authored-by: kensvin <63847755+Kensvin28@users.noreply.github.com>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
Co-authored-by: heipizhu4 <100454479+heipizhu4@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
2022-02-28 19:47:05 +02:00
SomeTroglodyte
bca3d5645a
Fix Spaceship production boni (and key binding) (#6247)
* Fix spaceship part boni

* Key binding for 'Add part to spaceship'
2022-02-28 19:42:02 +02:00
SomeTroglodyte
651dcff581
Fix Polynesia's Wayfinding (#6238)
* Fix Polynesia's Wayfinding

* Fix mod option to use other unit filters with UnitsMayEnterOcean
2022-02-28 19:41:22 +02:00
itanasi
f360eda047
Align (reduce) Embarked Defense Strength per Era (#6231)
* Change Embarked Defending Strength per era. Update Tutorial a little

* Use JSON implementation of EmbarkDefense

Co-authored-by: itanasi <spellman23@gmail.com>
2022-02-28 19:41:13 +02:00
Yair Morgenstern
db1304ee35 3.19.12 2022-02-25 13:48:47 +02:00
Yair Morgenstern
79699a0ba7
Translations update (#6227)
* Update Indonesian.properties (#6225)

* Update French.properties (#6218)

* Update Spanish.properties (#6217)

UPDATE

* Update Italian.properties (#6216)

* Update German translation (#6215)

Co-authored-by: kensvin <63847755+Kensvin28@users.noreply.github.com>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
Co-authored-by: Hello200000 <98656089+Hello200000@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: MartinP <77325495+Mape6@users.noreply.github.com>
2022-02-25 13:43:38 +02:00
Yair Morgenstern
ae2b91dd67 Moved wiki links to new site links 2022-02-23 21:40:20 +02:00
Yair Morgenstern
09089cb60d Added uniques and deprecations for "Requires" and "Unlocked by" uniques - #6165 2022-02-22 16:55:37 +02:00
Yair Morgenstern
162ed35255 3.19.11 2022-02-22 11:41:06 +02:00
Yair Morgenstern
d01203fcdc
Translations update (#6214)
* Update Italian.properties (#6209)

* Update Japanese.properties (#6207)

* translate ConditionalsPlacement

* Update German translation (#6206)

* Translation: Update of Spanish (#6204)

* Translation: Update of Spanish

* Update Spanish.properties

* Update French.properties (#6200)

* Update Indonesian.properties (#6198)

Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: nukurette <nukurette@gmail.com>
Co-authored-by: MartinP <77325495+Mape6@users.noreply.github.com>
Co-authored-by: ArchDuque-Pancake <78449553+ArchDuque-Pancake@users.noreply.github.com>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
Co-authored-by: kensvin <63847755+Kensvin28@users.noreply.github.com>
2022-02-22 11:38:28 +02:00
Xander Lenstra
e0345bcb52
Reorganized the way city states grant resources & rounded a float to an int (#6210)
* Reorganized the way city states grant resources & rounded a float to an int

* Reworded a string so it sounds nicer
2022-02-22 11:30:33 +02:00
Xander Lenstra
90386bd4e7
Made spaceship parts units instead of buildings (#6203)
* Spaceship parts are units now

* Fixed tests

* Removed commented out lines

* `Spaceship Part` unique can also go on buildings in ods
2022-02-22 11:30:20 +02:00
itanasi
ae77ff0f16
Updating Embarking Tutorial with more details (#6205)
* Add Amphibious penalty to Land attacking into Water and vice versa

* Replace Landing with Amphibious in all translation files

* Fix trailing whitespace

* Revert translation files

* Change working of Amphibious
Set penalty to Landing and Boarding

* Type-ify Unique and add Depreciated
Add Promotion to Melee Naval
Add exception that Landing penalty is NOT against cities

* Fix Vanilla

* Rename to Landing Party
Icon doesn't work

* Properly regenerated game.atlas/game.png

* Fox naval unit Landind penalty is for attacking on to land

* Only Land unit should have Boarding penalty

* Unbreak logic

* Adding more information to the Embarking Tutorial

* More info

Co-authored-by: itanasi <spellman23@gmail.com>
2022-02-22 11:30:10 +02:00
Yair Morgenstern
5b50f32505 Great Admiral movement removed from NAval Tradition - per #6131 2022-02-19 23:10:15 +02:00
Yair Morgenstern
970e535e62 3.19.10 2022-02-19 19:57:23 +02:00
Yair Morgenstern
f7f21d0cbf
Translations update (#6196)
* Update Russian.properties (#6191)

* Update Korean.properties (#6183)

* Update Korean.properties

* Update Korean.properties

* Update French.properties (#6174)

* Update Spanish.properties (#6173)

TRANSLATION

* Update Italian.properties (#6172)

* Update Italian.properties

* Update Italian.properties

* Update Indonesian.properties (#6171)

* Update German translation (#6170)

* Update Japanese translation (#6169)

* Update Japanese.properties

* fix translation

* Translation: Update Spanish 3.19.10 (#6182)

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

* Update Brazilian_Portuguese.properties (#6190)

Co-authored-by: deqtodo <94169613+deqtodo@users.noreply.github.com>
Co-authored-by: Samsaek the Calico <saud2410@naver.com>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
Co-authored-by: Hello200000 <98656089+Hello200000@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: kensvin <63847755+Kensvin28@users.noreply.github.com>
Co-authored-by: MartinP <77325495+Mape6@users.noreply.github.com>
Co-authored-by: nukurette <76560753+nukurette@users.noreply.github.com>
Co-authored-by: ArchDuque-Pancake <78449553+ArchDuque-Pancake@users.noreply.github.com>
Co-authored-by: Rodolfz147 <100000475+Rodolfz147@users.noreply.github.com>
2022-02-19 19:40:16 +02:00
Yair Morgenstern
6d48f99206
Trigger uniques by sacrificing units with conditional (#6157)
* Triggered uniques currently come from researching techs, adopting policies, and building buildings.
This adds a third way of triggering uniques, by attaching them to units with a "by consuming this unit" conditional, which will be added as a possible unit action.
So for example, "[amount] Free Technologies <by consuming this unit>", "Reveals the entire map <by consuming this unit>" etc.

* Added a new uniquetype for triggerable uniques, to make them separate from regular global uniques, so that triggerable uniques can become unit uniques when necessary

* And added translations so the tests will pass
2022-02-19 19:38:39 +02:00
itanasi
402a9ba825
Show Improvements that are buildable after Removing TerrainFeature (#6149)
* Initial working version!

* More comments

* Add missing .tr() translation calls

* add brackets

* Fixed

* Optimize checking for removable last feature
More complete tileInfo.clone()

Co-authored-by: itanasi <spellman23@gmail.com>
2022-02-19 19:34:27 +02:00
Yair Morgenstern
9d0db40bbf 3.19.9 2022-02-15 11:52:56 +02:00
Yair Morgenstern
23585832b5
Translations update (#6166)
* Update Spanish.properties (#6163)

* Update Spanish.properties

translation

* Update Spanish.properties

* Update Korean.properties (#6158)

* Update Korean.properties

* Update Korean.properties

* Update Traditional_Chinese.properties (#6156)

* Update French.properties (#6155)

* Update German translation (#6154)

* Update German translation

* Update German translation

* Update German translation

* Update and rename Spanish.properties  (#6153)

* Update and rename Spanish.properties to español.properties

Fixed some bugs in translations

* Rename español.properties to Spanish.properties

* Update Spanish.properties

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

Co-authored-by: Hello200000 <98656089+Hello200000@users.noreply.github.com>
Co-authored-by: Samsaek the Calico <saud2410@naver.com>
Co-authored-by: Chia-Hung Ni <jameseses@gmail.com>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
Co-authored-by: MartinP <77325495+Mape6@users.noreply.github.com>
2022-02-15 11:51:00 +02:00
Yair Morgenstern
86cbe895be
In Civ VI there are certain units available only if a specific building is built, and this was raised as a request by modders as well. (#6160)
Instead of expanding the existing 'requires building' unique to units and adding limiters, it's both easier and more generalizable to add conditionals for cities with and without certain buildings to replace the uniques entirely
2022-02-15 11:40:47 +02:00
Yair Morgenstern
97d74a3aef Enabled type check checking for uniques whose deprecation leads to multiple uniques!
This also enables auto-deprecating the Embark+Ocean unique
2022-02-15 11:29:32 +02:00
itanasi
9d1f463310
Add Amphibious penalty to Land attacking into Water and vice versa (#6127)
* Add Amphibious penalty to Land attacking into Water and vice versa

* Replace Landing with Amphibious in all translation files

* Fix trailing whitespace

* Revert translation files

* Change working of Amphibious
Set penalty to Landing and Boarding

* Type-ify Unique and add Depreciated
Add Promotion to Melee Naval
Add exception that Landing penalty is NOT against cities

* Fix Vanilla

* Rename to Landing Party
Icon doesn't work

* Properly regenerated game.atlas/game.png

Co-authored-by: itanasi <spellman23@gmail.com>
2022-02-14 19:21:53 +01:00
Yair Morgenstern
3fbcf64371 Apparently Android Studio was autoremoving the whitespace because it thought it knows better than me. Disabled by Editor > General > On save > disable Remove trailing whitespace 2022-02-13 11:19:45 +02:00
Yair Morgenstern
e6555741be Resolved untranslated texts as per #6131
- "Ampitheatre"
- Fixed tests
2022-02-13 11:04:28 +02:00
Yair Morgenstern
4b2bde0365 Resolved untranslated texts as per #6131
- "Resources" in city-state diplomacy screen
- "When Friends"/"When Allies" in same
- "Enhance religion"
- "Choose a Religion" in religion screen
- Religion name in religion screen
- Translated drilldown items in city screen
- "null for wheat" in improvement Civilopedia entry
- "Type" and others in city-state civilopedia entry
2022-02-13 10:58:47 +02:00
Yair Morgenstern
0d3a0ef7e3 Resolved untranslated texts as per #6131
- Added unique targets as lines to translate so they'll appear in BattleTable
2022-02-13 10:34:50 +02:00
Yair Morgenstern
47dea93775 Resolved untranslated texts as per #6131
- Requires more population
- Religious
- "Requires" in Policy civilopedia text
- "for" in improvement civilopedia text
- Untranslated conditionals in battle table (listed as "when fighting in [tileFilter] tiles")
2022-02-13 10:30:31 +02:00
Yair Morgenstern
c498426715 3.19.8 2022-02-12 19:25:12 +02:00
Yair Morgenstern
f03a6bd6b3
Translations update (#6150)
* Translation: Actualizar Español (#6141)

* Update Russian.properties (#6139)

* Update Italian.properties (#6138)

* Update French.properties (#6135)

Co-authored-by: ArchDuque-Pancake <78449553+ArchDuque-Pancake@users.noreply.github.com>
Co-authored-by: deqtodo <94169613+deqtodo@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
2022-02-12 19:03:43 +02:00
Yair Morgenstern
e72dcc8b0d
Unified "X is only available under Y conditions" into a single unique (#6133)
* Unified "X is only available under Y conditions" into a single unique

There were a few problems with existing uniques - they weren't really composable, the offered things they didn't keep, etc

For example, "Incompatible with [policy/tech/promotion]", UniqueTarget.Policy, UniqueTarget.Tech, UniqueTarget.Promotion. In fact, promotions only checked promotion incompatibility, promotions - promotion incompat, etc

Additionally, with a few more changes, this could cover several other uniques - "Hidden until [amount] social policy branches have been completed", "Requires at least [amount] population", perhaps others

I have to say I think conditionals are the best thing ever and they make amazing composability possible :)

* Autoupdate correctly recognizes parameters
Updated ruleset jsons

* Deprecation texts should be allowed to forward to other deprecated uniques so we only need to change the leaves when introducing new uniques, not go through the whole tree
2022-02-12 19:03:30 +02:00
Yair Morgenstern
4fb4722e3a
Arbitrary conditionals can become timed conditionals! (#6134)
* Arbitrary conditionals can become timed conditionals!
triggerCivwideUniques is activated in 3 situations:
- Tech complete
- Policy adopted
- Building complete

So for each of the unique containers for these I added a catch saying 'if this unique is a temporary unique then don't save it yourself

This has been lying around in todos for a while and generalizes one of the nasty hardcoded messes that I hate about Civ V. Why would you introduce ONE timed effect in the whole game?! You can use them all the time like Humankind or never use them like Civ IV, but why have just one whyyy

One more thing in this PR, that needed to be solved by the by, is allowing parameters to have a '2' on the end so we can autoreplace multiple parameters of the same type.
Using a regex is slightly more inefficient, but since this is A. only used once per UniqueType.kt, and B. allows us to have as many 'amount's as we want which is important if we have a lot of conditionals, I feel this is justified.

* Fixed comments from PR
2022-02-12 19:03:11 +02:00
Yair Morgenstern
13f052878b Merged all arrow images into one
Removed unnecessary filterNotNull from getTileBaseImageLocation
2022-02-09 16:59:05 +02:00
Yair Morgenstern
09ea1a869d 3.19.7 2022-02-09 12:31:08 +02:00
Yair Morgenstern
c54438ef9f
Translations update (#6132)
* Update Spanish.properties (#6130)

nothing important

* Update French.properties (#6126)

* Update Russian.properties (#6124)

* Update Japanese.properties (#6123)

* Update Portuguese.properties (#6121)

* Update Portuguese.properties

* Update Portuguese.properties

Sorry, corrected, I had overlooked that error.

* Update Italian.properties (#6119)

Co-authored-by: Hello200000 <98656089+Hello200000@users.noreply.github.com>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
Co-authored-by: deqtodo <94169613+deqtodo@users.noreply.github.com>
Co-authored-by: nukurette <76560753+nukurette@users.noreply.github.com>
Co-authored-by: Chacal <chacal_exodius@hotmail.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
2022-02-09 12:26:11 +02:00
itanasi
1420ad845c
Notify when Barbs don't give more XP (#6115)
* Updates to allow BarbXP gain check

* Remove from ICombatant

* Revert Battle.kt

* Fix code in BattleTable

* Add template.properties entry

* Fix space issue

* Silly autoformatting

Co-authored-by: temurakami <spellman23@gmail.com>
2022-02-08 11:42:24 +02:00
Yair Morgenstern
8fda18db42 3.19.6 2022-02-07 11:27:51 +02:00
Yair Morgenstern
e9d7ed168f
Translations update (#6118)
* Big update for French.properties (#6112)

* Big update for French.properties

- Try as much as possible to match Civ 5 french translation
- Modify some translations to better fit the UI
- Modify some translations to improve some original Civ 5 french entries which were poorly translated
- Make translations consistent through all the file
- Fix all broken translations due to bad word/key ordering
- Some quotes are now real quotes from french books (when available) rather than translated from english quotes
- Fix many typos

* Fix translation error

* Translatión: Actualización del Español (#6109)

Also deleted the extra resource icons I originally put 'xD

* Update Korean.properties (#6108)

* Update Korean.properties

* Update Korean.properties

* Update Korean.properties

* Update Korean.properties

* Update Korean.properties

* Update Korean.properties

* Update Korean.properties

* Update Korean.properties

* Update Japanese.properties (#6107)

* Update Indonesian.properties (#6103)

* Update Indonesian.properties

* Update Indonesian.properties

Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
Co-authored-by: ArchDuque-Pancake <78449553+ArchDuque-Pancake@users.noreply.github.com>
Co-authored-by: Samsaek the Calico <saud2410@naver.com>
Co-authored-by: yuracla <89312848+yuracla@users.noreply.github.com>
Co-authored-by: kensvin <63847755+Kensvin28@users.noreply.github.com>
2022-02-07 11:21:18 +02:00
Yair Morgenstern
c9d487638c Added button to reload all rulesets - very helpful if you're working on mods and adding things gradually :) 2022-02-06 22:07:56 +02:00
Yair Morgenstern
3661ad8d5b
Find all replaceable uniques, generate replacement text, check for compatibility, and replace! (#6105)
* Find all replaceable uniques, generate replacement text, check for compatibility, and replace!

All of the work up until now has lead up to this point - since we already know what's out and what to replace it with, we can do 90%+ of the work ourselves and spare the sanity of our modders

For an example run:
- Download your favorite mod
- Check its deprecated uniques in the options menu
- Run the autoupdater from the same menu
- See how they disappear
- Bask in the glory

* A few unreplaced uniques raised problems in some of the replacement texts

* Old unusable deprecated uniques are suddenly important again, because they can help autoupdate mods!

I'm wondering if to remove outdated mods entirely from the uniques.md, since they're going to keep accumulating

* Padding for the 'autoupdate' button

* Only display autoupdate button if there are unique to update
Also, fixed some of the revived deprecated unique's replacement text thanks to fancy new tests :)
Tech uniques autoupdate!

* Toast now pops correctly, added translation entries
2022-02-03 14:58:17 +02:00
Yair Morgenstern
37c0092284 3.19.5 2022-02-03 10:34:51 +02:00
Yair Morgenstern
0e9e4dc279
Translations update (#6102)
* Update Dutch translation (#6100)

* Update Dutch.properties

* Update Dutch.properties

* Taalfout verbeterd

* Taalfouten verbeterd

* Meer taalverbeteringen

* Laatste taalverbetering

* Update German translation (#6098)

Co-authored-by: Blubvis725 <62372520+Blubvis725@users.noreply.github.com>
Co-authored-by: MartinP <77325495+Mape6@users.noreply.github.com>
2022-02-03 10:26:50 +02:00
Yair Morgenstern
9696fa59f5
Added unique to convert terrain to other terrain if adjacent to something (#6094)
* Added unique to convert terrain to other terrain if adjacent to something

Terrain converting to other terrain when adjacent to rivers was using hardcoded stuff, so I un-hardcoded it
I thought I could use this to replace the 'coast' hardcoding, and if it wasn't for the maxCoastExtension then I could.
Modders CAN therefore add their own coast (Lava tiles and Ash tiles I dunno) but it will only be for directly close terrains.
This enables Deciv Redux to spawn huge maps.

* Also for Vanilla, which apparently had a different number of tabs than G&K for no apparent reason.

* Apparently terrain name wasn't a uniquetype yet

(cherry picked from commit 593fc257b5)
2022-02-02 00:59:37 -08:00
Yair Morgenstern
4f421dc44f 3.19.4 2022-02-01 10:06:47 +02:00
Yair Morgenstern
78e8dba2b5
Translations update (#6091)
* Update Spanish.properties (#6082)

* Update Spanish.properties

the only thing i didn't translate were the names of the cities if you have any problem contact me on discord like: lostxxxxx

* Update Spanish.properties

problem solved

* Update Japanese translation (#6075)

* Update Japanese.properties

* Update Japanese.properties

* Update Italian.properties (#6074)

Co-authored-by: Hello200000 <98656089+Hello200000@users.noreply.github.com>
Co-authored-by: yuracla <89312848+yuracla@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
2022-02-01 09:53:22 +02:00
Xander Lenstra
6bc41a627c
Typed all healing uniques (#6087)
* Typed all healing uniques

* Fixed tests by replacing placeholder texts by types in BeliefAutomation
2022-02-01 09:43:37 +02:00
SpacedOutChicken
d11fe43d2b
Fix art for farms on hills (#6080)
* Fix art for farms on hills

This makes hills with farms on them change appearance.

* Refine fix for farms on hills
2022-02-01 09:42:41 +02:00
Yair Morgenstern
16855f66f6
Gradle build tools upgrade (#6085)
* Gradle build tools upgrade
Apparently the magic is rewriting a specific line in the Android build file and downloading Android SDK 30.0.3

* Added wiki change, isn't that nice :)
2022-01-31 15:05:42 +02:00
Yair Morgenstern
0f4449f2e9 3.19.3 2022-01-29 23:40:43 +02:00
Yair Morgenstern
fc5dd86007
Translations update (#6073)
* Update Ukrainian.properties (#6068)

* Update Czech.properties  (#6060)

* Update Czech.properties

many new strings trsanslated

* Update Czech.properties

- fixed accidental typos

* Update German translation (#6059)

* Update Italian.properties (#6056)

Co-authored-by: StepanIvasyn <57094070+StepanIvasyn@users.noreply.github.com>
Co-authored-by: stoupa007 <60326342+stoupa007@users.noreply.github.com>
Co-authored-by: MartinP <77325495+Mape6@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
2022-01-29 23:32:22 +02:00
Xander Lenstra
a237e7bf82
Typed all remaining uniques using CityInfo.GetMatchingUniques and removed that function (#6071)
* Typed all remaining uniques using CityInfo.GetMatchingUniques and removed that function

* Fixed two NullPtrExceptions

* Fixed syntax
2022-01-29 23:27:48 +02:00
Md. Touhidur Rahman
1b01ee3802
updated Caravel.png, resolves #5317 (#6069)
* updated Caravel.png, resolves #5317

* Update Credits.md
2022-01-29 18:36:05 +02:00
Yair Morgenstern
6855a52466 3.19.2 2022-01-26 22:55:30 +02:00
Yair Morgenstern
dddba4d969
Translations update (#6054)
* Update Indonesian.properties (#6048)

* Update German translation (#6037)

* Update German translation

* Update German translation

* Update German translation

* Update German translation

* Update Italian.properties (#6035)

Co-authored-by: kensvin <63847755+Kensvin28@users.noreply.github.com>
Co-authored-by: MartinP <77325495+Mape6@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
2022-01-26 22:42:19 +02:00
will-ca
824efcb1a9
Try to fix potential typos in stock rulesets. (#6028)
* Make mod checker pass status message translatable.

* Try to fix some possibly broken Uniques.

Move comma.
2022-01-26 22:36:24 +02:00
ravignir
74cb3245a5
Update improved resource stats to fully match civ5 (#6038)
* Update improved resource stats to fully match civ5

* More fixes

* Update TileResources.json
2022-01-26 11:20:13 +01:00
Xander Lenstra
6a5d44c3e9
Adressed comments on the happiness PR after it was merged (#6047) 2022-01-24 22:23:26 +00:00
will-ca
4215ca7a51
Make Indirect Fire a starting promotion instead of Unique for Artillery, Battleship, etc. (#6042) 2022-01-24 21:02:15 +01:00
Xander Lenstra
b69507255f
Fixed the problems with the food carry-over unique (#6040) 2022-01-24 19:52:35 +02:00
Xander Lenstra
f6cb2bd0d7
Made unhappiness effects moddable by adding a global uniques json; added revolts when < -20 happiness (#5932)
* Added a json file for unhappiness effects

* Change existing code to handle these effects

* Made a weird and unexpendable way to add unhappiness effects to the civilopedia

* Add the default unhappinesseffects to mods without the json

* Added revolts when at very low happiness

* Renamed a few often-used functions

* Added a file for uniques that are always active

* Fixed tests

* Nullifies [Food] -> Nullifies Growth
2022-01-24 17:19:51 +00:00
Yair Morgenstern
336e190ff0 3.19.1 2022-01-24 11:56:00 +02:00
Yair Morgenstern
67592747a9
Translations update (#6034)
* Update Italian.properties (#6029)

* more word change (#6010)

* more word change

* Added that space

Co-authored-by: Xander Lenstra <71121390+xlenstra@users.noreply.github.com>

Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: fab144 <58261459+fab144@users.noreply.github.com>
Co-authored-by: Xander Lenstra <71121390+xlenstra@users.noreply.github.com>
2022-01-24 11:10:32 +02:00
itanasi
003c4197a5
Update Copper Mine to add only 1 production (match Civ 5) (#6033)
Co-authored-by: temurakami <spellman23@gmail.com>
2022-01-24 11:04:58 +02:00
Xander Lenstra
39ed8bd269
Typed some uniques, added more examples for parameters in unique documentation (#6020)
* Typed some uniques, etc.

* Missed a few square braces

* Missed a parameter

* Missed another parameter

* Made a conditional, spelling, added check to `isStatRelated`

Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
2022-01-24 11:03:40 +02:00
SpacedOutChicken
f483f0a345
Destroy Arsenal when city is captured (#6031)
* Destroy Arsenal when city is captured

* Destroy Arsenal when city is captured
2022-01-24 10:34:32 +02:00
will-ca
8461032a52
Try to fix a potentially miscapitalized/broken policy cost unique. (#6016)
* Try to fix a potentially miscapitalized/broken policy cost unique.

* Deprecate old capitalization.
2022-01-23 18:08:59 +01:00
Yair Morgenstern
f9c05997dd
Typified some building uniques (#6017)
* Typified some building uniques
I noticed that the code allows "[stats] from every [buildingFilter]" but the UniqueType was limited to "[stats] from every [buildingName]", so now that that's available we don't actually need the "[stats] from every Wonder" unique :)

* buildings-only unique moved to buildings section
2022-01-23 06:03:50 -08:00
will-ca
fe67dfa1c4
Make "Help" button clearer and translatable, random nation indicators and labels translatable. (#6013)
* Make unknown nation placeholder translatable.

* Make MultiplayerScreen help button clearer and translatable.

* Use `Constants.spectator` more.

* Make random/unknown nation icon translatable.
2022-01-23 09:39:28 +01:00
Yair Morgenstern
7e4a2944c3 3.19.0 2022-01-22 21:58:23 +02:00
Yair Morgenstern
f4bfcbab7c
Translations update (#6011)
* Update French.properties (#6006)

* Update French.properties

* Update French.properties

* Update Indonesian.properties (#6002)

* Update Indonesian.properties

* Update Indonesian.properties

* Update Indonesian.properties

Co-authored-by: Newexae <96820363+Newexae@users.noreply.github.com>
Co-authored-by: kensvin <63847755+Kensvin28@users.noreply.github.com>
2022-01-22 20:44:19 +02:00
yairm210
682d65f02e 3.18.19 2022-01-19 14:47:43 +02:00
Yair Morgenstern
a82d330c02
Translations update (#6001)
* Update Simplified_Chinese.properties (#5997)

* Update Italian.properties (#5990)

* Update Simplified_Chinese.properties (#6000)

* Update Simplified_Chinese.properties

* Create Simplified_Chinese.properties

* update bad translate

Co-authored-by: wwwxxxzzz666 <2273204577@qq.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: ThebestkillerTBK <62250232+ThebestkillerTBK@users.noreply.github.com>
2022-01-19 14:41:40 +02:00
will-ca
e477e4917a
Missing template.properties fields for AddMultiplayerGameScreen. (#5993) 2022-01-17 22:23:56 +02:00
yairm210
21fbaf4814 3.18.18 2022-01-16 19:51:33 +02:00
Yair Morgenstern
838b797699
Translations update (#5986)
* Update English.properties. (Remove no-op translations.) (#5977)

* Update Spanish.properties (#5970)

* Update Italian.properties (#5966)

* I made some changes to the simplified Chinese translation file.  (#5987)

* Minor polishing up for accuracy and some translation

* Additional translation

* Update Simplified_Chinese.properties

Co-authored-by: will-ca <willchencontact@gmail.com>
Co-authored-by: ArchDuque-Pancake <78449553+ArchDuque-Pancake@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: unciv-translation <97832928+unciv-translation@users.noreply.github.com>
2022-01-16 19:50:07 +02:00
yairm210
dd90b2bacc NewGameScreen threading normalized.
The NewGameScreen was written by a past version of myself that had no idea how to handle threading, and thus was extremely strange. Checking an object _on render_ and if it's set then activate? Totally clueless.
2022-01-16 19:10:30 +02:00
will-ca
9b121a478a
Clean up refactored pixel unit resolving. (#5979) 2022-01-16 18:43:49 +02:00
will-ca
f68c41e369
Explain when cities can't be razed. (#5976)
* Explain when cities can't be razed.

* Light refactoring and reword.

* Add update notice in translation strings.
2022-01-16 18:43:33 +02:00
Yair Morgenstern
b813e0b38a
Fixed assumption that the current game is in the list of games gathered from preview files (#5981) 2022-01-16 18:42:45 +02:00
yairm210
a2f5941927 chore - Minor improvements to science and culture tutorial capitalization 2022-01-15 22:09:33 +02:00