Commit graph

64 commits

Author SHA1 Message Date
Yair Morgenstern
26affe7943
Translation (#1878)
* Update Nations_Italian.json (#1864)

* Update Japanese.properties (#1867)

* Update Japanese.properties

* Update Japanese.properties

* Update Japanese.properties

* Update Japanese.properties

* Update Japanese.properties

* Update Japanese.properties

* Update Japanese.properties

* Update Japanese.properties

* Update Japanese.properties

* Update Japanese.properties

* Update Japanese.properties

* Update Japanese.properties

* Update Thai.properties (#1871)

I'm back!!

* Update German.properties (#1873)

Revised promotions

* Update German.properties (#1874)

added missing unit translations

* Update Italian.properties (#1875)

Typo fix

* Update Nations_Russian.json (#1877)

* rfe

* Update Nations_Russian.json

* Update Nations_Russian.json

* Update Russian.properties (#1876)

* Translation roundup + added Mongolian civ translations

* Update Russian.properties (#1879)

Mongolia update

* Additional translation strings related to the custom map settings (#1881)

* Diplomacy screen: Secondary relationships line is added (#1880)

* Additional translation strings

* Update Japanese.properties (#1883)

* Update Japanese.properties

* Update Japanese.properties

* Update to Ukrainian translations + fix of the translation call (#1888)

* Final touches before version

Co-authored-by: Smashfanful <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: paontv <57051667+paontv@users.noreply.github.com>
Co-authored-by: NoNZeeZ <58921355+NoNZeeZ@users.noreply.github.com>
Co-authored-by: ozolotl <ozolotl@users.noreply.github.com>
Co-authored-by: IraqLobster34 <56483230+IraqLobster34@users.noreply.github.com>
Co-authored-by: JackRainy <JackRainy@users.noreply.github.com>
2020-02-09 20:29:34 +02:00
Federico Luongo
edf0294dfd
Mongolia (#1855)
* Mongolia

* Translation & Atlas

* Remove debug option

* Remove erroneous import

* Promotions.addXP

* Khan heals 15 HP

* XP bonus fix

* Added 'Mongol Terror' which is the term used for the mongolian combat bonus

Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
2020-02-08 20:51:21 +02:00
Yair Morgenstern
5ee882c20d
Translations (#1863)
* Add japanese translations (#1854)

* Terrains, Resources, Units japanese translate.

* Add some translate.

* Add technology translation.

* Update Japanese.properties (#1860)

* Update Japanese.properties

Second half

* Update Japanese.properties

* Update Japanese.properties

Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>

* Create Nations_Japanese.json, and add translation a little (#1861)

* Update German.properties (#1862)

Added technology quotes and revised translation

* Autocleanup

Co-authored-by: pekomiya <hongu.yk@gmail.com>
Co-authored-by: paontv <57051667+paontv@users.noreply.github.com>
Co-authored-by: ozolotl <ozolotl@users.noreply.github.com>
2020-02-06 22:35:13 +02:00
Smashfanful
84b822aaac Update Nations.json (#1770)
* Update Nations.json

Added Lhasa, Vancouver, M'Banza-Kongo and Mogadishu

* Update Nations.json
2020-01-26 21:26:47 +02:00
Yair Morgenstern
c29ccadc60 Exploring units no longer auto-enter city states 2020-01-23 20:50:53 +02:00
lishaoxia1985
42e16ec80a Now we and AI can sign research agreement. (#1671) 2020-01-23 20:12:24 +02:00
Marerjh
43e9ee112e Update Ukrainian translation + Missing translations (#1714)
* Update Ukrainian.properties

* Update Ukrainian.properties

* Update Tutorials_Ukrainian.json

* Update Nations_Ukrainian.json

* Update Ukrainian.properties

* Update template.properties

Missing translations
2020-01-19 22:02:09 +02:00
Marerjh
02f57b4b09 Update Nations_Ukrainian.json (#1698)
* Update Nations_Ukrainian.json

* Update Ukrainian.properties

* Update Ukrainian.properties

* Update Nations_Ukrainian.json

* Update Nations_Ukrainian.json

* Update Ukrainian.properties
2020-01-16 22:08:52 +02:00
Federico Luongo
f118be5d40 Adopted JSONC standard for assets files (#1674)
* Adopted JSONC standard for assets files

* Update Nations_Ukrainian.json

* Update Nations_Ukrainian.json

* Normalized Nations_Ukrainian too

Co-authored-by: Marerjh <40261003+Marerjh@users.noreply.github.com>
2020-01-13 19:01:27 +02:00
JackRainy
0d889989c6 Improved Ukrainian translations (#1673)
* Improved Ukrainian translations

* Minor corrections
2020-01-12 23:35:57 +02:00
Smashfanful
759ab09293 Update Nations_Italian.json (#1660) 2020-01-11 21:41:31 +02:00
Oheto
8b44ffcd0e Update Nations_Ukrainian.json (#1641) 2020-01-09 20:29:23 +02:00
r3versi
065e944896 Songhai (#1636)
* Songhai, Burial Tomb, Gold for capturing city

* Burial Tomb unique: double gold gained when city is captured

* Rebuilt Atlas and Translations

* Italian translation + fix missing translations

* Barbarian Camp Reward

Is now modified by Speed and Difficulty
2020-01-09 19:23:00 +02:00
JackRainy
2c30348168 Improved translations for Ukrainian and Russian languages (#1631) 2020-01-07 19:09:26 +02:00
Yair Morgenstern
4f2e9966b6 Revert "Update Nations_Ukrainian.json (#1627)"
This reverts commit 06c23c10dc.
2020-01-07 19:09:08 +02:00
Oheto
06c23c10dc Update Nations_Ukrainian.json (#1627)
some cities
2020-01-07 19:08:11 +02:00
Smashfanful
339d3ca510 Update Nations_Italian.json (#1617)
Spain Civilization fix
2020-01-05 10:08:08 +02:00
Marerjh
3b334f528b Update Nations_Ukrainian.json (#1592) 2020-01-01 16:50:12 +02:00
Marerjh
0eaf630c53 Update Nations_Ukrainian.json (#1590) 2019-12-31 20:22:53 +02:00
RadioMagnetofonStereofoniczny
74a4fc9155 Update Nations_Polish.json (#1583) 2019-12-31 13:57:57 +02:00
Marerjh
9b63c4ee3b Update Nations_Ukrainian.json (#1576) 2019-12-30 18:18:37 +02:00
Yair Morgenstern
006b2d7690 External merge resolve of #1566
Merge branch 'spain' of https://github.com/r3versi/Unciv into r3versi-spain
2019-12-29 17:56:05 +02:00
Marerjh
d981c393ce Update Nations_Ukrainian.json (#1568) 2019-12-29 17:47:17 +02:00
RadioMagnetofonStereofoniczny
20a0a91d13 Create Nations_Polish.json (#1547) 2019-12-27 11:14:35 +02:00
Smashfanful
95e74f6355 Update Nations_Italian.json (#1526) 2019-12-24 16:11:23 +02:00
Yair Morgenstern
fc4eb01be8 Added tests to ensure we don't miss translations in the future 2019-12-17 19:16:31 +02:00
Yair Morgenstern
113531a695 Spanish Civ is not production-ready, and natural wonders should be opt-in at the beginning 2019-12-17 16:56:07 +02:00
r3versi
aa02a2d321 Natural Wonders (#1456)
* NaturalWonders initial commit
* Created models/ruleset/tile/NaturalWonder and assets/json/NaturalWonders
* MapGenerator now spawns NaturalWonders in random compatible random locations
* MapParameters has a noNaturalWonders option
* TileInfo has naturalWonder property (set to null if none)
* TileInfo and  UnitMovementAlgorithms correctly manages stats and consider the tile unpassable and unimprovable

* Notification and happiness on NaturalWonder discovery

* El Dorado discovery bonus, Spain unique

* Doubled tile yields for Spain

* NaturalWonders implemented as TerrainType + Fountain of Youth promotion

* Images issue #124

* NaturalWonder TileImages (Fantasy) and Overlay (Default)

* NaturalWonderOverlay.png : https://www.flaticon.com/free-icon/mount-fuji_2166259

* Bugfix

* Added translations

* Italian translations

* Fix translation issue
* missing space after = in template.properties breaks translations

* Improved NaturalWonder spawn logic

* Great Barrier Reef spawns on 2 contiguous tiles
* Each wonder has specific spawn requirements
* Number of wonders spawned scales with map radius

* Fix unused import
2019-12-16 20:37:49 +02:00
Yair Morgenstern
2b384c7d01 Added tests to check that Nations files are serializable, and fixed problems in Korean and Ukrainian files 2019-12-11 20:01:29 +02:00
Yair Morgenstern
81e520e608 GL 3.0 should now work for mac - kudos @lishaoxia1985 2019-12-08 10:04:16 +02:00
coding-human
6c755135c3 Added Korean (#1423)
* Create BasicHelp_Korean

Added Korean translation of BasicHelp

* Delete BasicHelp_Korean

* Create BasicHelp_Korean.json

Added Korean translation of BasicHelp

* Create Nations_Korean.json

Added Korean translation of Babylon, Greece, China

* Update Nations_Korean.json

Added some more Korean translations

* Update Nations_Korean.json

Updated Korean translation of City States

* Update Nations_Korean.json

Added more Korean translations

* Update Nations_Korean.json

Added another Korean translations

* Create Tutorials_Korean.json

Added some Korean translation (about half)

* Update Tutorials_Korean.json

* Update Tutorials_Korean.json

Finished Korean translation

* Update Nations_Korean.json

Only 10 nations left!(Finally..)

* Update Nations_Korean.json
2019-12-07 19:24:02 +02:00
lishaoxia1985
1eb5ced75c add map modifier and the benefit when we research the technology other Civs have. (#1339)
* update

* update

* update

* update

* update

* update

* update

* update
2019-11-19 19:11:01 +02:00
Smashfanful
ab5c5809e4 Update Nations_Italian.json (#1335) 2019-11-18 20:22:34 +02:00
Smashfanful
1ffa329ffe Update Nations.json (#1328)
* Update Nations.json

Changed a couple of lines

* Update Nations.json

Correction
2019-11-15 15:59:20 +02:00
Smashfanful
1abc649d59 Update Nations_Italian.json (#1329) 2019-11-13 19:55:38 +02:00
Smashfanful
2bd9a2fbd6 Update Nations.json (#1319)
Added Kuala Lumpur and Manila, and changed Ur's defeat quotes
2019-11-10 21:57:53 +02:00
Yair Morgenstern
7b8d335902 Merge branch 'master' of https://github.com/yairm210/UnCiv 2019-11-09 19:17:54 +02:00
Yair Morgenstern
1a034cba03 Removed mod civs from nation metadata 2019-11-09 19:07:35 +02:00
Prosta4okua
4a312c3197 Ukrainian translation (#1281)
* init

* 1

2

* 3

* from StepanIvasyn

* Preparing.
Other.json

* Fully translated file Other.json

* Fix

* Fully translated BasicHelp_Ukrainian.json

* 1

* resolved conflicts

* 1

* 2
2019-11-09 19:06:10 +02:00
Smashfanful
d6dcb8ae46 Update Nations_Italian.json (#1282) 2019-11-04 08:10:57 +02:00
Yair Morgenstern
57b0040df7 Added Siam civ - #703 2019-11-03 23:22:49 +02:00
Prosta4okua
94a0228e45 [WIP]Ukrainian translation (#1270)
* init

* 1

2

* 3

* from StepanIvasyn

* Preparing.
Other.json

* Fully translated file Other.json

* Fix

* Fully translated BasicHelp_Ukrainian.json
2019-11-02 22:43:58 +02:00
Yair Morgenstern
edb5ff92ed Fixed Indirect Fire promotion 2019-11-02 20:10:01 +02:00
Prosta4okua
ff731a9c1a init (#1262) 2019-10-31 15:47:58 +02:00
lishaoxia1985
05eb1b40ea update translation, thank deluxghost! (#1264)
* update

* update

* update

* update

* update

* update

* update

* range extension

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update
2019-10-31 13:49:42 +02:00
lishaoxia1985
88da508b82 update translation (#1222)
* update

* update

* update

* update

* update

* update

* update

* range extension

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update
2019-10-23 21:59:20 +03:00
Smashfanful
556ba11bba Update Nations.json (#1192)
Added new City-States, and modified Venice
2019-10-15 20:37:03 +03:00
Smashfanful
f968b55949 Update Nations_Italian.json (#1191) 2019-10-15 20:36:56 +03:00
Yair Morgenstern
e77fdd2993 Polynesia works! 2019-10-11 14:54:08 +03:00
Yair Morgenstern
4da70dfe88 Added polynesia icon and colors 2019-10-11 12:49:07 +03:00