Unified City States and City-States -> City-States #2497
This commit is contained in:
parent
286ef707c2
commit
c73df02d76
32 changed files with 65 additions and 65 deletions
|
@ -660,7 +660,7 @@
|
|||
|
||||
|
||||
|
||||
//City states
|
||||
//City-States
|
||||
{
|
||||
"name": "Milan",
|
||||
"adjective": ["Milanese"],
|
||||
|
|
|
@ -118,7 +118,7 @@ Very well, we shall look for new lands to settle. = Nu dobrá, podíváme se po
|
|||
We shall do as we please. = Budeme si dělat, co se nám zachce.
|
||||
We noticed your new city near our borders, despite your promise. This will have....implications. = Odhalili jsme nové město poblíž našich hranic navzdory vašim slibům. To bude mít... patřičné následky.
|
||||
|
||||
# City states
|
||||
# City-States
|
||||
|
||||
Provides [amountOfCulture] culture at 30 Influence = Poskytuje [amountOfCulture] bodů kultury při vlivu 30
|
||||
Provides 3 food in capital and 1 food in other cities at 30 Influence = Poskytuje 3 jídla v hlavním městě a 1 jídlo ve všech ostatních městech při vlivu 30
|
||||
|
@ -665,7 +665,7 @@ Bonuses = Bonusy
|
|||
Final = Celkem
|
||||
Other = Ostatní
|
||||
Population = Populace
|
||||
City States = Městské státy
|
||||
City-States = Městské státy
|
||||
Tile yields = Výnosy z políček
|
||||
Trade routes = Obchodní cesty
|
||||
Maintenance = Údržba budov
|
||||
|
|
|
@ -169,7 +169,7 @@ We shall do as we please. =
|
|||
# Requires translation!
|
||||
We noticed your new city near our borders, despite your promise. This will have....implications. =
|
||||
|
||||
# City states
|
||||
# City-States
|
||||
|
||||
# Requires translation!
|
||||
Provides [amountOfCulture] culture at 30 Influence =
|
||||
|
@ -1028,7 +1028,7 @@ Other =
|
|||
# Requires translation!
|
||||
Population =
|
||||
# Requires translation!
|
||||
City States =
|
||||
City-States =
|
||||
# Requires translation!
|
||||
Tile yields =
|
||||
# Requires translation!
|
||||
|
|
|
@ -216,7 +216,7 @@ We shall do as we please. =
|
|||
# Requires translation!
|
||||
We noticed your new city near our borders, despite your promise. This will have....implications. =
|
||||
|
||||
# City states
|
||||
# City-States
|
||||
|
||||
# Requires translation!
|
||||
Provides [amountOfCulture] culture at 30 Influence =
|
||||
|
@ -1232,7 +1232,7 @@ Other =
|
|||
# Requires translation!
|
||||
Population =
|
||||
# Requires translation!
|
||||
City States =
|
||||
City-States =
|
||||
# Requires translation!
|
||||
Tile yields =
|
||||
# Requires translation!
|
||||
|
|
|
@ -118,7 +118,7 @@ Very well, we shall look for new lands to settle. = Très bien, nous chercherons
|
|||
We shall do as we please. = Nous faisons ce que nous voulons.
|
||||
We noticed your new city near our borders, despite your promise. This will have....implications. = Nous avons remarqué votre nouvelle ville près de nos frontières, malgré votre promesse. Cela aura des... conséquences.
|
||||
|
||||
# City states
|
||||
# City-States
|
||||
|
||||
Provides [amountOfCulture] culture at 30 Influence = Fournit [amountOfCulture] de Culture à 30 d'influence
|
||||
Provides 3 food in capital and 1 food in other cities at 30 Influence = Fournit 3 Nourriture à la capitale et 1 nourriture pour les autres villes à 30 d'influence
|
||||
|
@ -666,7 +666,7 @@ Bonuses = Bonus
|
|||
Final = Valeurs nettes
|
||||
Other = Autre
|
||||
Population = Population
|
||||
City States = Cité-Etat
|
||||
City-States = Cité-Etat
|
||||
Tile yields = Rendement des cases
|
||||
Trade routes = Routes commerciales
|
||||
Maintenance = Entretien
|
||||
|
|
|
@ -118,7 +118,7 @@ Very well, we shall look for new lands to settle. = Einverstanden, wir werden na
|
|||
We shall do as we please. = Wir machen was wir wollen.
|
||||
We noticed your new city near our borders, despite your promise. This will have....implications. = Wir haben eure neue Stadt an unserer Grenze bemerkt - entgegen eures Versprechens. Das wird Folgen haben.
|
||||
|
||||
# City states
|
||||
# City-States
|
||||
|
||||
Provides [amountOfCulture] culture at 30 Influence = Liefert [amountOfCulture] Kultur für 30 Einflusspunkte
|
||||
Provides 3 food in capital and 1 food in other cities at 30 Influence = Liefert 3 Nahrung in der Hauptstadt und 1 Nahrung in anderen Städten für 30 Einflusspunkte
|
||||
|
@ -663,7 +663,7 @@ Bonuses = Boni
|
|||
Final = Endwert
|
||||
Other = Andere
|
||||
Population = Bevölkerung
|
||||
City States = Stadtstaat
|
||||
City-States = Stadtstaat
|
||||
Tile yields = Felderträge
|
||||
Trade routes = Handelsrouten
|
||||
Maintenance = Wartung
|
||||
|
|
|
@ -117,7 +117,7 @@ Very well, we shall look for new lands to settle. = Baiklah, kami akan mencari d
|
|||
We shall do as we please. = Kami akan berlaku sesuai keinginan kami.
|
||||
We noticed your new city near our borders, despite your promise. This will have....implications. = Kami menyadari kota yang baru kau dirikan di dekat perbatasan kami walaupun janjimu sebaliknya. Kau akan menerima....konsekuensinya.
|
||||
|
||||
# City states
|
||||
# City-States
|
||||
|
||||
Provides [amountOfCulture] culture at 30 Influence = Menyediakan [amountOfCulture] budaya di 30 Pengaruh
|
||||
Provides 3 food in capital and 1 food in other cities at 30 Influence = Menyediakan 3 makanan di ibu kota dan 1 makanan di kota lain di 30 Pengaruh
|
||||
|
@ -661,7 +661,7 @@ Bonuses = Bonus
|
|||
Final = Akhir
|
||||
Other = Lainnya
|
||||
Population = Populasi
|
||||
City States = Negara Kota
|
||||
City-States = Negara Kota
|
||||
Tile yields = Penghasilan daerah
|
||||
Trade routes = Rute perdagangan
|
||||
Maintenance = Pemeliharaan
|
||||
|
|
|
@ -117,7 +117,7 @@ Very well, we shall look for new lands to settle. = Ti porgiamo le nostre scuse,
|
|||
We shall do as we please. = Colonizzeremo la terra che ci pare e piace.
|
||||
We noticed your new city near our borders, despite your promise. This will have....implications. = A quanto pare le tue promesse di non espandere i tuoi territori adiacenti ai nostri erano solo parole al vento. Sappi che ci saranno conseguenze.
|
||||
|
||||
# City states
|
||||
# City-States
|
||||
|
||||
Provides [amountOfCulture] culture at 30 Influence = Dona [amountOfCulture] punti Cultura a minimo 30 Punti Influenza
|
||||
Provides 3 food in capital and 1 food in other cities at 30 Influence = Dona 3 Cibo alla Capitale e 1 Cibo alle altre Città a minimo 30 Punti Influenza
|
||||
|
@ -662,7 +662,7 @@ Bonuses = Bonus
|
|||
Final = Valori finali
|
||||
Other = Altro
|
||||
Population = Popolazione
|
||||
City States = Città-Stato
|
||||
City-States = Città-Stato
|
||||
Tile yields = Resa delle celle
|
||||
Trade routes = Rotte commerciali
|
||||
Maintenance = Manutenzione
|
||||
|
|
|
@ -118,7 +118,7 @@ Very well, we shall look for new lands to settle. = わかりました…我々
|
|||
We shall do as we please. = 我々は好きなようにやる
|
||||
We noticed your new city near our borders, despite your promise. This will have....implications. = 貴国は約束したにも関わらず、我々の国境近くに新しい都市を建設した。これには理由でも?
|
||||
|
||||
# City states
|
||||
# City-States
|
||||
|
||||
Provides [amountOfCulture] culture at 30 Influence = 影響力30で文化力+[amountOfCulture]
|
||||
Provides 3 food in capital and 1 food in other cities at 30 Influence = 影響力30で首都に食料+3、その他の都市に食料+1
|
||||
|
@ -708,7 +708,7 @@ Bonuses = ボーナス
|
|||
Final = ファイナル
|
||||
Other = その他
|
||||
Population = 人口
|
||||
City States = 都市国家
|
||||
City-States = 都市国家
|
||||
Tile yields = 収穫量
|
||||
Trade routes = 貿易路
|
||||
Maintenance = 維持
|
||||
|
|
|
@ -144,7 +144,7 @@ Very well, we shall look for new lands to settle. = 알겠습니다. 정착할
|
|||
We shall do as we please. = 우리가 원하는 데 살고자 하는 것이 잘못입니까?
|
||||
We noticed your new city near our borders, despite your promise. This will have....implications. = 우리 근처에 새 도시를 세우지 않겠다고 했는데, 이번에 새로운 도시를 세우셨군요. 그렇게 나오시겠다는 겁니까?
|
||||
|
||||
# City states
|
||||
# City-States
|
||||
|
||||
Provides [amountOfCulture] culture at 30 Influence = 영향력이 30일 때부터 문화 [amountOfCulture]을(를) 제공합니다.
|
||||
Provides 3 food in capital and 1 food in other cities at 30 Influence = 영향력이 30일 때부터 수도에 식량 +3, 수도가 아닌 도시에 식량 +1을 제공합니다.
|
||||
|
@ -779,7 +779,7 @@ Bonuses = 보너스
|
|||
Final = 최종 산출량
|
||||
Other = 기타
|
||||
Population = 인구
|
||||
City States = 도시 국가
|
||||
City-States = 도시 국가
|
||||
Tile yields = 타일 생산량
|
||||
Trade routes = 교역로
|
||||
Maintenance = 유지비
|
||||
|
|
|
@ -178,7 +178,7 @@ We shall do as we please. =
|
|||
# Requires translation!
|
||||
We noticed your new city near our borders, despite your promise. This will have....implications. =
|
||||
|
||||
# City states
|
||||
# City-States
|
||||
|
||||
# Requires translation!
|
||||
Provides [amountOfCulture] culture at 30 Influence =
|
||||
|
@ -1186,7 +1186,7 @@ Other =
|
|||
# Requires translation!
|
||||
Population =
|
||||
# Requires translation!
|
||||
City States =
|
||||
City-States =
|
||||
# Requires translation!
|
||||
Tile yields =
|
||||
# Requires translation!
|
||||
|
|
|
@ -118,7 +118,7 @@ Very well, we shall look for new lands to settle. = Bardzo proszę, będziemy sz
|
|||
We shall do as we please. = Zrobimy jak chcemy
|
||||
We noticed your new city near our borders, despite your promise. This will have....implications. = Mimo obietnicy zauważyliśmy twoje nowe miasto w pobliżu naszych granic. Poniesiesz za to konsekwencje
|
||||
|
||||
# City states
|
||||
# City-States
|
||||
|
||||
Provides [amountOfCulture] culture at 30 Influence = Dodaje [amountOfCulture] kultury przy Wpływie równym 30
|
||||
Provides 3 food in capital and 1 food in other cities at 30 Influence = Dodaje 3 jednostki żywności w stolicy i 1 jednostkę w innych miastach przy poziomie Wpływów równym 30
|
||||
|
@ -669,7 +669,7 @@ Bonuses = Bonusy
|
|||
Final = Finalny
|
||||
Other = Inne
|
||||
Population = Populacja
|
||||
City States = Państwa miasta
|
||||
City-States = Państwa miasta
|
||||
Tile yields = Pola uprawne
|
||||
Trade routes = Szlaki handlowe
|
||||
Maintenance = Utrzymanie
|
||||
|
|
|
@ -126,7 +126,7 @@ Very well, we shall look for new lands to settle. = Muito bem, procuraremos nova
|
|||
We shall do as we please. = Faremos o que quisermos.
|
||||
We noticed your new city near our borders, despite your promise. This will have....implications. = Nós notamos sua nova cidade perto de nossas fronteiras, apesar de sua promessa. Isso terá... consequências.
|
||||
|
||||
# City states
|
||||
# City-States
|
||||
|
||||
Provides [amountOfCulture] culture at 30 Influence = Provê [amountOfCulture] de cultura aos 30 de Influência
|
||||
Provides 3 food in capital and 1 food in other cities at 30 Influence = Provê 3 alimentos na capital e 1 alimento em outras cidades aos 30 de Influência
|
||||
|
@ -808,7 +808,7 @@ Final =
|
|||
Other = Outros
|
||||
Population = População
|
||||
# Requires translation!
|
||||
City States =
|
||||
City-States =
|
||||
Tile yields = Rendimento das terras
|
||||
Trade routes = Rotas comerciais
|
||||
Maintenance = Manutenção
|
||||
|
|
|
@ -123,7 +123,7 @@ Very well, we shall look for new lands to settle. = Foarte bine, ar trebui să c
|
|||
We shall do as we please. = O să facem cum vrem.
|
||||
We noticed your new city near our borders, despite your promise. This will have....implications. = Am văzut noul tău oraș de lângă granița noastră, în ciuda promisiunii. Asta va creea... complicații.
|
||||
|
||||
# City states
|
||||
# City-States
|
||||
|
||||
Provides [amountOfCulture] culture at 30 Influence = Oferă [amountOfCulture] cultură la 30 Influență
|
||||
Provides 3 food in capital and 1 food in other cities at 30 Influence = Oferă 3 mâncare în capitală și 1 mâncare în celelalte orașe la 30 Influență
|
||||
|
@ -797,7 +797,7 @@ Bonuses = Bonusuri
|
|||
Final = Final
|
||||
Other = Alte
|
||||
Population = Populație
|
||||
City States = Orașe-stat
|
||||
City-States = Orașe-stat
|
||||
Tile yields = Randamentele celulelor
|
||||
Trade routes = Rute commerciale
|
||||
Maintenance = Întreținere
|
||||
|
|
|
@ -118,7 +118,7 @@ Very well, we shall look for new lands to settle. = Хорошо, мы найд
|
|||
We shall do as we please. = Мы поступим, как сочтем нужным
|
||||
We noticed your new city near our borders, despite your promise. This will have....implications. = Мы заметили ваш новый город около наших границ. Это может повлечь... последствия.
|
||||
|
||||
# City states
|
||||
# City-States
|
||||
|
||||
Provides [amountOfCulture] culture at 30 Influence = Даёт [amountOfCulture] культуры при 30 Влияния
|
||||
Provides 3 food in capital and 1 food in other cities at 30 Influence = Даёт 3 Еды в столице и 1 Еда в остальных городах при 30 Влияния
|
||||
|
@ -679,7 +679,7 @@ Bonuses = Бонусы
|
|||
Final = Итоговые
|
||||
Other = Другой
|
||||
Population = Население
|
||||
City States = Города-государства
|
||||
City-States = Города-государства
|
||||
Tile yields = Клетка даёт
|
||||
Trade routes = Торговые маршруты
|
||||
Maintenance = Обслуживание
|
||||
|
|
|
@ -118,7 +118,7 @@ Very well, we shall look for new lands to settle. = 好的,我们将会寻找
|
|||
We shall do as we please. = 我们只是自己的奴隶,这里不需要弱者叽叽喳喳。
|
||||
We noticed your new city near our borders, despite your promise. This will have....implications. = 尽管你答应了,我们还是注意到你在我们边境附近建立了新城市。如果有不好的影响...这将是你咎由自取!
|
||||
|
||||
# City states
|
||||
# City-States
|
||||
|
||||
Provides [amountOfCulture] culture at 30 Influence = 当影响力不低于30时提供[amountOfCulture]文化
|
||||
Provides 3 food in capital and 1 food in other cities at 30 Influence = 当影响力不低于30时为首都提供3食物,为其他城市提供1食物
|
||||
|
@ -678,7 +678,7 @@ Bonuses = 相关加成
|
|||
Final = 实际产出
|
||||
Other = 其他
|
||||
Population = 人口
|
||||
City States = 城邦
|
||||
City-States = 城邦
|
||||
Tile yields = 地块产出
|
||||
Trade routes = 贸易路线
|
||||
Maintenance = 建筑维护费
|
||||
|
|
|
@ -118,7 +118,7 @@ Very well, we shall look for new lands to settle. = Bien, buscaremos otras tierr
|
|||
We shall do as we please. = Haremos lo que nos de la gana.
|
||||
We noticed your new city near our borders, despite your promise. This will have....implications. = Nos hemos dado cuenta de que has fundado ciudades cerca de nuestras fronteras, a pesar de tu promesa. Esto tendrá... consecuencias.
|
||||
|
||||
# City states
|
||||
# City-States
|
||||
|
||||
Provides [amountOfCulture] culture at 30 Influence = Proporciona [amountOfCulture] de cultura al alcanzar 30 de influencia
|
||||
Provides 3 food in capital and 1 food in other cities at 30 Influence = Proporciona 3 alimentos en la capital y 1 alimento en las demás ciudades al alcanzar 30 de Influencia
|
||||
|
@ -664,7 +664,7 @@ Bonuses = Bonuses
|
|||
Final = Final
|
||||
Other = Otro
|
||||
Population = Población
|
||||
City States = Ciudades-estado
|
||||
City-States = Ciudades-estado
|
||||
Tile yields = Rendimiento de casillas
|
||||
Trade routes = Rutas comerciales
|
||||
Maintenance = Mantenimiento
|
||||
|
|
|
@ -350,7 +350,7 @@ Very well, we shall look for new lands to settle. = หืมงั้นเห
|
|||
We shall do as we please. = เราจะทำสิ่งที่ในเราอยากจะทำเท่านั้น
|
||||
We noticed your new city near our borders, despite your promise. This will have....implications. = เราเห็นเมืองใหม่ของท่านมาตั้งใกล้อาณาเขตของเรา ตามความต้องการของท่านเอง นี่มันจะต้องมีนัยยะเเอบแฝงแน่ๆ
|
||||
|
||||
# City states
|
||||
# City-States
|
||||
|
||||
Provides [amountOfCulture] culture at 30 Influence = ให้ [amountOfCulture] แต้มวัฒนธรรมที่ 30 คะแนนอิทธิพล
|
||||
Provides 3 food in capital and 1 food in other cities at 30 Influence = ให้ 3 อาหารที่เมืองหลวง และ 1 อาหารในเมืองอื่นๆที่ 30 คะแนนอิทธิพล
|
||||
|
@ -749,7 +749,7 @@ Bonuses = โบนัส
|
|||
Final = สรุป
|
||||
Other = อื่นๆ
|
||||
Population = ประชากร
|
||||
City States = เมืองรัฐ
|
||||
City-States = เมืองรัฐ
|
||||
Tile yields = ผลที่ได้จากช่อง
|
||||
Trade routes = เส้นทางการค้า
|
||||
Maintenance = การบำรุง
|
||||
|
|
|
@ -118,7 +118,7 @@ Very well, we shall look for new lands to settle. = 好的,我們將會尋找
|
|||
We shall do as we please. = 我們只依照自己的意志行事。
|
||||
We noticed your new city near our borders, despite your promise. This will have....implications. = 儘管你答應了,我們還是注意到你在我們邊境附近建立了新城市。如果有不好的影響...這將是你自找的!
|
||||
|
||||
# City states
|
||||
# City-States
|
||||
|
||||
Provides [amountOfCulture] culture at 30 Influence = 當影響力不低於30時提供[amountOfCulture]文化
|
||||
Provides 3 food in capital and 1 food in other cities at 30 Influence = 當影響力不低於30時為首都提供3食物,為其他城市提供1食物
|
||||
|
@ -667,7 +667,7 @@ Bonuses = 相關加成
|
|||
Final = 實際產出
|
||||
Other = 其他
|
||||
Population = 人口
|
||||
City States = 城邦
|
||||
City-States = 城邦
|
||||
Tile yields = 地區產出
|
||||
Trade routes = 貿易路線
|
||||
Maintenance = 建築維護費
|
||||
|
|
|
@ -118,7 +118,7 @@ Very well, we shall look for new lands to settle. = Pekala, biz de yerleşecek y
|
|||
We shall do as we please. = İstediğimiz gibi yaparız.
|
||||
We noticed your new city near our borders, despite your promise. This will have....implications. = Söz vermene rağmen yeni şehrini sınırlarımızın yakınına kurdun. Bunun ... yaptırımları olacak.
|
||||
|
||||
# City states
|
||||
# City-States
|
||||
|
||||
Provides [amountOfCulture] culture at 30 Influence = 30 Etki'de [amountOfCulture] kültürü sağlar
|
||||
Provides 3 food in capital and 1 food in other cities at 30 Influence = 30 Etki'de başkente 3, diğer şehirlere 1 adet gıda sağlar
|
||||
|
@ -680,7 +680,7 @@ Bonuses = Bonuslar
|
|||
Final = Sonuç
|
||||
Other = Diğer
|
||||
Population = Nüfus
|
||||
City States = Şehir Devletleri
|
||||
City-States = Şehir Devletleri
|
||||
Tile yields = Bölge verimi
|
||||
Trade routes = Ticaret yolları
|
||||
Maintenance = Bakım
|
||||
|
|
|
@ -117,7 +117,7 @@ Very well, we shall look for new lands to settle. = Дуже добре, ми б
|
|||
We shall do as we please. = Ми будемо робити так, як забажаємо.
|
||||
We noticed your new city near our borders, despite your promise. This will have....implications. = Ми помітили ваше нове місто біля наших кордонів, незважаючи на вашу обіцянку. Це матиме... наслідки.
|
||||
|
||||
# City states
|
||||
# City-States
|
||||
|
||||
Provides [amountOfCulture] culture at 30 Influence = Надає [amountOfCulture] культури за 30 Впливу
|
||||
Provides 3 food in capital and 1 food in other cities at 30 Influence = Надає 3 їжі у столиці і 1 їжу в інших містах за 30 Впливу
|
||||
|
@ -661,7 +661,7 @@ Bonuses = Бонуси
|
|||
Final = Остаточно
|
||||
Other = Інше
|
||||
Population = Населення
|
||||
City States = Міста-держави
|
||||
City-States = Міста-держави
|
||||
Tile yields = Клітини
|
||||
Trade routes = Торгові шляхи
|
||||
Maintenance = Обслуговування
|
||||
|
|
|
@ -117,7 +117,7 @@ Very well, we shall look for new lands to settle. =
|
|||
We shall do as we please. =
|
||||
We noticed your new city near our borders, despite your promise. This will have....implications. =
|
||||
|
||||
# City states
|
||||
# City-States
|
||||
|
||||
Provides [amountOfCulture] culture at 30 Influence =
|
||||
Provides 3 food in capital and 1 food in other cities at 30 Influence =
|
||||
|
@ -661,7 +661,7 @@ Bonuses =
|
|||
Final =
|
||||
Other =
|
||||
Population =
|
||||
City States =
|
||||
City-States =
|
||||
Tile yields =
|
||||
Trade routes =
|
||||
Maintenance =
|
||||
|
|
10
changelog.md
10
changelog.md
|
@ -511,7 +511,7 @@ Translation updates
|
|||
|
||||
## 3.5.9
|
||||
|
||||
Resolved #1820 - Fixed a crashing bug with the AI trying to ally with defeated city states, as well as many other minor bugs
|
||||
Resolved #1820 - Fixed a crashing bug with the AI trying to ally with defeated City-States, as well as many other minor bugs
|
||||
|
||||
By Jack Rainy:
|
||||
- Nuclear missile is able to target any tile within the range
|
||||
|
@ -566,7 +566,7 @@ Translation updates
|
|||
|
||||
Research agreements! - by lishaoxia1985
|
||||
|
||||
Exploring units no longer auto-enter city states
|
||||
Exploring units no longer auto-enter City-States
|
||||
|
||||
Map editor menu fix - by lyrjie
|
||||
|
||||
|
@ -648,7 +648,7 @@ barbarian automation - by Vladimir Tanakov
|
|||
|
||||
Idle units select properly after settling a city - by lyrjie
|
||||
|
||||
Proper destruction notification for city states
|
||||
Proper destruction notification for City-States
|
||||
|
||||
Added Fur resource image
|
||||
|
||||
|
@ -726,7 +726,7 @@ Translation updates
|
|||
|
||||
## 3.4.5
|
||||
|
||||
Resolved #1533 - Defeated city states no longer "declare war" if you attack their ally
|
||||
Resolved #1533 - Defeated City-States no longer "declare war" if you attack their ally
|
||||
|
||||
Ancient Ruins are now spread out instead of randomized
|
||||
|
||||
|
@ -760,7 +760,7 @@ Most players said Cultural victory was too easy - now requires 5 branches instea
|
|||
|
||||
By r3versi:
|
||||
- Unique promotions listed in Promotion screen
|
||||
- Fixed Greece City states influence unique
|
||||
- Fixed Greece City-States influence unique
|
||||
- Added notifications on losing city state relationship
|
||||
|
||||
Misc. rare bugfixes when:
|
||||
|
|
|
@ -85,8 +85,8 @@ object GameStarter {
|
|||
.map { it.improvement!!.replace("StartingLocation ", "") }
|
||||
|
||||
val availableCityStatesNames = Stack<String>()
|
||||
// since we shuffle and then order by, we end up with all the city states with starting tiles first in a random order,
|
||||
// and then all the other city states in a random order! Because the sortedBy function is stable!
|
||||
// since we shuffle and then order by, we end up with all the City-States with starting tiles first in a random order,
|
||||
// and then all the other City-States in a random order! Because the sortedBy function is stable!
|
||||
availableCityStatesNames.addAll(ruleset.nations.filter { it.value.isCityState() }.keys
|
||||
.shuffled().sortedByDescending { it in cityStatesWithStartingLocations })
|
||||
|
||||
|
|
|
@ -170,7 +170,7 @@ object NextTurnAutomation{
|
|||
}
|
||||
|
||||
private fun getFreeTechForCityStates(civInfo: CivilizationInfo) {
|
||||
//City states automatically get all invented techs
|
||||
//City-States automatically get all invented techs
|
||||
for (otherCiv in civInfo.getKnownCivs().filterNot { it.isCityState() }) {
|
||||
for (entry in otherCiv.tech.techsResearched
|
||||
.filterNot { civInfo.tech.isResearched(it) }
|
||||
|
|
|
@ -375,7 +375,7 @@ class CityStats {
|
|||
newBaseStatList["Buildings"] = cityInfo.cityConstructions.getStats()
|
||||
newBaseStatList["Policies"] = getStatsFromPolicies(civInfo.policies)
|
||||
newBaseStatList["National ability"] = getStatsFromNationUnique()
|
||||
newBaseStatList["City States"] = getStatsFromCityStates()
|
||||
newBaseStatList["City-States"] = getStatsFromCityStates()
|
||||
|
||||
baseStatList = newBaseStatList
|
||||
}
|
||||
|
|
|
@ -76,7 +76,7 @@ class CivInfoStats(val civInfo: CivilizationInfo){
|
|||
statMap.add(entry.key, entry.value)
|
||||
}
|
||||
|
||||
//City states culture bonus
|
||||
//City-States culture bonus
|
||||
for (otherCiv in civInfo.getKnownCivs()) {
|
||||
if (otherCiv.isCityState() && otherCiv.getCityStateType() == CityStateType.Cultured
|
||||
&& otherCiv.getDiplomacyManager(civInfo.civName).relationshipLevel() >= RelationshipLevel.Friend) {
|
||||
|
@ -85,7 +85,7 @@ class CivInfoStats(val civInfo: CivilizationInfo){
|
|||
if(civInfo.nation.unique == UniqueAbility.FATHER_GOVERNS_CHILDREN)
|
||||
culture*=1.5f
|
||||
cultureBonus.add(Stat.Culture, culture)
|
||||
statMap.add("City States",cultureBonus)
|
||||
statMap.add("City-States",cultureBonus)
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -151,10 +151,10 @@ class CivInfoStats(val civInfo: CivilizationInfo){
|
|||
for (otherCiv in civInfo.getKnownCivs()) {
|
||||
if (otherCiv.isCityState() && otherCiv.getCityStateType() == CityStateType.Mercantile
|
||||
&& otherCiv.getDiplomacyManager(civInfo).relationshipLevel() >= RelationshipLevel.Friend) {
|
||||
if (statMap.containsKey("City-states"))
|
||||
statMap["City-states"] = statMap["City-states"]!! + 3f
|
||||
if (statMap.containsKey("City-States"))
|
||||
statMap["City-States"] = statMap["City-States"]!! + 3f
|
||||
else
|
||||
statMap["City-states"] = 3f
|
||||
statMap["City-States"] = 3f
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -517,7 +517,7 @@ class CivilizationInfo {
|
|||
}
|
||||
|
||||
fun giveGoldGift(otherCiv: CivilizationInfo, giftAmount: Int) {
|
||||
if(!otherCiv.isCityState()) throw Exception("You can only gain influence with city states!")
|
||||
if(!otherCiv.isCityState()) throw Exception("You can only gain influence with City-States!")
|
||||
gold -= giftAmount
|
||||
otherCiv.getDiplomacyManager(this).influence += giftAmount/10
|
||||
otherCiv.updateAllyCivForCityState()
|
||||
|
|
|
@ -132,7 +132,7 @@ class TechManager {
|
|||
}
|
||||
|
||||
fun addCurrentScienceToScienceOfLast8Turns() {
|
||||
// The Science the Great Scientist generates does not include Science from Policies, Trade routes and City States.
|
||||
// The Science the Great Scientist generates does not include Science from Policies, Trade routes and City-States.
|
||||
var allCitiesScience = 0f
|
||||
civInfo.cities.forEach{ it ->
|
||||
val totalBaseScience= it.cityStats.baseStatList.values.map { it.science }.sum()
|
||||
|
|
|
@ -582,7 +582,7 @@ class MapUnit {
|
|||
actions.add {
|
||||
val chosenUnit = listOf(Constants.settler, Constants.worker,"Warrior")
|
||||
.filter { civInfo.gameInfo.ruleSet.units.containsKey(it) }.random(tileBasedRandom)
|
||||
if (!(civInfo.isCityState() || civInfo.isOneCityChallenger()) || chosenUnit != Constants.settler) { //City states and OCC don't get settler from ruins
|
||||
if (!(civInfo.isCityState() || civInfo.isOneCityChallenger()) || chosenUnit != Constants.settler) { //City-States and OCC don't get settler from ruins
|
||||
civInfo.placeUnitNearTile(tile.position, chosenUnit)
|
||||
civInfo.addNotification("A [$chosenUnit] has joined us!", tile.position, Color.BROWN)
|
||||
}
|
||||
|
|
|
@ -76,18 +76,18 @@ class WorldScreenMenuPopup(val worldScreen: WorldScreen) : Popup(worldScreen) {
|
|||
}
|
||||
|
||||
class WorldScreenCommunityPopup(val worldScreen: WorldScreen) : Popup(worldScreen) {
|
||||
init{
|
||||
addButton("Discord"){
|
||||
init {
|
||||
addButton("Discord") {
|
||||
Gdx.net.openURI("https://discord.gg/bjrB4Xw")
|
||||
close()
|
||||
}
|
||||
|
||||
addButton("Github"){
|
||||
addButton("Github") {
|
||||
Gdx.net.openURI("https://github.com/yairm210/UnCiv")
|
||||
close()
|
||||
}
|
||||
|
||||
addButton("Reddit"){
|
||||
addButton("Reddit") {
|
||||
Gdx.net.openURI("https://www.reddit.com/r/Unciv/")
|
||||
close()
|
||||
}
|
||||
|
|
|
@ -511,7 +511,7 @@ Unless otherwise specified, all the following are from [the Noun Project](https:
|
|||
* [Resistance](https://thenounproject.com/term/revolution/1315305/) By HeadsOfBirds
|
||||
* [Viking Hat](https://thenounproject.com/search/?q=pillage&i=185405) By my name is mud for pillaging improvements
|
||||
* [Aim](https://thenounproject.com/search/?q=aim&i=2034920) By Kaviashri for ranged strength
|
||||
* [Capitol](https://thenounproject.com/search/?q=capitol&i=160031) By Loren Klein for City states
|
||||
* [Capitol](https://thenounproject.com/search/?q=capitol&i=160031) By Loren Klein for City-States
|
||||
* [Aircraft](https://thenounproject.com/search/?q=aircraft&i=1629000) By Tom Fricker for aircraft icon in city button
|
||||
* [radar scan](https://thenounproject.com/search/?q=range&i=1500234) By icon 54 for Range
|
||||
* [short range radar](https://thenounproject.com/search/?q=air%20range&i=2612731) by Vectors Point for Intercept range
|
||||
|
|
Loading…
Reference in a new issue