Commit Graph

4164 Commits

Author SHA1 Message Date
7f38118dd9 Expanded the buildingFilter to include options for national wonders (#5900)
* Expanded the buildingFilter to include options national wonders

* Also instruct the translation file writer on the changes

* Typo

* Non-national -> World
2022-01-07 13:41:53 +02:00
c1a6e05da6 Disables '[cityState] is afraid of your military power' for spectators & other non-major civs (#5918)
* Disables '[cityState] is afraid of your military power' for spectators

* Do the same for a few other similar notifications

* And more, for patronage complete policy
2022-01-06 14:19:29 -08:00
45ee382fba Resolved #5801 - detailed sources of battle modifiers (#5916) 2022-01-06 13:46:45 -08:00
d6a99a7848 Fixed a bug where great improvements could not be repaired after being pillaged (#5913)
* Fixed a bug where great improvements could not be repaired

* Formatting
2022-01-06 13:29:59 -08:00
a5bba8dfb0 Refactor pixel unit image resolving. (Includes ImageAttempter) (#5897)
* Add ImageAttempter for finding available from candidate images.

* Remove zero-arg ImageAttempter constructor.

* Refactor pixel unit image resolving.
2022-01-04 21:02:32 +01:00
96beed4b3e Add tileScale in TileSetConfig. (#5874)
* Add `tileScale` in `TileSetConfig`.

* Right, KDoc.
2022-01-04 10:18:13 -08:00
0e64ff5592 Performance improvements - inspired by ANR errors for this callstack (#5896) 2022-01-03 16:51:21 +00:00
89d4c046d4 Added more yield icons to the city stats table (#5894)
* Added more yield icons to the city stats table

* Replaced icons with Font.icon
2022-01-02 17:50:27 +00:00
cdbdda366b Revamped nukes again to closer match the original (#5892) 2022-01-02 04:04:43 -08:00
f06242ebe1 Allowed follower beliefs to have more uniques, merged a unique and globalized some uniques (#5882) 2021-12-31 13:47:52 +02:00
687ecb83f1 Merged some uniques and added a new one for not allowing to build units (#5731)
* Print stacktraces in more cases when crashing, useful for debugging

* Conditionalized no oceans before astronomy unique

* Cannot be built on tile before tech conditionalized

* Added "Cannot build unitFilter units" unique

* Fixed tests failing

* Merge branch master into some-uniques

* Fixed typo

* Apparently I made the same mistake twice

* Globalized unique
2021-12-31 12:13:09 +02:00
ee65adb5e4 Fixed a bug where all global unit discounts would always apply, despite only being for certain units (#5879) 2021-12-31 11:07:59 +02:00
dcbb0df4f9 Typefied spaceship part unique (#5878)
* Typefied spaceship part unique

* Removed unused imports

* Ah right, spaceship parts are still buildings
2021-12-30 18:33:01 +02:00
1a8a86cb2c Unify and improve moddability of more tile-based images. (#5873) 2021-12-29 18:21:34 +02:00
6b2778fd0a Merge remote-tracking branch 'origin/master' 2021-12-29 00:14:36 +02:00
7a00ebe2ec Can no longer promote units with 0 movement by sneaking into the promotion screen from elsewhere 2021-12-29 00:13:09 +02:00
0056eba408 Move BorderImages to tileset. Set origin in setHexagonImageSize(). (#5868) 2021-12-29 00:05:56 +02:00
af22ede437 Better map-to-ruleset incompatibility checks 2021-12-28 23:42:06 +02:00
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
9266ddc5d0 Fixed rare bug where captured civilian disappears before you can return it 2021-12-28 23:16:54 +02:00
bd70500685 Fixed bug in inquisitor automation 2021-12-28 23:10:44 +02:00
f90b22ad60 Resolved #5188 - stat names also include the stat icon :) 2021-12-28 23:03:17 +02:00
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
f3b4c2fa6f AI peace evaluation no longer hardocded - resolves first point of #5490 2021-12-28 22:43:23 +02:00
66fa8db51c Resolved #5469 - 'tile to expand to' choice incorporates city-specific bonuses 2021-12-28 22:36:30 +02:00
e3fb00d939 Resolved #5867 - fixed rare 'uninitialized continent sizes' bug 2021-12-28 21:28:31 +02:00
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
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
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
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
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
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
b744acdc55 Exit CrashScreen normally, without exceptions 2021-12-25 22:28:43 +02:00
d1b4fe6d1a Crash screen throws exception on a separate thread so the GCP logs record it 2021-12-25 22:24:37 +02:00
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
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
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
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
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
730a3d8482 Merge remote-tracking branch 'origin/master' 2021-12-24 12:51:13 +02:00
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
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
93268f53ee Another stab at #5729 after the toInt didn't help. 2021-12-23 21:22:40 +02:00
eb4a76dcd0 Resolved #5823 2021-12-23 21:15:20 +02:00
f4f673dc8a 3.18.11-patch1 2021-12-21 21:58:01 +02:00
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
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
b30576d115 Added an option to unlock all techs to the debug menu (#5820) 2021-12-18 20:05:34 +02:00
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
7aa7b8a4b2 Resolved #5790 - kudos to @xlenstra for finding the problem and providing reproduction! (#5812) 2021-12-17 08:47:07 +02:00