Commit Graph

1583 Commits

Author SHA1 Message Date
09420786bc modify battle damage calculation method about city attack. (#1141) 2019-10-05 21:10:10 +03:00
d1fb55a75e Resolved #1152 - New units no longer skip over unassignable tiles (land tiles for water units, mountains) when spawning 2019-10-05 20:58:33 +03:00
b9f79376ce Transportation upkeep no longer disappears after adopting Trade Unions - kudos ..,,,! 2019-10-05 20:46:10 +03:00
2a00ab2775 "Introduction to X" and "Declare war on X" trade items are now only X, adding the extra text on UI display - this makes them translatable 2019-10-04 16:49:31 +03:00
aafe23a2f5 freeTechs parameter in buildings replaced with Free Technology unique 2019-10-04 16:23:17 +03:00
2305f18233 Destroy planes when city is razed. 2019-10-03 16:32:27 +03:00
3358baab52 Added alert popups on finished tech 2019-10-02 18:21:43 +03:00
1f543843af Better worker AI. (#1136)
* Better worker AI.

* Fix tiles to improve condition.

* tilesToImprove changed from member to function.

* Minor performance optimization.

* Use the same condition for worker AI long term and short term target.
2019-10-02 17:49:07 +03:00
512a68c2ae Fixed bad nations comment end... 2019-10-01 23:30:04 +03:00
dd561759e4 Fixed bug where Open Borders trades didn't work when loading games 2019-10-01 22:18:25 +03:00
47db4dce31 Fixed Coastal Raider image
Puppet cities no longer increase policy costs
2019-10-01 22:05:38 +03:00
3b2777e098 some translation update (#1135) 2019-10-01 21:55:37 +03:00
3abd25c130 Added Thai, although the symbols on top don't seem to render well =( 2019-09-29 12:44:02 +03:00
1607d0b17c Better AI choice for annexing and razing cities. (#1132) 2019-09-29 11:54:43 +03:00
3ce1c7ee9d Made battle damage more readable 2019-09-29 11:53:54 +03:00
e5370c9b00 1.split different eras in tech tree, although color is not very good. 2. in original game, Japanese UA should be not used in Air Unit, so I fix it. 3. according to original game, edit the method to calculate battle damage. 4. there is two "Mohawk Warrior" words in the file "Units.json", and its obsoleteTech should be"Gunpowder", so i delete the wrong one and edit the right one. 5. edit "Building.json" to make it describing more accurate, of course, i edit "TileInfo.kt" according to the edited"Building.json". 6. some translation update. (#1127)
* 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

* update

* update

* update

* update

* update
2019-09-29 10:33:18 +03:00
7e274cae84 Added translations in map editor 2019-09-28 22:06:52 +03:00
5980f18f89 Puppeted cities now always auto assign production
Resolved #1124 - added annex and puppet tutorial
2019-09-28 21:43:27 +03:00
27e2b0615a Merge branch 'master' of https://github.com/yairm210/UnCiv 2019-09-28 21:42:45 +03:00
ba3103277a Fix Persia civ battle bonus. 2019-09-28 21:20:32 +03:00
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