This commit is contained in:
Yair Morgenstern 2021-05-01 23:05:30 +03:00
parent 73d35b28b7
commit 94c0995b23
29 changed files with 79 additions and 36 deletions

View File

@ -736,7 +736,8 @@ Puppeted cities do not increase your tech or policy cost, but their citizens gen
You have no control over the the production of puppeted cities. = Você não tem controle sobre a produção de Cidades Fantoche.
Puppeted cities also generate 25% less Gold and Science. = Cidades Fantoche também geram 25% menos de ouro e ciência.
A puppeted city can be annexed at any time. = Uma Cidade Fantoche pode ser anexada a qualquer momento.
Liberate = Libertar
# Requires translation!
Liberate (city returns to [originalOwner]) =
Liberating a city returns it to its original owner, giving you a massive relationship boost with them! = Libertar uma cidade retorna-a para seu proprietário original, dando a você um enorme impulso de relacionamento com ele!
Raze = Queimar
Razing the city annexes it, and starts razing the city to the ground. = Queimar a cidade a anexa, e ela começa a ser queimada á cinzas.

View File

@ -725,7 +725,8 @@ Puppeted cities do not increase your tech or policy cost, but their citizens gen
You have no control over the the production of puppeted cities. = Нямате контрол над продукцията в градовете кукли
Puppeted cities also generate 25% less Gold and Science. = Също така градовете кукли произвеждат 25% по-малко пари и наука.
A puppeted city can be annexed at any time. = Град кукла може да бъде присъединен по всяко време.
Liberate = Освобождаване
# Requires translation!
Liberate (city returns to [originalOwner]) =
Liberating a city returns it to its original owner, giving you a massive relationship boost with them! = Освобождаването на град връща града на официалният си собственик, давайки Ви огромен тласък на връзката Ви с тях!
Raze = Сриване
Razing the city annexes it, and starts razing the city to the ground. = Сриването на град присъединява града и започва да го разрушава.

View File

@ -721,7 +721,8 @@ Puppeted cities do not increase your tech or policy cost, but their citizens gen
You have no control over the the production of puppeted cities. = Nemáme kontrolu nad produkcí ve městech s loutkovou vládou.
Puppeted cities also generate 25% less Gold and Science. = Města s loutkovou vládou také poskytují o 25% méně zlata a výzkumu.
A puppeted city can be annexed at any time. = Město s loutkovou vládou lze kdykoliv anektovat.
Liberate = Osvobodit
# Requires translation!
Liberate (city returns to [originalOwner]) =
Liberating a city returns it to its original owner, giving you a massive relationship boost with them! = Osvobozené město se vrátí zpět k původnímu majiteli, což vám přinese masivní zlepšení vzájemných vztahů.
Raze = Vyhladit
Razing the city annexes it, and starts razing the city to the ground. = Vyhlazování města zároveň způsobí jeho anektování a započne srovnávání města ze zemí.

View File

@ -725,7 +725,8 @@ Puppeted cities do not increase your tech or policy cost, but their citizens gen
You have no control over the the production of puppeted cities. = Je hebt geen controle over de productie van poppensteden.
Puppeted cities also generate 25% less Gold and Science. = Poppensteden genereren 25% minder goud en wetenschap.
A puppeted city can be annexed at any time. = Een poppenstad kan ten allen tijde geannexeerd worden.
Liberate = Bevrijd
# Requires translation!
Liberate (city returns to [originalOwner]) =
Liberating a city returns it to its original owner, giving you a massive relationship boost with them! = Een stad bevrijden geeft het terug aan de originele eigenaar, wat zorgt voor een grote relatieboost met hen.
Raze = Uitwissen
Razing the city annexes it, and starts razing the city to the ground. = De uitwissing van de stad annexeerd het en begint de uitwissing tot de grond.

View File

@ -1361,7 +1361,7 @@ Puppeted cities also generate 25% less Gold and Science. =
# Requires translation!
A puppeted city can be annexed at any time. =
# Requires translation!
Liberate =
Liberate (city returns to [originalOwner]) =
# Requires translation!
Liberating a city returns it to its original owner, giving you a massive relationship boost with them! =
# Requires translation!

View File

