Commit graph

1572 commits

Author SHA1 Message Date
lishaoxia1985
fcb22f4a0e Diaploma in chinese makes well with language settings (#713)
* 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

* nation.json in chinese(no completed)

* Update Nations_Simplified_Chinese.json

* Update Nations.json

* Update Translations.json

* Update Translations.json

* Update Nations_Simplified_Chinese.json

* Update WorldScreenTopBar.kt

* update

* Update Translations.json

* update

* Update Nations_Italian.json

* updated(nation.json in Chinese also cannot runs well)

* updated(nation.json in Chinese also cannot runs well)

* Update TileImprovement.kt

* Update TileResource.kt

* Update Terrain.kt

* Update Terrain.kt

* updated(nation.json in Chinese also cannot runs well)

* Update Terrain.kt

* CivilopediaScreen language can be changed with setting

* CivilopediaScreen language can be changed with setting

* CivilopediaScreen language can be changed with setting

* chinese language update

* Update Translations.json

* Update Translations.json

* Update Translations.json

* Update BaseUnit.kt

* delete some word with "Nations.json"

* diplomacy in Chinese makes well  with the language setting
2019-05-07 10:30:11 +03:00
lishaoxia1985
79daad778f update some chinese language (#712)
* 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

* nation.json in chinese(no completed)

* Update Nations_Simplified_Chinese.json

* Update Nations.json

* Update Translations.json

* Update Translations.json

* Update Nations_Simplified_Chinese.json

* Update WorldScreenTopBar.kt

* update

* Update Translations.json

* update

* Update Nations_Italian.json

* updated(nation.json in Chinese also cannot runs well)

* updated(nation.json in Chinese also cannot runs well)

* Update TileImprovement.kt

* Update TileResource.kt

* Update Terrain.kt

* Update Terrain.kt

* updated(nation.json in Chinese also cannot runs well)

* Update Terrain.kt

* CivilopediaScreen language can be changed with setting

* CivilopediaScreen language can be changed with setting

* CivilopediaScreen language can be changed with setting

* chinese language update

* Update Translations.json

* Update Translations.json

* Update Translations.json

* Update BaseUnit.kt

* delete some word with "Nations.json"
2019-05-07 08:40:36 +03:00
Yair Morgenstern
89902bef95 Added Medic, Medic II promotions - #698 2019-05-06 23:01:28 +03:00
Yair Morgenstern
cf2580b8ed Solved #670 - civ starting locations are given as much space as possible 2019-05-06 20:46:48 +03:00
Am-per-Sand
024bad9b5a added Hanse building icon
silhouette from own photo of [Artus Court](https://en.wikipedia.org/wiki/Artus_Court)
2019-05-06 20:09:23 +03:00
Am-per-Sand
a0c90423cd added Hanse 2019-05-06 20:09:23 +03:00
Am-per-Sand
148d55c4db added unit icons for German uniques 2019-05-06 20:09:23 +03:00
Am-per-Sand
3502ed4e1d added German unique military 2019-05-06 20:09:23 +03:00
Am-per-Sand
4cd6e95278 add Landsknecht properties 2019-05-06 19:10:02 +03:00
Yann
a75d6f0c7b Update French version
You should look the file, sometimes there is repeated translations
2019-05-06 17:13:06 +03:00
Yair Morgenstern
9e03893e60 Added Woodsman promotion - #698 2019-05-05 23:22:59 +03:00
lishaoxia1985
3318f26a33 CivilopediaScreen language can be changed with setting (#706)
* 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

* nation.json in chinese(no completed)

* Update Nations_Simplified_Chinese.json

* Update Nations.json

* Update Translations.json

* Update Translations.json

* Update Nations_Simplified_Chinese.json

* Update WorldScreenTopBar.kt

* update

* Update Translations.json

* update

* Update Nations_Italian.json

* updated(nation.json in Chinese also cannot runs well)

* updated(nation.json in Chinese also cannot runs well)

* Update TileImprovement.kt

* Update TileResource.kt

* Update Terrain.kt

* Update Terrain.kt

* updated(nation.json in Chinese also cannot runs well)

* Update Terrain.kt

* CivilopediaScreen language can be changed with setting

* CivilopediaScreen language can be changed with setting

* CivilopediaScreen language can be changed with setting
2019-05-05 22:51:26 +03:00
Smashfanful
187fc026aa Update Translations.json
Added Italian translations
2019-05-05 18:27:33 +03:00
Smashfanful
ea06de76a0 Update Nations.json 2019-05-05 18:03:41 +03:00
Duan Tao
4d3e04baa0 Special diplomacy window for city states. 2019-05-05 16:20:23 +03:00
Duan Tao
1865f53c42 City states no longer build national wonders. 2019-05-05 16:20:23 +03:00
Duan Tao
fc4f62f555 City state icon. 2019-05-05 16:20:23 +03:00
Duan Tao
3292e41977 Fix city state diplomacy popup title. 2019-05-05 16:20:23 +03:00
Yair Morgenstern
2263f0c098 Map editing tools organized 2019-05-04 23:09:08 +03:00
Yair Morgenstern
5ea62f24d0 Tile icons in the map editor now look like the real tiles would 2019-05-04 22:40:19 +03:00
Yair Morgenstern
32ea37d4ec Added "Clear Map" button to Map Editor 2019-05-04 22:09:07 +03:00
Yair Morgenstern
d8fd48b4ce Workers can now remove Roads and Railroads 2019-05-04 21:55:31 +03:00
Brian Gainor
d527ccf90e Fix spelling of colosseum 2019-05-04 21:29:02 +03:00
lishaoxia1985
fabb4e922a nations in Chinese (#696)
* 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

* nation.json in chinese(no completed)

* Update Nations_Simplified_Chinese.json

* Update Nations.json

* Update Translations.json

* Update Translations.json

* Update Nations_Simplified_Chinese.json

* Update WorldScreenTopBar.kt

* update

* Update Translations.json

* update

* Update Nations_Italian.json

* updated(nation.json in Chinese also cannot runs well)

* updated(nation.json in Chinese also cannot runs well)

* Update TileImprovement.kt

* Update TileResource.kt

* Update Terrain.kt

* Update Terrain.kt

* updated(nation.json in Chinese also cannot runs well)

* Update Terrain.kt
2019-05-04 21:17:18 +03:00
Brian Gainor
7ab0267376 Don't show already-built national wonders in build menu
Should check whether wonder is already built *first*, before we check
whether prereqs are satisfied.
2019-05-04 20:46:17 +03:00
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
Duan Tao
cecce008b1 Lock city states. 2019-05-03 17:04:18 +03:00
Yair Morgenstern
cdfdbb40b8 More massive performance boosts 2019-05-03 16:59:46 +03:00
Yair Morgenstern
7400f6e874 Performance boost - moved TileInfo.isLand and .isWater to transient bools instead of functions, since the base terrain doesn't change
isBarbarianCivilization performance boost - called A LOT!
2019-05-02 23:15:22 +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
Yair Morgenstern
b4fc129a9b Added "relationship" dependant on the modifiers - this will be the main way we apply user actions to AI consequences 2019-05-01 00:13:41 +03:00
Yair Morgenstern
5952056518 Resolved #506 - Added real diplomatic relations!
Doesn't affect much now, but the platform is there to add what we want!
2019-04-30 23:56:47 +03:00
Yair Morgenstern
2ab8caeaea City states option locked away, so it doesn't affect users yet 2019-04-30 21:21:45 +03:00
Yair Morgenstern
0eb6b91957 Ibrushed up on the rules and there are ways to have influence decrease in quantities less than 1, so you were right, it is a float 2019-04-30 20:45:09 +03:00
Yair Morgenstern
de9ae3da54 City state type is now an enum
Attitude is now Influence and is an Int, not a float
Can no longer trade with city states
(All as per original Civ)
2019-04-30 19:52:27 +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
Duan Tao
307aea1cc0 Fixed : AI city under seige change production every turn. 2019-04-29 06:54:08 +03:00
Yair Morgenstern
d5b247e2c1 Human players can no longer see each other's construction info 2019-04-29 00:36:08 +03:00
Yair Morgenstern
2b8946f5e7 DiplomacyManager.flagsCountdown is now a Hashmap<String, Int> because of deserialization bullshit
Solved a silly bug in the Diplomacy overview
2019-04-29 00:25:02 +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
Duan Tao
28cc905bb5 Pops defeat msg before AI founds any city. 2019-04-28 08:11:14 +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
Duan Tao
884c7b7bb8 Fixed : Trying to move into border of uncountered civs caused crash. 2019-04-27 20:54:58 +03:00
Yair Morgenstern
68c2763ea7 Code cleanup 2019-04-25 10:37:46 +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