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

2209 commits

Author SHA1 Message Date
Yair Morgenstern
de1be0f6ee Forgot to test run =/ welp 2020-01-27 00:19:52 +02:00
Yair Morgenstern
cc764426e5 Added Marathon speed per user request 2020-01-27 00:11:28 +02:00
Yair Morgenstern
f1fb8aea18 Added Marathon speed per user request 2020-01-27 00:11:01 +02:00
Yair Morgenstern
daa3c8fcec Resolved #1782 - air units are no longer sent to join non-transporting units exiting the city 
Transportation logic cleanup
 2020-01-27 00:04:45 +02:00
ltrcao
563e1f2527 Added quick access to diplomacy screen with other civilizations by tapping on their city buttons. (#1774) 
Implemented with @Azzurite's suggestions to match the button's behavior with the player's own city buttons:
* First tap slides the city button down so that the underlying tile is visible.
* Second tap on the button presents the diplomacy screen focused on the city's owner civ.
 2020-01-26 21:40:38 +02:00
Yair Morgenstern
7339c43c0d CivilizationInfo.getUnits is now a sequence, for better performance throughout 2020-01-26 21:22:58 +02:00
Federico Luongo
66b5263509 Fix Latitude (#1781) 
* Fix Latitude

* Code de-duplication
 2020-01-26 21:00:39 +02:00
Yair Morgenstern
67bc2231b9 Fixed anti air units intercept range 2020-01-26 20:59:16 +02:00
Teague Lander
30a50a8c6b Add missing Forge and Seaport production bonus uniques (#1773) 
* Add missing Forge and Seaport production bonus uniques
 Parital fix for #1762
 - Forge gets "+15% production of land units"
 - Seaport gets "+15% production of naval units"

* Adds missing translation "+15% production of land units"
 2020-01-26 20:17:26 +02:00
Yair Morgenstern
5a6b5e5db3 Simplified research agreement logic 2020-01-25 21:21:06 +02:00
Federico Luongo
925f3267ad Discrete rendering (#1768) 
* Re-introduced Discrete Rendering as an opt-in feature

* Persistent settings change
 2020-01-25 20:56:48 +02:00
Federico Luongo
59e815c30e Fix turns to construction (#1767) 
Fix #1759: the stored production is used only for the first construction of its kind in the construction queue
 2020-01-25 19:50:43 +02:00
Marerjh
8469956f91 Update Ukrainian.properties (#1761) 
* Update Ukrainian.properties

* Update template.properties

* Update Ukrainian.properties

* Update ConstructionsTable.kt

* Update CityInfoTable.kt

* Update Ukrainian.properties

* Update Ukrainian.properties

Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
 2020-01-25 19:47:38 +02:00
JackRainy
e0a00eb9a5 Implemented aircraft carrier "Flight Deck" and "Armor Plating" promotions (#1754) 
* Implemented aircraft carrier "Flight Deck" and "Armor Plating" promotions

* Template for the translation strings

* New icons are added

Co-authored-by: ltrcao <ltrcao@users.noreply.github.com>
 2020-01-25 19:43:53 +02:00
lyrjie
b21fdc6c37 Fix: being able to acquire another player's tiles in multiplayer (#1766) 2020-01-25 19:40:47 +02:00
Yair Morgenstern
e9a6fd86f9 Added 'mountain within 2 tiles' restriction to Machu Picchu as per #1762 2020-01-23 23:44:25 +02:00
rayray61
5889cfd182 sorry for not informing you enough (#1764) 
I didn't think you would add them from discord they were just example (I forgot letter Ğ ğ )
 2020-01-23 22:15:32 +02:00
Yair Morgenstern
c29ccadc60 Exploring units no longer auto-enter city states 2020-01-23 20:50:53 +02:00
Yair Morgenstern
e419443eb6 Added missing Turkish letters 2020-01-23 20:36:56 +02:00
lishaoxia1985
42e16ec80a Now we and AI can sign research agreement. (#1671) 2020-01-23 20:12:24 +02:00
Yair Morgenstern
ce50828cdb 3.5.5-patch1 2020-01-22 19:09:16 +02:00
Federico Luongo
32e3cb2112 Hotfix Legalism on foundation (#1747) 2020-01-22 19:06:45 +02:00
lyrjie
9e0ed36bba Map editor menu (#1739) 
* Refactor: map size is enum

* Feature: map editor menu

* Cleanup

* Added "Empty" map generation type for the map editor
 2020-01-22 13:10:39 +02:00
JackRainy
617eea92cf Refactoring of isTransported flag for air units (#1742) 
* Refactoring of `isTransported` flag for air units

* Minor refactoring: canAirUnitMoveTo as a separate function

* Redundant check is removed
 2020-01-22 13:09:36 +02:00
Yair Morgenstern
4accfb594f Better specialist allocation table placement 2020-01-21 23:27:56 +02:00
Yair Morgenstern
1633394164 Resolved #1696 
Specialist allocation
- Is now in a separate class
- Is immediately viewable on the City screen
 2020-01-21 23:16:44 +02:00
Yair Morgenstern
7ea6fc2551 Added 4-way tile images (base,feature,improvement,resource) by The Bucketeer 
Fixed some issues with existing tile images
 2020-01-21 21:02:11 +02:00
lyrjie
73fc55eb0c Fix: Oligarchy (#1740) 
* Fix: Oligarchy applying to civilian, water and air units

* Fix: moving unit into/out of city doesn't trigger income refresh
 2020-01-21 19:48:52 +02:00
JackRainy
1441dd49f5 Aircraft carrier is added (#1731) 
* Implemented aircraft carrier by @ltrcao in PR #1723

* New icon for the Carrier unit
 2020-01-20 22:53:59 +02:00
Timo T
b95844d2f4 Refactor: Streamline popups (#1735) 
First, `PopupTable` and all extending classes had the `Table` at the end removed. Second, the popup base classes `Popup(Table)` and `YesNoPopup(Table)` were moved from the worldscreen to the util package.

Third: The popups were inconsistent. In CameraStageBaseScreen, there was a check with 3 parts, one if any tutorial was showing, second if any child is a TradePopup, and third if the boolean field "hasPopupOpen" is true.

However, all of these checks were, in the end, `Popup(Table)`s on the screen. So, this check has simply been changed to check if any child is a `Popup(Table)`. All the other checks and their relating code could simply be removed.
 2020-01-20 19:13:21 +02:00
Federico Luongo
0a5aefcdd9 Fix Legalism Policy (#1724) 
Closes #1712
 2020-01-19 18:43:52 +02:00
Federico Luongo
fd765fc442 Hotfix empty entry in construction queue (#1725) 2020-01-19 18:41:25 +02:00
lyrjie
762af74b61 Barbarians don't move/attack on the turn of their spawning (#1719) 
* Barbarians don't move/attack on the turn of their spawning

* Revert "Barbarians don't move/attack on the turn of their spawning"

This reverts commit b088fb8c

* Better implementation

Co-authored-by: dumichno <57294813+dumichno@users.noreply.github.com>
 2020-01-19 18:40:44 +02:00
lyrjie
7805f90dab Fix: ships being teleported into landlocked cities (#1718) 
* Fix: ships being teleported into landlocked cities

* Proposal: extend the city teleport to all owned tiles

* Utilizing the existing method

Co-authored-by: dumichno <57294813+dumichno@users.noreply.github.com>
 2020-01-18 22:14:29 +02:00
Yair Morgenstern
014220c480 Merge tag '3.5.3-patch1' 2020-01-18 21:58:09 +02:00
lyrjie
8efe21ea57 Fix: barbarians pillaging ancient ruins (#1720) 
Co-authored-by: dumichno <57294813+dumichno@users.noreply.github.com>
 2020-01-18 21:56:22 +02:00
Yair Morgenstern
66637637f4 findFurthestTile no longer crashes when the unit has no tiles it can move to 2020-01-18 21:20:28 +02:00
Yair Morgenstern
02def2ffa9 Resource+Improvement is go! 
Added resource-specific plantations by The Bucketeer
 2020-01-17 15:07:47 +02:00
lyrjie
d3e88906d6 Fix: starting units being able to spawn on Ancient Ruins/Barbarian encampments (#1691) 
* Fix: starting units being able to spawn on Ancient Ruins/Barbarian encampments

* Added doc and commentary
 2020-01-16 12:06:43 +02:00
Yair Morgenstern
c1c6f93f6d Ancient ruins are no longer save-scummable 2020-01-15 22:21:00 +02:00
Yair Morgenstern
b73e7100c0 Resolved #1700 - As per original civ, you no longer start with a scout. 2020-01-15 22:11:05 +02:00
lyrjie
ad1a57dd02 Map reveal after singleplayer defeat (#1681) 
* Added map reveal when the player is defeated in singleplayer

* Added victory (actually defeat) screen when the player is defeated

* Moved the victory screen navigation to an appropriate place

* Moved the map reveal logic to WorldMapHolder

* Tutorials and Diplomacy button are hidden after the defeat
 2020-01-15 19:56:01 +02:00
lyrjie
0a12062c70 Fix: "Pick construction" tutorial never completes (#1693) 2020-01-14 15:28:18 +02:00
lyrjie
81258297d5 Fix: ability to buy the same building multiple times (#1692) 2020-01-14 15:21:12 +02:00
lyrjie
2d0aec5a26 Fix: idle units not being properly selected after settling a city (#1685) 
Closes #1682
 2020-01-13 13:29:38 +02:00
Duan Tao
72df6869a3 Make sure all building be built before producting science. (#1678) 2020-01-13 12:06:19 +02:00
Yair Morgenstern
9a426318ba Proper destruction notification for city states 
Added Fur resource image
 2020-01-13 00:09:09 +02:00
Federico Luongo
5e003cfd64 Fix Map Editor Lag (#1670) 
In painting mode, only the last drawn tiles are updated.
 2020-01-12 23:29:26 +02:00
JackRainy
de7a369131 Fix of the Regex expression to heal after the battle (#1676) 2020-01-12 23:24:00 +02:00
Yair Morgenstern
08218b954e healUnit and tryPillageImprovement in BarbarianAutomation use their counterparts from UnitAutomation, because they're basically exactly the same 2020-01-12 23:21:34 +02:00
JackRainy
8a327fa7be Fix for the "Back button can't end Unciv (#1513)" (#1661) 
* Callback to exit the game by 'Back' button

* Prompt dialog for the game exit

* Additional strings for translations are generated

* Do not show exit prompt dialog twice
 2020-01-12 23:05:49 +02:00
Yair Morgenstern
ca59dc4e1f Removed redundant "else"s for less indentation and 'happy pathing' 2020-01-12 20:52:23 +02:00
Vladimir Tanakov
725edc2a31 Better barbarian automation (#1560) 2020-01-12 20:48:34 +02:00
JackRainy
109b60db2c Disable France culture boost after Steam Power research (#1663) 2020-01-11 22:59:45 +02:00
r3versi
51ecb0e99d Legalism grants Culture Buildings asap (#1658) 
* Legalism grants Culture Buildings asap

* Buildings granted by Legalism cost no maintenance
 2020-01-11 22:52:58 +02:00
r3versi
a1b03849ec Fix city screen (#1657) 
* Last CityScreen fix

* Atlas & Translations
 2020-01-11 22:46:17 +02:00
lyrjie
c37ea14df5 Defeat improvements (#1654) 
* Fix: civilization not being destroyed when disbanding the initial settler

* Fix: destroyed unit providing visibility until the end of the turn
 2020-01-11 22:33:27 +02:00
Vladimir Tanakov
fd5d38fb01 Fix issue when city can not bombard enemy (#1644) 2020-01-11 22:11:20 +02:00
r3versi
2daf27278d WIP Construction Queue (#1648) 
* Construction Queue

* Added constructionQueue in addition to currentConstruction: if currentConstruction is done, next construction from Queue is started; if Queue is empty invoke ConstructionAutomation
* Queue utility methods: add, remove, higher prio, lower prio
* Icons to move constructions in queue
* Top left city stats moved to top right panel
* Added current construction and queue construction to top left
* Extended selected construction (containing description) moved to bottom right, it is now displayed alternatively to selected tile
* Max queue size, cannot change queue in puppet city or in other player turn
* Queue and current construction reset on puppeting city

* Cleanup again

* CityStatsTable is a separate class so we can play around with where it's located with minimal code changes

* Rejection reason wrap & removing nothing on enqueue a construction

* Crude UI proposal

* Tutorial updates for queues

Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
 2020-01-10 11:41:43 +02:00
r3versi
12a98aa4bb City construction queue (#1479) 
* Construction Queue

* Added constructionQueue in addition to currentConstruction: if currentConstruction is done, next construction from Queue is started; if Queue is empty invoke ConstructionAutomation
* Queue utility methods: add, remove, higher prio, lower prio
* Icons to move constructions in queue
* Top left city stats moved to top right panel
* Added current construction and queue construction to top left
* Extended selected construction (containing description) moved to bottom right, it is now displayed alternatively to selected tile

Rework

* Max queue size, cannot change queue in puppet city or in other player turn

* Queue and current construction reset on puppeting city

Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
 2020-01-09 20:58:15 +02:00
Yair Morgenstern
977fcfb97e Code cleanup - when{} instead of if-else chains, toLabel() instead of Label(...) 2020-01-09 20:54:33 +02:00
lyrjie
ba324c9fad Added the "crudely-drawn map" to ancient ruins outcomes (#1645) 
* Added the "crudely-drawn map" to ancient ruins outcomes

Closes #1640

* Extracted the constants for readability

Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
 2020-01-09 20:40:59 +02:00
drwhut
b1b82c6a67 Fixed a bug where the growth bar's height exceeded the group. (#1646) 
This happened on the turn that a city was taken.
 2020-01-09 20:18:37 +02:00
lyrjie
fe837d78ee Fix: player being able to buy tiles outside the 3-tile radius (#1643) 2020-01-09 20:18:03 +02:00
philippeitis
bc83be1441 Fix Altas type (should be Atlas). Fix srawable -> drawable (#1639) 2020-01-09 20:17:33 +02:00
Vladimir Tanakov
9776029376 introduce UnitActionsType (#1633) 2020-01-09 20:17:13 +02:00
r3versi
036d4058f1 Cities referenced by UUID (#1638) 
* Cities referenced by UUID

* UUID defaulted in CityInfo

Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
 2020-01-09 19:41:55 +02:00
r3versi
065e944896 Songhai (#1636) 
* Songhai, Burial Tomb, Gold for capturing city

* Burial Tomb unique: double gold gained when city is captured

* Rebuilt Atlas and Translations

* Italian translation + fix missing translations

* Barbarian Camp Reward

Is now modified by Speed and Difficulty
 2020-01-09 19:23:00 +02:00
Yair Morgenstern
f554d8c2c4 Multiple mods work OK! 2020-01-07 19:50:36 +02:00
drwhut
a13570f109 Added a growth progress bar to CityButton. (#1626) 
* Added temporary growth number to CityButton.

* Added a growth bar to CityButton.

* Made relevant changes based on comments in pull request #1626

* Added the unicode infinity symbol to reflect no growth.

* New growth functions now return null instead of -1.

* Adjusted the population group width to account for large numbers.

* Changed the colour of the growth number.
 2020-01-07 18:55:38 +02:00
Yair Morgenstern
365dced442 Non-continuous rendering isn't quite ready yet 2020-01-06 09:47:18 +02:00
Yair Morgenstern
285c92150c Incan mod is successful! We can haz mods! =D 2020-01-05 22:55:48 +02:00
Yair Morgenstern
7462aae94c Big changes to mods and rulesets - almost production ready! 
Rulesets are heavy to load so we now have a RulesetCache, which can construct "custom" rulesets with a list of mods!
We now pack mod images on Desktop run, and load the atlases for the loaded mods on load game!
 2020-01-05 22:11:10 +02:00
Yair Morgenstern
6a9de727ad misc. so they don't get in the way of the main work 2020-01-05 21:45:09 +02:00
Yair Morgenstern
47e998269a Allocation and runtime optimization with sequences 2020-01-04 23:02:57 +02:00
Yair Morgenstern
8f231cd6e1 Can now only start game in NewGamScreen with 2 or more players 2020-01-04 22:09:49 +02:00
Yair Morgenstern
7eb4b0db2d 3.4.8 2020-01-04 21:26:33 +02:00
Yair Morgenstern
c6b96f4f5b Resolved #1608 - added û character 2020-01-04 21:17:15 +02:00
r3versi
e61c4f5f1c Discrete rendering (#1612) 
* Named threads for debugging/profiling

* Proposal: Discrete rendering, remove black spinning circle
 2020-01-04 21:13:41 +02:00
r3versi
23cfab6001 Stop Exploration sets unit.action to null (#1613) 
* Stop Exploration sets unit.action to null

* UnitActions callback Fix #1614
 2020-01-04 21:08:23 +02:00
lyrjie
2af847b3a6 Fix: "Sell the building" button being randomly disabled (#1611) 
* Fix: "Sell the building" button being randomly disabled based on the sell price

* Fix: `sellBuildingButton` being enabled in puppet cities

Co-authored-by: dumichno <57294813+dumichno@users.noreply.github.com>
 2020-01-04 21:01:06 +02:00
r3versi
40c6934ae4 Clear current map removes natural wonders (#1607) 2020-01-04 21:00:18 +02:00
Yair Morgenstern
19c21b64f7 All GetTilesInDistance and GetTilesAtDistance are now without new vector allocation, so much faster and with much less memory! 2020-01-04 20:47:09 +02:00
Yair Morgenstern
9907e4429c Removed game settings from crash report, not very helpful 2020-01-03 15:20:38 +02:00
r3versi
f7b5a506fd HexMath is a singleton (#1603) 2020-01-03 10:33:01 +02:00
r3versi
a1b0c1dcd4 TileMapHolder refactor & Map Editor update (#1584) 
* TileMapHolder renamed to MapHolder
* EditorMapHolder and WorldMapHolder inherits from ZoomableScrollPane
* MapEditor Brush Size (from 1 to 5)
* MapEditor painting mode (dragging the pointer on screen paints continuously)
 2020-01-02 20:02:38 +02:00
Yair Morgenstern
73816dd470 Resolved #1598 - we now save map options for new games started 2020-01-02 19:37:40 +02:00
Yair Morgenstern
52165e692f Specific automation for Missile units means they won't try to move to tiles that they can't move to 2020-01-02 19:36:19 +02:00
Vladimir Tanakov
03aee45fe3 Refactor sounds and unitactions data class (#1596) 2020-01-02 19:01:51 +02:00
Yair Morgenstern
4c51e70283 Managed to load first mini mod, needs some work before this can work for users 
(what happens if we started a game with mod A and then we want to start a game with only mod B?)
 2019-12-31 17:49:07 +02:00
Yair Morgenstern
61050feca1 3.4.6 2019-12-30 18:36:05 +02:00
lyrjie
cedb6ff5e3 Added the notification for the third-party civilizations (#1558) 
* Added the notification for the third-party civilizations

If a civilizations knows about some two civilizations, it will be notified when:
* They declare the war
* They make a peace
* They sign the declaration of peace
* One denounce the other

Additionally, when civ enters a new era, all civs that know about it get a notification

* Fixed the translation `.properties`

* Cleanup

* Fix: 2 notifications for each peace treaty

Russia and America...
America and Russia...

* Typo

* Code style changes

* Resolved conflicts

* Simple getCommonKnownCivs() tests
 2019-12-30 18:12:14 +02:00
Yair Morgenstern
2132c49d55 jsonParser no longer serialized in CivilizationInfo 2019-12-30 18:07:00 +02:00
Vladimir Tanakov
1cc8227025 Fix civilopedia parsing, fix dialog does not call update to enable next turn button (#1553) 2019-12-30 18:04:12 +02:00
Yair Morgenstern
d3311b3f24 Map editor works again 2019-12-30 18:00:11 +02:00
Yair Morgenstern
d750e369a0 Resolved #1569 - "Patreon" button actually opens Patreon now 2019-12-29 18:03:59 +02:00
Yair Morgenstern
006b2d7690 External merge resolve of #1566 
Merge branch 'spain' of https://github.com/r3versi/Unciv into r3versi-spain
 2019-12-29 17:56:05 +02:00
Yair Morgenstern
4dd3a69a72 Can now display pixel resources on the map! 2019-12-29 17:51:39 +02:00
Yair Morgenstern
1143356747 Letting players see other players' policies was not a good idea, having it be unknown is part of the challenge methinks 2019-12-29 15:08:31 +02:00
r3versi
aa034d73c2 Fix natural wonders (#1550) 
* Natural Wonders Uniques

* Fix Natural Wonders in Map Editor

* Translation files

* Terrain uniques test

* GBR spawn update Fix #1552
 2019-12-28 23:11:37 +02:00
Yair Morgenstern
a55e01f004 AI no longer attempts to get rid of barbarian encampments with nuclear strikes. 2019-12-28 23:10:49 +02:00
Yair Morgenstern
e02038d4bf Fixed crashing bug from trying to move the the enemy unit instead of to the place to attack from 2019-12-28 21:15:57 +02:00
r3versi
461f285059 Moving a city to a cityless Civ flags it as capital (#1556) 2019-12-28 19:10:26 +02:00
Yair Morgenstern
9d9700b119 Welp added some lines I shouldn't have 2019-12-27 00:20:02 +02:00
Yair Morgenstern
80be3c276e Small steps towards mods 2019-12-27 00:15:42 +02:00
Yair Morgenstern
87830bf8b2 Code cleanup - ruleset maps are now lowercased 2019-12-26 22:00:49 +02:00
Yair Morgenstern
6c10d1d4f8 Code cleaning - no more direct access to the cached center tile in CityInfo 2019-12-26 18:08:11 +02:00
Yair Morgenstern
8a229c502c Can no longer purchase constructions from cities in resistance 2019-12-26 18:04:02 +02:00
lyrjie
539758b905 Translation placeholder testing (#1542) 
* Added translation string placeholders test

* Fixed the placeholder typos in all translations

* [30] to 30 migration
 2019-12-26 14:39:15 +02:00
Yair Morgenstern
94f1b074c9 Indonesian is in and has a flag 2019-12-26 12:15:26 +02:00
Yair Morgenstern
fd8528af7a All tests are properly Koltinized! 2019-12-26 12:01:23 +02:00
Vladimir Tanakov
7f06ae0cce Refactor Tutorials and fix some issues, write tests (#1524) 2019-12-26 11:40:48 +02:00
lyrjie
935f598282 Fix: automated units would advance towards enemies they can't attack without dying (#1529) 
* Fix: units would advance towards enemies they can't attack without dying

* Code quality
 2019-12-26 11:29:40 +02:00
Yair Morgenstern
a95c9ee4cd Ancient Ruins are now spread out instead of randomized 2019-12-25 23:52:09 +02:00
Yair Morgenstern
94414203ef Resolved #1533 - Defeated city states no longer "declare war" if you attack their ally 2019-12-25 23:42:32 +02:00
r3versi
00f26b1510 Fix #1531 + Indonesian.properties added (#1532) 
* Fix #1531

* Requested on Discord

* Update Indonesian.properties

Co-authored-by: hyunamae <59202601+hyunamae@users.noreply.github.com>
 2019-12-25 23:37:49 +02:00
lyrjie
be09051295 Fix: cities can be connected to capital via coast even if they don't have Harbor building (#1528) 
Reported by discord@tap wature
 2019-12-25 10:59:53 +02:00
lyrjie
2c07bae6f2 Fix: barbarians won't enter tiles owned by other civs (#1523) 
* Fix: barbarians won't enter tiles owned by other civs

* Barbarians ability to enter player tiles is now affected by difficulty setting
 2019-12-24 23:43:26 +02:00
Yair Morgenstern
97f3260047 Grand Mesa artwork by The Bucketeer means it's now in the game! 2019-12-24 15:28:59 +02:00
lyrjie
982c326ccd Polynesia ocean fix (#1522) 
yarim210/Unciv#1514
 2019-12-24 12:49:25 +02:00
r3versi
b6dbc3a833 Fix nat wonder #2 (#1519) 
* Fix Natural Wonders tile worked happiness not computed & double bonus from discovering extended (like GBR) Natural Wonder in same turn

* Bugfix Barbarians spawning on Natural Wonder + Notification on Barbarian Spawn

* Added notification text to ranslations
 2019-12-23 23:55:19 +02:00
r3versi
303e0493d8 Fix Natural Wonders tile worked happiness not computed & double bonus from discovering extended (like GBR) Natural Wonder in same turn (#1518) 2019-12-23 22:14:02 +02:00
Vladimir Tanakov
25a3467cb3 Add crash reporting controller and email sending on android (#1509) 2019-12-23 22:12:35 +02:00
Yair Morgenstern
dedb46c55c 3.4.3 2019-12-23 19:15:57 +02:00
r3versi
a1aec212bd City states influence, Bugfix Greece (#1512) 
* Fix Greece Unique wasn't effective + Added CityState relation notifications

* Greece influence to CityState benefits from unique
* Added notifications when you are about to lose (or lost) friendship and alliance with a city state. Closes #1168
* Introduced restingPoint in DiplomacyManager to support constant shifts in influence

* Autogeneration translation files
 2019-12-22 23:08:46 +02:00
Yair Morgenstern
dff886939d Many many people have said that winning cultural victory is too easy, so it's now upped from 4 to 5 policy branches 2019-12-22 22:14:04 +02:00
Yair Morgenstern
707b59cc6a Hopefully solved ANRs when first entering a large multiplayer game 2019-12-22 22:13:05 +02:00
Yair Morgenstern
3ef34f99ff Added missing translations 2019-12-22 20:00:28 +02:00
Yair Morgenstern
9838e0f3a9 Solved rare bug when razing the capital city 2019-12-22 19:58:38 +02:00
Yair Morgenstern
82d8670b16 Fixed super wierd bug where the conquering player hadn't met the civ he was conquering the city from (whaaaaat) 2019-12-22 19:00:58 +02:00
Yair Morgenstern
ca86d9d360 Hopefully fixed crash on specific devices when activating "Conduct trade mission" 2019-12-22 18:54:07 +02:00
Yair Morgenstern
fb244943fb Fixed crash when liberating cities when you haven't met their original owners 2019-12-22 18:50:40 +02:00
Yair Morgenstern
314b620405 Fixed relatively rare crash where the settings were being read but ended up null, not sure how that happened to start with... 2019-12-22 18:35:41 +02:00
r3versi
c2dc0217b6 Rejuvenation icon + Unique promotions are listed in PromotionPickerScreen (#1506) 2019-12-22 15:29:40 +02:00
Yair Morgenstern
ffd5368df4 Added Promotion information to Civilopedia 2019-12-21 21:05:54 +02:00
Yair Morgenstern
1d2bf490b5 People said in the comments they couldn't find the "Create improvement" button, so here. 2019-12-21 20:35:04 +02:00
Yair Morgenstern
884eb672e7 Merge branch 'master' of https://github.com/yairm210/Unciv 2019-12-21 20:07:43 +02:00
Yair Morgenstern
09c8cf221f Resolved #1493 - Added Nation information to Civilopedia 2019-12-21 20:06:58 +02:00
Vladimir Tanakov
0b8145cba5 Fix error due changing language on Android < 4.4 (#1502) 2019-12-21 19:56:23 +02:00
r3versi
383b39c62d Diplomacy graph size scales with screen space available (#1495) 
* Diplomacy graph size scales with screen space available

* Deleted debug option left on
 2019-12-21 19:50:01 +02:00
r3versi
2afda16095 Added missing translations of Natural Wonders and Civilopedia Tutorials entries (#1498) 
* Added missing translations natural wonders related

* Auto generation of translation files

* Missing Tutorial names translation

* Auto generation translation files

Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
 2019-12-21 19:44:11 +02:00
r3versi
6598c76041 Fixes #891 (#1491) 
* After a zoom gesture the World Screen needs to be updated
 2019-12-21 19:35:27 +02:00
Yair Morgenstern
32621b6611 Game crash popup is no longer a tutorial, so it doesn't get affected by the "displayTutorials" settings and has migrated to the .properties files for translation. 2019-12-21 18:58:14 +02:00
Yair Morgenstern
3f0e33df89 Added try/catch on reading the translation file (some phones don't support UTF-8???) 
You can always pass the language screen even if we don't read the percentage files
We read the percentage files from the INTERNAL NOT THE LOCAL OBVIOUSLY
 2019-12-20 11:27:26 +02:00
Yair Morgenstern
7d1eaf4338 We no longer need the ugly "Missing translations" dropdown in the Options, now that all missing translations are super easy to find in the translation files themselves =) 2019-12-20 00:08:23 +02:00
Yair Morgenstern
3f1edbf308 We now generate a small "percentage complete of each language" file, so that getting that information doesn't take an entire second on Android (that's a lot at startup!) - down to a couple of ms! 2019-12-19 18:29:18 +02:00
Yair Morgenstern
a41874e1a5 We now load translation percentages on initialization so we won't need to mid-game, fixed "create" and the "resume" both trying to do the same things 2019-12-19 17:48:17 +02:00
Yair Morgenstern
ebfd79636f Natural wonders (and other terrains with no RGB) now have a golden color on the minimap 2019-12-19 17:45:20 +02:00
Yair Morgenstern
3627d4e6e2 Now load only necessary translations 
Since loading all the translation files was taking around 2.5 seconds on my phone, and I assume much longer on older phones, we now only load the translations of the currently selected file, and if we need to find the translation percentage of all the files we deal with that separately. Down to around 200-300 ms on my phone =)
Also Translations is no longer part of the Ruleset, instead meing located in UncivGame
 2019-12-18 23:32:31 +02:00
Yair Morgenstern
77d00f35bb Translation files now take a huge amount of time to load, moved their loading into a thread and put up a "loading screen" beforehand 2019-12-18 22:24:18 +02:00
Yair Morgenstern
fd7160b785 Added line spacings in the translation files, for organization 2019-12-17 22:57:39 +02:00
Kevin Fisher
52111430ef Add close icon for the UnitTable (#1472) 2019-12-17 21:44:20 +02:00
Yair Morgenstern
b0a0638e84 Hopefully solved ANR when loading the game initially 2019-12-17 20:46:30 +02:00
Yair Morgenstern
e82cdd42fa Solved Application Not Responding when downloading map 2019-12-17 20:39:46 +02:00
Yair Morgenstern
fc4eb01be8 Added tests to ensure we don't miss translations in the future 2019-12-17 19:16:31 +02:00
Yair Morgenstern
113531a695 Spanish Civ is not production-ready, and natural wonders should be opt-in at the beginning 2019-12-17 16:56:07 +02:00
Yair Morgenstern
4f03322565 Tutorial task table now becomes visible when turning displayTutorials on - kudos @r3versi 2019-12-17 14:39:32 +02:00
Yair Morgenstern
0de84e60a9 Not all Natural Wonders look good enough to enter the game as-of-now. 2019-12-17 14:23:17 +02:00
r3versi
aa02a2d321 Natural Wonders (#1456) 
* NaturalWonders initial commit
* Created models/ruleset/tile/NaturalWonder and assets/json/NaturalWonders
* MapGenerator now spawns NaturalWonders in random compatible random locations
* MapParameters has a noNaturalWonders option
* TileInfo has naturalWonder property (set to null if none)
* TileInfo and  UnitMovementAlgorithms correctly manages stats and consider the tile unpassable and unimprovable

* Notification and happiness on NaturalWonder discovery

* El Dorado discovery bonus, Spain unique

* Doubled tile yields for Spain

* NaturalWonders implemented as TerrainType + Fountain of Youth promotion

* Images issue #124

* NaturalWonder TileImages (Fantasy) and Overlay (Default)

* NaturalWonderOverlay.png : https://www.flaticon.com/free-icon/mount-fuji_2166259

* Bugfix

* Added translations

* Italian translations

* Fix translation issue
* missing space after = in template.properties breaks translations

* Improved NaturalWonder spawn logic

* Great Barrier Reef spawns on 2 contiguous tiles
* Each wonder has specific spawn requirements
* Number of wonders spawned scales with map radius

* Fix unused import
 2019-12-16 20:37:49 +02:00
Yair Morgenstern
0366233be5 Translations will always be read with UTF-8 encoding 2019-12-16 19:47:35 +02:00
Yair Morgenstern
7abd0143c6 Excess settler food to production conversion moved to CityStats, solving the "0 production for settler" bug and also it's now displayed in the stats breakdown =) 2019-12-16 19:41:17 +02:00
Yair Morgenstern
a0dd770a3a 'Show tutorials' setting now controls tutorial tasks as well 2019-12-15 23:12:34 +02:00
Yair Morgenstern
8ae0d9d191 Maybe fixed the 'no languages except Chinese' bug in Android phones, but since I can't check this, I'll stick with both of them. Better safe... 2019-12-15 22:50:51 +02:00
Yair Morgenstern
94a960abc2 All languages should work for everyone 2019-12-15 22:00:12 +02:00
Yair Morgenstern
873f578d9f Added explanations for Great Scientist and overflow things in techManager 2019-12-15 21:32:32 +02:00
Yair Morgenstern
4b99656719 Changed Great Scientist unique and action strings in all languages, and removed BasicHelp - all the important info should be in the tutorials anyway. 2019-12-15 21:21:17 +02:00
lishaoxia1985
418a4968a4 great scienstist does the job like original game (#1453) 2019-12-15 20:41:39 +02:00
lishaoxia1985
e937ea0af1 all codes are writen in Kotlin (#1452) 2019-12-15 20:28:34 +02:00
Yair Morgenstern
ddf2794902 Fixed quote typo 2019-12-14 23:37:29 +02:00
Yair Morgenstern
66af60b107 templates.properties -> template.properties 2019-12-14 23:31:11 +02:00
Yair Morgenstern
7ba5429387 Templates file is now empty for simple creation of new language files! 2019-12-14 23:26:00 +02:00
Yair Morgenstern
04ad012cd9 IT IS DONE 
Translations are now split by language, and new translations can be added to all languages by changing the templates.properties file!
 2019-12-14 23:18:46 +02:00
Yair Morgenstern
b544615643 In multiplayer, Overview screen now opens as the viewing player, not current player 2019-12-14 21:04:29 +02:00
Yair Morgenstern
7eda5e9d31 Fixed Application Not Responding when uploading map 2019-12-13 14:40:45 +02:00
Yair Morgenstern
307bccb7d0 Added tutorial task for viewing stats breakdown 
Added an animation to "Pick language" on the language picker screen, because someone actually got stuck on that 0_0
 2019-12-13 14:31:42 +02:00
Yair Morgenstern
906bf19426 Better category spacing for Civilopedia 2019-12-13 14:07:46 +02:00
Yair Morgenstern
a13d6bc82e Package move & civilopedia scroll fix 2019-12-13 13:58:05 +02:00
Yair Morgenstern
76c09ad59c Resolved #1440 - Barbarians now function again! 2019-12-12 23:57:26 +02:00
Yair Morgenstern
aa73fa130e More tutorial tasks 2019-12-12 23:57:02 +02:00
Yair Morgenstern
58d58ef3a3 Cleaned up tutorials 2019-12-12 20:58:02 +02:00
Yair Morgenstern
acf91b4e12 Solved Application Not Responding errors when saving large games 2019-12-12 20:27:46 +02:00
Yair Morgenstern
5812f2026f Added Missions, to replace wall-of-text tutorials in bite-sized pieces! Very pleased with this =D 2019-12-11 22:48:18 +02:00
Yair Morgenstern
973c8fb7f8 Auto detecting resolution was a terrible idea and I regret it entirely 2019-12-11 19:43:08 +02:00
Yair Morgenstern
a91d48c912 Load Map screen now includes Download, and can handle large map names 2019-12-09 23:21:09 +02:00
Yair Morgenstern
54bbd5d8a2 New game screen clearly split into "Map options" and "Game options" 2019-12-09 22:48:54 +02:00
Yair Morgenstern
9493ce1a2e Extracted name, type, radius and noRuins of map from GameParameters to MapParameters, so that Maps can be created and defined outside of games 2019-12-09 20:46:10 +02:00
Yair Morgenstern
a90059988b Resolved #1434 Resolved #1363 - Workers no longer build tiles on other civ's territory 2019-12-09 18:53:04 +02:00
Yair Morgenstern
caf98b8470 Silly multithreading movement problems should no longer crash the game for the user - they're rare, but when you have 50,000 users they pop up every day. 2019-12-09 18:48:48 +02:00
Yair Morgenstern
32ac709a02 Resolved #1433 - city-states immediately destroy cities upon conquering 2019-12-09 18:42:18 +02:00
Yair Morgenstern
b6bb961d7c Resolved #1422 - resources are now spread over different terrains as much as possible 2019-12-08 21:19:45 +02:00
Yair Morgenstern
026afb2c88 Android icons up-to-date 2019-12-08 18:53:41 +02:00
Yair Morgenstern
9725c0f66c Facism -> Fascism policy name change in existing save files 2019-12-08 18:44:04 +02:00
Sam Rogers
cdcd7cf116 correct spelling of "Fascism" policy (#1432) 2019-12-08 18:40:48 +02:00
Yair Morgenstern
df27cb3bdd The base resolution is auto but it can be manually set. That oughtta keep everyone happy. 2019-12-08 18:22:25 +02:00
Yair Morgenstern
66e940dd2b Revert "We now auto-detect resolution from the screen! Been a long time coming!" 
This reverts commit 7d458207b5.
 2019-12-08 17:36:02 +02:00
Yair Morgenstern
7d458207b5 We now auto-detect resolution from the screen! Been a long time coming! 2019-12-08 15:28:53 +02:00
Yair Morgenstern
34bd8155ae New icon! 2019-12-08 15:00:27 +02:00
Yair Morgenstern
297e604bbf Long translated leader names now display nicely in civ picker popup 2019-12-08 12:59:38 +02:00
Yair Morgenstern
5694877fbd Every civ damaged by a nuclear blast declares war on the attacker 2019-12-08 12:01:58 +02:00
Yair Morgenstern
02501793b3 Using nuclear weapons has large diplomatic reprecussions 2019-12-08 11:50:30 +02:00
Yair Morgenstern
736edb5069 Back to the way it was - we only need the shader if we're using GL 3.0 apparently 
Let's stick to 2.0 for now
 2019-12-08 11:22:46 +02:00
Yair Morgenstern
81e520e608 GL 3.0 should now work for mac - kudos @lishaoxia1985 2019-12-08 10:04:16 +02:00
Yair Morgenstern
9f3a943865 Resolved #1426 - starting a new game from a file-map game shows new correct options on the new game screen 2019-12-07 20:31:04 +02:00
Yair Morgenstern
440941cdea Battle simulation will no longer be dislayed for fogged-out tiles with units 2019-12-07 20:21:44 +02:00
Yair Morgenstern
69cdd0c187 Can no longer construct Apollo Program, and therefore spaceship parts, if Scientific Victory is disabled 2019-12-07 19:56:10 +02:00
Yair Morgenstern
38b9b13a0a Ruleset should have a lower-case s, because it's not, you know, a Set 
Also, Rulesets can now read rules from any json folder
 2019-12-06 13:59:12 +02:00
Yair Morgenstern
c32e3fce3c More normalization - can no longer add "everywhere" improvements on Water tiles. 2019-12-06 11:17:33 +02:00
Yair Morgenstern
6ab58fd8ab More map editor normalization, because people will doo whatever they can to break the system 2019-12-06 10:23:30 +02:00
Yair Morgenstern
3ea4f8bc82 Resolved #1420 - Menu in the map editor no longer opens multiple times on subsequent clicks 2019-12-06 10:12:16 +02:00
Yair Morgenstern
110e7b7052 Desktop no longer crashes/bugs on first initialization 2019-12-05 20:59:44 +02:00
Yair Morgenstern
b9487c1800 More ruleSet-shouldnt-come-from-static fixes 2019-12-05 20:39:57 +02:00
Yair Morgenstern
51a0d7727a Renamed gameInfo.gameBasics to ruleSet 2019-12-05 20:22:34 +02:00
Yair Morgenstern
9b6ec809b3 Map editor now works with new ruleset 2019-12-05 00:15:05 +02:00
Yair Morgenstern
b7ffdb7cc3 Renamed GameBasics to RuleSet, because that's basically what it is 2019-12-05 00:01:00 +02:00
Yair Morgenstern
47e214258a FINALLY managed to un-staticify GameBasics, this means the game can potentially recognize different rulesets! 2019-12-04 23:57:54 +02:00
Yair Morgenstern
b64c209218 Resolved #1361 - clicking on a unit's promotions now brings you to the promotion screen 2019-12-04 19:47:18 +02:00
Yair Morgenstern
ef272b3208 Fixed "Positive" diplomatic modifier for warmongering 2019-12-03 21:28:50 +02:00
Yair Morgenstern
87a746f79b Non-coastal cities no longer have water units missing resources in the construction list 2019-12-03 21:19:28 +02:00
Yair Morgenstern
cf4d40501e Fixed "Arial units trying to move to their own tile" crashing bug 2019-12-03 20:45:35 +02:00
Yair Morgenstern
9868749d56 Solved crashing "AI Unit upgrade" bug! 2019-12-03 19:48:16 +02:00
Yair Morgenstern
e3ac6f4e53 Resolved #1404 - AI should no longer be able to win cultural victory after being defeated 2019-12-02 22:08:57 +02:00
Yair Morgenstern
f79858e39e Tutorials will now always be read with the correct encoding 2019-12-02 22:02:21 +02:00
Yair Morgenstern
7a9fd14b13 Resolved #1405 - upgrading Spearman to Landsknecht no longer gives you gold 2019-12-02 22:01:16 +02:00
Yair Morgenstern
fa0d650362 City buttons stay the correct size upon "Next turn" 2019-12-01 21:47:40 +02:00
Yair Morgenstern
6124fd5271 Removed long click action. It was more trouble than it was worth. 2019-12-01 21:21:50 +02:00
Yair Morgenstern
dae477a870 Resolved #1374 - air units should no longer move and attack in the same turn 2019-12-01 21:20:53 +02:00
Yair Morgenstern
c992995b6f Can now pick Random civ in player picker 2019-11-30 23:11:46 +02:00
u-ndefine
6d1cfd2a9c Minor typo fix at VictoryScreen.kt (#1399) 2019-11-30 21:57:42 +02:00
Yair Morgenstern
757439f2d1 3.3.3 2019-11-30 21:56:00 +02:00
Yair Morgenstern
68ee549edb Map editor normalizes tiles, so you can't add improvements of features where they shouldn't belong 
Placing a civ starting location removes older starting locations
 2019-11-29 12:01:32 +02:00
Yair Morgenstern
5807957d32 Resolved #1369 - nuking capitals no longer crashes the game 2019-11-28 22:21:39 +02:00
Yair Morgenstern
c1d3ac2604 Added timers to see what's taking so long. It's the fonts - 11 seconds to load Chinese characters. 
Specifically, putGlyph. Which makes sense, since it's basically rendering 3000 images into the memory for Chinese.
 2019-11-28 22:10:26 +02:00
Yair Morgenstern
3816014ae4 Added Great Person city location to notification 2019-11-28 21:10:36 +02:00
Yair Morgenstern
55b2da6d75 Normalized resource reveal notification 2019-11-28 21:05:36 +02:00
Yair Morgenstern
3d3b2cd3fc When choosing a tech to work towards, the order will no longer "jump" over techs 2019-11-28 20:42:25 +02:00
Yair Morgenstern
df964a5ec6 TechPickerScreen organization 2019-11-28 20:28:04 +02:00
Yair Morgenstern
008485b38c Exploring units are not considered Idle 2019-11-28 20:26:44 +02:00
Yair Morgenstern
d0975ebc38 I don't think you should be able to see other tech's tech trees from the victory screen. 2019-11-28 19:57:55 +02:00
Yair Morgenstern
ad19dd1afa Resolved #1388 - Starting era no longer automatically displayed as "Ancient" in New Game screen 2019-11-28 19:42:08 +02:00
Yair Morgenstern
8826c4e84f Resolved #1372 - AI should now build spaceship parts and be able to win a scientific victory =) 2019-11-27 21:15:16 +02:00
Yair Morgenstern
7998ed2f0c Resolved #1365 - Disabled trading cities in One City Challenge 2019-11-26 20:55:07 +02:00
Yair Morgenstern
2da7c5be8f Tutorials are now popup tables - limits the width of tutorials so they don't go off-screen 2019-11-25 14:28:32 +02:00
Yair Morgenstern
ad4bc86d52 Merge branch 'master' of https://github.com/yairm210/Unciv 2019-11-25 12:09:33 +02:00
Yair Morgenstern
aee9724765 Your voice has been heard - All units now have the Explore command 2019-11-25 12:08:22 +02:00
lishaoxia1985
7453ee637f 1. overflow science when finishing and starting research. 2. in the cityscreen unit should be not visible. 3. modifier the policy "Commerce Complete" according to original game. 4. the action of "Great Merchant" now is the same as original game. 5. translation update. (#1355) 
* update

* update

* update

* update

* update

* update
 2019-11-25 12:03:20 +02:00
Yair Morgenstern
488b733db6 Resolved #1368 - missiles can no longer be promoted 2019-11-25 11:58:02 +02:00
Yair Morgenstern
2a139ff732 Resolved #1364 - Policy picker screen won't appear from the world screen if there are no possible policies to pick 2019-11-24 00:02:28 +02:00
Yair Morgenstern
a8c98f60d7 Railroads are now much more visible! 2019-11-23 22:43:35 +02:00
Yair Morgenstern
c447bd2da8 Resolved #1359 - City name from overview screen now leads directly to the city scren 2019-11-23 22:30:25 +02:00
Yair Morgenstern
095deee125 UncivGame rename 2019-11-23 22:28:23 +02:00
Yair Morgenstern
18be826c1a Changed "help translating" initial message to point to Github 2019-11-23 21:52:43 +02:00
Yair Morgenstern
1230b00688 Fixed crash in tile editor as a result of adding Fallout, which has no "occursOn" terrains 2019-11-23 21:35:03 +02:00
Yair Morgenstern
62fd7d8588 Desktop Unciv now sends status to Discord! 
Basically stole the Discord RPC implementation outta Mindustry
 2019-11-21 16:24:27 +02:00
Yair Morgenstern
0ec0ee3d44 All the various clicks on the world screen can now work together as friends 2019-11-21 10:53:08 +02:00
Yair Morgenstern
cbb5db2fb8 Resolved #1231 - can now aquire tiles from eighboring cities again, kudos @klondi 2019-11-20 23:33:09 +02:00
Yair Morgenstern
e4fe43f281 Resolved #1344 - currently showing tutorials should not activate again 2019-11-19 23:19:07 +02:00
Yair Morgenstern
3ea6c63e0b Fixed annoying bug which would treat long pans and flings as long clicks 2019-11-19 23:09:36 +02:00
Yair Morgenstern
526a99fb0d Set ShowPixelImprovements to True for new players - I think the world is ready 2019-11-19 22:08:24 +02:00
Yair Morgenstern
b1868accc5 Nuclear Weapon setting moved to Options, s it can be more easily explored by players 2019-11-19 22:00:16 +02:00
lishaoxia1985
dd28711ee7 update translation (#1352) 
* update

* update

* update

* update

* update

* update

* update

* update

* update

* update
 2019-11-19 21:58:56 +02:00
Yair Morgenstern
ff3795c96f TechButton now displays units and buildings corresponding to the description 2019-11-19 20:16:53 +02:00
Yair Morgenstern
15e59b161b Technology description no longer includes Manhatten Prokect or Nuclear Missile in description when nuclear weapons are disabled 2019-11-19 19:34:48 +02:00
lishaoxia1985
1eb5ced75c add map modifier and the benefit when we research the technology other Civs have. (#1339) 
* update

* update

* update

* update

* update

* update

* update

* update
 2019-11-19 19:11:01 +02:00
Duan Tao
111030e457 Nuke your enemy! (#1318) 
* Nuke your enemy!

* Fantasy tiles. Worker automaticly clears fallout.

* Some AI improvement for choosing wonder and military unit.

* Add nuclear weapon option.
 2019-11-19 08:43:04 +02:00
Yair Morgenstern
313f55171c Lint 2019-11-18 22:03:49 +02:00
Yair Morgenstern
83aab24bba Resolved #1341 - Annexed cities no longer have population permanently gone "outside" their borders (Mr Gorbachev, tear down this wall!) 2019-11-17 23:03:13 +02:00
Yair Morgenstern
f7bb5c4a59 Added lines between prerequisite techs in TechPickerScreen - now you can see the entire tree! 2019-11-17 22:41:08 +02:00
Yair Morgenstern
2d94cc2179 Changed translation files to always read in UTF-8 - should solve Desktop getting wierdly read characters, hopefully 2019-11-17 22:38:30 +02:00
Yair Morgenstern
80d9b3bd49 Trades in overview screen are now almost symmetrical 2019-11-17 21:37:27 +02:00
Yair Morgenstern
aa4c70f090 Fixed trades always beng denied because "our proposed trade is no longer relevant" 2019-11-17 21:16:51 +02:00
Yair Morgenstern
1ecc6bbb2a Performance improvement - tile taps and long-clicks are now done at the TileMapHolder level, meaning we can only create one instead of one per tile, massive memory saving! 
Map now zooms with mouse scroll in Desktop!
 2019-11-16 23:02:09 +02:00
Yair Morgenstern
a48c356920 Base image tiles on tiles with improvement images are now grayed out when not visible 2019-11-16 21:15:33 +02:00
Yair Morgenstern
3a4d79c14f Resolved #1336 - can no longer get Settlers from Collective Rule policy when in One City challenge 2019-11-16 18:44:56 +02:00
Yair Morgenstern
e7b6450a71 Resolved #1332 - can no longer get settlers from ruins in One City challenge 2019-11-15 14:31:19 +02:00
Yair Morgenstern
4845fb7865 JAR file is now ready for desktop consumption! 2019-11-15 09:12:06 +02:00
Yair Morgenstern
e21d7eb54a We can now have "layered" images for the base tile, such as grassland + manufactory! 2019-11-14 21:01:24 +02:00
Yair Morgenstern
c6b550e43d Resolved #1312 - More obvious division between promotion 'pick now' and description 
Civilopedia redone!
Now with simpler picking and images!
 2019-11-13 22:54:10 +02:00
Yair Morgenstern
a94a3f9d2e Resolved #1323 - invalid trades should now be removed when turn starts 2019-11-13 21:45:54 +02:00
sveckarel
7a9c99ee81 Update czech translations (#1327) 
* Czech translations improvements

* Update Czech translations
 2019-11-12 06:52:48 +02:00
Yair Morgenstern
b0e29c5d3c City-state alliance Bugfix 2019-11-11 21:07:16 +02:00
Yair Morgenstern
637b487a2c City-states allied to Civs no longer attempt to declare war when it does on Civs they haven't met yet 2019-11-09 20:25:30 +02:00
Yair Morgenstern
28b15a537a City-states no longer generate Great People 2019-11-09 19:18:27 +02:00
Yair Morgenstern
e1350cdb05 separated whiteDot for images from TableBackground for backgrounds 2019-11-08 15:42:19 +02:00
lishaoxia1985
4d5ae8fa25 now you only need to create font once. (#1269) 
* update

* update

* update

* update

* update

* update

* update

* range extension

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update
 2019-11-08 15:31:11 +02:00
Yair Morgenstern
d8ec67bb43 Resolved #1307 - you no longer get a notification when conneccting to the cities of other Civs 
New notification when cities have disconnected from your capital
 2019-11-06 21:43:48 +02:00
Yair Morgenstern
140753e9c4 Resolved #1302 - captured settlers are converted workers as per original Civ V 2019-11-05 18:16:37 +02:00
Yair Morgenstern
777802ab04 Can no longer click 'next turn' if popups are open - #1289 2019-11-05 15:21:28 +02:00
Yair Morgenstern
8226304097 Better Civ icons 2019-11-05 12:51:05 +02:00
Duan Tao
1e403442f7 City-state allies with most influencing civ. (#1291) 
* City-state allies with most influencing civ.

* More notifications for alliance. More intense status update.

* Fix a crash about lateinit tiles.

* More reasonable civInfo.setTransients.
 2019-11-05 12:23:21 +02:00
Yair Morgenstern
2e9b1e6de6 Added 750x500 resolution for tiny screens (it still looks OK, but if we go lower to 600*400 then...no) 
City states no longer get starting Scouts - #1289
 2019-11-05 10:18:43 +02:00
BenBooth1344
92ddc864fa Implemented One City Challenge (#1279) 
* Implemented One City Challenge

Implemented One City Challenge

* prevent OCC from capturing settlers

* Fixed spellling of Destroy

* fixed capture logic for barbarian
 2019-11-04 14:24:43 +02:00
Yair Morgenstern
57b0040df7 Added Siam civ - #703 2019-11-03 23:22:49 +02:00
Yair Morgenstern
9610f9f918 bugfix - Music volume slider no longer auto-sets to sound effect volume 2019-11-03 20:15:49 +02:00
BenBooth1344
b82a52ce38 added no ancient ruins option (#1280) 2019-11-03 16:17:15 +02:00
Yair Morgenstern
791439397e Added Brandenburg Gate wonder - #643 
Fixed translation bugs
 2019-11-02 23:08:55 +02:00
Yair Morgenstern
edb5ff92ed Fixed Indirect Fire promotion 2019-11-02 20:10:01 +02:00
Yair Morgenstern
78027ef249 Distinguished notifications of "trade item TO nation has ended" from "trade item FROM nation has ended" 2019-10-31 15:55:13 +02:00
Yair Morgenstern
23178836cf More performance 
- Shoved TextureRegionDrawables into a hashmap for faster searching and more unified access (not everyone has to create a Drawable for the Region now)
- getLanguages() now does the minimum amount of work without saving intermediates

Unified ImageGetter.getTableBackground()  (helper, not performance)
 2019-10-31 12:59:19 +02:00
Yair Morgenstern
de30382536 Memory performance improvements! 
- .tr() no longer tries to regex replace every entry in the dictionary - instead, we save the shortened version of each translation in its place!
 - when counting language completion percentage, we only count the numbers, not save them to a list!
 - label coloring and size now baked-in to .toLabel(). meaning we don't need to reassign styles and rebuild font caches!
 2019-10-31 12:01:23 +02:00
Yair Morgenstern
c39c1a4c15 Fixed crash when failing to download map in map editor 2019-10-31 10:25:11 +02:00
Yair Morgenstern
18ffe9b67f Removed unused Fonts functions 
Fixed bug on city creation caused by 750ca0c
 2019-10-31 09:46:33 +02:00
Yair Morgenstern
dbbfd13486 Music now downloads on another thread to not harm the user experience 
Removed unused "Username" string
 2019-10-31 09:40:50 +02:00
Yair Morgenstern
9dee9f8256 Can now download background music for the game through the Options menu =D 2019-10-30 23:31:16 +02:00
Yair Morgenstern
f4c20792ae Resolved #1256 - Puppeted cities no longer autobuild units or wonders 2019-10-30 20:36:14 +02:00
lishaoxia1985
1f8db38ea2 update translation (#1258) 
* update

* update

* update

* update

* update

* update

* update

* range extension

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update
 2019-10-30 15:45:03 +02:00
Yair Morgenstern
750ca0c1e9 Resolved #1252 - Tiles created inside your borders take control of the city center tile, so they don't become "Invisible cities" 2019-10-29 22:32:52 +02:00
Yair Morgenstern
2ec628a0da Map generation simplified, rewritten, and now much MUCH more readable! 2019-10-29 22:17:07 +02:00
lishaoxia1985
8af6a5ffa6 update translation (#1247) 
* update

* update

* update

* update

* update

* update

* update

* range extension

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update
 2019-10-29 06:20:27 +02:00
Yair Morgenstern
f80b0ee777 Added link to Patreon 
Units upgrading to units with built-in promotions now get those promotions
 2019-10-28 21:24:04 +02:00
Yair Morgenstern
827af89498 Resolved #1250 - Resources requiring a specific tech to build the improvement, are no longer provided before researching that tech (by cities etc) 2019-10-28 21:09:18 +02:00
Yair Morgenstern
6a46af4f88 Can no longer create great improvements on water or unbuildable tiles (like Oasis) 2019-10-28 21:00:08 +02:00
lishaoxia1985
e865055488 update translation (#1243) 
* update

* update

* update

* update

* update

* update

* update

* range extension

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update
 2019-10-27 17:30:56 +02:00
sveckarel
5abaff7905 Added next few czech words, fixed issue with Save game from last commit 2019-10-27 11:39:24 +02:00
sveckarel
c12ed1842c Translations improvements, fixed few czech words 2019-10-27 11:39:24 +02:00
Yair Morgenstern
ba33e2266d Resolved #1230 - sleeping units wake up if there's an enemy nearby 2019-10-26 21:18:17 +03:00
Yair Morgenstern
8151476806 NativeFont has proved itself well enough - got rid of old WenQuanYiMicroHei font and corresponding setting 2019-10-26 20:54:32 +03:00
Yair Morgenstern
232896665e Solved promotion name-change bug 2019-10-26 20:44:32 +03:00
Yair Morgenstern
4d285e972d Can now translate [year] BC / [year] AD (#1240) 2019-10-26 20:27:01 +03:00
sveckarel
39747cb6e3 Correction of Czech tranlations, adding missing keys 2019-10-26 20:17:03 +03:00
Duan Tao
c4263867ff Better work actions. Improvement time scales with game speed. 2019-10-25 16:04:08 +03:00
Yair Morgenstern
c751d5a670 Resolved #1233 - notifications show up on "next turn" without needing to click anywhere 2019-10-24 22:42:37 +03:00
Yair Morgenstern
891ea5584f Resolved #1234 - improvements that replace the current improvement now indicated in the improvement picker screen 2019-10-24 22:18:47 +03:00
Yair Morgenstern
6fb3ba0f13 Resolved #1229 - AI doesn't choose to construct workers if the Civ has idle automated workers 2019-10-24 21:57:24 +03:00
Yair Morgenstern
7d1fd6e177 Added cache for character sets, improving time for Chinese and Korean game initialization 2019-10-24 21:50:49 +03:00
Duan Tao
d630c742b9 Worker will not waste time on oasis. 2019-10-24 12:15:34 +03:00
lishaoxia1985
88da508b82 update translation (#1222) 
* update

* update

* update

* update

* update

* update

* update

* range extension

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update
 2019-10-23 21:59:20 +03:00
Yair Morgenstern
318dbb2a6d Added tiles with visiable improvements, since not all improvements and combinations are ready this is behind a menu option 2019-10-23 21:56:23 +03:00
Smashfanful
2967f66fdf Update Fonts.kt 2019-10-23 09:08:39 +03:00
Yair Morgenstern
777d1391f4 Changed options for "Show worked tiles" and "Show resources and improvements" because it was less clear than the other options 2019-10-22 19:41:22 +03:00
Yair Morgenstern
f400a03358 Renamed "Immortal" to "Persian Immortal" because of the conflict in naming between the unit and the difficulty 
Also, changed existing units of Immortal or with Range promotion
 2019-10-22 19:25:58 +03:00
Yair Morgenstern
e6ecc53615 Progress bar should no longer appear after getting a tech in the middle of research for free 
Generalized unique fonts to fit Korean as well as Chinese
 2019-10-22 00:14:56 +03:00
Yair Morgenstern
965217d95c Undid "Immortal" name change 
Fixed json errors
Added Korean and Czech flags
 2019-10-21 23:23:38 +03:00
Yair Morgenstern
e2c19696c9 Grassland ad Tundra are now also constants, completing the set 2019-10-20 10:48:16 +03:00
Yair Morgenstern
384194c531 Desert now a constant 2019-10-18 17:39:13 +03:00
Yair Morgenstern
77f479e39b Added river toggles to map editor to see how it looks. Not good, btw - can't see rivers behind mountain/forest/hill tiles... 
Disabled for now, until we find a better way to display rivers.
 2019-10-18 16:39:23 +03:00
lishaoxia1985
6d1edd67e0 move the tile table to the top of the min-map, delete the bottom bar, the size of the unit table can be changed according to resolution, especially about 900*600. (#1207) 
* update

* update

* update

* update

* update
 2019-10-18 16:22:38 +03:00
Yair Morgenstern
397d9ccec3 Added river rendering, river effects not implemented yet 2019-10-18 09:16:08 +03:00
Yair Morgenstern
e71bc978b9 Fixed "Negative turns to construction" in extreme edge cases 2019-10-18 09:14:53 +03:00
Yair Morgenstern
96281db945 Merge branch 'master' of https://github.com/yairm210/UnCiv 2019-10-17 10:25:31 +03:00
Yair Morgenstern
33805ca6f8 Organized TileGroup icons (for improvements, resources and units) into a separate class 2019-10-17 00:05:10 +03:00
Duan Tao
691a305e50 Duantao/settler food info (#1198) 
* Better info for building settler.

* Shorter message.

* Fix message.
 2019-10-16 18:16:27 +03:00
Yair Morgenstern
e95fbc3fb9 Expanded and clarified stats breakdown 2019-10-16 10:33:24 +03:00
Yair Morgenstern
ecc32365f5 Added notification when cities are connected to the capital 2019-10-16 00:40:37 +03:00
Duan Tao
e6659a80e0 Fixed : unit cannot be bombarded sometimes between 2 cites. (#1193) 2019-10-15 20:34:08 +03:00
Yair Morgenstern
36ffc5520a Added annex/puppet/liberate/raze explanations on the popup where you choose between them 2019-10-15 20:30:11 +03:00
Yair Morgenstern
14cbe9e21d Even more pixel images! 
Added Pillaging tutorial
 2019-10-15 16:00:07 +03:00
Yair Morgenstern
f7a9aa9bb6 Unit pixel images are now opt-in 2019-10-15 11:09:30 +03:00
Yair Morgenstern
e2459c06fc More unit icons 2019-10-15 10:52:21 +03:00
Yair Morgenstern
35a96dbed4 Bonus and Luxury resources are spread out evenly over the map 2019-10-14 23:00:55 +03:00
Yair Morgenstern
0f351ad964 Solved "Free tech but all techs already researched" problem 2019-10-14 21:43:34 +03:00
Yair Morgenstern
5473afbecf Added icons for the major unit types 2019-10-13 14:06:18 +03:00
Yair Morgenstern
fb768682fe Added more unit icons =) 
Organized tileset image locations
 2019-10-13 11:49:34 +03:00
Yair Morgenstern
538e53883c Added pixel sprites for land and water units! 2019-10-13 11:18:14 +03:00
Yair Morgenstern
16d565a1f2 Resolved #1185 (hopefully): Made trade requests in offer popup, scrollable 2019-10-12 22:44:28 +03:00
Yair Morgenstern
b661308a9d Improvements that provide resources now specified in the improvement picker screen 
Tutorials for resources now specify that a specific improvement is needed
 2019-10-12 22:27:45 +03:00
lishaoxia1985
7d14c0924b 1.update translation 2. delete population number back the city name of city screen because there is a detail table in the screen. 3. now when you touch "X" you can close unit table. (#1184) 2019-10-12 21:39:58 +03:00
Yair Morgenstern
27dfae18de Can now choose Era when starting a new game! 2019-10-11 16:05:27 +03:00
Yair Morgenstern
e77fdd2993 Polynesia works! 2019-10-11 14:54:08 +03:00
Duan Tao
c8e68842e9 Added setting about auto-build roads. (#1181) 
* Added setting about auto-build roads.

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

* update
 2019-10-09 23:40:02 +03:00
Yair Morgenstern
5d6ecd1ca4 More tutorial name changes so it looks better in the Civilopedia 2019-10-08 10:44:14 +03:00
Yair Morgenstern
734e0e8068
Merge pull request #1171 from ninjatao/duantao/barbarian_bonus 
Duantao/barbarian bonus
 2019-10-08 10:27:38 +03:00
Yair Morgenstern
62310fa3d5 Fixed "Game errors when loading game" - #1171 2019-10-08 10:26:46 +03:00
Duan Tao
b1c5398804 Difficulty bonus vs barbarian. 2019-10-08 10:17:14 +08:00
Duan Tao
3ae18374b6 Liberating city state gives influence. 2019-10-07 13:58:34 +03:00
Yair Morgenstern
b3a2bc3307 Tutorials now accessible from Civilopedia! 
Mass tutorial renaming
 2019-10-06 23:18:51 +03:00
Yair Morgenstern
69dd7ec7b6 Resolved #1157 - Added popup for entering Golden Age 2019-10-06 19:46:22 +03:00
Yair Morgenstern
4cde23e7a9 Popups no longer appear in multiplayer when it's not your turn 2019-10-06 19:25:40 +03:00
Yair Morgenstern
3d992fc9ee Resolved #1162 - City button, resources and tech description in multiplayer now act according to the viewing civ, and not the current player - Thanks @lobraarbol! 2019-10-06 19:21:47 +03:00
lishaoxia1985
09420786bc modify battle damage calculation method about city attack. (#1141) 2019-10-05 21:10:10 +03:00
Yair Morgenstern
d1fb55a75e Resolved #1152 - New units no longer skip over unassignable tiles (land tiles for water units, mountains) when spawning 2019-10-05 20:58:33 +03:00
Yair Morgenstern
b9f79376ce Transportation upkeep no longer disappears after adopting Trade Unions - kudos ..,,,! 2019-10-05 20:46:10 +03:00
Yair Morgenstern
2a00ab2775 "Introduction to X" and "Declare war on X" trade items are now only X, adding the extra text on UI display - this makes them translatable 2019-10-04 16:49:31 +03:00
Yair Morgenstern
aafe23a2f5 freeTechs parameter in buildings replaced with Free Technology unique 2019-10-04 16:23:17 +03:00
Duan Tao
2305f18233 Destroy planes when city is razed. 2019-10-03 16:32:27 +03:00
Yair Morgenstern
3358baab52 Added alert popups on finished tech 2019-10-02 18:21:43 +03:00
Duan Tao
1f543843af Better worker AI. (#1136) 
* Better worker AI.

* Fix tiles to improve condition.

* tilesToImprove changed from member to function.

* Minor performance optimization.

* Use the same condition for worker AI long term and short term target.
 2019-10-02 17:49:07 +03:00
Yair Morgenstern
512a68c2ae Fixed bad nations comment end... 2019-10-01 23:30:04 +03:00
Yair Morgenstern
dd561759e4 Fixed bug where Open Borders trades didn't work when loading games 2019-10-01 22:18:25 +03:00
Yair Morgenstern
47db4dce31 Fixed Coastal Raider image 
Puppet cities no longer increase policy costs
 2019-10-01 22:05:38 +03:00
lishaoxia1985
3b2777e098 some translation update (#1135) 2019-10-01 21:55:37 +03:00
Yair Morgenstern
3abd25c130 Added Thai, although the symbols on top don't seem to render well =( 2019-09-29 12:44:02 +03:00
Duan Tao
1607d0b17c Better AI choice for annexing and razing cities. (#1132) 2019-09-29 11:54:43 +03:00
Yair Morgenstern
3ce1c7ee9d Made battle damage more readable 2019-09-29 11:53:54 +03:00
lishaoxia1985
e5370c9b00 1.split different eras in tech tree, although color is not very good. 2. in original game, Japanese UA should be not used in Air Unit, so I fix it. 3. according to original game, edit the method to calculate battle damage. 4. there is two "Mohawk Warrior" words in the file "Units.json", and its obsoleteTech should be"Gunpowder", so i delete the wrong one and edit the right one. 5. edit "Building.json" to make it describing more accurate, of course, i edit "TileInfo.kt" according to the edited"Building.json". 6. some translation update. (#1127) 
* systemProp

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* fix that researched tech can be picked when we pick a free tech

* update to master

* update

* Update TechPickerScreen.kt

* delete english selectlanguage becauce menu have two choice, enlarge overview's image icon because it's too small to align.

* update

* language polish is wrong to be writing "polski"

* 显示教程

* update

* update

* update

* update

* update

* update

* update

* viewport

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update
 2019-09-29 10:33:18 +03:00
Yair Morgenstern
7e274cae84 Added translations in map editor 2019-09-28 22:06:52 +03:00
Yair Morgenstern
5980f18f89 Puppeted cities now always auto assign production 
Resolved #1124 - added annex and puppet tutorial
 2019-09-28 21:43:27 +03:00
Yair Morgenstern
27e2b0615a Merge branch 'master' of https://github.com/yairm210/UnCiv 2019-09-28 21:42:45 +03:00
Duan Tao
ba3103277a Fix Persia civ battle bonus. 2019-09-28 21:20:32 +03:00
Yair Morgenstern
49d3ea2c0e Resolved #1125 - cities can bombard over all tiles in a radius of 2 2019-09-27 11:25:23 +03:00
lishaoxia1985
df2faee2a8 fix that the rightsidebutton will change into another words when you touch tech button in tech tree switching from victorystatus screen. (#1122) 
* systemProp

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* fix that researched tech can be picked when we pick a free tech

* update to master

* update

* Update TechPickerScreen.kt

* delete english selectlanguage becauce menu have two choice, enlarge overview's image icon because it's too small to align.

* update

* language polish is wrong to be writing "polski"

* 显示教程

* update

* update

* update

* update

* update

* update

* update

* viewport

* update

* update

* update

* update

* update

* update

* update
 2019-09-26 18:17:43 +03:00
Duan Tao
f32f4de3a9 Fixed : Liberated city remain in puppet status. 2019-09-26 18:16:16 +03:00
Yair Morgenstern
98f780be93 Attacking unit now enters enemy city before you decide what to do with it - #1123 2019-09-25 22:26:07 +03:00