@ -775,7 +775,8 @@ Puppeted cities do not increase your tech or policy cost, but their citizens gen
You have no control over the the production of puppeted cities. = Et voi valita mitä nukkekaupunki tuottaa.
Puppeted cities also generate 25% less Gold and Science. = Nukkekaupungit myös tuottavat 25% vähemmän Kultaa ja Tiedettä
A puppeted city can be annexed at any time. = Nukkekaupungin voi ottaa hallintaan milloin vain.
Liberate = Vapauta
# Requires translation!
Liberate (city returns to [originalOwner]) =
Liberating a city returns it to its original owner, giving you a massive relationship boost with them! = Kaupungin vapauttaminen palauttaa sen sen alkuperäiselle omistajalle parantaen suhteitanne valtaisasti!
Raze = Polta
Razing the city annexes it, and starts razing the city to the ground. = Polttaminen ottaa kaupungin hallintaan ja aloittaa polttamisen maan tasalle.

View File

@ -724,7 +724,8 @@ Puppeted cities do not increase your tech or policy cost, but their citizens gen
You have no control over the the production of puppeted cities. = Vous ne contrôlez pas la production des cités fantoches.
Puppeted cities also generate 25% less Gold and Science. = Les cités fantoches produisent -25% en Or et Science.
A puppeted city can be annexed at any time. = Une cité fantoche peut être annexée à n'importe quel moment.
Liberate = Libérer
# Requires translation!
Liberate (city returns to [originalOwner]) =
Liberating a city returns it to its original owner, giving you a massive relationship boost with them! = Libérer une cité la renvoie à son propriétaire initial, vous donnant un bonus massif dans la relation que vous entretenez avec lui !
Raze = Raser
Razing the city annexes it, and starts razing the city to the ground. = Raser une ville l'annexe puis la rase jusqu'au sol.

View File

@ -721,7 +721,8 @@ Puppeted cities do not increase your tech or policy cost, but their citizens gen
You have no control over the the production of puppeted cities. = Ihr habt keine Kontrolle über die Produktion von Marionettenstädten.
Puppeted cities also generate 25% less Gold and Science. = Marionettenstädte generieren 25% weniger Gold und Wissenschaft.
A puppeted city can be annexed at any time. = Eine Marionettenstadt kann jederzeit annektiert werden.
Liberate = Befreien
# Requires translation!
Liberate (city returns to [originalOwner]) =
Liberating a city returns it to its original owner, giving you a massive relationship boost with them! = Befreite Städte gehen wieder in den Besitz des vorherigen Besitzers über. Eure Beziehung wird sich dadurch massiv verbessern!
Raze = Niederreißen
Razing the city annexes it, and starts razing the city to the ground. = Niederreißen annektiert die Stadt zunächst und macht sie dem Erdboden gleich.

View File

@ -735,7 +735,8 @@ Puppeted cities do not increase your tech or policy cost, but their citizens gen
You have no control over the the production of puppeted cities. = Nincs befolyásod a leigázott városok termelésébe
Puppeted cities also generate 25% less Gold and Science. = 25%-al kevesebb aranyat és tudományt termelnek
A puppeted city can be annexed at any time. = A leigázott várost bármikor annektálhatod
Liberate = Felszabadítás
# Requires translation!
Liberate (city returns to [originalOwner]) =
Liberating a city returns it to its original owner, giving you a massive relationship boost with them! = A felszabadított város visszakerül az eredeti tulajdonosához, ezzel hatalmas kapcsolati értékekre szert téve!
Raze = Lerombol
Razing the city annexes it, and starts razing the city to the ground. = Egy város lerombolása először annektálja azt, majd teljesen elpusztul.

View File

@ -724,7 +724,8 @@ Puppeted cities do not increase your tech or policy cost, but their citizens gen
You have no control over the the production of puppeted cities. = Anda tidak punya kontrol atas produksi kota boneka.
Puppeted cities also generate 25% less Gold and Science. = Kota boneka menghasilkan 25% lebih sedikit Emas dan Ilmu Pengetahuan.
A puppeted city can be annexed at any time. = Kota boneka dapat dicaplok kapan saja.
Liberate = Merdekakan
# Requires translation!
Liberate (city returns to [originalOwner]) =
Liberating a city returns it to its original owner, giving you a massive relationship boost with them! = Memerdekakan kota mengembalikannya kepada pemilik yang semula dan memberikan Anda dorongan yang besar dalam relasi dengan mereka!
Raze = Meruntuhkan
Razing the city annexes it, and starts razing the city to the ground. = Pilihan ini akan mencaplok kota, kemudian kota akan diruntuhkan rata dengan tanah.

