Formation link Image Help

[tuvus]

Problem Description

I am having trouble adding in the correct unit action link pictures for the Formation UI. I have tried in my branch FormationLinkImage, however I haven't had any success. Could someone else please take a look at this.

Thanks!

[SomeTroglodyte]

What do you mean, FormationLinkImage looks not too bad - what is the issue?

(apart from branch proliferation - 91 is lots, and why both getUnitActionPortrait and getImage for the same usecase)

[tuvus]

The images still aren't aligning correctly though.

Pictures

The escort image isn't showing up correctly like the sleep icon.

The escort formation image here also isn't set up correctly. Even with my image changes.

[SomeTroglodyte]

The images still aren't aligning correctly though.

Now there's a clear problem description... But could be a variety of causes... Adding remote... git fetch... wading through oodles of branches... checkout... Commenting...

• UnitActionIcons/Stop is the same as UnitActionIcons/StopMove - two copies get atlas-merged anyway but allow a modder to provide distinct images - OK but then "StopFormation" or so would be nicer than just "Stop"
• Link is 50x50 white on transparent, UnitActionIcons should be 100x100 Black on transparent. ¹
• I forgot the attribution back in Spruced up Civilopedia - phase 4 - Visual candy, Units #4350, so I can't quickly gimp a proper one from source - maybe I kept a copy on the other box...?

But otherwise...

Index: core/src/com/unciv/models/UnitAction.kt
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/core/src/com/unciv/models/UnitAction.kt b/core/src/com/unciv/models/UnitAction.kt
--- a/core/src/com/unciv/models/UnitAction.kt	(revision 09b97ddb09ce9ddda5241e1af3a2e4ce7f84fe9e)
+++ b/core/src/com/unciv/models/UnitAction.kt	(date 1712561897004)
@@ -15,8 +15,8 @@
  */
 open class UnitAction(
     val type: UnitActionType,
-    /** How often this action is used, a higher value means more often and that it should be on an earlier page. 
-     * 100 is very frequent, 50 is somewhat frequent, less than 25 is press one time for multi-turn movement. 
+    /** How often this action is used, a higher value means more often and that it should be on an earlier page.
+     * 100 is very frequent, 50 is somewhat frequent, less than 25 is press one time for multi-turn movement.
      * A Rare case is > 100 if a button is something like add in capital, promote or something,
      * we need to inform the player that taking the action is an option. */
     val useFrequency: Float,
@@ -105,7 +105,7 @@
     StopEscortFormation("Stop Escort formation",
         { ImageGetter.getUnitActionPortrait("Stop") }, false, defaultPage = 1),
     EscortFormation("Escort formation",
-        { ImageGetter.getImage("OtherIcons/Link") }, false, defaultPage = 1),
+        { ImageGetter.getUnitActionPortrait("Formation") }, false, defaultPage = 1),
     SwapUnits("Swap units",
         { ImageGetter.getUnitActionPortrait("Swap") }, false, defaultPage = 0),
     Automate("Automate",
Index: core/src/com/unciv/ui/components/widgets/UnitGroup.kt
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/core/src/com/unciv/ui/components/widgets/UnitGroup.kt b/core/src/com/unciv/ui/components/widgets/UnitGroup.kt
--- a/core/src/com/unciv/ui/components/widgets/UnitGroup.kt	(revision 09b97ddb09ce9ddda5241e1af3a2e4ce7f84fe9e)
+++ b/core/src/com/unciv/ui/components/widgets/UnitGroup.kt	(date 1712561896988)
@@ -177,7 +177,7 @@
     private fun getActionImage(): Image? {
         return when {
             unit.isSleeping() -> ImageGetter.getImage("UnitActionIcons/Sleep")
-            unit.isEscorting() -> ImageGetter.getImage("UnitActionIcons/Link")
+            unit.isEscorting() -> ImageGetter.getImage("UnitActionIcons/Formation")
             unit.isMoving() -> ImageGetter.getImage("UnitActionIcons/MoveTo")
             unit.isExploring() -> ImageGetter.getImage("UnitActionIcons/Explore")
             unit.getTile().improvementInProgress!=null && unit.canBuildImprovement(unit.getTile().getTileImprovementInProgress()!!) ->
diff --git a/android/Images.ConstructionIcons/UnitActionIcons/Formation.png b/android/Images.ConstructionIcons/UnitActionIcons/Formation.png
new file mode 100644
index 0000000000000000000000000000000000000000..7a997a2ff244e0463797a2803579c638ce6f964d
GIT binary patch
literal 2354
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
YUlK3gdDAlqBLDyZ07*qoM6N<$f?|_ZlK=n!

That is a new link from https://www.freeiconspng.com/img/9888 - to be resolved (use and credit this, replace "link.png" - or - find old tnp source and credit it and gimp to Formation.png)

Question remains - why is the image on the Worker with 0 movement ungrayed while the one on the Archer with 1mp is? unit.isIdle() gets actionGroup?.color?.a = opacity * 0.5f - is that intuitive??

Footnotes

1. Which is your original problem - if you can call it that - nano-misunderstanding perhaps ↩

[SomeTroglodyte]

• maybe I kept a copy on the other box

Nope, I've kept an intermediate with better resolution, but no metadata. So should we replace it so we can name a proper credit? I'd prefer thenounproject over freeiconspng - the latter explicitly says for personal use only. Any votes? Should be a relatively thick one, so maybe this one rotated, maybe the ring-overlap gaps widened? Or - I supply a 100x100 black gimped from my intermediate and we ignore the credits problem for now:

[tuvus]

Thank you!