yairm210
a7b880c033
3.18.10
2021-12-15 23:12:28 +02:00
Yair Morgenstern
7830eda9a1
Translations update ( #5800 )
...
* Update German translation (#5797 )
* Update Russian.properties (#5788 )
* Update Russian.properties
* Fix translation
* Update indonesian.properties (#5787 )
* Update French.properties (#5786 )
* Update Swedish.properties (#5783 )
Co-authored-by: MartinP <77325495+Mape6@users.noreply.github.com>
Co-authored-by: deqtodo <94169613+deqtodo@users.noreply.github.com>
Co-authored-by: canneling <84187828+canneling@users.noreply.github.com>
Co-authored-by: RONDEAU Felix <79422543+xil-f-dev@users.noreply.github.com>
Co-authored-by: SimonCeder <63475501+SimonCeder@users.noreply.github.com>
2021-12-15 23:02:53 +02:00
Giuseppe D'Addio
408bea9fe8
Update Nations.json ( #5778 )
...
Took out two unecessary spaces
2021-12-15 23:01:09 +02:00
itanasi
4fe7315478
Sort Maintenace Using Fixed Point ( #5764 )
...
* Add new UniqueType.NoMaintenance to support Guided Missile
* revert gradle
Add UnitMaintenanceDiscount
Rename UnitMaintenanceDiscount->UnitMaintenanceDiscountGlobal
Rework maintenance equation to account for overlapping reductions
Add maintenance variable to MapUnit
* Add square brackets in string (apparently didn't check in?)
More robust uniques check code so not assuming only one matching unique
Use toPercent()
* Proper toPercent() math
* Use fixed point Long to help in sorting to avoid float bug?
* Use fixed point Long to help in sorting to avoid float bug?
Co-authored-by: temurakami <spellman23@gmail.com>
2021-12-15 22:59:10 +02:00
Xander Lenstra
b1390cd6db
Moved Coal discovery back to industrialization ( #5799 )
2021-12-15 14:30:12 +02:00
yairm210
c655d69c78
Order unique docs by target type so we don't get reorderings all the time
2021-12-14 19:02:58 +02:00
GGGuenni
28d3c12142
Improvements to TurnChecker data usage ( #5789 )
...
* Added necessary utils
Added the FileNotFoundException which is also part of #5593
* Added preview download to MultiplayerScreen
* Added preview download to TurnChecker
* Fixed uncomplete commit
* Removed debug print in MultiplayerScreen
2021-12-13 21:14:30 +02:00
will-ca
270c26c850
Raise minSdk to 21. ( #5792 )
2021-12-13 20:12:53 +02:00
Interdice
3f6fe234b3
AI for Inquisitor and Missionary ( #5590 )
...
* First pull request to add missionaries and inquisitors
* First pull request to add missionaries and inquisitors
* First pull request to add missionaries and inquisitors
* First pull request to add missionaries and inquisitors
* Ai choice
* some fixes
* some fixes
* adding a system for the ai to buy with faith
* adding a system for the ai to buy with faith
* adding a system for the ai to buy with faith
* adding a system for the ai to buy with faith
* adding a system for the ai to buy with faith
* adding a system for the ai to buy with faith
* adding a system for the ai to buy with faith
* adding a system for the ai to buy with faith
* adding a system for the ai to buy with faith
* adding a system for the ai to buy with faith
* adding a system for the ai to buy with faith
* finally done
* finally done
* some fixes
* some fixes
* some fixes
* some fixes
* some fixes
* some fixes
* some fixes
2021-12-12 12:27:09 +02:00
yairm210
0c1509bfe8
Resolved problem in new uniques with multiple parameters of the same name
...
Relevant to #5783 and #5781
2021-12-11 20:23:31 +02:00
yairm210
2889d1c24f
Merge remote-tracking branch 'origin/master'
2021-12-11 19:49:13 +02:00
yairm210
72d16dbcd4
3.18.9-patch1
2021-12-11 19:48:34 +02:00
SimonCeder
1c01cd27da
Add a couple missing template strings ( #5784 )
...
* missing templates
* Update template.properties
2021-12-11 19:30:35 +02:00
yairm210
48bc79c256
Oh my bad, that's why the Discord messages aren't appearing :)
2021-12-10 15:48:53 +02:00
yairm210
e9da000485
3.18.9
2021-12-10 15:37:17 +02:00
yairm210
b537f9e386
Resolved #5779 - uniques and conditionals for translating are taken directly from the uniquetypes
2021-12-10 15:34:17 +02:00
yairm210
23bad8d961
Resolved #4921 - can gift improvements to city states also on water tiles and when other improvements have been built on top of the resource
2021-12-09 21:58:57 +02:00
yairm210
3872a46519
Resolved #5691 - enabled code minify, if we see that this ruins stuff we can always turn it back off again with an appropriate comment
2021-12-09 20:47:33 +02:00
yairm210
ed3a4accdd
Resolved #5775 - don't try and set resource amounts for "image" tiles, like in map editor or civilopedia
2021-12-09 20:43:19 +02:00
yairm210
f3378f4ced
3.18.8-patch1
...
Resolved #5774 - removed demanded resource from city when resource is not in ruleset
2021-12-09 20:37:37 +02:00
yairm210
3dfb0aec70
3.18.8
2021-12-07 22:12:05 +02:00
yairm210
31e0f36ff3
Merge remote-tracking branch 'origin/master'
2021-12-07 22:03:08 +02:00
yairm210
7896e70a87
3.18.7-patch1
2021-12-07 21:52:28 +02:00
yairm210
e205190e1d
Merge branch 'temp'
...
# Conflicts:
# buildSrc/src/main/kotlin/BuildConfig.kt
2021-12-07 21:50:21 +02:00
yairm210
41c328286b
3.18.7-patch1
2021-12-07 21:49:36 +02:00
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
yairm210
1782f27e9b
3.18.7-patch1
2021-12-07 21:43:17 +02:00
yairm210
e3d86db66d
3.18.7-patch1
2021-12-07 21:39:48 +02:00
Xander Lenstra
099b180a07
Band-aided a bug where players in multiplayer games were waiting for themselves. ( #5768 )
...
(cherry picked from commit 22b3997c28
2021-12-07 21:39:01 +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
