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

Merge branch 'master' of https://github.com/yairm210/Unciv

Browse Source
This commit is contained in:
Yair Morgenstern
2021-04-01 20:44:49 +03:00
parent 9cb017c8a5 387693512c
commit a26bf30c28
2 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/com/unciv/logic/map/TileInfo.kt
View File

@ -443,9 +443,9 @@ open class TileInfo {
return when (tileMap.getNeighborTileClockPosition(this, otherTile)) { return when (tileMap.getNeighborTileClockPosition(this, otherTile)) {
2 -> otherTile.hasBottomLeftRiver // we're to the bottom-left of it 2 -> otherTile.hasBottomLeftRiver // we're to the bottom-left of it
4 -> hasBottomRightRiver // we're to the top-right of it 4 -> hasBottomRightRiver // we're to the top-left of it
6 -> hasBottomRiver // we're directly above it 6 -> hasBottomRiver // we're directly above it
8 -> hasBottomLeftRiver // we're to the top-left of it 8 -> hasBottomLeftRiver // we're to the top-right of it
10 -> otherTile.hasBottomRightRiver // we're to the bottom-right of it 10 -> otherTile.hasBottomRightRiver // we're to the bottom-right of it
12 -> otherTile.hasBottomRiver // we're directly below it 12 -> otherTile.hasBottomRiver // we're directly below it
else -> throw Exception("Should never call this function on a non-neighbor!") else -> throw Exception("Should never call this function on a non-neighbor!")

10
core/src/com/unciv/ui/tilegroups/TileGroup.kt
View File

@ -581,7 +581,15 @@ open class TileGroup(var tileInfo: TileInfo, var tileSetStrings:TileSetStrings)
else ImageGetter.getImage(tileSetStrings.railroad) else ImageGetter.getImage(tileSetStrings.railroad)
roadImage.image = image roadImage.image = image
val relativeHexPosition = tileInfo.position.cpy().sub(neighbor.position) val relativeHexPosition = when (tileInfo.tileMap.getNeighborTileClockPosition(neighbor, tileInfo)){
2 -> Vector2(0f,1f)
4 -> Vector2(-1f,0f)
6 -> Vector2(-1f,-1f)
8 -> Vector2(0f,-1f)
10 -> Vector2(1f,0f)
12 -> Vector2(1f,1f)
else -> Vector2.Zero
}
val relativeWorldPosition = HexMath.hex2WorldCoords(relativeHexPosition) val relativeWorldPosition = HexMath.hex2WorldCoords(relativeHexPosition)
// This is some crazy voodoo magic so I'll explain. // This is some crazy voodoo magic so I'll explain.