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

UI Update (#3102)

Browse source 
* Add "Load game" in WorldscreenMenuPopup

* UI Update

* Fix the Ottomans uniques, edit Tech description
This commit is contained in:
lishaoxia1985 2020-09-11 00:25:56 +08:00 committed by GitHub
parent f859259c2a
commit 9d951835d1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
47 changed files with 536 additions and 560 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
android/Images/OtherIcons/buttonBackground.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 612 B

After

Width:  |  Height:  |  Size: 832 B

BIN
android/Images/OtherIcons/civTableBackground.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 431 B

BIN
android/Images/OtherIcons/techButtonBackground.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 991 B

664
android/assets/game.atlas
View file

File diff suppressed because it is too large Load diff

BIN
android/assets/game.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 881 KiB

After

Width:  |  Height:  |  Size: 882 KiB

BIN
android/assets/game2.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 500 KiB

After

Width:  |  Height:  |  Size: 503 KiB

2
android/assets/jsons/Civ V - Vanilla/Nations.json
View file

@ -366,7 +366,7 @@
"outerColor": [245,248,185], "outerColor": [245,248,185],
"innerColor": [18,84,30], "innerColor": [18,84,30],
"uniqueName": "Barbary Corsairs", "uniqueName": "Barbary Corsairs",
"uniques": ["Pay only one third the usual cost for naval unit maintenance", "50% chance of capturing defeated Barbarian naval units and earning 25 Gold"], "uniques": ["Pay only one third the usual cost for naval unit maintenance", "Melee naval units can capture defeated naval units and earn 25 Gold"],
"cities": ["Istanbul","Edirne","Ankara","Bursa","Konya","Samsun","Gaziantep","Diyabakir","Izmir","Kayseri","Malatya", "cities": ["Istanbul","Edirne","Ankara","Bursa","Konya","Samsun","Gaziantep","Diyabakir","Izmir","Kayseri","Malatya",
"Marsin","Antalya","Zonguldak","Denizli","Ordu","Mugia","Eskishehir","Inebolu","Sinop","Adana","Artuin", "Marsin","Antalya","Zonguldak","Denizli","Ordu","Mugia","Eskishehir","Inebolu","Sinop","Adana","Artuin",
"Bodrum","Eregli","Silifke","Sivas","Amasya","Marmaris","Trabzon","Erzurum","Urfa","Izmit","Afyonkarhisar", "Bodrum","Eregli","Silifke","Sivas","Amasya","Marmaris","Trabzon","Erzurum","Urfa","Izmit","Afyonkarhisar",

10
android/assets/jsons/translations/Brazilian_Portuguese.properties
View file

@ -613,9 +613,9 @@ Tile =
# Requires translation! # Requires translation!
Missing resource = Missing resource =
# Requires translation! # Requires translation!
[stats] on [tileType] tiles = The following improvements [stats]: =
# Requires translation! # Requires translation!
from improvements: = The following improvements on [tileType] tiles [stats]: =
Hurry Research = Apressar Pesquisa Hurry Research = Apressar Pesquisa
@ -940,8 +940,6 @@ Download [modName] =
# Requires translation! # Requires translation!
Could not download mod list = Could not download mod list =
# Requires translation! # Requires translation!
[amount] Stars =
# Requires translation!
Download mod from URL = Download mod from URL =
# Requires translation! # Requires translation!
Download = Download =
@ -2370,7 +2368,7 @@ From the magnificence of Topkapi, the Ottoman nation greets you, stranger! I'm S
Let us do business! Would you be interested? = Vamos fazer negócios! Está interessado? Let us do business! Would you be interested? = Vamos fazer negócios! Está interessado?
Barbary Corsairs = Corsários Bárbaros Barbary Corsairs = Corsários Bárbaros
# Requires translation! # Requires translation!
50% chance of capturing defeated Barbarian naval units and earning 25 Gold = Melee naval units can capture defeated naval units and earn 25 Gold =
Pay only one third the usual cost for naval unit maintenance = Pague somente um terço do custo normal para a manutenção de unidades navais Pay only one third the usual cost for naval unit maintenance = Pague somente um terço do custo normal para a manutenção de unidades navais
Istanbul = Instambul Istanbul = Instambul
# Requires translation! # Requires translation!
@ -3924,6 +3922,7 @@ Fort = Forte
Road = Estrada Road = Estrada
Remove Forest = Cortar floresta Remove Forest = Cortar floresta
Remove Jungle = Cortar selva Remove Jungle = Cortar selva
@ -4197,6 +4196,7 @@ Founds a new city = Estabelecer uma nova cidade
Ignores terrain cost = Ignora custo de movimento em terrenos Ignores terrain cost = Ignora custo de movimento em terrenos
Maori Warrior = Guerreiro Maori Maori Warrior = Guerreiro Maori
# Requires translation! # Requires translation!

13
android/assets/jsons/translations/Czech.properties
View file

@ -601,8 +601,10 @@ vs [unitType] = proti [unitType]
Terrain = Terén Terrain = Terén
Tile = Políčko Tile = Políčko
Missing resource = Chybí surovina Missing resource = Chybí surovina
[stats] on [tileType] tiles = [stats] na políčku [tileType] # Requires translation!
from improvements: = z vylepšení: The following improvements [stats]: =
# Requires translation!
The following improvements on [tileType] tiles [stats]: =
Hurry Research = Urychlit výzkum Hurry Research = Urychlit výzkum
@ -901,8 +903,6 @@ Download [modName] =
# Requires translation! # Requires translation!
Could not download mod list = Could not download mod list =
# Requires translation! # Requires translation!
[amount] Stars =
# Requires translation!
Download mod from URL = Download mod from URL =
# Requires translation! # Requires translation!
Download = Download =
@ -2329,7 +2329,8 @@ From the magnificence of Topkapi, the Ottoman nation greets you, stranger! I'm S
# Requires translation! # Requires translation!
Let us do business! Would you be interested? = Let us do business! Would you be interested? =
Barbary Corsairs = Barbarští korzáři Barbary Corsairs = Barbarští korzáři
50% chance of capturing defeated Barbarian naval units and earning 25 Gold = 50% na zajetí poražené Barbarské námořní jednotky a zisk 25 zlata # Requires translation!
Melee naval units can capture defeated naval units and earn 25 Gold =
Pay only one third the usual cost for naval unit maintenance = Platí pouze 1/3 žoldu námořním jednotkám Pay only one third the usual cost for naval unit maintenance = Platí pouze 1/3 žoldu námořním jednotkám
# Requires translation! # Requires translation!
Istanbul = Istanbul =
@ -3947,6 +3948,7 @@ Fort = Opevnění
Road = Cesta Road = Cesta
Remove Forest = Vykácet les Remove Forest = Vykácet les
Remove Jungle = Vykácet džungli Remove Jungle = Vykácet džungli
@ -4218,6 +4220,7 @@ Founds a new city = Založit nové město
Ignores terrain cost = Pohyb v obtížném terénu bez penalizace Ignores terrain cost = Pohyb v obtížném terénu bez penalizace
Maori Warrior = Maorský válěčník Maori Warrior = Maorský válěčník
Jaguar = Jaguár Jaguar = Jaguár

10
android/assets/jsons/translations/Dutch.properties
View file

@ -936,9 +936,9 @@ Tile =
# Requires translation! # Requires translation!
Missing resource = Missing resource =
# Requires translation! # Requires translation!
[stats] on [tileType] tiles = The following improvements [stats]: =
# Requires translation! # Requires translation!
from improvements: = The following improvements on [tileType] tiles [stats]: =
# Requires translation! # Requires translation!
@ -1458,8 +1458,6 @@ Download [modName] =
# Requires translation! # Requires translation!
Could not download mod list = Could not download mod list =
# Requires translation! # Requires translation!
[amount] Stars =
# Requires translation!
Download mod from URL = Download mod from URL =
# Requires translation! # Requires translation!
Download = Download =
@ -3363,7 +3361,7 @@ Let us do business! Would you be interested? =
# Requires translation! # Requires translation!
Barbary Corsairs = Barbary Corsairs =
# Requires translation! # Requires translation!
50% chance of capturing defeated Barbarian naval units and earning 25 Gold = Melee naval units can capture defeated naval units and earn 25 Gold =
# Requires translation! # Requires translation!
Pay only one third the usual cost for naval unit maintenance = Pay only one third the usual cost for naval unit maintenance =
# Requires translation! # Requires translation!
@ -5296,6 +5294,7 @@ Fort =
Road = Weg Road = Weg
# Requires translation! # Requires translation!
Remove Forest = Remove Forest =
@ -5673,6 +5672,7 @@ Founds a new city = Sticht een nieuwe stad
Ignores terrain cost = Negeert terreinskosten Ignores terrain cost = Negeert terreinskosten
# Requires translation! # Requires translation!
Maori Warrior = Maori Warrior =

10
android/assets/jsons/translations/English.properties
View file

@ -1137,9 +1137,9 @@ Tile =
# Requires translation! # Requires translation!
Missing resource = Missing resource =
# Requires translation! # Requires translation!
[stats] on [tileType] tiles = The following improvements [stats]: =
# Requires translation! # Requires translation!
from improvements: = The following improvements on [tileType] tiles [stats]: =
# Requires translation! # Requires translation!
@ -1669,8 +1669,6 @@ Download [modName] =
# Requires translation! # Requires translation!
Could not download mod list = Could not download mod list =
# Requires translation! # Requires translation!
[amount] Stars =
# Requires translation!
Download mod from URL = Download mod from URL =
# Requires translation! # Requires translation!
Download = Download =
@ -3599,7 +3597,7 @@ Let us do business! Would you be interested? =
# Requires translation! # Requires translation!
Barbary Corsairs = Barbary Corsairs =
# Requires translation! # Requires translation!
50% chance of capturing defeated Barbarian naval units and earning 25 Gold = Melee naval units can capture defeated naval units and earn 25 Gold =
# Requires translation! # Requires translation!
Pay only one third the usual cost for naval unit maintenance = Pay only one third the usual cost for naval unit maintenance =
# Requires translation! # Requires translation!
@ -5633,6 +5631,7 @@ Fort =
# Requires translation! # Requires translation!
Road = Road =
# Requires translation! # Requires translation!
Remove Forest = Remove Forest =
@ -6040,6 +6039,7 @@ Founds a new city =
# Requires translation! # Requires translation!
Ignores terrain cost = Ignores terrain cost =
# Requires translation! # Requires translation!
Maori Warrior = Maori Warrior =

10
android/assets/jsons/translations/Finnish.properties
View file

@ -616,9 +616,9 @@ Terrain = Maasto
Tile = Ruutu Tile = Ruutu
Missing resource = Puuttuva resurssi Missing resource = Puuttuva resurssi
# Requires translation! # Requires translation!
[stats] on [tileType] tiles = The following improvements [stats]: =
# Requires translation! # Requires translation!
from improvements: = The following improvements on [tileType] tiles [stats]: =
Hurry Research = Hoputa Tutkimus Hurry Research = Hoputa Tutkimus
@ -940,8 +940,6 @@ Download [modName] =
# Requires translation! # Requires translation!
Could not download mod list = Could not download mod list =
# Requires translation! # Requires translation!
[amount] Stars =
# Requires translation!
Download mod from URL = Download mod from URL =
# Requires translation! # Requires translation!
Download = Download =
@ -2063,7 +2061,7 @@ From the magnificence of Topkapi, the Ottoman nation greets you, stranger! I'm S
Let us do business! Would you be interested? = Käykäämme kauppaa! Olisitko kiinnostunut? Let us do business! Would you be interested? = Käykäämme kauppaa! Olisitko kiinnostunut?
Barbary Corsairs = Barbaarikaapparit Barbary Corsairs = Barbaarikaapparit
# Requires translation! # Requires translation!
50% chance of capturing defeated Barbarian naval units and earning 25 Gold = Melee naval units can capture defeated naval units and earn 25 Gold =
Pay only one third the usual cost for naval unit maintenance = Maksat vain kolmanneksen laivaston yksiköiden ylläpidosta Pay only one third the usual cost for naval unit maintenance = Maksat vain kolmanneksen laivaston yksiköiden ylläpidosta
Istanbul = Istanbul Istanbul = Istanbul
Edirne = Edirne Edirne = Edirne
@ -3872,6 +3870,7 @@ Fort =
Road = Tie Road = Tie
# Requires translation! # Requires translation!
Remove Forest = Remove Forest =
@ -4227,6 +4226,7 @@ Founds a new city = Perustaa uuden kaupungin
# Requires translation! # Requires translation!
Ignores terrain cost = Ignores terrain cost =
# Requires translation! # Requires translation!
Maori Warrior = Maori Warrior =

10
android/assets/jsons/translations/French.properties
View file

@ -631,9 +631,9 @@ Tile =
# Requires translation! # Requires translation!
Missing resource = Missing resource =
# Requires translation! # Requires translation!
[stats] on [tileType] tiles = The following improvements [stats]: =
# Requires translation! # Requires translation!
from improvements: = The following improvements on [tileType] tiles [stats]: =
Hurry Research = Accélère la recherche scientifique en cours Hurry Research = Accélère la recherche scientifique en cours
@ -983,8 +983,6 @@ Download [modName] =
# Requires translation! # Requires translation!
Could not download mod list = Could not download mod list =
# Requires translation! # Requires translation!
[amount] Stars =
# Requires translation!
Download mod from URL = Download mod from URL =
# Requires translation! # Requires translation!
Download = Download =
@ -2066,7 +2064,7 @@ From the magnificence of Topkapi, the Ottoman nation greets you, stranger! I'm S
Let us do business! Would you be interested? = Parlons affaires ! Seriez-vous intéressé ? Let us do business! Would you be interested? = Parlons affaires ! Seriez-vous intéressé ?
Barbary Corsairs = Corsaires barbares Barbary Corsairs = Corsaires barbares
# Requires translation! # Requires translation!
50% chance of capturing defeated Barbarian naval units and earning 25 Gold = Melee naval units can capture defeated naval units and earn 25 Gold =
# Requires translation! # Requires translation!
Pay only one third the usual cost for naval unit maintenance = Pay only one third the usual cost for naval unit maintenance =
Istanbul = Istanbul Istanbul = Istanbul
@ -3242,6 +3240,7 @@ Fort = Fort
Road = Route Road = Route
Remove Forest = Défricher la forêt Remove Forest = Défricher la forêt
Remove Jungle = Défricher la jungle Remove Jungle = Défricher la jungle
@ -3515,6 +3514,7 @@ Founds a new city = Fonde une nouvelle ville
Ignores terrain cost = Ignore le coût du terrain Ignores terrain cost = Ignore le coût du terrain
Maori Warrior = Guerrier maori Maori Warrior = Guerrier maori
# Requires translation! # Requires translation!

10
android/assets/jsons/translations/German.properties
View file

@ -606,9 +606,9 @@ Terrain = Gelände
Tile = Feld Tile = Feld
Missing resource = Fehlende Ressource Missing resource = Fehlende Ressource
# Requires translation! # Requires translation!
[stats] on [tileType] tiles = The following improvements [stats]: =
# Requires translation! # Requires translation!
from improvements: = The following improvements on [tileType] tiles [stats]: =
Hurry Research = Forschung beschleunigen Hurry Research = Forschung beschleunigen
@ -909,8 +909,6 @@ Download [modName] =
# Requires translation! # Requires translation!
Could not download mod list = Could not download mod list =
# Requires translation! # Requires translation!
[amount] Stars =
# Requires translation!
Download mod from URL = Download mod from URL =
# Requires translation! # Requires translation!
Download = Download =
@ -1964,7 +1962,7 @@ From the magnificence of Topkapi, the Ottoman nation greets you, stranger! I'm S
Let us do business! Would you be interested? = Lass uns handeln! Sind sie interressiert? Let us do business! Would you be interested? = Lass uns handeln! Sind sie interressiert?
Barbary Corsairs = Barbarische Korsaren Barbary Corsairs = Barbarische Korsaren
# Requires translation! # Requires translation!
50% chance of capturing defeated Barbarian naval units and earning 25 Gold = Melee naval units can capture defeated naval units and earn 25 Gold =
Pay only one third the usual cost for naval unit maintenance = Zahle nur ein Drittel der üblichen Unterhaltskosten für Marine-Einheiten Pay only one third the usual cost for naval unit maintenance = Zahle nur ein Drittel der üblichen Unterhaltskosten für Marine-Einheiten
Istanbul = Istanbul Istanbul = Istanbul
Edirne = Edirne Edirne = Edirne
@ -3090,6 +3088,7 @@ Fort = Festung
Road = Straße Road = Straße
Remove Forest = Wald abholzen Remove Forest = Wald abholzen
Remove Jungle = Dschungel abholzen Remove Jungle = Dschungel abholzen
@ -3362,6 +3361,7 @@ Founds a new city = Gründet eine neue Stadt
Ignores terrain cost = Ignoriert Geländekosten Ignores terrain cost = Ignoriert Geländekosten
Maori Warrior = Maori Krieger Maori Warrior = Maori Krieger
# Requires translation! # Requires translation!

10
android/assets/jsons/translations/Hungarian.properties
View file

@ -627,9 +627,9 @@ Terrain = Terep
Tile = Terület Tile = Terület
Missing resource = Hiányzó alapanyag Missing resource = Hiányzó alapanyag
# Requires translation! # Requires translation!
[stats] on [tileType] tiles = The following improvements [stats]: =
# Requires translation! # Requires translation!
from improvements: = The following improvements on [tileType] tiles [stats]: =
Hurry Research = Kutatás felgyorsítása Hurry Research = Kutatás felgyorsítása
@ -1095,8 +1095,6 @@ Download [modName] =
# Requires translation! # Requires translation!
Could not download mod list = Could not download mod list =
# Requires translation! # Requires translation!
[amount] Stars =
# Requires translation!
Download mod from URL = Download mod from URL =
# Requires translation! # Requires translation!
Download = Download =
@ -2916,7 +2914,7 @@ Let us do business! Would you be interested? =
# Requires translation! # Requires translation!
Barbary Corsairs = Barbary Corsairs =
# Requires translation! # Requires translation!
50% chance of capturing defeated Barbarian naval units and earning 25 Gold = Melee naval units can capture defeated naval units and earn 25 Gold =
# Requires translation! # Requires translation!
Pay only one third the usual cost for naval unit maintenance = Pay only one third the usual cost for naval unit maintenance =
# Requires translation! # Requires translation!
@ -4817,6 +4815,7 @@ Fort = Erőd
Road = Út Road = Út
Remove Forest = Erdő eltávolítása Remove Forest = Erdő eltávolítása
Remove Jungle = Dzsungel eltávolítása Remove Jungle = Dzsungel eltávolítása
@ -5191,6 +5190,7 @@ Founds a new city =
# Requires translation! # Requires translation!
Ignores terrain cost = Ignores terrain cost =
# Requires translation! # Requires translation!
Maori Warrior = Maori Warrior =

13
android/assets/jsons/translations/Indonesian.properties
View file

@ -600,8 +600,10 @@ vs [unitType] = vs [unitType]
Terrain = Medan Terrain = Medan
Tile = Daerah Tile = Daerah
Missing resource = Sumber daya kurang Missing resource = Sumber daya kurang
[stats] on [tileType] tiles = [stats] pada daerah [tileType] # Requires translation!
from improvements: = dari improvisasi: The following improvements [stats]: =
# Requires translation!
The following improvements on [tileType] tiles [stats]: =
Hurry Research = Percepat Riset Hurry Research = Percepat Riset
@ -897,8 +899,6 @@ Download [modName] =
# Requires translation! # Requires translation!
Could not download mod list = Could not download mod list =
# Requires translation! # Requires translation!
[amount] Stars =
# Requires translation!
Download mod from URL = Download mod from URL =
# Requires translation! # Requires translation!
Download = Download =
@ -1941,7 +1941,8 @@ Ruin! Ruin! Istanbul becomes Iram of the Pillars, remembered only by the melanch
From the magnificence of Topkapi, the Ottoman nation greets you, stranger! I'm Suleiman, Kayser-I Rum, and I bestow upon you my welcome! = Dari keagungan Topkapi, bangsa Ottoman mengucapkan salam. Aku Sulaiman, Kaisar I Rum, dan aku memberikan sambutanku kepadamu! From the magnificence of Topkapi, the Ottoman nation greets you, stranger! I'm Suleiman, Kayser-I Rum, and I bestow upon you my welcome! = Dari keagungan Topkapi, bangsa Ottoman mengucapkan salam. Aku Sulaiman, Kaisar I Rum, dan aku memberikan sambutanku kepadamu!
Let us do business! Would you be interested? = Mari berbisnis! Apakah kamu tertarik? Let us do business! Would you be interested? = Mari berbisnis! Apakah kamu tertarik?
Barbary Corsairs = Keganasan Corsair Barbary Corsairs = Keganasan Corsair
50% chance of capturing defeated Barbarian naval units and earning 25 Gold = 50% kemungkinan menawan unit laut orang Barbar yang dikalahkan dan menerima 25 Emas # Requires translation!
Melee naval units can capture defeated naval units and earn 25 Gold =
Pay only one third the usual cost for naval unit maintenance = Hanya perlu membayar sepertiga dari biaya biasanya untuk unit angkatan laut. Pay only one third the usual cost for naval unit maintenance = Hanya perlu membayar sepertiga dari biaya biasanya untuk unit angkatan laut.
Istanbul = Istanbul Istanbul = Istanbul
Edirne = Edirne Edirne = Edirne
@ -3018,6 +3019,7 @@ Fort = Kubu Pertahanan
Road = Jalan Road = Jalan
Remove Forest = Singkirkan Hutan Remove Forest = Singkirkan Hutan
Remove Jungle = Singkirkan Hutan Belantara Remove Jungle = Singkirkan Hutan Belantara
@ -3289,6 +3291,7 @@ Founds a new city = Dirikan kota baru
Ignores terrain cost = Mengabaikan medan Ignores terrain cost = Mengabaikan medan
Maori Warrior = Pejuang Maori Maori Warrior = Pejuang Maori
Jaguar = Jaguar Jaguar = Jaguar

12
android/assets/jsons/translations/Italian.properties
View file

@ -600,8 +600,10 @@ vs [unitType] = contro [unitType]
Terrain = Terreno Terrain = Terreno
Tile = Casella Tile = Casella
Missing resource = Risorsa mancante Missing resource = Risorsa mancante
[stats] on [tileType] tiles = [stats] sulle caselle [tileType] # Requires translation!
from improvements: = da miglioramenti: The following improvements [stats]: =
# Requires translation!
The following improvements on [tileType] tiles [stats]: =
Hurry Research = Accelera ricerca Hurry Research = Accelera ricerca
@ -897,8 +899,6 @@ Download [modName] =
# Requires translation! # Requires translation!
Could not download mod list = Could not download mod list =
# Requires translation! # Requires translation!
[amount] Stars =
# Requires translation!
Download mod from URL = Download mod from URL =
# Requires translation! # Requires translation!
Download = Download =
@ -1942,7 +1942,7 @@ From the magnificence of Topkapi, the Ottoman nation greets you, stranger! I'm S
Let us do business! Would you be interested? = Facciamo un affare! Ti interessa? Let us do business! Would you be interested? = Facciamo un affare! Ti interessa?
Barbary Corsairs = Corsari barbarici Barbary Corsairs = Corsari barbarici
# Requires translation! # Requires translation!
50% chance of capturing defeated Barbarian naval units and earning 25 Gold = Melee naval units can capture defeated naval units and earn 25 Gold =
Pay only one third the usual cost for naval unit maintenance = Il mantenimento delle unità navali è ridotto a un terzo Pay only one third the usual cost for naval unit maintenance = Il mantenimento delle unità navali è ridotto a un terzo
Istanbul = Istanbul Istanbul = Istanbul
Edirne = Edirne Edirne = Edirne
@ -3019,6 +3019,7 @@ Fort = Forte
Road = Strada Road = Strada
Remove Forest = Rimuovi foresta Remove Forest = Rimuovi foresta
Remove Jungle = Rimuovi giungla Remove Jungle = Rimuovi giungla
@ -3290,6 +3291,7 @@ Founds a new city = Può fondare una nuova città
Ignores terrain cost = Ignora i costi di movimento su terreno Ignores terrain cost = Ignora i costi di movimento su terreno
Maori Warrior = Guerriero Maori Maori Warrior = Guerriero Maori
Jaguar = Guerriero giaguaro Jaguar = Guerriero giaguaro

13
android/assets/jsons/translations/Japanese.properties
View file

@ -600,8 +600,10 @@ vs [unitType] = vs [unitType]
Terrain = 地形 Terrain = 地形
Tile = タイル Tile = タイル
Missing resource = 不足している資源 Missing resource = 不足している資源
[stats] on [tileType] tiles = [tileType]タイルに[stats] # Requires translation!
from improvements: = 資源活用施設: The following improvements [stats]: =
# Requires translation!
The following improvements on [tileType] tiles [stats]: =
Hurry Research = 研究を開始 Hurry Research = 研究を開始
@ -897,8 +899,6 @@ Download [modName] =
# Requires translation! # Requires translation!
Could not download mod list = Could not download mod list =
# Requires translation! # Requires translation!
[amount] Stars =
# Requires translation!
Download mod from URL = Download mod from URL =
# Requires translation! # Requires translation!
Download = Download =
@ -1941,7 +1941,8 @@ Ruin! Ruin! Istanbul becomes Iram of the Pillars, remembered only by the melanch
From the magnificence of Topkapi, the Ottoman nation greets you, stranger! I'm Suleiman, Kayser-I Rum, and I bestow upon you my welcome! = ようこそ、見知らぬ者よ！我はスレイマン、オスマンの指導者である。この素晴らしい機会を祝う宴をもうけようではないか！ From the magnificence of Topkapi, the Ottoman nation greets you, stranger! I'm Suleiman, Kayser-I Rum, and I bestow upon you my welcome! = ようこそ、見知らぬ者よ！我はスレイマン、オスマンの指導者である。この素晴らしい機会を祝う宴をもうけようではないか！
Let us do business! Would you be interested? = 我らの取引に興味はありませんか？ Let us do business! Would you be interested? = 我らの取引に興味はありませんか？
Barbary Corsairs = バルバリア海賊 Barbary Corsairs = バルバリア海賊
50% chance of capturing defeated Barbarian naval units and earning 25 Gold = 50％の確率で倒した蛮族の海軍ユニットを獲得、25ゴールドを得る # Requires translation!
Melee naval units can capture defeated naval units and earn 25 Gold =
Pay only one third the usual cost for naval unit maintenance = 海軍ユニットの維持費が通常の3分の1になる Pay only one third the usual cost for naval unit maintenance = 海軍ユニットの維持費が通常の3分の1になる
Istanbul = イスタンブール Istanbul = イスタンブール
Edirne = エディルネ Edirne = エディルネ
@ -3018,6 +3019,7 @@ Fort = 要塞
Road = 道路 Road = 道路
Remove Forest = 森林削除 Remove Forest = 森林削除
Remove Jungle = ジャングル削除 Remove Jungle = ジャングル削除
@ -3289,6 +3291,7 @@ Founds a new city = 新しい都市を建設できる。
Ignores terrain cost = 地形を無視 Ignores terrain cost = 地形を無視
Maori Warrior = マオリの戦士 Maori Warrior = マオリの戦士
Jaguar = ジャガー戦士 Jaguar = ジャガー戦士

10
android/assets/jsons/translations/Korean.properties
View file

@ -616,9 +616,9 @@ Terrain = 지형
Tile = 타일 Tile = 타일
Missing resource = 전략 자원 부족 Missing resource = 전략 자원 부족
# Requires translation! # Requires translation!
[stats] on [tileType] tiles = The following improvements [stats]: =
# Requires translation! # Requires translation!
from improvements: = The following improvements on [tileType] tiles [stats]: =
Hurry Research = 연구 가속 Hurry Research = 연구 가속
@ -937,8 +937,6 @@ Download [modName] =
# Requires translation! # Requires translation!
Could not download mod list = Could not download mod list =
# Requires translation! # Requires translation!
[amount] Stars =
# Requires translation!
Download mod from URL = Download mod from URL =
# Requires translation! # Requires translation!
Download = Download =
@ -1996,7 +1994,7 @@ From the magnificence of Topkapi, the Ottoman nation greets you, stranger! I'm S
Let us do business! Would you be interested? = 우리 거래해보세! 관심 있나? Let us do business! Would you be interested? = 우리 거래해보세! 관심 있나?
Barbary Corsairs = 바르바리 해적 Barbary Corsairs = 바르바리 해적
# Requires translation! # Requires translation!
50% chance of capturing defeated Barbarian naval units and earning 25 Gold = Melee naval units can capture defeated naval units and earn 25 Gold =
Pay only one third the usual cost for naval unit maintenance = 해상 유닛 유지비 -67% Pay only one third the usual cost for naval unit maintenance = 해상 유닛 유지비 -67%
Istanbul = 이스탄불 Istanbul = 이스탄불
Edirne = 에디르네 Edirne = 에디르네
@ -3131,6 +3129,7 @@ Fort = 요새
Road = 도로 Road = 도로
Remove Forest = 숲 제거 Remove Forest = 숲 제거
Remove Jungle = 정글 제거 Remove Jungle = 정글 제거
@ -3403,6 +3402,7 @@ Founds a new city = 새로운 도시 건설
Ignores terrain cost = 지형에 의한 이동력 감소 무시 Ignores terrain cost = 지형에 의한 이동력 감소 무시
Maori Warrior = 마오리 전사 Maori Warrior = 마오리 전사
# Requires translation! # Requires translation!

10
android/assets/jsons/translations/Lithuanian.properties
View file

@ -632,9 +632,9 @@ Tile =
# Requires translation! # Requires translation!
Missing resource = Missing resource =
# Requires translation! # Requires translation!
[stats] on [tileType] tiles = The following improvements [stats]: =
# Requires translation! # Requires translation!
from improvements: = The following improvements on [tileType] tiles [stats]: =
Hurry Research = Skubėti tyrimai Hurry Research = Skubėti tyrimai
@ -983,8 +983,6 @@ Download [modName] =
# Requires translation! # Requires translation!
Could not download mod list = Could not download mod list =
# Requires translation! # Requires translation!
[amount] Stars =
# Requires translation!
Download mod from URL = Download mod from URL =
# Requires translation! # Requires translation!
Download = Download =
@ -2897,7 +2895,7 @@ From the magnificence of Topkapi, the Ottoman nation greets you, stranger! I'm S
Let us do business! Would you be interested? = Let us do business! Would you be interested? =
Barbary Corsairs = Barbarų korsarai Barbary Corsairs = Barbarų korsarai
# Requires translation! # Requires translation!
50% chance of capturing defeated Barbarian naval units and earning 25 Gold = Melee naval units can capture defeated naval units and earn 25 Gold =
# Requires translation! # Requires translation!
Pay only one third the usual cost for naval unit maintenance = Pay only one third the usual cost for naval unit maintenance =
# Requires translation! # Requires translation!
@ -4921,6 +4919,7 @@ Fort =
# Requires translation! # Requires translation!
Road = Road =
# Requires translation! # Requires translation!
Remove Forest = Remove Forest =
@ -5336,6 +5335,7 @@ Founds a new city =
# Requires translation! # Requires translation!
Ignores terrain cost = Ignores terrain cost =
# Requires translation! # Requires translation!
Maori Warrior = Maori Warrior =

10
android/assets/jsons/translations/Malay.properties
View file

@ -1092,9 +1092,9 @@ Tile =
# Requires translation! # Requires translation!
Missing resource = Missing resource =
# Requires translation! # Requires translation!
[stats] on [tileType] tiles = The following improvements [stats]: =
# Requires translation! # Requires translation!
from improvements: = The following improvements on [tileType] tiles [stats]: =
# Requires translation! # Requires translation!
@ -1627,8 +1627,6 @@ Download [modName] =
# Requires translation! # Requires translation!
Could not download mod list = Could not download mod list =
# Requires translation! # Requires translation!
[amount] Stars =
# Requires translation!
Download mod from URL = Download mod from URL =
# Requires translation! # Requires translation!
Download = Download =
@ -3503,7 +3501,7 @@ Let us do business! Would you be interested? =
# Requires translation! # Requires translation!
Barbary Corsairs = Barbary Corsairs =
# Requires translation! # Requires translation!
50% chance of capturing defeated Barbarian naval units and earning 25 Gold = Melee naval units can capture defeated naval units and earn 25 Gold =
# Requires translation! # Requires translation!
Pay only one third the usual cost for naval unit maintenance = Pay only one third the usual cost for naval unit maintenance =
# Requires translation! # Requires translation!
@ -5455,6 +5453,7 @@ Fort =
# Requires translation! # Requires translation!
Road = Road =
# Requires translation! # Requires translation!
Remove Forest = Remove Forest =
@ -5870,6 +5869,7 @@ Founds a new city =
# Requires translation! # Requires translation!
Ignores terrain cost = Ignores terrain cost =
# Requires translation! # Requires translation!
Maori Warrior = Maori Warrior =

10
android/assets/jsons/translations/Persian_(Pinglish-DIN).properties
View file

@ -621,9 +621,9 @@ Terrain = No’e zamin
Tile = Tile =
Missing resource = Manabe’e nā mojood Missing resource = Manabe’e nā mojood
# Requires translation! # Requires translation!
[stats] on [tileType] tiles = The following improvements [stats]: =
# Requires translation! # Requires translation!
from improvements: = The following improvements on [tileType] tiles [stats]: =
Hurry Research = Sorat baḵšidan be tahğiğ Hurry Research = Sorat baḵšidan be tahğiğ
@ -948,8 +948,6 @@ Download [modName] =
# Requires translation! # Requires translation!
Could not download mod list = Could not download mod list =
# Requires translation! # Requires translation!
[amount] Stars =
# Requires translation!
Download mod from URL = Download mod from URL =
# Requires translation! # Requires translation!
Download = Download =
@ -2830,7 +2828,7 @@ From the magnificence of Topkapi, the Ottoman nation greets you, stranger! I'm S
Let us do business! Would you be interested? = Let us do business! Would you be interested? =
Barbary Corsairs = Dozdān Daryāi e Barbar Barbary Corsairs = Dozdān Daryāi e Barbar
# Requires translation! # Requires translation!
50% chance of capturing defeated Barbarian naval units and earning 25 Gold = Melee naval units can capture defeated naval units and earn 25 Gold =
# Requires translation! # Requires translation!
Pay only one third the usual cost for naval unit maintenance = Pay only one third the usual cost for naval unit maintenance =
# Requires translation! # Requires translation!
@ -4852,6 +4850,7 @@ Fort =
# Requires translation! # Requires translation!
Road = Road =
# Requires translation! # Requires translation!
Remove Forest = Remove Forest =
@ -5267,6 +5266,7 @@ Founds a new city =
# Requires translation! # Requires translation!
Ignores terrain cost = Ignores terrain cost =
# Requires translation! # Requires translation!
Maori Warrior = Maori Warrior =

10
android/assets/jsons/translations/Persian_(Pinglish-UN).properties
View file

@ -621,9 +621,9 @@ Terrain = No’e zamin
Tile = Tile =
Missing resource = Manabe’e naa mojood Missing resource = Manabe’e naa mojood
# Requires translation! # Requires translation!
[stats] on [tileType] tiles = The following improvements [stats]: =
# Requires translation! # Requires translation!
from improvements: = The following improvements on [tileType] tiles [stats]: =
Hurry Research = Sorat bakhshidan be tahghigh Hurry Research = Sorat bakhshidan be tahghigh
@ -948,8 +948,6 @@ Download [modName] =
# Requires translation! # Requires translation!
Could not download mod list = Could not download mod list =
# Requires translation! # Requires translation!
[amount] Stars =
# Requires translation!
Download mod from URL = Download mod from URL =
# Requires translation! # Requires translation!
Download = Download =
@ -2830,7 +2828,7 @@ From the magnificence of Topkapi, the Ottoman nation greets you, stranger! I'm S
Let us do business! Would you be interested? = Let us do business! Would you be interested? =
Barbary Corsairs = Dozdaan Daryaai e Barbar Barbary Corsairs = Dozdaan Daryaai e Barbar
# Requires translation! # Requires translation!
50% chance of capturing defeated Barbarian naval units and earning 25 Gold = Melee naval units can capture defeated naval units and earn 25 Gold =
# Requires translation! # Requires translation!
Pay only one third the usual cost for naval unit maintenance = Pay only one third the usual cost for naval unit maintenance =
# Requires translation! # Requires translation!
@ -4852,6 +4850,7 @@ Fort =
# Requires translation! # Requires translation!
Road = Road =
# Requires translation! # Requires translation!
Remove Forest = Remove Forest =
@ -5267,6 +5266,7 @@ Founds a new city =
# Requires translation! # Requires translation!
Ignores terrain cost = Ignores terrain cost =
# Requires translation! # Requires translation!
Maori Warrior = Maori Warrior =

10
android/assets/jsons/translations/Polish.properties
View file

@ -614,9 +614,9 @@ Terrain = Teren
Tile = Pole Tile = Pole
Missing resource = Brakujący surowiec Missing resource = Brakujący surowiec
# Requires translation! # Requires translation!
[stats] on [tileType] tiles = The following improvements [stats]: =
# Requires translation! # Requires translation!
from improvements: = The following improvements on [tileType] tiles [stats]: =
Hurry Research = Przyśpiesz Badania Hurry Research = Przyśpiesz Badania
@ -935,8 +935,6 @@ Download [modName] =
# Requires translation! # Requires translation!
Could not download mod list = Could not download mod list =
# Requires translation! # Requires translation!
[amount] Stars =
# Requires translation!
Download mod from URL = Download mod from URL =
# Requires translation! # Requires translation!
Download = Download =
@ -1994,7 +1992,7 @@ From the magnificence of Topkapi, the Ottoman nation greets you, stranger! I'm S
Let us do business! Would you be interested? = Zróbmy interes! Byłbyś zainteresowany? Let us do business! Would you be interested? = Zróbmy interes! Byłbyś zainteresowany?
Barbary Corsairs = Barbarzyńscy Korsarze Barbary Corsairs = Barbarzyńscy Korsarze
# Requires translation! # Requires translation!
50% chance of capturing defeated Barbarian naval units and earning 25 Gold = Melee naval units can capture defeated naval units and earn 25 Gold =
Pay only one third the usual cost for naval unit maintenance = Tylko jedna trzecia kosztów utrzymania jednostek morskich Pay only one third the usual cost for naval unit maintenance = Tylko jedna trzecia kosztów utrzymania jednostek morskich
Istanbul = Stambuł Istanbul = Stambuł
Edirne = Adrianopol Edirne = Adrianopol
@ -3129,6 +3127,7 @@ Fort = Fort
Road = Droga Road = Droga
Remove Forest = Usuń Las Remove Forest = Usuń Las
Remove Jungle = Usuń Dżunglę Remove Jungle = Usuń Dżunglę
@ -3401,6 +3400,7 @@ Founds a new city = Zakłada nowe miasto
Ignores terrain cost = Ignoruje koszty terenu Ignores terrain cost = Ignoruje koszty terenu
Maori Warrior = Wojownik Maori Maori Warrior = Wojownik Maori
# Requires translation! # Requires translation!

10
android/assets/jsons/translations/Portuguese.properties
View file

@ -639,9 +639,9 @@ Tile =
# Requires translation! # Requires translation!
Missing resource = Missing resource =
# Requires translation! # Requires translation!
[stats] on [tileType] tiles = The following improvements [stats]: =
# Requires translation! # Requires translation!
from improvements: = The following improvements on [tileType] tiles [stats]: =
Hurry Research = Apressar Pesquisa Hurry Research = Apressar Pesquisa
@ -1028,8 +1028,6 @@ Download [modName] =
# Requires translation! # Requires translation!
Could not download mod list = Could not download mod list =
# Requires translation! # Requires translation!
[amount] Stars =
# Requires translation!
Download mod from URL = Download mod from URL =
# Requires translation! # Requires translation!
Download = Download =
@ -2713,7 +2711,7 @@ From the magnificence of Topkapi, the Ottoman nation greets you, stranger! I'm S
Let us do business! Would you be interested? = Let us do business! Would you be interested? =
Barbary Corsairs = Corsários Bárbaros Barbary Corsairs = Corsários Bárbaros
# Requires translation! # Requires translation!
50% chance of capturing defeated Barbarian naval units and earning 25 Gold = Melee naval units can capture defeated naval units and earn 25 Gold =
# Requires translation! # Requires translation!
Pay only one third the usual cost for naval unit maintenance = Pay only one third the usual cost for naval unit maintenance =
# Requires translation! # Requires translation!
@ -4501,6 +4499,7 @@ Fort =
Road = Estrada Road = Estrada
Remove Forest = Cortar floresta Remove Forest = Cortar floresta
Remove Jungle = Cortar selva Remove Jungle = Cortar selva
@ -4777,6 +4776,7 @@ Founds a new city = Estabelecer uma nova cidade
Ignores terrain cost = Ignora custo de movimento em terrenos Ignores terrain cost = Ignora custo de movimento em terrenos
Maori Warrior = Guerreiro Maori Maori Warrior = Guerreiro Maori
# Requires translation! # Requires translation!

10
android/assets/jsons/translations/Romanian.properties
View file

@ -631,9 +631,9 @@ Tile =
# Requires translation! # Requires translation!
Missing resource = Missing resource =
# Requires translation! # Requires translation!
[stats] on [tileType] tiles = The following improvements [stats]: =
# Requires translation! # Requires translation!
from improvements: = The following improvements on [tileType] tiles [stats]: =
Hurry Research = Grăbește cercetarea Hurry Research = Grăbește cercetarea
@ -1033,8 +1033,6 @@ Download [modName] =
# Requires translation! # Requires translation!
Could not download mod list = Could not download mod list =
# Requires translation! # Requires translation!
[amount] Stars =
# Requires translation!
Download mod from URL = Download mod from URL =
# Requires translation! # Requires translation!
Download = Download =
@ -2777,7 +2775,7 @@ From the magnificence of Topkapi, the Ottoman nation greets you, stranger! I'm S
Let us do business! Would you be interested? = Let us do business! Would you be interested? =
Barbary Corsairs = Corsari Barbari Barbary Corsairs = Corsari Barbari
# Requires translation! # Requires translation!
50% chance of capturing defeated Barbarian naval units and earning 25 Gold = Melee naval units can capture defeated naval units and earn 25 Gold =
# Requires translation! # Requires translation!
Pay only one third the usual cost for naval unit maintenance = Pay only one third the usual cost for naval unit maintenance =
# Requires translation! # Requires translation!
@ -4584,6 +4582,7 @@ Fort =
Road = Drum Road = Drum
Remove Forest = Defrișează pădurea Remove Forest = Defrișează pădurea
Remove Jungle = Defrișează jungla Remove Jungle = Defrișează jungla
@ -4921,6 +4920,7 @@ Founds a new city = Fondează un oraș nou
Ignores terrain cost = Ignoră costul terenului Ignores terrain cost = Ignoră costul terenului
Maori Warrior = Războinic Maori Maori Warrior = Războinic Maori
# Requires translation! # Requires translation!

10
android/assets/jsons/translations/Russian.properties
View file

@ -606,9 +606,9 @@ Terrain = Местность
Tile = Клетка Tile = Клетка
Missing resource = Недостаточно ресурса Missing resource = Недостаточно ресурса
# Requires translation! # Requires translation!
[stats] on [tileType] tiles = The following improvements [stats]: =
# Requires translation! # Requires translation!
from improvements: = The following improvements on [tileType] tiles [stats]: =
Hurry Research = Ускорить исследование Hurry Research = Ускорить исследование
@ -909,8 +909,6 @@ Download [modName] =
# Requires translation! # Requires translation!
Could not download mod list = Could not download mod list =
# Requires translation! # Requires translation!
[amount] Stars =
# Requires translation!
Download mod from URL = Download mod from URL =
# Requires translation! # Requires translation!
Download = Download =
@ -1963,7 +1961,7 @@ From the magnificence of Topkapi, the Ottoman nation greets you, stranger! I'm S
Let us do business! Would you be interested? = Тебе интересна сделка? Let us do business! Would you be interested? = Тебе интересна сделка?
Barbary Corsairs = Берберские пираты Barbary Corsairs = Берберские пираты
# Requires translation! # Requires translation!
50% chance of capturing defeated Barbarian naval units and earning 25 Gold = Melee naval units can capture defeated naval units and earn 25 Gold =
Pay only one third the usual cost for naval unit maintenance = Содержание морских юнитов стоит треть обычной цены Pay only one third the usual cost for naval unit maintenance = Содержание морских юнитов стоит треть обычной цены
Istanbul = Стамбул Istanbul = Стамбул
Edirne = Эдирне Edirne = Эдирне
@ -3089,6 +3087,7 @@ Fort = Форт
Road = Дорога Road = Дорога
Remove Forest = Вырубить лес Remove Forest = Вырубить лес
Remove Jungle = Вырубить джунгли Remove Jungle = Вырубить джунгли
@ -3360,6 +3359,7 @@ Founds a new city = Основывает новый город
Ignores terrain cost = Игнорирует штрафы местности Ignores terrain cost = Игнорирует штрафы местности
Maori Warrior = Воин Маори Maori Warrior = Воин Маори
# Requires translation! # Requires translation!

52
android/assets/jsons/translations/Simplified_Chinese.properties
View file

@ -434,7 +434,7 @@ Our proposed trade request is no longer relevant! = 我们的贸易項目已失
[defender] withdrew from a [attacker] = [defender]从[attacker]的攻势中撤退 [defender] withdrew from a [attacker] = [defender]从[attacker]的攻势中撤退
[building] has provided [amount] Gold! = [building]提供了[amount]金钱！ [building] has provided [amount] Gold! = [building]提供了[amount]金钱！
[civName] has stolen your territory! = [civName]窃取了你的领土！ [civName] has stolen your territory! = [civName]窃取了你的领土！
Clearing a [forest] has created [amount] Production for [cityName] = 移除[forest]为[cityName]增加了[amount]产能 Clearing a [forest] has created [amount] Production for [cityName] = 砍伐[forest]为[cityName]增加了[amount]产能
# World Screen UI # World Screen UI
@ -596,12 +596,12 @@ defence vs ranged = 对远程攻击防御
Attacker Bonus = 主动攻击加成 Attacker Bonus = 主动攻击加成
Landing = 登陆作战 Landing = 登陆作战
Flanking = 侧翼夹击 Flanking = 侧翼夹击
vs [unitType] = 对战[unitType] vs [unitType] = vs [unitType]
Terrain = 地形修正 Terrain = 地形修正
Tile = 地块 Tile = 地块
Missing resource = 资源缺失 Missing resource = 战略资源缺乏
[stats] on [tileType] tiles = [tileType]地块[stats] The following improvements [stats]: = 下列设施[stats]：
from improvements: = 来自设施： The following improvements on [tileType] tiles [stats]: = 建造在[tileType]地块上的下列设施[stats]：
Hurry Research = 加速科技研究 Hurry Research = 加速科技研究
@ -629,7 +629,7 @@ ranged units = 远程单位
# For the All "newly-trained [relevant] units in this city receive the [] promotion" translation. Relevant as in 'units that can receive' # For the All "newly-trained [relevant] units in this city receive the [] promotion" translation. Relevant as in 'units that can receive'
relevant = 相应的 relevant = 相应的
# For '[stats] from [Water] tiles in this city' # For '[stats] from [Water] tiles in this city'
Water = 水 Water = 水上
# For [stats] from [Water resource] tiles in this city # For [stats] from [Water resource] tiles in this city
Water resource = 水上资源 Water resource = 水上资源
River = 河流 River = 河流
@ -890,24 +890,14 @@ Invalid ID! = 无效的ID！
# Mods # Mods
# Requires translation! Mods = 模组
Mods = Download [modName] = 下载模组：[modName]
# Requires translation! Could not download mod list = 无法载入模组列表
Download [modName] = Download mod from URL = 从网络地址获取模组
# Requires translation! Download = 下载
Could not download mod list = Done! = 完成！
# Requires translation! Delete [modName] = 删除模组：[modName]
[amount] Stars = Are you SURE you want to delete this mod? = 你确定要删除这个模组吗？
# Requires translation!
Download mod from URL =
# Requires translation!
Download =
# Requires translation!
Done! =
# Requires translation!
Delete [modName] =
# Requires translation!
Are you SURE you want to delete this mod? =
# Uniques that are relevant to more than one type of game object # Uniques that are relevant to more than one type of game object
@ -994,7 +984,7 @@ Lighthouse = 灯塔
All military naval units receive +1 movement and +1 sight = 所有海军军事单位+1移动力和+1视野 All military naval units receive +1 movement and +1 sight = 所有海军军事单位+1移动力和+1视野
The Great Lighthouse = 大灯塔 The Great Lighthouse = 大灯塔
+[amount]% production when building [param] in this city = 所在城市组建[param]时产能积累速率+[amount] +[amount]% production when building [param] in this city = 所在城市组建[param]时产能积累速率+[amount]%
Stable = 马厩 Stable = 马厩
Circus Maximus = 大竞技场 Circus Maximus = 大竞技场
@ -1051,8 +1041,7 @@ Enables nuclear weapon = 允许建造核武器
Manhattan Project = 曼哈顿计划 Manhattan Project = 曼哈顿计划
'The katun is established at Chichen Itza. The settlement of the Itza shall take place there. The quetzal shall come, the green bird shall come. Ah Kantenal shall come. It is the word of God. The Itza shall come.' - The Books of Chilam Balam = “这个卡吞建立在奇琴伊察。伊察将在那里定居。格查尔鸟将会到来，绿色的鸟将会到来。阿·坎特纳尔将会到来。这是神的预言。伊察将会到来。”——《奇兰巴兰之书》（玛雅人的预言书） 'The katun is established at Chichen Itza. The settlement of the Itza shall take place there. The quetzal shall come, the green bird shall come. Ah Kantenal shall come. It is the word of God. The Itza shall come.' - The Books of Chilam Balam = “这个卡吞建立在奇琴伊察。伊察将在那里定居。格查尔鸟将会到来，绿色的鸟将会到来。阿·坎特纳尔将会到来。这是神的预言。伊察将会到来。”——《奇兰巴兰之书》（玛雅人的预言书）
# Requires translation! Golden Age length increased by [amount]% = 黄金时代持续时间+[amount]%
Golden Age length increased by [amount]% =
Chichen Itza = 奇琴伊察 Chichen Itza = 奇琴伊察
'Few romances can ever surpass that of the granite citadel on top of the beetling precipices of Machu Picchu, the crown of Inca Land.' - Hiram Bingham = “很少有能超越这座建立在马丘比丘顶峰峭壁上的石头城塞的浪漫，它是印加的皇冠。”——海勒姆·宾厄姆（美国探险家） 'Few romances can ever surpass that of the granite citadel on top of the beetling precipices of Machu Picchu, the crown of Inca Land.' - Hiram Bingham = “很少有能超越这座建立在马丘比丘顶峰峭壁上的石头城塞的浪漫，它是印加的皇冠。”——海勒姆·宾厄姆（美国探险家）
@ -1941,7 +1930,7 @@ Ruin! Ruin! Istanbul becomes Iram of the Pillars, remembered only by the melanch
From the magnificence of Topkapi, the Ottoman nation greets you, stranger! I'm Suleiman, Kayser-I Rum, and I bestow upon you my welcome! = 在托普卡利的壮丽之下，奥斯曼帝国向您致敬，陌生人！我是苏莱曼一世，在这里，我表示对您的欢迎！ From the magnificence of Topkapi, the Ottoman nation greets you, stranger! I'm Suleiman, Kayser-I Rum, and I bestow upon you my welcome! = 在托普卡利的壮丽之下，奥斯曼帝国向您致敬，陌生人！我是苏莱曼一世，在这里，我表示对您的欢迎！
Let us do business! Would you be interested? = 让我们做些威尼斯商人要做的事吧，你对这个交易怎么看？ Let us do business! Would you be interested? = 让我们做些威尼斯商人要做的事吧，你对这个交易怎么看？
Barbary Corsairs = 巴巴里海盗 Barbary Corsairs = 巴巴里海盗
50% chance of capturing defeated Barbarian naval units and earning 25 Gold = 拥有50%几率俘获战败的蛮族海军单位并获得25黄金 Melee naval units can capture defeated naval units and earn 25 Gold = 海军近战单位能够俘获战败的敌方海军单位并获得25金钱
Pay only one third the usual cost for naval unit maintenance = 海上单位维护费为正常值的1/3 Pay only one third the usual cost for naval unit maintenance = 海上单位维护费为正常值的1/3
Istanbul = 伊斯坦布尔 Istanbul = 伊斯坦布尔
Edirne = 埃迪尔内 Edirne = 埃迪尔内
@ -2991,7 +2980,7 @@ Barringer Crater = 巴林杰陨石坑
#################### Lines from TileImprovements from Civ V - Vanilla #################### #################### Lines from TileImprovements from Civ V - Vanilla ####################
Can also be built on tiles adjacent to fresh water = 也能建造在毗邻淡水的地块 Can also be built on tiles adjacent to fresh water = 也能建造在毗邻淡水的地块
[stats] on [param] tiles once [tech] is discovered = 研发[tech]后[param]地块[stats] [stats] on [param] tiles once [tech] is discovered = 研发[tech]科技后建造在[param]地块上的该设施[stats]
Farm = 农场 Farm = 农场
Lumber mill = 锯木场 Lumber mill = 锯木场
@ -3018,6 +3007,7 @@ Fort = 堡垒
Road = 道路 Road = 道路
Remove Forest = 砍伐森林 Remove Forest = 砍伐森林
Remove Jungle = 砍伐丛林 Remove Jungle = 砍伐丛林
@ -3289,6 +3279,7 @@ Founds a new city = 建立一座城市，组建此单位时城市的食物积累
Ignores terrain cost = 所有地形都只消耗1移动力 Ignores terrain cost = 所有地形都只消耗1移动力
Maori Warrior = 毛利勇士 Maori Warrior = 毛利勇士
Jaguar = 美洲虎战士 Jaguar = 美洲虎战士
@ -3483,8 +3474,7 @@ Modern Armor = 现代坦克
Great Artist = 大艺术家 Great Artist = 大艺术家
Great Person - [stat] = 伟人 - [stat] Great Person - [stat] = 伟人 - [stat]
Can construct [tileImprovement] = 能建造[tileImprovement] Can construct [tileImprovement] = 能建造[tileImprovement]
# Requires translation! Can start an [amount]-turn golden age = 可以开启[amount]回合黄金时代
Can start an [amount]-turn golden age =
Great Scientist = 大科学家 Great Scientist = 大科学家
Can hurry technology research = 可以加速科技研究 Can hurry technology research = 可以加速科技研究

13
android/assets/jsons/translations/Spanish.properties
View file

@ -600,8 +600,10 @@ vs [unitType] = vs [unitType]
Terrain = Terreno Terrain = Terreno
Tile = Casilla Tile = Casilla
Missing resource = Recurso faltante Missing resource = Recurso faltante
[stats] on [tileType] tiles = [stats] en [tileType] casillas # Requires translation!
from improvements: = de mejoras: The following improvements [stats]: =
# Requires translation!
The following improvements on [tileType] tiles [stats]: =
Hurry Research = Acelerar investigación Hurry Research = Acelerar investigación
@ -897,8 +899,6 @@ Download [modName] =
# Requires translation! # Requires translation!
Could not download mod list = Could not download mod list =
# Requires translation! # Requires translation!
[amount] Stars =
# Requires translation!
Download mod from URL = Download mod from URL =
# Requires translation! # Requires translation!
Download = Download =
@ -1941,7 +1941,8 @@ Ruin! Ruin! Istanbul becomes Iram of the Pillars, remembered only by the melanch
From the magnificence of Topkapi, the Ottoman nation greets you, stranger! I'm Suleiman, Kayser-I Rum, and I bestow upon you my welcome! = ¡Desde la magnificiencia de Topkapi, el imperio Otomano te saluda extranjero! Soy Solimán, César de Roma, te doy la bienvenida. From the magnificence of Topkapi, the Ottoman nation greets you, stranger! I'm Suleiman, Kayser-I Rum, and I bestow upon you my welcome! = ¡Desde la magnificiencia de Topkapi, el imperio Otomano te saluda extranjero! Soy Solimán, César de Roma, te doy la bienvenida.
Let us do business! Would you be interested? = ¡Hagámos negocios! ¿Te interesa? Let us do business! Would you be interested? = ¡Hagámos negocios! ¿Te interesa?
Barbary Corsairs = Corsarios Berberiscos Barbary Corsairs = Corsarios Berberiscos
50% chance of capturing defeated Barbarian naval units and earning 25 Gold = 50% de probabilidad de capturar unidades navales bárbaras derrotadas y ganar 25 de oro # Requires translation!
Melee naval units can capture defeated naval units and earn 25 Gold =
Pay only one third the usual cost for naval unit maintenance = Pague solo un tercio del costo habitual por el mantenimiento de la unidad naval Pay only one third the usual cost for naval unit maintenance = Pague solo un tercio del costo habitual por el mantenimiento de la unidad naval
Istanbul = Estambul Istanbul = Estambul
Edirne = Edirne Edirne = Edirne
@ -3018,6 +3019,7 @@ Fort = Fuerte
Road = Carretera Road = Carretera
Remove Forest = Quitar bosque Remove Forest = Quitar bosque
Remove Jungle = Quitar selva Remove Jungle = Quitar selva
@ -3289,6 +3291,7 @@ Founds a new city = Funda una nueva ciudad
Ignores terrain cost = Ignora el coste del terreno Ignores terrain cost = Ignora el coste del terreno
Maori Warrior = Guerrero maorí Maori Warrior = Guerrero maorí
Jaguar = Jaguar Jaguar = Jaguar

38
android/assets/jsons/translations/Traditional_Chinese.properties
View file

@ -609,14 +609,12 @@ defence vs ranged = 對遠程攻擊防禦
Attacker Bonus = 主動攻擊加成 Attacker Bonus = 主動攻擊加成
Landing = 登陸作戰 Landing = 登陸作戰
Flanking = 側翼夾擊 Flanking = 側翼夾擊
vs [unitType] = 對戰[unitType] vs [unitType] = vs [unitType]
Terrain = 地形修正 Terrain = 地形修正
Tile = 地塊 Tile = 地塊
Missing resource = 資源缺失 Missing resource = 戰略資源缺乏
# Requires translation! The following improvements [stats]: = 下列設施[stats]：
[stats] on [tileType] tiles = The following improvements on [tileType] tiles [stats]: = 建造在[tileType]地塊上的下列設施[stats]：
# Requires translation!
from improvements: =
Hurry Research = 加速科技研究 Hurry Research = 加速科技研究
@ -645,15 +643,12 @@ ranged units =
# For the All "newly-trained [relevant] units in this city receive the [] promotion" translation. Relevant as in 'units that can receive' # For the All "newly-trained [relevant] units in this city receive the [] promotion" translation. Relevant as in 'units that can receive'
relevant = 相應的 relevant = 相應的
# For '[stats] from [Water] tiles in this city' # For '[stats] from [Water] tiles in this city'
Water = 水 Water = 水上
# For [stats] from [Water resource] tiles in this city # For [stats] from [Water resource] tiles in this city
Water resource = 水上資源 Water resource = 水上資源
# Requires translation! River = 河流
River = fresh water = 淡水
# Requires translation! non-fresh water = 非淡水
fresh water =
# Requires translation!
non-fresh water =
Wonders = 奇觀 Wonders = 奇觀
Base values = 基礎產出 Base values = 基礎產出
@ -930,8 +925,6 @@ Download [modName] =
# Requires translation! # Requires translation!
Could not download mod list = Could not download mod list =
# Requires translation! # Requires translation!
[amount] Stars =
# Requires translation!
Download mod from URL = Download mod from URL =
# Requires translation! # Requires translation!
Download = Download =
@ -1034,7 +1027,7 @@ Lighthouse = 燈塔
All military naval units receive +1 movement and +1 sight = 所有海軍軍事單位+1移動力和+1視野 All military naval units receive +1 movement and +1 sight = 所有海軍軍事單位+1移動力和+1視野
The Great Lighthouse = 大燈塔 The Great Lighthouse = 大燈塔
+[amount]% production when building [param] in this city = 所在城市組建[param]時產能積累速率+[amount] +[amount]% production when building [param] in this city = 所在城市組建[param]時產能積累速率+[amount]%
Stable = 馬廄 Stable = 馬廄
Circus Maximus = 大競技場 Circus Maximus = 大競技場
@ -1093,8 +1086,7 @@ Enables nuclear weapon = 允許建造核武器
Manhattan Project = 曼哈頓計畫 Manhattan Project = 曼哈頓計畫
'The katun is established at Chichen Itza. The settlement of the Itza shall take place there. The quetzal shall come, the green bird shall come. Ah Kantenal shall come. It is the word of God. The Itza shall come.' - The Books of Chilam Balam = “這個卡吞建立在奇琴伊察。伊察將在那裡定居。格查爾鳥將會到來，綠色的鳥將會到來。阿·坎特納爾將會到來。這是神的預言。伊察將會到來。”——《奇蘭巴蘭之書》（馬雅人的預言書） 'The katun is established at Chichen Itza. The settlement of the Itza shall take place there. The quetzal shall come, the green bird shall come. Ah Kantenal shall come. It is the word of God. The Itza shall come.' - The Books of Chilam Balam = “這個卡吞建立在奇琴伊察。伊察將在那裡定居。格查爾鳥將會到來，綠色的鳥將會到來。阿·坎特納爾將會到來。這是神的預言。伊察將會到來。”——《奇蘭巴蘭之書》（馬雅人的預言書）
# Requires translation! Golden Age length increased by [amount]% = 黃金時代持續時間+[amount]%
Golden Age length increased by [amount]% =
Chichen Itza = 奇琴伊察 Chichen Itza = 奇琴伊察
'Few romances can ever surpass that of the granite citadel on top of the beetling precipices of Machu Picchu, the crown of Inca Land.' - Hiram Bingham = “很少有能超越這座建立在馬丘比丘頂峰峭壁上的石頭城塞的浪漫，它是印加的皇冠。”——海勒姆·賓厄姆（美國探險家） 'Few romances can ever surpass that of the granite citadel on top of the beetling precipices of Machu Picchu, the crown of Inca Land.' - Hiram Bingham = “很少有能超越這座建立在馬丘比丘頂峰峭壁上的石頭城塞的浪漫，它是印加的皇冠。”——海勒姆·賓厄姆（美國探險家）
@ -1984,8 +1976,7 @@ Ruin! Ruin! Istanbul becomes Iram of the Pillars, remembered only by the melanch
From the magnificence of Topkapi, the Ottoman nation greets you, stranger! I'm Suleiman, Kayser-I Rum, and I bestow upon you my welcome! = 在托普卡利的壯麗之下，奧斯曼帝國向您致敬，陌生人！我是蘇萊曼一世，在這裡，我表示對您的歡迎！ From the magnificence of Topkapi, the Ottoman nation greets you, stranger! I'm Suleiman, Kayser-I Rum, and I bestow upon you my welcome! = 在托普卡利的壯麗之下，奧斯曼帝國向您致敬，陌生人！我是蘇萊曼一世，在這裡，我表示對您的歡迎！
Let us do business! Would you be interested? = 讓我們做些威尼斯商人要做的事吧，你對這個交易怎麼看？ Let us do business! Would you be interested? = 讓我們做些威尼斯商人要做的事吧，你對這個交易怎麼看？
Barbary Corsairs = 巴巴里海盜 Barbary Corsairs = 巴巴里海盜
# Requires translation! Melee naval units can capture defeated naval units and earn 25 Gold = 海軍近戰單位能夠俘獲戰敗的敵方海軍單位並獲得25金錢
50% chance of capturing defeated Barbarian naval units and earning 25 Gold =
Pay only one third the usual cost for naval unit maintenance = 海上單位維護費為正常值的1/3 Pay only one third the usual cost for naval unit maintenance = 海上單位維護費為正常值的1/3
Istanbul = 伊斯坦布爾 Istanbul = 伊斯坦布爾
Edirne = 埃迪爾內 Edirne = 埃迪爾內
@ -2111,7 +2102,7 @@ You mongrel! Cursed be you! The world will long lament your heinous crime! = 你
Peace be on you! I am Darius, the great and outstanding king of kings of great Persia... but I suppose you knew that. = 和平永伴汝身...我是大流士，波斯最偉大的皇帝...我希望你知道這一點。 Peace be on you! I am Darius, the great and outstanding king of kings of great Persia... but I suppose you knew that. = 和平永伴汝身...我是大流士，波斯最偉大的皇帝...我希望你知道這一點。
In my endless magnanimity, I am making you this offer. You agree, of course? = 在我的容忍範圍裡，我將給你一個很棒的報價，你將會同意的，不是嗎？ In my endless magnanimity, I am making you this offer. You agree, of course? = 在我的容忍範圍裡，我將給你一個很棒的報價，你將會同意的，不是嗎？
Good day to you! = 祝你有美好的一天！ Good day to you! = 祝你有美好的一天！
Ahh... you... = ❤️哈...你好...... Ahh... you... = 哈...你好......
Achaemenid Legacy = 阿契美尼德王朝的遺產 Achaemenid Legacy = 阿契美尼德王朝的遺產
+10% Strength for all units during Golden Age = 處於黃金時代時所有單位+10%戰鬥力 +10% Strength for all units during Golden Age = 處於黃金時代時所有單位+10%戰鬥力
+1 Movement for all units during Golden Age = 處於黃金時代時所有單位+1移動力 +1 Movement for all units during Golden Age = 處於黃金時代時所有單位+1移動力
@ -3111,6 +3102,7 @@ Fort = 堡壘
Road = 道路 Road = 道路
Remove Forest = 砍伐森林 Remove Forest = 砍伐森林
Remove Jungle = 砍伐叢林 Remove Jungle = 砍伐叢林
@ -3383,6 +3375,7 @@ Founds a new city = 建立一座城市，組建此單位時城市的食物積累
Ignores terrain cost = 所有地形都只消耗1移動力 Ignores terrain cost = 所有地形都只消耗1移動力
Maori Warrior = 毛利勇士 Maori Warrior = 毛利勇士
# Requires translation! # Requires translation!
@ -3579,8 +3572,7 @@ Modern Armor = 現代坦克
Great Artist = 大藝術家 Great Artist = 大藝術家
Great Person - [stat] = 偉人 - [stat] Great Person - [stat] = 偉人 - [stat]
Can construct [tileImprovement] = 能建造[tileImprovement] Can construct [tileImprovement] = 能建造[tileImprovement]
# Requires translation! Can start an [amount]-turn golden age = 可以開啟[amount]回合黃金時代
Can start an [amount]-turn golden age =
Great Scientist = 大科學家 Great Scientist = 大科學家
Can hurry technology research = 可以加速科技研究 Can hurry technology research = 可以加速科技研究

10
android/assets/jsons/translations/Turkish.properties
View file

@ -619,9 +619,9 @@ Terrain = Arazi
Tile = Bölge Tile = Bölge
Missing resource = Eksik kaynak Missing resource = Eksik kaynak
# Requires translation! # Requires translation!
[stats] on [tileType] tiles = The following improvements [stats]: =
# Requires translation! # Requires translation!
from improvements: = The following improvements on [tileType] tiles [stats]: =
Hurry Research = Araştırma Hızlandırma Hurry Research = Araştırma Hızlandırma
@ -948,8 +948,6 @@ Download [modName] =
# Requires translation! # Requires translation!
Could not download mod list = Could not download mod list =
# Requires translation! # Requires translation!
[amount] Stars =
# Requires translation!
Download mod from URL = Download mod from URL =
# Requires translation! # Requires translation!
Download = Download =
@ -2115,7 +2113,7 @@ From the magnificence of Topkapi, the Ottoman nation greets you, stranger! I'm S
Let us do business! Would you be interested? = Let us do business! Would you be interested? =
Barbary Corsairs = Berber Korsanları Barbary Corsairs = Berber Korsanları
# Requires translation! # Requires translation!
50% chance of capturing defeated Barbarian naval units and earning 25 Gold = Melee naval units can capture defeated naval units and earn 25 Gold =
# Requires translation! # Requires translation!
Pay only one third the usual cost for naval unit maintenance = Pay only one third the usual cost for naval unit maintenance =
Istanbul = İstanbul Istanbul = İstanbul
@ -3736,6 +3734,7 @@ Fort = Kale
Road = Yol Road = Yol
Remove Forest = Ormanı ortadan kaldır Remove Forest = Ormanı ortadan kaldır
Remove Jungle = Sık ormanı ortadan kaldır Remove Jungle = Sık ormanı ortadan kaldır
@ -4012,6 +4011,7 @@ Founds a new city = Yeni bir şehir kurar
Ignores terrain cost = Arazi maliyetini yok sayar Ignores terrain cost = Arazi maliyetini yok sayar
Maori Warrior = Maori Savaşçısı Maori Warrior = Maori Savaşçısı
# Requires translation! # Requires translation!

10
android/assets/jsons/translations/Ukrainian.properties
View file

@ -606,9 +606,9 @@ Terrain = Місцевість
Tile = Клітина Tile = Клітина
Missing resource = Відсутній ресурс Missing resource = Відсутній ресурс
# Requires translation! # Requires translation!
[stats] on [tileType] tiles = The following improvements [stats]: =
# Requires translation! # Requires translation!
from improvements: = The following improvements on [tileType] tiles [stats]: =
Hurry Research = Завершити дослідження Hurry Research = Завершити дослідження
@ -909,8 +909,6 @@ Download [modName] =
# Requires translation! # Requires translation!
Could not download mod list = Could not download mod list =
# Requires translation! # Requires translation!
[amount] Stars =
# Requires translation!
Download mod from URL = Download mod from URL =
# Requires translation! # Requires translation!
Download = Download =
@ -1963,7 +1961,7 @@ From the magnificence of Topkapi, the Ottoman nation greets you, stranger! I'm S
Let us do business! Would you be interested? = Давайте торгувати! Ви зацікавлені? Let us do business! Would you be interested? = Давайте торгувати! Ви зацікавлені?
Barbary Corsairs = Корсари-варвари Barbary Corsairs = Корсари-варвари
# Requires translation! # Requires translation!
50% chance of capturing defeated Barbarian naval units and earning 25 Gold = Melee naval units can capture defeated naval units and earn 25 Gold =
Pay only one third the usual cost for naval unit maintenance = Сплачуйте лише третину звичайних витрат на обслуговування військово-морських частин Pay only one third the usual cost for naval unit maintenance = Сплачуйте лише третину звичайних витрат на обслуговування військово-морських частин
Istanbul = Стамбул Istanbul = Стамбул
Edirne = Едірне Edirne = Едірне
@ -3089,6 +3087,7 @@ Fort = Форт
Road = Дорога Road = Дорога
Remove Forest = Вирубати ліс Remove Forest = Вирубати ліс
Remove Jungle = Вирубати джунглі Remove Jungle = Вирубати джунглі
@ -3360,6 +3359,7 @@ Founds a new city = Може заснувати нове місто
Ignores terrain cost = Перетинає місцевість без перешкод Ignores terrain cost = Перетинає місцевість без перешкод
Maori Warrior = Воїн Маорі Maori Warrior = Воїн Маорі
# Requires translation! # Requires translation!

5
android/assets/jsons/translations/template.properties
View file

@ -600,8 +600,8 @@ vs [unitType] =
Terrain = Terrain =
Tile = Tile =
Missing resource = Missing resource =
[stats] on [tileType] tiles = The following improvements [stats]: =
from improvements: = The following improvements on [tileType] tiles [stats]: =
Hurry Research = Hurry Research =
@ -893,7 +893,6 @@ Invalid ID! =
Mods = Mods =
Download [modName] = Download [modName] =
Could not download mod list = Could not download mod list =
[amount] Stars =
Download mod from URL = Download mod from URL =
Download = Download =
Done! = Done! =

27
android/assets/skin/flat-earth-ui.atlas
View file

@ -4,24 +4,6 @@ size: 512,512
format: RGBA8888 format: RGBA8888
filter: Linear,Linear filter: Linear,Linear
repeat: none repeat: none
button
rotate: false
xy: 91, 136
size: 56, 42
split: 18, 18, 0, 0
pad: 13, 14, 3, 2
orig: 56, 42
offset: 0, 0
index: -1
button-pressed
rotate: false
xy: 91, 92
size: 56, 42
split: 18, 18, 0, 0
pad: 13, 14, 3, 2
orig: 56, 42
offset: 0, 0
index: -1
checkbox checkbox
rotate: false rotate: false
xy: 183, 304 xy: 183, 304
@ -127,15 +109,6 @@ splitpane-vertical
orig: 11, 4 orig: 11, 4
offset: 0, 0 offset: 0, 0
index: -1 index: -1
textfield
rotate: false
xy: 142, 226
size: 30, 30
split: 4, 4, 4, 4
pad: 4, 4, 1, 1
orig: 30, 30
offset: 0, 0
index: -1
white white
rotate: false rotate: false
xy: 91, 89 xy: 91, 89

10
android/assets/skin/flat-earth-ui.json
View file

@ -50,15 +50,15 @@ com.badlogic.gdx.graphics.Color: {
} }
com.badlogic.gdx.scenes.scene2d.ui.Skin$TintedDrawable: { com.badlogic.gdx.scenes.scene2d.ui.Skin$TintedDrawable: {
button-c: { button-c: {
name: button name: "Button"
color: color color: color
} }
button-pressed-c: { button-pressed-c: {
name: button-pressed name: "Button"
color: color color: color
} }
button-h: { button-h: {
name: button name: "Button"
color: highlight color: highlight
} }
checkbox-c: { checkbox-c: {
@ -106,7 +106,7 @@ com.badlogic.gdx.scenes.scene2d.ui.Skin$TintedDrawable: {
color: color color: color
} }
textfield-c: { textfield-c: {
name: textfield name: "Button"
color: color color: color
} }
color: { color: {
@ -150,7 +150,7 @@ com.badlogic.gdx.scenes.scene2d.ui.Skin$TintedDrawable: {
color: black color: black
} }
button-p: { button-p: {
name: button name: "Button"
color: pressed color: pressed
} }
slider-fancy-p: { slider-fancy-p: {

2
core/src/com/unciv/MainMenuScreen.kt
View file

@ -47,7 +47,7 @@ class MainMenuScreen: CameraStageBaseScreen() {
// If we were in a mod, some of the resource images for the background map we're creating // If we were in a mod, some of the resource images for the background map we're creating
// will not exist unless we reset the ruleset and images // will not exist unless we reset the ruleset and images
ImageGetter.ruleset = RulesetCache.getBaseRuleset() ImageGetter.ruleset = RulesetCache.getBaseRuleset()
ImageGetter.refreshAtlas() //ImageGetter.refreshAtlas()
thread(name = "ShowMapBackground") { thread(name = "ShowMapBackground") {
val newMap = MapGenerator(RulesetCache.getBaseRuleset()) val newMap = MapGenerator(RulesetCache.getBaseRuleset())

2
core/src/com/unciv/UncivGame.kt
View file

@ -115,7 +115,7 @@ class UncivGame(parameters: UncivGameParameters) : Game() {
ImageGetter.ruleset = gameInfo.ruleSet ImageGetter.ruleset = gameInfo.ruleSet
Gdx.input.inputProcessor = null // Since we will set the world screen when we're ready, Gdx.input.inputProcessor = null // Since we will set the world screen when we're ready,
// This is to avoid ANRs when loading. // This is to avoid ANRs when loading.
ImageGetter.refreshAtlas() //ImageGetter.refreshAtlas()
worldScreen = WorldScreen(gameInfo.getPlayerToViewAs()) worldScreen = WorldScreen(gameInfo.getPlayerToViewAs())
setWorldScreen() setWorldScreen()
} }

4
core/src/com/unciv/logic/battle/Battle.kt
View file

@ -165,8 +165,8 @@ object Battle {
// Similarly, Ottoman unique // Similarly, Ottoman unique
if (defender.isDefeated() && defender.getUnitType().isWaterUnit() && defender.getCivInfo().isBarbarian() if (defender.isDefeated() && defender.getUnitType().isWaterUnit() && defender.getCivInfo().isBarbarian()
&& attacker.isMelee() && attacker.getUnitType().isWaterUnit() && attacker.isMelee() && attacker.getUnitType().isWaterUnit()
&& attacker.getCivInfo().hasUnique("50% chance of capturing defeated Barbarian naval units and earning 25 Gold") && attacker.getCivInfo().hasUnique("Melee naval units can capture defeated naval units and earn 25 Gold")
&& Random().nextDouble() > 0.5) { && Random().nextDouble() > 0.4 * attacker.getAttackingStrength() / defender.getDefendingStrength() + 0.1f) {
attacker.getCivInfo().placeUnitNearTile(attackedTile.position, defender.getName()) attacker.getCivInfo().placeUnitNearTile(attackedTile.position, defender.getName())
attacker.getCivInfo().gold += 25 attacker.getCivInfo().gold += 25
} }

4
core/src/com/unciv/models/ruleset/tech/Technology.kt
View file

@ -28,12 +28,12 @@ class Technology {
for (improvement in ruleset.tileImprovements.values) for ( unique in improvement.uniqueObjects for (improvement in ruleset.tileImprovements.values) for ( unique in improvement.uniqueObjects
.filter { it.placeholderText in setOf("[] once [] is discovered", "[] on [] tiles once [] is discovered") .filter { it.placeholderText in setOf("[] once [] is discovered", "[] on [] tiles once [] is discovered")
&& it.params.last() == name }) { && it.params.last() == name }) {
val key = if (unique.params.size == 2 ) unique.params[0] else "[${unique.params[0]}] on [${unique.params[1]}] tiles" val key = if (unique.params.size == 2 ) "The following improvements [${unique.params[0]}]:" else "The following improvements on [${unique.params[1]}] tiles [${unique.params[0]}]:"
if (!mapOfImprovedImprovements.containsKey(key)) mapOfImprovedImprovements[key] = ArrayList() if (!mapOfImprovedImprovements.containsKey(key)) mapOfImprovedImprovements[key] = ArrayList()
mapOfImprovedImprovements[key]!!.add(improvement.name) mapOfImprovedImprovements[key]!!.add(improvement.name)
} }
for ( improvements in mapOfImprovedImprovements) { for ( improvements in mapOfImprovedImprovements) {
val impimpString = improvements.key.tr() + " from improvements: ".tr() + improvements.value.joinToString(", ") { it.tr() } val impimpString = improvements.key.tr() + improvements.value.joinToString(", "," ") { it.tr() }
lineList += impimpString lineList += impimpString
} }

2
core/src/com/unciv/ui/pickerscreens/ModManagementScreen.kt
View file

@ -43,7 +43,7 @@ class ModManagementScreen: PickerScreen() {
repo.name = repo.name.replace('-', ' ') repo.name = repo.name.replace('-', ' ')
val downloadButton = repo.name.toTextButton() val downloadButton = repo.name.toTextButton()
downloadButton.onClick { downloadButton.onClick {
descriptionLabel.setText(repo.description + "\n" + "[${repo.stargazers_count}] Stars".tr()) descriptionLabel.setText(repo.description + "\n" + "[${repo.stargazers_count}]✯".tr())
removeRightSideClickListeners() removeRightSideClickListeners()
rightSideButton.enable() rightSideButton.enable()
rightSideButton.setText("Download [${repo.name}]".tr()) rightSideButton.setText("Download [${repo.name}]".tr())

4
core/src/com/unciv/ui/pickerscreens/TechButton.kt
View file

@ -15,7 +15,7 @@ class TechButton(techName:String, private val techManager: TechManager, isWorldS
init { init {
touchable = Touchable.enabled touchable = Touchable.enabled
background = ImageGetter.getDrawable("OtherIcons/techButtonBackground").apply { setMinSize(0f,0f) } background = ImageGetter.getRoundedEdgeTableBackground()
pad(10f) pad(10f)
if (ImageGetter.techIconExists(techName)) if (ImageGetter.techIconExists(techName))
@ -73,6 +73,6 @@ class TechButton(techName:String, private val techManager: TechManager, isWorldS
if (isWorldScreen) rightSide.add(techEnabledIcons) if (isWorldScreen) rightSide.add(techEnabledIcons)
else rightSide.add(techEnabledIcons) else rightSide.add(techEnabledIcons)
// .width(techEnabledIcons.children.size * (techIconSize+6f)) // .width(techEnabledIcons.children.size * (techIconSize+6f))
.minWidth(150f) .minWidth(225f)
} }
} }

2
core/src/com/unciv/ui/tilegroups/CityButton.kt
View file

@ -118,7 +118,7 @@ class CityButton(val city: CityInfo, private val tileGroup: WorldTileGroup): Tab
if (!showAdditionalInfoTags || tileGroup.tileInfo.airUnits.isEmpty()) return if (!showAdditionalInfoTags || tileGroup.tileInfo.airUnits.isEmpty()) return
val secondarycolor = city.civInfo.nation.getInnerColor() val secondarycolor = city.civInfo.nation.getInnerColor()
val airUnitTable = Table() val airUnitTable = Table()
airUnitTable.background = ImageGetter.getRoundedEdgeTableBackground(city.civInfo.nation.getOuterColor(),false) airUnitTable.background = ImageGetter.getRoundedEdgeTableBackground(city.civInfo.nation.getOuterColor()).apply { setMinSize(0f,0f) }
val aircraftImage = ImageGetter.getImage("OtherIcons/Aircraft") val aircraftImage = ImageGetter.getImage("OtherIcons/Aircraft")
aircraftImage.color = secondarycolor aircraftImage.color = secondarycolor
airUnitTable.add(aircraftImage).size(15f) airUnitTable.add(aircraftImage).size(15f)

2
core/src/com/unciv/ui/utils/CameraStageBaseScreen.kt
View file

@ -13,6 +13,7 @@ import com.badlogic.gdx.scenes.scene2d.*
import com.badlogic.gdx.scenes.scene2d.ui.* import com.badlogic.gdx.scenes.scene2d.ui.*
import com.badlogic.gdx.scenes.scene2d.utils.ChangeListener import com.badlogic.gdx.scenes.scene2d.utils.ChangeListener
import com.badlogic.gdx.scenes.scene2d.utils.ClickListener import com.badlogic.gdx.scenes.scene2d.utils.ClickListener
import com.badlogic.gdx.scenes.scene2d.utils.Drawable
import com.badlogic.gdx.utils.viewport.ExtendViewport import com.badlogic.gdx.utils.viewport.ExtendViewport
import com.unciv.UncivGame import com.unciv.UncivGame
import com.unciv.models.Tutorial import com.unciv.models.Tutorial
@ -75,6 +76,7 @@ open class CameraStageBaseScreen : Screen {
val skin by lazy { val skin by lazy {
val skin = Skin().apply { val skin = Skin().apply {
add("Nativefont", Fonts.font, BitmapFont::class.java) add("Nativefont", Fonts.font, BitmapFont::class.java)
add("Button", ImageGetter.getRoundedEdgeTableBackground(), Drawable::class.java)
addRegions(TextureAtlas("skin/flat-earth-ui.atlas")) addRegions(TextureAtlas("skin/flat-earth-ui.atlas"))
load(Gdx.files.internal("skin/flat-earth-ui.json")) load(Gdx.files.internal("skin/flat-earth-ui.json"))
} }

14
core/src/com/unciv/ui/utils/ImageGetter.kt
View file

@ -50,6 +50,7 @@ object ImageGetter {
textureRegionDrawables.clear() textureRegionDrawables.clear()
// These are the drawables from the base game // These are the drawables from the base game
for(region in atlas.regions){ for(region in atlas.regions){
region.texture.setFilter(Texture.TextureFilter.Linear,Texture.TextureFilter.Linear)
val drawable =TextureRegionDrawable(region) val drawable =TextureRegionDrawable(region)
textureRegionDrawables[region.name] = drawable textureRegionDrawables[region.name] = drawable
} }
@ -67,11 +68,11 @@ object ImageGetter {
} }
} }
fun refreshAtlas() { /*fun refreshAtlas() {
atlas.dispose() // To avoid OutOfMemory exceptions atlas.dispose() // To avoid OutOfMemory exceptions
atlas = TextureAtlas("game.atlas") atlas = TextureAtlas("game.atlas")
setTextureRegionDrawables() setTextureRegionDrawables()
} }*/
fun getWhiteDot() = getImage(whiteDotLocation) fun getWhiteDot() = getImage(whiteDotLocation)
fun getDot(dotColor: Color) = getWhiteDot().apply { color = dotColor} fun getDot(dotColor: Color) = getWhiteDot().apply { color = dotColor}
@ -89,11 +90,10 @@ object ImageGetter {
else return textureRegionDrawables[whiteDotLocation]!! else return textureRegionDrawables[whiteDotLocation]!!
} }
fun getRoundedEdgeTableBackground(tintColor: Color?=null, isButton: Boolean =true): NinePatchDrawable { fun getRoundedEdgeTableBackground(tintColor: Color?=null): NinePatchDrawable {
val drawable =if(isButton) NinePatchDrawable(NinePatch(getDrawable("OtherIcons/buttonBackground").region,20,20,20,20)).apply { val drawable = NinePatchDrawable(NinePatch(getDrawable("OtherIcons/buttonBackground").region,25,25,0,0)).apply {
setPadding(0f,10f,0f,10f) setPadding(5f,15f,5f,15f)
} else NinePatchDrawable(NinePatch(getDrawable("OtherIcons/civTableBackground").region,12,12,12,12)) }
.apply { setPadding(5f,5f,5f,5f) }
if(tintColor==null) return drawable if(tintColor==null) return drawable
return drawable.tint(tintColor) return drawable.tint(tintColor)
} }

8
core/src/com/unciv/ui/worldscreen/NotificationsScroll.kt
View file

@ -30,12 +30,12 @@ class NotificationsScroll(internal val worldScreen: WorldScreen) : ScrollPane(nu
notificationsTable.clearChildren() notificationsTable.clearChildren()
for (notification in notifications.toList().reversed()) { // toList to avoid concurrency problems for (notification in notifications.toList().reversed()) { // toList to avoid concurrency problems
val label = notification.text.toLabel(Color.BLACK,14) val label = notification.text.toLabel(Color.BLACK,30)
val listItem = Table() val listItem = Table()
listItem.add(ImageGetter.getCircle() listItem.add(ImageGetter.getCircle()
.apply { color=notification.color }).size(10f).padRight(5f) .apply { color=notification.color }).size(20f).padRight(5f)
listItem.background = ImageGetter.getRoundedEdgeTableBackground(null, false) listItem.background = ImageGetter.getRoundedEdgeTableBackground().apply { setScale(0.5f) }
listItem.add(label) listItem.add(label)
// using a large click area with no gap in between each message item. // using a large click area with no gap in between each message item.
@ -52,7 +52,7 @@ class NotificationsScroll(internal val worldScreen: WorldScreen) : ScrollPane(nu
} }
notificationsTable.pack() notificationsTable.pack()
pack() pack()
height = min(notificationsTable.height,worldScreen.stage.height/3) height = min(notificationsTable.height,worldScreen.stage.height * 2 / 3 - 15f)
} }
} }

4
core/src/com/unciv/ui/worldscreen/WorldScreen.kt
View file

@ -339,8 +339,8 @@ class WorldScreen(val viewingCiv:CivilizationInfo) : CameraStageBaseScreen() {
} }
updateNextTurnButton(hasOpenPopups()) // This must be before the notifications update, since its position is based on it updateNextTurnButton(hasOpenPopups()) // This must be before the notifications update, since its position is based on it
notificationsScroll.update(viewingCiv.notifications) notificationsScroll.update(viewingCiv.notifications)
notificationsScroll.setPosition(stage.width - notificationsScroll.width - 5f, notificationsScroll.setPosition(stage.width - notificationsScroll.width*0.5f - 10f,
nextTurnButton.y - notificationsScroll.height - 5f) nextTurnButton.y - notificationsScroll.height*0.5f - 5f)
} }
private fun getCurrentTutorialTask(): String { private fun getCurrentTutorialTask(): String {

6
core/src/com/unciv/ui/worldscreen/mainmenu/WorldScreenMenuPopup.kt
View file

@ -7,6 +7,7 @@ import com.unciv.models.translations.tr
import com.unciv.ui.CivilopediaScreen import com.unciv.ui.CivilopediaScreen
import com.unciv.ui.newgamescreen.GameSetupInfo import com.unciv.ui.newgamescreen.GameSetupInfo
import com.unciv.ui.newgamescreen.NewGameScreen import com.unciv.ui.newgamescreen.NewGameScreen
import com.unciv.ui.saves.LoadGameScreen
import com.unciv.ui.saves.SaveGameScreen import com.unciv.ui.saves.SaveGameScreen
import com.unciv.ui.utils.Popup import com.unciv.ui.utils.Popup
import com.unciv.ui.utils.addSeparator import com.unciv.ui.utils.addSeparator
@ -36,6 +37,11 @@ class WorldScreenMenuPopup(val worldScreen: WorldScreen) : Popup(worldScreen) {
}.size(width,height) }.size(width,height)
addSeparator() addSeparator()
addSquareButton("Load game".tr()){
worldScreen.game.setScreen(LoadGameScreen(worldScreen))
close()
}.size(width,height)
addSeparator()
addSquareButton("Start new game".tr()){ addSquareButton("Start new game".tr()){
worldScreen.game.setScreen(NewGameScreen(worldScreen, GameSetupInfo(worldScreen.gameInfo))) worldScreen.game.setScreen(NewGameScreen(worldScreen, GameSetupInfo(worldScreen.gameInfo)))