Merge sulai's changes. Add credits. More space on icon

yairm210 · Jan 24, 2025 · 242072a · 242072a
1 parent 42c6493
commit 242072a
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 6 deletions.
diff --git a/android/Images.ConstructionIcons/UnitActionIcons/Skip.png b/android/Images.ConstructionIcons/UnitActionIcons/Skip.png
diff --git a/android/assets/jsons/Tutorials.json b/android/assets/jsons/Tutorials.json
@@ -234,8 +234,7 @@
     "name": "Idle Units",
     "steps": [
       "Clicking 'Next unit' move to the next unit in the queue.",
-        "If you don't want to move a unit, you can command it to 'Wait' this turn. This be default is the same as clicking 'Next unit'",
-        "If you won't be moving it for a while, you can have the unit enter Fortify or Sleep mode - \n  units in Fortify or Sleep are not considered idle units.",
+        "If you don't want to move a unit this turn, you can skip it by clicking 'Next unit' again, or command the unit to 'Skip turn'.",        "If you won't be moving it for a while, you can have the unit enter Fortify or Sleep mode - \n  units in Fortify or Sleep are not considered idle units.",
         "If you want to disable the 'Next unit' feature entirely, you can toggle it in Menu -> Check for idle units.",
         "If you'd rather 'Next unit' cycle the units and not mark them as Done, you can change it in the Options -> Gameplay menu.",
         "You can also cycle through the idle units using the left and right triangles on the Unit Table in the lower left of the screen."

diff --git a/android/assets/jsons/translations/template.properties b/android/assets/jsons/translations/template.properties
@@ -1225,7 +1225,7 @@ Pillage [improvement] =
 [improvement] (Pillaged!) = 
 Repair [improvement] - [turns] = 
 Skip = 
-Skip Unit = 
+Skip turn = 
 Are you sure you want to pillage this [improvement]? = 
 We have looted [amount] from a [improvement] = 
 We have looted [amount] from a [improvement] which has been sent to [cityName] = 

diff --git a/core/src/com/unciv/models/UnitAction.kt b/core/src/com/unciv/models/UnitAction.kt
@@ -180,7 +180,7 @@ enum class UnitActionType(
         { ImageGetter.getUnitActionPortrait("DisbandUnit") }, false, defaultPage = 1),
     GiftUnit("Gift unit",
         { ImageGetter.getUnitActionPortrait("Present") }, UncivSound.Silent, defaultPage = 1),
-    Skip("Skip Unit",
+    Skip("Skip turn",
         { ImageGetter.getUnitActionPortrait("Skip") }, UncivSound.Silent, defaultPage = 0),
     ShowAdditionalActions("Show more",
         { ImageGetter.getUnitActionPortrait("ShowMore") }, false),

diff --git a/core/src/com/unciv/ui/screens/worldscreen/unit/actions/UnitActions.kt b/core/src/com/unciv/ui/screens/worldscreen/unit/actions/UnitActions.kt
@@ -377,7 +377,7 @@ object UnitActions {
         ))
     }
 
-    // should mark unit as due=false and not cycle back in the queue
+    // Skip one turn: marks a unit as due=false and doesn't cycle back in the queue
     private suspend fun SequenceScope<UnitAction>.addSkipAction(unit: MapUnit) {
         yield(UnitAction(
             type = UnitActionType.Skip,

diff --git a/docs/Credits.md b/docs/Credits.md
@@ -710,7 +710,7 @@ HexaRealm tileset images by legacymtgsalvationuser69544 [here](https://github.co
 - [City](https://thenounproject.com/icon/city-571332) By Felix Westphal
 - [Fire](https://thenounproject.com/icon/96564) By Lloyd Humphreys for "city being razed" icon
 - [Sleep](https://thenounproject.com/icon/sleep-1760085) By Saeful Muslim for unit "sleep" action and status
-- [Clockwise](https://thenounproject.com/icon/clockwise-184528/) By Universal Icons (Louis Dawson) for "Wait" icon. The original work has been slightly modified.
+- [Skip](https://www.flaticon.com/free-icon/jump_3976216) by Freq Wazza for Skip icon
 - [Banner](https://thenounproject.com/term/banner/866282/) By Emir Palavan for embarked units
 - [Arrow](https://thenounproject.com/icon/arrow-2032227/) By uzeir syarief for moving between idle units, expanders, etc.
 - [Exchange](https://thenounproject.com/icon/exchange-17858) By Mike Rowe for switching tiles between cities