mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-07-30 14:48:56 +07:00
Code Issues Packages Projects Releases Wiki Activity

Update city-state related icons and popups.

Browse Source
This commit is contained in:
Duan Tao
2019-05-08 17:16:44 +08:00
committed by Yair Morgenstern
parent 9ab02c8d22
commit 1434ca3f30
5 changed files with 357 additions and 324 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
android/Images/OtherIcons/CityState.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.2 KiB

645
android/assets/game.atlas
View File

File diff suppressed because it is too large Load Diff

BIN
android/assets/game.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 991 KiB

After

Width:  |  Height:  |  Size: 986 KiB

22
core/src/com/unciv/ui/trade/DiplomacyScreen.kt
View File

@ -10,6 +10,9 @@ import com.unciv.logic.civilization.CityStateType
import com.unciv.logic.civilization.CivilizationInfo
import com.unciv.logic.civilization.diplomacy.DiplomaticModifiers
import com.unciv.logic.civilization.diplomacy.RelationshipLevel
import com.unciv.logic.trade.TradeLogic
import com.unciv.logic.trade.TradeOffer
import com.unciv.logic.trade.TradeType
import com.unciv.models.gamebasics.tr
import com.unciv.models.stats.Stat
import com.unciv.ui.utils.*
@ -113,7 +116,24 @@ class DiplomacyScreen:CameraStageBaseScreen() {
val diplomacyManager = currentPlayerCiv.getDiplomacyManager(otherCiv)
if (!currentPlayerCiv.isAtWarWith(otherCiv)) {
if (currentPlayerCiv.isAtWarWith(otherCiv)) {
if (otherCiv.isCityState()) {
val PeaceButton = TextButton("Negociate Peace".tr(), skin)
PeaceButton.onClick {
YesNoPopupTable("Peace with [${otherCiv.civName}]?".tr(), {
diplomacyManager.makePeace()
updateLeftSideTable()
}, this)
val tradeLogic = TradeLogic(currentPlayerCiv, otherCiv)
tradeLogic.currentTrade.ourOffers.add(TradeOffer("Peace Treaty", TradeType.Treaty, 20))
tradeLogic.currentTrade.theirOffers.add(TradeOffer("Peace Treaty", TradeType.Treaty, 20))
tradeLogic.acceptTrade()
}
diplomacyTable.add(PeaceButton).row()
}
} else {
val declareWarButton = TextButton("Declare war".tr(), skin)
declareWarButton.color = Color.RED
val turnsToPeaceTreaty = diplomacyManager.turnsToPeaceTreaty()

14
core/src/com/unciv/ui/worldscreen/AlertPopup.kt
View File

@ -49,10 +49,16 @@ class AlertPopup(val worldScreen: WorldScreen, val popupAlert: PopupAlert): Popu
add(getCloseButton("Farewell."))
}
AlertType.FirstContact -> {
val translatedNation = worldScreen.gameInfo.getCivilization(popupAlert.value).getTranslatedNation()
addLeaderName(translatedNation)
addGoodSizedLabel(translatedNation.introduction).row()
add(getCloseButton("A pleasure to meet you."))
val civ = worldScreen.gameInfo.getCivilization(popupAlert.value)
val translatedNation = civ.getTranslatedNation()
if (civ.isCityState()) {
addGoodSizedLabel("Type : " + civ.getCityStateType()).row()
add(getCloseButton("A pleasure to meet you."))
} else {
addLeaderName(translatedNation)
addGoodSizedLabel(translatedNation.introduction).row()
add(getCloseButton("A pleasure to meet you."))
}
}
AlertType.CityConquered -> {
addGoodSizedLabel("What would you like to do with the city?").row()