Commit Graph

6601 Commits

Author SHA1 Message Date
Xander Lenstra
f14ec29468
Fixed a rare diplomacy voting bug in one-more-turn mode (#5845)
* Fixed a rare bug where in one-more-turn mode after conquering all other civs, players could be asked to vote, despite having no one to vote for

* Removed code duplication
2021-12-27 09:01:04 +02:00
Xander Lenstra
f03918f610
Fixed a few combat bugs and changed the religions founded label (#5846)
* Fixed a bug where bonusses applying 'in friendly tiles' would not apply

* Reworded something so it actually makes sense

* Fixed capitalization error leading to autocracy complete bonus no longer working

* Fixed save serialization errors and finally correctly implemented the time limit for autocracy bonus

* Made value const and static
2021-12-26 07:31:07 +02:00
yairm210
c62006cf72 3.18.12 2021-12-25 23:57:42 +02:00
yairm210
6325b3c3a2 3.18.12 2021-12-25 23:28:07 +02:00
yairm210
b8b5f79ee0 3.18.12 2021-12-25 22:51:41 +02:00
will-ca
af941754cd
Show arrows on map for unit actions: Asset files. (#5825)
* Show arrows on map for unit actions.

* Don't wrap arrows unless world wrap is actually enabled.

* Fix transported air units always being treated like teleports.

* Simple reviews.

* Separate movement arrow visibility checks from WorldScreen.

* Assets for map arrows overlay.

Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
2021-12-25 22:29:19 +02:00
yairm210
b744acdc55 Exit CrashScreen normally, without exceptions 2021-12-25 22:28:43 +02:00
yairm210
d1b4fe6d1a Crash screen throws exception on a separate thread so the GCP logs record it 2021-12-25 22:24:37 +02:00
Yair Morgenstern
2898a64606
Translations update (#5850)
* Update Swedish.properties (#5841)

* Update Indonesian.properties (#5832)

* Update Italian.properties (#5831)

* Update Italian.properties

* Update Italian.properties

* Update Russian.properties (#5849)

Co-authored-by: SimonCeder <63475501+SimonCeder@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: deqtodo <94169613+deqtodo@users.noreply.github.com>
2021-12-25 22:23:33 +02:00
will-ca
e672bfb6d3
Show arrows on map for unit actions. (#5824)
* Show arrows on map for unit actions.

* Don't wrap arrows unless world wrap is actually enabled.

* Fix transported air units always being treated like teleports.

* Simple reviews.

* Separate movement arrow visibility checks from WorldScreen.

Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
2021-12-25 22:20:29 +02:00
Xander Lenstra
f3a2edf390
Converted the max turns drop down to a slider, idea courtesy of SomeTroglodyte (#5843)
* Converted the time victory drop down to a slider, idea courtesy of SomeTroglodyte

* Added a score breakdown to stat overview screen

* Removed score factors with value 0 & applied SomeTroglodyte's patch

* Removed 2000 max turns, should never be reached anyways
2021-12-25 17:57:02 +02:00
Xander Lenstra
ecadfb53fa
Typed some uniques and fixed a policy not working (#5848)
* Typed some uniques, fixing a policy not working

* Repurposed an unused function to remove .unit in some places

* Fixed compilation errors
2021-12-25 17:55:14 +02:00
Xander Lenstra
ea51c7155b
Fixed a bug where an empty improvement picker screen could open (#5815)
* Fixed a bug where an empty improvement picker screen could open

* Moved the check for constructing instead of building to the unit
2021-12-25 17:53:10 +02:00
Xander Lenstra
759366c912
Added score and time victory (#5842)
* Added a score calculation

* Added the score in multiple places of the UI

* Added time victory and a max turns

* Made time victory functional

* Added translation files
2021-12-24 14:31:36 +02:00
yairm210
730a3d8482 Merge remote-tracking branch 'origin/master' 2021-12-24 12:51:13 +02:00
yairm210
4c41536ed8 Resolved #4202 - AI cities now build workboats for use in other cities
Solves the 'landlocked but with water improvement' deadlock
2021-12-24 12:50:58 +02:00
will-ca
69450c5f4b
Added debug menu button that spawns and improves all strategic resources into your territory. (#5838)
* Added debug menu button that spawns and improves all strategic resources into your territory.

* Reviews.
2021-12-24 11:57:59 +02:00
yairm210
93268f53ee Another stab at #5729 after the toInt didn't help. 2021-12-23 21:22:40 +02:00
yairm210
eb4a76dcd0 Resolved #5823 2021-12-23 21:15:20 +02:00
will-ca
90df253783
Disable -XstartOnFirstThread when not on Mac. (#5782)
* Disable `-XstartOnFirstThread` when not on Mac.

* Update desktop Mac arguments.

* Disable JVM Mac args only for `desktop:run`.
2021-12-22 19:17:50 +02:00
yairm210
f4f673dc8a 3.18.11-patch1 2021-12-21 21:58:01 +02:00
yairm210
c70ac334bd 3.18.11 2021-12-20 21:25:17 +02:00
Yair Morgenstern
1152d8b0f7
Translations update (#5830)
* Update German translation (#5829)

* Update German translation

* Update German translation

* Update Russian.properties (#5813)

* Update Russian.properties

* Update Russian.properties

* Update Russian.properties

* Update Italian.properties (#5807)

* typo (#5805)

Co-authored-by: MartinP <77325495+Mape6@users.noreply.github.com>
Co-authored-by: deqtodo <94169613+deqtodo@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: Joni Arida <JoniArida@users.noreply.github.com>
2021-12-20 21:17:07 +02:00
will-ca
723aaf779c
Add new universal crash handlers and error reporting screen. (#5804)
* Add new crash handler and error reporting screen.

* Minor cleanup.

* Word choice.

* Rename `SafeCrashStage` to `CrashHandlingStage`.

* Reviews.

* Reference stack traces in comments for thread and postRunnable exceptions.

* Remove excessive line breaks, superfluous .apply{}.
2021-12-20 20:55:58 +02:00
Xander Lenstra
c9628c7fa7
Extended use for "in [tileFilter] tiles" conditionals (#5827)
* Changed 'in [tileFilter] tiles' to also apply outside of combat

* Changed unique docs writer to also sort applicables, so these are also not regenerated constantly
2021-12-20 13:53:03 +02:00
Xander Lenstra
b7804c0bf6
Removed double space in template.properties
This lead to failed tests for new languages, as the second space would be seen as the translated string, which obviously doesn't contain the placeholder tags.
2021-12-20 11:59:54 +01:00
Md. Touhidur Rahman
237016d3d6
Fixes warnings in desktop-file-validate (#5822)
Trying to validate this desktop entry with `desktop-file-validate` (default tool for desktop entry validation) shows the following warnings.
```bash
~$ desktop-file-validate unciv.desktop
unciv.desktop: warning: key "Encoding" in group "Desktop Entry" is deprecated
unciv.desktop: warning: boolean key "Terminal" in group "Desktop Entry" has value "0", which is deprecated: boolean values should be "false" or "true"
```
Thus deprecated lines were removed or edited.
2021-12-18 20:06:27 +02:00
Xander Lenstra
b30576d115
Added an option to unlock all techs to the debug menu (#5820) 2021-12-18 20:05:34 +02:00
Xander Lenstra
75ef6f6c8d
Changed remove heresy sound effect (#5821) 2021-12-18 20:05:11 +02:00
will-ca
1ab3041536
Refactor MiniMapHolder's little green map overlay toggle icons. (#5814)
* Refactor MiniMapHolder's little green map overlay toggle icons.

* Remove comment.

* Actually, don't hide those properties.
2021-12-18 17:56:50 +02:00
Xander Lenstra
17b382a614
Replaced illegal / questionably legal assets (#5819)
* Replaced illegal / questionably legal assets

* Resized policy icon to correct size
2021-12-18 17:53:21 +02:00
Yair Morgenstern
7aa7b8a4b2
Resolved #5790 - kudos to @xlenstra for finding the problem and providing reproduction! (#5812) 2021-12-17 08:47:07 +02:00
yairm210
12404a6ba6 3.18.10-patch1 2021-12-16 22:56:46 +02:00
yairm210
8a93511a6a Merge remote-tracking branch 'origin/master' 2021-12-16 22:54:56 +02:00
yairm210
9d38ce75c4 @Interdice even after all that there was still a bug - we didn't check if the tiles we were sending the missionary/inquisitor to was actually reachable :) 2021-12-16 22:54:46 +02:00
Xander Lenstra
58cc3b517e
Fixed an infinite loop where foreign legion upgraded to the unit it replaced (#5808)
* Fixed an infinite loop where foreign legion upgraded to the unit it replaced

* Changed the wrong variable

* Maybe it is useful to also change its unlock tech

* Whoops, should only be for non-null values
2021-12-16 17:50:10 +02:00
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