Great Admiral: Add Repair Fleet ability #13751
Conversation
…add-great-admiral
|
There's a little bit too much here |
|
Sounds good with me. I'll have this focus on an iterative trigger. |
RobLoach
changed the title
Every adjacent [unitFilter] unit for Unit Triggers
|
Brought in the latest changes, seems to be working. |
RobLoach
changed the title
Every adjacent [unitFilter] unit for Unit Triggers
core/src/com/unciv/models/ruleset/unique/UniqueTriggerActivation.kt
Outdated
Show resolved
Hide resolved
core/src/com/unciv/models/ruleset/unique/UniqueTriggerActivation.kt
Outdated
Show resolved
Hide resolved
|
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
|
Conflicts have been resolved. |
| override fun isInvisible(to: Civilization): Boolean = unit.isInvisible(to) | ||
| override fun canAttack(): Boolean = unit.canAttack() | ||
| override fun matchesFilter(filter: String, multiFilter: Boolean) = unit.matchesFilter(filter, multiFilter) | ||
| override fun matchesFilter(filter: String, multiFilter: Boolean) = unit.matchesFilter(filter, multiFilter=multiFilter) |
There was a problem hiding this comment.
Seems unnecessary, but is...
MapUnitCombatant.kt:22:99 Argument type mismatch: actual type is 'Boolean', but 'GameContext?' was expected.
The matchesFilter signature is...
fun matchesFilter(filter: String, state: GameContext? = cache.state, multiFilter: Boolean = true)Just looks weird because we're skipping the state.
|
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
|
Conflicts have been resolved. |
|
This PR is stale because it has been open 45 days with no activity. Remove stale label or comment or this will be closed in 10 days. |
2 participants
This adds the Great Admiral Repair Fleet ability.
Rather than a special unique to heal adjacent units, it allows
unitTriggerTargetto take inEvery adjacent [mapUnitFilter] unit. When triggered, it invokes the trigger for all adjacent units matchingmapUnitFilter.It also adds the "Change Port" ability, which allows the Great Admiral to move to other coastal cities. Good for when they're blocked in a lake.
Screenshot
Save Game