AnarchistGamers/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-09-26 21:35:14 -04:00
Code Issues Packages Projects Releases Wiki Activity

Added link to Patreon

Browse Source 
Units upgrading to units with built-in promotions now get those promotions
This commit is contained in:
Yair Morgenstern 2019-10-28 21:24:04 +02:00
parent 827af89498
commit f80b0ee777
5 changed files with 501 additions and 482 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

974
android/assets/game.atlas
View File

File diff suppressed because it is too large Load Diff

BIN
android/assets/game.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.0 MiB

After

Width:  |  Height:  |  Size: 1.0 MiB

2
core/src/com/unciv/logic/city/CityInfo.kt
View File

@ -132,7 +132,7 @@ class CityInfo {
val improvement = GameBasics.TileImprovements[resource.improvement!!]!! val improvement = GameBasics.TileImprovements[resource.improvement!!]!!
if(improvement.techRequired!=null && !civInfo.tech.isResearched(improvement.techRequired!!)) continue if(improvement.techRequired!=null && !civInfo.tech.isResearched(improvement.techRequired!!)) continue
} }
if (resource.improvement == tileInfo.improvement || tileInfo.isCityCenter() if (resource.improvement == tileInfo.improvement || tileInfo.isCityCenter()
// Per https://gaming.stackexchange.com/questions/53155/do-manufactories-and-customs-houses-sacrifice-the-strategic-or-luxury-resources // Per https://gaming.stackexchange.com/questions/53155/do-manufactories-and-customs-houses-sacrifice-the-strategic-or-luxury-resources
|| (resource.resourceType==ResourceType.Strategic && tileInfo.containsGreatImprovement())){ || (resource.resourceType==ResourceType.Strategic && tileInfo.containsGreatImprovement())){

5
core/src/com/unciv/ui/worldscreen/optionstable/WorldScreenMenuTable.kt
View File

@ -146,6 +146,11 @@ class WorldScreenCommunityTable(val worldScreen: WorldScreen) : PopupTable(world
remove() remove()
} }
addButton("Patreon"){
Gdx.net.openURI("https://github.com/yairm210/UnCiv")
remove()
}
addCloseButton() addCloseButton()
open() open()

2
core/src/com/unciv/ui/worldscreen/unit/UnitActions.kt
View File

@ -94,7 +94,7 @@ class UnitActions {
newunit.health = unit.health newunit.health = unit.health
newunit.promotions = unit.promotions newunit.promotions = unit.promotions
for(promotion in unit.baseUnit.promotions) for(promotion in newunit.baseUnit.promotions)
if(promotion !in newunit.promotions.promotions) if(promotion !in newunit.promotions.promotions)
newunit.promotions.addPromotion(promotion, true) newunit.promotions.addPromotion(promotion, true)