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

Resolved #1177 - Great Improvements now provide Strategic resources

Browse Source 
APK no longer bundles maps in assets
This commit is contained in:
Yair Morgenstern 2019-10-10 14:48:09 +03:00
parent bde11941c5
commit 8d58702d80
3 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
android/build.gradle
View File

@ -41,7 +41,7 @@ android {
release { release {
// Don't add local save files and fonts to release, obviously // Don't add local save files and fonts to release, obviously
aaptOptions { aaptOptions {
ignoreAssetsPattern "!SaveFiles:!fonts" ignoreAssetsPattern "!SaveFiles:!fonts:!maps"
} }
minifyEnabled false minifyEnabled false
@ -51,7 +51,7 @@ android {
debug { debug {
// Don't add local save files and fonts to release, obviously // Don't add local save files and fonts to release, obviously
aaptOptions { aaptOptions {
ignoreAssetsPattern "!SaveFiles:!fonts" ignoreAssetsPattern "!SaveFiles:!fonts:!maps"
} }
} }
} }

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

@ -126,7 +126,9 @@ class CityInfo {
for (tileInfo in getTiles().filter { it.resource != null }) { for (tileInfo in getTiles().filter { it.resource != null }) {
val resource = tileInfo.getTileResource() val resource = tileInfo.getTileResource()
if(resource.revealedBy!=null && !civInfo.tech.isResearched(resource.revealedBy!!)) continue if(resource.revealedBy!=null && !civInfo.tech.isResearched(resource.revealedBy!!)) 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
|| (resource.resourceType==ResourceType.Strategic && tileInfo.containsGreatImprovement())){
var amountToAdd = 1 var amountToAdd = 1
if(resource.resourceType == ResourceType.Strategic){ if(resource.resourceType == ResourceType.Strategic){
amountToAdd = 2 amountToAdd = 2

4
core/src/com/unciv/ui/worldscreen/optionstable/PopupTable.kt
View File

@ -25,7 +25,9 @@ open class PopupTable(val screen: CameraStageBaseScreen): Table(CameraStageBaseS
screen.stage.addActor(this) screen.stage.addActor(this)
} }
open fun close(){ remove() } open fun close() {
remove()
}
fun addGoodSizedLabel(text: String): Cell<Label> { fun addGoodSizedLabel(text: String): Cell<Label> {
val label = text.toLabel() val label = text.toLabel()