View File

@ -721,7 +721,8 @@ Puppeted cities do not increase your tech or policy cost, but their citizens gen
You have no control over the the production of puppeted cities. = Non hai alcun controllo sulla produzione delle città fantoccio.
Puppeted cities also generate 25% less Gold and Science. = Gli stati fantoccio generano anche il 25% di Oro e Scienza in meno.
A puppeted city can be annexed at any time. = Puoi annettere una città fantoccio ogni volta che vuoi, ma ricorda che è un processo irreversibile.
Liberate = Libera
# Requires translation!
Liberate (city returns to [originalOwner]) =
Liberating a city returns it to its original owner, giving you a massive relationship boost with them! = Liberare una città la restituirà al suo possessore originale, dandoti un'enorme bonus diplomatico nei loro confronti!
Raze = Radi al suolo
Razing the city annexes it, and starts razing the city to the ground. = Questa opzione ti permetterà di annettere la città e poi di raderla al suolo.

View File

@ -724,7 +724,8 @@ Puppeted cities do not increase your tech or policy cost, but their citizens gen
You have no control over the the production of puppeted cities. = 生産を管理することができない。
Puppeted cities also generate 25% less Gold and Science. = 科学力、文化力-25%
A puppeted city can be annexed at any time. = 傀儡国家はいつでも併合できる。
Liberate = 解放
# Requires translation!
Liberate (city returns to [originalOwner]) =
Liberating a city returns it to its original owner, giving you a massive relationship boost with them! = 都市を開放すると、元の所有者に戻され、関係が改善する。
Raze = 焼却
Razing the city annexes it, and starts razing the city to the ground. = 都市を併合して破壊する。

View File

@ -737,7 +737,8 @@ Puppeted cities do not increase your tech or policy cost, but their citizens gen
You have no control over the the production of puppeted cities. = 괴뢰 도시는 어떤 것을 생산할 지 선택할 수 없습니다.
Puppeted cities also generate 25% less Gold and Science. = 괴뢰 도시는 또한 금과 과학을 25% 적게 생성합니다.
A puppeted city can be annexed at any time. = 괴뢰 도시는 언제든지 합병할 수 있습니다.
Liberate = 해방
# Requires translation!
Liberate (city returns to [originalOwner]) =
Liberating a city returns it to its original owner, giving you a massive relationship boost with them! = 해방된 도시는 원래 지도자에게 돌아가고 그들과의 관계가 크게 향상됩니다!
Raze = 불태우기
Razing the city annexes it, and starts razing the city to the ground. = 도시를 합병한 후 서서히 불태웁니다.

View File

@ -798,7 +798,8 @@ Puppeted cities do not increase your tech or policy cost, but their citizens gen
You have no control over the the production of puppeted cities. = Jūs negalite valdyti marionetinių miestų gamybos.
Puppeted cities also generate 25% less Gold and Science. = Miestai, iš kurių gaminami marionetai, taip pat sukuria 25% mažiau aukso ir mokslo.
A puppeted city can be annexed at any time. = Lėlių miestą galima bet kada aneksuoti.
Liberate = Išlaisvinti
# Requires translation!
Liberate (city returns to [originalOwner]) =
Liberating a city returns it to its original owner, giving you a massive relationship boost with them! = Išlaisvinęs miestą, jis grąžina jį pradiniam savininkui ir suteikia didžiulį ryšį su jais!
Raze = Išprievartauti
Razing the city annexes it, and starts razing the city to the ground. = Stebint miestą, jis pridedamas ir pradedamas siautėti miestas.

View File

@ -1211,7 +1211,8 @@ You have no control over the the production of puppeted cities. =
Puppeted cities also generate 25% less Gold and Science. =
# Requires translation!
A puppeted city can be annexed at any time. =
Liberate = Bebaskan
# Requires translation!
Liberate (city returns to [originalOwner]) =
# Requires translation!
Liberating a city returns it to its original owner, giving you a massive relationship boost with them! =
# Requires translation!

View File

