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

1146 commits

Author SHA1 Message Date
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
Duan Tao
6124474b4f Mark defeated civs in diplomacy screen. 2018-12-21 16:35:03 +08:00
Duan Tao
b2a95e039e Updates topbar display on unit upgrade. 2018-12-21 13:51:54 +08:00
yairm210
230bb0549b
Merge pull request #363 from ninjatao/update_stats_after_acquire 
After acquiring tile from nearby city, update stats.
 2018-12-20 17:53:52 +02:00
Duan Tao
23799ce80c After acquiring tile from nearby city, update stats. 2018-12-20 23:12:54 +08:00
Duan Tao
9ff6764df2 Better arrange deserts, tundras and lakes. 2018-12-20 15:32:14 +08:00
yairm210
3ce89e1928
Merge pull request #358 from ninjatao/map_gen 
Add celluar automica map generator.
 2018-12-20 06:42:12 +02:00
Duan Tao
5496a5e640 Add pangaea map type. Add options. 2018-12-20 11:58:54 +08:00
Yair Morgenstern
51b62028a8 Maybe solved a concurrency-related java.lang.IllegalArgumentException from CameraStageBaseScreen.render 
It's hard to tell because it only crops extremely randomly in, like, 1 in a 1000 games, and the users just continue on with their lives,
But it's a crash record and we want 0 of those!
 2018-12-19 19:53:53 +02:00
Yair Morgenstern
a677850084 Water units can enter cities 2018-12-19 19:36:18 +02:00
Yair Morgenstern
f19750409d Buying techs now enables their uniques immediately - kudos ingvart! 2018-12-19 19:20:57 +02:00
Duan Tao
c18b64f10f Add celluar automica map generator. 2018-12-19 19:47:36 +08:00
Yair Morgenstern
a1a2b89949 Added various attack sounds, for different types of units 2018-12-18 22:32:04 +02:00
yairm210
0491b21956
Merge pull request #356 from ninjatao/auto_railroad 
Auto build railroad.
 2018-12-18 20:22:38 +02:00
Yair Morgenstern
e3926764f2 Difficulty is now game-wide, in preparation for multiplayer 
Apparently choosing difficulty...didn't actually do anything until now, which is an embarrasing oversight and explains why people thought the game was too hard even on easy mode...
 2018-12-18 19:26:56 +02:00
Yair Morgenstern
b054a3ff4a Work boats can't "create improvement" on tiles that already have an improvement 2018-12-18 18:58:07 +02:00
Yair Morgenstern
6bdd0da3ea Notifications are now per-civ instead of game-wide, in preparation for multiplayer 
Added player type to civinfo, in preparation for multiplayer
 2018-12-18 18:57:13 +02:00
Duan Tao
f717645019 Auto build railroad. 2018-12-18 10:19:57 +08:00
Yair Morgenstern
2923dc80c9 Massive performance improvement thanks to: 
* not mapping out the uniques every tile
* saving tech uniques and units uniques specific to movement between tiles
 2018-12-17 21:33:07 +02:00
Yair Morgenstern
94fd43f422 Added icon for lakes 
Added more sound effects
Added Leaning Tower of Pisa
 2018-12-17 19:00:45 +02:00
Yair Morgenstern
3edc95dd3e Added whoosh sound when telling units to move 2018-12-17 14:46:01 +02:00
Yair Morgenstern
319cfd1fe9 Added sound effect for purchasing constructions and tiles 2018-12-17 13:24:48 +02:00
Yair Morgenstern
fd2d55876d Added unique sound effects for multiple actions 2018-12-17 13:11:50 +02:00
yairm210
978dac806f
Merge pull request #355 from ninjatao/fish_boat 
AI uses work boats.
 2018-12-17 11:47:33 +02:00
Yair Morgenstern
82f9f64fab Added first sound effect, and sound effect volume control settings 
As of now, every single button in the game has the same click sound, but that will change
 2018-12-17 11:45:24 +02:00
Duan Tao
b95192006e Fix safe call. 2018-12-17 17:22:54 +08:00
Yair Morgenstern
f5c8b28d82 Organized Modern Era techs 
Free techs are added like regular techs - with all the abilities and notifications thereof
 2018-12-17 10:49:13 +02:00
Duan Tao
9dab9cd556 AI uses work boats. 2018-12-17 16:24:14 +08:00
yairm210
e46682cb21
Merge pull request #350 from ninjatao/try_land_before_attack 
Embarked land unit try to land before attack on water.
 2018-12-16 06:51:15 +02:00
Yair Morgenstern
d1c7117c54 Mountains no longer appear in ranges - caused untenable starting positions 
Lakes now appear randomly!
 2018-12-14 13:46:52 +02:00
