yairm210
fda3d32332
Performance improvement for getting civ-wide uniques, should help mitigate existing ANRs
2021-11-13 22:25:07 +02:00
yairm210
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
yairm210
eefe499fff
3.18.1
2021-11-12 00:35:57 +02:00
yairm210
57c033ff34
More error handling for out of memory errors
2021-11-12 00:19:52 +02:00
Yair Morgenstern
c45b6c8f7a
Translations update ( #5665 )
...
* Update Swedish.properties (#5661 )
* Update Russian.properties (#5660 )
* Update Russian.properties
* Fix translation
* Update German translation (#5659 )
* Update Indonesian.properties (#5655 )
* Update Indonesian.properties
* Update Indonesian.properties
* Update Italian.properties (#5653 )
* Update Italian.properties
* Update Italian.properties
Co-authored-by: SimonCeder <63475501+SimonCeder@users.noreply.github.com>
Co-authored-by: AlimovAR <82767510+AlimovAR@users.noreply.github.com>
Co-authored-by: MartinP <77325495+Mape6@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>
2021-11-12 00:16:08 +02:00
yairm210
8aa99c03e2
Probably solved a bug where brushes would cause non-ruleset terrains for mods without grassland
2021-11-11 23:56:29 +02:00
yairm210
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
yairm210
c92381adba
Don't display religion follower table if no one in city follows any religion
2021-11-11 21:57:00 +02:00
SimonCeder
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
yairm210
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
Xander Lenstra
cda34bf23f
Replace calls to clone with calls to cloneStats when that is clearer ( #5656 )
2021-11-09 11:59:24 +02:00
Xander Lenstra
003f2434c1
Differentiating Vanilla & G&K ( #5654 )
...
* Fixed tests checking for mod correctness
* Update G&K jsons to current vanilla versions
* First pass over buildings & beliefs
* First pass over nations
* First pass over eras.json
* Fully updated tech tree
* First pass over units
* Second pass over buildings -- fixed techs
* Fixed last prerequisites and row numbers of tech
* Went through the entire tech tree and moved things to their correct spot
* Fixed tests
2021-11-09 06:23:30 +02:00
Xander Lenstra
2854d88e11
Cleaned up some code from the split ( #5652 )
2021-11-09 06:21:24 +02:00
Xander Lenstra
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
Xander Lenstra
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
Xander Lenstra
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
Xander Lenstra
2250d75b4c
Removed a wrongly implemented BNW-only building ( #5649 )
2021-11-08 22:14:27 +02:00
yairm210
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
yairm210
b87a3b9ace
3.18.0
2021-11-08 19:52:26 +02:00
yairm210
de83383c8b
3.18.0
2021-11-08 19:52:09 +02:00
Yair Morgenstern
8ffd64a71c
Translations update ( #5648 )
...
* Update German translation (#5646 )
* Update Russian.properties (#5644 )
* Update Russian.properties
* Update Russian.properties
* Update Ukrainian.properties (#5638 )
* Update Ukrainian.properties
* Update Ukrainian.properties
* Update Ukrainian.properties
* Update Ukrainian.properties
* Update Ukrainian.properties
* Update Swedish.properties (#5635 )
* Update Indonesian.properties (#5628 )
* Update Italian.properties (#5627 )
Co-authored-by: MartinP <77325495+Mape6@users.noreply.github.com>
Co-authored-by: AlimovAR <82767510+AlimovAR@users.noreply.github.com>
Co-authored-by: Marerjh <40261003+Marerjh@users.noreply.github.com>
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>
2021-11-08 19:36:24 +02:00
SimonCeder
73d9179f09
can remove fallout on oases ( #5640 )
...
* can remove fallout on oases
* remove matchesfilter
2021-11-07 18:25:27 +02:00
yairm210
74d1d0451c
Minor linting
2021-11-05 15:07:30 +02:00
SimonCeder
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
yairm210
6e6192c369
More field deprecation
2021-11-04 22:43:15 +02:00
yairm210
bad6692207
Deprecated older fields
2021-11-04 22:40:26 +02:00
Xander Lenstra
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
SimonCeder
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
yairm210
25cad3aef2
Minor performance improvements
2021-11-03 16:12:24 +02:00
yairm210
0065d1052b
Merge remote-tracking branch 'origin/master'
2021-11-03 15:57:56 +02:00
yairm210
198958772c
Fixed error where typed unique map would try and register untyped uniques
2021-11-03 15:57:35 +02:00
SimonCeder
78afff9f36
fix bug when city states bullied ( #5634 )
2021-11-03 15:49:02 +02:00
yairm210
ff389e0238
City stats performance boost - converted list iterations to nice map retrievals :)
2021-11-03 14:29:01 +02:00
SimonCeder
0a0881d5bd
Quest fixes ( #5629 )
...
* quest fixes
* strings
* better placeholder for competitions
2021-11-03 13:59:13 +02:00
yairm210
cafbf0d155
Units can promote only if they have movement left and have not attacked
2021-11-03 10:23:59 +02:00
yairm210
05b741b3e5
Can upgrade unit if any movement is left, as per Civ V
2021-11-03 10:10:43 +02:00
will-ca
ad545e47da
Fix Spacebar key binding in LWJGL3; Switch to integer/named key. ( #5633 )
2021-11-03 08:48:45 +02:00
Yair Morgenstern
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
SimonCeder
118f11abb1
Encampments revealed by ruins effects have lastSeenImprovement updated ( #5631 )
2021-11-03 00:14:32 +02:00
yairm210
8f216b3662
3.17.14
2021-11-02 18:17:20 +02:00
yairm210
f568d98694
Removed deprecated components
2021-11-02 18:15:49 +02:00
Yair Morgenstern
1ca17fb3a7
Translations update ( #5626 )
...
* Update translation: Simplified Chinese (#5624 )
* Update Swedish.properties (#5622 )
* Update Ukrainian.properties (#5621 )
* Update Ukrainian.properties
* Update Ukrainian.properties
* Update German translation (#5620 )
* Update German translation
* Update German translation
* Update Italian.properties (#5611 )
* Update Italian.properties
* Update Italian.properties
Co-authored-by: Zoron <fralonra@aliyun.com>
Co-authored-by: SimonCeder <63475501+SimonCeder@users.noreply.github.com>
Co-authored-by: Marerjh <40261003+Marerjh@users.noreply.github.com>
Co-authored-by: MartinP <77325495+Mape6@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
2021-11-02 17:52:07 +02:00
logic
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
SimonCeder
15a2a51a99
Unique flags ( #5625 )
...
* Add flags to UniqueTypes, implement HideInCivilopedia
* hasFlag function
2021-11-02 17:23:40 +02:00
will-ca
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
Yair Morgenstern
71ea8dadf7
Hopefully fixed tests
2021-11-01 10:12:58 +02:00
yairm210
405c561d5e
Replaced "Map Height" with "Map Elevation"
2021-10-31 23:15:42 +02:00
yairm210
5ab802b776
Last untyped unique that could affect getTileStats performance
2021-10-31 23:00:02 +02:00
yairm210
4f897d9cc1
Fully deprecated older uniques
2021-10-31 22:54:23 +02:00
yairm210
d2add82ac3
Solved ANRs caused by slow "quickstarts"
2021-10-31 22:38:48 +02:00