@ -783,7 +783,8 @@ Puppeted cities do not increase your tech or policy cost, but their citizens gen
You have no control over the the production of puppeted cities. = Šomā hič kontoroli be sāḵt-o-sāz e šahr hāye mostaemere nadārid.
Puppeted cities also generate 25% less Gold and Science. = Šahr hāye mostaemere hamčenin 25% Talā va Elm e kamtari toolid mikonand.
A puppeted city can be annexed at any time. = Yek šahr e mostaemere harvağti mitavānad zamime šavad.
Liberate = Āzād Kardan
# Requires translation!
Liberate (city returns to [originalOwner]) =
Liberating a city returns it to its original owner, giving you a massive relationship boost with them! = Āzād kardan e yek šahr ān rā be sāheb e asli aš bar migardānad, yek komak bozorg dar ravābet e šomā bā ānhā mikonad!
Raze = Virān Kardan
Razing the city annexes it, and starts razing the city to the ground. = Virān karadn e šahr ānrā zamime mikonad, sepas šoro be virān kardan mikonad tā bā ḵāk yeksān šavad.

View File

@ -780,7 +780,8 @@ Puppeted cities do not increase your tech or policy cost, but their citizens gen
You have no control over the the production of puppeted cities. = Shomaa hich kontoroli be saakht-o-saaz e shahr haaye mostaemere nadaarid.
Puppeted cities also generate 25% less Gold and Science. = Shahr haaye mostaemere hamchenin 25% Talaa va Elm e kamtari toolid mikonand.
A puppeted city can be annexed at any time. = Yek shahr e mostaemere harvaghti mitavaanad zamime shavad.
Liberate = Aazaad Kardan
# Requires translation!
Liberate (city returns to [originalOwner]) =
Liberating a city returns it to its original owner, giving you a massive relationship boost with them! = Aazaad kardan e yek shahr aan raa be saaheb e asli ash bar migardaanad, yek komak bozorg dar ravaabet e shomaa baa aanhaa mikonad!
Raze = Viraan Kardan
Razing the city annexes it, and starts razing the city to the ground. = Viraan karadn e shahr aanraa zamime mikonad, sepas shoro be viraan kardan mikonad taa baa khaak yeksaan shavad.

View File

@ -723,7 +723,8 @@ Puppeted cities do not increase your tech or policy cost, but their citizens gen
You have no control over the the production of puppeted cities. = Nie masz kontroli nad produkcją w marionetkowych miastach.
Puppeted cities also generate 25% less Gold and Science. = Marionetkowe miasta generują również o 25% mniej Złota i Nauki.
A puppeted city can be annexed at any time. = Marionetkowe miasto może zostać w każdej chwili przyłączone do twego imperium.
Liberate = Wyzwól
# Requires translation!
Liberate (city returns to [originalOwner]) =
Liberating a city returns it to its original owner, giving you a massive relationship boost with them! = Wyzwolone państwa miasta wrócą pod kontrole ich pierwotnego właściciela. Zapewni ci to ogromną premię dyplomatyczną.
Raze = Wyburz
Razing the city annexes it, and starts razing the city to the ground. = Przyłączy to miasto do twojego imperium i rozpocznie proces wyburzania.

View File

@ -731,7 +731,8 @@ Puppeted cities do not increase your tech or policy cost, but their citizens gen
You have no control over the the production of puppeted cities. = Não tens controlo sobre a produção das cidades fantoche.
Puppeted cities also generate 25% less Gold and Science. = Cidade fantoche geram 25% menos Ouro e Ciência.
A puppeted city can be annexed at any time. = Uma cidade fantoche pode ser anexada a qualquer altura.
Liberate = Liberar
# Requires translation!
Liberate (city returns to [originalOwner]) =
Liberating a city returns it to its original owner, giving you a massive relationship boost with them! = Liberar uma cidade retorna-a para o seu dono original, dando-te um impulso massivo de relação com eles!|
Raze = Arrasar
Razing the city annexes it, and starts razing the city to the ground. = Arrasar a cidade anexa-a e começa a arrasá-la.

View File

