From ab26f66e1a2eccf8d1c8d7f1b01f9ae0f4755cb5 Mon Sep 17 00:00:00 2001 From: Yair Morgenstern Date: Sun, 1 Sep 2019 15:26:27 +0300 Subject: [PATCH] Implemented Alexander's unique - #563 --- android/assets/jsons/Nations.json | 2 -- .../jsons/Translations/Diplomacy,Trade,Nations.json | 7 +++++-- .../logic/civilization/diplomacy/DiplomacyManager.kt | 9 +++++++-- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/android/assets/jsons/Nations.json b/android/assets/jsons/Nations.json index a17588702f..1696b1f07a 100644 --- a/android/assets/jsons/Nations.json +++ b/android/assets/jsons/Nations.json @@ -66,10 +66,8 @@ outerColor:[181, 232, 232], innerColor:[68,142,249], - /* uniqueName:"Hellenic League", unique:"City-State Influence degrades at half and recovers at twice the normal rate", - */ cities:["Athens","Sparta","Corinth","Argos","Knossos","Mycenae","Pharsalos","Ephesus","Halicarnassus","Rhodes", "Eretria","Pergamon","Miletos","Megara","Phocaea","Sicyon","Tiryns","Samos","Mytilene","Chios", "Paros","Ellis","Syracuse","Herakleia","Gortyn","Chalkis","Pylos","Pella","Naxos"] diff --git a/android/assets/jsons/Translations/Diplomacy,Trade,Nations.json b/android/assets/jsons/Translations/Diplomacy,Trade,Nations.json index 2461538c42..6e2495d9b8 100644 --- a/android/assets/jsons/Translations/Diplomacy,Trade,Nations.json +++ b/android/assets/jsons/Translations/Diplomacy,Trade,Nations.json @@ -361,7 +361,7 @@ "Your so-called 'friendship' is worth nothing.":{ // When we have a decleration of friendship to someone and we declare war on them - Italian:"La tua cosiddetta 'amicizia' non vale nulla!" + Italian:"La tua cosiddetta 'amicizia' non vale nulla!" Portuguese:"Sua chamada 'amizade' não vale nada." French:"Votre soi-disant 'amitié' ne vaut rien." } @@ -748,7 +748,10 @@ "Alexander":{ Italian:"Alessandro" French:"Alexandre le Grand" - } + }, + + "City-State Influence degrades at half and recovers at twice the normal rate": { + }, "China":{ Italian:"Cina" diff --git a/core/src/com/unciv/logic/civilization/diplomacy/DiplomacyManager.kt b/core/src/com/unciv/logic/civilization/diplomacy/DiplomacyManager.kt index c4b193fffa..25ef94f81a 100644 --- a/core/src/com/unciv/logic/civilization/diplomacy/DiplomacyManager.kt +++ b/core/src/com/unciv/logic/civilization/diplomacy/DiplomacyManager.kt @@ -279,10 +279,15 @@ class DiplomacyManager() { } } + // City-state influence + val hasCityStateInfluenceBonus = + civInfo.nation.unique=="City-State Influence degrades at half and recovers at twice the normal rate" if (influence > 1) { - influence -= 1 + if(hasCityStateInfluenceBonus) influence -= 0.5f + else influence -= 1 } else if (influence < 1) { - influence += 1 + if(hasCityStateInfluenceBonus) influence += 2 + else influence += 1 } else influence = 0f }