Commit Graph

6387 Commits

Author SHA1 Message Date
Yair Morgenstern
312bc3d405
Translations update (#5769)
* Update Indonesian.properties (#5763)

* Update Turkish.properties (#5759)

Co-authored-by: kensvin <63847755+Kensvin28@users.noreply.github.com>
Co-authored-by: omerfaruk-cakmak <32402595+omerfaruk-cakmak@users.noreply.github.com>
2021-12-07 21:45:49 +02:00
Xander Lenstra
22b3997c28
Band-aided a bug where players in multiplayer games were waiting for themselves. (#5768) 2021-12-07 21:38:45 +02:00
SimonCeder
24bd2b66b0
Regions part 3 - resource placement, resource settings (#5690)
* placeLuxuries

* map resource settings

* strategic and bonus resources

* terrain fixes

* slight optimizations

* vanilla jsons

* fix luxury terrain distribution

* also for vanilla

* fix ruleset bug

* terrainfilter
2021-12-07 07:25:16 +02:00
yairm210
4bc8c83555 Merge remote-tracking branch 'origin/master' 2021-12-06 19:20:28 +02:00
yairm210
0088ddd18b Solved bug that made civilian units uncapturable 2021-12-06 19:19:37 +02:00
Xander Lenstra
2fa3228148
Fixed a crash that occasionally happened when liberating a city to a dead civ (#5762)
* Fixed a crash that occasionally happened when liberating a city to a dead civ

* Added descriptive comment
2021-12-06 11:54:10 +02:00
Xander Lenstra
10be481524
Added an icon for the telegraph tech (#5765) 2021-12-06 11:53:29 +02:00
Xander Lenstra
40cb651433
Fixed the unique for giving sight to units no longer working (#5760) 2021-12-06 07:10:52 +02:00
Xander Lenstra
a46f638ef1
Fixed a bug where protected city states would have a red line to their protector in the diplomacy overview screen (#5761) 2021-12-06 07:10:05 +02:00
yairm210
31639aac9f Resolved #5752 - don't show 'fortify until healed' if the unit won't actually heal in this tile 2021-12-05 21:38:27 +02:00
yairm210
144d2738a4 Trying to find the cause of #5729 2021-12-05 21:33:04 +02:00
yairm210
0d4da03b7c 3.18.7 2021-12-05 21:23:04 +02:00
Yair Morgenstern
72b51d41c7
Translations update (#5758)
* Update Russian.properties (#5755)

* Update Russian.properties

* Update Russian.properties

* Update indonesian.properties (#5747)

i translate # Requires translation! in bottom but i don't change anything else

* Update Italian.properties (#5743)

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

* Update German translation (#5741)

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

Co-authored-by: deqtodo <94169613+deqtodo@users.noreply.github.com>
Co-authored-by: canneling <84187828+canneling@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>
2021-12-05 20:55:28 +02:00
Xander Lenstra
ba36956990
Replaced a != sign by a == sign (#5753) 2021-12-05 12:58:32 +02:00
Xander Lenstra
b6ce8b2aac
Fixed a bug where 'requires a [buildingName] in this city' would not work (#5754) 2021-12-05 12:55:46 +02:00
SimonCeder
936a32300b
counteroffer fixes (#5749) 2021-12-04 23:25:43 +02:00
yairm210
623420039b Resolved #5727 - on multiplayer, game info is updated as each intermediate player finishes their turn 2021-12-04 23:24:34 +02:00
yairm210
9950e963bc Resolved #5742 - removed extraneous empty lines from translation files 2021-12-04 23:13:43 +02:00
Xander Lenstra
d1224a36cf
Fixed a bug where WLTKD would continue after conquering/trading a city (#5748) 2021-12-04 18:33:19 +02:00
Xander Lenstra
c60381f712
Reïnstated translations that were previously added in #4820, but reversed when 3.16.3 was released (#5746)
According to a Malay speaker in discord, this resolves several curse words and similar being removed from the translation. As #4820 also changed some 3700 other lines and the file hasn't been touched since, this should also improve the translation in other ways.
I am, however, not a Malay speaker, so I personally cannot vouch for the correctness of these translations.
Additionally, all lines that have been added since 3.16.3 to be translated, have been removed from this file, making the change seem larger than it really is.
2021-12-04 18:02:17 +02:00
yairm210
5697a6f912 Solved crash of #5728 - AIs ignore trade requests that have become invalid mid-turn
They also no longer spam each other with requests
2021-12-03 13:57:00 +02:00
yairm210
9edc713d5c 3.18.6 2021-12-03 11:33:18 +02:00
yairm210
234b1b1741 Removed many "proxy functions" from civInfo to cityStateFunctions 2021-12-03 11:28:24 +02:00
yairm210
7169458943 More informative exceptions, to try and catch the "invalid city ID on trade" crash 2021-12-03 11:12:48 +02:00
yairm210
69db686101 Moved all fully deprecated uniques to their own region down below
Slight steps towards stat percent bonus calculation efficiency in CityStats
2021-12-03 11:01:55 +02:00
yairm210
0def261012 Added unique types, added regions for easier location 2021-12-03 10:48:39 +02:00
Yair Morgenstern
e054863bd8
Translations update (#5730)
* Update German translation (#5724)

* Update Swedish.properties (#5719)

* Update translation: Simplified Chinese (#5717)

* Update Italian.properties (#5712)

* Update Simplified_Chinese.properties (#5714)

* Update Simplified_Chinese.properties

* Update Simplified_Chinese.properties

* Update Russian.properties (#5735)

* Fixed niche bug that let you try and capture civilians in territory you can't enter

* Resolved #5713 - AI doesn't try attacking with non-attack units

* Update Russian.properties

* Update Russian.properties

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

* Update Brazilian_Portuguese.properties (#5734)

* Fixed niche bug that let you try and capture civilians in territory you can't enter

* Resolved #5713 - AI doesn't try attacking with non-attack units

* Fixed a bug where statue off Zeus would not work (#5732)

* Update Brazilian_Portuguese.properties

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

* Update pt-br (#5733)

* Fixed niche bug that let you try and capture civilians in territory you can't enter

* Resolved #5713 - AI doesn't try attacking with non-attack units

* Fixed a bug where statue off Zeus would not work (#5732)

* Update pt-br

From a brazilian developer that loves wath u doing

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

Co-authored-by: MartinP <77325495+Mape6@users.noreply.github.com>
Co-authored-by: SimonCeder <63475501+SimonCeder@users.noreply.github.com>
Co-authored-by: Zoron <fralonra@aliyun.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: wwwxxxzzz666 <2273204577@qq.com>
Co-authored-by: deqtodo <94169613+deqtodo@users.noreply.github.com>
Co-authored-by: Samuel Barbosa <79980951+SamuelBarbosa0042@users.noreply.github.com>
Co-authored-by: Xander Lenstra <71121390+xlenstra@users.noreply.github.com>
2021-12-03 10:16:30 +02:00
itanasi
7f07bcb9e5
Recycling center (#5738)
* Add support to UniqueType.MaxNumberBuilding (including rejectionReasons)
Add Recycling Center entry to JSON
Need Graphical Icon

* Fix typo
Add TODO

* adding Recycling Center icon

* Credit update for icon
Rephrase Rejection text
Updated .atlas and .png
Add code to block showing Recycling Center

* Fix using placeholderText
Set shouldShow to True so iot still appears while under construction but not completed

* Rejection Text now working
Remove debug prints

* Remove odd extra lines

* extra lines

* Remove excessive if statement in shouldBeDisplayed
Reword text. Unique can apply to Buildings and Units
Refactor Signature since not just Buildings

* Adding code to remove building in transferred city

Co-authored-by: temurakami <spellman23@gmail.com>
2021-12-03 10:15:51 +02:00
will-ca
8060b69378
Center Agriculture in Tech tree. (#5736)
* Update Techs.json

* Update Techs.json
2021-11-30 19:01:06 +02:00
Xander Lenstra
06dd395efb
Fixed a bug where statue off Zeus would not work (#5732) 2021-11-30 14:42:19 +02:00
yairm210
57f3bf2bb2 Resolved #5713 - AI doesn't try attacking with non-attack units 2021-11-29 22:45:54 +02:00
yairm210
b9d2078442 Fixed niche bug that let you try and capture civilians in territory you can't enter 2021-11-29 22:41:55 +02:00
yairm210
e43e23b9a8 Disabled buggy counteroffer mechanic to release a stable version 2021-11-29 19:47:42 +02:00
will-ca
f86b765d38
Show which cities are missing required buildings for National Wonders. (#5718) 2021-11-29 15:57:36 +02:00
yairm210
6296f6917f Autogenerated docs wraps conditionals and doesn't give examples for non-parameter-containing uniques 2021-11-28 08:30:31 +02:00
yairm210
0cef056c4d Typing for unit uniques 2021-11-28 08:28:55 +02:00
yairm210
05742e02f3 Added documentation for Mac parameters as per #5679 and future-proofing build.gradle for eventual mac releases 2021-11-27 21:05:11 +02:00
yairm210
84e600786c 3.18.5 2021-11-27 20:08:47 +02:00
Yair Morgenstern
7ca1222678
Translations update (#5711)
* Update Russian.properties (#5708)

* Update Russian.properties

* Update Russian.properties

* Update Russian.properties

* Update German translation (#5706)

Co-authored-by: deqtodo <94169613+deqtodo@users.noreply.github.com>
Co-authored-by: MartinP <77325495+Mape6@users.noreply.github.com>
2021-11-27 20:03:31 +02:00
SpacedOutChicken
79f7319a31
Stop putting Wonders as start buildings (#5710)
This will stop the adding of Wonders as starting buildings in the Future era
2021-11-27 20:01:05 +02:00
SimonCeder
10686d1d8f
We Love The King Day (#5705)
* we love the king day

* AI improvements

* Don't break old saves

* unused import

* tutorial

* proper growth when unhappy

* reviews
2021-11-27 19:59:19 +02:00
Xander Lenstra
4107ff3386
Added health conditionals (#5707)
* Added health conditionals

* Whenefied conditional
2021-11-27 19:52:54 +02:00
yairm210
ce158d0c44 Fixed terrace farms not improving with Civil Service and Fertilizer techs 2021-11-24 18:43:19 +02:00
yairm210
15cbf8359f Resolved edge case crash when conquering the capital of a civ that has a unique capital city indicator 2021-11-24 18:33:51 +02:00
yairm210
5d160508d3 Fixed bug when attempting to load a game that uses mods you don't have 2021-11-24 18:33:44 +02:00
SimonCeder
2dd4415977
Counteroffer mechanic, updated trade valuations (#5702)
* counteroffer mechanic

* string template

* string template

* AI always counteroffers if able
2021-11-23 13:00:30 +02:00
yairm210
694e862944 Small improvement 2021-11-22 22:01:17 +02:00
yairm210
1b0eaa8a71 Unique autodocs ++ 2021-11-22 21:59:35 +02:00
yairm210
92fd72d895 Better autogenerated unique docs 2021-11-22 21:10:21 +02:00
yairm210
4113b810ff Simplified civ info stats happiness breakdown 2021-11-22 20:53:08 +02:00