mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-07-05 07:49:17 +07:00
Code Issues Packages Projects Releases Wiki Activity

Icons for units replaced by civ unique units are no longer shown in tech button

Browse Source
This commit is contained in:
Yair Morgenstern
2019-04-02 21:53:36 +03:00
parent 5444fd705b
commit e93ed68a2b
3 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
android/build.gradle
View File

@ -21,8 +21,8 @@ android {
applicationId "com.unciv.app" applicationId "com.unciv.app"
minSdkVersion 14 minSdkVersion 14
targetSdkVersion 28 targetSdkVersion 28
versionCode 223 versionCode 224
versionName "2.14.3" versionName "2.14.4"
} }
// Had to add this crap for Travis to build, it wanted to sign the app // Had to add this crap for Travis to build, it wanted to sign the app

2
build.gradle
View File

@ -16,7 +16,7 @@ buildscript {
} }
dependencies { dependencies {
classpath 'de.richsource.gradle.plugins:gwt-gradle-plugin:0.6' classpath 'de.richsource.gradle.plugins:gwt-gradle-plugin:0.6'
classpath 'com.android.tools.build:gradle:3.3.1' classpath 'com.android.tools.build:gradle:3.3.2'
classpath 'com.mobidevelop.robovm:robovm-gradle-plugin:2.3.1' classpath 'com.mobidevelop.robovm:robovm-gradle-plugin:2.3.1'
} }
} }

9
core/src/com/unciv/ui/pickerscreens/TechButton.kt
View File

@ -34,8 +34,13 @@ class TechButton(techName:String, val techManager: TechManager) : Table(CameraSt
val techEnabledIcons = Table() val techEnabledIcons = Table()
techEnabledIcons.defaults().pad(5f) techEnabledIcons.defaults().pad(5f)
for(unit in GameBasics.Units.values.filter { it.requiredTech==techName val techEnabledUnits = GameBasics.Units.values.filter { it.requiredTech==techName }
&& (it.uniqueTo==null || it.uniqueTo==techManager.civInfo.civName) }) val ourUniqueUnits = techEnabledUnits.filter { it.uniqueTo == techManager.civInfo.civName }
val replacedUnits = ourUniqueUnits.map { it.replaces!! }
val ourEnabledUnits = techEnabledUnits.filter { it.uniqueTo == null && !replacedUnits.contains(it.name) }
.union(ourUniqueUnits)
for(unit in ourEnabledUnits)
techEnabledIcons.add(ImageGetter.getConstructionImage(unit.name).surroundWithCircle(30f)) techEnabledIcons.add(ImageGetter.getConstructionImage(unit.name).surroundWithCircle(30f))
for(building in GameBasics.Buildings.values.filter { it.requiredTech==techName for(building in GameBasics.Buildings.values.filter { it.requiredTech==techName