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

1460 commits

Author SHA1 Message Date
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
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
Yair Morgenstern
d1df5a2fdf Chinese font downloaded per-use basis - makes the android app require Internet permissions, but that was coming anyway 2018-12-09 19:47:21 +02:00
Duan Tao
bb12fc7cdb Code style improvement. 2018-12-09 19:05:33 +08:00
Yair Morgenstern
ff29448e06 Added translations for Ancient Ruins bonus notifications 2018-12-07 12:20:23 +02:00
Yair Morgenstern
4491ae1859 Movable tiles shown again for Civilian units 2018-12-07 12:01:31 +02:00
Yair Morgenstern
0a5ba19c6d Translation update: more things are translated, more are translatable, translation function moved 2018-12-07 11:24:55 +02:00
Duan Tao
ca3172b2cf Give food a little bit more weight. 2018-12-07 15:59:05 +08:00
Yair Morgenstern
01ece11185 Added Camel Archer, Arabian unique unit 2018-12-06 23:08:11 +02:00
Yair Morgenstern
6672b9e7bd Added Minuteman, American unique, and England special ability 2018-12-06 22:02:03 +02:00
Yair Morgenstern
20994cb908 Dev: Save & Load screens put into separate package 2018-12-06 20:19:16 +02:00
Duan Tao
173a773271 Allow auto assign population to specialists. 2018-12-07 00:39:15 +08:00
Yair Morgenstern
7cacff0a37 Can no longer see diplomatic staus of civs you haven't met in Diplomacy Overview 2018-12-06 16:12:31 +02:00
Yair Morgenstern
37dc952fe6 MoveHereButton dissapears after unit has moved 2018-12-06 15:55:28 +02:00
Yair Morgenstern
9b07120080 Added Destroyer, late-game naval melee unit 
Caravel upgrades to ironclad
 2018-12-06 15:47:35 +02:00
Yair Morgenstern
5d56b930c1 Added Diplomacy overview! 2018-12-06 13:33:10 +02:00
Yair Morgenstern
44d5017f6f MoveHereButton creation deferred to main thread, in order to LibGDX errors caused by concurrent UI alteration 2018-12-06 12:30:02 +02:00
yairm210
eb4844c48d
Merge pull request #308 from ninjatao/fix_free_building 
Free culture building now generates culture. Add map size option.
 2018-12-06 11:44:06 +02:00
Yair Morgenstern
e53f8d8933 Merge branch 'master' of https://github.com/yairm210/UnCiv 2018-12-06 11:41:49 +02:00
Duan Tao
fbfde0d9fb Add resistance icon. 2018-12-06 14:44:18 +08:00
Duan Tao
fc5fc48f7d Better addCultureBuilding. 2018-12-06 11:17:35 +08:00
Duan Tao
d1a86079a2 Add city resistance. 2018-12-06 01:03:23 +08:00
Duan Tao
b25f8751e6 Free culture building now generates culture. Add map size option. 2018-12-05 23:42:18 +08:00
Yair Morgenstern
ed1753d4ad Added small black spinning circle around selected unit, so it will be more noticable 2018-12-05 15:01:42 +02:00
Yair Morgenstern
67625321b8 Great merchant trade mission gold increases with era (as per original civ) 
Added Great People actions translations
 2018-12-05 13:48:23 +02:00
Yair Morgenstern
d530740d35 Merge branch 'master' of https://github.com/yairm210/UnCiv 2018-12-05 10:31:20 +02:00
Yair Morgenstern
13ff4843c0 Civilopeida entries sorted alphabetically 2018-12-05 10:30:50 +02:00
yairm210
7800a003db
Merge pull request #305 from ninjatao/fix_acquire 
Add icon for aquirable tiles in city screen.
 2018-12-05 10:23:05 +02:00
