Duan Tao
91baeddde2
Fix crash from diplomacy screen.
2019-05-10 18:20:07 +03:00
lishaoxia1985
c37983667c
move some words into other translation files,the city name can be changed with setting
...
although the city name can be changed with setting,it's only correct when you build a new city or start a new game.if you change the game language in game progress it will miss some font.
2019-05-09 23:16:47 +03:00
Duan Tao
2ac654e26b
Fix first contact popup.
2019-05-09 18:54:43 +03:00
Duan Tao
c221d50e01
Add 2 more type of city-states.
2019-05-09 18:54:43 +03:00
Duan Tao
0b6422f9e7
Better check for culture buildings.
2019-05-09 18:04:05 +03:00
Duan Tao
029ab965d1
Legalism checks replaced culture building correctly.
2019-05-09 18:04:05 +03:00
Yair Morgenstern
b3a4ed4c4f
Declaration of Friendship is go!
...
I'm sure there's stuff I've forgotten but there is just so much that happens in diplomacy that is dependant on these declarations
2019-05-08 18:48:36 +03:00
Yair Morgenstern
f8a4f15f33
Separated City-state and Major civ diplomacy tables, because they're more different than similar at this point
...
Centralized nation leader name
2019-05-08 17:58:49 +03:00
Yair Morgenstern
75bdced3c6
Added Declaration of Friendship logic
...
@ninjatao - I changed your BorderConflict into a DiplomacyFlag, and so all the logic of "removing every turn and deleting if 0" is built-in =)
2019-05-08 17:24:56 +03:00
Yair Morgenstern
8ce1613559
Resolved #698 - Added Heal Instantly 'promotion'
2019-05-08 16:03:01 +03:00
Duan Tao
ff508f22b0
Add border conflict counter for periodly popup.
2019-05-08 13:32:23 +03:00
Duan Tao
06f25b5b5b
Fix peace popup with city-state.
2019-05-08 13:32:23 +03:00
Duan Tao
1434ca3f30
Update city-state related icons and popups.
2019-05-08 13:32:23 +03:00
Yair Morgenstern
9ab02c8d22
Organized json files, split translation file into several smaller files for organizational purposes
2019-05-07 21:59:34 +03:00
Duan Tao
cb867f0066
Code improvement for city state border conflict.
2019-05-07 15:23:08 +03:00
Duan Tao
ad54fb3c56
Invading city-state border will damage relationship.
2019-05-07 13:55:11 +03:00
Duan Tao
30531316d2
Player can enter city-state borders.
2019-05-07 13:55:11 +03:00
Duan Tao
ef7b73ad5f
Unlock city states.
2019-05-07 13:55: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
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
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
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
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
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