Added AbsoluteUnits Settler-Ancient era by Basil

ninjum · Feb 26, 2025 · 574962f · 574962f
1 parent 7fbdffe
commit 574962f
Show file tree

Hide file tree

Showing 11 changed files with 503 additions and 462 deletions.
diff --git a/...oid/Images.AbsoluteUnits/TileSets/AbsoluteUnits/Units/Settler-Ancient era-1.png b/...oid/Images.AbsoluteUnits/TileSets/AbsoluteUnits/Units/Settler-Ancient era-1.png
diff --git a/...oid/Images.AbsoluteUnits/TileSets/AbsoluteUnits/Units/Settler-Ancient era-2.png b/...oid/Images.AbsoluteUnits/TileSets/AbsoluteUnits/Units/Settler-Ancient era-2.png
diff --git a/android/Images.AbsoluteUnits/TileSets/AbsoluteUnits/Units/Settler-Ancient era.png b/android/Images.AbsoluteUnits/TileSets/AbsoluteUnits/Units/Settler-Ancient era.png
diff --git a/...id/Images.AbsoluteUnits/TileSets/AbsoluteUnits/Units/Settler-Medieval era-1.png b/...id/Images.AbsoluteUnits/TileSets/AbsoluteUnits/Units/Settler-Medieval era-1.png
diff --git a/...id/Images.AbsoluteUnits/TileSets/AbsoluteUnits/Units/Settler-Medieval era-2.png b/...id/Images.AbsoluteUnits/TileSets/AbsoluteUnits/Units/Settler-Medieval era-2.png
diff --git a/android/Images.AbsoluteUnits/TileSets/AbsoluteUnits/Units/Settler-Medieval era.png b/android/Images.AbsoluteUnits/TileSets/AbsoluteUnits/Units/Settler-Medieval era.png
diff --git a/android/assets/AbsoluteUnits.atlas b/android/assets/AbsoluteUnits.atlas
diff --git a/android/assets/AbsoluteUnits.png b/android/assets/AbsoluteUnits.png
diff --git a/core/src/com/unciv/ui/popups/options/OptionsPopup.kt b/core/src/com/unciv/ui/popups/options/OptionsPopup.kt
@@ -72,7 +72,7 @@ class OptionsPopup(
         tabs.addPage(
             "About",
             aboutTab(),
-            ImageGetter.getExternalImage("Icon.png"), 24f
+            ImageGetter.getExternalImage("Icons/Unciv128.png"), 24f
         )
         tabs.addPage(
             "Display",
@@ -119,7 +119,7 @@ class OptionsPopup(
             ImageGetter.getImage("OtherIcons/Settings"), 24f
         )
 
-        if (RulesetCache.size > BaseRuleset.values().size) {
+        if (RulesetCache.size > BaseRuleset.entries.size) {
             val content = ModCheckTab(screen)
             tabs.addPage("Locate mod errors", content, ImageGetter.getImage("OtherIcons/Mods"), 24f)
         }

diff --git a/desktop/src/com/unciv/app/desktop/DesktopLauncher.kt b/desktop/src/com/unciv/app/desktop/DesktopLauncher.kt
@@ -89,8 +89,6 @@ internal object DesktopLauncher {
         config.setWindowSizeLimits(WindowState.minimumWidth, WindowState.minimumHeight, -1, -1)
 
 
-
-
         // LibGDX not yet configured, use regular java class
         val maximumWindowBounds = getMaximumWindowBounds()
 

diff --git a/docs/Credits.md b/docs/Credits.md
@@ -180,6 +180,7 @@ Barbarian variants by Pelo, made for [Playable Barbarians](https://github.com/Ja
 By Basil:
 
 - Worker-Barbarians
+- Settler-Ancient era
 
 ### HexaRealm
Original file line number	Diff line number	Diff line change
Expand Up		@@ -89,8 +89,6 @@ internal object DesktopLauncher {
		config.setWindowSizeLimits(WindowState.minimumWidth, WindowState.minimumHeight, -1, -1)




		// LibGDX not yet configured, use regular java class
		val maximumWindowBounds = getMaximumWindowBounds()

Expand Down