Commit graph

769 commits

Author SHA1 Message Date
Yair Morgenstern
6c7a0f9f4e Applied a6c2098 in translations 2019-05-03 17:12:42 +03:00
Am-per-Sand
a6c20984f2 Citizenship and Legalism description changed.
Unclear description fixed. I have almost created a pull request for `CityStats.kt`: 
```
if (policies.contains("Citizenship")  && currentConstruction.name == "Worker")
stats.production += 25f
```
as I thought it should boost training of Workers.

I also attach #423 contents of  with a similar unclarity of Legalism.
2019-05-03 17:06:53 +03:00
Yair Morgenstern
cdfdbb40b8 More massive performance boosts 2019-05-03 16:59:46 +03:00
Yair Morgenstern
827d24c778 Resolved #694, and another crashing bug 2019-05-02 23:06:34 +03:00
Smashfanful
628463cc54 Update Translations.json
New Italian Translations
2019-05-02 13:21:41 +03:00
Yair Morgenstern
e8f27c4ef4 Diplomacy is ready to be unleashed upon the unsuspecting public! 2019-05-02 00:11:32 +03:00
Duan Tao
f2333b5839 Added City states (#681)
* Add Milan as 1st city state. Choose box for number of city states.

* City states don't get settlers.

* Added diplomancy relationship. Now increase by gift and decreases every turn.

* Friendly culture city states provides culture bonus.

* 0 city states by default.

* Disable many trade items for city states.

* Fix part 1.

* Fix diplomacy screen and pop-ups.

* City state doesn't build world wonders.

* City states destroy city when conquering.

* Fixed : Trying to move into border of uncountered civs caused crash.

* City states don't exchange tech or declare war on others.

* Fix a very strange problem : you could trade introduction of AI to itself.

* City states automatically get all invented techs.

* Pops defeat msg before AI founds any city.

* Fix conquest victory with city states.

* Fixed : AI city under seige change production every turn.
2019-04-30 19:33:32 +03:00
Yair Morgenstern
d5b247e2c1 Human players can no longer see each other's construction info 2019-04-29 00:36:08 +03:00
lishaoxia1985
c8ea9f1a27 change chinese font to "WenQuanYiMicroHei" (#691)
* Update Translations.json

* Update Translations.json

* Update Tutorials_Simplified_Chinese.json

* Update Tutorials_Simplified_Chinese.json

* Update Translations.json

* Update Tutorials_Simplified_Chinese.json

* Update Translations.json

* Update Translations.json

* Update Translations.json

* Update Translations.json

* Update Tutorials_Simplified_Chinese.json

* Update Translations.json

* Update Translations.json

* Update Tutorials_Simplified_Chinese.json

* Update Tutorials_Simplified_Chinese.json

* Update Tutorials_Simplified_Chinese.json

* Add files via upload

* Update Tutorials_Simplified_Chinese.json

* Update Translations.json

* Update Translations.json

* Update Tutorials_Simplified_Chinese.json

* Update Translations.json

* Update Translations.json

* Update BasicHelp_Simplified_Chinese.json

* Update Translations.json

* Update Translations.json

* Update Tutorials_Simplified_Chinese.json

* Chinese traslation, i have test it,but app may get corruption.

* constructing buildings and wonders in the city the language shows normally according to language setting

* Update Translations.json

* Update Translations.json

* Update Translations.json

* Update Translations.json

* change chinese font with WenQuanYiMicroHei

* Update Translations.json
2019-04-28 08:14:35 +03:00
Yair Morgenstern
292297e02d Resolved #685 - loading game would clear resistance counters 2019-04-27 23:36:35 +03:00
Smashfanful
fce52ec787 Update Nations_Italian.json 2019-04-27 21:10:21 +03:00
lishaoxia1985
7eb8c03d24 Basic Help in Chinese and Some Updates (#683)
* Update Translations.json

* Update Translations.json

* Update Tutorials_Simplified_Chinese.json

* Update Tutorials_Simplified_Chinese.json

* Update Translations.json

* Update Tutorials_Simplified_Chinese.json

* Update Translations.json

* Update Translations.json

* Update Translations.json

* Update Translations.json

* Update Tutorials_Simplified_Chinese.json

* Update Translations.json

* Update Translations.json

* Update Tutorials_Simplified_Chinese.json

* Update Tutorials_Simplified_Chinese.json

* Update Tutorials_Simplified_Chinese.json

* Add files via upload

* Update Tutorials_Simplified_Chinese.json

* Update Translations.json

* Update Translations.json

* Update Tutorials_Simplified_Chinese.json

* Update Translations.json

* Update Translations.json

* Update BasicHelp_Simplified_Chinese.json

* Update Translations.json

* Update Translations.json

* Update Tutorials_Simplified_Chinese.json

* Chinese traslation, i have test it,but app may get corruption.

* constructing buildings and wonders in the city the language shows normally according to language setting

* Update Translations.json

* Update Translations.json

* Update Translations.json
2019-04-27 21:09:53 +03:00
Yair Morgenstern
931f485a8e Kotlin'D Counter class, apparently it's been Java this whole time and I didn't even notice 2019-04-25 10:28:46 +03:00
Yair Morgenstern
aea2e3efcf AIs no longer exchange techs below Prince difficulty 2019-04-24 22:13:37 +03:00
Yair Morgenstern
d8c238bf97 Added a popup for people who try to create a game and fail 2019-04-24 21:14:53 +03:00
Yair Morgenstern
c3a00a0f5e All trades are now cancelled when a civ is defeated 2019-04-24 20:48:32 +03:00
Yair Morgenstern
8a600ea07d Moved hasOpenBorders to a transient bool for "next turn" performance reasons 2019-04-24 11:58:03 +03:00
Yair Morgenstern
07a8b97ed2 Open Borders is now only available with Civil Service, as per Civ V 2019-04-24 11:31:50 +03:00
Yair Morgenstern
5d8d7ca89b AI can now offer you trades - this is a big step towards proper diplomacy relations!
As of now they only offer luxury-to-luxury trades
2019-04-23 17:07:01 +03:00
lishaoxia1985
046fe1088f Update Tutorials_Simplified_Chinese.json 2019-04-23 14:38:50 +03:00
lishaoxia1985
16d55577b2 Update Translations.json 2019-04-23 14:38:50 +03:00
lishaoxia1985
ab915c408a Update Translations.json 2019-04-23 14:38:50 +03:00
lishaoxia1985
9549be7d06 Update Translations.json 2019-04-23 14:38:50 +03:00
lishaoxia1985
6ef95c37ff Update Translations.json 2019-04-23 14:38:50 +03:00
lishaoxia1985
a182b32485 Update Tutorials_Simplified_Chinese.json 2019-04-23 14:38:50 +03:00
lishaoxia1985
a89c0623ce Update Translations.json 2019-04-23 14:38:50 +03:00
lishaoxia1985
57b8d9f3d9 Update Tutorials_Simplified_Chinese.json 2019-04-23 14:38:50 +03:00
lishaoxia1985
d0984e12a9 Update Tutorials_Simplified_Chinese.json 2019-04-23 14:38:50 +03:00
lishaoxia1985
f6c5532b14 Update Translations.json 2019-04-23 14:38:50 +03:00
lishaoxia1985
50224c71f6 Update Translations.json 2019-04-23 14:38:50 +03:00
Am-per-Sand
c19be603f2 new Cossack icon 2019-04-22 12:33:23 +02:00
Yair Morgenstern
f954686dfd
Merge pull request #669 from lishaoxia1985/master
Update Translations.json
2019-04-22 09:17:16 +03:00
lishaoxia1985
edcfe69732
Update Translations.json 2019-04-21 19:21:58 +08:00
Yair Morgenstern
30232564a2
Merge pull request #667 from lishaoxia1985/master
update some simplified chinese language
2019-04-21 08:33:28 +03:00
lishaoxia1985
4c52b639e5
Update Translations.json 2019-04-21 06:49:39 +08:00
lishaoxia1985
c845001097
Update Translations.json 2019-04-21 03:51:24 +08:00
Yair Morgenstern
cefd50ea57 Trade table logic greatly simplified, now all trade displays are dependent only on the current trade in the TradeLogic - this paves the way for "inserting" trades into the trade table, which is required for AI-offered trades! 2019-04-20 22:44:18 +03:00
lishaoxia1985
dd48d4444f
Update Translations.json 2019-04-21 01:26:47 +08:00
Am-per-Sand
630f86bbb3
enable Sentry for water melee units
There is contradictory information on units that can receive Sentry promotion, but this has been already enabled, so **adding missing prerequisites** so as water melee can get it as well as water ranged now.
2019-04-20 18:42:02 +02:00
Yair Morgenstern
4576056b9f Number of strategic resources now directly dependant on the number of settlable land tiles 2019-04-17 20:34:03 +03:00
Smashfanful
6723b8b717
Update Nations.json 2019-04-15 16:45:46 +02:00
Duan Tao
18c612dc14 Update assets. 2019-04-15 20:02:44 +08:00
Duan Tao
1a6fe1a397 Merge branch 'dev/main' into BigBen 2019-04-15 19:59:03 +08:00
Duan Tao
70241ac25b Add Big Ben. 2019-04-15 19:46:15 +08:00
Yair Morgenstern
25455df0fd
Merge pull request #649 from divizdev/master
Russian translation
2019-04-15 08:22:09 +03:00
Yair Morgenstern
089f8ac49f "Map Editor" button now takes the current map to edit 2019-04-14 22:33:19 +03:00
Yair Morgenstern
7ce7c2da93 Merge branch 'master' of https://github.com/yairm210/UnCiv 2019-04-14 22:13:10 +03:00
Yair Morgenstern
cd6806d07e Removed our getRandom() extension, because it now comes built-in in Kotlin, yay! 2019-04-14 22:12:54 +03:00
divizdev
8fe889dc96
Merge branch 'master' into master 2019-04-14 21:22:14 +03:00
diviz
9647a6d64e Russian translation 2019-04-14 21:17:06 +03:00