mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-01-21 09:47:33 +07:00
Code Issues Packages Projects Releases Wiki Activity
4,548 Commits 6 Branches 1,039 Tags 1.2 GiB
ee5aa38129
Commit Graph

2865 Commits

Author SHA1 Message Date
9kgsofrice
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
9kgsofrice
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
Yair Morgenstern
bbcf5ffed7 Added "All" filter for units 2020-12-11 14:28:29 +02:00
Yair Morgenstern
d0774db030 Resolved #3408 - Unit maintenance cost reduction generalized, now works for Ottomans 2020-12-11 14:24:09 +02:00
Yair Morgenstern
3ab57f1ada Resolved #3409 - American unique grants extra sight only to military land units 2020-12-11 14:11:35 +02:00
Yair Morgenstern
1f59a4ea48 Fixed crash when nuking Barbarian units 2020-12-11 14:09:19 +02:00
Yair Morgenstern
ab548dda54 Fixed ANR caused by too many saved games 2020-12-10 10:42:02 +02:00
Yair Morgenstern
4578994adf Reassign population after selling a specialist-providing building 2020-12-10 10:10:14 +02:00
9kgsofrice
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
Yair Morgenstern
fb743ade31 Added nation icons to the leader names in the diplomacy screen 2020-12-09 23:01:43 +02:00
Yair Morgenstern
c1a717e4f8 Resolved #3289 - can place unbuildable improvements that can exist on tiles 2020-12-09 22:46:15 +02:00
9kgsofrice
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
Yair Morgenstern
3e6955d0d9 Selected unit stays selected when single-tap moved into a tile with another unit 2020-12-07 20:08:58 +02:00
9kgsofrice
2c35cc98de
Specialists can add happiness (#3398) 2020-12-07 08:46:39 +02:00
9kgsofrice
cc5f4fc316
Should not be displayed without [] (#3396) 
* cleaned up again :)

* add val "filter"
 2020-12-06 22:19:49 +02:00
Yair Morgenstern
8a5247324c 3.11.18 2020-12-06 22:16:03 +02:00
Yair Morgenstern
b50c129e2d "+[] Movement for all [] units" now respects all unit categories 2020-12-06 21:50:46 +02:00
Yair Morgenstern
378e1ddc66 Fixed broken build, also - test for the new Travis! 2020-12-06 21:23:49 +02:00
Yair Morgenstern
48d0758abf Improvements can't be built in neutral areas, as per Civ V 2020-12-06 20:39:53 +02:00
Yair Morgenstern
22b3f563f3 Crash reports contain the game version for easy filtering 
Added helper function cityInfo.isWorked(tile)
 2020-12-05 22:54:16 +02:00
givehub99
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
Yair Morgenstern
5cf3e7764a CORRECT handling for mods that changed their buildings or units 2020-12-04 14:12:47 +02:00
Yair Morgenstern
81a38be5f4 Added button to add construction items directly to the queue 2020-12-04 11:27:28 +02:00
Duan Tao
93a26f635c
Workers stop building (most) duplicate roads connecting cities. (#3391) 2020-12-04 10:16:19 +02:00
Yair Morgenstern
4a0c69741e Merge branch 'temp' 2020-12-04 00:11:48 +02:00
Yair Morgenstern
4bb6426b79 3.11.17-patch1 2020-12-04 00:11:29 +02:00
Yair Morgenstern
a9d36c073a Mods can handle removing existing buildings 2020-12-03 23:58:48 +02:00
Yair Morgenstern
c12afb4131 "have signed the peace treaty" -> "have signed a peace treaty" 2020-12-03 23:29:36 +02:00
Yair Morgenstern
af113db8d7 Don't allow AI to offer peace to cty states allied with their enemies 2020-12-03 22:17:52 +02:00
Yair Morgenstern
2a3a0b107f Fixed rare errors 2020-12-02 23:17:20 +02:00
9kgsofrice
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
9kgsofrice
525cea1cc9
"Uncapturable" unique (#3388) 
* WIP

* "Uncapturable" unique; civilians will be destroyed instead of captured
 2020-12-02 22:45:44 +02:00
9kgsofrice
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
9kgsofrice
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
9kgsofrice
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
9kgsofrice
0e39d47dab
Changes check to remove national wonders on city ownership changes to rely on building.isNationalWonder (#3386) 2020-12-02 18:49:37 +02:00
Yair Morgenstern
0feb9bdefc First attempt at making Unciv Android-TV-compatible 2020-12-01 23:26:01 +02:00
Yair Morgenstern
07cee7e679 3.11.16-patch1 
Fixed x100 combat modifier for units in rough/open terrain
 2020-12-01 22:07:10 +02:00
Yair Morgenstern
d6c95ade5e Display mod incompatabilities 2020-11-30 22:13:23 +02:00
Yair Morgenstern
98d01f50b1 Merge branch 'master' of https://github.com/yairm210/Unciv 2020-11-30 22:07:51 +02:00
Yair Morgenstern
61a0ccba5f Fixed minor mod bugs 2020-11-30 22:07:44 +02:00
9kgsofrice
ea11c3fdf3
getResourceModifier for resources modified by uniques (#3372) 
* added function getResourceModifier to civinfo and tied into cityInfo resource checks
pared down getTileResourceAmount function

* simplified function usage
 2020-11-30 21:54:54 +02:00
Yair Morgenstern
f59c9a8593 Resolved #3364 - Fixed certain battle modifiers not activating 2020-11-26 14:51:29 +02:00
Yair Morgenstern
c86d6e7b69 Fixed broken tests 2020-11-26 14:27:14 +02:00
Yair Morgenstern
fd646f6b06 Resolved #3347 - units spawned by buildings are spawned in the city the building was built in 2020-11-24 22:12:03 +02:00
Yair Morgenstern
eb0776005f Added mod checks that combat units have strength and ranged units have rangedStrength 2020-11-24 21:43:00 +02:00
Yair Morgenstern
f6f95a7c53 More framerate savers! Now only cityButtonGroups that actually contain a cityButton will be rendered, giving us another massive performance boost! 
We're up to 28-29 fps on Android while zoomed!
 2020-11-24 21:38:04 +02:00
Yair Morgenstern
01ee6cc768 A large part of the rendering time was dedicated to trying to run actions on TileGroup groups, most of which can never have actions to begin with! 
So now their act() does nothing, greatly improving framerate!
 2020-11-24 00:08:39 +02:00
Yair Morgenstern
9dd7b2abf3 More texture switch savings in the CityButton 2020-11-23 23:21:51 +02:00
Yair Morgenstern
7b0bb55045 Can now handle units upgrading to units with no required tech 2020-11-23 22:25:17 +02:00