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
yairm210
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
yairm210
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
Yair Morgenstern
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
Xander Lenstra
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
Xander Lenstra
045b52c935
Fixed a bug where hagia sophia could be build in non-faith games ( #5617 )
2021-10-31 14:00:24 +02:00
yairm210
2c9e702639
Merge remote-tracking branch 'origin/master'
2021-10-31 10:32:59 +02:00
yairm210
1af01dc693
Fixed music download error
2021-10-31 10:32:50 +02:00
Yair Morgenstern
715a810b9c
Update buildAndDeploy.yml
...
Release tag belongs to release section
2021-10-30 22:25:10 +03:00
yairm210
c8f2d337c3
3.17.13
2021-10-30 20:41:59 +03:00
Yair Morgenstern
e53d611f4a
Translations update ( #5610 )
...
* Update translation: Simplified Chinese (#5606 )
* The currently missing german lines (#5596 )
* Update Indonesian.properties (#5595 )
* Update Italian.properties (#5575 )
* Update Swedish.properties (#5574 )
Co-authored-by: Zoron <zoronlivingston@gmail.com>
Co-authored-by: SomeTroglodyte <63000004+SomeTroglodyte@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>
Co-authored-by: SimonCeder <63475501+SimonCeder@users.noreply.github.com>
2021-10-30 20:33:21 +03:00
will-ca
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
Yair Morgenstern
860e788fb5
Separate unit automation ( #5592 )
...
* Should resolve #5534 and the long-standing request of "move after automate" by separating the automated movement from the actual end of turn
* Added translation
* Automated units move in a separate thread to avoid UI freezing
2021-10-30 19:02:43 +03:00
asda488
72ffeaddce
Remove Discord RPC checks for unsuitable devices ( #5594 )
...
* Allow Discord RPC disabiling on ARM devices
* Remove Discord RPC check
2021-10-30 19:02:24 +03:00
SimonCeder
bfe0b68ab8
Barbarian units ( #5589 )
...
* barbarian unique units; barbarian blacklisted units
* credits
* barbarian units do not take resources
* ai fix
2021-10-29 13:33:11 +03:00
SomeTroglodyte
6172a893b8
Fix PercentProductionBuildings and PercentProductionWonders ( #5588 )
2021-10-29 11:29:03 +03:00
SimonCeder
03cebbdd42
Fix for broken saves in #5573 ( #5587 )
...
* no new camps in 4 tiles for 15 turns after cleared
* can't spawn land units on water or vice versa, unit choice
* UniqueType.MustSetUp
* sometroglodyte's fixes
2021-10-28 22:31:20 +03:00
Xander Lenstra
4c053ddc99
Revert "Splitting of vanilla and gods & kings rulesets -- Part 1: Groundwork ( #5577 )" ( #5585 )
...
This reverts commit db6e58847999605f8d7629c06afaa2e90033c00c.
2021-10-28 22:01:06 +03:00
