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
