Commit Graph

4063 Commits

Author SHA1 Message Date
b23ba40cd0 More Unique types, with some deprecations 2021-11-21 21:08:15 +02:00
59c5d2b10c Unique types for building filters 2021-11-21 21:02:45 +02:00
4b5a709ee0 Resolved #4595 - policy screen keeps scroll position when adding new policy 2021-11-20 23:31:37 +02:00
1a7f562bc0 Resolved #5265 - cannot add 2 of the same buildings to the queue visually 2021-11-20 23:27:31 +02:00
73f275f4cd Resolved #5642 - viewable tiles update after capturing city 2021-11-20 21:10:41 +02:00
fa5ac83f88 Resolved #5662 - AI won't declare war at the very beginning of games for little reason 2021-11-20 21:00:40 +02:00
d477029232 Cleanup renaming "CameraStageBaseScreen" in KDocs. (#5695) 2021-11-20 19:56:53 +02:00
ea0738f6e5 Recreate map editor screen when changing ruleset to update all the editing tools 2021-11-19 15:20:28 +02:00
ea29458038 Resolved #5668 - Changing base ruleset in map editor removes all terrain references that are no longer viable, including starting locations for nations not in new ruleset 2021-11-19 15:09:01 +02:00
bdeccb87e8 Resolved #5692 - exiting Civilopedia always brings you o the previous screen 2021-11-19 14:15:48 +02:00
ff3cd7511c Somehow not all got added? 2021-11-19 12:27:48 +02:00
200a62670c Rename: Changed CameraStageBaseScreen to BaseScreen 2021-11-19 12:26:57 +02:00
8ddbe3b2b7 3.18.3 2021-11-19 12:13:23 +02:00
422bb58814 Caught out of memory errors on autosave 2021-11-15 21:36:06 +02:00
8f89826d03 Removed code that was unreachable after the removal of an exception in BackwardCompatability.kt for 3.18.2 (#5680) 2021-11-15 15:35:32 +02:00
5a458e93cb Fixed a crash when changing the base ruleset while in portrait mode (#5671)
* Fixed a crash when changing the base ruleset while in portrait mode

* Whoops
2021-11-14 14:14:16 +02:00
f3115d9f03 Pre-solved potential bugs, unique typing for deprecated uniques 2021-11-14 00:16:01 +02:00
297c3d8ba6 Probably resolved #5555 - made tileset config overrides deterministic 2021-11-13 23:32:02 +02:00
c41fb3591a Caught "null values from musicHistory.peekLast" bug 2021-11-13 22:38:58 +02:00
5910e52407 Catching out of memory errors when updating tiles with a catch-all popup 2021-11-13 22:33:55 +02:00
fda3d32332 Performance improvement for getting civ-wide uniques, should help mitigate existing ANRs 2021-11-13 22:25:07 +02:00
4b43ff5b5e Resolved crashes in game options table when changing base ruleset before the mod list was defined 2021-11-13 22:18:11 +02:00
57c033ff34 More error handling for out of memory errors 2021-11-12 00:19:52 +02:00
8aa99c03e2 Probably solved a bug where brushes would cause non-ruleset terrains for mods without grassland 2021-11-11 23:56:29 +02:00
4ce8704969 Solved bug where AI units could expend all movement trying to attack enemy units when moving through fog, and would still try and attack 2021-11-11 23:34:43 +02:00
c92381adba Don't display religion follower table if no one in city follows any religion 2021-11-11 21:57:00 +02:00
e4f686964e Regions part 2 - City state placements, start normalization (#5663)
* start position normalization

* assignLuxuries

* City states placement

* city state normalization

* don't consider tiny islands

* also modify the other json since they are duplicated now
2021-11-11 12:11:48 +02:00
bc5ea2d90a Resolved #5641 - unit upgrade check ONLY removes/adds unit if absolutely necessary
This previously was done every time the function was called, leading to updating the civ resources twice per unit check, which is kind of heavy
2021-11-09 23:38:30 +02:00
cda34bf23f Replace calls to clone with calls to cloneStats when that is clearer (#5656) 2021-11-09 11:59:24 +02:00
2854d88e11 Cleaned up some code from the split (#5652) 2021-11-09 06:21:24 +02:00
5cf5e13ffb Fixed a bug where maps created before the split PR could no longer be opened after (#5651) 2021-11-09 06:20:27 +02:00
ac2bc3a404 Second version of G&K / vanilla split (#5647)
* Copied files for Gods & Kings folder

* Added G&K and unified with mods in dropdown

* Split the baseruleset from the mods list in game parameters

* Mod links are checked again when selecting a mod

* The new map editor screen now also uses the base ruleset

* Updated the ruleset change dialog in the map editor; Fixed a crash

* Refactored some code and fixed some bugs
2021-11-08 22:57:09 +02:00
fb1b494470 It's probably a good idea to actually convert Hanse's to Banks rather than remove them entirely, actually (#5650)
* It's probably a good idea to actually convert Hanse's to Banks rather than remove them entirely, actually

* Remove checks for the unique as well

* Might as well use the intended function for it too
2021-11-08 22:50:43 +02:00
367e0b940d Solved bug where land units that upgrade to water units would attempt to upgrade where the upgraded unit could not be placed.
This was such a cool idea that I decided to let it live :)
2021-11-08 21:35:11 +02:00
de83383c8b 3.18.0 2021-11-08 19:52:09 +02:00
73d9179f09 can remove fallout on oases (#5640)
* can remove fallout on oases

* remove matchesfilter
2021-11-07 18:25:27 +02:00
74d1d0451c Minor linting 2021-11-05 15:07:30 +02:00
09c40002f0 Regions part 1 - subdivide generated maps into regions, and use to place civs (#5556)
* json definitions

* create regions, define region types

* count terrains

* terrain qualities

* tilesInRectangle

* use even q coords

* major civ start locations

* move to separate file

* remove printlns

* unused imports

* strings

* strings

* reviews

* conditionalize qualities

* guess qualities of terrain types without explicit definitions

* guess qualities of terrain types without explicit definitions

* Update template.properties

* Update template.properties

* add HideInCivilopedia to technical uniques

* reviews
2021-11-05 07:59:48 +02:00
6e6192c369 More field deprecation 2021-11-04 22:43:15 +02:00
bad6692207 Deprecated older fields 2021-11-04 22:40:26 +02:00
eb24a8d364 Possibly fixed a bug where replacement buildings would not be granted (#5636)
* Possibly fixed a bug where replacement buildings would not be granted

* Fixed tests
2021-11-04 18:37:31 +02:00
010931ca42 Bombard notification (#5637)
* add notification when able to bombard

* harmonize with enemy unit notification

* use city.range
2021-11-04 18:36:50 +02:00
25cad3aef2 Minor performance improvements 2021-11-03 16:12:24 +02:00
0065d1052b Merge remote-tracking branch 'origin/master' 2021-11-03 15:57:56 +02:00
198958772c Fixed error where typed unique map would try and register untyped uniques 2021-11-03 15:57:35 +02:00
78afff9f36 fix bug when city states bullied (#5634) 2021-11-03 15:49:02 +02:00
ff389e0238 City stats performance boost - converted list iterations to nice map retrievals :) 2021-11-03 14:29:01 +02:00
0a0881d5bd Quest fixes (#5629)
* quest fixes

* strings

* better placeholder for competitions
2021-11-03 13:59:13 +02:00
cafbf0d155 Units can promote only if they have movement left and have not attacked 2021-11-03 10:23:59 +02:00
05b741b3e5 Can upgrade unit if any movement is left, as per Civ V 2021-11-03 10:10:43 +02:00