Commit graph

812 commits

Author SHA1 Message Date
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
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
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
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