Commit Graph

4094 Commits

Author SHA1 Message Date
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
ad545e47da Fix Spacebar key binding in LWJGL3; Switch to integer/named key. (#5633) 2021-11-03 08:48:45 +02:00
a1e0b686b1 Upgrading to LWJGL 3, which is now the default, as of LibGDX 1.10.1 (#5614)
* Upgrading to LWJGL 3, which is now the default, as of LibGDX 1.10.1
MacOS running problem solved by adding JVM args to desktop build.gradle
Should resolve #5601

* Apparently, keyTyped is ONLY for character keys. Esc and f12 are non-character keys, so we need to change from keyTyped to keyDown.
How does this affect out ctrl combinations? Dunno yet :) I couldn't find any actual uses in code, but it shouldn't be worse than keyTyped
This commit can be cherry-picked into the master branch as a preparation for the move to lwjgl3
2021-11-03 00:15:47 +02:00
118f11abb1 Encampments revealed by ruins effects have lastSeenImprovement updated (#5631) 2021-11-03 00:14:32 +02:00
8f216b3662 3.17.14 2021-11-02 18:17:20 +02:00
f568d98694 Removed deprecated components 2021-11-02 18:15:49 +02:00
f53435e612 Made rich presence text not change with language (#5613)
* update for no reason

* bruuhhhhhhhhh

* bruuhhhhhhhhh

* rebase... this probably wont work

* bruuhhhhhhhhh

* fix comments..?

* bruuhhhhhhhhh

* equalize with upstream/master

* made the game not change the text shown in rich presence with the current language, added a language override functionality to String.tr() which is probably inefficient as hell, also the reason why i had to keep the .tr in leader name is because it showed the parantheses

* i have no idea why github or git keeps bugging me on this but this line randomly appears then disappears

* i have no idea why github or git keeps bugging me on this but this line randomly appears then disappears

* revert changes to .tr(), use what @yairm210 suggested
2021-11-02 17:24:37 +02:00
15a2a51a99 Unique flags (#5625)
* Add flags to UniqueTypes, implement HideInCivilopedia

* hasFlag function
2021-11-02 17:23:40 +02:00
d15e01d5e8 Show notification to cycle through visible resources when clicking on resource icon in Resource Overview. (#5603)
* Show notif to cycle through resource tiles when tapping on icon in Resource Overview.

* Make resource reveal notification more configurable, and move completely to `GameInfo`.

* Make resource reveal notification loop through all explored tiles, instead of just visible tiles.

* Have resource discovery notif cycle through matching CS centers for CS-only Luxuries.

* Remove commented lines.

* Remove extra comma.

* Use Sequence in resource notif.
2021-11-01 18:39:01 +02:00
71ea8dadf7 Hopefully fixed tests 2021-11-01 10:12:58 +02:00
405c561d5e Replaced "Map Height" with "Map Elevation" 2021-10-31 23:15:42 +02:00
5ab802b776 Last untyped unique that could affect getTileStats performance 2021-10-31 23:00:02 +02:00
4f897d9cc1 Fully deprecated older uniques 2021-10-31 22:54:23 +02:00
d2add82ac3 Solved ANRs caused by slow "quickstarts" 2021-10-31 22:38:48 +02:00
b7f9472308 If we're already at it, same thing for anti-local effects, this should help performance in the tileInfo.getStats() function 2021-10-31 22:24:27 +02:00
bf568a44eb Big performance improvement - don't need to string-compare every param of every unique of every building each time we're looking for global uniques 2021-10-31 22:19:56 +02:00
52933ca58b Added new type-based uniqueMap, which will be the base of the "cached uniques revolution", and added a relatively benign use in unit uniques (#5619) 2021-10-31 21:56:41 +02:00
53a0c9b248 Reworked buying buildings & units with stats a bit (#5618)
* Reworked buying buildings & units with stats a bit

* Reviews
2021-10-31 17:59:13 +02:00
1af01dc693 Fixed music download error 2021-10-31 10:32:50 +02:00
79ec9a461a Show construction icons in Cities Overview. (#5602)
* Show construction icons in Cities Overview.

* Don't try to draw images for empty Cities Overview constructions.
2021-10-30 20:25:55 +03:00