Yair Morgenstern
93646cd74b Missing French accentuated characters now shown 2018-12-05 10:21:14 +02:00
Duan Tao
f1c27ca0ea Add icon for aquirable tiles in city screen. 2018-12-05 15:13:06 +08:00
Yair Morgenstern
c706fa455a Code inspection and other general fixes - gotta clean up when there are guests ;) 2018-12-04 23:21:57 +02:00
Yair Morgenstern
7410cb8efe BuildingTable and UnitTable texts translated! 2018-12-04 22:41:54 +02:00
Yair Morgenstern
c359616824 General code cleanup - performance improvements on order in ||, StringBuilders replaced with line lists, added missing translations 2018-12-04 21:23:25 +02:00
Yair Morgenstern
d087a3f69a Solved 2 edge cases - one where Unciv.resume() is called with an empty GameInfo, and the other where the MoveHereButton in TileMapHolder can throw an exception if the board changed between 2 actions. 
Both impossible to replicate, both will work if the user tries again, but still better solved than unsolved.
 2018-12-04 20:47:37 +02:00
yairm210
bb78673edc
Merge pull request #302 from ninjatao/fix_acquire 
Fix : can acquire tiles that already belong to the city.
 2018-12-04 20:22:40 +02:00
Duan Tao
26a4a37389 Fix : can acquire tiles that already belong to the city. 2018-12-04 22:26:05 +08:00
Yair Morgenstern
3fe6bbeecc Unhappiness combat penalty capped at 90% - kudos anh pham-vu! 2018-12-04 13:09:38 +02:00
yairm210
eba64d38ee
Merge pull request #299 from ninjatao/fix_conquered_population 
Fix : city might have negative free population after been conquered.
 2018-12-04 12:32:25 +02:00
Duan Tao
6934ed0b0d Unassign population before conquered city given to conquerer. 2018-12-04 18:21:05 +08:00
yairm210
a2a2c2ca00
Merge pull request #300 from ninjatao/allow_tranfer_tile 
Allow city to acuqire nearby tiles from friendly cities.
 2018-12-04 12:14:45 +02:00
Duan Tao
76ecec8511 Remove wraping method for transfering tile. 2018-12-04 18:09:17 +08:00
Yair Morgenstern
bc1b1e7672 Solved a super-rare bug where the game would get stuck if you expanded the city onto a tile with an enemy that couldn't be teleported anywhere else - kudos Groundless Name! 2018-12-04 11:45:16 +02:00
Duan Tao
7c0179b268 Only connected tiles are acquirable. 2018-12-04 14:07:14 +08:00
Duan Tao
473bb17eba Allow city to acuqire nearby tiles from friendly cities. 2018-12-04 12:57:29 +08:00
Duan Tao
b5adf08dbe Fix city might have negative free population after been conquered. 2018-12-04 10:48:38 +08:00
Yair Morgenstern
c12906f63b Removed old StatExplainer code 2018-12-03 17:42:41 +02:00
Duan Tao
6cb965f0ad Can no longer choose Great War Infantry as free gp. 2018-12-03 22:48:37 +08:00
Yair Morgenstern
53bac34b42 Added Gatling Gun unit 
Cannon upgrades to Artillery
 2018-12-03 16:00:29 +02:00
yairm210
23e55495d4
Merge pull request #297 from ninjatao/fix_city_button_color 
City button changes color after been conquered.
 2018-12-03 15:27:34 +02:00
Duan Tao
a769678e63 City button changes color after been conquered. 2018-12-03 19:26:35 +08:00
Yair Morgenstern
b3b2cbe23c Organized trade table 2018-12-03 13:08:34 +02:00
Yair Morgenstern
1e17df4b1e Travis update, using 'android:components' instead of 'install' for base installations 2018-12-03 10:17:06 +02:00
Yair Morgenstern
4f0f163c00 Difficulty affects all AI yields now, which should widen the difficulty range - easy difficulties are now easier, and hard ones are harder 2018-12-03 09:57:27 +02:00
Yair Morgenstern
24b27a791f Added Replacable Parts tech and Great War Infantry 
Musketman now upgrades to Rifleman
Solved more rare concurrency problems
 2018-12-02 23:05:05 +02:00
Yair Morgenstern
28ae533acc Added Landship, the first Armor unit! 
Added promotions for Armor units
 2018-12-02 15:46:45 +02:00
