diff --git a/android/assets/jsons/translationsByLanguage/Czech.properties b/android/assets/jsons/translationsByLanguage/Czech.properties index 55ff23ab..2f5ffe4b 100644 --- a/android/assets/jsons/translationsByLanguage/Czech.properties +++ b/android/assets/jsons/translationsByLanguage/Czech.properties @@ -677,6 +677,8 @@ We have discovered the lost technology of [techName] in the ruins! = V troskách A [unitName] has joined us! = Jednotka [unitName] se přidala na naši stranu! An ancient tribe trains our [unitName] in their ways of combat! = Starodávný kmen cvičí naši jednotku [unitName] v jejich bojových uměních! We have found a stash of [amount] gold in the ruins! = Skrýš, která obsahovala [amount] zlata byla objevena v ruinách! + # Requires translation! +We have found a crudely-drawn map in the ruins! = [unit] finished exploring. = Jednotka [unit] dokončila průzkum. [unit] has no work to do. = Jednotka [unit] nemá nic dalšího na práci. You're losing control of [name]. = Ztratili jsme přátelství s městským státem [name]. diff --git a/android/assets/jsons/translationsByLanguage/Dutch.properties b/android/assets/jsons/translationsByLanguage/Dutch.properties index 1be58b1b..4da31399 100644 --- a/android/assets/jsons/translationsByLanguage/Dutch.properties +++ b/android/assets/jsons/translationsByLanguage/Dutch.properties @@ -1072,6 +1072,8 @@ A [unitName] has joined us! = Een [unitName] heeft zich bij ons aangesloten! An ancient tribe trains our [unitName] in their ways of combat! = Een oude stam traint onze [unitName] in hun manier van vechten! We have found a stash of [amount] gold in the ruins! = We hebben een voorraad [amount] Goud gevonden in de ruïnes! # Requires translation! +We have found a crudely-drawn map in the ruins! = + # Requires translation! [unit] finished exploring. = # Requires translation! [unit] has no work to do. = diff --git a/android/assets/jsons/translationsByLanguage/English.properties b/android/assets/jsons/translationsByLanguage/English.properties index f821194e..6a96f2a2 100644 --- a/android/assets/jsons/translationsByLanguage/English.properties +++ b/android/assets/jsons/translationsByLanguage/English.properties @@ -1196,6 +1196,8 @@ An ancient tribe trains our [unitName] in their ways of combat! = # Requires translation! We have found a stash of [amount] gold in the ruins! = # Requires translation! +We have found a crudely-drawn map in the ruins! = + # Requires translation! [unit] finished exploring. = # Requires translation! [unit] has no work to do. = diff --git a/android/assets/jsons/translationsByLanguage/French.properties b/android/assets/jsons/translationsByLanguage/French.properties index 7f82acd3..8c050ea6 100644 --- a/android/assets/jsons/translationsByLanguage/French.properties +++ b/android/assets/jsons/translationsByLanguage/French.properties @@ -667,6 +667,8 @@ We have discovered the lost technology of [techName] in the ruins! = Nous avons A [unitName] has joined us! = Un(e) [unitName] nous a rejoint! An ancient tribe trains our [unitName] in their ways of combat! = Une tribue ancienne a entrainée notre [unitName] au combat We have found a stash of [amount] gold in the ruins! = Nous avons trouvés un tas de [amount] ors dans les ruines! + # Requires translation! +We have found a crudely-drawn map in the ruins! = [unit] finished exploring. = [unit] a fini d'explorer [unit] has no work to do. = [unit] n'a rien à faire You're losing control of [name]. = Vous perdez le contrôle de [name] @@ -951,7 +953,6 @@ Clear improvements = Effacer les améliorations Clear resource = Effacer les ressources Requires = Requiert Menu = Menu - # Requires translation! Brush Size = Taille de Brosse # Civilopedia Tutorials names diff --git a/android/assets/jsons/translationsByLanguage/German.properties b/android/assets/jsons/translationsByLanguage/German.properties index 0783a06f..90742c40 100644 --- a/android/assets/jsons/translationsByLanguage/German.properties +++ b/android/assets/jsons/translationsByLanguage/German.properties @@ -680,6 +680,8 @@ We have discovered the lost technology of [techName] in the ruins! = Wir haben d A [unitName] has joined us! = Ein(e) [unitName] hat sich uns angeschlossen! An ancient tribe trains our [unitName] in their ways of combat! = Ein antiker Stamm bringt unserer(em) [unitName] dessen Kampftechniken bei! We have found a stash of [amount] gold in the ruins! = Wir haben [amount] Gold in den Ruinen gefunden! + # Requires translation! +We have found a crudely-drawn map in the ruins! = [unit] finished exploring. = [unit] hat die Erkundung abgeschlossen. [unit] has no work to do. = [unit] hat keine Arbeit mehr. You're losing control of [name]. = Die Freundschaft mit [name] wird brüchig. diff --git a/android/assets/jsons/translationsByLanguage/Indonesian.properties b/android/assets/jsons/translationsByLanguage/Indonesian.properties index 3e39a908..f3ad7941 100644 --- a/android/assets/jsons/translationsByLanguage/Indonesian.properties +++ b/android/assets/jsons/translationsByLanguage/Indonesian.properties @@ -683,6 +683,8 @@ We have discovered the lost technology of [techName] in the ruins! = Kita telah A [unitName] has joined us! = Seorang [unitName] telah bergabung dengan kita! An ancient tribe trains our [unitName] in their ways of combat! = Sebuah suku kuno melatih [unitName] kita dalam cara bertarung! We have found a stash of [amount] gold in the ruins! = Kita telah menemukan [amount] emas di reruntuhan + # Requires translation! +We have found a crudely-drawn map in the ruins! = [unit] finished exploring. = [unit] selesai menjelajah. [unit] has no work to do. = [unit] tidak punya pekerjaan lain. You're losing control of [name]. = Anda kehilangan kendali dari [name] diff --git a/android/assets/jsons/translationsByLanguage/Italian.properties b/android/assets/jsons/translationsByLanguage/Italian.properties index efc213cb..f7ff5f33 100644 --- a/android/assets/jsons/translationsByLanguage/Italian.properties +++ b/android/assets/jsons/translationsByLanguage/Italian.properties @@ -665,6 +665,8 @@ We have discovered the lost technology of [techName] in the ruins! = Abbiamo sco A [unitName] has joined us! = L'unità [unitName] si è unita a noi! An ancient tribe trains our [unitName] in their ways of combat! = Un'antica tribù ha addestrato la nostra unità [unitName] nelle loro arti della guerra! We have found a stash of [amount] gold in the ruins! = Abbiamo trovato un tesoro di [amount] pezzi d'oro nelle rovine! + # Requires translation! +We have found a crudely-drawn map in the ruins! = [unit] finished exploring. = [unit] non sta più esplorando. [unit] has no work to do. = [unit] è ora inattivo. You're losing control of [name]. = Stai perdendo il controllo di [name]. diff --git a/android/assets/jsons/translationsByLanguage/Korean.properties b/android/assets/jsons/translationsByLanguage/Korean.properties index c12e8a84..24d30bdd 100644 --- a/android/assets/jsons/translationsByLanguage/Korean.properties +++ b/android/assets/jsons/translationsByLanguage/Korean.properties @@ -700,6 +700,8 @@ We have discovered the lost technology of [techName] in the ruins! = 고대 유 A [unitName] has joined us! = [unitName]이(가) 아군이 되었습니다! An ancient tribe trains our [unitName] in their ways of combat! = 아군 [unitName]이(가) 고대 부족으로부터 전투 훈련을 받았습니다! We have found a stash of [amount] gold in the ruins! = 고대 유적에서 금 [amount]을(를) 찾았습니다! + # Requires translation! +We have found a crudely-drawn map in the ruins! = [unit] finished exploring. = [unit]의 탐사가 끝났습니다. [unit] has no work to do. = [unit]이(가) 할 수 있는 작업이 없습니다. You're losing control of [name]. = 도시 국가 [name]에 대한 영향력을 잃기 직전입니다. diff --git a/android/assets/jsons/translationsByLanguage/Malay.properties b/android/assets/jsons/translationsByLanguage/Malay.properties index b223d8c4..e471385c 100644 --- a/android/assets/jsons/translationsByLanguage/Malay.properties +++ b/android/assets/jsons/translationsByLanguage/Malay.properties @@ -1085,6 +1085,8 @@ An ancient tribe trains our [unitName] in their ways of combat! = # Requires translation! We have found a stash of [amount] gold in the ruins! = # Requires translation! +We have found a crudely-drawn map in the ruins! = + # Requires translation! [unit] finished exploring. = # Requires translation! [unit] has no work to do. = diff --git a/android/assets/jsons/translationsByLanguage/Polish.properties b/android/assets/jsons/translationsByLanguage/Polish.properties index 91eb9298..4fa02ae7 100644 --- a/android/assets/jsons/translationsByLanguage/Polish.properties +++ b/android/assets/jsons/translationsByLanguage/Polish.properties @@ -667,6 +667,8 @@ We have discovered the lost technology of [techName] in the ruins! = Odkryliśmy A [unitName] has joined us! = [unitName] włączyła się w nasze szeregi! An ancient tribe trains our [unitName] in their ways of combat! = Starożytne plemie nauczyło jednostkę [unitName] ich sztuk walki! We have found a stash of [amount] gold in the ruins! = Znaleźliśmy w ruinach [amount] złota! + # Requires translation! +We have found a crudely-drawn map in the ruins! = [unit] finished exploring. = Jednostka [unit] zakończyła eksplorację. [unit] has no work to do. = Jednostka [unit] jest bez zajęcia. You're losing control of [name]. = Tracisz kontrolę nad [name]. diff --git a/android/assets/jsons/translationsByLanguage/Portuguese.properties b/android/assets/jsons/translationsByLanguage/Portuguese.properties index 15186370..7e115932 100644 --- a/android/assets/jsons/translationsByLanguage/Portuguese.properties +++ b/android/assets/jsons/translationsByLanguage/Portuguese.properties @@ -701,6 +701,8 @@ A [unitName] has joined us! = Um [unitName] se juntou a nós! An ancient tribe trains our [unitName] in their ways of combat! = Uma antiga tribo treina nosso [unitName] em suas formas de combate! We have found a stash of [amount] gold in the ruins! = Encontramos um estoque de [amount] de ouro nas ruínas! # Requires translation! +We have found a crudely-drawn map in the ruins! = + # Requires translation! [unit] finished exploring. = # Requires translation! [unit] has no work to do. = diff --git a/android/assets/jsons/translationsByLanguage/Romanian.properties b/android/assets/jsons/translationsByLanguage/Romanian.properties index d11ab109..e9a890ad 100644 --- a/android/assets/jsons/translationsByLanguage/Romanian.properties +++ b/android/assets/jsons/translationsByLanguage/Romanian.properties @@ -979,6 +979,8 @@ A [unitName] has joined us! = Un [unitName] ni s-a alăturat! An ancient tribe trains our [unitName] in their ways of combat! = Un trib străvechi ne invață un [unitName] metodele lor de luptă! We have found a stash of [amount] gold in the ruins! = Am descoperit un depozit de [amount] aur printre ruine! # Requires translation! +We have found a crudely-drawn map in the ruins! = + # Requires translation! [unit] finished exploring. = # Requires translation! [unit] has no work to do. = diff --git a/android/assets/jsons/translationsByLanguage/Russian.properties b/android/assets/jsons/translationsByLanguage/Russian.properties index 1293e8bd..b30f287b 100644 --- a/android/assets/jsons/translationsByLanguage/Russian.properties +++ b/android/assets/jsons/translationsByLanguage/Russian.properties @@ -667,6 +667,8 @@ We have discovered the lost technology of [techName] in the ruins! = Мы обн A [unitName] has joined us! = [unitName] присоединился к нам! An ancient tribe trains our [unitName] in their ways of combat! = Древнее племя обучает наших [unitName] своим способам ведения боя! We have found a stash of [amount] gold in the ruins! = Мы нашли сундук с [amount] золота в руинах! + # Requires translation! +We have found a crudely-drawn map in the ruins! = [unit] finished exploring. = [unit] завершил исследование местности. [unit] has no work to do. = [unit] завершил все доступные работы. You're losing control of [name]. = Вы теряете влияние на [name]. diff --git a/android/assets/jsons/translationsByLanguage/Simplified_Chinese.properties b/android/assets/jsons/translationsByLanguage/Simplified_Chinese.properties index d13c21f8..3354e6a9 100644 --- a/android/assets/jsons/translationsByLanguage/Simplified_Chinese.properties +++ b/android/assets/jsons/translationsByLanguage/Simplified_Chinese.properties @@ -678,6 +678,8 @@ We have discovered the lost technology of [techName] in the ruins! = 我们在 A [unitName] has joined us! = [unitName]加入了我们！ An ancient tribe trains our [unitName] in their ways of combat! = 一个古老的部落以他们的战斗方式训练了我们的[unitName]！ We have found a stash of [amount] gold in the ruins! = 我们在废墟中找到了[amount]金钱！ + # Requires translation! +We have found a crudely-drawn map in the ruins! = [unit] finished exploring. = [unit]已完成探索 [unit] has no work to do. = [unit]处于闲置状态 You're losing control of [name]. = 您正在失去与[name]的脆弱友谊 diff --git a/android/assets/jsons/translationsByLanguage/Spanish.properties b/android/assets/jsons/translationsByLanguage/Spanish.properties index b8985cb7..5f513557 100644 --- a/android/assets/jsons/translationsByLanguage/Spanish.properties +++ b/android/assets/jsons/translationsByLanguage/Spanish.properties @@ -671,6 +671,8 @@ We have discovered the lost technology of [techName] in the ruins! = ¡Hemos des A [unitName] has joined us! = ¡Un [unitName] se ha unido a nosotros! An ancient tribe trains our [unitName] in their ways of combat! = ¡Una antigua tribu entrena a nuestros [unitName] en sus formas de combate! We have found a stash of [amount] gold in the ruins! = ¡Hemos encontrado un alijo de [amount] de oro en las ruinas! + # Requires translation! +We have found a crudely-drawn map in the ruins! = [unit] finished exploring. = [unit] terminó de explorar. [unit] has no work to do. = [unit] no tiene trabajo. You're losing control of [name]. = Estás perdiendo el control de [name]. diff --git a/android/assets/jsons/translationsByLanguage/Traditional_Chinese.properties b/android/assets/jsons/translationsByLanguage/Traditional_Chinese.properties index 7c8bed17..eb73e88c 100644 --- a/android/assets/jsons/translationsByLanguage/Traditional_Chinese.properties +++ b/android/assets/jsons/translationsByLanguage/Traditional_Chinese.properties @@ -678,6 +678,8 @@ We have discovered the lost technology of [techName] in the ruins! = 我們在 A [unitName] has joined us! = [unitName]加入了我們！ An ancient tribe trains our [unitName] in their ways of combat! = 一個古老的部落以他們的戰鬥方式訓練了我們的[unitName]！ We have found a stash of [amount] gold in the ruins! = 我們在廢墟中找到了[amount]金錢！ + # Requires translation! +We have found a crudely-drawn map in the ruins! = [unit] finished exploring. = [unit]已完成探索 [unit] has no work to do. = [unit]處於閒置狀態 You're losing control of [name]. = 您正在失去與[name]的脆弱友誼 diff --git a/android/assets/jsons/translationsByLanguage/Ukrainian.properties b/android/assets/jsons/translationsByLanguage/Ukrainian.properties index 4750bc77..364b8ee8 100644 --- a/android/assets/jsons/translationsByLanguage/Ukrainian.properties +++ b/android/assets/jsons/translationsByLanguage/Ukrainian.properties @@ -667,6 +667,8 @@ We have discovered the lost technology of [techName] in the ruins! = В руїн A [unitName] has joined us! = До нас приєднався підрозділ [unitName]! An ancient tribe trains our [unitName] in their ways of combat! = Давнє племʼя навчило їхнього способу битви наш підрозділ [unitName]! We have found a stash of [amount] gold in the ruins! = В руїнах знайдено скарб золота кількістю [amount]! + # Requires translation! +We have found a crudely-drawn map in the ruins! = [unit] finished exploring. = Підрозділ [unit] закінчив обстеження. [unit] has no work to do. = Підрозділ [unit] без роботи. You're losing control of [name]. = Втрачається контроль над містом-державою [name]. diff --git a/android/assets/jsons/translationsByLanguage/template.properties b/android/assets/jsons/translationsByLanguage/template.properties index 2a3159e7..76e22d5f 100644 --- a/android/assets/jsons/translationsByLanguage/template.properties +++ b/android/assets/jsons/translationsByLanguage/template.properties @@ -665,6 +665,7 @@ We have discovered the lost technology of [techName] in the ruins! = A [unitName] has joined us! = An ancient tribe trains our [unitName] in their ways of combat! = We have found a stash of [amount] gold in the ruins! = +We have found a crudely-drawn map in the ruins! = [unit] finished exploring. = [unit] has no work to do. = You're losing control of [name]. = diff --git a/core/src/com/unciv/logic/map/MapUnit.kt b/core/src/com/unciv/logic/map/MapUnit.kt index a0651b9f..546d9ec2 100644 --- a/core/src/com/unciv/logic/map/MapUnit.kt +++ b/core/src/com/unciv/logic/map/MapUnit.kt @@ -15,6 +15,7 @@ import com.unciv.models.ruleset.tile.TerrainType import com.unciv.models.ruleset.unit.BaseUnit import com.unciv.models.ruleset.unit.UnitType import java.text.DecimalFormat +import kotlin.random.Random class MapUnit { @@ -63,6 +64,12 @@ class MapUnit { var promotions = UnitPromotions() var due: Boolean = true + companion object { + private const val ANCIENT_RUIN_MAP_REVEAL_OFFSET = 4 + private const val ANCIENT_RUIN_MAP_REVEAL_RANGE = 4 + private const val ANCIENT_RUIN_MAP_REVEAL_CHANCE = 0.8f + } + //region pure functions fun clone(): MapUnit { val toReturn = MapUnit() @@ -507,6 +514,17 @@ class MapUnit { civInfo.addNotification("We have found a stash of [$amount] gold in the ruins!",tile.position, Color.GOLD) } + // Map of the surrounding area + actions.add { + val revealCenter = tile.getTilesAtDistance(ANCIENT_RUIN_MAP_REVEAL_OFFSET).random() + val tilesToReveal = revealCenter + .getTilesInDistance(ANCIENT_RUIN_MAP_REVEAL_RANGE) + .filter { Random.nextFloat() < ANCIENT_RUIN_MAP_REVEAL_CHANCE } + .map { it.position } + civInfo.exploredTiles.addAll(tilesToReveal) + civInfo.addNotification("We have found a crudely-drawn map in the ruins!", tile.position, Color.RED) + } + (actions.random())() }