wbrawner/Unciv
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Tile variants!

Browse source
This commit is contained in:
Yair Morgenstern 2020-04-18 22:46:25 +03:00
parent cb2e3a1bce
commit 4fd869dbee
1 changed files with 15 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
core/src/com/unciv/ui/tilegroups/TileGroup.kt
View file

@ -17,6 +17,7 @@ import com.unciv.ui.utils.center
import com.unciv.ui.utils.centerX import com.unciv.ui.utils.centerX
import kotlin.math.PI import kotlin.math.PI
import kotlin.math.atan import kotlin.math.atan
import kotlin.random.Random
open class TileGroup(var tileInfo: TileInfo, var tileSetStrings:TileSetStrings) : Group() { open class TileGroup(var tileInfo: TileInfo, var tileSetStrings:TileSetStrings) : Group() {
@ -243,7 +244,20 @@ open class TileGroup(var tileInfo: TileInfo, var tileSetStrings:TileSetStrings)
for(image in tileBaseImages) image.remove() for(image in tileBaseImages) image.remove()
tileBaseImages.clear() tileBaseImages.clear()
for(location in tileBaseImageLocations.reversed()) { // reversed because we send each one to back for(location in tileBaseImageLocations.reversed()) { // reversed because we send each one to back
val image = ImageGetter.getImage(location) // Here we check what actual tiles exist, and pick one - not at random, but based on the tile location,
// so it stays consistent throughout the game
val existingImages = ArrayList<String>()
existingImages.add(location)
var i=2
while (true){
val tileVariant = location+i
if(ImageGetter.imageExists(location+i)) existingImages.add(tileVariant)
else break
i+=1
}
val finalLocation = existingImages.random(Random(tileInfo.position.hashCode()+location.hashCode()))
val image = ImageGetter.getImage(finalLocation)
tileBaseImages.add(image) tileBaseImages.add(image)
baseLayerGroup.addActor(image) baseLayerGroup.addActor(image)
setHexagonImageSize(image) setHexagonImageSize(image)