Commit Graph

3527 Commits

Author SHA1 Message Date
1070584180 Mass deprecation 2021-07-19 23:27:34 +03:00
7039b6a287 More sequencing for faster unique filtering 2021-07-19 23:13:36 +03:00
f85bedeb2f Faster filtering to avoid some ANRs 2021-07-19 23:00:05 +03:00
fce7d39d4a Fix for missing Farms (all mod TileSetConfigs were always active) (#4553)
* Fix for missing Farms (all mod TileSetConfigs were always active)

* Fix for missing Farms v2

* Fix for missing Farms patch1
2021-07-19 22:05:48 +03:00
973a8fb0ac Small fixes (#4548)
* Raze city button should be disabled for original capitals

* Halicarnassus trigger checks Great Person

* New water improvements should recalculate resource stuff

* Should't be able to create water improvements outside borders
2021-07-19 21:53:15 +03:00
46da6bd56e Sort Civilopedia entries using locale (#4560) 2021-07-19 21:52:26 +03:00
c81c1b6a1b Implemented Follower beliefs for religions (#4530)
* Minor things

* Added a few follower beliefs

* Implemented follower beliefs when founding a religion

* Added missing follower beliefs as much as possible

* Religion screen now scrolls correctly

* Buttons for chosen religions are now disabled  instead of removed, idea couresty to someTroglodyte

* Implemented requested changes
2021-07-19 21:51:34 +03:00
50cec97354 Spruced up Civilopedia - phase 5 - buildings (#4391)
* Spruced up Civilopedia - phase 5 - buildings

* Finish merging master into Civilopedia-Buildings

* Spruced up Civilopedia - phase 5 - buildings - patch

* Spruced up Civilopedia - phase 5 - buildings - patch2

* Spruced up Civilopedia - phase 5 - buildings - patch3

* Spruced up Civilopedia - phase 5 - buildings - patch4

* Spruced up Civilopedia - phase 5 - buildings - patch5
2021-07-19 21:48:51 +03:00
118c1fc888 Unit gifting (#4557)
* wonder splash screens

* wonder splash screens atlas

* reset to master

* add basic gifting to city states and major civs

* actual gifting of the unit

* add gift icon to atlas

* adjust relationship decay

* add strings to jsons

* AI and player return same object
2021-07-19 00:30:10 +03:00
f5a95fad18 TileGroup linting and 0.001% optimization (#4531) 2021-07-18 23:30:28 +03:00
8c35e54b71 Rewritten Tooltip class (#4552) 2021-07-17 22:44:09 +03:00
3a7da738c4 Keyboard mapping by keyCode (#4542)
* Keyboard mapping by keyCode

* Keyboard mapping by keyCode - v2
2021-07-17 22:26:20 +03:00
9efcc4f423 Fixed bug where great prophets could be chosen as free great persons when religion was disabled (#4518) 2021-07-15 10:38:26 +03:00
482a1260ca Fixed bug which leads to crashes for almost all users (#4519) 2021-07-15 10:36:59 +03:00
df2cf711ba More deprecation 2021-07-14 23:30:47 +03:00
e3e08732db Deprecations 2021-07-14 22:51:33 +03:00
6b73a3e9d7 3.15.12 2021-07-14 22:34:11 +03:00
2752c713b9 Founding Religions (#4505)
* Fixed crashes on loading save games with religion

* Added missing credit

* Religious cities now show religion icons in the city button

* Add icons for religions

* You can now found beliefs, with snazzy icons!

* Fixed bug which made prophets impossible to generate

* Added missing translatable strings

* Fixed translation tests properly

* Implemented requested changes

* Implemented part of the requested changes

* Removed SplitPane in favor of Table

* Removed unused code

* Capped the amount of foundable religions to the amount of religions
2021-07-14 22:09:51 +03:00
477051c616 Updated the tile choosing algorithm for city expansion (#4510)
* Updated the tile choosing algorithm for city expansion to the one used in the base game

* Implemented requested changes
2021-07-14 19:32:50 +03:00
314a2a48bb Wonder build screens redux (#4509)
* wonder splash screens

* wonder splash screens atlas

* removed pyramids file, add portrait code

* restore atlas
2021-07-13 23:42:40 +03:00
c9010c5fdc Tweaked Slider, use in MapParametersTable (#4506) 2021-07-13 20:55:22 +03:00
6c0237fcc3 Disabled city state diplomacy buttons when it is not your turn (#4503) 2021-07-13 17:41:31 +03:00
68b40cf860 Fixed bug where great prophets could be given when religion was disabled (#4502) 2021-07-13 17:40:54 +03:00
07e3a2228e Fixed bug where effects of all aquaducts nationwide stacked in each city (#4487)
* Fixed bug where effects of all aquaducts nationwide stacked in each city

* Implemented requested changes

* Implemented requested changes better
2021-07-13 06:26:37 +03:00
2e34253a1e Resolved #4484 - civs with no cities can no longer pick policies 2021-07-12 21:25:52 +03:00
4ee0ef4e1f Fixed crashes on loading save games with religion (#4479) 2021-07-12 21:12:46 +03:00
f97e64e54e Fixed bug where submarines could not attack embarked units (#4459)
* Fixed bug where submarines could not attack embarked units

* Implemented requested changes

* Fixed typo
2021-07-12 19:37:56 +03:00
30082c8254 Resolved #4453 - Spectator no longer appears on Diplomacy overview 2021-07-11 21:51:35 +03:00
ab89768894 Fix worldSizeModifier in TechManager (#4473) 2021-07-11 19:11:50 +03:00
1fe8c566ee Fix Hun city names (#4469) (#4476) 2021-07-11 19:10:03 +03:00
63d98c4692 Fixed bug where tile construction time was increased instead of decreased (#4475) 2021-07-11 19:09:17 +03:00
4c9e15c0ea Make map symmetrical if it's not wrapped (#4461) 2021-07-11 10:51:57 +03:00
56111fa24c Translations update (#4465)
* Update Simplified_Chinese.properties (#4456)

* Update Indonesian.properties (#4455)

* Update Indonesian.properties

* Update Indonesian.properties

* Update Italian.properties (#4445)

* Laid some groundwork for implementing further religions (#4444)

* Laid some groundwork for implementing further religions

* Fixed duplication of Religion object

* Update Korean.properties (#4443)

* Update Korean.properties

* Update Korean.properties

* Update Spanish translations fase 1 (#4440)

* Update Spanish translations fase 1

DO NOT merge this until I have finnished it. I run out of time today.

* Update Spanish.properties

* Update Czech.properties (#4437)

* Update Czech.properties

many new (and old) strings translated

* Update Czech.properties

tweaked some newly translated strings

* huns and netherlands strings

* Update Swedish.properties (#4436)

Back up to 100%
Also some tweaks:
Ändrade ett par enheter för att få realegenus (en/den) på så många som möjligt
t ex Pansarskepp -> Pansarbåt (historiskt korrekt benämning, även Monitor är tänkbart)
Man kan överväga även t ex Infanteri -> Infanterist, finns åsikter?

* Update German translation (#4434)

* Adjusting the accent (#4426)

I changed a lot of phrases and words to European Portuguese as these phrases were in Brazilian Portuguese which has its own translation in another document.

Co-authored-by: lishaoxia1985 <49801619+lishaoxia1985@users.noreply.github.com>
Co-authored-by: kensvin <63847755+Kensvin28@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: Xander Lenstra <71121390+xlenstra@users.noreply.github.com>
Co-authored-by: Samsaek the Calico <saud2410@naver.com>
Co-authored-by: ArchDuque-Pancake <78449553+ArchDuque-Pancake@users.noreply.github.com>
Co-authored-by: stoupa007 <60326342+stoupa007@users.noreply.github.com>
Co-authored-by: SimonCeder <63475501+SimonCeder@users.noreply.github.com>
Co-authored-by: MartinP <77325495+Mape6@users.noreply.github.com>
Co-authored-by: batatasmor <75855494+batatasmor@users.noreply.github.com>
2021-07-10 23:02:23 +03:00
b650b95356 Add missing pantheons, fix minor bugs (#4419)
* Added all remaining pantheons

* AI now choose pantheons, AI no longer tries to get mutually exclusive policies

* I don't know why this was changed

* Implemented requested changes
2021-07-10 22:50:50 +03:00
77b4bcd26a Fixed spurious notifications of revealed resources too far away or in foreign territory (#4464)
Co-authored-by: Frederick Hayward <frederick.hayward@student.unimelb.edu.au>
2021-07-10 21:59:46 +03:00
253e62de72 City states give gold when met; updates to city state gold gifts (#4435)
* City States now give gold when met

* City States can now receive different amounts of gold, and the amount of influence gained from gifts follows the base game

* Implemented requested changes

* Fixed tests
2021-07-10 21:51:11 +03:00
5925489c0b Fixed bug (#4449) 2021-07-10 21:18:45 +03:00
02bacac8e7 Fixed nullptrexception (#4458) 2021-07-10 21:10:04 +03:00
74b3db5927 Fixed bug where gold from rivers wasn't doubled during golden ages (#4462) 2021-07-10 21:09:21 +03:00
0c916e85fb Fixed _very_ old inconsitency that broke my game :( (#4442) 2021-07-09 19:15:16 +03:00
d262c1a6ea Automated atomic bombs no longer cause crashes 2021-07-09 13:51:18 +03:00
c327b54b1b City Centers can no longer be removed by nukes (#4423)
* City Centers can no longer be removed by nukes

* Implemented requested changes

* Implemented more requested changes
2021-07-09 12:13:45 +03:00
df7bba02a1 Merge branch 'master' of https://github.com/yairm210/Unciv 2021-07-09 11:01:40 +03:00
0d328ef99a Stuffed some +/- uniques into the square brackets 2021-07-09 11:01:25 +03:00
5376e488a0 Added a simplified version of great prophets, implemented a basic city religion UI (#4356)
* Add a very simple display for the religion in a city

* Added missing credits for shrine

* Added Great Prophet unit

* Great prophets can now be generated using faith

* Great Prophets can now construct holy sites

* Great Prophets can now spread their religion to friendly cities

* Holy site can only be constructed if the great prophet hasn't spread religion yet

* Added missing translation string

* Fixed more translation problems

* Implemented requested changes
2021-07-09 10:48:33 +03:00
edad1e10a2 Fix for placeholder parameters changing names and becoming out of sync with existing translations.
Relevant to #4402
2021-07-09 10:16:39 +03:00
21eadb39ff Updated TranslationFileWriter to include the new values that filters can have (#4402)
* Updated TranslationFileWriter to include the new values that filters can have

* Implemented requested changes
2021-07-09 09:14:24 +03:00
ced85fafd1 Fixed a bug where one city challengers could capture enemy cities (#4431)
* Fixed a bug where one city challengres could capture enemy cities

* Actually, this is a cleaner implementation
2021-07-09 09:11:17 +03:00
fbd64b9520 Refactored the way cities determine what uniques should apply when (#4393)
* I'm so sorry for the size of this PR

* Uniques are better generalized

* Code now compiles

* Missed a line

* Some more cleaning up
2021-07-07 22:01:14 +03:00
373b42bfcf Update "World screen" tutorial text and Home key improved (#4403) 2021-07-07 20:00:12 +03:00