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

Save associated unique in UnitAction for automation / grouping - see #12393

Browse Source
This commit is contained in:
yairm210 2024-11-03 08:08:56 +02:00
parent a0bbab1362
commit ab15058008
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
core/src/com/unciv/models/UnitAction.kt
View File

@ -2,6 +2,7 @@ package com.unciv.models
import com.badlogic.gdx.scenes.scene2d.Actor
import com.unciv.Constants
import com.unciv.models.ruleset.unique.Unique
import com.unciv.models.ruleset.unit.BaseUnit
import com.unciv.models.translations.getPlaceholderParameters
import com.unciv.ui.components.fonts.Fonts
@ -23,6 +24,7 @@ open class UnitAction(
val title: String = type.value,
val isCurrentAction: Boolean = false,
val uncivSound: UncivSound = type.uncivSound,
val associatedUnique: Unique? = null,
/** Action is Null if this unit *can* execute the action but *not right now* - it's embarked, out of moves, etc */
val action: (() -> Unit)? = null
) {
@ -70,7 +72,7 @@ open class UnitAction(
/** Specialized [UnitAction] for upgrades
*
* Transports [unitToUpgradeTo] from [creation][com.unciv.ui.screens.worldscreen.unit.actions.UnitActionsUpgrade.getUpgradeAction]
* Transports [unitToUpgradeTo] from [creation][com.unciv.ui.screens.worldscreen.unit.actions.UnitActionsUpgrade.getUpgradeActions]
* to [UI][com.unciv.ui.screens.worldscreen.unit.actions.UnitActionsTable.update]
*/
class UpgradeUnitAction(
@ -196,6 +198,6 @@ enum class UnitActionType(
val binding: KeyboardBinding =
binding ?:
KeyboardBinding.values().firstOrNull { it.name == name } ?:
KeyboardBinding.entries.firstOrNull { it.name == name } ?:
KeyboardBinding.None
}

4
core/src/com/unciv/ui/screens/worldscreen/unit/actions/UnitActionsFromUniques.kt
View File

@ -78,6 +78,7 @@ object UnitActionsFromUniques {
useFrequency = 80f,
title = title,
uncivSound = UncivSound.Chimes,
associatedUnique = unique,
action = {
// check if we would be breaking a promise
val leadersPromisedNotToSettleNear = getLeadersWePromisedNotToSettleNear(unit.civ, tile)
@ -242,6 +243,7 @@ object UnitActionsFromUniques {
yield(
UnitAction(UnitActionType.TriggerUnique, 80f, title,
associatedUnique = unique,
action = unitAction.takeIf {
UnitActionModifiers.canActivateSideEffects(unit, unique)
})
@ -312,6 +314,7 @@ object UnitActionsFromUniques {
unique,
unit
),
associatedUnique = unique,
action = {
val unitTile = unit.getTile()
unitTile.setImprovement(improvement.name, unit.civ, unit)
@ -393,6 +396,7 @@ object UnitActionsFromUniques {
yield(UnitAction(UnitActionType.Transform, 70f,
title = title,
associatedUnique = unique,
action = {
val oldMovement = unit.currentMovement
unit.destroy()