diff --git a/core/src/com/unciv/logic/map/mapunit/MapUnit.kt b/core/src/com/unciv/logic/map/mapunit/MapUnit.kt index f698fb14164a9..8f354cad1e93a 100644 --- a/core/src/com/unciv/logic/map/mapunit/MapUnit.kt +++ b/core/src/com/unciv/logic/map/mapunit/MapUnit.kt @@ -897,7 +897,11 @@ class MapUnit : IsPartOfGameInfoSerialization { val promotion = unique.params[0] promotions.addPromotion(promotion, true) } - + + val triggeredUniques = getTriggeredUniques(UniqueType.TriggerUponEnteringTile) { tile.matchesFilter(it.params[0]) } + for (triggeredUnique in triggeredUniques) + UniqueTriggerActivation.triggerUnique(triggeredUnique, this) + updateVisibleTiles(true, currentTile.position) } diff --git a/core/src/com/unciv/models/ruleset/unique/UniqueType.kt b/core/src/com/unciv/models/ruleset/unique/UniqueType.kt index b4c17afb0a96c..1b9d91e25574a 100644 --- a/core/src/com/unciv/models/ruleset/unique/UniqueType.kt +++ b/core/src/com/unciv/models/ruleset/unique/UniqueType.kt @@ -909,6 +909,7 @@ enum class UniqueType( TriggerUponLosingHealth("upon losing at least [amount] HP in a single attack", UniqueTarget.UnitTriggerCondition), TriggerUponEndingTurnInTile("upon ending a turn in a [tileFilter] tile", UniqueTarget.UnitTriggerCondition), TriggerUponDiscoveringTile("upon discovering a [tileFilter] tile", UniqueTarget.UnitTriggerCondition), + TriggerUponEnteringTile("upon entering a [tileFilter] tile", UniqueTarget.UnitTriggerCondition), //endregion diff --git a/core/src/com/unciv/models/ruleset/validation/RulesetValidator.kt b/core/src/com/unciv/models/ruleset/validation/RulesetValidator.kt index b862ac3a18f80..a9eeddc66f0e4 100644 --- a/core/src/com/unciv/models/ruleset/validation/RulesetValidator.kt +++ b/core/src/com/unciv/models/ruleset/validation/RulesetValidator.kt @@ -313,7 +313,7 @@ class RulesetValidator(val ruleset: Ruleset) { } } - val unitMovementTypes = UnitMovementType.entries.map { it.name }.toSet() + private val unitMovementTypes = UnitMovementType.entries.map { it.name }.toSet() private fun addUnitTypeErrors( lines: RulesetErrorList, tryFixUnknownUniques: Boolean