Add Great Admiral

android/assets/jsons/Civ V - Gods & Kings/GlobalUniques.json

@@ -9,6 +9,7 @@
         "Cannot build [Settler] units <when below [-10] [Happiness]>",
         "Rebel units may spawn <when below [-20] [Happiness]>",
         "[-1] Sight <for [Embarked] units>",
+        "Enables [Great Admiral] units to enter ocean tiles",
 
         // TODO: Implement the uniques below
         // "[+20]% [Culture] [in all cities] <during a golden age>",

android/assets/jsons/Civ V - Gods & Kings/Units.json

@@ -1658,6 +1658,17 @@
             "Great Person - [War]", "Unbuildable", "Uncapturable"],
 		"movement": 5
 	},
+	{
+		"name": "Great Admiral",
+		"unitType": "Civilian Water",
+		"uniques": [
+            "[+15]% Strength bonus for [{Military} {Water}] units within [2] tiles",
+            "[Target Unit] heals [100] HP <targeting [Water] units within [1] tiles> <by consuming this unit>",
+			"Can be earned through combat",
+            "Is part of Great Person group [Admiral]",
+            "Great Person - [War]", "Unbuildable", "Uncapturable"],
+		"movement": 4
+	},
 
 	/* Religious units */
 

core/src/com/unciv/models/ruleset/unique/UniqueTriggerActivation.kt

@@ -87,7 +87,8 @@ object UniqueTriggerActivation {
         unit: MapUnit? = null,
         tile: Tile? = city?.getCenterTile() ?: unit?.currentTile,
         notification: String? = null,
-        triggerNotificationText: String? = null
+        triggerNotificationText: String? = null,
+        ignoreMultiModifiers: Boolean = false
     ): (()->Boolean)? {
 
         val relevantCity by lazy {
@@ -119,6 +120,27 @@ object UniqueTriggerActivation {
             else Random(-550) // Very random indeed
         val ruleset = civInfo.gameInfo.ruleset
 
+        // Modifier trigger to iterate through multiple units
+        if (unique.hasModifier(UniqueType.TargetingUnitsWithinTiles) && !ignoreMultiModifiers) {
+            val modifiers = unique.getModifiers(UniqueType.TargetingUnitsWithinTiles)
+            if (tile != null) {
+                val triggerFunctions = modifiers.flatMap {
+                    val mapUnitFilter = it.params[0]
+                    tile.getTilesInDistance(it.params[1].toInt())
+                        .flatMap { it.getUnits() }
+                        .filter { it.matchesFilter(mapUnitFilter) }
+                        .mapNotNull { getTriggerFunction(unique, civInfo, city, it, it.getTile(), notification, triggerNotificationText, true) }
+                }
+                if (triggerFunctions.none()) return null
+                return {
+                    for (triggerFunction in triggerFunctions) {
+                        triggerFunction.invoke()
+                    }
+                    true
+                }
+            } else return null
+        }
+
         when (unique.type) {
             UniqueType.TriggerEvent -> {
                 val event = ruleset.events[unique.params[0]] ?: return null

core/src/com/unciv/models/ruleset/unique/UniqueType.kt

@@ -969,6 +969,9 @@ enum class UniqueType(
 
     ///////////////////////////////////////////// region 90 META /////////////////////////////////////////////
 
+    TargetingUnitsWithinTiles("targeting [mapUnitFilter] units within [positiveAmount] tiles", UniqueTarget.MetaModifier,
+        docDescription = "Modifies this unique to activate on each of the given units within the certain amount of tiles"),
+
     ConditionalTimedUnique("for [nonNegativeAmount] turns", UniqueTarget.MetaModifier,
         docDescription = "Turns this unique into a trigger, activating this unique as a *global* unique for a number of turns"),
     

docs/Credits.md

@@ -160,6 +160,7 @@ Unless otherwise specified, all the following are from [the Noun Project](https:
 -   [General](https://thenounproject.com/icon/general-933566) By anbileru adaleru for Great General
 -   [Religion](https://thenounproject.com/icon/preach-53064) by Bruno Gätjens González adapted for Missionary
 -   [invisibility cloak ](https://thenounproject.com/term/invisibility-cloak/1419648/) by Locad for Inquisitor
+-   [Anchor](https://thenounproject.com/icon/anchor-7764100/) by M. Adebadal for Great Admiral
 
 ### Units - AbsoluteUnits unitset images
 

docs/Modders/uniques.md

@@ -3848,6 +3848,13 @@ Simple unique parameters are explained by mouseover. Complex parameters are expl
 
     Modifiers that can be added to other uniques changing user experience, not their behavior
 
+??? example  "<targeting [mapUnitFilter] units within [positiveAmount] tiles>"
+	Modifies this unique to activate on each of the given units within the certain amount of tiles
+
+	Example: "<targeting [Wounded] units within [3] tiles>"
+
+	Applicable to: MetaModifier
+
 ??? example  "<for [nonNegativeAmount] turns>"
 	Turns this unique into a trigger, activating this unique as a *global* unique for a number of turns