wbrawner/Unciv
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
3662 commits 7 branches 304 tags 288 MiB
Commit graph

2209 commits

Author SHA1 Message Date
Yair Morgenstern
5473afbecf Added icons for the major unit types 2019-10-13 14:06:18 +03:00
Yair Morgenstern
fb768682fe Added more unit icons =) 
Organized tileset image locations
 2019-10-13 11:49:34 +03:00
Yair Morgenstern
538e53883c Added pixel sprites for land and water units! 2019-10-13 11:18:14 +03:00
Yair Morgenstern
16d565a1f2 Resolved #1185 (hopefully): Made trade requests in offer popup, scrollable 2019-10-12 22:44:28 +03:00
Yair Morgenstern
b661308a9d Improvements that provide resources now specified in the improvement picker screen 
Tutorials for resources now specify that a specific improvement is needed
 2019-10-12 22:27:45 +03:00
lishaoxia1985
7d14c0924b 1.update translation 2. delete population number back the city name of city screen because there is a detail table in the screen. 3. now when you touch "X" you can close unit table. (#1184) 2019-10-12 21:39:58 +03:00
Yair Morgenstern
27dfae18de Can now choose Era when starting a new game! 2019-10-11 16:05:27 +03:00
Yair Morgenstern
e77fdd2993 Polynesia works! 2019-10-11 14:54:08 +03:00
Duan Tao
c8e68842e9 Added setting about auto-build roads. (#1181) 
* Added setting about auto-build roads.

* AI tries to keep population growing if possible.
 2019-10-11 12:46:57 +03:00
Yair Morgenstern
a8dac82157 Added Moai as part of Polynesian civ - lots of changes to be made for that! 2019-10-11 12:09:22 +03:00
Yair Morgenstern
0d929a7942 Resolved #1182 - Iroquois unique fixed 2019-10-10 21:10:21 +03:00
Yair Morgenstern
01dd6dfc7d We now assign the input processor when assigning the current screen, hopefully this should solve the "no input" bug in Chrome OS mentioned in #1140 2019-10-10 15:35:26 +03:00
Yair Morgenstern
8d58702d80 Resolved #1177 - Great Improvements now provide Strategic resources 
APK no longer bundles maps in assets
 2019-10-10 14:48:09 +03:00
Yair Morgenstern
eb179c7a66 Nicer menu table 2019-10-10 12:39:52 +03:00
Duan Tao
362184e515 City states now get free techs from major civs. (#1175) 2019-10-10 12:10:54 +03:00
Yair Morgenstern
222e4ad4b5 Tutorial fix 2019-10-10 09:48:05 +03:00
lishaoxia1985
4baa7b6105 fix display tutorial, please update immediately (#1176) 
* update

* update
 2019-10-09 23:40:02 +03:00
Yair Morgenstern
5d6ecd1ca4 More tutorial name changes so it looks better in the Civilopedia 2019-10-08 10:44:14 +03:00
Yair Morgenstern
734e0e8068
Merge pull request #1171 from ninjatao/duantao/barbarian_bonus 
Duantao/barbarian bonus
 2019-10-08 10:27:38 +03:00
Yair Morgenstern
62310fa3d5 Fixed "Game errors when loading game" - #1171 2019-10-08 10:26:46 +03:00
Duan Tao
b1c5398804 Difficulty bonus vs barbarian. 2019-10-08 10:17:14 +08:00
Duan Tao
3ae18374b6 Liberating city state gives influence. 2019-10-07 13:58:34 +03:00
Yair Morgenstern
b3a2bc3307 Tutorials now accessible from Civilopedia! 
Mass tutorial renaming
 2019-10-06 23:18:51 +03:00
Yair Morgenstern
69dd7ec7b6 Resolved #1157 - Added popup for entering Golden Age 2019-10-06 19:46:22 +03:00
Yair Morgenstern
4cde23e7a9 Popups no longer appear in multiplayer when it's not your turn 2019-10-06 19:25:40 +03:00
Yair Morgenstern
3d992fc9ee Resolved #1162 - City button, resources and tech description in multiplayer now act according to the viewing civ, and not the current player - Thanks @lobraarbol! 2019-10-06 19:21:47 +03:00
lishaoxia1985
09420786bc modify battle damage calculation method about city attack. (#1141) 2019-10-05 21:10:10 +03:00
Yair Morgenstern
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
Yair Morgenstern
b9f79376ce Transportation upkeep no longer disappears after adopting Trade Unions - kudos ..,,,! 2019-10-05 20:46:10 +03:00
Yair Morgenstern
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
Yair Morgenstern
aafe23a2f5 freeTechs parameter in buildings replaced with Free Technology unique 2019-10-04 16:23:17 +03:00
Duan Tao
2305f18233 Destroy planes when city is razed. 2019-10-03 16:32:27 +03:00
Yair Morgenstern
3358baab52 Added alert popups on finished tech 2019-10-02 18:21:43 +03:00
Duan Tao
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
Yair Morgenstern
512a68c2ae Fixed bad nations comment end... 2019-10-01 23:30:04 +03:00
Yair Morgenstern
dd561759e4 Fixed bug where Open Borders trades didn't work when loading games 2019-10-01 22:18:25 +03:00
Yair Morgenstern
47db4dce31 Fixed Coastal Raider image 
Puppet cities no longer increase policy costs
 2019-10-01 22:05:38 +03:00
lishaoxia1985
3b2777e098 some translation update (#1135) 2019-10-01 21:55:37 +03:00
Yair Morgenstern
3abd25c130 Added Thai, although the symbols on top don't seem to render well =( 2019-09-29 12:44:02 +03:00
Duan Tao
1607d0b17c Better AI choice for annexing and razing cities. (#1132) 2019-09-29 11:54:43 +03:00
Yair Morgenstern
3ce1c7ee9d Made battle damage more readable 2019-09-29 11:53:54 +03:00
lishaoxia1985
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
Yair Morgenstern
7e274cae84 Added translations in map editor 2019-09-28 22:06:52 +03:00
Yair Morgenstern
5980f18f89 Puppeted cities now always auto assign production 
Resolved #1124 - added annex and puppet tutorial
 2019-09-28 21:43:27 +03:00
Yair Morgenstern
27e2b0615a Merge branch 'master' of https://github.com/yairm210/UnCiv 2019-09-28 21:42:45 +03:00
Duan Tao
ba3103277a Fix Persia civ battle bonus. 2019-09-28 21:20:32 +03:00
Yair Morgenstern
49d3ea2c0e Resolved #1125 - cities can bombard over all tiles in a radius of 2 2019-09-27 11:25:23 +03:00
lishaoxia1985
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
Duan Tao
f32f4de3a9 Fixed : Liberated city remain in puppet status. 2019-09-26 18:16:16 +03:00
Yair Morgenstern
98f780be93 Attacking unit now enters enemy city before you decide what to do with it - #1123 2019-09-25 22:26:07 +03:00
Duan Tao
f714dd197c AI bonus starting units should not provide city-states settlers. 2019-09-25 22:00:56 +03:00
Duan Tao
fc5c7235c5 Minor code reorg. Adjust tech trade value with game speed. 2019-09-25 22:00:56 +03:00
Duan Tao
4ca32a0523 Fix a code style bug that caused exception mentioned in last commit. 2019-09-25 22:00:56 +03:00
Duan Tao
e511385d12 Fix a bug that causes exception when selecting special construction. 2019-09-25 22:00:56 +03:00
Duan Tao
56f4d2d57b Annexed city from puppet status should not be in resistance. 2019-09-25 22:00:56 +03:00
Yair Morgenstern
dcdf36b153 Added coloring to tech icons themselves (All tech icons are now white) 2019-09-24 17:55:21 +03:00
Yair Morgenstern
40c76b7752 Resolved #1114 - submarines cannot attack from coast to lake and vice versa 2019-09-24 17:26:19 +03:00
lishaoxia1985
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
Yair Morgenstern
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
Duan Tao
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
Yair Morgenstern
cb06253584 Minor code reorg 2019-09-23 17:48:59 +03:00
Yair Morgenstern
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
Yair Morgenstern
6d9543e07b Added resistance icon in city screen 2019-09-23 16:19:53 +03:00
Yair Morgenstern
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
Duan Tao
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
Yair Morgenstern
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
Duan Tao
c4e4f3d2a3 Fix trade resources check. 2019-09-19 11:10:50 +03:00
Yair Morgenstern
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
Yair Morgenstern
753efe5f47 Added error popup when failed to download map 2019-09-18 22:28:16 +03:00
Duan Tao
0adeb68ea6 Invisible submarines are excluded from notification. 2019-09-18 08:42:47 +03:00
Yair Morgenstern
b86d11b5fa Merge branch 'master' of https://github.com/yairm210/UnCiv 2019-09-17 22:40:09 +03:00
Yair Morgenstern
190d9f72fd Resolved #1091 (spelling mistakes) 2019-09-17 22:39:21 +03:00
Yair Morgenstern
04127164bc Added all remaining wonder quotes and more promotion icons 2019-09-17 22:39:08 +03:00
Duan Tao
0f1f5bf746 Spaceship should not be bought. 2019-09-17 08:14:10 +03:00
lishaoxia1985
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
Yair Morgenstern
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
Yair Morgenstern
479b751cb3 Gold and Science breakdowns are now much more detailed 2019-09-15 18:52:40 +03:00
Yair Morgenstern
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
Yair Morgenstern
3084a5bc33 Added Persian civilization 2019-09-15 15:17:56 +03:00
Yair Morgenstern
9665c59782 Changed some border icons to filled icons, which look way better in-game 2019-09-15 14:53:18 +03:00
Yair Morgenstern
d645ae4478 Added Iroquois civilization 2019-09-15 12:13:14 +03:00
Yair Morgenstern
bad10370de innerColor and outerColor function name changes 2019-09-14 23:17:52 +03:00
Yair Morgenstern
f6323edbc8 Victory screen no longer shows every turn on "one more turn" mode 
Moved Nation jsons
 2019-09-14 23:06:34 +03:00
lishaoxia1985
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
lishaoxia1985
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
Yair Morgenstern
05a77a9a68 Fixed "units deselect after next turn" problem 
Popup alerts now come before trade request popups
 2019-09-11 21:18:01 +03:00
Yair Morgenstern
b8c3bd402f Merge branch 'master' of https://github.com/yairm210/UnCiv 2019-09-11 19:37:09 +03:00
Yair Morgenstern
5cc169a828 Added half the wonder quotes 2019-09-11 19:35:42 +03:00
Duan Tao
548b1a96d0 Fix statue of liberity affect. 2019-09-11 10:33:28 +03:00
Duan Tao
d2ee684293 Adjust food and culture weight for AI cities developpment. (#1060) 2019-09-11 10:33:06 +03:00
lishaoxia1985
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
Yair Morgenstern
1cf049f82f Added popups after construction of wonder is complete 2019-09-10 00:11:25 +03:00
Yair Morgenstern
bdb049a29a
Tech cost increases with more city. (#1054) 2019-09-09 23:07:43 +03:00
Yair Morgenstern
7454b57e4d Tech coloration issues 2019-09-09 23:06:17 +03:00
lishaoxia1985
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
Duan Tao
6c3c4bf7af Auto build Aqueducts and Medical Labs. 2019-09-09 15:52:07 +03:00
Duan Tao
bfe73c1f4e Tech cost increases with more city. 2019-09-09 17:56:32 +08:00
Yair Morgenstern
9e0ba99c0a Invalid trade requests (e.g. giving a city that isn't yours anymore or resources you no longer own) are discarded at the beginning of the civ's turn 2019-09-08 23:33:39 +03:00
Yair Morgenstern
7603d3c839 Merge branch 'master' of https://github.com/yairm210/UnCiv 2019-09-08 19:27:58 +03:00
Yair Morgenstern
462fc6fab7 English translations 2019-09-08 19:27:00 +03:00
lishaoxia1985
c06028b082 update translation (#1041) 
* 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
 2019-09-08 19:25:49 +03:00
Yair Morgenstern
3974842265 Added error message when attempting to load a map from bad copied data 2019-09-07 21:31:56 +03:00
Yair Morgenstern
c9f6ba958f Can no longer adopt policies after being defeated 2019-09-07 21:24:28 +03:00
lishaoxia1985
53aaceb06b update Chinese translation，Russian translation Lost a word ("), please update it immediately！ (#1028) 
* systemProp

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update
 2019-09-07 21:08:36 +03:00
Duan Tao
3d324f516d AIs are not affected by auto-production setting. 2019-09-07 21:00:48 +03:00
Yair Morgenstern
df2be37785 Added show/hide button for tile panel in map editor 
Fixed unit unique translations in Civilopedia
 2019-09-06 16:20:45 +03:00
Yair Morgenstern
587c76b1f8 Added Show Minimap setting option 2019-09-05 23:20:16 +03:00
Yair Morgenstern
17b3069668 Added confirmation popup when deleting maps 2019-09-05 21:50:33 +03:00
Yair Morgenstern
d3a6417996 Can no longer pick policies in multiplayer when it's someone elses turn 2019-09-05 21:45:04 +03:00
lishaoxia1985
faa90dd269 update chinese traslation (#1026) 
* systemProp

* update

* update

* update
 2019-09-05 15:27:22 +03:00
Yair Morgenstern
e9bb39d9e5 Added name and description for map editor objects 2019-09-04 20:27:23 +03:00
Yair Morgenstern
59cb9f972c You now see your own Diplomacy screen when in multiplayer, and not that of the current player 2019-09-04 20:12:13 +03:00
Yair Morgenstern
91ac744692 Added "user id from clipboard" button in New Game screen 
Fixed other user id problems
 2019-09-03 23:22:27 +03:00
Yair Morgenstern
eeb1c26ef5 Added Korean civ 2019-09-02 23:44:29 +03:00
Yair Morgenstern
675d05d1e4 Minor fixes to multiplayer UI components 2019-09-01 17:18:08 +03:00
Yair Morgenstern
efaa0c9a6c Performance improvements for NativeFont - separated chinese and other charsForFonts, 
since the chinese have hundreds of chars and it makes the font loading time really long
 2019-09-01 17:12:47 +03:00
Yair Morgenstern
ab26f66e1a Implemented Alexander's unique - #563 2019-09-01 15:26:27 +03:00
Yair Morgenstern
20493b12b6 Resolved #1014 - Great Engineers can hurry National Wonders 2019-09-01 15:13:06 +03:00
lishaoxia1985
62a85cd14a can use native font and "WenQuanYimicroHei" in andriod and desktop (#1013) 
* Update Other.json

* Update Notifications.json

* Update Other.json

* Can Change Language With No "ttf" Font

* update

* Update AndroidLauncher.java

* repair app running slowly in using no "tff" class

* Can Change Language with No "ttf" Font (#772)

* Update Other.json

* Update Notifications.json

* Update Other.json

* Can Change Language With No "ttf" Font

* update

* Update AndroidLauncher.java

* repair app running slowly in using no "tff" class

* update nativefont for Desktop and IOS

* Delete NativeFontIOS.java

* can choose nativefont or font downloading from internet

* update

* update

* Update Fonts.kt

* Update Fonts.kt

* update

* update

* update

* update

* Update build.gradle

* update

* update

* update

* can choose native font or "WenquanYiMicroHei"

* update

* update

* update

* update
 2019-09-01 13:01:37 +03:00
Yair Morgenstern
8d3a2d6da3 Organized Multiplayer popup 2019-08-31 22:24:18 +03:00
Yair Morgenstern
015b8343c7 Hoh boy so many changes to ensure the regular game works with multiplayer... 2019-08-30 14:46:52 +03:00
Yair Morgenstern
bc1592bafe Added game ID copy and join, so one person can create a game, send it to someone else, and the other person can join it 2019-08-29 13:18:09 +03:00
Yair Morgenstern
fd4d96ed8e Policy screen button moved to world screen instead of being in the menu 2019-08-29 12:04:43 +03:00
Yair Morgenstern
acdeea06b8 More steps towards upload/downloading multiplayer games 2019-08-29 11:09:57 +03:00
Yair Morgenstern
eb06ed2cf6 Unified PopupTable.addCloseButton() 
Added basic online game upload/download functionality
 2019-08-29 10:27:08 +03:00
Yair Morgenstern
ef75593794 More PopupTable.close() uses 2019-08-28 13:30:49 +03:00
Yair Morgenstern
e82b6c5090 Added close() function to popup 2019-08-27 17:00:28 +03:00
Yair Morgenstern
834290001b Improved "rank city center" by also considering resources that the civ has in its borders but has not yet improved 2019-08-27 15:09:54 +03:00
Yair Morgenstern
8ef09a816a Fixed annoying "can't click next turn" bug! 2019-08-27 14:57:40 +03:00
Yair Morgenstern
5ae8f0d6ff AI tries to build cities next to luxury resources it doesn't yet have 2019-08-27 14:56:21 +03:00
Yair Morgenstern
22a8a85426 AI now more focused on improving small cities to big ones 2019-08-27 14:39:54 +03:00
Yair Morgenstern
6769c30ebe Added isOnlineMultiplayer toggle in newGameScreen and an input for the player ID 2019-08-26 15:49:59 +03:00
Yair Morgenstern
3a04fe75eb New "Load map" screen, with load from clipboard and delete map options 2019-08-25 23:26:50 +03:00
Yair Morgenstern
17f41a549e "Upload map" now deals with failures properly 
Maps for downloading now scrollable
 2019-08-25 17:16:36 +03:00
Yair Morgenstern
60257c6d64 Save and load game screens now hide autosaves by default 2019-08-25 17:01:28 +03:00
Yair Morgenstern
0a777e5b59 Action strings are now constants 2019-08-21 23:55:12 +03:00
Yair Morgenstern
c685e0f528 Resolved #1007 - trades and alerts now work again, which means they'll also work in multiplayer =) 2019-08-21 23:44:28 +03:00
Yair Morgenstern
b9baa654ab Added End Game Messages for varioud victory types 2019-08-20 10:55:27 +03:00
Yair Morgenstern
56b3f1c77a City founding tutorial no longer activates if the AI founded a city before you 2019-08-18 23:25:01 +03:00
Yair Morgenstern
23f575d150 Resolved #963 - Units wouldn't leave enemy tiles after war was declared, unlike original Civ 2019-08-18 22:57:20 +03:00
Yair Morgenstern
814ecde1e3 Resolved #1003 - Logistics promotion didn't work on air units 2019-08-18 22:45:03 +03:00
Yair Morgenstern
1817b3e541 Resolved #995 - Can now open/close categories in city screen 2019-08-15 22:20:34 +03:00
Yair Morgenstern
9a4722b6b9 Readded city state select box 2019-08-15 20:41:28 +03:00
Yair Morgenstern
365cb6f1b9 Nation changed to transient in CivInfo 2019-08-15 10:43:15 +03:00
Yair Morgenstern
d84863d2dd Ottoman unique no longer also applies to ranged units 2019-08-15 10:16:20 +03:00
Yair Morgenstern
202c1828a7 Fixed concurrency problems when working on "next turn" by working on a clone of the game state 2019-08-15 10:15:27 +03:00
Yair Morgenstern
05d3aa9193 Each individual player is now specified when starting a new game 2019-08-12 00:30:29 +03:00
Yair Morgenstern
9de30bfbce More changes towards player-based game starts 2019-08-09 15:57:34 +03:00
Yair Morgenstern
93634dae31 Added base for player picking per-player - necessary for multiplayer and solves other probems along the way 2019-08-09 09:03:51 +03:00
Yair Morgenstern
327eea7b13 Added display of Human / AI for othe civs 2019-08-08 19:44:05 +03:00
Yair Morgenstern
05e4e33a3d Added username and ID - this will be how we recognize players in multiplayer 2019-08-08 18:50:18 +03:00
Yair Morgenstern
c138fbc385 Fixed "can't download map on Android" bug 2019-08-07 22:14:23 +03:00
Yair Morgenstern
cbf1b8bb11 Players can now continue to view (but not change) game data when other players are playing their turns 2019-08-06 23:04:56 +03:00
Yair Morgenstern
2f6eec5ff8 All city screen state-changing functions are now dependant on whether the viewing civ is the current player civ 2019-08-06 22:39:31 +03:00
Yair Morgenstern
786c157ba9 Disabled all (hopefully) state-changing actions when it's not the player's turn 2019-08-05 06:28:39 +03:00
Yair Morgenstern
5c02281023 When multiple policies can be picked, don't exit the policy picker screen 2019-08-04 23:15:46 +03:00
Yair Morgenstern
9a48133e1b Added visible scrollbars in tech picker screen 2019-08-04 22:59:33 +03:00
Yair Morgenstern
7b37e426a9 WorldScreen now accepts player as parameter - important for multiplayer so people could see their own map even when it's someone else's turn 2019-08-04 22:47:49 +03:00
Yair Morgenstern
7b21505a53 Fixed rare "cloning exploredTiles" concurrency bug 
Removed .replace in ImageGetter.getImage() thus lowering memory consumption
 2019-08-04 19:13:11 +03:00
Yair Morgenstern
691d905c9f Resolved #983 - city-state defeat messages were empty 2019-08-01 21:40:16 +03:00
Yair Morgenstern
23eb7d2f19 Can now upload and download uploaded maps in the map editor screen! 2019-08-01 21:38:09 +03:00
Yair Morgenstern
9c1864708f Fixed crash when a militaristic city state tries to gift a unit to a civ with no cities 2019-07-30 21:21:24 +03:00
Yair Morgenstern
dae20d09dc Fixed bug where if the AI completed all the policies and needed to pick another one, the game would crash 2019-07-29 17:04:03 +03:00
Yair Morgenstern
2799205884 Demands now work between human players! 2019-07-29 17:03:24 +03:00
Yair Morgenstern
6dc471850e Trades are no longer instantaneous, but consist of sending a trade request on the requestor's turn and accepting/denying it on the reciever's turn. 
This allows us to FINALLY enable trade between human players, enables PvP in hotseat multiplayer, and paves the way to real multiplayer!
 2019-07-29 16:31:21 +03:00
Yair Morgenstern
2d24e62b0b Resolved #974 - city stats not summmed correctly 2019-07-28 22:50:22 +03:00
Yair Morgenstern
98eb4c8cd7 Travis test + minor fixes 2019-07-27 23:21:40 +03:00
Yair Morgenstern
b131372b13 Fixed "units from ruins block activating unit" bug and fixed colors for new city states 2019-07-27 22:34:57 +03:00
Yair Morgenstern
42e5f3b883 Fixed "huge stats in cities" bug 2019-07-26 15:06:21 +03:00
Yair Morgenstern
76339095ce Solved bug where units spawned into tiles with ancient ruins would crash the game, and ancient ruin bonuses would sometimes activate twice 2019-07-25 20:07:10 +03:00
Yair Morgenstern
4ada8528e1 Game speed now affects golden age turns 2019-07-24 19:34:54 +03:00
Yair Morgenstern
994e313101 Added Game Speed option - part of #559 2019-07-24 18:35:06 +03:00
Yair Morgenstern
7d38841eb8 Added tutorial for 'Next unit' 2019-07-24 17:58:32 +03:00
Yair Morgenstern
ae0f4906ed Resolved #961 - ordered game saves by last modified and made only the saves scrollable (and not the naming textbox) 2019-07-24 12:11:24 +03:00
Yair Morgenstern
2c10ce2fb5 Memory performance tweaks 
Renamed nation Main and Secondary to Outer and Inner colors, to be more clear what we're laking about
 2019-07-24 11:55:10 +03:00
Yair Morgenstern
858ae5be7c More and probably final memory performance modifications - we're down from ~400MB on peak of initial update() to about 200MB! 
Definitely sped things up along the way as well, not sure by how much though
 2019-07-24 00:37:12 +03:00
Yair Morgenstern
932d09af99 Yet Even Yet More performance improvements 2019-07-23 01:01:19 +03:00
Yair Morgenstern
db0543468b Multiple performance improvements, especially for memory - should mitigate OutOfMemory exceptions on older phones 2019-07-23 00:20:00 +03:00
Yair Morgenstern
78b9908479 Memory improvements, hoping to mitigate OutOfMemory errors 2019-07-22 22:36:14 +03:00
Yair Morgenstern
0b7f5f5cff Resolved #954 - settlers can't settle cities inside other civ's territory 
LibGDX, Kotlin and Gradle upgrade
 2019-07-22 21:20:03 +03:00
Yair Morgenstern
11d7ac714c Added initial dropbox tests - get folder contents and download file 2019-07-22 02:34:55 +03:00
Yair Morgenstern
2604ff6ab6 Fixes to unit moving through occupied tiles 2019-07-21 23:43:17 +03:00
Yair Morgenstern
15f1648ca4 Resolved #937 - reveal all hidden tiles visible from every tile on unit movement path 
This also solves the problem of units "skipping over" barbarian encampments and ancient ruins when on the path
 2019-07-21 23:32:06 +03:00
Yair Morgenstern
e73ad76227 Resolved #931 - added Barbarian Brute as a replacement to the Warrior 2019-07-21 22:49:04 +03:00
Yair Morgenstern
d1936cacd3 Resolved #950 - AI now construct Harbors and Seaports 2019-07-21 20:28:29 +03:00
Yair Morgenstern
e9e0e55b5e Resolved #952 - fixed building requirements for Neuschwanstein, Stone Works, Windmill and Spaceship Factory 2019-07-21 19:54:16 +03:00
Yair Morgenstern
558bba44cc Added Anti-Aircraft gun unit, and intercept range on non-ranged units 2019-07-19 14:40:29 +03:00
Yair Morgenstern
b565489fd5 Changed "free population" in cities to "unassigned population" to be less confusing 2019-07-19 14:01:16 +03:00
Yair Morgenstern
90318ef93b Tech reorg - added Lasers and Mobile Tactics, tech tree is now almost 100% G&K 2019-07-17 22:21:05 +03:00
Duan Tao
c223c16de8 Petronage covered unique buildings like burial tomb. 2019-07-17 13:09:34 +03:00
Duan Tao
75059a7859 Better expansion and population growth turns message. 2019-07-17 12:53:34 +03:00
Yair Morgenstern
b9a7f7e1d0 Added Great War Bomber 
Air units now require Oil
 2019-07-15 22:45:32 +03:00
Yair Morgenstern
cf8d9f9ff1 Air units now destroyed when conquering a city - I think this was the cause of some crashes 2019-07-14 23:37:11 +03:00
Yair Morgenstern
5ba172f71b AI now knows to pathfind multiple cities for air units and to move fighters towards enemy cities with many air units 2019-07-14 23:33:16 +03:00
Yair Morgenstern
7bbd006180 Added BFS for arial movement 2019-07-13 22:48:47 +03:00
Yair Morgenstern
d96a1002b1 Resolved #933 - water units correctly recognized in battle modifiers 2019-07-13 22:26:52 +03:00
Yair Morgenstern
fdfeb28e87 Drastically reduced the number of barbarian encampments that spawn 2019-07-13 22:22:32 +03:00
Yair Morgenstern
0fe3de0d50 Simplified BFS.getPathTo() 2019-07-12 15:40:03 +03:00
Yair Morgenstern
d9942aec7c Added all promotions for air units, and a couple for other units that were previously missed 2019-07-11 22:35:22 +03:00
Yair Morgenstern
00e112e668 Code Org - Moved more Unit movement things into UnitMovementAlgorithms 2019-07-11 21:43:03 +03:00
Yair Morgenstern
e78f408bff Translation fixes 2019-07-11 21:21:45 +03:00
Duan Tao
cae3d49738 Add notification translation. 2019-07-11 10:05:29 +03:00
Duan Tao
a8e248b892 Add Militaristic type city-state. 2019-07-11 10:05:29 +03:00
Yair Morgenstern
3b515f58d7 Map editor maps start out with all improvements and roads removed 2019-07-10 22:49:54 +03:00
Yair Morgenstern
214b4880e4 AIR UNITS ARE GO! 
Added interception and basic air unit AI
 2019-07-10 22:41:44 +03:00
Yair Morgenstern
51ad40b8bf Code reorg - Split some functions off of civilizationInfo into their own sub-classes because it was getting too long 2019-07-10 20:05:29 +03:00
Yair Morgenstern
9ad7b976d5 Embarked units at sea which need to heal now go find land to heal on, and don't stay stuck in the same place 2019-07-08 19:29:12 +03:00
Yair Morgenstern
9559894a86 Military units no longer try to accompany great generals - great geenerals should follow the army units, not the other way round! 
Culture building priority is dependant on whether the city is producing culture at all
Gold is now less highly valued by the AI when picking tiles to work
 2019-07-08 18:37:24 +03:00
Yair Morgenstern
3ff78ef6b3 Fishing boats can no longer create oil wells in cities with oil 2019-07-08 18:03:45 +03:00
Yair Morgenstern
ab7ce12a87 Resolved #687 - can now place starting locations for specific civs in the map editor 2019-07-07 23:55:43 +03:00
Yair Morgenstern
f42cfd8b25 Air units can attack! 2019-07-05 14:46:04 +03:00
Yair Morgenstern
070d780e18 Unit table now displays range for ranged units 
Air units are ranged units
Moving air units around now works completely!
 2019-07-05 14:27:39 +03:00
Yair Morgenstern
8d79cca70d Fixed Ottomans naval capture unique 2019-07-05 12:23:58 +03:00
Yair Morgenstern
32a45968aa Changed unit selection in cities, to accomodate air units in the future 2019-07-05 11:15:40 +03:00
Yair Morgenstern
eedc0e30f2 Bonus as Attacker problem fixed 2019-07-04 19:54:51 +03:00
Yair Morgenstern
185ec10f10 Can now see when city contains air units 2019-07-03 23:32:17 +03:00
Yair Morgenstern
c01c9b96bf City health bar now appears outside the city button - doesn't change the button positioning when the city is damaged 2019-07-03 23:20:22 +03:00
Yair Morgenstern
833a5ed0db Added Air unit types 2019-07-03 18:42:28 +03:00
Yair Morgenstern
1201d9b54b More AI tweaks 2019-07-03 18:39:59 +03:00
Yair Morgenstern
e81844c053 AI focuses production of units on cities with high production, so the weaker ones can build infrastructure 
Organized ChooseNextConstruction automation
 2019-07-03 00:09:50 +03:00
Yair Morgenstern
b0b47d0a3a Split AI choice for construction of defensive and offensive buildings 2019-07-02 00:27:24 +03:00
Yair Morgenstern
4d5f3a51e3 Domination-victory AI declare war on close civs even when having an advantage that isn't an absolute advantage, 
and declare war on civs that are situated far away if they are weak enough and there's no one close by
 2019-07-02 00:00:41 +03:00
Am-per-Sand
c5f2caa66b Western Slavic chars Fonts.kt 
Polish
Czech
Slovak
 2019-06-30 22:24:24 +03:00
Yair Morgenstern
0eb28b9ae7 Great General bonus affects naval units (as long as we don't have Great Admirals in the game) 2019-06-30 19:48:47 +03:00
Yair Morgenstern
76187efc3d Can no longer pillage city ruins - #914 2019-06-30 19:37:49 +03:00
Yair Morgenstern
1898c6f9f1 AI is willing to trade Open Borders when unfriendly... for ridiculous prices 2019-06-30 19:35:04 +03:00
Yair Morgenstern
08d0a0013c AI bombardment focuses primarily on siene and secondarily on other ranged units 2019-06-30 00:22:55 +03:00
Yair Morgenstern
519ad2a7ad AI focuses city bombardment on siege units 2019-06-30 00:18:28 +03:00
Yair Morgenstern
e59ad4ff94 Fixed war declaration against civs with a space in their name (e.g. The Ottomans) 2019-06-29 23:56:35 +03:00
Am-per-Sand
6d38800093 à in Fonts.kt 
just in case: à propos
 2019-06-29 23:18:03 +03:00
Am-per-Sand
8970e76efa Ú in Fonts.kt 
Spanish:"Único a la civilización"
 2019-06-29 23:18:03 +03:00
Am-per-Sand
a3ede00638 È ¡ in Fonts.kt 
Italian:"È nato un [greatPerson]!"
 Spanish:"¡Has entrado en una edad de oro!"
 2019-06-29 23:18:03 +03:00
Yair Morgenstern
f60574941a "Start new game" from Victory screen opens up the new game options, and doesn't auto-start a new game 2019-06-29 22:58:05 +03:00
Yair Morgenstern
e921833580 Fixed "Endless Production" bug for Hanse 2019-06-29 22:57:25 +03:00
Yair Morgenstern
8f0c3f1c02 Resolved #908 - added Science overview to overview screen 2019-06-27 12:01:08 +03:00
Yair Morgenstern
1aa703e69b "Current construction is user set" saved between saves/loads - #875 2019-06-27 10:46:32 +03:00
Yair Morgenstern
46bd65e45a Bugfix - cities with maintenance but no gold production now display gold breakdown 2019-06-25 23:14:13 +03:00
Yair Morgenstern
c517dd9d64 Added the Ottomans! #703 2019-06-25 23:00:55 +03:00
Yair Morgenstern
e1dda58f58 Options table was getting too long - now scrolls nicely 2019-06-25 21:22:16 +03:00
Yair Morgenstern
c3efc10ea8 Fixed bug where gifts from AIs to city-states were interpreted as gifts from human player to city-states 2019-06-24 21:53:31 +03:00
Am-per-Sand
b2c7595fcc add Ó Í chars in Fonts.kt 
pt: Ópera de Sydney Índia
 2019-06-24 19:58:21 +03:00
Yair Morgenstern
fd20207980 Resolved #893 - Trade screen does not reset after a trade and must be closed to update - for realz this time 2019-06-24 19:40:28 +03:00
Yair Morgenstern
7e50f70bd5 Resolved #899 - Added setting to disable city auto-picking construction 2019-06-24 19:35:45 +03:00
Yair Morgenstern
477a4889b3 Resolved #893 - trade table doesn't reset after trade 2019-06-24 06:52:46 +03:00
Yair Morgenstern
3b9ab43bbe Resolved #898 - added option to disable tutorials 2019-06-24 06:43:51 +03:00
Yair Morgenstern
d9bd0fa6b8 Resolved #897 - split initial tutorial, which was too long, into several parts 2019-06-24 06:37:45 +03:00
Yair Morgenstern
c0f569c826 Bugfix - AIs no longer try to gain influence wth city-states they haven't met yet 2019-06-23 22:44:04 +03:00
Yair Morgenstern
7d17265032 Added initial setup of WorldScreen in worldscreen creation, so it doesn't take too long in the render, hopefully 2019-06-21 14:29:55 +03:00
Yair Morgenstern
d4ead7bbf2 City-states no longer get policies 2019-06-21 14:06:08 +03:00
Yair Morgenstern
ee1aa61221 Fixed Hanse special ability 2019-06-21 14:01:33 +03:00
Yair Morgenstern
b7f7bb3b2e Barbarians guarding encampments noww fortify 2019-06-21 12:55:34 +03:00
Yair Morgenstern
6d3ef94941 Update civ resources when selling a building and destroying a unit 2019-06-20 23:08:30 +03:00
Yair Morgenstern
e0f72af06d Added Caching for civ Resources, Stats and city Happiness information for massive performance improvements in some late games 2019-06-20 23:03:28 +03:00
Yair Morgenstern
5cf05cd7d9 AI now saves up money to use for purchasing city-state influence 2019-06-20 20:40:23 +03:00
Yair Morgenstern
2b3de8b78f Undiscovered civs aren't revealed in Overview by their icons 
Irrelevant Overviews are disabled
 2019-06-19 20:52:26 +03:00
Yair Morgenstern
7958c795dd Fixed Coast start bias 2019-06-19 20:22:38 +03:00
Yair Morgenstern
a1e1b91b9a Added Civ icon to cities 
Improved City Connection icon
 2019-06-19 20:13:32 +03:00
Yair Morgenstern
a6d1cdc398 Unified civ display in Overview and Victory screens 2019-06-19 19:20:25 +03:00
Yair Morgenstern
227f6627be Resolved #883 - Added Civilization icons 2019-06-19 18:43:25 +03:00
Yair Morgenstern
27c83f1792 Resolved #880 - Notifications for end-of-trade no longer activate after instant trade 2019-06-19 17:48:26 +03:00
Yair Morgenstern
b0e43ace59 Resolved #885 - units disbanding on your tiles yields gold even when not on city center 2019-06-19 17:40:52 +03:00
Yair Morgenstern
b2afc838a6 Resolved #533 - Added nation-dependant start location biases 2019-06-17 12:51:57 +03:00
Yair Morgenstern
853a325876 Added German nation - #703 2019-06-17 11:20:15 +03:00
Yair Morgenstern
3f3dd0193e Resolved #251 - Choose specific victory conditions on new game 
Victory screen no longer 'reveals' civs you haven't met
 2019-06-16 19:51:12 +03:00
david.enrique
0ab0f2e7bb Increment of index in one line 2019-06-15 22:38:02 +03:00
david.enrique
56ff436f94 Add victory type choice on new game screen 2019-06-15 22:38:02 +03:00
Yair Morgenstern
120ae8b253 Resources sorted and no bonus resources in Resource Overview 2019-06-15 22:30:07 +03:00
Yair Morgenstern
19334bcdec Added resource drilldown table to overview 2019-06-14 15:03:53 +03:00
Yair Morgenstern
22f44d328b Building resource requirements now appear in Civilopedia 2019-06-14 14:59:36 +03:00
Yair Morgenstern
5943d1e12e Apollo Program is now a NATIONAL wonder, so multiple civs can compete for Science Victory 2019-06-13 22:10:52 +03:00
Yair Morgenstern
d49b33f0c7 Resolved #872 - Added Immersive mode, for users whose navigation bar is a virtual, not physical one 2019-06-13 17:28:23 +03:00
Yair Morgenstern
ab1a1be170 Special construction set by the user (Gold, Science etc) are not auto-changed when a better alternative exists 2019-06-13 16:58:56 +03:00
Yair Morgenstern
00153ab456 Culture-oriented AI much more predisposed to peace agreements 2019-06-13 14:38:31 +03:00
Yair Morgenstern
b8e5b34489 AIs don't make water military units in areas where they can't fight anyone 2019-06-13 14:37:04 +03:00
Yair Morgenstern
b0ef219c84 AIs no longer double-pick the same policy... 2019-06-13 14:36:18 +03:00
Yair Morgenstern
8974e02290 Show victory screen when AI wins 2019-06-13 14:35:55 +03:00
Yair Morgenstern
45080744b7 Years of peace modifier no longer rises while at war (whoops!) 2019-06-13 13:23:54 +03:00
Yair Morgenstern
6618bed1ab AI now utilizes special constructions (Nothing, Gold, Science) when no better options are available 2019-06-13 13:19:23 +03:00
Yair Morgenstern
816196520e Culture-focused civs don't declare war 
Chosen free great person is victory-type-dependant
 2019-06-13 13:18:20 +03:00
Yair Morgenstern
ea5f649d87 Added global victory status to victory status screen, so you can see how bad the AI is at actually winning... -_- 2019-06-13 12:47:40 +03:00
Yair Morgenstern
29f2474b13 AI now chooses policies according to preferred victory type - should drastically ncrease the sucess chance of the AI to win a cultural victory! 2019-06-13 12:00:53 +03:00
Yair Morgenstern
dda38c5cd1 Better construction picking AI 2019-06-12 23:18:34 +03:00
Yair Morgenstern
e1884768fd Added priority to wonders by type 2019-06-12 22:34:39 +03:00
Yair Morgenstern
b7be0e7934 Each Civ now has a preferred victory type, and makes construction choices based on said type 2019-06-12 22:01:37 +03:00
Yair Morgenstern
3e770db86d Can now add and remove improvements in the map editor! 2019-06-10 18:36:25 +03:00
Yair Morgenstern
89f689bcc9 Performance improvements 2019-06-10 17:31:07 +03:00
Yair Morgenstern
bd0b61b909 AI tries to clear barbarian encampments with its idle military units 2019-06-10 17:30:37 +03:00
Yair Morgenstern
f8cf9392fb AIs demand of each other not to settle near them, and they respond accordingly 2019-06-10 16:44:06 +03:00
Yair Morgenstern
96ee91cb08 Added diplomatic reprecissions for demands that the other civs is unwilling to fulfil 
Removed WeAgreedNotToSettleNearThem flag - was reverse copy of AgreedNotToSettleNearUs
 2019-06-10 16:19:04 +03:00
Yair Morgenstern
d5a0894f75 Added diplomatic reprecissions for demands that the other civs is unwilling to fulfil 
Removed WeAgreedNotToSettleNearThem flag - was reverse copy of AgreedNotToSettleNearUs
 2019-06-10 16:18:59 +03:00
Yair Morgenstern
5ed9a5912b Resolved #856 - Cities created in your own territory get their own land and are no longer "ghost cities" 2019-06-09 23:15:03 +03:00
Yair Morgenstern
2a71d9e122 Resolved #866 - City-states can no longer get Ancient Ruin bonuses 2019-06-09 23:00:59 +03:00
Yair Morgenstern
84bcfe2d39 Added "Community" tab in the menu, with links to the Github and Discord 2019-06-07 15:55:48 +03:00
Yair Morgenstern
fc41de7a83 Unexplored tiles now dark gray - less oppresive in the main map and possible to tell apart from city-state areas in the minimap 2019-06-07 15:23:17 +03:00
Yair Morgenstern
f713d266db Implemented "Don't settle cities near us", which goes both ways - a good basis for further demands (#831) 2019-06-07 13:04:18 +03:00
Yair Morgenstern
99d7b0ea1a Fixed edge-case bug when units try to be created but aren't, and then get assigned an Alhambra promotion, triggering viewableTile update 2019-06-05 23:49:38 +03:00
Yair Morgenstern
e8bdb8a2e4 Added initial logic for promising not to settle cities near other civs - not yet activated 2019-06-05 23:21:17 +03:00
Yair Morgenstern
ab450808b2 Can no longer pass the turn when popups have not been dealt with 2019-06-05 23:18:03 +03:00
Yair Morgenstern
827a6f7871 Fixed bug where injured units would try to heal by pillaging barbarian encampments 2019-06-05 23:14:52 +03:00
Yair Morgenstern
5b884c0ecf Resolved #854 - promotion buttons show description also for non-pickable promotions 2019-06-04 22:45:43 +03:00
Yair Morgenstern
8c53244427 Don't try to pillage improvement to heal if you're a civilian unit 2019-06-04 22:35:17 +03:00
Yair Morgenstern
60f1859fdc Can now select all tile types n map editor, even on smaller resolutions 2019-06-03 22:17:23 +03:00
Yair Morgenstern
527288b886 Fixed crash in new diplomatic relations and unified DiplomacyManager.getModifier() 2019-06-03 22:06:35 +03:00
Yair Morgenstern
f49662b22e Resolved #836 - bug where ranged units could shoot above forests+jungles 2019-06-03 20:50:58 +03:00
Am-per-Sand
6f29fe9e76 include À ì in Fonts.kt 
#428
 2019-06-03 20:32:45 +03:00
Yair Morgenstern
09079bd76f Resolved #839 - Set up takes 1 movement point 2019-06-03 20:26:05 +03:00
Yair Morgenstern
cf37122304 Translation organization 2019-06-02 23:31:16 +03:00
Yair Morgenstern
0916720f86 Cannot declare friendship after denounce and vice versa 2019-06-02 19:47:49 +03:00
Yair Morgenstern
88422524ac Barbarian encampments don't show red on unexplored tiles 2019-06-01 23:42:30 +03:00
Yair Morgenstern
36da3359db Added denunceation 2019-06-01 23:20:02 +03:00
Yair Morgenstern
f60ebbb7e1 Civs clearing an encampment now get gold 2019-06-01 22:47:41 +03:00
Yair Morgenstern
8040cb01b9 Resolved #830 - city-states no longer offer trades 2019-06-01 22:27:38 +03:00
Yair Morgenstern
4b4f5e77b8 Resolved #646 - Barbarians now spawn from Encampments! 2019-05-31 17:36:19 +03:00
Yair Morgenstern
b068e6f88f Minor translation changes 2019-05-30 19:57:27 +03:00
Yair Morgenstern
16d8c16dfe Each unit now saves its viewable tiles, which gives in certain situations a whopping 10% performance improvement! Whoa! 2019-05-29 22:58:20 +03:00
Yair Morgenstern
b9cf40487f Performance improvements for Next Turn 2019-05-29 22:10:32 +03:00
Yair Morgenstern
d733df207f Fixed bug that prevented the "next turn" button from being pressed when the game didn't autosave, 
meaning players who picked turns between autosaves manually were screwed
 2019-05-29 21:44:42 +03:00
Yair Morgenstern
2060bcfa0a Resolved #821 - Civ-wide stats are now affected by percent bonuses 2019-05-29 21:12:10 +03:00
Yair Morgenstern
3fbcc019e3 There were somes things that were in the translations files but weren't translated in-game 2019-05-28 23:43:18 +03:00
Yair Morgenstern
d0cb10abbe Hopefully fixed a recurring bug in tryHeadTowardsEnemyCity 2019-05-28 23:13:08 +03:00
Yair Morgenstern
b6512535fb Fixed bug in GetProductionCost that was probably caused by the construction changing while the city button was rendering 2019-05-28 23:09:47 +03:00
Yair Morgenstern
2066978ca0 Legion no longer construct roads on water tiles - #811 2019-05-27 19:55:43 +03:00
Yair Morgenstern
a204333410 Added countdown to relationship change with city states 2019-05-26 18:52:32 +03:00
Yair Morgenstern
1bb62ad681 Civs respond according to neutral/hate and respond properly after peace 2019-05-26 18:32:19 +03:00
Yair Morgenstern
f78f9c2fad Resolved #803 - Heal Instantly didn't update health in unit icon 2019-05-26 16:16:42 +03:00
Yair Morgenstern
408dfcfc7e Final touches to City States, and they're ready to roll! 2019-05-26 16:10:09 +03:00
Yair Morgenstern
e70e052515 Resolved #804 - bigger Diplomacy and Next Turn buttons for easier click 2019-05-26 15:07:15 +03:00
Yair Morgenstern
9352243eb4 Fixed switching unit selection bug - #804 2019-05-26 14:46:45 +03:00
Yair Morgenstern
3640874b35 Dispose previous altas when replacing it to avoid OutOfMemory exceptions 2019-05-24 14:33:59 +03:00
Yair Morgenstern
125bb1270e Tech button no longer displays buildings replaced by Civ unique buiildings 2019-05-24 14:25:46 +03:00
Yair Morgenstern
25fc1b3c71 Last fixes for Indian nation! 
Checks for specific buildings now work for all civ-unique buildings as well
 2019-05-24 13:59:00 +03:00
Yair Morgenstern
7e6b102f27 Merge branch 'roadOnLongClick' 2019-05-23 22:21:46 +03:00
Amper-sandd
af19d8a1b0 add Indian assets (#800) 
* War Elephant icon

* Mughal Fort icon

* credits for Indian unique icons

* bonuses for Castle apply to Mughal Fort too

* getCityHappiness() complies with the Indian unique

* getCityHappiness() complies with the Indian

missing bracket 🙄
 2019-05-23 21:50:46 +03:00
martin
6bd06474bd improved overview city screen 
- dynamic layout
- cities and units sorted by name
- jump-to buttons for cities
- rounded values in statistics
 2019-05-23 16:25:47 +03:00
martin
c3f700ddc6 notifications with LocationAction don't select units, but only the tile 2019-05-23 16:25:08 +03:00
martin
b49270e690 moving city button with absolute coordinates to prevent it from wandering around (#794) 2019-05-23 16:25:08 +03:00
martin
eb3ba51396 allow siege units to move when set up (#797) 2019-05-23 16:25:08 +03:00
martin
c31f6bc7dd show context menu entry only if roads are researched 2019-05-23 07:57:34 +03:00
martin
73c273985f worker moves on working on road even when the path is blocked by other civilian units. Player will receive messages about those occasions. 2019-05-23 07:57:34 +03:00
martin
d676c18aec adding MapUnitAction.name(), a user-readable name for actions. Eg "Moving" instead of "moveTo x,y" 2019-05-23 07:57:34 +03:00
martin
4330508d2e using StringAction for string-encoded actions used throughout the app 2019-05-23 07:57:34 +03:00
Yair Morgenstern
29647896ce We no longer "downgrade" tiles from Railroad to Road when we try to build a Road somewhere 
Fixed error where if intermediate tiles were full (o e.g. other workers) it would try to "jump" to a tile that was out of its reach
 2019-05-22 22:55:24 +03:00
martin
98803f0454 implementing BuildLongRoadAction 2019-05-22 22:23:03 +03:00
martin
a8c3b3755b adding MapUnitAction, which is compatible to MapUnit.action 2019-05-22 22:23:03 +03:00
martin
86eda6208a show long-press context menu (move here, Construct road this way) 2019-05-22 22:23:03 +03:00
Yair Morgenstern
ea9c9da48d Added missing notification translations (#792) 2019-05-22 22:07:50 +03:00
martin
c8c3370cb9 show "rough terrain" property in Civilopedia 2019-05-22 21:57:14 +03:00
martin
0e1a7f44c4 fixed enemy city buttons not to be clickable. simplifies tile selection when attacking 2019-05-22 21:57:14 +03:00
martin
d3f7a73cf3 allow siege units to go sleeping even when set up 2019-05-22 21:57:14 +03:00
sulai
b5138b6527 auto save on dispose (#774) 
* auto save on dispose

* auto save: clone game info outside the save-game thread

* keep autosaves for the last 10 turns
 2019-05-21 08:18:34 +03:00
Yair Morgenstern
fd4123e15f City state icon in city button now visible and colored according to city-state color 2019-05-20 22:22:16 +03:00
sulai
f905fa8068 Single tap pickers for improvements and promotion (#765) 
* single tap picker (improvements, policies and promotions), tbd: split button

* improvement and promotion pickers: using split buttons featuring a question mark. allows single-tap choice.

* improvement picker and promotion picker: show "pick now" to the right of the button
 2019-05-20 20:38:50 +03:00
Yair Morgenstern
bec3c2a224 City button moved back before units 2019-05-20 20:37:25 +03:00
Yair Morgenstern
d08e9fe525 Units are now selectable again - #750 2019-05-20 20:22:24 +03:00
sulai
fdf95317f0 units support single-tap move (#750) 
* implemented single tap move
- units stay selected after move (to go on moving)
- and they are de-selectable by taping them again (to abort moving)

* unit movement: mark the reachable spots clearly to avoid accidental movement

* 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 units not being de-selected when clicking the UnitTable or "next unit" button

* zooming forwards clicks on to the map, so we need to deselect units in that case

* clean up branch

* added "Move units with a single tap" to options menu
 2019-05-20 20:08:59 +03:00
Yair Morgenstern
3cfe3a7f73 Resolved #787 - when selecting bombardable enemy unit with no military unit selected, bombarding city is automatically selected 2019-05-20 20:06:08 +03:00
Yair Morgenstern
a54f68528f Resolved #782 - Wonders are no longer built twice under "race conditions" 2019-05-20 19:48:18 +03:00
sulai
95a3a65c34 Ui improvements (#779) 
* Notifications scroll: keep scrolling position on game update if it's still the same list

* tech picker shows current/recent technology centered on the screen

* using NotificationAction interface to attach various actions to Notifications

* tech notifications: center on tech that was discovered
 2019-05-20 16:31:04 +03:00
sulai
db6e2faff8 CityButton: render units in front (#784) 
* CityButton: render units in front

* First click on single button: move down. Second click: open city screen.
 2019-05-20 16:17:27 +03:00
Yair Morgenstern
4a97d3ea18 Fixes to city button - now allows for units to be selected in the city (#771) 2019-05-19 22:58:24 +03:00
Yair Morgenstern
5c4be33418 Resolved #596 - unit retains focus when moved to tile with another unit already in it, if it has movement points left 2019-05-19 22:31:16 +03:00
Yair Morgenstern
20450250bd Resolved #778 - AI construction would generate too many workers late-game 2019-05-18 23:30:52 +03:00
Brian Gainor
081ed9dc4a Check terrain requirements for buildings first 
If a city isn't next to a mountain, it shouldn't show Observatory with
"Needs a Library".
 2019-05-18 23:22:51 +03:00
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
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
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
Yair Morgenstern
aea2e3efcf AIs no longer exchange techs below Prince difficulty 2019-04-24 22:13:37 +03:00
Yair Morgenstern
d8c238bf97 Added a popup for people who try to create a game and fail 2019-04-24 21:14:53 +03:00
Yair Morgenstern
143d4422e8 When purchasing a building, the buildings list (on the left) is immediately updated to reflect that 2019-04-24 21:03:33 +03:00
Yair Morgenstern
c3a00a0f5e All trades are now cancelled when a civ is defeated 2019-04-24 20:48:32 +03:00
Yair Morgenstern
bda375f441 Declaring war now cancels all prior trade agreements 2019-04-24 12:15:30 +03:00
Yair Morgenstern
8a600ea07d Moved hasOpenBorders to a transient bool for "next turn" performance reasons 2019-04-24 11:58:03 +03:00
Yair Morgenstern
07a8b97ed2 Open Borders is now only available with Civil Service, as per Civ V 2019-04-24 11:31:50 +03:00
Yair Morgenstern
c81c81fe8f Resolved #525 - Added Open Borders agreement 2019-04-24 10:19:47 +03:00
Duan Tao
21398c96a1 Building type check normalized. 2019-04-24 07:37:00 +03:00
Am-per-Sand
cb951da53e Fix negative turnsToNewPopulation while razing 
missing bracket, sorry I will never compile any programmes in my life, I will never learn Kotlin and will have a happy life. I wrote it by hand in the textarea on github.com 😎
 2019-04-23 23:13:48 +03:00
Am-per-Sand
42624f5bac Fix negative turnsToNewPopulation while razing 
Now when razing, city's food storage is carried over from the stage when city's population was +1 larger and FoodToNextPopulation was respectively larger. If a player would like to stop razing, such city would spring up immediately growing next turn or further on. Another side effect is negative turnsToNewPopulation in the city screen.

The same surplus cut off could be done to production if a Great Engineer speeds wonder production the same way and if negative turnsToComplete is possible (but have not spotted this line yet).
 2019-04-23 23:13:48 +03:00
Yair Morgenstern
0e8decfd07 AI won't propose peace for 10 turns after war has been declared 2019-04-23 18:34:20 +03:00
Yair Morgenstern
11db5524dd AI now waits a certain number of turns between offering the same trade again - 20 turns for luxury exchange, 5 turns for peace 2019-04-23 18:02:07 +03:00
Yair Morgenstern
5bb598fb6f AI now offers peace to the player - need to normalize its requests, since now it only offers gold so the offer is kind of flat if it doesn't have any. 2019-04-23 17:47:32 +03:00
Yair Morgenstern
5d8d7ca89b AI can now offer you trades - this is a big step towards proper diplomacy relations! 
As of now they only offer luxury-to-luxury trades
 2019-04-23 17:07:01 +03:00
Duan Tao
720b3546eb Fix national wonders 'building elsewhere' tip. 2019-04-23 14:37:52 +03:00
Duan Tao
bd3a0da2e6 Fixed : Pillaging destroyed improvement even on land. 2019-04-22 11:48:12 +08:00
Yair Morgenstern
c3da6a5112 Treaties are now correctly added and removed from both sides of the table together 2019-04-21 21:08:36 +03:00
Yair Morgenstern
cefd50ea57 Trade table logic greatly simplified, now all trade displays are dependent only on the current trade in the TradeLogic - this paves the way for "inserting" trades into the trade table, which is required for AI-offered trades! 2019-04-20 22:44:18 +03:00
Am-per-Sand
3afcd68a6b
Enable Piety when building Broadcast Tower 
someone wrote [it should work for Broadcast Towers](https://forums.civfanatics.com/resources/social-policy-piety-vanilla.25659/#1) as well.
 2019-04-20 18:50:53 +02:00
Duan Tao
c83a2ed73c Continents shape improved. 2019-04-19 19:03:40 +08:00
Duan Tao
babd29919a MapGen added type Continents. 2019-04-19 18:46:43 +08:00
Yair Morgenstern
4576056b9f Number of strategic resources now directly dependant on the number of settlable land tiles 2019-04-17 20:34:03 +03:00
Yair Morgenstern
9dabbb7946
Merge pull request #658 from ninjatao/AI_parameter 
Adjust AI parameters.
 2019-04-17 15:02:28 +03:00
Yair Morgenstern
54fc81fda7
Merge pull request #655 from Am-per-Sand/piety 
Activate Piety bonus
 2019-04-17 13:30:25 +03:00
Duan Tao
c6c3ba1e67 Adjust AI parameters. 2019-04-17 18:21:09 +08:00
Am-per-Sand
e3907e0fe1
forgot Broadcast Tower 2019-04-16 19:50:36 +02:00
Am-per-Sand
35a0dee32f
Activate Piety bonus 
N.B.
The same condition may be found in `Building.kt`, so 
- may be add a function `isCultural`
or
- add a property `cultural:true` or even `type:[military, cultural, productive, financial, scientific, wonder]` to `Buildings.json` and get rid of `isWonder` there
 2019-04-16 19:45:19 +02:00
Yair Morgenstern
cbf0c52d2c Barbarians no longer spawn on mountains and lakes (a bit silly) 2019-04-15 22:08:44 +03:00
Duan Tao
1a6fe1a397 Merge branch 'dev/main' into BigBen 2019-04-15 19:59:03 +08:00
Duan Tao
70241ac25b Add Big Ben. 2019-04-15 19:46:15 +08:00
Yair Morgenstern
5d77ac8b84
Merge pull request #651 from ninjatao/fix_battletable 
Fix submarines battle table.
 2019-04-15 10:56:53 +03:00
Duan Tao
e63f9297b3 Fix submarines battle table. 2019-04-15 14:05:22 +08:00
Yair Morgenstern
bafd7b2a21
Merge pull request #650 from ninjatao/fix_conquer 
Fix unassigned population when capturing city.
 2019-04-15 08:21:00 +03:00
Duan Tao
67a763ef21 Fix unassigned population when capturing city. 2019-04-15 09:27:05 +08:00
Yair Morgenstern
089f8ac49f "Map Editor" button now takes the current map to edit 2019-04-14 22:33:19 +03:00
Yair Morgenstern
8d91cb90dc Solved another rare concurrency error 2019-04-14 22:18:40 +03:00
Yair Morgenstern
8bf09420e0 Resolved #647 - Starting locations should not be on tiny Islands 2019-04-14 22:13:55 +03:00
Yair Morgenstern
cd6806d07e Removed our getRandom() extension, because it now comes built-in in Kotlin, yay! 2019-04-14 22:12:54 +03:00
Yair Morgenstern
0539890a4d Added "No barbarians" starting option - part of #559 2019-04-13 22:49:17 +03:00
Yair Morgenstern
d86672b0c0 Organized new game screen functions 2019-04-12 16:59:56 +03:00
Yair Morgenstern
9bb4d988a3 Added Arabian unique - #563 2019-04-12 15:11:39 +03:00
Yair Morgenstern
c3bfed1bd1 Added Legion unique unit - #563 2019-04-12 14:30:53 +03:00
Yair Morgenstern
dc2f88765b Added Foreign Legion unique unit - #563 2019-04-12 13:33:59 +03:00
Yair Morgenstern
646f430636 Added War Chariot unique unit - #563 2019-04-11 23:16:14 +03:00
Yair Morgenstern
2c638d46e6
Merge pull request #634 from ninjatao/population_assign 
Fix pop assignment when founding city.
 2019-04-10 09:21:10 +03:00
Duan Tao
c1fad81e18 Fix pop assignment when founding city. 2019-04-10 13:50:39 +08:00
Yair Morgenstern
6af749b77b Added Walls of Babylon unique building 
Added Chu-Ko-Nu unique unit
 2019-04-09 23:31:16 +03:00
Yair Morgenstern
9b9b21fe28 Resolved #579 - When picking a construction and buying it, chosen construction reverts to previously chosen construction 2019-04-09 22:38:47 +03:00
Yair Morgenstern
06b44140b8 Resolved #603 - Move unit icons back above city label 2019-04-09 16:49:24 +03:00
Yair Morgenstern
7fa24a8f17 Added Neuschwanstein wonder - part of #245 2019-04-09 16:27:12 +03:00
Yair Morgenstern
350963d182 Resolved #606 - Added "Annex or raze city" popup 2019-04-08 22:25:47 +03:00
Yair Morgenstern
6cd925cf78 Replaced "Diplomatic Incident" with more generic "Popup Alert" 2019-04-08 20:49:34 +03:00
Yair Morgenstern
e7f99975eb Resolved #610 - map generation assigns a set amount of each Strategic resource, which are spread across the map 2019-04-07 23:16:57 +03:00
Yair Morgenstern
3c3c81fd88 Added Himji Castle wonder - #245 2019-04-07 20:23:57 +03:00
Yair Morgenstern
9a0baf028e Added Colossus wonder - #245 2019-04-04 16:07:16 +03:00
Yair Morgenstern
24d71c3450 A minor usage of Java 8 replaced with non-Java-8 for older phones 2019-04-04 15:53:42 +03:00
Yair Morgenstern
55860fb480
Merge pull request #627 from ninjatao/invisible_submarine 
Battle table no longer pops up when clicking on invisible submarines.
 2019-04-03 16:05:54 +03:00
Duan Tao
b368b32cd1 Battle table no longer pops up when clicking on invisible submarines. 2019-04-03 19:18:21 +08:00
Yair Morgenstern
e93ed68a2b Icons for units replaced by civ unique units are no longer shown in tech button 2019-04-02 21:53:36 +03:00
Yair Morgenstern
5444fd705b Greatly increased distance between civ starting locations 2019-04-01 23:00:05 +03:00
Yair Morgenstern
89a720f7b2 Cities now only take ownership of _unowned_ tiles around them 2019-04-01 22:38:36 +03:00
Yann
1a8708576d
Update BattleDamage.kt 
To solve Issue #621
 2019-04-01 11:37:36 +02:00
Yair Morgenstern
e433eefc05
Merge pull request #618 from ninjatao/future_tech 
Avoid future tech blocking ending turn.
 2019-04-01 07:23:11 +03:00
Duan Tao
0bbcc39eca Avoid future tech blocking ending turn. 2019-04-01 09:54:59 +08:00
Yair Morgenstern
6796c1868b Added a much better initial tutorial, so people new to the 4X genre can find their arms and legs around the game 2019-04-01 00:05:11 +03:00
Yair Morgenstern
9eb9176b2a Units & buildings requiring resources or other needs are now displayed, but not selectable, from the city screen as constructions 2019-03-29 18:03:18 +03:00
Yair Morgenstern
a5e1978a71 Added popup for "move and attack" bug that I can't figure out 2019-03-29 15:38:22 +03:00
Yair Morgenstern
f38da59fe9 Resolved #614 - bug withpillaged water tiles 2019-03-29 15:26:31 +03:00
Yair Morgenstern
b0830ba487 Resolved #613 - policy choice & city conquer collision 2019-03-29 15:20:30 +03:00
Yair Morgenstern
12719c1e0e Added Great Wall wonder 2019-03-29 15:17:58 +03:00
Yair Morgenstern
064488ca37 Solved a crash situation when clicking on "Future Tech" when it has already been researched 2019-03-28 23:51:39 +02:00
Yair Morgenstern
0b47289c3d Resolved #601 - gold luxury not accepted in trades 
Organized trade buy/sell logic - should be much easier to understand now!
Split into Evaluation and the current trade deal, evaluation split into buying and selling
 2019-03-28 23:05:50 +02:00
Yair Morgenstern
3295753d2d Resolved #581 - Turns to production values are now always accurate and don't depend on bonuses to the current production 2019-03-25 19:52:29 +02:00
Yair Morgenstern
e43c22a74b Apparently .replaceAll is incompatible with Android 5.1, but hey who needs them. 2019-03-24 20:27:00 +02:00
Yair Morgenstern
bba6f43943 Changed "Combat Unit" to Military Unit" for naming consistency 2019-03-23 22:04:50 +02:00
Yair Morgenstern
a751ed6e31 Resolved #593 - Show/Hide resources and improvements button wasn't working 2019-03-22 10:57:18 +02:00
Duan Tao
22253af842 Work boat should have lower priority than other buildings, not higher. 2019-03-22 12:07:11 +08:00
Duan Tao
e2f650a512 wonder building priority. 2019-03-22 11:50:03 +08:00
Yair Morgenstern
4001526aea Construction choices are now more standardized and easier to understand 
Construction choice depends on how much work is left towards construction and not initial cost
 2019-03-22 00:49:08 +02:00
Yair Morgenstern
34a3b614b0 Map no longer zooms whe being created 2019-03-22 00:10:27 +02:00
Yair Morgenstern
dcd64bf58f Can see all production icons in debug mode 2019-03-22 00:09:56 +02:00
Yair Morgenstern
69d3703543 Resolved #595 - Added release version to options table 2019-03-21 22:46:49 +02:00
Yair Morgenstern
1dc6a2cf2d
Merge pull request #585 from ninjatao/build_order2 
Redo build order AI.
 2019-03-21 13:42:20 +02:00
Yair Morgenstern
e4c7a2698f Clearer population toggle in cities 2019-03-21 13:17:10 +02:00
Yair Morgenstern
775055902f Continuation of #590 - "Machu Picchu" instead of "Machu Pichu" 
Changed info in saved games to fit the change
 2019-03-21 12:53:41 +02:00
Duan Tao
90f8421777 Avoid building many wonders at the same time. 2019-03-21 08:00:11 +08:00
Yair Morgenstern
973cfd50a2 Added different city tiles for different locations 2019-03-20 15:15:55 +02:00
Yair Morgenstern
2503da2ed0 Added City tile! 2019-03-20 13:11:47 +02:00
Yair Morgenstern
1d88e76452 Split map into layers for base image, features, overlays, and fog 
Added Marsh and Lakes images
IT LOOKS SO GOOD NOW DAMN
 2019-03-20 12:09:54 +02:00
Yair Morgenstern
fe9fc110d8 Added tile feature tiles to tilesets! 2019-03-20 11:06:08 +02:00
Duan Tao
af48f80e1a Priority tuning part 2. 2019-03-20 10:25:33 +08:00
Yair Morgenstern
d6f3ab3f40 Fantasy hex tileset is go! 2019-03-19 18:35:58 +02:00
Yair Morgenstern
21377f63e7 Added Tilesets, for alternative tile images - this could be big! 
Options table is now a table, not a list - more room for future options
 2019-03-19 17:09:51 +02:00
Duan Tao
11bb63495b Fixed : unit upgrades to itself with 10 gold. 2019-03-18 18:40:11 +08:00
Duan Tao
cb9f032e35 Priority tuning part 1. 2019-03-18 15:41:37 +08:00
Yair Morgenstern
3086520bd2 Hopefully solved a YouCantGetThereFromHereException in tryAttackNearbyEnemy 2019-03-18 06:47:17 +02:00
Yair Morgenstern
c33b0a67fe Resolved #586 - units now upgrade to the most recent upgrade, not to the next possible one 2019-03-17 23:10:11 +02:00
Duan Tao
c916b96d1e Redo build order AI. 2019-03-18 00:15:36 +08:00
Duan Tao
f8a8d7bbfb Embarked civilian units should have no defense. 2019-03-17 15:50:52 +08:00
Yair Morgenstern
29bc82e1bd Diplomacy screen redesigned, to allow for more diplomacy options in the future 2019-03-15 12:14:19 +02:00
Yair Morgenstern
ab2e044a09 Units no longer freeze on the spot when they need to heal but can't find where 2019-03-15 10:41:51 +02:00
Yair Morgenstern
36781e4b55 Unified ranking tiles for healing logic 2019-03-15 10:34:16 +02:00
Yair Morgenstern
5873ccc848 Resolved #541 - change "Replacable Parts" to "Replaceable Parts", also in saved games 
Continuation of #571
 2019-03-15 10:21:00 +02:00
Yair Morgenstern
10d098b9de 2.13.14 2019-03-14 22:29:25 +02:00
Yair Morgenstern
7d312eea39
Merge pull request #567 from ninjatao/AI_peace 
AIs negociate peace.
 2019-03-13 13:10:57 +02:00
Duan Tao
d113a88e21 AIs negociate peace. 2019-03-13 18:13:39 +08:00
Yair Morgenstern
479b3a02ad Resolved #383 - Configurable amount of turns between autosaves 2019-03-12 22:10:25 +02:00
Yair Morgenstern
eba3aa3033 no message 2019-03-12 19:25:41 +02:00
Yair Morgenstern
81b29a5b57 Resolved #551 - Update city stats on production change 2019-03-12 19:24:50 +02:00
Yair Morgenstern
f69be35647
Merge pull request #564 from ninjatao/fix_buildings_list 
Fix builds list in city screen.
 2019-03-12 18:19:31 +02:00
Duan Tao
67eb3a86e0 Fix builds list in city screen. 2019-03-12 22:18:30 +08:00
Yair Morgenstern
02f1530c44 Fixed translation file 2019-03-11 20:20:07 +02:00
Yair Morgenstern
cef4eafa0f
Merge pull request #557 from ninjatao/fix_bombarf_crash 
Fix bombard crash.
 2019-03-11 17:52:05 +02:00
Duan Tao
1a5862d6b1 Fix build error... 2019-03-11 23:19:40 +08:00
Duan Tao
dbf48ac7bf Fix bombard crash. 2019-03-11 23:07:04 +08:00
Yair Morgenstern
0fcc3a6807 Fixed bug where setting the max. amount of AI players meant that there was no human player, so people got a fully-fogged out map 2019-03-10 23:43:49 +02:00
Yair Morgenstern
42ca98efd2 Gave up on the idea of the attack button - if the enemy moves we need to remove the button, and it's actually very difficult to determine this. 2019-03-10 23:27:19 +02:00
Yair Morgenstern
aea7d750fd Added a popup when trying and faiing to load a game, so people will send me emails when this happens 2019-03-10 23:13:04 +02:00
Yair Morgenstern
881f532bf7 Memory-saving tweak 2019-03-10 23:04:04 +02:00
Yair Morgenstern
115aef50ad Better starting locations on tiny map with lots of players 2019-03-10 23:03:25 +02:00
Yair Morgenstern
09b1446fea Removed empty translations (very bad for people who play the game in that language) 
Added a way to copy game info directly from files, and also a popup when encountering a certain error, for debugging purposes
 2019-03-10 22:52:57 +02:00
Yair Morgenstern
883469a6b9
Merge pull request #547 from ninjatao/explorer_heal 
Auto-explore heals if injured.
 2019-03-10 15:52:16 +02:00
Duan Tao
5173bd98a2 Auto-explore heals if injured. 2019-03-10 20:42:13 +08:00
Yair Morgenstern
319b1c8524 Can now attack enemies from the map, just like moving units 2019-03-09 22:56:20 +02:00
Yair Morgenstern
3883261d45
Merge pull request #537 from ninjatao/jira/493 
Better defeat condition.
 2019-03-09 22:07:07 +02:00
Duan Tao
451a95a86c Better defeat condition. 2019-03-08 22:37:26 +08:00
Yair Morgenstern
94fb9af4a1
Merge pull request #536 from ninjatao/jira/493 
Load proper citiesCreated info.
 2019-03-08 16:36:43 +02:00
Duan Tao
01dd1fccd7 Load proper citiesCreated info. 2019-03-08 22:23:56 +08:00
Yair Morgenstern
fa181275b0
Merge pull request #534 from ninjatao/test_warfare 
Slightly better build order. AI has more troops.
 2019-03-08 15:41:49 +02:00
Yair Morgenstern
2ec8225c20 Resolved #384 - can now sell one building per city per turn 2019-03-08 13:45:12 +02:00
Duan Tao
b6d4ff8747 Slightly better build order. AI has more troops. 2019-03-08 18:48:06 +08:00
Yair Morgenstern
adea36fb81 Commented out snow - we don't want it appearing in patches until we have better map generation 2019-03-08 10:15:10 +02:00
Yair Morgenstern
f15490d0ac Resolved #470 - can now click on a building in the city info table to display its effect 
Organized city info table
 2019-03-07 23:05:48 +02:00
Yair Morgenstern
6a833ae89a Resolved #514 - enemy civ is defeated even when he has settlers left, as per original Civ 2019-03-06 20:39:53 +02:00
Yair Morgenstern
b2a29714bd
Merge pull request #512 from ninjatao/issue/498 
Make units pillage improvement to heal, especially barbarians.
 2019-03-06 15:17:17 +02:00
Duan Tao
d91a23b723 Make units pillage improvement to heal, especially barbarians. 2019-03-06 17:42:00 +08:00
Yair Morgenstern
afaf4ae6da Resolved #508 - Missing and bad translations 2019-03-05 22:18:57 +02:00
Yair Morgenstern
efe677d27c Added Civilopedia texts to translation file 2019-03-04 21:32:18 +02:00
Duan Tao
223055d247 Barbarian units ignore strategy resources. 2019-03-04 09:44:09 +08:00
Yair Morgenstern
0ef11e12cd Resolved #491 - Once Honor has been adopted, gain Culture when you kill a barbarian unit 2019-03-03 23:05:12 +02:00
Yair Morgenstern
9e5d6d3c75 Resolved #469 - AI Great General tries to maximize effect on troops 2019-03-02 22:53:30 +02:00
Yair Morgenstern
2d1a044e29 Resolved #490 - AI doesn't train settlers when at war 2019-03-02 22:30:52 +02:00
Yair Morgenstern
c676d127dd Resolved #488 - Recalibrated tech costs 2019-03-02 22:26:31 +02:00
Yair Morgenstern
6ad3652205 Resolved #486 - strategic resources are now scarcer 2019-03-02 21:52:14 +02:00
Yair Morgenstern
58e38ea634 Added Japan civ! 
Some units now recieve promotions when created/upgraded to, as per Civ V
 2019-03-02 21:27:35 +02:00
Yair Morgenstern
3432f9b8c1 Rendering performance improvements - much smoother scrolling! 2019-02-27 20:17:27 +02:00
Yair Morgenstern
199b0c16ec World map properly padded 
Fixed super weird error which I have no idea how it entered the code???
 2019-02-26 20:23:07 +02:00
Yair Morgenstern
52d6c998f2 Resolved #164 - Removed zoom-out limitations 2019-02-25 22:04:53 +02:00
Yair Morgenstern
13f2f101a0 Resolved #468 - AI now accompanies Great People with military escorts 
Merged "CivInfos" json into "Nations"
 2019-02-25 21:21:12 +02:00
Yair Morgenstern
6cda5bb8ad Fixed #467 - popups on separate screens affected each other 2019-02-24 13:07:34 +02:00
Yair Morgenstern
b73077baa4 Nation translations are go! 2019-02-24 12:02:02 +02:00
Yair Morgenstern
47dbd69c96 Civilopedia now displays Basic Help per-language 
Fixed problems with Italian translation files
Fixed a couple of errors moving to the next turn with the current construction method
 2019-02-24 10:27:43 +02:00
Yair Morgenstern
59f5f9ceeb Resolved #453 - Allow copy-pasting maps as text in map editor 2019-02-22 10:36:26 +02:00
Yair Morgenstern
53664ec043 Added Kremlin wonder 2019-02-22 10:27:47 +02:00
Yair Morgenstern
563bbaf021 Unit construction moved to the beginning of the turn, so they won't be generated out in the open and vulnerable to enemy attacks before you can control them - Kudos am-per-sand! 2019-02-21 20:12:17 +02:00
Yair Morgenstern
325ac06e97 Resolved #463 - City stats and percentages now displayed precisely and according to calculation order in drilldown 2019-02-21 20:00:45 +02:00
Yair Morgenstern
80dd4c759b Added percentage bonuses to city stats drilldown 
Fixed happiness drilldown display in city screen
 2019-02-19 22:45:52 +02:00
Yair Morgenstern
973c1693c8 Unified canFortify() checks 2019-02-18 23:02:14 +02:00
Yair Morgenstern
063c00a61d Tiles in city screen are now centered also on larger resolutions 2019-02-18 23:01:11 +02:00
Yair Morgenstern
df237d8686 Fixed #457 - AI naval units would fortify 2019-02-18 20:46:50 +02:00
Yair Morgenstern
b5f18d2fe6 Fixed #450 - cities not connecting to roads 2019-02-17 00:23:56 +02:00
Yair Morgenstern
dd63491c03 Techs from ancient ruins now added properly 2019-02-17 00:01:54 +02:00
Yair Morgenstern
4c5753c41f Fixed #452 - France's unique ability not working 2019-02-16 23:52:26 +02:00
Yair Morgenstern
d581ca924f Resolved #454 - Allow starting game with 0 AIs when there are 2 or more human players 2019-02-16 23:41:11 +02:00
Yair Morgenstern
356f8b6bbd Resolved #455 - add great person point breakdown to city info 2019-02-16 23:39:03 +02:00
Yair Morgenstern
0cd5426440 Battle table indicates damage with health bars 2019-02-15 13:48:29 +02:00
Yair Morgenstern
b38c615056 Separated CityPickerTable and TileTable in CityScreen to their own classes 2019-02-15 12:32:50 +02:00
Yair Morgenstern
6de517d4d5 Separated battle table height from the height of the tile and unit tables 2019-02-14 23:12:35 +02:00
Yair Morgenstern
e200e9026f Text for strength, movement and ranged strength in unit tablee replaced with icons - table is now consistently much smaller, and much less bothersome! 2019-02-14 22:49:46 +02:00
Yair Morgenstern
0fab01e393 Tile map now pans to chosen tile, instead of "flashing" there - makes the map feel more connected and helps you understand where you are IMHO 2019-02-14 22:21:26 +02:00
Yair Morgenstern
9ba360408c Added helper function to create labels from text 2019-02-13 23:53:50 +02:00
Yair Morgenstern
ee55839557 Fixed minor problem with Egypt's neutral "let's hear it" responses 
Current construction in city better represented
 2019-02-13 19:02:11 +02:00
Yair Morgenstern
748e84f265 Resolved #449 - added "go to unit" button in unit overview 2019-02-11 22:07:34 +02:00
Yair Morgenstern
0788141054 Civs now have unique responses for introduction, greeting, trade acceptance and refusal 2019-02-11 20:46:49 +02:00
Yair Morgenstern
d080f37a94 Now ignore unknown fields on all jsons 2019-02-10 23:27:48 +02:00
Yair Morgenstern
796284c7e2 Added unique civ text for attacking, being attacked, and being defeated 2019-02-10 19:50:42 +02:00
Yair Morgenstern
07663bfc54 Added "Diplomatic Incidents" for diplomatic messages between civs (as of now, only declaration of war) 2019-02-10 16:34:46 +02:00
Yair Morgenstern
2834752826 Added "change city name" with a popup that appears when clicking on the city name in the ciity screen 2019-02-10 15:32:48 +02:00
Yair Morgenstern
4b7a447eae Civ city name generation now done by a global counter - enables city name changes later 2019-02-10 09:50:36 +02:00
Yair Morgenstern
cc0a999471 Added "exit map editor" button to map editor 2019-02-09 23:26:59 +02:00
Yair Morgenstern
ae7cbcb3c9 Embarked units now have era-based defensive strength (like in original civ) 2019-02-09 23:06:13 +02:00
Yair Morgenstern
d9fb3fdb2c Switched positions of "raze city" and "exit city" buttons - "exit" is a much more common use-case, and therefore should have the more easily-reachable spot 2019-02-09 22:40:52 +02:00
Yair Morgenstern
10e9a5e481 AI units much more cautious when attacking cities - only enter city bombard range if there's a good chance of capturing the city 
#416
 2019-02-09 21:31:16 +02:00
Yair Morgenstern
3feb231620 Added "deselect" button to unit & city display 2019-02-09 21:25:30 +02:00
Yair Morgenstern
d2a48fae38 Added "current edit" hex to bottom-right of map editor screen 2019-02-08 00:34:46 +02:00
Yair Morgenstern
d42416974c Saving and loading games is now done directly to\from files without becoming strings in the meantime - should help avoid some OutOfMemory exceptions when the games become really huge (the GameInfo as c# classes is much smaller thatn the serialized text for a number of reasons) 2019-02-07 23:06:13 +02:00
Yair Morgenstern
50931a86c1 Resolved #447 - cities now have roads and railroads only when corresponding tech has been researched 2019-02-07 22:56:13 +02:00
Yair Morgenstern
6856301504 Resolved #446 - Buildings are now created when production is completed by Great Engineers, so production of the current turn can be added to the next construction 2019-02-05 20:04:07 +02:00
Yair Morgenstern
a98ce0d7d9 Auto-load the first map, if any exist 
Center the map editor on the map
 2019-02-03 20:34:21 +02:00
Yair Morgenstern
d8d2b89e73 Enabled loading maps from the map editor 2019-02-03 19:42:31 +02:00
Yair Morgenstern
81d1a79e19 Can now choose a map name and load a map from those existing on the phone! 2019-02-02 23:26:56 +02:00
Yair Morgenstern
3a990434f3 Added initial map editor! Woohoo! 2019-02-02 22:43:02 +02:00
Yair Morgenstern
8e2c3287f6 CityScreen now also uses TileGroupMap 2019-01-29 23:52:51 +02:00
Yair Morgenstern
8038dd4c4f Separated "Group to hold visual map based on tilegroups" to a separate class, for reuse in CityScreen, the future map editor, and maybe also in the minimap 2019-01-29 21:48:23 +02:00
Duan Tao
49f0fe725a Free promotions don't affect future xp. 2019-01-29 18:24:28 +08:00
Duan Tao
c69f54408b Allow to add real free promotions to unit. 2019-01-29 14:46:24 +08:00
Yair Morgenstern
3044fb2978 Fixed crashing bug caused by using GameBasics.Technologies.keys directly, and editing it 2019-01-28 20:45:28 +02:00
Yair Morgenstern
5a78c612ab Fixed errors caused by AI civs not having any non-researched techs to choose from, when all techs are researched - now choose future tech again 2019-01-27 23:45:39 +02:00
Yair Morgenstern
653cb556cf Fixed errors caused by siege unit's movement points not being calculated correctly 2019-01-27 23:38:11 +02:00
Yair Morgenstern
5ab6c6c991
Merge pull request #439 from ninjatao/barbarians 
Barbarians
 2019-01-27 17:58:58 +02:00
Duan Tao
edc53171cc Barbarian generation improvement. 2019-01-27 21:34:40 +08:00
Duan Tao
c2f6637a91 Fix construction cost. 2019-01-27 16:22:57 +08:00
Yair Morgenstern
f80077a412 Resolved #435 - profit from disbanding units 2019-01-26 22:39:48 +02:00
Yair Morgenstern
665af17ae5 Fixed #438 - changing production before answering the "do you want to purchase construction" popup lead to buying the newly chosen production 2019-01-26 22:00:48 +02:00
Duan Tao
624f83d109 Remove unique units from barbarians. 2019-01-26 19:04:13 +08:00
Duan Tao
ddcf3dd83e Remove unit list for barbarians. 2019-01-26 18:58:12 +08:00
Duan Tao
c18cc2476f Generate different type of barbarians. 2019-01-26 18:48:29 +08:00
Yair Morgenstern
478a9e6996 Resolved #429 - display era names only once in tech picker screen 2019-01-23 20:52:26 +02:00
Yair Morgenstern
a4175438a3 Resolved #424 - added confirm box when declaring war 2019-01-23 20:16:34 +02:00
Yair Morgenstern
b60df3ce85 Resolved #428 - missing characters in German translation 2019-01-23 20:07:13 +02:00
Duan Tao
0f1221e033 Fix seige units finding targets bug. 2019-01-23 21:10:25 +08:00
Duan Tao
a141cb1f1c Rearrange code for pruchasing stuff. 2019-01-23 16:09:18 +08:00
Duan Tao
fa8c948c04 Allow ai to spend money for building & unit. 2019-01-23 16:09:08 +08:00
Duan Tao
53c0bbb0a3 AI exchange techs strategy change. 2019-01-23 16:08:52 +08:00
Duan Tao
d11cb4779b AIs trade techs. Also modified AI tech choose strategy. 2019-01-23 16:08:37 +08:00
Yair Morgenstern
1a6089ead1
Merge pull request #431 from ninjatao/fix_city_defeated_info 
Fix city defeated info.
 2019-01-23 09:56:12 +02:00
Duan Tao
a03482477d Fix city defeated info. 2019-01-23 15:27:37 +08:00
Duan Tao
7b83776bfa Fix building bonus replaced bug. 2019-01-23 11:26:05 +08:00
Yair Morgenstern
baed1e50cd Returned tile info table in the city screen, construction scroll now translated, added city screen translations to translations file - #417 2019-01-22 21:48:30 +02:00
Yair Morgenstern
2267d2945d
Merge pull request #427 from ninjatao/fix_cityscreen 
Fix city screen info windows.
 2019-01-22 13:19:52 +02:00
Duan Tao
2d69fa9804 Fix city screen info windows. 2019-01-22 19:09:46 +08:00
Yair Morgenstern
9ba73c4a6f No height difference between hills and hills with jungle/forest 2019-01-21 23:10:03 +02:00
Yair Morgenstern
d7067d2835 Resolved #409 - rewrite line-of-sight rules 2019-01-21 22:41:22 +02:00
Yair Morgenstern
d1de589e4f Resolved #422 - can no longer move through units of other civs we're at war with 2019-01-21 20:17:48 +02:00
Yair Morgenstern
811ed5a7a2 Better AI build order for #416 2019-01-20 23:05:08 +02:00
Yair Morgenstern
effec4856c Resolved #424 and upgraded gradle 2019-01-20 22:44:09 +02:00
Duan Tao
a0ee9b6bd7 Fix city screen population info. 2019-01-20 21:22:00 +08:00
Yair Morgenstern
fa8f9deb2c Solved #420 - viewable tiles not updated when trading cities, kudos zivvel! 2019-01-19 23:49:46 +02:00
Yair Morgenstern
2ca894b05f City construction picking now done through a scroll on the city screen, like in the original =D 
Also resolved #417 on the way
 2019-01-19 23:43:28 +02:00
Yair Morgenstern
a371aedf23 Changes to city screen - city summary in top-left corner like original 2019-01-19 21:01:47 +02:00
Yair Morgenstern
e573368d18 Added CN Tower, Pentagon #245 2019-01-16 22:24:29 +02:00
Yair Morgenstern
eeaca08f57 Added Alhambra #245 2019-01-16 21:45:46 +02:00
Yair Morgenstern
49ed7570f8 Added Hubble Space Telescope wonder, Stable unique ability 
Added missing translations
 2019-01-16 21:26:14 +02:00
Yair Morgenstern
2df64861d1 Added Infantry, Machine Gun units 
Added Railroad, Ballistics techs
Added Statue of Liberty wonder
 2019-01-15 22:17:34 +02:00
Yair Morgenstern
ee278586e7 Solved #413 probable (ANR trying to load super-huge autosave game) by disabling the update() in the initialize, instead setting shouldUpdate to true by default so it'll update in the rendering thread 2019-01-14 21:57:09 +02:00
Yair Morgenstern
53c5c6d5ab Can now choose to start a game with multiple human players! 2019-01-14 20:48:30 +02:00
Duan Tao
c198db0641 Adjust city attack strength. Also shown in unittable when selected. 2019-01-12 20:33:30 +08:00
Yair Morgenstern
abd9d6d9a4 Decreased bombard strength as per Civ V 
Don't display empty stats in city detail table
 2019-01-11 12:12:19 +02:00
Yair Morgenstern
8e478d2d71 Added intermediate screen between players on the same phone, so they won't see each other's screens 2019-01-11 12:10:27 +02:00
Yair Morgenstern
3ddacff4f4
Merge branch 'master' into bombard 2019-01-11 10:56:34 +02:00
Yair Morgenstern
401aa942eb Can now play with multiple human players! 
Need to find a way for all human players to choose their civs in a simple manner
 2019-01-11 09:58:32 +02:00
Yair Morgenstern
8bf84393fc More changes to enable multiplayer - save the current player in the civInfo, distinguish between "current player" and "human player" 2019-01-10 21:29:24 +02:00
Yair Morgenstern
d19861b348 Maybe solved an ANR caused by resume(), it's hard to tell 2019-01-10 20:43:32 +02:00
Duan Tao
4e77edcec0 Code cleanup 2. 2019-01-10 11:30:33 +08:00
Duan Tao
57dce317ea Code cleanup. 2019-01-09 21:17:05 +08:00
Duan Tao
2f22b1d576 City bombardment is counted as ranged. 2019-01-09 18:56:52 +08:00
Yair Morgenstern
c7dbad1085
Merge pull request #412 from ninjatao/auto_fix_pillage 
Avoid pillaged great improvement from being replaced by resource impr…
 2019-01-09 07:53:24 +02:00
Duan Tao
f237adef4b Avoid pillaged great improvement from being replaced by resource improvement. 2019-01-09 11:09:57 +08:00
Duan Tao
730111993e Code cleanup and bug fix. 2019-01-09 10:12:00 +08:00
Yair Morgenstern
a7bbea106c Resolved #407 - units cannot pillage when at full health 2019-01-08 18:45:06 +02:00
Yair Morgenstern
2fdd3e2628 Fixed #402 - couldn't build wonder if it was being built by a rival civ 2019-01-08 18:43:06 +02:00
Yair Morgenstern
c282ffb423 Resolved #410 - land units on lake aren't shown as embarked 2019-01-08 15:43:54 +02:00
Duan Tao
a2764d7b91 Ai uses bombardment. 2019-01-08 20:16:18 +08:00
Duan Tao
0f16a25cc6 You can actually Bombard! But ai cannot yet. 2019-01-08 19:55:35 +08:00
Duan Tao
7a17779bf4 Mark bombard targets. 2019-01-08 18:35:14 +08:00
Duan Tao
9054496940 Select city before entering city screen. 2019-01-08 15:34:32 +08:00
Yair Morgenstern
eeb494364b Resolved #407 - Add pillaging terrain improvements 2019-01-07 21:56:02 +02:00
Yair Morgenstern
b8aa4932a0 Added unique ability for Egypt and France 2019-01-07 18:44:42 +02:00
Duan Tao
b11c96ce3f chooseImprovement returns null when there is already better improvement. 2019-01-07 11:58:57 +08:00
Yair Morgenstern
84007533fc Resolved #311 - translate victory screen 2019-01-06 22:48:24 +02:00
Yair Morgenstern
567786c125 Resolved #399 - lakes act differently than in original game 2019-01-06 22:41:03 +02:00
Duan Tao
ae210e05f3 Idle worker try to connect cities with roads. 2019-01-05 23:13:59 +08:00
Yair Morgenstern
19906ade75 Added Babylonian civ unique 2019-01-04 11:51:44 +02:00
Yair Morgenstern
2f5b6e7be5 Resolved #396 - save game start parameters and use for subsequent games 
Later, we could use this info to display to the user in the load game screen
Solved #394 - couldn't scroll map far on edges, some tiles were hard to get to
 2019-01-04 10:59:47 +02:00
Duan Tao
39d2b5d60c Constucting a great improvement remove unfinished improvement. 2019-01-04 14:15:25 +08:00
Yair Morgenstern
0567eb442d
Merge pull request #391 from ninjatao/submarine 
Submarine, resolves #388
 2018-12-31 17:13:21 +02:00
Yair Morgenstern
7f9ca0fd3d
Merge pull request #386 from ninjatao/worker_automate 
Worker automation uses more resource.
 2018-12-31 14:49:20 +02:00
Duan Tao
19ce158ccb Update wolfpack bonus, icons. 2018-12-31 19:58:24 +08:00
Duan Tao
de5610180f Add WaterSubmarine unit type. 2018-12-31 19:42:20 +08:00
Yair Morgenstern
8ad37530b2 Solved another 2 rare concurrency problems - CityInfo.workedTiles and CityInfo.tiles are not edited directly but switched out 2018-12-30 20:40:48 +02:00
Duan Tao
5f3da79484 Fix evalutate peace treaty bug. 2018-12-30 19:22:40 +08:00
Duan Tao
be80aaecda Worker automation leaves great tile improvement alone. 2018-12-30 19:19:06 +08:00
Duan Tao
f2e6c1b08f Chinese unique ability. 2018-12-30 12:24:01 +08:00
Duan Tao
922a29e60f Worker automation uses more resource. 2018-12-30 11:46:27 +08:00
Yair Morgenstern
30e8af1848
Merge pull request #378 from ninjatao/great_general 
Great general
 2018-12-29 19:54:17 +02:00
Duan Tao
b57a6f65fe Improvement part2, for great general actions. 2018-12-29 10:52:01 +08:00
Yair Morgenstern
48efb4dcd2 Fixed #362 (Cannot upgrade units at 0 resource) 
Great improvements remove terrain features
 2018-12-28 10:09:57 +02:00
Duan Tao
f70c725b85 Code improvement, part 1. 2018-12-28 09:53:30 +08:00
Duan Tao
2e91b9f84e Fix great general automation exception. 2018-12-28 00:00:22 +08:00
Duan Tao
05657ea131 Fix : Avoid addGreatPerson exception. 2018-12-27 23:09:54 +08:00
Duan Tao
2904ed04eb Fix great general bonus. 2018-12-27 11:45:27 +08:00
Duan Tao
6c51073112 Some improvement on ai. 2018-12-27 11:44:30 +08:00
Duan Tao
0e77d5b044 Avoid addGreatPerson exception. 2018-12-27 11:01:07 +08:00
Yair Morgenstern
aca089fa4a Solved notification concurrency exception 2018-12-26 20:08:57 +02:00
Duan Tao
2575ffd01f fix general points. 2018-12-26 23:39:20 +08:00
Duan Tao
ae1629fcb0 AI uses great generals. I hope. 2018-12-26 23:30:21 +08:00
Duan Tao
60f59fe2aa Great general provides bonus for nearby friendly land units. 2018-12-26 19:25:07 +08:00
Duan Tao
7478215353 Add great general generation, overview screen and free pickup. 2018-12-26 18:42:22 +08:00
Duan Tao
c3e8563bf2 Add great general unit. 2018-12-26 18:06:36 +08:00
yairm210
39b09f16b2
Merge pull request #377 from ninjatao/indirect_fire 
fix "Indirect Fire" typo.
 2018-12-26 11:46:17 +02:00
Duan Tao
3e5740563f fix "Indirect Fire" typo. 2018-12-26 16:16:37 +08:00
yairm210
c967d058d2
Merge pull request #376 from ninjatao/fix_humanism 
Humanism should increase happiness, instead of science.
 2018-12-26 06:38:47 +02:00
Duan Tao
5dae652c0b Humanism should increase happiness, instead of science. 2018-12-26 10:32:50 +08:00
Yair Morgenstern
6925b0262f Removed deprecated classes and fields from half a year ago 2018-12-25 22:12:11 +02:00
Yair Morgenstern
91630cd687 Victory condition logic moved to VictoryManager 
Victory screen now pops up when you fulfill the victory conditions =D
Added "One more turn" mode, if people want to play after the victory conditions have been fulfilled
 2018-12-25 21:59:37 +02:00
yairm210
885070de99
Merge pull request #373 from ninjatao/fix_new_game_crash 
Avoid crash from giving ai free techs.
 2018-12-24 16:08:13 +02:00
Duan Tao
e3c9567904 Avoid crash from giving ai free techs. 2018-12-24 20:01:32 +08:00
yairm210
a6716f2a40
Merge pull request #368 from ninjatao/fix_declare_war 
Fixed : can repeatly declare war.
 2018-12-22 18:32:06 +02:00
Duan Tao
3491a1841a Fixed : can repeatly declare war. 2018-12-22 12:29:17 +08:00
Yair Morgenstern
faf5803b1d Cleaned up UnitAutomation.TryGarrison 
Added explainations of various map generation techniques
 2018-12-21 11:51:57 +02:00
Duan Tao
b4fa88cada Remove extra word to prevent the label from being too long. 2018-12-21 16:41:48 +08:00