Yair Morgenstern
1301b1181a City stats details in city screen moved from table to right-side scroller 2018-12-02 10:35:05 +02:00
Yair Morgenstern
cd28358289 Fixed bug where you could convince AI to declare war on defeated civs - kudos ninjatao! 2018-12-01 22:40:14 +02:00
Yair Morgenstern
8ec63f2e94 Re-added language picker, hope it won't generate negative reviews again =\ 2018-12-01 22:22:30 +02:00
Yair Morgenstern
ec65268099 AI now uses Great People properly 
Fixed bug where loading a game with a free policy would freeze everything
 2018-12-01 22:16:26 +02:00
Yair Morgenstern
8c3282ddce Ruins no longer give researched techs - kudos philn3v! 
Can no longer see over mountains
 2018-11-30 10:21:44 +02:00
Yair Morgenstern
ce9d68e375 Hopefully the yield in the city screen looks better now 
Added mountains
 2018-11-28 23:05:14 +02:00
Yair Morgenstern
c807ee5098 Solved ANR problems related to moving units long distances across the map 2018-11-28 18:59:18 +02:00
Yair Morgenstern
44be2b6d67 Cities now unassign speciallists when razed/starve and don't go into "negative population" - thanks am-per-sand! 2018-11-28 18:30:33 +02:00
Yair Morgenstern
87c3d18ac7 City specialists now stay through game restarts 2018-11-28 18:25:09 +02:00
Yair Morgenstern
defeb7431b Buildings requiring nearnby resources now say so - thanks zivvel! 
Promotion bonuses no longer override unit-specific ones, but are added - thanks ninjatao!
 2018-11-28 17:54:00 +02:00
Yair Morgenstern
43ec085b89 Fixed "no resources on coast" - thanks ninjatao! 2018-11-28 17:32:49 +02:00
Yair Morgenstern
de4c042dd5 Buildings that provide free buildings (e.g. The Great Library) now deal with civ uniques (e.g. Paper Maker) 2018-11-27 23:50:08 +02:00
Yair Morgenstern
324176d098 Performance: Added transient builtBuildingObjects list in cittyConstructions, so we won't have to get the list every time we want to calculate, well, loads of stuff 2018-11-27 23:31:40 +02:00
Yair Morgenstern
ea68a70823 Solved concurrent modification problems from TechManager.researchedTechnologies and civInfo.exploredTiles 2018-11-27 22:48:41 +02:00
Yair Morgenstern
6096bde9cd Changed Forest icon 
Narrowed hexagon edges
 2018-11-27 21:51:52 +02:00
Yair Morgenstern
2cd7e5dc88 Added "declare war on X" to available trades 
Organized trades by type
 2018-11-27 19:10:27 +02:00
Yair Morgenstern
24ccd630da Can now select as many enemy civs as there are civilizations to assign to them 
Can now start the game with "Huge" maps, because "Large" wasn't big enough for everyone apparently -_-
 2018-11-26 19:50:58 +02:00
Yair Morgenstern
556c10109d Performance improvements in both getCivUnits and canPassThrough of tile 
Fixed no embarkation & policy pick bug
 2018-11-24 22:48:42 +02:00
Yair Morgenstern
6c9297abc2 Performance improvement - added baseTerrain transient in tileInfo 2018-11-24 21:58:39 +02:00
Yair Morgenstern
347d329233 Moved map toggle icons near the minimap 2018-11-24 21:47:09 +02:00
Yair Morgenstern
5577022bd7 Added unit icons to battle table 2018-11-24 21:15:22 +02:00
Yair Morgenstern
254d415968 Organized minimap UI 2018-11-23 14:48:05 +02:00
Yair Morgenstern
5b66f8f0f7 Organized Unit Table UI 2018-11-23 14:36:22 +02:00
Yair Morgenstern
c71f320731 Units now unsleep after moving 2018-11-23 10:06:16 +02:00
Yair Morgenstern
e16ea5c803 Performance: Added Transient list of researched technologies 2018-11-21 20:02:12 +02:00
Yair Morgenstern
d7ddd85c32 Performance: Viewable tiles are now a transient list in civInfo 2018-11-21 19:16:06 +02:00
Yair Morgenstern
bf4d9b609d Dev: when getting tile stats, we only check the gold-per-turn of the viewing civ if its current gold is negative 2018-11-21 18:45:02 +02:00
Yair Morgenstern
71d99dce51 Improved Next Turn performance 
Dev: in tryGarrisonUnit, we now run canReach only when absolutely neccesary
Dev: Center tile of CityInfo cached, we access it a lot and it never really changes
 2018-11-21 18:07:05 +02:00
