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

Issue#2019 (#2051)

Browse Source 
* Issue#2019
Player should not be able to nuke a civilsation that it has a peace treaty with

* wordlscreen is updated when notification shown (#2019)

* Fixed PR comments #2019

* issue #2019

* Fixed PR comments #2019

* Fixed PR comments #2019

* Fixed PR comments #2019
refactoring

* Fixed PR comments #2019
removed unnecessary line
This commit is contained in:
Yair Morgenstern
2020-03-05 22:50:23 +02:00
committed by GitHub
parent 82ab66ad05
commit 7bd0365a8e
2 changed files with 27 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/com/unciv/logic/civilization/diplomacy/DiplomacyManager.kt
View File

@ -185,6 +185,8 @@ class DiplomacyManager() {
}
fun canDeclareWar() = (turnsToPeaceTreaty()==0 && diplomaticStatus != DiplomaticStatus.War)
//Used for nuke
fun canAttack() = (turnsToPeaceTreaty()==0)
fun goldPerTurn():Int{
var goldPerTurnForUs = 0

30
core/src/com/unciv/ui/worldscreen/bottombar/BattleTable.kt
View File

@ -12,6 +12,7 @@ import com.unciv.UncivGame
import com.unciv.logic.automation.BattleHelper
import com.unciv.logic.automation.UnitAutomation
import com.unciv.logic.battle.*
import com.unciv.logic.civilization.Notification
import com.unciv.logic.map.TileInfo
import com.unciv.models.AttackableTile
import com.unciv.models.translations.tr
@ -236,11 +237,29 @@ class BattleTable(val worldScreen: WorldScreen): Table() {
attackerNameWrapper.add(UnitGroup(attacker.unit,25f)).padRight(5f)
attackerNameWrapper.add(attackerLabel)
add(attackerNameWrapper)
var canNuke = true
val defenderNameWrapper = Table()
for (tile in targetTile.getTilesInDistance(Battle.NUKE_RADIUS)) {
//To make sure we dont nuke civilisations we cant declare war with
val attackerCiv = attacker.getCivInfo()
val defenderTileCiv = tile.getCity()?.civInfo
if(defenderTileCiv != null && defenderTileCiv.knows(attackerCiv)) {
val canAttackDefenderCiv = attackerCiv.getDiplomacyManager(defenderTileCiv).canAttack()
canNuke = canNuke && canAttackDefenderCiv
}
val defender = tryGetDefenderAtTile(tile, true)
if (defender == null) continue
val defenderUnitCiv = defender.getCivInfo()
if( defenderUnitCiv.knows(attackerCiv))
{
val canAttackDefenderUnitCiv = attackerCiv.getDiplomacyManager(defenderUnitCiv).canAttack()
canNuke = canNuke && canAttackDefenderUnitCiv
}
val defenderLabel = Label(defender.getName().tr(), skin)
when (defender) {
is MapUnitCombatant ->
@ -263,16 +282,17 @@ class BattleTable(val worldScreen: WorldScreen): Table() {
val canReach = attacker.unit.currentTile.getTilesInDistance(attacker.unit.getRange()).contains(targetTile)
if (!worldScreen.isPlayersTurn || !attacker.canAttack() || !canReach) {
if (!worldScreen.isPlayersTurn || !attacker.canAttack() || !canReach || !canNuke) {
attackButton.disable()
attackButton.label.color = Color.GRAY
}
else {
attackButton.onClick {
try {
Battle.nuke(attacker, targetTile)
worldScreen.mapHolder.unitActionOverlay?.remove() // the overlay was one of attacking
worldScreen.shouldUpdate = true
Battle.nuke(attacker, targetTile)
worldScreen.mapHolder.unitActionOverlay?.remove() // the overlay was one of attacking
worldScreen.shouldUpdate = true
}
catch (ex:Exception){
openBugReportPopup()