diff --git a/android/Images.UnitPromotionIcons/UnitPromotionIcons/Fallback.png b/android/Images.UnitPromotionIcons/UnitPromotionIcons/Fallback.png new file mode 100644 index 0000000000..f3fd7fa07b Binary files /dev/null and b/android/Images.UnitPromotionIcons/UnitPromotionIcons/Fallback.png differ diff --git a/android/assets/UnitPromotionIcons.atlas b/android/assets/UnitPromotionIcons.atlas index 87864d620a..aa45f21199 100644 --- a/android/assets/UnitPromotionIcons.atlas +++ b/android/assets/UnitPromotionIcons.atlas @@ -165,28 +165,35 @@ UnitPromotionIcons/Operational Range orig: 50, 50 offset: 0, 0 index: -1 -UnitPromotionIcons/Flight Deck +UnitPromotionIcons/Fallback rotate: false xy: 1156, 62 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 -UnitPromotionIcons/Formation +UnitPromotionIcons/Great Generals + rotate: false + xy: 1156, 62 + size: 50, 50 + orig: 50, 50 + offset: 0, 0 + index: -1 +UnitPromotionIcons/Quick Study + rotate: false + xy: 1156, 62 + size: 50, 50 + orig: 50, 50 + offset: 0, 0 + index: -1 +UnitPromotionIcons/Flight Deck rotate: false xy: 1214, 62 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 -UnitPromotionIcons/Great Generals - rotate: false - xy: 1272, 62 - size: 50, 50 - orig: 50, 50 - offset: 0, 0 - index: -1 -UnitPromotionIcons/Quick Study +UnitPromotionIcons/Formation rotate: false xy: 1272, 62 size: 50, 50 diff --git a/android/assets/UnitPromotionIcons.png b/android/assets/UnitPromotionIcons.png index 2214c76e5d..32e890b463 100644 Binary files a/android/assets/UnitPromotionIcons.png and b/android/assets/UnitPromotionIcons.png differ diff --git a/core/src/com/unciv/models/ruleset/unit/BaseUnit.kt b/core/src/com/unciv/models/ruleset/unit/BaseUnit.kt index a445af16e8..9f0ecf4bb2 100644 --- a/core/src/com/unciv/models/ruleset/unit/BaseUnit.kt +++ b/core/src/com/unciv/models/ruleset/unit/BaseUnit.kt @@ -216,8 +216,6 @@ class BaseUnit : RulesetObject(), INonPerpetualConstruction { if (boughtWith != null && !civInfo.gameInfo.gameParameters.godMode && !unit.hasUnique(UniqueType.MoveImmediatelyOnceBought)) unit.currentMovement = 0f - if (this.isCivilian()) return true // tiny optimization makes save files a few bytes smaller - addConstructionBonuses(unit, cityConstructions) return true