wbrawner/Unciv
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Added diplomatic reprecissions for demands that the other civs is unwilling to fulfil

Browse source 
Removed WeAgreedNotToSettleNearThem flag - was reverse copy of AgreedNotToSettleNearUs
This commit is contained in:
Yair Morgenstern 2019-06-10 16:19:04 +03:00
parent d5a0894f75
commit 96ee91cb08
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
core/src/com/unciv/logic/automation/SpecificUnitAutomation.kt
View file

@ -84,8 +84,9 @@ class SpecificUnitAutomation{
val tilesNearCities = unit.civInfo.gameInfo.civilizations.flatMap { it.cities } val tilesNearCities = unit.civInfo.gameInfo.civilizations.flatMap { it.cities }
.flatMap { .flatMap {
val distanceAwayFromCity = val distanceAwayFromCity =
if (it.civInfo.knows(unit.civInfo.civName) if (unit.civInfo.knows(it.civInfo.civName)
&& it.civInfo.getDiplomacyManager(unit.civInfo).hasFlag(DiplomacyFlags.WeAgreedNotToSettleNearThem)) // If the CITY OWNER knows that the UNIT OWNER agreed not to settle near them
&& it.civInfo.getDiplomacyManager(unit.civInfo).hasFlag(DiplomacyFlags.AgreedToNotSettleNearUs))
6 6
else 3 else 3
it.getCenterTile().getTilesInDistance(distanceAwayFromCity) it.getCenterTile().getTilesInDistance(distanceAwayFromCity)

1
core/src/com/unciv/logic/civilization/diplomacy/DiplomacyManager.kt
View file

@ -31,7 +31,6 @@ enum class DiplomacyFlags{
BorderConflict, BorderConflict,
SettledCitiesNearUs, SettledCitiesNearUs,
AgreedToNotSettleNearUs, AgreedToNotSettleNearUs,
WeAgreedNotToSettleNearThem,
IgnoreThemSettlingNearUs IgnoreThemSettlingNearUs
} }

2
core/src/com/unciv/ui/trade/DiplomacyScreen.kt
View file

@ -279,7 +279,7 @@ class DiplomacyScreen:CameraStageBaseScreen() {
val threatLevel = Automation().threatAssessment(otherCiv,currentPlayerCiv) val threatLevel = Automation().threatAssessment(otherCiv,currentPlayerCiv)
if(threatLevel>ThreatLevel.Medium){ if(threatLevel>ThreatLevel.Medium){
setRightSideFlavorText(otherCiv,"Very well, we shall look for new lands to settle.","Excellent!") setRightSideFlavorText(otherCiv,"Very well, we shall look for new lands to settle.","Excellent!")
otherCiv.getDiplomacyManager(currentPlayerCiv).setFlag(DiplomacyFlags.WeAgreedNotToSettleNearThem,100) currentPlayerCiv.getDiplomacyManager(otherCiv).setFlag(DiplomacyFlags.AgreedToNotSettleNearUs,100)
} }
else { else {
setRightSideFlavorText(otherCiv,"We shall do as we please.","Very well.") setRightSideFlavorText(otherCiv,"We shall do as we please.","Very well.")