Commit Graph

1613 Commits

Author SHA1 Message Date
49d3ea2c0e Resolved #1125 - cities can bombard over all tiles in a radius of 2 2019-09-27 11:25:23 +03:00
df2faee2a8 fix that the rightsidebutton will change into another words when you touch tech button in tech tree switching from victorystatus screen. (#1122)
* systemProp

* 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

* fix that researched tech can be picked when we pick a free tech

* update to master

* update

* Update TechPickerScreen.kt

* delete english selectlanguage becauce menu have two choice, enlarge overview's image icon because it's too small to align.

* update

* language polish is wrong to be writing "polski"

* 显示教程

* update

* update

* update

* update

* update

* update

* update

* viewport

* update

* update

* update

* update

* update

* update

* update
2019-09-26 18:17:43 +03:00
f32f4de3a9 Fixed : Liberated city remain in puppet status. 2019-09-26 18:16:16 +03:00
98f780be93 Attacking unit now enters enemy city before you decide what to do with it - #1123 2019-09-25 22:26:07 +03:00
f714dd197c AI bonus starting units should not provide city-states settlers. 2019-09-25 22:00:56 +03:00
fc5c7235c5 Minor code reorg. Adjust tech trade value with game speed. 2019-09-25 22:00:56 +03:00
4ca32a0523 Fix a code style bug that caused exception mentioned in last commit. 2019-09-25 22:00:56 +03:00
e511385d12 Fix a bug that causes exception when selecting special construction. 2019-09-25 22:00:56 +03:00
56f4d2d57b Annexed city from puppet status should not be in resistance. 2019-09-25 22:00:56 +03:00
dcdf36b153 Added coloring to tech icons themselves (All tech icons are now white) 2019-09-24 17:55:21 +03:00
40c76b7752 Resolved #1114 - submarines cannot attack from coast to lake and vice versa 2019-09-24 17:26:19 +03:00
f6009c43ca 1. In PickTechScreen all the Techs have the same size. 2.The tech in different era has different color. 3.About global status in victory status screen, you can touch the icons of Civs to check its policy tree and tech tree, but close button may lead to worldscreen (#1096) 2019-09-24 17:09:19 +03:00
27b8cd5f1b AI now puppets cities by default - much better for long-term strategy, since puppeted cities are technically also controlled by AI controllers so... 2019-09-24 16:57:49 +03:00
38a28888ef Duantao/ai bonus (#1117)
* Ai bonus.

* AI modifiers apply correctly.

* AI initial units.

* Use gameInfo.getDifficulty() instead of civInfo.getDifficulty().

* Minor fix.
2019-09-24 16:19:17 +03:00
cb06253584 Minor code reorg 2019-09-23 17:48:59 +03:00
548078fb37 Changes to Puppet - Annex - Liberate:
- From Conquer you can move either to Liberate, or to Puppet -> Annex -> Raze
- All unit actions at battle are completely independant of your decision what you do with the city, so they're not deffered until you decide
2019-09-23 17:29:05 +03:00
6d9543e07b Added resistance icon in city screen 2019-09-23 16:19:53 +03:00
a1f5690e41 Added Puppet icon - some reorgnizing still needs to be done in regards to puppet vs annex 2019-09-23 10:46:51 +03:00
65b8fe531e Duantao/liberate city (#1097)
* Allow to liberate city to its founder.

* Workaround : Avoid exception on conquering city with infantry unit.

* Liberate button actually works.

* Fix trade resources check.

* Postpone the 2nd part of postBattleActions until choice is made.

* Add puppet option.

* Puppet city cannot be controlled directly.

* Add annex and puppet happiness/culture/science bonus.

* Add courthouse. Icon is missing.

* Icon for courthouse.

* Update png.
2019-09-23 08:37:53 +03:00
a3889a549e Iroquis can now use Forest and Jungles to connect cities
Persian +1 movement only activaes when in golden age
2019-09-20 10:26:15 +03:00
c4e4f3d2a3 Fix trade resources check. 2019-09-19 11:10:50 +03:00
2def82c4a6 When picking random city states for a map, first priority now goes to city states with starting locations defined in the map 2019-09-18 22:42:44 +03:00
753efe5f47 Added error popup when failed to download map 2019-09-18 22:28:16 +03:00
0adeb68ea6 Invisible submarines are excluded from notification. 2019-09-18 08:42:47 +03:00
b86d11b5fa Merge branch 'master' of https://github.com/yairm210/UnCiv 2019-09-17 22:40:09 +03:00
190d9f72fd Resolved #1091 (spelling mistakes) 2019-09-17 22:39:21 +03:00
04127164bc Added all remaining wonder quotes and more promotion icons 2019-09-17 22:39:08 +03:00
0f1f5bf746 Spaceship should not be bought. 2019-09-17 08:14:10 +03:00
390254b584 instead some font-sizes with the one is often used in game and doesn't need to be created again, adjust the construction table in city screen (#1080)
* systemProp

* 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

* fix that researched tech can be picked when we pick a free tech

* update to master

* update

* Update TechPickerScreen.kt

* delete english selectlanguage becauce menu have two choice, enlarge overview's image icon because it's too small to align.

* update

* language polish is wrong to be writing "polski"

* 显示教程

* update

* update

* update

* update

* update

* update

* update

* viewport
2019-09-16 19:48:41 +03:00
48ad8f3f88 Got rid of most of the original civ's Promotion icons and replaced with Unciv icons =) 2019-09-15 23:26:20 +03:00
479b751cb3 Gold and Science breakdowns are now much more detailed 2019-09-15 18:52:40 +03:00
b038e926a4 Idle units are much more visible on the map
Technically, nstead of fading out the entire unit with its background, we just fade out its central icon, that way it remains much more visible on the map
2019-09-15 18:15:57 +03:00
3084a5bc33 Added Persian civilization 2019-09-15 15:17:56 +03:00
9665c59782 Changed some border icons to filled icons, which look way better in-game 2019-09-15 14:53:18 +03:00
d645ae4478 Added Iroquois civilization 2019-09-15 12:13:14 +03:00
bad10370de innerColor and outerColor function name changes 2019-09-14 23:17:52 +03:00
f6323edbc8 Victory screen no longer shows every turn on "one more turn" mode
Moved Nation jsons
2019-09-14 23:06:34 +03:00
5f43c93846 MrUldiggg delete some words which are necessary. please update immediately (#1069)
* systemProp

* 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

* fix that researched tech can be picked when we pick a free tech

* update to master

* update

* Update TechPickerScreen.kt

* delete english selectlanguage becauce menu have two choice, enlarge overview's image icon because it's too small to align.

* update

* language polish is wrong to be writing "polski"

* 显示教程

* update

* update

* update
2019-09-12 19:42:29 +03:00
6e34f4743a update translation (#1067)
* systemProp

* 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

* fix that researched tech can be picked when we pick a free tech

* update to master

* update

* Update TechPickerScreen.kt

* delete english selectlanguage becauce menu have two choice, enlarge overview's image icon because it's too small to align.

* update

* language polish is wrong to be writing "polski"

* 显示教程
2019-09-12 13:05:58 +03:00
05a77a9a68 Fixed "units deselect after next turn" problem
Popup alerts now come before trade request popups
2019-09-11 21:18:01 +03:00
b8c3bd402f Merge branch 'master' of https://github.com/yairm210/UnCiv 2019-09-11 19:37:09 +03:00
5cc169a828 Added half the wonder quotes 2019-09-11 19:35:42 +03:00
548b1a96d0 Fix statue of liberity affect. 2019-09-11 10:33:28 +03:00
d2ee684293 Adjust food and culture weight for AI cities developpment. (#1060) 2019-09-11 10:33:06 +03:00
99959c9937 delete one english selectlanguage because menu have two choice, enlarge overview's image icon because it's too small to align. (#1058)
* systemProp

* 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

* fix that researched tech can be picked when we pick a free tech

* update to master

* update

* Update TechPickerScreen.kt

* delete english selectlanguage becauce menu have two choice, enlarge overview's image icon because it's too small to align.

* update

* language polish is wrong to be writing "polski"

* 显示教程
2019-09-10 17:41:45 +03:00
1cf049f82f Added popups after construction of wonder is complete 2019-09-10 00:11:25 +03:00
bdb049a29a Tech cost increases with more city. (#1054) 2019-09-09 23:07:43 +03:00
7454b57e4d Tech coloration issues 2019-09-09 23:06:17 +03:00
a8663dda91 fix that researched tech can be picked when we pick a free tech (#1049)
* systemProp

* 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

* fix that researched tech can be picked when we pick a free tech

* update to master

* update

* Update TechPickerScreen.kt
2019-09-09 22:43:00 +03:00
6c3c4bf7af Auto build Aqueducts and Medical Labs. 2019-09-09 15:52:07 +03:00