Commit Graph

5167 Commits

Author SHA1 Message Date
nacro711072
d65c756e4c
fix no victoryTypes for the first time gaming with "quick game" opion. (#7785) 2022-09-12 00:34:47 +03:00
Yair Morgenstern
351c6aa798
Solve CS placement clustering (#7783) 2022-09-12 00:33:22 +03:00
nacro711072
2157f1849e
Fixed: double unit while loading game from customFile. (#7771) 2022-09-10 08:06:31 -07: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
ab1236683f
AI: Recognize when no further techs can be researched, even if some techs are blocked (#7755) 2022-09-08 22:48:58 +03:00
Xander Lenstra
11bfe93ce7
Fixed a wrongly implemented feature disabling pantheon founding (#7738) 2022-09-08 22:48:46 +03:00
Xander Lenstra
0542855f88
Spies give vision in cities in which they are stationed (#7762) 2022-09-08 22:48:35 +03:00
Yair Morgenstern
30c426959b
Resolves second part of #7708 - don't re-raise tech popups for previously researched techs (#7757) 2022-09-08 16:17:17 +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
Leonard Günther
35e225b68f
Replaced BackgroundActor companion (#7749)
as it was interfering with the moddable UI
2022-09-07 12:18:47 +03:00
nacro711072
7a1c025e10
fix: lateinit property cityInfo has not been initialized issue. (#7739)
* fix: lateinit property cityInfo has not been initialized issue.

* use loop instead of foreach.
2022-09-05 08:15:58 +02: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
Xander Lenstra
f46ab1de3a
Disable spectators from changing unit names (#7737) 2022-09-04 16:23:50 +03:00
lishaoxia1985
63324b3272
delete unnecessary random(randomness.RNG) (#7721) 2022-08-30 11:29:57 +03:00
Yair Morgenstern
b1579224a8 Better milestones for world religion 2022-08-29 00:04:44 +03:00
Yair Morgenstern
a0766f75d2 Resolve #7705 - correct filtering of civs that need to have majority religion for world religion to activate
This was very poorly implemented
2022-08-29 00:02:19 +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
Brian
2e81a6152b
Fixed unit not giftable in one-sided open borders agreement. (#7701) 2022-08-24 00:14:47 -07:00
nacro711072
34f21dd08f
fix crash for start game with single player. (#7696) 2022-08-23 11:26:36 +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
CrispyXYZ
e58e184889
close app completely when clicked 'Exit' button (#7655)
* kill app when clicked 'Exit' button

* add super.onDestroy()

* tries to fix temporarily

* Update AndroidLauncher.kt

* add System.exit(0)

* a little fix
2022-08-22 21:09:47 +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
Jack Rainy
aa2d457260
Restore the button's style correctly (#7683) 2022-08-22 20:17:04 +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
Brian
86834de82a
Improved options to rename units (#7676)
Co-authored-by: Brian Huckaby <bdhuckaby@gmail.com>
2022-08-22 11:46:55 +03:00
Jack Rainy
e2de79acbd
Suggest to adopt policy when the game starts with some culture (#7682) 2022-08-20 21:16:59 +03:00
Xander Lenstra
089e762f72
Fixed a crash when marrying a city-state without cities (#7684) 2022-08-20 21:11:25 +03:00
Ouaz
90e582a0c3
Add an icon for "Wait" unit action (#7668) 2022-08-16 12:30:37 +02:00
Ouaz
11fd49c765
Fix "1.5x unhappiness" still being mentioned (#7669)
Follows #7420
2022-08-16 13:23:19 +03:00
Xander Lenstra
b1727f9360
Fix spies being gained in non espionage games (#7661)
* 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

* No spies gained when espionage is disabled

* Added missing function
2022-08-14 18:37:39 +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
MindaugasRumsa51
89979748a1
Notificiations tab scroll fix in empire overview (#7536)
* Update NotificationsOverviewTable.kt

* Update EmpireOverviewCategories.kt

* Update NotificationsOverviewTable.kt
2022-08-13 22:43:42 +03:00
OptimizedForDensity
9967642573
Fix infinite city-state tribute bug (#7653) 2022-08-13 22:43:25 +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
306aef4c67 Resolved #7647 - Mod translations loaded upon lod download 2022-08-12 14:24:22 +03:00
OptimizedForDensity
a4424d2ab1
Several pathfinding optimizations (#7523)
* Slight pathfinding optimization

* Cache canReach()

* More optimizations

* Use hashset instead of two arraylists
2022-08-08 17:13:27 +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
OptimizedForDensity
f1a69744cb
Fix mod translation file generation (#7629) 2022-08-07 17:36:55 +03:00
Xander Lenstra
44fdf53b05
Added a hidden option for enabling espionage (#7615) 2022-08-06 22:05:44 +03:00
Xander Lenstra
baeae5c8ae
Occupied cities have +2 extra unhappiness (#7628) 2022-08-06 22:05:21 +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
Liam A
00e1ed25a1
Made invisible units not become visible just by being next to an owned tile. (#7618) 2022-08-06 11:58:57 +02:00
Xander Lenstra
35eb71c937
Removes the option for disabling religion (#7606)
* Removes the option for disabling religion

* Deprecated religionEnabled variable, set default to `true` and removed in cases where it shouldn't have effect
2022-08-05 11:46:06 -04:00
OptimizedForDensity
6309bbdcb6
Fix bug related to resuming games (#7613) 2022-08-05 14:01:57 +02:00
Xander Lenstra
7a749fdec1
Added 'without resource' conditional (#7611) 2022-08-05 10:16:30 +03:00
Xander Lenstra
121859defb
Added a unique for destroying improvements on attack (#7605)
* Added a unique to destroy improvements on attack

* Removed last part of unique, as we have the `in [tileFilter] tiles` conditional
2022-08-04 20:12:42 -04: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
MindaugasRumsa51
5cc77dad3e
Update ReligionAutomation.kt (#7581) 2022-08-04 18:29: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
itanasi
0da7918a94
Minor Compile change (#7588) 2022-08-03 10:42:41 -04: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
itanasi
436917f2af
Allow Citizen Management to pick any tile owned within 3 tiles (#7533) 2022-08-03 16:08:46 +02:00
OptimizedForDensity
30e1dcbcdd
Fix broken translation (#7580) 2022-08-02 18:23:37 +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
Yair Morgenstern
e510bf4929 Resolved error where missionary cost was determined by Capital, and not by cities it could actually be constructed in 2022-08-01 19:42:59 +03:00
oynqr
6054b32f92
Fix erroneous relationship decay notification (#7564)
Whenever your relationship resting point as well as the relationship
score for city states is at the exact value of 30 or 60, a notification
is shown that the relationship is about to degrade, even though it can
and will not.
This fixes said issue by changing the comparison operators of the
current influence and the resting point in
getCityStateInfluenceDegrade() and getCityStateInfluenceRecovery() to
the correct ones, respectively <= and >=.
2022-08-01 17:57:58 +03:00
Joan Josep
6a943bb46f
Rename "Show minimap" to "Minimap size" (#7567) 2022-07-31 15:56:45 -04:00
SimonCeder
c760510f5b Invalid players removed from global quests 2022-07-31 14:24:07 +02:00
SimonCeder
a6e61c120b Fix NW placement 2022-07-30 00:07:48 +02:00
OptimizedForDensity
64e79ffa0d
Allow passable natural wonders (#7550) 2022-07-28 23:00:31 +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
a61c958d03 Merge branch 'automated-ruins' 2022-07-25 22:06:18 +02:00
Xander Lenstra
52d0814e7b
Update religious AI; buying faith buildings, inquisitor AI updates (#7454)
* Update AI for buying with Faith, allowing it to buy Faith buildings

* Minor bug fixes

* Revamped inquisitor AI, minor changes to missionary AI

* Reviews

* Reviews

* Reviews

* Removed magic number
2022-07-23 13:06:48 -04:00
SimonCeder
2f52b6bf1a
Merge pull request #7507 from SimonCeder/marriagebug
avoid potential marriage bug
2022-07-23 09:04:10 +02: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
SimonCeder
64e6fd086d
Update CityStateFunctions.kt 2022-07-22 20:16:30 +02:00
SimonCeder
5846da6f8a
cover more cases 2022-07-22 20:14:08 +02:00
Timo T
9f251787fa
Fix games not being loadable (#7508)
* Fix wrong caching key

* Refactor: Change caching keys to unique name
2022-07-22 16:04:30 +03:00
OptimizedForDensity
772e7faf54
Construction automation optimization (#7504) 2022-07-22 14:48:21 +02:00
SimonCeder
73ad76b59c avoid potential marriage bug 2022-07-22 14:06:29 +02:00
Yair Morgenstern
acd71617cc Quick win for #7491 - check religion spread range for cities only after checking it's with a majority major religion 2022-07-22 10:29:25 +03:00
Yair Morgenstern
858c7bc256 Quick win for #7491 - only update resources after trade/unit if resources are relevant 2022-07-22 09:26:40 +03:00
Yair Morgenstern
ae187f4f85 Quick win for #7491 - when creating a unit, only update civ resources if the unit has resource requirements 2022-07-21 22:57:30 +03:00
Yair Morgenstern
77b0b582ae Disabled autosave when resizing worldScreen 2022-07-21 22:31:44 +03:00
Yair Morgenstern
96c9d105f3 Resolved #7497 - Fixed Civilopedia crash on terrains 2022-07-21 18:26:41 +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
Xander Lenstra
986346a127
Added a unique limiting what units can be intercepted (#7488)
* Added a unique limiting what units can be intercepted

* Cleaned up implementation and added stateForConditionals
2022-07-21 09:16:33 +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
42df3f06f0
Simplified and optimized image attempter use (#7494)
* Simplified and optimized image attempter use

Image fallback logic was in a bad place - confusing, semi-optimized, and spread out over several places

This brings everything into one place, simplifies the logic, adds comments,  optimizes string concats to bring down RAM usage, and adds caching so we don't need to conduct the same searches over and over

* Minor reorder

There is still more that can be cleaned up but not now
2022-07-21 07:52:26 +03:00
Yair Morgenstern
448efc813d
40% performance save on tileInfo.getImprovementStats() by caching citywide uniques (#7492) 2022-07-20 19:53:30 +03:00
Yair Morgenstern
8574ad4624
Save all tile terrains and terrain uniques in transients, for better performance (#7490)
* Save all tile terrains and terrain uniques in transients, for better performance
Also minor changes in other places for performance reasons

* CR changes + test fix
2022-07-20 16:38:42 +03:00
Yair Morgenstern
e2d04b37f7
HexaRealm as default tileset (#7477) 2022-07-20 11:57:50 +03:00
itanasi
ee6082c394
Replace "moveTo" in unit overview with "Moving" (#7457) 2022-07-19 14:01:42 +02: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
Yair Morgenstern
f1a72e9611
Resolve #7438 -Can no longer receive negative gold offers from AI (#7451)
* Can no longer receive negative gold offers from AI

* Function over field

* Correct checking for tradable offers in AI counteroffer
2022-07-18 17:57:36 +03:00
Timo T
0ba7a457c4
Gray out city state friend bonus when allied (#7475) 2022-07-17 21:50:04 +03:00
Yair Morgenstern
59d7a81b26
Keep progress in notification scroll when updating (#7447)
* Keep progress in notification scroll when resizing

* Don't use layout directly, as per docs
2022-07-17 01:04:42 +03:00
OptimizedForDensity
c2ae9e3145
Stop transported units from being able to pillage tiles (#7468) 2022-07-17 01:04:11 +03:00
MindaugasRumsa51
9f25ce66c2
Fix getting settlers from ancient ruins on one-city challenge (#7459)
* Update UniqueTriggerActivation.kt

* Update UniqueTriggerActivation.kt

* Update UniqueTriggerActivation.kt

* Update UniqueTriggerActivation.kt

* Update UniqueTriggerActivation.kt

* Update UniqueTriggerActivation.kt
2022-07-15 14:50:28 -04:00
Yair Morgenstern
0716350a3e Stat colors unified - for use in notifications, improvements, yield icons, etc 2022-07-15 12:36:39 +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
itanasi
8138fa5d54
Interception always takes an attack (#7455) 2022-07-15 11:56:35 +03:00
OptimizedForDensity
7d7a36acc9
Add more music triggers (#7407)
* Add noted unimplemented music triggers

* Prototype try-civ-specific-then-try-general music function

* Undo previous commit and rename Built to Wonder

* Move music triggers to alert popup
2022-07-15 11:56:26 +03:00
Timo T
28ff3da9cf
Fix potential race condition in multiplayer game update (#7444) 2022-07-15 10:52:35 +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
OptimizedForDensity
ecf9de6cfb
Move border below icons (#7452) 2022-07-15 01:27:26 +02:00
OptimizedForDensity
cb6160c4a8
Significantly reduce AI turn time (#7441)
* Significantly speed up AI pathfinding

* Undo caching and improve AI

* Undo comment change

* Improvement

* Reorder and comment
2022-07-14 16:49:39 +03:00
Xander Lenstra
160b51d578
Added more unit tests (#7448) 2022-07-14 10:27:06 +03:00
alexban011
850899cbc3
sorted eras by eraNumber (#7443) 2022-07-13 21:43:37 +02:00
Timo T
e71616d433
Fix game crashing when a multiplayer game can not be read (#7440)
* Fix game crashing when a multiplayer game can not be read

* Refactor: fix typo
2022-07-13 21:59:07 +03:00
Yair Morgenstern
552a6ee787
Unique deprecation (#7433) 2022-07-12 06:50:49 +03:00
OptimizedForDensity
48744f658c
City health updates when finishing health-increasing buildings (#7310)
* Set full health if city builds health increasing building while at full health

* Proportional health addition

* Move function to postBuildEvent function
2022-07-11 19:08:19 +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
OptimizedForDensity
0a6110555e
Fix some graphics issues related to combat (#7421)
* Fix some issues related to units flashing red

* Slight change to variable name and string definition
2022-07-11 10:34:52 +03:00
Xander Lenstra
ae5a0221ed
Refactorings & three more unit tests for uniques (#7412) 2022-07-10 23:19:45 +02:00
OptimizedForDensity
e65e1dc9ce
Fix any civ being able to capture barbarians (#7418) 2022-07-10 19:15:17 +03:00
itanasi
0f5e0b546e
Remove double XP gain from Intercept (#7414) 2022-07-10 11:53:38 +03:00
Yair Morgenstern
f2365568d4
Fix multiple capture uniques resulting in double-capture (#7403) 2022-07-10 01:12:59 +02:00
OptimizedForDensity
0511372fe8
Stop automate production setting from automating other players' production in MP (#7351)
* Fix automate production option in multiplayer

* More explicit condition
2022-07-09 22:50:53 +03:00
OptimizedForDensity
aab49e7295
Fix policy uniques not being applied (#7404) 2022-07-09 22:50:30 +03:00
OptimizedForDensity
43da7ee3cd
Sort game speeds in Civilopedia by game speed modifier (#7408) 2022-07-09 22:49:37 +03:00
Timo T
b21f616120
Fix Desktop multiplayer options showing a double separator (#7410) 2022-07-09 22:49:16 +03: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
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
58e65978dc
Prevent theme music tracks from randomly playing (#7396)
* Don't play theme music tracks randomly

* Tweak

* Remove redundant code

* Ambient string to variable
2022-07-08 15:49:55 +03:00
OptimizedForDensity
7c64015aed
Improve AI belief picking (#7369)
* Improve AI belief picking

* Change default gameTimeScalingPercent to 100

Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
2022-07-08 15:49:35 +03:00
alexban011
33237d5a59
feature (#7325) 2022-07-08 15:48:41 +03:00
Yair Morgenstern
3422e161ad Removed deprecated uniques 2022-07-08 15:48:33 +03:00
Yair Morgenstern
87aa5bc2c0 Resolved #7379 - puppet cities generate no extra unhappiness (per Civ V) 2022-07-08 14:17:29 +03:00
Yair Morgenstern
e8eb66a4f6 Resolved crash when resuming before music controller initialized 2022-07-07 19:57:34 +03:00
alexban011
ce5f0dd879
Increase mod search request page size (#7377) 2022-07-07 17:43:16 +02:00
OptimizedForDensity
60f7ea4322
Unstack enemy unit strength modifiers (#7390) 2022-07-07 17:52:16 +03:00
alexban011
fc1896eaf1
Puppeted cities can no longer become capitals (#7360) 2022-07-07 16:28:57 +02:00
alexban011
aadec7e211
fixed zoom buttons not toggling without reloading the worldscreen (#7378)
* feature

* readablity
2022-07-05 22:06:38 +03:00
letstalkaboutdune
f3e043cd8f
Update UnitGroup.kt (#7375)
Handle unitBaseImage and actionGroup layers of unit icons properly if unit is idle
2022-07-05 22:04:51 +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
8b4bb89995
Fix duplicate version in string (#7374) 2022-07-05 08:05:06 +03:00
letstalkaboutdune
33e5b6475a
Fix actionGroup Opacity (#7370)
Makes actionGroup layer of unit icon 100% opaque when selected.
2022-07-04 22:16:42 +03:00
alexban011
4f97c239b4
Add civ names under their icon in diplomacy screen (#7240) 2022-07-04 17:26:30 +02: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
OptimizedForDensity
1649b236bb
Slight optimization of getAttackableEnemies (#7353) 2022-07-04 16:35:49 +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
OptimizedForDensity
8203557633
Better AI targeting (#7359) 2022-07-04 16:34:33 +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
alexban011
818655f928
fix notification log not removing [ ] used for translations (#7335)
* fix

* improved

* removed unused imports
2022-07-01 09:37:30 +03:00
OptimizedForDensity
437f0f90b9
Add support for era-specific unit sprites (#7293)
* Add era specific unit sprites

* Check era numbers instead of names

* Reset atlas

* Reset

* Code deduplication

* More consistent function name

* Use lambda expression instead of function

* Get rid of gross kludge

* Use era names instead of numbers
2022-07-01 09:36:54 +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
Timo T
08cede4f5a
Fix OutOfMemoryError when loading a game and another is already loaded (#7306)
* Fix OutOfMemoryError when loading a game and another is already loaded

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

* 2 - start year:
2022-07-01 09:34:13 +03:00
OptimizedForDensity
61509f747e
Don't wake sleeping civilians if they're in a city (#7311) 2022-07-01 09:33:35 +03:00
alexban011
724ac56c62
Exception handleing when loading mod options (#7279)
* try catches

* catching specific exceptions

* try catch when calling the function

* removed unused import
2022-07-01 09:33:16 +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
Skekdog
27854bc031
Fix crash when exploring (#7314)
* Exploring units now take several turns to reach a ruin (but only if it is in vision, not behind fog of war)
Re-did this because the last pull request was a mess and so was everything else I was doing

* Fix crash reported by @Aditya von Karma#8015 on discord

* Update UnitAutomation.kt

Use canReach instead of canMoveTo

* Update UnitAutomation.kt

Use both canReach and canMoveTo
2022-06-27 15:51:46 +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
Skekdog
3e9a485b86
Exploring units now take several turns to reach a ruin (but only if it is in vision, not behind fog of war) (#7285)
Re-did this because the last pull request was a mess and so was everything else I was doing
2022-06-25 22:20:01 +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
Timo T
725c298a2a
Fix crash handling not disposing previous screens (#7301) 2022-06-25 22:10:42 +03: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
50a8ff3ce0
Fix crash when melee unit captures civilian then tries to attack it (#7282) 2022-06-24 14:05:49 +02:00
OptimizedForDensity
51caf7a4ed
Fix Mayan UB not appearing in Civilopedia (#7283) 2022-06-24 11:53:55 +03:00
OptimizedForDensity
4f6a2eb2f4
Add notification when a civ is resurrected through liberation (#7276) 2022-06-24 01:24:29 +02:00
OptimizedForDensity
e69789a683
Allow modded harbor-type buildings to connect cities to capital (#7254) 2022-06-23 20:53:32 +02:00
OptimizedForDensity
b716d4a68d
Fix "Religions to be founded" count (#7278) 2022-06-23 20:42:53 +02:00
Azzurite
e0a65fb95a Fix the fix 2022-06-23 20:01:44 +02:00
alexban011
50ec861edd
fix (#7281) 2022-06-23 18:27:33 +03:00
Timo T
b558d92a1e
Fix city ambient sounds not working on Desktop (#7271) 2022-06-23 01:08:18 +02:00
Timo T
466560abba
Fix city sounds not being played on released game versions (#7268) 2022-06-22 12:39:16 +02:00
Azzurite
884a16d632 Fix city ambience sound not being stopped when the city screen is updated via UncivGame.replaceCurrentScreen 2022-06-22 10:44:39 +02:00
Azzurite
7e36d62b6e Fix crash 2022-06-22 10:00:17 +02: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
SomeTroglodyte
a13a39293f
Rework Policy and Diplomacy buttons (#7027)
* WordScreenTopBar rework, portrait-friendlier

* WordScreenTopBar rework, portrait-friendlier - NotificationsScroll

* WordScreenTopBar rework, portrait-friendlier - Rounded corners

* WordScreenTopBar rework, portrait-friendlier - Tweak padding

* WordScreenTopBar rework, portrait-friendlier - review

* Worldscreen reorg 1 - Tech policy Diplomacy

* Tech Policy Diplomacy buttons - postmerge fix and 7130 simpler
2022-06-22 09:31:07 +03:00
OptimizedForDensity
50e479b21d
Fix cases where AI great people get stuck trying to build a great improvement (#7239) 2022-06-22 09:29:43 +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
OptimizedForDensity
7de3fdf452
Fix disappearing terrain when switching between mods (#7257) 2022-06-22 09:08:38 +03:00
OptimizedForDensity
83926eac7c
Fix policies not contributing stats from city-states (#7237) 2022-06-21 01:18:42 +02:00
OptimizedForDensity
954d0e4fe0
AI missionaries avoid cities with inquisitors (#7218) 2022-06-20 22:46:11 +03:00
alexban011
2224e65707
fixed crash in NextTurnAutomation (#7227)
* fixed crash

* redone

* reviews

* reviews 2
2022-06-20 09:50:03 +03:00
Yair Morgenstern
f10bf8bfbe Resolved crash for victory condition not in ruleset 2022-06-20 09:49:22 +03:00
Yair Morgenstern
5b5e4137db Resolved crash for stats not in statCostModifiers 2022-06-20 09:46:57 +03:00
Azzurite
9d5b3d4e4a Refactor: Remove unnecessary float conversion 2022-06-19 21:50:06 +02:00
alexban011
363d241691
Fix a religion to be a majority when it's over 50% of the cities, not equal to 50% (#7223) 2022-06-19 21:48:54 +02:00
Timo T
6d6b390ef8
Nicer multiplayer settings (#7198)
* Nicer multiplayer settings

* Refactor: use shortcut method
2022-06-19 21:47:36 +03:00
OptimizedForDensity
c2c991f8b8
Population reassignment bug fixes (#7221)
* Fix locked tiles not being unassigned after population decrease

* Fix assigned specialists not updating after a building is removed
2022-06-19 21:46:58 +03:00
OptimizedForDensity
4955d35efb
Moddable game speed backwards compatibility (#7212)
* Move GameSpeed definition to JSON files

* Minor cleanup and some corrections

* Round down tribute gold to match old when statement

* Small variable name changes

* Some typos

* Reduce number of speed modifiers plus code improvements

* Catch missing game speed

* Found a better place for the check

* More tweaks

* Added a startYear mod constant and some tweaks

* Cleanup old GameSpeed file references

* Fix tests

* Add game speeds civilopedia page

* Remove one last todo

* Fix translation

* New icon for game speeds

* More game speed modifiers

* Fix error

* Update Speeds.json files and move tutorial to docs

* Rename GameSpeed class to Speed

* Rename GameSpeed -> Speed and other reviews

* Forgot a file

* Add start year to civilopedia

* Remove decimal from default starting years

* Fix backwards compatibility

* Unused import

Co-authored-by: OptimizedForDensity <>
2022-06-19 10:23:56 +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
Azzurite
672b804ac5 Refactor: Fix doc comments 2022-06-19 01:13:45 +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
Joan Josep
c9f0d19555
Victory status window should translate "Technologies" entry. (#7210)
There is no "Techs" string in the translation files. Use "Technologies" instead.
2022-06-19 00:31:50 +03:00
Joan Josep
7614cc01c4
Translate search help text in Mod filter (#7202) 2022-06-18 23:31:24 +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
Timo T
06198f2e2c
Scroll WorldScreen immediately to the city when exiting it (#7195) 2022-06-18 21:39:06 +02:00
Timo T
488f12be9c
Fix civilopedia not showing any victory type entries when opening it without any game open (#7194) 2022-06-18 21:50:34 +03:00
Timo T
7481e5aa13
Allow clearing the multiplayer server text field with the "Backspace" key (#7196) 2022-06-18 21:48:59 +03:00
Jack Rainy
35a4f079b1
Do not trigger the Time Victory if it is not enabled (#7197)
* Whitespaces

* Use the proper list of victory types

* Clean up if the victory type was removed
2022-06-18 21:44:07 +03: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
Timo T
c84580c71e
Fix memory leaks in BaseScreen & gdx.Stage/gdx.TextFields (#7190)
* Fix memory leaks in BaseScreen & gdx.TextFields/gdx.Stage

* Fix loading screen not showing anymore

* Make popScreen exit the game if it would try to remove the last screen
2022-06-18 21:41:15 +03:00
Skekdog
4933082088
Fix crash when base ruleset contains no strategic resources (#7193) 2022-06-18 01:54:26 +02:00
Paul Pogonyshev
d6b41c56ff
More shortcuts (#7171)
* Add shortcut 'Tab' to perform unit movement

* When no unit is selected, use 'Z' as a shortcut to select next unit
2022-06-18 01:53:45 +02:00
Paul Pogonyshev
71160b2e63
Make 'Home Home' shortcut always open capital's city screen (#7186) 2022-06-18 01:53:29 +02:00
Paul Pogonyshev
0533c9eaba
Restore unit action shortcuts accidentally dropped in commit 4fb2ad8fa (#7187) 2022-06-16 22:32:02 +03:00
itanasi
38b6770e84 Maintain Fortify bonus after Fortify until Healed (#6991)
* Maintain Fortify bonus after Fortify until Healed

* add in backward compatibility

* attempt

* Add in proper backwards compatibility

* Convert Fortify in BackwardCompatibility.kt instead

* Remove debug code

* Now with Regex

* remove unnecessary import
2022-06-16 21:30:31 +02:00
OptimizedForDensity
623b84ea30
AI considers liberating city-states from other civilizations (#7157)
* AI will consider liberating a city state on conquest

* Factor in current civ happiness for liberation consideration

* Refactor foundingCiv check into function
2022-06-16 21:12:26 +03:00
Timo T
4fb2ad8fab
Fix unit action/selection overlay not being closed when performing an action with a new unit (#7184) 2022-06-16 21:07:59 +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
Paul Pogonyshev
d462100c19
Refactor key handling (#7042)
* Refactor keyboard shortcut handling

* Use 'userObject' for attachments instead of a WeakHashMap

* Fix shorcut vetoing when a popup is active

* Solve misc. review complaints

* Reimplement changes in UnitActionsTable to exactly repeat what the previous code did

* Fix last commit
2022-06-15 20:04:44 +03:00
Timo T
1bbc11cc47
Fix option change not reloading main menu properly (#7170) 2022-06-15 20:01:02 +03:00
Timo T
89a7cc7246
Fix wrong Duration short formatting (#7167) 2022-06-15 20:00:13 +03:00
Yair Morgenstern
4d0230f70e Revert "Maintain Fortify bonus after Fortify until Healed (#6991)"
This reverts commit 07b7d91107.
2022-06-14 22:03:18 +03:00
alexban011
59e4eb8373
increased kotlin version to latest 1.7.0 (#7151)
* updated to 1.7.0

* change to empty else

* bumped ios java to 1.8
2022-06-14 21:10:44 +03:00
itanasi
07b7d91107
Maintain Fortify bonus after Fortify until Healed (#6991)
* Maintain Fortify bonus after Fortify until Healed

* add in backward compatibility

* attempt

* Add in proper backwards compatibility

* Convert Fortify in BackwardCompatibility.kt instead

* Remove debug code

* Now with Regex

* remove unnecessary import
2022-06-14 21:09:31 +03:00
Timo T
a5f9623dbe
Fix OutOfMemory error when loading game state after already having a game loaded (#7145)
* Fix OutOfMemory error when loading game state after already having a game loaded

* Fix screen resize not being handled correctly

* Add withContext shortcut functions

* Add more logging

* Fix multiplayer games sometimes being loaded twice

* Make the loading screen nicer

* Make the loading screen hide previous popups for making the screenshot

* Don't do custom rendering & dispose the texture

Sometimes it makes sense to understand the library you're using...

* Fix missing GL context

* Refactor: increase readability of loadGame function
2022-06-14 21:09:09 +03:00
Timo T
b6a98e5540
Fix EventBus not being able to listen to events with more than one level of inheritance (#7009) 2022-06-14 21:08:43 +03:00
Yair Morgenstern
4633462884 Condiional fixes 2022-06-14 20:47:12 +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
OptimizedForDensity
cac616a97b
Fix spectator's fog of war toggle (#7130) 2022-06-14 20:32:36 +03:00
Timo T
90bdcf9329
Fix scroll to wonder in the map editor (#7154)
* Fix scroll to wonder in the map editor

* Fix blink always happening
2022-06-14 20:32:06 +03:00
Timo T
c3268126ee
Fix unit being captured two times (#7141) 2022-06-14 20:31:47 +03:00
Jack Rainy
9ffd9b817b
Do not enter the city while performing an air strikes sequence (#7148) 2022-06-14 13:42:53 +02:00
OptimizedForDensity
ed922b182d
Improvements to AI military unit usage (#7147)
* Add more opportunities for AI units to attack
2022-06-14 13:34:24 +02:00
OptimizedForDensity
9ac019caea
Prevent AI from sending a second peace treaty (#7150) 2022-06-14 01:06:29 +02:00
Yair Morgenstern
46b1516159 Fixed translation order 2022-06-13 22:22:52 +03:00
Yair Morgenstern
86f2560d7e Added test for branches which require missing eras 2022-06-13 21:39:57 +03:00
Azzurite
5506ad2cd4 Fix anchor link 2022-06-12 21:28:09 +02:00
Timo T
4da1d442e4
Fix NPE in Nation selection & editor mods popup (#7144) 2022-06-12 18:10:03 +02:00
Azzurite
dc16bba983 Add more extensive multiplayer documentation 2022-06-12 12:55:39 +02: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
OptimizedForDensity
72b197fdc3
Stop AI puppets from building settlers and military (#7129)
* Stop puppeted cities from building settlers and military

* Move puppet check to function
2022-06-11 22:14:24 +03:00
Yair Morgenstern
d34fa7db3d 4.1.9 2022-06-10 16:56:19 +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
Timo T
9918353c66
Fix crash during next turn automation (#7125) 2022-06-10 16:44:02 +03:00
alexban011
55ed226608
disable worldWrap if its disabled in settings (#7123) 2022-06-10 15:48:51 +03:00
Yair Morgenstern
5cd992a076 Resolved #7111 - Peace cooldown with city-states 2022-06-09 19:51:08 +03:00
Yair Morgenstern
538b7b8e7d refactor: Simplified city-state war declaration 2022-06-09 19:33:14 +03:00
Yair Morgenstern
467b0b2570 All "attacked city state" functions should only activate when attacking directly, not when declaring war due to alliances 2022-06-09 19:26:12 +03:00
Yair Morgenstern
6c463797d8 Resolves #7080 - tileFilter matches resource name and uniques 2022-06-08 19:52:45 +03:00
Yair Morgenstern
b15e949a33 Resolves #7103 - mapholder size reset after resize 2022-06-08 19:40:41 +03:00
OptimizedForDensity
b79246ee02
Certain projects cannot be hurried by great engineer (#7076) 2022-06-08 10:20:45 +03:00
OptimizedForDensity
207cba0844
Fix scout not upgrading through ruins (#7091) 2022-06-08 10:19:42 +03:00
SomeTroglodyte
0ac89a906d
WordScreenTopBar rework, portrait-friendlier (#6945)
* WordScreenTopBar rework, portrait-friendlier

* WordScreenTopBar rework, portrait-friendlier - NotificationsScroll

* WordScreenTopBar rework, portrait-friendlier - Rounded corners

* WordScreenTopBar rework, portrait-friendlier - Tweak padding

* WordScreenTopBar rework, portrait-friendlier - review
2022-06-08 10:18:30 +03:00
alexban011
29c55cd393
fixed minimap showing fog of war everywhere when you joined a mp game without being a player (#7094)
* reveal tiles if spectator

* better formatting

* even better formatting

* removed additional new line
2022-06-08 10:18:11 +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
Yair Morgenstern
e5d8de6b58 Resolved crashes when centering on a city-state with no cities 2022-06-07 23:31:22 +03:00
OptimizedForDensity
c40b25a73b
Fix rare case where ruins would delete an AI unit while trying to upgrade it (#7084)
* Fix rare case where ruins could delete AI units when upgrading the unit

* Don't moveToTile if the unit is destroyed

* Update comment

* Forgot to uncomment line

* Move currentMovement = 0f to destroy()
2022-06-07 08:27:25 +03:00
OptimizedForDensity
f5317eb53b
Prevent duplicate ruin reward (#7085) 2022-06-06 22:34:23 +03:00
Yair Morgenstern
120c41dd15 Revert "Moddable prettier Tutorials - Step 1 (#7064)"
This reverts commit e91c0ff212.
2022-06-06 09:59:21 +03:00