Duan Tao
81b891564e Embarked land unit try to land before attack on water. 2018-12-14 19:38:30 +08:00
Yair Morgenstern
afbd2ad21b Chinese font should now be loaded properly 2018-12-14 12:44:47 +02:00
yairm210
b3c79ec299
Merge pull request #347 from ninjatao/place_new_unit 
prefer to place new land units on land.
 2018-12-14 12:05:41 +02:00
Duan Tao
1a731a7ec1 Add observatory requirement. 2018-12-14 17:16:33 +08:00
Duan Tao
b1d2b13ddd Improvements. 2018-12-14 16:35:10 +08:00
Duan Tao
c8ec2bcbb7 prefer to place new land units on land. 2018-12-13 19:54:04 +08:00
yairm210
042e295611
Merge pull request #344 from ninjatao/can_only_attack_water 
Make submarine only attack water tiles.
 2018-12-13 13:15:40 +02:00
Duan Tao
74efa3cfbc Cannot continue info now has city name. 2018-12-13 19:00:48 +08:00
Duan Tao
a9249ede0c Make submarine only attack water tiles. 2018-12-13 18:36:35 +08:00
yairm210
ac241d2744
Merge pull request #334 from ninjatao/add_battleship 
Add Battleship. Enabled Electronics for battleship.
 2018-12-13 12:21:45 +02:00
Duan Tao
b91e1f418f Fix attackable detection. 2018-12-13 12:29:55 +08:00
Duan Tao
11871991d3 Submarine can only be aimed by destroyers and submarines. 2018-12-13 12:14:09 +08:00
Yair Morgenstern
9e8930c263 Multiple promotions with the same effect (e.g. Barrage I and II) will now both activate - kudos Philn3v! 2018-12-12 23:05:14 +02:00
Yair Morgenstern
406fa60f61 Unhappiness battle modifier properly capped now 2018-12-12 22:57:03 +02:00
yairm210
9187465699
Merge pull request #335 from ninjatao/cityrange_tutorial 
Add city range tutorial.
 2018-12-12 22:34:42 +02:00
Duan Tao
36d7b30279 Submarine is invisible now, except to submarines and destroyers. But it still can be aimed by everybody. 2018-12-12 22:52:09 +08:00
Duan Tao
209eb4c73b Add submarine and refrigeration. Submarine is not invisible yet. 2018-12-12 13:23:29 +08:00
yairm210
6110fc1cd3
Merge pull request #330 from ninjatao/fix_embark_attack 
Allow embarked units to attack land units, like in civ5.
 2018-12-11 21:34:56 +02:00
Duan Tao
3ff5cd5140 Upgraded unit now gets promotions working. 2018-12-11 23:45:18 +08:00
Duan Tao
d73bf6d13f Fix spelling error. 2018-12-11 19:19:36 +08:00
Duan Tao
2e7a2cda12 Add city range tutorial. 2018-12-11 19:06:36 +08:00
Duan Tao
ed507ad063 Allow embarked units to attack land units, like in civ5. 2018-12-11 11:43:48 +08:00
Yair Morgenstern
63f1f501cd Added Hoplite (Greek unique unit) and Rome's unique ability 2018-12-10 22:31:03 +02:00
Yair Morgenstern
ec80dcc0c0 Minor translation changes 2018-12-10 18:10:19 +02:00
Yair Morgenstern
437c422817 When exiting city, the city's unit is not selected 2018-12-10 16:26:38 +02:00
Yair Morgenstern
7ee76771f5 Added some missing translations 
aab/apk now doesn't einclude local debug files
Maybe solved resume problem on Chrome OS (see issue 322), needs to be checked
 2018-12-10 14:09:01 +02:00
yairm210
2dd32b9a2c
Merge pull request #326 from ninjatao/fix_free_tech 
Fix research queue when getting free tech.
 2018-12-10 12:28:39 +02:00
Duan Tao
dc314fa315 Fix research queue when getting free tech. 2018-12-10 17:50:46 +08:00
Yair Morgenstern
6dbf6232e9 Hidden tiles no longer visible from inside the city screen - kudos flecheapolinienne! 2018-12-10 11:40:34 +02:00
Yair Morgenstern
41df61c92e GAH chinese turned out to be a NIGHTMARE but it looks like it's finally done! 2018-12-10 11:19:35 +02:00
Yair Morgenstern
70d6697f16 Added icon for simplified chinese, missing character for Portuguese, ancient ruins no longer appear on impassible tiles 2018-12-10 11:04:40 +02:00
yairm210
4ea09a71b6
Merge pull request #312 from ninjatao/auto_specialist 
Allow auto assign population to specialists.
 2018-12-10 10:52:57 +02:00
Yair Morgenstern
1ba0929869 Font download now preceded by a "requires fonts, do you want to download?" message that allows you to opt out 2018-12-10 10:41:13 +02:00
Duan Tao
d364f3896c Allow ai city to re-assign specialists. 2018-12-10 11:34:30 +08:00