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

Multiple promotions with the same effect (e.g. Barrage I and II) will now both activate - kudos Philn3v!

Browse Source
This commit is contained in:
Yair Morgenstern
2018-12-12 23:05:14 +02:00
parent 406fa60f61
commit 9e8930c263
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
android/assets/game.atlas
View File

@ -312,7 +312,7 @@ BuildingIcons/Palace
orig: 100, 100 orig: 100, 100
offset: 0, 0 offset: 0, 0
index: -1 index: -1
BuildingIcons/Paper maker BuildingIcons/Paper Maker
rotate: false rotate: false
xy: 1660, 1127 xy: 1660, 1127
size: 100, 100 size: 100, 100

9
core/src/com/unciv/logic/map/MapUnit.kt
View File

@ -13,7 +13,6 @@ import com.unciv.ui.utils.getRandom
import java.text.DecimalFormat import java.text.DecimalFormat
import java.util.* import java.util.*
import kotlin.collections.ArrayList import kotlin.collections.ArrayList
import kotlin.collections.HashSet
class MapUnit { class MapUnit {
@Transient lateinit var civInfo: CivilizationInfo @Transient lateinit var civInfo: CivilizationInfo
@ -68,14 +67,16 @@ class MapUnit {
return movementAlgs().getDistanceToTilesWithinTurn(tile.position,currentMovement) return movementAlgs().getDistanceToTilesWithinTurn(tile.position,currentMovement)
} }
@Transient var tempUniques= HashSet<String>() // This SHOULD NOT be a hashset, because if it is, thenn promotions with the same text (e.g. barrage I, barrage II)
// will not get counted twice!
@Transient var tempUniques= ArrayList<String>()
fun getUniques(): HashSet<String> { fun getUniques(): ArrayList<String> {
return tempUniques return tempUniques
} }
fun updateUniques(){ fun updateUniques(){
val uniques = HashSet<String>() val uniques = ArrayList<String>()
val baseUnit = baseUnit() val baseUnit = baseUnit()
uniques.addAll(baseUnit.uniques) uniques.addAll(baseUnit.uniques)
uniques.addAll(promotions.promotions.map { GameBasics.UnitPromotions[it]!!.effect }) uniques.addAll(promotions.promotions.map { GameBasics.UnitPromotions[it]!!.effect })