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

Proposal for New borders (#4124)

Browse Source 
* new-borders

* New Borders
This commit is contained in:
Federico Luongo 2021-06-13 20:56:47 +02:00 committed by GitHub
parent ea852f9fa0
commit 5f66c57de5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 694 additions and 683 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
android/Images/OtherIcons/Border-inner.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 359 B

BIN
android/Images/OtherIcons/Border-outer.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 190 B

BIN
android/Images/OtherIcons/Border.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 329 B

1319
android/assets/game.atlas
View File

File diff suppressed because it is too large Load Diff

BIN
android/assets/game.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 968 KiB

After

Width:  |  Height:  |  Size: 968 KiB

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

@ -18,6 +18,7 @@ import com.unciv.ui.cityscreen.YieldGroup
import com.unciv.ui.utils.ImageGetter import com.unciv.ui.utils.ImageGetter
import com.unciv.ui.utils.center import com.unciv.ui.utils.center
import com.unciv.ui.utils.centerX import com.unciv.ui.utils.centerX
import com.unciv.ui.utils.toLabel
import kotlin.math.PI import kotlin.math.PI
import kotlin.math.atan import kotlin.math.atan
import kotlin.random.Random import kotlin.random.Random
@ -573,39 +574,25 @@ open class TileGroup(var tileInfo: TileInfo, var tileSetStrings:TileSetStrings,
val sign = if (relativeWorldPosition.x < 0) -1 else 1 val sign = if (relativeWorldPosition.x < 0) -1 else 1
val angle = sign * (atan(sign * relativeWorldPosition.y / relativeWorldPosition.x) * 180 / PI - 90.0).toFloat() val angle = sign * (atan(sign * relativeWorldPosition.y / relativeWorldPosition.x) * 180 / PI - 90.0).toFloat()
val borderImage = ImageGetter.getWhiteDot() val innerBorderImage = ImageGetter.getImage("OtherIcons/Border-inner")
innerBorderImage.width = 38f
innerBorderImage.setOrigin(Align.center) // THEN the origin is correct,
innerBorderImage.rotateBy(angle) // and the rotation works.
innerBorderImage.center(this) // move to center of tile
innerBorderImage.moveBy(-relativeWorldPosition.x * 15f, -relativeWorldPosition.y * 15f)
innerBorderImage.color = civOuterColor
miscLayerGroup.addActor(innerBorderImage)
images.add(innerBorderImage)
borderImage.setSize(27f,2f) // The order is important. First we set the size, val outerBorderImage = ImageGetter.getImage("OtherIcons/Border-outer")
borderImage.setOrigin(Align.center) // THEN the origin is correct, outerBorderImage.width = 38f
borderImage.rotateBy(angle) // and the rotation works. outerBorderImage.setOrigin(Align.center) // THEN the origin is correct,
borderImage.center(this) // move to center of tile outerBorderImage.rotateBy(angle) // and the rotation works.
borderImage.moveBy(-relativeWorldPosition.x * 0.75f * 25f, -relativeWorldPosition.y * 0.75f * 25f) outerBorderImage.center(this) // move to center of tile
borderImage.color = civInnerColor outerBorderImage.moveBy(-relativeWorldPosition.x * 15f, -relativeWorldPosition.y * 15f)
miscLayerGroup.addActor(borderImage) outerBorderImage.color = civInnerColor
images.add(borderImage) miscLayerGroup.addActor(outerBorderImage)
images.add(outerBorderImage)
for (i in -2..2) {
val image = ImageGetter.getTriangle()
image.setSize(5f, 5f)
image.setOrigin(Align.center)
image.rotateBy(angle)
image.center(this)
// in addTiles, we set the position of groups by relative world position *0.8*groupSize, filter groupSize = 50
// Here, we want to have the borders start HALFWAY THERE and extend towards the tiles, so we give them a position of 0.8*25.
// BUT, we don't actually want it all the way out there, because we want to display the borders of 2 different civs!
// So we set it to 0.75
image.moveBy(-relativeWorldPosition.x * 0.75f * 25f, -relativeWorldPosition.y * 0.75f * 25f)
// And now, move it within the tileBaseImage side according to i.
// Remember, if from the center of the hexagon to the middle of the side is an (a,b) vecctor,
// Then within the side, which is of course perpendicular to the (a,b) vector,
// we can move with multiples of (b,-a) which is perpendicular to (a,b)
image.moveBy(relativeWorldPosition.y * i * 4, -relativeWorldPosition.x * i * 4)
image.color = civOuterColor
miscLayerGroup.addActor(image)
images.add(image)
}
} }
} }
} }
@ -792,9 +779,12 @@ open class TileGroup(var tileInfo: TileInfo, var tileSetStrings:TileSetStrings,
} }
} }
fun showCircle(color: Color, alpha: Float = 0.3f) { fun showCircle(color: Color, alpha: Float = 0.3f, number: Int = -1) {
circleImage.isVisible = true circleImage.isVisible = true
circleImage.color = color.cpy().apply { a = alpha } circleImage.color = color.cpy().apply { a = alpha }
if (number >= 0)
miscLayerGroup.addActor(number.toLabel())
} }
fun hideCircle() { circleImage.isVisible = false } fun hideCircle() { circleImage.isVisible = false }