sulai
73e397c2c2
Improved city button ( #771 )
...
* improved CityButton
* keep city button out of the way if a unit on the city tile is selected
* fixed city button to be clickable always. however this hides units behind it
* added click area for city buttons in an own layer, so the units render in front and the city button click area handles the clicks
* city button: simplified code
2019-05-18 23:09:02 +03:00
Yair Morgenstern
054b3b000d
Resolved #752 - Added big friendship penalty for betraying declaration of friendship
2019-05-17 15:00:24 +03:00
Yair Morgenstern
0e54a1b91c
City button now looks normal when being razed or in resistance - before the health bar positioning ade the entire button totally out of whack
2019-05-17 14:26:07 +03:00
Yair Morgenstern
c98a6fc4d7
Resolved #758 - water melee units can now take cities (apparently this is a Vanilla vs G&K difference, I'll go with the G&K because it causes more interesting gameplay options)
2019-05-17 14:15:52 +03:00
Yair Morgenstern
862c714b47
Added city-state icon to diplomacy screen, so you know who's a city state and who's a major civ at a glance
2019-05-17 13:03:59 +03:00
Yair Morgenstern
2e16a96c4d
Can no longer gift city states with gold you don't have
2019-05-16 22:08:45 +03:00
martin
5e97d32898
keep city button out of the way if a unit on the city tile is selected
2019-05-16 19:42:34 +03:00
martin
e8a9157a65
improved CityButton
2019-05-16 19:42:34 +03:00
sulai
9ce7959d32
more ui improvements ( #757 )
...
* unit action: when an exclusive decision is made, deselect unit
* clicking on the unit information in the UnitTable will show that unit + minor fixes
* siege units won't show movement hints when set up, while packing up does not cost any movement points
* workers: highlight button when constructing an improvement, won't sleep then
* fixed broken saved game
* show messages if exploring is done or WorkerAutomation is done
* Revert "siege units won't show movement hints when set up, while packing up does not cost any movement points"
This reverts commit b805993a
2019-05-16 17:54:58 +03:00
Yair Morgenstern
59e30529c4
Resolved #753 - can no longer pillage tiles of allied civs (that's an act of war)
2019-05-14 20:47:21 +03:00
martin
157e6e81a8
don't flood the player with similar messages about spotted enemies. instead cycle through units by clicking the message multiple times.
2019-05-14 17:07:01 +03:00
martin
c11915c978
highlight unit action buttons to show their current action (sleep, fortify, set up)
...
- works especially well for fortification, will not show that state in the unitTable any more where it caused a layout problem
- in case of set up it's now very clear if a unit is set up or not
2019-05-14 17:07:01 +03:00
martin
1c3b44af16
idle unit buttons: set due=false and select the right unit in case of 2 units per tile
2019-05-14 17:07:01 +03:00
martin
462dc26460
made on-map windows touchable, so you can't "touch through" them on the map
2019-05-14 17:07:01 +03:00
Yair Morgenstern
48af218795
Strategic resources cost more in trade from a civ who's at war and can use them for units
2019-05-13 22:23:30 +03:00
martin
12f1b41784
fixed next turn button by updating it on main thread
2019-05-13 17:17:27 +03:00
martin
eaa0a9dbad
when a unit is selected, use the ? button to read about it in the Civilopedia
2019-05-13 17:17:27 +03:00
martin
0ce55feb39
added a ? to the unit panel in the lower left and fixed jumping ui elements there
2019-05-13 17:17:27 +03:00
martin
dcb7daaabd
minor ui fixes
2019-05-13 17:17:27 +03:00
etourdot
995ebb5cf8
#742 : fix options screen bug when language changed
2019-05-13 17:09:11 +03:00
Yair Morgenstern
c9bd56da95
Resolved #732 - don't change peace negotiation deals depending on how much you dislike the enemy
2019-05-12 22:29:22 +03:00
Yair Morgenstern
a9a1962cec
Continuation of #738 - readability, and solves case where 2 civs have unique buildings to the same base building (say Royal Library and Paper Maker)
...
#729 - AddCultureBuilding now adds civ-specific building (e.g. Burial Tomb), not just checks to see if it's built
2019-05-12 22:24:11 +03:00
Yair Morgenstern
42a0e2e771
Continuation of d2541e6, to better fit coding standards (everything worked fine)
...
I reallly like the way you did this, so I'm making it enabled by default =D
2019-05-12 19:29:02 +03:00
sulai
d2541e6c4a
improved "next turn" - button ( #741 )
...
* as long as there are units due to be checked by the player, replace "next turn" button by "next unit" button
* fixed the next-turn button to update within WorldScreen.update()
* moved due methods to CivilizationInfo.kt
* "next turn" button will also show "pick a tech" and "pick a policy" when needed
* added "check for idle units" to the game settings
* "check for idle units" - default to false
2019-05-12 19:20:06 +03:00
Yair Morgenstern
cf9194f767
Other civ you're at war with is always at least Enemy, if not Unforgivable
2019-05-11 23:39:00 +03:00
Yair Morgenstern
24a71b16f2
Trade button changed to "Negotiate Peace" when at war, and peace treaties are a must when "trading" in this situation
2019-05-11 23:32:12 +03:00
lishaoxia1985
20d05aa8e0
all chinese font will show well ( #739 )
...
* update some diplomacy words in chinese
* all chinese font can be show well
* Update Fonts.kt
* update chinese language
2019-05-11 22:20:41 +03:00
Duan Tao
0e68a23d29
Fix crash.
2019-05-11 22:13:41 +03:00
Duan Tao
4ab118273b
Transfer unique bulidings properly.
2019-05-11 22:13:41 +03:00
lishaoxia1985
656246cd10
all chinese font can be show well
2019-05-10 18:20:27 +03:00
Duan Tao
3b30daf852
Code cleanup.
2019-05-10 18:20:07 +03:00
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
