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

City-state alliance Bugfix

Browse source
This commit is contained in:
Yair Morgenstern 2019-11-11 21:07:16 +02:00
parent 2bd9a2fbd6
commit b0e29c5d3c
4 changed files with 21 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
android/assets/jsons/Translations/Notifications.json
View file

@ -675,14 +675,14 @@
Ukrainian:"Розірвано альянс з містом-державою [name]"
}
"[civName] gave us a [untiName] as gift near [cityName]!":{ // When a city state gives a unit as gift.
Italian:"[civName] ci ha dato [untiName] come regalo vicino a [cityName]!"
French:"[civName] nous offre un(e) [untiName] prêt de [cityName]!"
Russian:"[civName] передал нам в дар [untiName] около города [cityName]!"
Simplified_Chinese:"[civName]将[cityName]附近的[untiName]赠予我们！",
Traditional_Chinese:"[civName]將[cityName]附近的[untiName]贈與我們！",
Czech:"Civilizace [civName] nám darovala jednotku [untiName] poblíž města [cityName]"
Ukrainian:"Цивілізація [civName] дарує підрозділ [untiName] біля міста [cityName]"
"[civName] gave us a [unitName] as gift near [cityName]!":{ // When a city state gives a unit as gift.
Italian:"[civName] ci ha dato [unitName] come regalo vicino a [cityName]!"
French:"[civName] nous offre un(e) [unitName] prêt de [cityName]!"
Russian:"[civName] передал нам в дар [unitName] около города [cityName]!"
Simplified_Chinese:"[civName]将[cityName]附近的[unitName]赠予我们！",
Traditional_Chinese:"[civName]將[cityName]附近的[unitName]贈與我們！",
Czech:"Civilizace [civName] nám darovala jednotku [unitName] poblíž města [cityName]"
Ukrainian:"Цивілізація [civName] дарує підрозділ [unitName] біля міста [cityName]"
}
"[civName] has denounced us!":{

20
build.gradle
View file

@ -151,20 +151,20 @@ project(":core") {
*/
compile project(":core")
implementation project(":core")
compile "junit:junit:4.12"
compile "org.mockito:mockito-all:1.9.5"
implementation "junit:junit:4.12"
implementation "org.mockito:mockito-all:1.9.5"
compile "com.badlogicgames.gdx:gdx-backend-headless:$gdxVersion"
compile "com.badlogicgames.gdx:gdx:$gdxVersion"
implementation "com.badlogicgames.gdx:gdx-backend-headless:$gdxVersion"
implementation "com.badlogicgames.gdx:gdx:$gdxVersion"
testCompile 'junit:junit:4.12'
testCompile "org.mockito:mockito-all:1.9.5"
testImplementation 'junit:junit:4.12'
testImplementation "org.mockito:mockito-all:1.9.5"
testCompile "com.badlogicgames.gdx:gdx-backend-headless:$gdxVersion"
testCompile "com.badlogicgames.gdx:gdx:$gdxVersion"
testCompile "com.badlogicgames.gdx:gdx-platform:$gdxVersion:natives-desktop"
testImplementation "com.badlogicgames.gdx:gdx-backend-headless:$gdxVersion"
testImplementation "com.badlogicgames.gdx:gdx:$gdxVersion"
testImplementation "com.badlogicgames.gdx:gdx-platform:$gdxVersion:natives-desktop"
}
}}

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

@ -356,7 +356,7 @@ class DiplomacyManager() {
if (!otherCiv.isCityState()) {
for (thirdCiv in otherCiv.getKnownCivs()) {
if (thirdCiv.isCityState() && thirdCiv.getAllyCiv() == otherCiv.civName
&& thirdCiv.knows(otherCiv)
&& thirdCiv.knows(civInfo)
&& thirdCiv.getDiplomacyManager(civInfo).canDeclareWar()) {
thirdCiv.getDiplomacyManager(civInfo).declareWar()
}

4
desktop/build.gradle
View file

@ -55,6 +55,6 @@ task afterEclipseImport(description: "Post processing after project generation",
}
dependencies {
compile "com.badlogicgames.gdx:gdx-freetype-platform:$gdxVersion:natives-desktop"
compile project(path: ':core')
implementation "com.badlogicgames.gdx:gdx-freetype-platform:$gdxVersion:natives-desktop"
implementation project(path: ':core')
}