Commit Graph

5992 Commits

Author SHA1 Message Date
SomeTroglodyte
0500f73770
Victory screen and victory detection use VictoryData (#9175)
* VictoryScreen uses VictoryData

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

* Fix map editor resource label wrapped to about 1 char width
2023-04-11 09:09:07 +03:00
MioBestWaifu
e7d091197f
Fix issue #7792 (#9164)
The issue was caused by Latin-Civs Mixed Militias being considered workers in ConstructionAutomation.addWorkerChoice() but not beign counted as one in ConstructionAutomation.workers. Now, any unit that can build improvements counts as a worker in it. In addition, the AI simulates military units that can found city, build improvements or are religious as civilians in peacetime and as soldiers in wartime.
2023-04-11 07:55:15 +03:00
Yair Morgenstern
a363edaa6a 4.6.0 2023-04-09 18:15:53 +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
SomeTroglodyte
0c60f87b27
User option to control NotificationScroll behaviour (#9148) 2023-04-09 17:58:39 +03:00
Yair Morgenstern
32a76fd359 4.5.17-patch1
Solved "cannot start single player game"
2023-04-09 17:27:17 +03:00
Yair Morgenstern
a691066b05 Resolved #9146 - crash screen '
copy to clipboard' no longer causes crashes itself
2023-04-09 17:23:22 +03:00
Yair Morgenstern
338c4bd7e4 toString extension including sign (+/-) 2023-04-09 14:11:42 +03:00
Yair Morgenstern
29c647e0f7 Actually implemented nation filter conditional 2023-04-09 10:27:34 +03:00
SomeTroglodyte
065f434fb6
Code Reorg AlertPopup (#9140) 2023-04-09 01:47:38 +03:00
Yair Morgenstern
711655c786 Better wrapping for long construction item names 2023-04-09 01:20:17 +03:00
Yair Morgenstern
0d9cff0922 "<for [nationFilter]>" conditional added 2023-04-08 22:46:49 +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
Yair Morgenstern
77f230ff1a Fixed json loading errors in latest version due to tab names changing 2023-04-08 22:03:22 +03:00
SomeTroglodyte
04d4def24f
Notifications can be hidden (#9108)
* Some linting around Notification UI

* Hide-able NotificationsScroll with restore button
2023-04-08 21:40:48 +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
SomeTroglodyte
93d2ba2af5
Carrier right-click attack fix (#9130) 2023-04-08 21:36:19 +03:00
Yair Morgenstern
cb20d91822 Battle table displays bonuses according to tile that unit will attack from, not the current tile it's on 2023-04-08 21:34:55 +03:00
SomeTroglodyte
ca06d7e54a
Main menu background map changes infrequently (#9133) 2023-04-07 16:22:46 +03:00
SomeTroglodyte
36667d9d18
Random Nations game starter - reactive UI (#9127)
* Random Nations game starter - reactive UI

* Random Nations game starter - reactive UI continued

* Random Nations game starter - reactive UI - patch
2023-04-07 09:53:04 +03:00
WhoIsJohannes
21510a8455
Show city size in CityScreenCityPickerTable.kt (#9120)
I need this quite often when deciding whether to build something such as "Library" (get 1 research for each 2 population -> "Oh, wait, what's the population of this city?")

Longer term I want to check how hard it would be to show the effects of something more directly e.g. for the social policy picker screen. E.g. "Gain one happiness for each city with a garrison" or "Empire produces double the amount of resources" or "1 extra happiness for each walls, castle, arsenal etc.", would be nice to see directly to how much happiness, resources that translates to make a better decision.
2023-04-05 12:25:30 +03:00
WhoIsJohannes
6b4003311b
Don't buy tiles in the very early game. (#9117) 2023-04-04 23:42:18 +03:00
SomeTroglodyte
2150fc2244
Random nation count (#9118)
* Fix game starter problems with random number of players

* Some cleanup to use new Player constructor signature
2023-04-04 23:41:45 +03:00
WhoIsJohannes
0e87be8487
Prevent offering zero gold. (#9119)
This happened to me in a game, unfortunately I don't have the save since it's one round ago in a multiplayer game, but I'm pretty sure this is the part of the code causing the problem.
2023-04-04 23:40:36 +03:00
SomeTroglodyte
910778418a
Victory screen replay gets a Slider (#9116)
* VictoryScreen tweaks for narrow portrait, UncivSlider update

* VictoryScreen Replay Slider
2023-04-04 22:06:22 +03:00
Yair Morgenstern
7cfbc9b7fa Fixed bug where AI could buy tiles not contiguous to city - @WhoIsJohannes 2023-04-04 10:58:08 +03:00
SomeTroglodyte
4c88fbb996
Change map resource controls presentation (#9104) 2023-04-04 10:52:42 +03:00
WhoIsJohannes
bc341a6fcb
Don't do anything crazy if military is inferior and never give away m… (#9096)
* Don't do anything crazy if military is inferior and never give away more than 10% (ceil) of your cities in any case.

* Don't coerce types implicitly.

* Comment weird distance to capital logic and invert -- => +

* Maximum give away 20% of cities instead of 10%
2023-04-04 10:50:33 +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
WhoIsJohannes
8b01498227
Get going with producing military if your ass is about to get kicked. (#9109) 2023-04-03 23:38:04 +03:00
Yair Morgenstern
9e239de6ce Resolved #9103 - invalid conditionals on building uniques no longer lead to crashes 2023-04-03 21:54:52 +03:00
Yair Morgenstern
6953e0341b 4.5.16-patch
Fixed 'construct improvement' crash
2023-04-03 21:34:39 +03:00
SomeTroglodyte
ca36c0e6e6
Prevent MapEditor 'pinch zoom' painting tiles (#9101) 2023-04-03 17:06:11 +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
Yair Morgenstern
67482f0ebe #9098 - rankStatsForCityWork also uses local unique cache 2023-04-03 14:36:24 +03:00
Yair Morgenstern
d6f5e0badb #9098 - getKnownCivs returns sequence 2023-04-03 14:09:56 +03:00
Yair Morgenstern
f387de9506 performance: Don't update visible tiles if we've moved within our border 2023-04-03 11:13:29 +03:00
Yair Morgenstern
ad299a8a62 performance: Cache uniques for calculating specialist stats 2023-04-03 11:03:59 +03:00
Yair Morgenstern
9c121086ea Performance: Removed map lookup for getLastTerrain
This was used in isImpassible which was used in canPassThrough, which means it was called A LOT
2023-04-03 10:55:52 +03:00
Yair Morgenstern
f0ee25dcac Performance: Removed map lookup every time we want to get a unit's type 2023-04-03 10:49:50 +03:00
Yair Morgenstern
bfb869f64f Performance: nation type booleans are all lazy vals, to avoid unnecessary string comparisons
These were so numerous that they were popping up in the CPU profiler which is just unacceptable
2023-04-03 10:45:19 +03:00
Yair Morgenstern
f50b88c9a5 Performance: Save civ tiles and neighbors in cache to update visible tiles faster 2023-04-03 10:32:09 +03:00
Yair Morgenstern
3db03a78d2 Performance: Use unique cache for tile percentage stats and auto-assigning population to tiles 2023-04-03 09:27:05 +03:00
SomeTroglodyte
d3ac7c24bd
Declare Era.citySound not TranslationFileWriter-worthy (#9095) 2023-04-03 07:22:58 +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
WhoIsJohannes
de7177692f
Make AI buy city tiles. (#9065)
* Make AI buy city tiles.

* Address comments
2023-03-31 14:54:03 +03:00
SomeTroglodyte
ce495d4ff2
Fix ColorMarkupLabel prefSize (#9077) 2023-03-31 14:48:30 +03:00
Yair Morgenstern
2d184655c7 Automated units don't try and conquer the same city twice 2023-03-30 20:51:56 +03:00
SomeTroglodyte
aea988a6bb
Untinted embedded symbols - Notifications and Citystate diplomacy (#9051) 2023-03-30 16:32:43 +03:00
SomeTroglodyte
3d56c1ba5d
Fix disbanding units a civ cannot afford (#9073)
* Fix disbanding units a civ cannot afford

* Avoid performance impact of CityState Afraid evaluation where possible
2023-03-30 10:22:52 +03:00
SomeTroglodyte
c5d0de8144
Main menu cancels background map creation when obsolete (#9072) 2023-03-30 10:22:37 +03:00
Yair Morgenstern
6fa1d61f4f Constructed units that can't be placed are put on hold till the next turn 2023-03-29 23:19:55 +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
SomeTroglodyte
be69f8b52d
Fix TileSet mods can lock user out (#9023) 2023-03-29 11:42:34 +03:00
SomeTroglodyte
13f4dd0756
Fix obsoleted units replace in construction queues for Nation-unique upgrades (#9044) 2023-03-29 11:34:40 +03:00
Yair Morgenstern
d3305e680a Resolved #9058 - Mods that remove 'repair' improvement no longer cause crashes down the line 2023-03-29 10:17:20 +03:00
Yair Morgenstern
6000232eac Resolved #9054 - Archipelago creates water again 2023-03-29 09:57:37 +03:00
SomeTroglodyte
bb332637d1
Fix exploit allowing promotion with 0 movement (#9055)
* Close exploit allowing promotion with 0 movement

* PromotionPickerScreen linting
2023-03-28 07:35:56 +03:00
SomeTroglodyte
76705f98e9
Fix notifications for pillage loot (#9047) 2023-03-27 09:17:51 +03:00
SomeTroglodyte
dc4e78f073
A renamed unit shows that new name in can promote notifications (#9043) 2023-03-26 22:29:45 +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
a78e48612f GPT calculation fixed 2 2023-03-26 21:37:17 +03:00
SomeTroglodyte
2adb4ffdde
Fix MiscLayer not respecting fog of war for spectator (#8992)
* Fix MiscLayer not respecting fog of war for spectator

* Fix MiscLayer not respecting fog of war for spectator - fix1
2023-03-26 12:17:54 +03:00
itanasi
e18a964a28
Automated Civilians don't multi-turn path through Enemy Territory (#9038) 2023-03-26 11:47:45 +03:00
Yair Morgenstern
879cb5ea4a GPT calculation fixed 2023-03-26 00:13:35 +03:00
Yair Morgenstern
e2f2011024 Gold per turn is worth less the more turns 'in the future' we're talking about 2023-03-25 22:11:08 +03:00
Yair Morgenstern
7bc28c4588 Returned Perlin map type 2023-03-25 21:58:10 +03:00
Skekdog
2d793f8f47
City-state music plays when first meeting them (#9026) 2023-03-25 21:35:18 +03:00
SomeTroglodyte
09cff6e55f
TechPickerScreen colors - skinnable and prettier Future Tech (#9033) 2023-03-25 21:34:49 +03:00
SomeTroglodyte
708daf9816
VictoryScreen code reorg (#9018) 2023-03-25 21:33:24 +03:00
itanasi
e506631925
More variety in Main Menu map (#9029) 2023-03-25 21:33:07 +03:00
SomeTroglodyte
666c9c5b29
Omit irrelevant warnings from startup console log (#9032) 2023-03-25 21:32:38 +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
SomeTroglodyte
da7786a2cb
More Spectator/Barbarians fixes related to income (#9011)
* Prevent Barbarians and Spectator having income or Allies

* Prevent Barbarians and Spectator having income or Allies - fix test
2023-03-23 23:57:23 +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
SomeTroglodyte
5b8593f3ed
Linting and a little hardening of the UI-Skins code (#9007) 2023-03-23 21:21:31 +02:00
Yair Morgenstern
27279a7361 Resolved #8996 - Spectator startTurn and endTurn do nothing 2023-03-23 21:19:12 +02:00
SomeTroglodyte
cb25e32762
"Sleep until healed" knows when you can't (#9003) 2023-03-23 09:17:12 +02:00
Gualdimar
a1d0248f6a
Wrappable multiplayer button (#9002) 2023-03-23 09:14:04 +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
Yair Morgenstern
5da7592616 4.5.11-patch1 2023-03-22 10:42:18 +02:00
Yair Morgenstern
79fd3a8f7a Resolved #8991 #8985 - Solved capital conquest crash 2023-03-22 10:40:42 +02:00
SomeTroglodyte
25764015d7
Tiny tweak to Max Turns slider (#8989) 2023-03-21 23:26:36 +02:00
Yair Morgenstern
cc8d080b72 Resolved #8944 - triggered notification text for unit triggers sent correctly 2023-03-21 17:36:22 +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
882f6a6ab2
Desktop starting size fix (#8973)
* Fix initial size jumps of windowed desktop

* Fix window jumping back to previous size on changes to mode
2023-03-21 14:39:55 +02:00
WhoIsJohannes
11be6e2804
Silently log ranking stats for each major civ every turn (#8964)
* Record each stat each round for each civilization.

* Implement custom serialization and encapsulate logic in separate CivRankingHistory.kt

* Address comments

* Address comments and add RankingTypeTest.kt
2023-03-21 14:38:22 +02:00
SomeTroglodyte
4ba6574419
Fix stats reward for GP consumption escalation - hopefully (#8980) 2023-03-21 14:37:38 +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
Gualdimar
934bf33a70
Fixed selected civ update (#8974)
* Fixed selected civ update

* Fixed spaces
2023-03-21 14:06:52 +02:00
SomeTroglodyte
dabd26ac0d
Fix Great Person Create Improvement requiring Resource (#8979)
* Fix GP create with Improvement requiring Resource

* Unit Test: GP create with Improvement requiring Resource
2023-03-21 14:06:35 +02:00
Yair Morgenstern
2c7633f058 Fixed 'upon gaining unit' trigger activating for all units 2023-03-21 10:51:52 +02:00
Yair Morgenstern
e5452f5605 modding: 'Only available when' applies to beliefs 2023-03-20 22:19:00 +02:00
SomeTroglodyte
9201ea2cfa
Fix closing Foreign City Info Popup leaves Next Turn button inactive (#8971) 2023-03-20 12:05:19 +02:00
Yair Morgenstern
8294352fcc Better promotion positioning in unit overview 2023-03-20 10:26:44 +02:00
Gualdimar
eda4a57244
Victory screen fixed button position (#8970) 2023-03-20 01:01:06 +02:00
Yair Morgenstern
b6a0ed5882 Fixed loading games 2023-03-20 00:53:36 +02:00
Yair Morgenstern
2d6a88f3e3 Resolved #8968 - stats for notifications string'd without special characters 2023-03-20 00:41:58 +02:00
Yair Morgenstern
a37eb28964 UnitMovementAlgorithms -> UnitMovement and modernized city connections tests 2023-03-20 00:20:34 +02:00
Yair Morgenstern
61f7b14f04 Resolved #4963 - stat updates propagate where they didn't before 2023-03-19 23:37:29 +02:00
Yair Morgenstern
b51374859b Resolved #8169 - Map editor tabs look scrollable 2023-03-19 23:08:35 +02:00
Gualdimar
7cd6a68639
Fixed exploit in the foreign city religion info table (#8967) 2023-03-19 22:41:06 +02:00
Yair Morgenstern
4f901d2bf2 Resolved #7036 - hide bombard notification after executing bombardment 2023-03-19 19:27:56 +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
SomeTroglodyte
863163084f
Keyboard Bindings Step 5: Late resolving (#8923) 2023-03-19 18:55:42 +02:00
WhoIsJohannes
dec5344b1f
Add city size (population) to TradeOffer.kt (#8956)
* Add city size (population) to TradeOffer.kt

* Add .tr() to city name

* Improve i18n

* Deprove i18n
2023-03-19 17:19:31 +02:00
SomeTroglodyte
fccfef8412
City detailed stats popup - fixed header (#8959)
* DetailedStatsPopup fixed header

* DetailedStatsPopup formatters optimized

* DetailedStatsPopup keyboard
2023-03-19 17:14:39 +02:00
Gualdimar
3820c5efa4
Save settings when closing the options popup (#8961) 2023-03-19 17:13:24 +02:00
SomeTroglodyte
88d329a51d
WASD listener out of WorldScreen and add to map editor (#8947) 2023-03-18 19:27:25 +02:00
SomeTroglodyte
9b9620b681
EmpireOverviewCategories rework (#8953) 2023-03-18 19:26:11 +02:00
SomeTroglodyte
9bb49342cc
Fix Garrison bonus logic (#8952)
* City filter for Military Caste
* Garrison display in Overview - all credit to @WhoIsJohannes
2023-03-18 19:24:33 +02:00
Yair Morgenstern
20e1b9b978 Tilesets: Separated unexplored tiles from not visible tiles 2023-03-17 12:06:15 +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
Yair Morgenstern
a46870c862 Deprecation of old components - ConstructionFilter, Ruleset.maxXpFromBarbarians, GameParameters.gameSpeed 2023-03-16 22:53:22 +02:00
SomeTroglodyte
5a58d8c39c
Harden and improve "Download Mod from Url" parser (#8924) 2023-03-16 22:43:16 +02:00
SomeTroglodyte
c5993e0392
Keyboard Bindings small fix : (#8929)
* Del and Backspace mappable
* Inspection warns about direct uses of buggy functions
* Keybinding SelectBox centers
2023-03-16 22:40:45 +02:00
Yair Morgenstern
a4b6585626 Mod checker tab aligns all mods to the left 2023-03-16 19:52:07 +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
SomeTroglodyte
9262beb9a5
Show garrison in City overview (#8906)
* Add a Garrison column to City Overview

* Add a Garrison column to City Overview - clickable
2023-03-16 11:25:47 +02:00
SomeTroglodyte
461fc4f191
Future tech fix (#8917)
* Future Tech - fix research progress

* Some minor linting

* Tech - Prefer kotlin libraries
2023-03-16 11:24:08 +02:00
Yair Morgenstern
7eb70b412b . 2023-03-15 19:28:19 +02:00
Yair Morgenstern
f89765354a Resolved #8901 - Modding: Units from triggers respect "limited to [amount] per civilization" limits 2023-03-15 19:19:35 +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
855a818a84 Resolved #8899 - Modding: 'upon being defeated' now applies to destroyed civilians as well 2023-03-15 18:34:13 +02:00
Yair Morgenstern
2e3f131169 Resolved #8897 - Modding: Ruins now contain unit triggerables, changed some ruin uniques to unit triggerables 2023-03-15 18:28:12 +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
Gualdimar
988f404ebc
World wrap scrolling fix (#8903) 2023-03-15 08:37:09 +02:00
Gualdimar
d3a419f8f8
Notifications scroll pane position fix (#8900)
* Notifications scroll pane position fix

* Removed an unnecessary var
2023-03-14 22:54:31 +02:00
Gualdimar
3bbb3a016c
Double trades fix + Diplomacy screen layout fix (#8896) 2023-03-14 20:41:42 +02:00
Gualdimar
0a9814e3b8
Minimap hotseat fix (#8894) 2023-03-14 18:28:47 +02:00
Yair Morgenstern
a2da1ff7ee Resolved translation errors at #6131 2023-03-13 23:26:32 +02:00
Yair Morgenstern
2a74be3be2 4.5.7-patch1
Resolved #8883
2023-03-13 19:45:39 +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
9eee47a628 Resolved #8880 - deprecated old barb camp serialzation 2023-03-13 16:59:09 +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
2d54c56c7b Resolved #8863 - Deprecated GameSettings.resolution 2023-03-11 21:13:23 +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
a547acbf4e
Debug option to paint coords on map tiles (#8818)
* Debug option to paint coords on map tiles

* Debug option to paint coords on map tiles - rename flag
2023-03-11 20:12:38 +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
SomeTroglodyte
b7a8cd7620
Fix possible crash involving right-click attack (#8859) 2023-03-11 20:05:25 +02:00
SomeTroglodyte
de12f671a5
Improve completeness and consistency of Technology descriptions (#8860) 2023-03-11 20:04:12 +02:00
SomeTroglodyte
2f00aa2af1
Comments only - TileInfo to Tile (#8861)
(the two in UniqueParameterType are actually useful links during code review)
2023-03-11 20:03:08 +02:00
SomeTroglodyte
488257387c
Fix city desert tiles with Petra selectable (#8854) 2023-03-09 19:34:33 +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
Gualdimar
6d72c7b85f
Dynamic minimap (#8794)
* Dynamic minimap

* Fixed minimap size

* Fix for rectangular maps

* Fix minimap for spectator

* Proper fix for spectator

* Resizing the game window no longer breaks the minimap

* Implemented the camera rectangle + Explored region more accurate positioning

* ExploredRectangle is calculated only after expanding the region
2023-03-08 11:25:13 +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
41ee20efc5 Better AI evaluation of which improvement to build on a tile 2023-03-05 22:47:49 +02:00
Yair Morgenstern
7025bbb94a chore: convert 'provides resources' to separate function 2023-03-05 22:29:45 +02:00
Yair Morgenstern
d3c084f89f Added 'additional times' to limited actions 2023-03-05 20:03:54 +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
Gualdimar
38839d2c9c
Fix ExploredRegion rectangular maps support + Zoomout flicker prevention reworked (#8826)
* Fix ExploredRegion rectangular maps support + Increased zoom padding

* Flicker prevention reworked
2023-03-05 18:58:33 +02:00
Yair Morgenstern
ce2f128260 Fixed endless loop for mod checker 2023-03-05 14:19:20 +02:00
Yair Morgenstern
8c24926476 Modding: global alert available as triggerable for all objects 2023-03-05 12:53:02 +02:00
Yair Morgenstern
c049721531 Better order of unit actions 2023-03-05 11:03:58 +02:00
Yair Morgenstern
cc8bfa605f Resolves #8630 - can only purchase units when not disabled by setting or otherwise 2023-03-05 10:59:36 +02:00
Yair Morgenstern
e15167d92e Resolved #8815 - action texts properly translated. 2023-03-05 09:50:49 +02:00
SomeTroglodyte
5d87f82a6e
Belarusian Locale for better sorting (#8816) 2023-03-05 09:28:48 +02:00
Yair Morgenstern
146ad7481e Fixed flanking bonus calculation when attacking unit is not adjacent to enemy 2023-03-05 08:53:27 +02:00
Yair Morgenstern
006bcac7fd Resolve #8733 - don't remove Forest tiles for Camp improvements 2023-03-04 23:10:58 +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
Yair Morgenstern
ae4d226027 Solved 'cannot start game' errors - 'always true' conditionals do not affect 'getMatchingUniques' 2023-03-04 20:46:05 +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
SomeTroglodyte
5e61b0d313
Diplomacy trade layout fix (#8808)
* Diplomacy and Trade - Linting

* Diplomacy and Trade - Fix gradual layout deterioration
2023-03-04 19:19:24 +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
458d35026c Added 'once' unit action modifier, effectively equal to '[1] times' 2023-03-03 15:29:14 +02:00
Yair Morgenstern
608e0dfb71 Added limited usage for actions! 2023-03-03 14:47:50 +02:00
Yair Morgenstern
fc22f0900b chore: renames 2023-03-03 14:21:43 +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
64925adc7e 'founds a new city' now accepts action modifiers 2023-03-02 21:12:11 +02:00
Yair Morgenstern
06fa2c2378 Added 'for [amount] movement' unit action modifier 2023-03-02 21:02:34 +02:00
SomeTroglodyte
085c5d73e8
Simplify method TileMap.getTilesInRectangle (#8786) 2023-03-02 20:29:21 +02:00
Leonard Günther
6f7279d1ec
Fixed setPassword body is compressed (#8790)
+ Updated server to also use the correct Basic implementation
2023-03-02 20:26:07 +02:00
Gualdimar
f8bf6256d9
DragPaintListener fix (#8789) 2023-03-02 20:25:44 +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
15c1998379 Death symbols for Great Person actions 2023-03-01 21:00:13 +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
Yair Morgenstern
66faeb0d15 Preparation for unit action modifiers 2023-03-01 15:26:54 +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
Yair Morgenstern
c20c05a446 Resolved #8766 - gifting cities no longer causes crash 2023-02-27 17:07:11 +02:00
Leonard Günther
8f7fcb2e3e
Fixed TurnChecker can not authenticate (#8770) 2023-02-27 16:51:27 +02:00
SomeTroglodyte
58b3d6eaac
Fix random nations pool popup (#8769)
* Fix random nations pool dialog

* Rename randomNations for backwards compat with 4.5.0 or older
2023-02-27 16:51:04 +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
SomeTroglodyte
3d84297da1
Better control over debug messages (#8748)
* Better control over debug messages

* Better control over debug messages
2023-02-27 11:13:34 +02:00
Yair Morgenstern
44399e770c Added triggered uniques to grant specific tech / policy 2023-02-27 10:58:08 +02:00
SomeTroglodyte
bcfa2fcd27
Fix broken random nations pool (#8763) 2023-02-27 08:30:38 +02:00
Yair Morgenstern
8361d68452 Added 'upon ending turn in tile' unit trigger 2023-02-26 23:41:09 +02:00
Yair Morgenstern
ec1b2b5077 Fixed 'HiddenFromCivilopedia' targets 2023-02-26 23:26:48 +02:00
Yair Morgenstern
4ba822ca49 Resolved #8762 - Civilopedia does not crash when displaying techs on fresh start 2023-02-26 23:19:24 +02:00
Yair Morgenstern
e27de0eb96 Resolved #8759 - 'upon declaring friendship' triggers for both sides 2023-02-26 23:16:16 +02:00
Yair Morgenstern
88cd136dd5 Resolved #8758 - all unpillagable improvements are not destroyed by 'destroy improvements' unique 2023-02-26 23:04:55 +02:00
Yair Morgenstern
86a63ac578 'upon conquering' is a condition not a triggered unique 2023-02-26 22:33:00 +02:00
Yair Morgenstern
9988764d4d Added 'trigger upon losing over X HP in single attack' 2023-02-26 22:11:23 +02:00
Yair Morgenstern
faada0ac79 Added 'trigger upon promotion', 'trigger upon conquering city' unit trigger 2023-02-26 22:04:57 +02:00
Yair Morgenstern
67f4704ca2 Added unit trigger for 'upon defeat' 2023-02-26 21:57:52 +02:00
Yair Morgenstern
a47864ecac Special type for unit triggerables 2023-02-26 21:52:18 +02:00
Yair Morgenstern
8c9877365d unit triggers also activate civ triggers 2023-02-26 21:48:46 +02:00
Yair Morgenstern
090c421f9b Introduced "upon defeating [unitFilter] unit" trigger 2023-02-26 20:31:13 +02:00
SomeTroglodyte
7bfaeb274c
City screen displays "free" tile yields undimmed (#8753) 2023-02-26 19:19:18 +02:00
Yair Morgenstern
cff8876ec8 4.5.0-patch3
Fixed 'unitsToRemove' error
2023-02-26 10:13:25 +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
Yair Morgenstern
87403c9472
exploredTiles deprecation, step 1 - do not check exploredTiles when checking if a tile is explored (#8747)
exploredTiles continues to remain updated, to allow
2023-02-26 09:04:14 +02:00
Yair Morgenstern
9acc84ff8e Resolved #8739 - cannot 'undo' if you cannot change state 2023-02-25 22:23:23 +02:00
Yair Morgenstern
0144947bb7 4.5.0-patch1 2023-02-25 21:31:04 +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
Yair Morgenstern
b3d8415f61 "must be on/next to" unique for buildings can accepts tile filter - #3242 2023-02-25 20:53:54 +02:00
SomeTroglodyte
e458b64339
Fix problems with dual save folder support (#8734) 2023-02-25 20:43:59 +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
Gualdimar
e69eb5b518
Map exploring disables undo button + ExploredRegion smallfixes (#8741) 2023-02-24 23:44:43 +01:00
Yair Morgenstern
04cc091d94 Added conditionals for religion state 2023-02-23 23:05:42 +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
ryg-git
09d3094bd8
if tileset or unitset in different in WorldMapHolder compared to GameSetting reload the game on resume (#8519) 2023-02-23 23:05:03 +02:00
Gualdimar
713f116400
Limit camera movement within explored region (#8661)
* Load game resets scroll position

* Limit camera within explored region
2023-02-23 22:41:21 +02:00
SomeTroglodyte
5d07fd981b
Allow filters in the ModOptions "ToRemove" lists (#8730)
* Allow "*" wildcard in the ModOptions "ToRemove" lists

* Allow filters in the ModOptions "ToRemove" lists
2023-02-23 22:40:47 +02:00
vegeta1k95
33ddb2dc3a Fix tech description items alignment 2023-02-23 14:55:46 +01:00
Skekdog
145811849c
Play city-state music if available (#8727)
* City-states now play their music if it exists
More of a fix than anything - before this city state music would only play when declare war button is confirmed

* City-states now play their music if it exists
More of a fix than anything - before this city state music would only play when declare war button is confirmed
2023-02-23 09:31:23 +02:00
Gualdimar
16ffae6e00
Fixed world wrap coordinates check (#8724)
* Fixed world wrap coordinates check (#8724)
2023-02-23 00:16:37 +01:00
vegeta1k95
5077477987 Attempt to fix JDK8 compatibility with TextureArraySpriteBatch 2023-02-23 00:03:05 +01:00
Yair Morgenstern
4e662a460b chore: code cleanup 2023-02-22 10:03:28 +02:00
Yair Morgenstern
06292bec64 Fix unique parameter type 2023-02-22 09:54:10 +02:00
Yair Morgenstern
7b1a5e296c modding: Added "upon gaining a [unitFilter] unit" trigger condition 2023-02-22 09:32:50 +02:00
Yair Morgenstern
8565762df3 chore: moved citiesConnectedToCapitalToMediums to cache 2023-02-22 09:29:37 +02:00
Yair Morgenstern
7a0f1e4a26 chore: single use of GUI in city button to get viewing civ 2023-02-21 23:53:09 +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
96fdbbff09 Better error message for multiplayer games that get corrupted data from the server 2023-02-20 20:26:50 +02:00