diff --git a/android/Images/NotificationIcons/EnhanceReligion.png b/android/Images/NotificationIcons/EnhanceReligion.png index 39c948ba58..def1d350cf 100644 Binary files a/android/Images/NotificationIcons/EnhanceReligion.png and b/android/Images/NotificationIcons/EnhanceReligion.png differ diff --git a/android/Images/NotificationIcons/FoundPantheon.png b/android/Images/NotificationIcons/FoundPantheon.png index a1f6107866..def1d350cf 100644 Binary files a/android/Images/NotificationIcons/FoundPantheon.png and b/android/Images/NotificationIcons/FoundPantheon.png differ diff --git a/android/Images/NotificationIcons/FoundReligion.png b/android/Images/NotificationIcons/FoundReligion.png index a01d73ed7a..def1d350cf 100644 Binary files a/android/Images/NotificationIcons/FoundReligion.png and b/android/Images/NotificationIcons/FoundReligion.png differ diff --git a/android/Images/NotificationIcons/Loading.png b/android/Images/NotificationIcons/Loading.png index 85743da6a0..ad1235c513 100644 Binary files a/android/Images/NotificationIcons/Loading.png and b/android/Images/NotificationIcons/Loading.png differ diff --git a/android/Images/NotificationIcons/MoveAutomatedUnits.png b/android/Images/NotificationIcons/MoveAutomatedUnits.png index 2844518c84..7651a78f10 100644 Binary files a/android/Images/NotificationIcons/MoveAutomatedUnits.png and b/android/Images/NotificationIcons/MoveAutomatedUnits.png differ diff --git a/android/Images/NotificationIcons/NextTurn.png b/android/Images/NotificationIcons/NextTurn.png index 5db162e8ec..e6d76977a1 100644 Binary files a/android/Images/NotificationIcons/NextTurn.png and b/android/Images/NotificationIcons/NextTurn.png differ diff --git a/android/Images/NotificationIcons/NextUnit.png b/android/Images/NotificationIcons/NextUnit.png index 96d53f0094..7651a78f10 100644 Binary files a/android/Images/NotificationIcons/NextUnit.png and b/android/Images/NotificationIcons/NextUnit.png differ diff --git a/android/Images/NotificationIcons/PickConstruction.png b/android/Images/NotificationIcons/PickConstruction.png new file mode 100644 index 0000000000..09d430c55c Binary files /dev/null and b/android/Images/NotificationIcons/PickConstruction.png differ diff --git a/android/Images/NotificationIcons/PickProduction.png b/android/Images/NotificationIcons/PickProduction.png deleted file mode 100644 index 8180054864..0000000000 Binary files a/android/Images/NotificationIcons/PickProduction.png and /dev/null differ diff --git a/android/Images/NotificationIcons/PickTech.png b/android/Images/NotificationIcons/PickTech.png index 5110962a46..ccfb3f80ab 100644 Binary files a/android/Images/NotificationIcons/PickTech.png and b/android/Images/NotificationIcons/PickTech.png differ diff --git a/android/Images/NotificationIcons/ReformReligion.png b/android/Images/NotificationIcons/ReformReligion.png index 04c4c19562..def1d350cf 100644 Binary files a/android/Images/NotificationIcons/ReformReligion.png and b/android/Images/NotificationIcons/ReformReligion.png differ diff --git a/android/Images/NotificationIcons/Working.png b/android/Images/NotificationIcons/Working.png index 9f26a7b946..ad1235c513 100644 Binary files a/android/Images/NotificationIcons/Working.png and b/android/Images/NotificationIcons/Working.png differ diff --git a/android/Images/NotificationIcons/WorldCongressVote.png b/android/Images/NotificationIcons/WorldCongressVote.png index 762b21bebb..4d0c5ed196 100644 Binary files a/android/Images/NotificationIcons/WorldCongressVote.png and b/android/Images/NotificationIcons/WorldCongressVote.png differ diff --git a/android/assets/game.png b/android/assets/game.png index b9f2ff1d2a..acb1a0c43e 100644 Binary files a/android/assets/game.png and b/android/assets/game.png differ diff --git a/core/src/com/unciv/ui/worldscreen/status/NextTurnButton.kt b/core/src/com/unciv/ui/worldscreen/status/NextTurnButton.kt index ca1dd30a73..eab4e306d2 100644 --- a/core/src/com/unciv/ui/worldscreen/status/NextTurnButton.kt +++ b/core/src/com/unciv/ui/worldscreen/status/NextTurnButton.kt @@ -2,28 +2,22 @@ package com.unciv.ui.worldscreen.status import com.badlogic.gdx.Input import com.badlogic.gdx.graphics.Color -import com.badlogic.gdx.scenes.scene2d.ui.TextButton -import com.badlogic.gdx.utils.Align import com.unciv.models.translations.tr import com.unciv.ui.images.IconTextButton import com.unciv.ui.images.ImageGetter -import com.unciv.ui.utils.BaseScreen import com.unciv.ui.utils.KeyCharAndCode import com.unciv.ui.utils.KeyShortcut -import com.unciv.ui.utils.extensions.center -import com.unciv.ui.utils.extensions.centerX -import com.unciv.ui.utils.extensions.centerY import com.unciv.ui.utils.extensions.isEnabled import com.unciv.ui.utils.extensions.keyShortcuts import com.unciv.ui.utils.extensions.onActivation -import com.unciv.ui.utils.extensions.setFontSize +import com.unciv.ui.utils.extensions.setSize class NextTurnButton( -) : IconTextButton("", null) { +) : IconTextButton("", null, 30) { private var nextTurnAction = NextTurnAction("", Color.BLACK) {} init { - label.setFontSize(30) +// label.setFontSize(30) labelCell.pad(10f) onActivation { nextTurnAction.action() } keyShortcuts.add(Input.Keys.SPACE) @@ -42,7 +36,7 @@ class NextTurnButton( label.setText(nextTurnAction.text.tr()) label.color = nextTurnAction.color if (nextTurnAction.icon != null && ImageGetter.imageExists(nextTurnAction.icon)) - iconCell.setActor(ImageGetter.getImage(nextTurnAction.icon)) + iconCell.setActor(ImageGetter.getImage(nextTurnAction.icon).apply { setSize(30f) }) else iconCell.clearActor() pack() diff --git a/docs/Modders/uniques.md b/docs/Modders/uniques.md index a11e1675ee..32ee807ea3 100644 --- a/docs/Modders/uniques.md +++ b/docs/Modders/uniques.md @@ -252,6 +252,11 @@ Simple unique parameters are explained by mouseover. Complex parameters are expl Applicable to: Global +??? example "Provides [amount] [resource]" + Example: "Provides [3] [Iron]" + + Applicable to: Global, Improvement + ??? example "[relativeAmount]% growth [cityFilter]" Example: "[+20]% growth [in all cities]" @@ -858,11 +863,6 @@ Simple unique parameters are explained by mouseover. Complex parameters are expl Applicable to: Building, Unit, Improvement -??? example "Provides [amount] [resource]" - Example: "Provides [3] [Iron]" - - Applicable to: Building, Improvement - ??? example "Unbuildable" Applicable to: Building, Unit, Improvement