mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-07-13 17:28:57 +07:00
Code Issues Packages Projects Releases Wiki Activity

Added Discord icon+link on main menu

Browse Source
This commit is contained in:
yairm210
2024-11-27 16:55:54 +02:00
parent 6524a5157a
commit a7f69adfbb
5 changed files with 246 additions and 231 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
android/Images.Icons/OtherIcons/Discord.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 6.8 KiB

453
android/assets/Icons.atlas
View File

File diff suppressed because it is too large Load Diff

BIN
android/assets/Icons.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 567 KiB

After

Width:  |  Height:  |  Size: 561 KiB

1
core/src/com/unciv/logic/map/mapunit/movement/UnitMovement.kt
View File

@ -526,7 +526,6 @@ class UnitMovement(val unit: MapUnit) {
/** /**
* Swaps this unit with the unit on the given tile * Swaps this unit with the unit on the given tile
* Limited to neighboring tiles only
* Precondition: this unit can swap-move to the given tile, as determined by canUnitSwapTo * Precondition: this unit can swap-move to the given tile, as determined by canUnitSwapTo
*/ */
fun swapMoveToTile(destination: Tile) { fun swapMoveToTile(destination: Tile) {

23
core/src/com/unciv/ui/screens/mainmenuscreen/MainMenuScreen.kt
View File

@ -1,5 +1,6 @@
package com.unciv.ui.screens.mainmenuscreen package com.unciv.ui.screens.mainmenuscreen
import com.badlogic.gdx.Gdx
import com.badlogic.gdx.graphics.Color import com.badlogic.gdx.graphics.Color
import com.badlogic.gdx.scenes.scene2d.Touchable import com.badlogic.gdx.scenes.scene2d.Touchable
import com.badlogic.gdx.scenes.scene2d.actions.Actions import com.badlogic.gdx.scenes.scene2d.actions.Actions
@ -27,6 +28,7 @@ import com.unciv.ui.audio.SoundPlayer
import com.unciv.ui.components.UncivTooltip.Companion.addTooltip import com.unciv.ui.components.UncivTooltip.Companion.addTooltip
import com.unciv.ui.components.extensions.center import com.unciv.ui.components.extensions.center
import com.unciv.ui.components.extensions.surroundWithCircle import com.unciv.ui.components.extensions.surroundWithCircle
import com.unciv.ui.components.extensions.surroundWithThinCircle
import com.unciv.ui.components.extensions.toLabel import com.unciv.ui.components.extensions.toLabel
import com.unciv.ui.components.input.KeyShortcutDispatcherVeto import com.unciv.ui.components.input.KeyShortcutDispatcherVeto
import com.unciv.ui.components.input.KeyboardBinding import com.unciv.ui.components.input.KeyboardBinding
@ -193,18 +195,25 @@ class MainMenuScreen: BaseScreen(), RecreateOnResize {
game.popScreen() game.popScreen()
} }
val helpButton = "?".toLabel(fontSize = 48) val civilopediaButton = "?".toLabel(fontSize = 48)
.apply { setAlignment(Align.center) } .apply { setAlignment(Align.center) }
.surroundWithCircle(60f, color = skinStrings.skinConfig.baseColor) .surroundWithCircle(60f, color = skinStrings.skinConfig.baseColor)
.apply { actor.y -= 2.5f } // compensate font baseline (empirical) .apply { actor.y -= 2.5f } // compensate font baseline (empirical)
.surroundWithCircle(64f, resizeActor = false) .surroundWithCircle(64f, resizeActor = false)
helpButton.touchable = Touchable.enabled civilopediaButton.touchable = Touchable.enabled
// Passing the binding directly to onActivation gives you a size 26 tooltip... // Passing the binding directly to onActivation gives you a size 26 tooltip...
helpButton.onActivation { openCivilopedia() } civilopediaButton.onActivation { openCivilopedia() }
helpButton.keyShortcuts.add(KeyboardBinding.Civilopedia) civilopediaButton.keyShortcuts.add(KeyboardBinding.Civilopedia)
helpButton.addTooltip(KeyboardBinding.Civilopedia, 30f) civilopediaButton.addTooltip(KeyboardBinding.Civilopedia, 30f)
helpButton.setPosition(30f, 30f) civilopediaButton.setPosition(30f, 30f)
stage.addActor(helpButton) stage.addActor(civilopediaButton)
val discordButton = ImageGetter.getImage("OtherIcons/Discord")
.surroundWithCircle(60f, color = skinStrings.skinConfig.baseColor)
.surroundWithThinCircle(Color.WHITE)
.onActivation { Gdx.net.openURI("https://discord.gg/bjrB4Xw") }
discordButton.setPosition(stage.width-30f-discordButton.width, 30f)
stage.addActor(discordButton)
val versionLabel = "{Version} ${UncivGame.VERSION.text}".toLabel() val versionLabel = "{Version} ${UncivGame.VERSION.text}".toLabel()