@ -809,7 +809,8 @@ You have no control over the the production of puppeted cities. =
Puppeted cities also generate 25% less Gold and Science. =
# Requires translation!
A puppeted city can be annexed at any time. =
Liberate = Eliberează
# Requires translation!
Liberate (city returns to [originalOwner]) =
# Requires translation!
Liberating a city returns it to its original owner, giving you a massive relationship boost with them! =
Raze = Distruge

View File

@ -725,7 +725,8 @@ Puppeted cities do not increase your tech or policy cost, but their citizens gen
You have no control over the the production of puppeted cities. = Вы не имеете контроля над их производством.
Puppeted cities also generate 25% less Gold and Science. = Также города-сателлиты производят на 25% меньше золота и науки.
A puppeted city can be annexed at any time. = Город-сателлит можно аннексировать в любое время.
Liberate = Освободить
# Requires translation!
Liberate (city returns to [originalOwner]) =
Liberating a city returns it to its original owner, giving you a massive relationship boost with them! = Освобождение города возвращает его исходному владельцу и значительно улучшает отношения с ним!
Raze = Разрушить
Razing the city annexes it, and starts razing the city to the ground. = Присоединяет город к вашей стране и начинает разрушать его до состояния выжженой земли.

View File

@ -721,7 +721,8 @@ Puppeted cities do not increase your tech or policy cost, but their citizens gen
You have no control over the the production of puppeted cities. = 您无法控制已傀儡城市的产能。
Puppeted cities also generate 25% less Gold and Science. = 已傀儡城市的金钱和科研产出-25%。
A puppeted city can be annexed at any time. = 可以在任何时候选择吞并已傀儡城市。
Liberate = 解放
# Requires translation!
Liberate (city returns to [originalOwner]) =
Liberating a city returns it to its original owner, giving you a massive relationship boost with them! = “解放城市”会将该城市归还给初始拥有者,这样做会极大增进两者的关系!
Raze = 摧毁
Razing the city annexes it, and starts razing the city to the ground. = “摧毁城市”意味着吞并该城市,同时开始将该城市夷为平地。

View File

@ -721,7 +721,8 @@ Puppeted cities do not increase your tech or policy cost, but their citizens gen
You have no control over the the production of puppeted cities. = No puedes controlar la producción en las ciudades títeres.
Puppeted cities also generate 25% less Gold and Science. = Las ciudades títeres generan 25% menos de oro y ciencia.
A puppeted city can be annexed at any time. = Una ciudad títere puede ser anexada en cualquier momento.
Liberate = Liberar
# Requires translation!
Liberate (city returns to [originalOwner]) =
Liberating a city returns it to its original owner, giving you a massive relationship boost with them! = ¡Liberar una ciudad se la devolverá a su dueño original, dándote una mejora enorme en la relación con ellos!
Raze = Arrasar
Razing the city annexes it, and starts razing the city to the ground. = Arrasar una ciudad la anexara instantáneamente, y empezará a arrasarla hasta los cimientos.

View File

@ -721,7 +721,8 @@ Puppeted cities do not increase your tech or policy cost, but their citizens gen
You have no control over the the production of puppeted cities. = 您無法控制傀儡城市的產能。
Puppeted cities also generate 25% less Gold and Science. = 傀儡城市的金錢和科研產出-25%。
A puppeted city can be annexed at any time. = 可以在任何時候併吞傀儡城市。
Liberate = 解放
# Requires translation!
Liberate (city returns to [originalOwner]) =
Liberating a city returns it to its original owner, giving you a massive relationship boost with them! = “解放城市”會將該城市歸還給初始擁有者,這樣做會極大增進兩者的關係!
Raze = 摧毀
Razing the city annexes it, and starts razing the city to the ground. = “摧毀城市”意味著併吞該城市,同時開始將該城市夷為平地。

View File

@ -724,7 +724,8 @@ Puppeted cities do not increase your tech or policy cost, but their citizens gen
You have no control over the the production of puppeted cities. = Kukla şehirlerin üretimi üzerinde hiçbir kontrolünüz yoktur.
Puppeted cities also generate 25% less Gold and Science. = Kukla şehirler 25% daha az Altın ve Bilim üretir.
A puppeted city can be annexed at any time. = Kukla şehir istediğiniz zaman ilhak edilebilir.
Liberate = Özgürleştir
# Requires translation!
Liberate (city returns to [originalOwner]) =
Liberating a city returns it to its original owner, giving you a massive relationship boost with them! = Bir şehri özgürleştirmek, onu asıl sahibine geri verir ve onlarla büyük bir ilişki artışı sağlar!
Raze = Yık
Razing the city annexes it, and starts razing the city to the ground. = Şehri ilhak eder ve şehri yerle bir etmeye başlar.

