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

Fix Paradrop crossing World-wrap seam (#10936)

Browse Source 
* Fix Paradrop crossing World-wrap seam problem

* Change MoveHereButton for Paradrop
This commit is contained in:
SomeTroglodyte
2024-01-15 17:56:13 +01:00
committed by GitHub
parent 351917709c
commit cf5eb02ce7
3 changed files with 19 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/src/com/unciv/logic/map/HexMath.kt
View File

@ -4,13 +4,13 @@ import com.badlogic.gdx.math.Vector2
import com.badlogic.gdx.math.Vector3 import com.badlogic.gdx.math.Vector3
import kotlin.math.abs import kotlin.math.abs
import kotlin.math.cos import kotlin.math.cos
import kotlin.math.max
import kotlin.math.min
import kotlin.math.round import kotlin.math.round
import kotlin.math.roundToInt import kotlin.math.roundToInt
import kotlin.math.sign import kotlin.math.sign
import kotlin.math.sin import kotlin.math.sin
import kotlin.math.sqrt import kotlin.math.sqrt
import kotlin.math.max
import kotlin.math.min
@Suppress("MemberVisibilityCanBePrivate", "unused") // this is a library offering optional services @Suppress("MemberVisibilityCanBePrivate", "unused") // this is a library offering optional services
object HexMath { object HexMath {
@ -227,6 +227,7 @@ object HexMath {
return hexesToReturn return hexesToReturn
} }
/** Get number of hexes from [origin] to [destination] _without respecting world-wrap_ */
fun getDistance(origin: Vector2, destination: Vector2): Int { fun getDistance(origin: Vector2, destination: Vector2): Int {
val relativeX = origin.x - destination.x val relativeX = origin.x - destination.x
val relativeY = origin.y - destination.y val relativeY = origin.y - destination.y

3
core/src/com/unciv/logic/map/mapunit/movement/UnitMovement.kt
View File

@ -5,7 +5,6 @@ package com.unciv.logic.map.mapunit.movement
import com.badlogic.gdx.math.Vector2 import com.badlogic.gdx.math.Vector2
import com.unciv.Constants import com.unciv.Constants
import com.unciv.logic.map.BFS import com.unciv.logic.map.BFS
import com.unciv.logic.map.HexMath.getDistance
import com.unciv.logic.map.mapunit.MapUnit import com.unciv.logic.map.mapunit.MapUnit
import com.unciv.logic.map.tile.Tile import com.unciv.logic.map.tile.Tile
import com.unciv.models.UnitActionType import com.unciv.models.UnitActionType
@ -258,7 +257,7 @@ class UnitMovement(val unit: MapUnit) {
if (unit.baseUnit.movesLikeAirUnits()) if (unit.baseUnit.movesLikeAirUnits())
return unit.currentTile.aerialDistanceTo(destination) <= unit.getMaxMovementForAirUnits() return unit.currentTile.aerialDistanceTo(destination) <= unit.getMaxMovementForAirUnits()
if (unit.isPreparingParadrop()) if (unit.isPreparingParadrop())
return getDistance(unit.currentTile.position, destination.position) <= unit.cache.paradropRange && canParadropOn(destination) return unit.currentTile.aerialDistanceTo(destination) <= unit.cache.paradropRange && canParadropOn(destination)
return getDistanceToTiles().containsKey(destination) return getDistanceToTiles().containsKey(destination)
} }

26
core/src/com/unciv/ui/screens/worldscreen/WorldMapHolder.kt
View File

@ -501,18 +501,22 @@ class WorldMapHolder(
val smallerCircleSizes = 25f val smallerCircleSizes = 25f
private fun getMoveHereButton(dto: MoveHereButtonDto): Group { private fun getMoveHereButton(dto: MoveHereButtonDto): Group {
val moveHereButton = ImageGetter.getStatIcon("Movement") val isParadrop = dto.unitToTurnsToDestination.keys.all { it.isPreparingParadrop() }
.apply { color = Color.BLACK; width = buttonSize / 2; height = buttonSize / 2 } val image = if (isParadrop)
.surroundWithCircle(buttonSize-2, false) ImageGetter.getUnitActionPortrait("Paradrop", buttonSize / 2)
else ImageGetter.getStatIcon("Movement")
.apply { color = Color.BLACK; width = buttonSize / 2; height = buttonSize / 2 }
val moveHereButton = image
.surroundWithCircle(buttonSize - 2, false)
.surroundWithCircle(buttonSize, false, Color.BLACK) .surroundWithCircle(buttonSize, false, Color.BLACK)
if (!isParadrop) {
val numberCircle = dto.unitToTurnsToDestination.values.maxOrNull()!!.toString().toLabel(fontSize = 14) val numberCircle = dto.unitToTurnsToDestination.values.maxOrNull()!!.toString().toLabel(fontSize = 14)
.apply { setAlignment(Align.center) } .apply { setAlignment(Align.center) }
.surroundWithCircle(smallerCircleSizes-2, color = BaseScreen.skinStrings.skinConfig.baseColor.darken(0.3f)) .surroundWithCircle(smallerCircleSizes - 2, color = BaseScreen.skinStrings.skinConfig.baseColor.darken(0.3f))
.surroundWithCircle(smallerCircleSizes,false) .surroundWithCircle(smallerCircleSizes, false)
moveHereButton.addActor(numberCircle)
moveHereButton.addActor(numberCircle) }
val firstUnit = dto.unitToTurnsToDestination.keys.first() val firstUnit = dto.unitToTurnsToDestination.keys.first()
val unitIcon = if (dto.unitToTurnsToDestination.size == 1) UnitGroup(firstUnit, smallerCircleSizes) val unitIcon = if (dto.unitToTurnsToDestination.size == 1) UnitGroup(firstUnit, smallerCircleSizes)
@ -536,7 +540,7 @@ class WorldMapHolder(
} }
private fun getSwapWithButton(dto: SwapWithButtonDto): Group { private fun getSwapWithButton(dto: SwapWithButtonDto): Group {
val swapWithButton = Group().apply { width = buttonSize;height = buttonSize; } val swapWithButton = Group().apply { width = buttonSize; height = buttonSize }
swapWithButton.addActor(ImageGetter.getCircle().apply { width = buttonSize; height = buttonSize }) swapWithButton.addActor(ImageGetter.getCircle().apply { width = buttonSize; height = buttonSize })
swapWithButton.addActor( swapWithButton.addActor(
ImageGetter.getImage("OtherIcons/Swap") ImageGetter.getImage("OtherIcons/Swap")