Yair Morgenstern
edada1182b Changed date notations to BC and AD, as per original Civ 2018-11-21 16:40:27 +02:00
Yair Morgenstern
49603f8852 Fixed bug where resource-requiring buildings could be built without the resource 2018-11-21 16:34:11 +02:00
Yair Morgenstern
2ab4e406aa Fixed bug where auto-assigned population in cities could work tiles outside of 3-tile range 2018-11-21 16:31:14 +02:00
Yair Morgenstern
fad7df055b It's now much easier to enter a city by clicking on the city button 2018-11-21 16:15:46 +02:00
Yair Morgenstern
9590d9890b Solved bug where AI work boats would try to create Fishing Boats on Oil in coast (thanks Pierre Wall!) 2018-11-21 15:33:12 +02:00
Yair Morgenstern
1929118732 Policy picker no longer jumps up if you manually picked the policy when you got enough points 
Buildings that increase XP now display so in construction picker screen
 2018-11-21 15:19:33 +02:00
Yair Morgenstern
17c98f9f46 Fixed Embarkation tutorial 2018-11-21 15:10:15 +02:00
Yair Morgenstern
eaa1287653 Added icons to city buildings 2018-11-19 23:04:45 +02:00
Yair Morgenstern
1b5bd472cb Unit icons no longer look like they're trying to escape their borders 2018-11-19 22:53:07 +02:00
Yair Morgenstern
8a7719e634 Unviewable resources no longer affect improvement yield (e.g. mine on unviewable coal) 
Resource-requiring units no longer get a penalty when civ is breaking even on that resource
 2018-11-19 20:44:26 +02:00