View File

@ -724,7 +724,8 @@ Puppeted cities do not increase your tech or policy cost, but their citizens gen
You have no control over the the production of puppeted cities. = Ви не маєте контролю над виробництвом маріонеткових міст.
Puppeted cities also generate 25% less Gold and Science. = Маріонеткові міста також генерують на 25% менше золота та науки.
A puppeted city can be annexed at any time. = Маріонеткові міста можуть бути анексованими будь-коли.
Liberate = Визволити
# Requires translation!
Liberate (city returns to [originalOwner]) =
Liberating a city returns it to its original owner, giving you a massive relationship boost with them! = Визволення міста повертає його своєму первісному власнику, надаючи вам значний приріст відносин з ними!
Raze = Зруйнувати
Razing the city annexes it, and starts razing the city to the ground. = Захоплюючи місто, ви можете його зруйнувати.

View File

@ -3,8 +3,8 @@ package com.unciv.build
object BuildConfig {
const val kotlinVersion = "1.4.30"
const val appName = "Unciv"
const val appCodeNumber = 560
const val appVersion = "3.14.4"
const val appCodeNumber = 561
const val appVersion = "3.14.5"
const val gdxVersion = "1.10.0"
const val roboVMVersion = "2.3.1"

View File

@ -1,3 +1,21 @@
## 3.14.5
New tile layering is live for all users!
Tile options in map editor screen no longer 'click' on tiles behind them
Added construction production info to city screen
Specify original owner when showing "Liberate city"
Added "Self-destructs when attacking" unique
By SomeTroglodyte:
- City expansion notification points to acquired tile
- Visual improvements for the City Overview
Fix screen bugs when you don't use splitpane in pickscreen - By lishaoxia1985
## 3.14.4
Resolved #3524 - Happiness in city overview now calculated correctly

View File

@ -360,14 +360,14 @@ object UnitActions {
private fun takeOverTilesAround(unit: MapUnit) {
// This method should only be called for a citadel - therefore one of the neighbour tile
// must belong to unit's civ, so minByOrNull will be never `null`.
// must belong to unit's civ, so minByOrNull will be never `null`. Thiss
fun priority(tile: TileInfo): Int {
// helper calculates priority (lower is better): distance plus razing malus
fun priority(tile: TileInfo): Int { // helper calculates priority (lower is better): distance plus razing malus
val city = tile.getCity()!! // !! assertion is guaranteed by the outer filter selector.
return city.getCenterTile().aerialDistanceTo(tile) +
(if (city.isBeingRazed) 5 else 0)
}
// In the rare case more than one city owns tiles neighboring the citadel
// this will prioritize the nearest one not being razed
val nearestCity = unit.currentTile.neighbors
@ -378,20 +378,20 @@ object UnitActions {
// we use getTilesInDistance here, not neighbours to include the current tile as well
val tilesToTakeOver = unit.currentTile.getTilesInDistance(1)
.filter { !it.isCityCenter() && it.getOwner() != unit.civInfo }
// make a set of civs to be notified (a set - in order to not repeat notification on each tile)
val notifications = mutableSetOf<CivilizationInfo>()
// take over the ownership
val civsToNotify = mutableSetOf<CivilizationInfo>()
for (tile in tilesToTakeOver) {
val otherCiv = tile.getOwner()
if (otherCiv != null) {
// decrease relations for -10 pt/tile
if (!otherCiv.knows(unit.civInfo)) otherCiv.meetCivilization(unit.civInfo)
otherCiv.getDiplomacyManager(unit.civInfo).addModifier(DiplomaticModifiers.StealingTerritory, -10f)
notifications.add(otherCiv)
civsToNotify.add(otherCiv)
}
nearestCity.expansion.takeOwnership(tile)
}
for (otherCiv in notifications)
for (otherCiv in civsToNotify)
otherCiv.addNotification("[${unit.civInfo}] has stolen your territory!", unit.currentTile.position, unit.civInfo.civName, NotificationIcon.War)
}