Commit Graph

4146 Commits

Author SHA1 Message Date
yairm210
2ea97edb92 Can now load maps with extra lines at the end, as found in some mods in the wild 2021-12-28 23:33:52 +02:00
yairm210
9266ddc5d0 Fixed rare bug where captured civilian disappears before you can return it 2021-12-28 23:16:54 +02:00
yairm210
bd70500685 Fixed bug in inquisitor automation 2021-12-28 23:10:44 +02:00
yairm210
f90b22ad60 Resolved #5188 - stat names also include the stat icon :) 2021-12-28 23:03:17 +02:00
yairm210
d418e572f8 Resolved #4354 - can no longer 'cheat' the unit overlay by e.g. automating a unit and then try and swap it with another unit 2021-12-28 22:49:46 +02:00
yairm210
f3b4c2fa6f AI peace evaluation no longer hardocded - resolves first point of #5490 2021-12-28 22:43:23 +02:00
yairm210
66fa8db51c Resolved #5469 - 'tile to expand to' choice incorporates city-specific bonuses 2021-12-28 22:36:30 +02:00
yairm210
e3fb00d939 Resolved #5867 - fixed rare 'uninitialized continent sizes' bug 2021-12-28 21:28:31 +02:00
will-ca
f6d186445c
Try to fix #5729 as concurrency issue. (#5862)
* Try to fix #5729 as concurrency issue.

* Oh, remove comment about crash, I guess.
2021-12-28 09:15:34 +02:00
will-ca
005c465ee4
Use tileset fallbacks for missing images. (#5852)
* Use tileset fallbacks for missing images.

* Disable tileset fallback for FantasyHex.

* Tweak docs, remove debug signature.
2021-12-27 21:05:33 +02:00
will-ca
a1dfa53664
Save attacks per civ for arrows for cities, missiles, dead units. (#5855)
* Save attacks per civ for arrows for cities, missiles, dead units.

* Tweak docs.
2021-12-27 20:57:30 +02:00
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
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
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
yairm210
f4f673dc8a 3.18.11-patch1 2021-12-21 21:58:01 +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
b30576d115
Added an option to unlock all techs to the debug menu (#5820) 2021-12-18 20:05:34 +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
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
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
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
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
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
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
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
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
40cb651433
Fixed the unique for giving sight to units no longer working (#5760) 2021-12-06 07:10:52 +02:00