Commit Graph

2930 Commits

Author SHA1 Message Date
30c12662d2 Unified science addition logic 2020-12-16 14:08:17 +02:00
925e092629 Solved ANR when loading large games from the load screen 2020-12-16 12:27:01 +02:00
f27f036e28 Resolved #3378 - AI no longer tries to heal units in dangerous tiles - by nob0dy73 2020-12-14 11:39:05 +02:00
24b46e8c2c AI knows not to try and heal units which would heal anyway 2020-12-14 11:31:13 +02:00
fad967b31a Resolved #3382 - Added tryTakeBackCapturedCity by nob0dy73 2020-12-14 11:12:05 +02:00
835ed003be Resolved #3380 - added tryHeadTowardsSiegedCity to unit automation, by nob0dy73 2020-12-14 11:07:11 +02:00
fd372d8c77 Forced disband from lack of gold now provides disband gold 2020-12-13 22:49:39 +02:00
d1387a04c3 Implemented missing Korean UA (#3416)
* try to implement korean ability

* Corrected typo error

Coreect camel typo errror

* updated new korean feautre translation.

* edited korean unique text to get right sentence.

* merge duplicated code into addScience(Int)
2020-12-13 12:28:05 +02:00
b264876b6b Deprecation of old unique formats in favor of newer, more generalized ones 2020-12-13 12:21:38 +02:00
7ec176ac45 Minor fixes for the tile yields 2020-12-13 09:52:15 +02:00
0e5b2f0db0 Display tile yields (#3322)
* Show tile yields functionality (WIP)

* Toggle yields (WIP)

* Show Yields (WIP)

* Show tile yields WIP

* showTileYields (WIP)

* tidying code

* Display tile yields (WIP)

* Show tile yields (WIP)

* Update CityTileGroup.kt
2020-12-13 09:31:37 +02:00
963fee3552 Added much-needed "+[]% Production when constructing [] units" unique 2020-12-13 09:27:31 +02:00
11fb6b4b67 Merge branch 'master' of https://github.com/yairm210/Unciv 2020-12-13 09:20:40 +02:00
7731211b09 All relevant unit filtering moved to baseUnit, so we can filter on constructions as well 2020-12-13 09:19:45 +02:00
86b4548d11 kept the old one for now (#3414) 2020-12-12 20:11:15 +02:00
ee5aa38129 GG bonus generation now checks for civinfo uniques (#3412)
* great general bonus isn't applied to national uniques

check added to allow this

* added uniques together :)

* added vals in line with similar checks - more efficient(?)
2020-12-12 20:10:39 +02:00
fe38249dc1 City-state resources from all sources shared with ally civ (#3411)
* merged functions for getCityResources and getResourcesFromAlly

* "city-states" origin moved to civinfotransientupdater
2020-12-12 20:09:39 +02:00
bbcf5ffed7 Added "All" filter for units 2020-12-11 14:28:29 +02:00
d0774db030 Resolved #3408 - Unit maintenance cost reduction generalized, now works for Ottomans 2020-12-11 14:24:09 +02:00
3ab57f1ada Resolved #3409 - American unique grants extra sight only to military land units 2020-12-11 14:11:35 +02:00
1f59a4ea48 Fixed crash when nuking Barbarian units 2020-12-11 14:09:19 +02:00
ab548dda54 Fixed ANR caused by too many saved games 2020-12-10 10:42:02 +02:00
4578994adf Reassign population after selling a specialist-providing building 2020-12-10 10:10:14 +02:00
d3ba68f7d3 resources can be added by tile improvement with unique "Provides [] []" (#3406)
* resources can be added by tile improvement with unique "Provides [] []"

* to minimise indentation

* to minimise indentation

* changed null check

* flip if
2020-12-09 23:02:46 +02:00
fb743ade31 Added nation icons to the leader names in the diplomacy screen 2020-12-09 23:01:43 +02:00
c1a717e4f8 Resolved #3289 - can place unbuildable improvements that can exist on tiles 2020-12-09 22:46:15 +02:00
e80dc879bb wonder text will not be displayed & "[] enabled:" will not show if nothing visible in list (#3399) 2020-12-07 22:26:34 +02:00
3e6955d0d9 Selected unit stays selected when single-tap moved into a tile with another unit 2020-12-07 20:08:58 +02:00
2c35cc98de Specialists can add happiness (#3398) 2020-12-07 08:46:39 +02:00
cc5f4fc316 Should not be displayed without [] (#3396)
* cleaned up again :)

* add val "filter"
2020-12-06 22:19:49 +02:00
8a5247324c 3.11.18 2020-12-06 22:16:03 +02:00
b50c129e2d "+[] Movement for all [] units" now respects all unit categories 2020-12-06 21:50:46 +02:00
378e1ddc66 Fixed broken build, also - test for the new Travis! 2020-12-06 21:23:49 +02:00
48d0758abf Improvements can't be built in neutral areas, as per Civ V 2020-12-06 20:39:53 +02:00
22b3f563f3 Crash reports contain the game version for easy filtering
Added helper function cityInfo.isWorked(tile)
2020-12-05 22:54:16 +02:00
6a73909c67 Helicopter Gunship (#3385)
* -Helicopter Gunship Implemented
-Anti-Tank Gun upgrades to it

* unit atlas

* "All tiles cost 1 movement"
2020-12-04 14:20:24 +02:00
5cf3e7764a CORRECT handling for mods that changed their buildings or units 2020-12-04 14:12:47 +02:00
81a38be5f4 Added button to add construction items directly to the queue 2020-12-04 11:27:28 +02:00
93a26f635c Workers stop building (most) duplicate roads connecting cities. (#3391) 2020-12-04 10:16:19 +02:00
4a0c69741e Merge branch 'temp' 2020-12-04 00:11:48 +02:00
4bb6426b79 3.11.17-patch1 2020-12-04 00:11:29 +02:00
a9d36c073a Mods can handle removing existing buildings 2020-12-03 23:58:48 +02:00
c12afb4131 "have signed the peace treaty" -> "have signed a peace treaty" 2020-12-03 23:29:36 +02:00
af113db8d7 Don't allow AI to offer peace to cty states allied with their enemies 2020-12-03 22:17:52 +02:00
2a3a0b107f Fixed rare errors 2020-12-02 23:17:20 +02:00
1f5fa74cea adds val to modoptions and check to battle.kt to adjust max xp from barbarians (#3389) 2020-12-02 23:04:00 +02:00
525cea1cc9 "Uncapturable" unique (#3388)
* WIP

* "Uncapturable" unique; civilians will be destroyed instead of captured
2020-12-02 22:45:44 +02:00
b2e40a892b unique "[] units gain the [] promotion" affects exisiting units (#3387)
* "[] units gain the [] promotion" unique affects existing units

* removed toString() and flipped &&

* probably this is closer to what you had in mind :)
2020-12-02 19:49:13 +02:00
80688eb4a5 Hide build menu constructions requiring resources with unique (#3370)
* "Not displayed as an available construction without []"
Hides constructions that are missing resources

* combined unique check

* removed duplicate code

* clarified if clause

* simplified check and obsoleted existing unique

* previous iteration did not work due to OR instead of AND

* if we don't check to see if this is actually a resource, we get a crash
2020-12-02 19:13:15 +02:00
2aac9ea314 Nation "style" can define unit appearance (#3368)
* added "style" in Nation.kt and checks in Tilegroups
allows pixel units to be displayed as a specific style if appropriate file exists

* Preserves "specificUnitIconLocation" in tilegroups.kt
2020-12-02 19:12:05 +02:00