Yair Morgenstern
9d27e22952 Every unit enabled by a tech gets its own line now 2018-11-19 20:07:29 +02:00
Yair Morgenstern
3e02417838 AI units no longer attack from an embarked state (it's just not worth it) 2018-11-17 22:01:47 +02:00
Yair Morgenstern
af88d287c3 Dev: added "type" property to MapUnit to reflect baseUnit.unitType, since that's used EVERYWHERE 2018-11-17 21:57:52 +02:00
Yair Morgenstern
f6f8b53ab1 Water units can no longer fortify 2018-11-17 21:43:58 +02:00
Yair Morgenstern
678db24d78 All unit uniques displayed in tech tree 
Unit bonus/penalty uniques are now translated
 2018-11-17 21:19:43 +02:00
Yair Morgenstern
22e6f39caf Dev: Removed baseDescription from units, all old baseDescriptions moved to Uniques 2018-11-17 21:02:42 +02:00
Yair Morgenstern
2db768f9ed Added tutorials for siege units and embarkation 2018-11-17 20:56:30 +02:00
Yair Morgenstern
69e30ce212 Dev: Techs are now recognized by their unique abilities, not by tech name 2018-11-17 20:33:21 +02:00
Yair Morgenstern
b01ed7541e Translation fixes 2018-11-14 21:08:43 +02:00
Yair Morgenstern
7ce4d2515b Barbarians are now colored in red+black, like in the original civ 2018-11-14 19:41:53 +02:00
Yair Morgenstern
640a3b873e Ballista replaces catapult, not horseman 
When an improvement is under construction, you cannot pick to construct that improvement again
 2018-11-14 19:31:33 +02:00
Yair Morgenstern
c0f2e7ab07 Population, resource and improvement images are faded out when a military unit is selected 2018-11-13 21:37:41 +02:00
Yair Morgenstern
2b2f8affd8 Hiding resources and improvements in the world screen no loger affects the city screens 2018-11-13 21:17:01 +02:00
Yair Morgenstern
42e6ab1c65 Fixed great person point generation 
Added great person points to civ overview
 2018-11-13 21:10:23 +02:00
Yair Morgenstern
0a0b664dfe Specialists work again! =D 2018-11-12 21:54:11 +02:00
Yair Morgenstern
62ef51f38e Added Navigation tech with Seaport building and Frigate unit 
Water maps are out of beta and are now default!
 2018-11-12 13:05:42 +02:00
Yair Morgenstern
d5a5c400bd Units' resource requirements now stated in construction picking screen 2018-11-12 11:45:18 +02:00
Yair Morgenstern
f127c9ac37 Units requiring resources, but the civ doesn't have that resource, get a combat penalty 2018-11-12 11:44:21 +02:00
Yair Morgenstern
5ef5ff572e Added Ironclad unit 2018-11-12 11:21:00 +02:00
Yair Morgenstern
d3a4952fef AI will only pay for extra luxuries if it can trade them away 2018-11-12 09:47:43 +02:00
Yair Morgenstern
e43cd0ae6b AI won't pay in trade for strategic resources it can't use or doesn't need 2018-11-08 22:39:28 +02:00
Yair Morgenstern
d2d07f49a7 Work boats can now construct Oil Wells in coastal tiles 2018-11-08 21:38:17 +02:00
Yair Morgenstern
a7694867d0 Population is assigned/unassigned in cities by clicking on the tile, not just the population symbol 2018-11-06 22:49:40 +02:00
Yair Morgenstern
a062b02bb5 Percentage increases from buildings displayed in tech picking screen 2018-11-06 20:29:48 +02:00
Yair Morgenstern
f73d840a9d Silly roadbuilding crash bugfix 2018-11-06 20:26:31 +02:00
Yair Morgenstern
c8285b9b0a Added new Targeting, Coastal Raider, Bombardment, Boarding Party promotions for naval units, and opened up older promotions for them 2018-11-04 20:07:54 +02:00
Yair Morgenstern
02b0f6e9fe Code organization - separated TechButton and IconCircleGroup to separate files &c 
Tech with special abilities now displayed with a star icon
 2018-11-04 18:42:55 +02:00
Yair Morgenstern
937687a0f4 Steam Power and Astronomy now increase embarked units' movement 2018-11-04 13:07:03 +02:00
Yair Morgenstern
fb2538524a Tile info now dispays which civ each unit belongs to 
Embarked units marked on map with different shaped background
 2018-11-04 13:06:16 +02:00
Yair Morgenstern
788e0d115f Units in overview now scrollable 2018-11-03 19:55:40 +02:00
Yair Morgenstern
c1cc32e95b Tech eras are now translated 2018-11-03 19:52:28 +02:00
Yair Morgenstern
3958ed3cdb Fixed Ecology image 
World screen now also displays icons of tech results
 2018-11-03 19:49:05 +02:00
Yair Morgenstern
8b12b80f34 Fixed images of Burial Tomb and Paper Maker 
Techs now display little icons of their effects
 2018-11-03 19:19:30 +02:00
Yair Morgenstern
5e9b62162c Fixed bug where AI settlers would attempt to settle on water tiles, causing crashes 2018-11-03 18:59:05 +02:00
Yair Morgenstern
eb9ae392d3 Added Monastery and Solar Plant icons, which were missing 2018-11-02 14:53:20 +02:00
Yair Morgenstern
abc3bfcae8 Added Galleass, first ranged water unit! 2018-11-02 12:49:41 +02:00
Yair Morgenstern
ac6adefdbd Hydro plant bugfix 2018-11-01 20:42:57 +02:00
Yair Morgenstern
e750207eb5 Settlers, workers and great people can n longer construct things when embarked 2018-11-01 20:35:00 +02:00
Yair Morgenstern
e8b8277609 When a unit disappears (e.g. a settler that founde a city), it's "move unit here" overlay disappears too 2018-11-01 19:39:32 +02:00
Yair Morgenstern
5a6e5043b3 Trade routes now travel between harbors over water, and are calculated once per civilization instead of per city 2018-11-01 19:27:57 +02:00
Yair Morgenstern
60b86decfb Added tutorials on injured units and workers 2018-10-31 14:00:49 +02:00
Yair Morgenstern
9fe24e2d3d Improved AI roadbuilding - faster and can overcome obstacles 2018-10-30 22:37:30 +02:00
Yair Morgenstern
10bfdfc8bc When picking an improvement for a sleeping worker, it un-sleeps 2018-10-28 19:34:13 +02:00
Yair Morgenstern
4423dadefd Removed hydro plant from loaded games 2018-10-28 16:37:51 +02:00
Yair Morgenstern
f86736db6d Removed Hydro Plant, since it requires rivers to be useful, and we don't yet have rivers. 2018-10-28 16:16:47 +02:00
Yair Morgenstern
52dc1931cc Wonder uniques now displayed in cities (thanks Kumārikā Bālā for pointing out the problem!) 2018-10-28 15:58:46 +02:00
Yair Morgenstern
0f4accb5a4 Added "missing translations" menu in display options, so translators can see which texts have not yet been translated in their language 2018-10-28 15:23:35 +02:00
Yair Morgenstern
324239b3e6 Typo fix: dicipline -> discipline 2018-10-28 15:06:55 +02:00
Yair Morgenstern
45e5f82478 Added Compass tech and Harbor building 2018-10-28 14:33:42 +02:00
Yair Morgenstern
cc0e76ba00 Added info of tile's unit defence bonus to tile info (not everyone is a veteren Civ player...) 2018-10-28 12:37:00 +02:00
Yair Morgenstern
f7021154f3 Available languages now sorted by percentage translated 
Added missing tilda vowels in font for Spanish translation
 2018-10-24 23:08:41 +03:00
Yair Morgenstern
8186db0a17 Fixed bug where embarked automated workers with no workable tiles around, would try to work the water tile they were on (thanks Pommerbot X for sending the game data, this was pretty niche!) 2018-10-24 23:02:23 +03:00
Yair Morgenstern
284cc5c924 Can now see translation percent when picking language 2018-10-24 22:59:57 +03:00
Yair Morgenstern
230031e9f5 Fixed combat for embarked units 2018-10-23 22:08:30 +03:00
Yair Morgenstern
2c5f4e1529 Land units can embark! 2018-10-22 20:05:04 +03:00
Yair Morgenstern
7537f59bda Bugfix: water units can't conquer cities 2018-10-22 20:04:32 +03:00
Yair Morgenstern
9c36ae0c6b Added The Great Lighthouse 2018-10-19 15:11:14 +03:00
Yair Morgenstern
a6b4a62abc Centeralized translations of alerts to translations file, for Spanish 2018-10-18 22:59:33 +03:00
Yair Morgenstern
f9f46391ea Fixed lighthouse & trireme problems 2018-10-18 22:57:45 +03:00
Yair Morgenstern
dea7775be5 Added Optics and Lighthouse 2018-10-16 21:13:29 +03:00
Yair Morgenstern
c1e070018f Added Triremes and water combat! 2018-10-15 22:57:33 +03:00
yairm210
8912984e74
Merge pull request #243 from bryanwweber/fix_medical_lab_stats 
Fix medical lab stats and stasis chamber name
 2018-10-15 12:24:49 +03:00
Yair Morgenstern
ba144be973 Added resources and terrain features back to land-only maps 2018-10-14 21:07:01 +03:00
Bryan W. Weber
345f0db27e
Fix all spellings of Statis->Stasis 2018-10-14 13:55:01 -04:00
Bryan W. Weber
f90f2026ec
Apply the Medical Lab effect to the city food supply 2018-10-14 11:19:20 -04:00
Yair Morgenstern
b4c17f7664 Organized building order and icon credits 2018-10-13 21:53:17 +03:00
Yair Morgenstern
b528ef38e9 Minor improvements 2018-10-12 15:02:12 +03:00
Yair Morgenstern
9ad027b848 Added option to choose map generation type 2018-10-12 14:19:05 +03:00
Yair Morgenstern
a855bc0e7b Organized unit image credits 
Sea civilian units are now universally recognized as civilian units
 2018-10-11 23:05:49 +03:00
Yair Morgenstern
1111a23c14 Added Fish, Pearls and Whale resources, Work Boats unit, Sailing tech and Fishing Boats impovement 2018-10-11 23:03:31 +03:00
Yair Morgenstern
64359a794e Added random land\sea division using Perlin noise 
Can now divide undecided parts of maps into random terrain regions
 2018-10-11 13:00:23 +03:00
Yair Morgenstern
f07521b843 National wonders requiring buildings (e.g. Library) now accept unique replacements (e.g. Paper Maker) 2018-10-09 21:06:15 +03:00
Yair Morgenstern
4277bbc403 Added tech progress bars in tech picking screen 2018-10-06 20:19:51 +03:00
Yair Morgenstern
7e6fa0e895 Fixed gold tile cost bug 2018-10-05 00:00:50 +03:00
Yair Morgenstern
50c2ad4573 Added America civ 2018-10-04 23:33:08 +03:00
Yair Morgenstern
a8bb9f53b7 Added medieval tech icons 2018-10-03 23:03:53 +03:00
Yair Morgenstern
2e6dcce6ca Added completion bar to tech button 2018-10-02 21:05:23 +03:00
Yair Morgenstern
b99d6c67b6 Another minor bugfix 2018-10-02 00:10:11 +03:00
Yair Morgenstern
5beac5cd03 Minor bugfix 2018-10-02 00:00:33 +03:00
Yair Morgenstern
47a61ccb29 Addd basis for tech progress bar 2018-10-01 23:50:37 +03:00
Yair Morgenstern
8c7e8437ec Added tech icons for ancient & classical technologies 2018-09-30 00:24:09 +03:00
Yair Morgenstern
833760ab32 Huge performance boost for time of "next turn" 2018-09-25 22:03:53 +03:00
Yair Morgenstern
d22da73636 Fixed stack overflow exception that happened when an automated worker tried to move to a neighboring tile and coudn't get there. 2018-09-25 09:15:36 +03:00
Yair Morgenstern
e9bb834bac Added icon of selected unit to unit table and movement 2018-09-25 09:09:28 +03:00
Yair Morgenstern
6af4e20d3e Separated tutorials to a separate file 2018-09-24 22:10:18 +03:00
Yair Morgenstern
a2b730a279 Can now add images to tutorials! Added images for Tile Clicked, Unit Selected and Tile Layout tutorials. 2018-09-24 22:04:39 +03:00
Yair Morgenstern
6143b53157 Movement has changed - It is now done via clicking on the tile, and a "move to" button will appear on that tile 2018-09-24 20:51:16 +03:00
Yair Morgenstern
eb26a3f241 Civ city list is now concurrency-proof 2018-09-23 15:42:06 +03:00
Yair Morgenstern
fdd9481535 Fog is now done using crosshatching - maybe it looks better, hard for me to tell. 2018-09-23 15:27:38 +03:00
Yair Morgenstern
895331e3f2 Added Ancient Ruins, aka goodie huts! 2018-09-23 12:10:54 +03:00
Yair Morgenstern
7b2bf48e04 Added City Ruins when a city is razed (no effects, just game flavour) 2018-09-23 11:03:03 +03:00
Yair Morgenstern
5710001715 Added "Buy tile" option to cities 2018-09-23 10:39:56 +03:00
Yair Morgenstern
4b0aca4ef0 Added diplomatic introductions to trade 2018-09-17 19:54:16 +03:00
Yair Morgenstern
a73ba90c38 AI doesn't declare war so quickly anymore 2018-09-17 18:34:51 +03:00
Yair Morgenstern
4bc598dcd4 Added automated exploration for scout units 2018-09-17 08:10:51 +03:00