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

2638 commits

Author SHA1 Message Date
Yair Morgenstern
40325a38b4 Merge branch 'master' of https://github.com/yairm210/Unciv 2020-05-26 16:35:56 +03:00
Yair Morgenstern
8e9cd174dc 3.8.12-patch1 
Added case where worker that needs to ru away has nowhere to move to
 2020-05-26 16:35:01 +03:00
k.h.lai
a9d9b5a64f
Reformat "object:" to "object :" according to the official kotlin style guide (#2666) 2020-05-26 16:12:29 +03:00
k.h.lai
ef0c0b9407
Improve keyboard shortcut (#2663) 
* Use keyDown instead of keyTyped to handle arrow keys

* Rename getIconAnKeyForUnitAction to getIconAndKeyForUnitAction
Remove unnecessary dependencies in UnitActionsTable.kt

* Use backButtonAndESCHandler to deselect unit and city
 2020-05-25 21:17:02 +03:00
Yair Morgenstern
41aade6eb9 Advanced sliders work on New Map Screen 2020-05-24 21:49:36 +03:00
Daniel Bälz
fcffbbb9bd
Minor UI improvements construction menu (#2657) 
* Fix padding for headers in construction menu

* Sync width of queue and available construction tables

* Left align "Add to queue" button to prevent jumping

* Remove duplicate separator and padding

* Improve design of CityInfoTable

* Fix padding for headers in construction menu

* Sync width of queue and available construction tables

* Left align "Add to queue" button to prevent jumping

* Remove duplicate separator and padding

* Improve design of CityInfoTable
 2020-05-24 21:30:34 +03:00
Daniel Bälz
ee5ef800c7
Evaluate translations for mods only when the mod is active in a game. Fixes #2622 (#2650) 2020-05-24 21:29:16 +03:00
Daniel Bälz
24c88313e8
Add remove button for construction queue items (#2654) 2020-05-23 23:10:46 +03:00
Yair Morgenstern
2f43213616 Resolved #2647 - Automated workers run away from enemy military units 2020-05-22 11:08:39 +03:00
Alexander
8745f58dc2
Uniformed the size of buttons on LanguagePickerScreen and MultiplayerScreen (#2628) 2020-05-21 22:31:03 +03:00
Yair Morgenstern
90051ebe5c Rivers no longer disappear on 'next turn' 2020-05-21 22:18:28 +03:00
Yair Morgenstern
9b9e172897 Gold deficit only affects science when the civ has negative gold 2020-05-21 22:16:12 +03:00
Jack Rainy
98a4c8bf00
Don't reveal submarine position by city markers (#2643) 2020-05-21 12:20:44 +03:00
Yair Morgenstern
4b405ecc61 Resolved #2642 - added difficulty settings to Civilopedia 
No translations yet
 2020-05-20 22:20:26 +03:00
Yair Morgenstern
d81507ef2d Resolved #2549 - fixed New Game Screen options alignment and placing 2020-05-20 20:52:13 +03:00
Yair Morgenstern
9b93e4fb51 Unified capitalization in New Game screen - #2549 2020-05-20 20:46:59 +03:00
Yair Morgenstern
0262ee816b Resources no longer spawn under unbuildable, unremovable terrain features 2020-05-19 21:44:10 +03:00
AcridBrimistic
39e5d0df0f
relationshipLevel() clean-up (#2627) 
* Diplomacy Clean-up

* Better formatting

* Quickfix

* Fix

counterpoint
 2020-05-19 21:28:32 +03:00
Yair Morgenstern
eb6a11cccb Resolved #2638 - Auto-assign of population no longer "double books" tiles 2020-05-19 19:21:26 +03:00
lishaoxia1985
0678e77487
delete skin file about "*.fnt" and use nativefont instead. (#2109) 2020-05-19 19:06:03 +03:00
Daniel Bälz
47d7e8ef09
Gradle Kotlin DSL (#2634) 
* Ease migration to Gradle Kotlin DSL by changing quotes, function calls and plugin definitions

* Migrate build scripts to Gradle Kotlin DSL
 2020-05-19 00:14:01 +03:00
Yair Morgenstern
45f85d9c38 Fixed Manhattan Project being inversely affected by nuclear weapons disabling 2020-05-18 23:42:40 +03:00
Väinö Mäkelä
4b6bab523f
Rewrite the font system to render the characters incrementally (#2635) 2020-05-18 23:09:38 +03:00
Yair Morgenstern
7330daff48 All UI changes in threads are now run in a postRunnable - should hopefully get rid of IndexOutOfBoundsExceptions 2020-05-18 23:08:19 +03:00
Yair Morgenstern
3032ba9c73 River adjacency functions and gold bonus for tiles adjacent to rivers 2020-05-17 21:29:12 +03:00
Alexander Korolyov
8a43d5c5d6
Change default value for new simulateUntilWinOrLose parameter. (#2632) 
By default it should be 0 - simulation turned off.
 2020-05-17 18:48:58 +03:00
Alexander Korolyov
55fdb3a9e7
Exits simulation mode when player wins or losses. (#2624) 
* Exits simulation mode (simulateUntilTurnForDebug) when player wins or losses.

* Update core/src/com/unciv/logic/GameInfo.kt

Co-authored-by: AcridBrimistic <acridbrimistic@protonmail.com>

* Update core/src/com/unciv/UncivGame.kt

Co-authored-by: AcridBrimistic <acridbrimistic@protonmail.com>

* Update core/src/com/unciv/logic/GameInfo.kt

Co-authored-by: AcridBrimistic <acridbrimistic@protonmail.com>

* New parameter for simulation until any of player wins or loses or maximum turns reached.
Added battle logging flag.

Co-authored-by: AcridBrimistic <acridbrimistic@protonmail.com>
 2020-05-17 12:33:49 +03:00
Yair Morgenstern
2444b2e1d2 New river edges and flattened tiles by The Bucketeer! 
Opened River changes in Tile Editor - only visual for now, but should help people see how their tiles would look with rivers surrounding them
 2020-05-16 23:54:16 +03:00
Yair Morgenstern
7668a21ae8 Tiny fix to Years To Turn 2020-05-16 22:15:54 +03:00
AcridBrimistic
67f7e67f55
Years per turn improvement (#2607) 
* Year issue fix

* Clean up and try

* real good update

* udf
 2020-05-16 22:01:10 +03:00
Jack Rainy
8877c18f31
Civilian should not move when bought (#2621) 
* Civilian cannot move when bought same as military unit

* Minor code restyling
 2020-05-16 21:57:36 +03:00
Jack Rainy
4026c9b91d
Fix of the translation template for the start new game menu (#2623) 
* Adding missing translations + corrections to existing

* Translation of the "Avoid" starting biases
 2020-05-16 21:56:55 +03:00
Yair Morgenstern
14b99aa010 City-states no longer accumulate points towards Great Generals 2020-05-16 21:40:43 +03:00
Yair Morgenstern
8639fc6e1c Can no longer see other human players' assigned tiles in Multiplayer 2020-05-15 14:07:58 +03:00
Yair Morgenstern
cc8f4c3ceb Separated the city overview from the overview screen - it was getting too crowdded 2020-05-15 12:28:17 +03:00
Yair Morgenstern
2f3d3d96b7 Resolved #2618 - better inter-city navigatin int eh city screen 2020-05-15 10:39:51 +03:00
Yair Morgenstern
54dd7e5d62 Resolved #2611 - City button shrinks on zoom in, showing the 'hidden' unit icons behind it 2020-05-15 00:36:06 +03:00
Yair Morgenstern
de337a0ca2 Fixed crash in rare situation where a citadel takes over land of an unknown civ 2020-05-14 08:22:30 +03:00
Yair Morgenstern
b566aacef4 3.8.8 2020-05-12 21:47:33 +03:00
Yair Morgenstern
b393498c1a Organized checkboxes in game parameters table 2020-05-12 21:46:31 +03:00
Yair Morgenstern
c84550fc2c More NewGameScreen reorg 2020-05-12 21:38:54 +03:00
Yair Morgenstern
0190854b88 Redid layout for the New Game screen - see #2549 2020-05-12 20:38:44 +03:00
Yair Morgenstern
105a7d63b0 Separated MapOptions to its own class - this can help us with map generation in the map editor, AND help us make UI changes for the New Game screen faster 2020-05-12 19:20:48 +03:00
Yair Morgenstern
1ace4bcf3a Normalized "Buy" and "Fortify" sounds, so they're not overly loud 2020-05-11 23:11:18 +03:00
Yair Morgenstern
1adb19787a Removed the crutches for unit attack bugs - we want to figure them out! 2020-05-11 20:33:53 +03:00
Yair Morgenstern
3a2b8453d5 Solved ANR when loading game to display its metadata 2020-05-11 20:20:24 +03:00
Yair Morgenstern
c756014fec Added helper class GameSetupInfo - this will help us when setting up multiplayer games for transferring data from/to the server 2020-05-10 22:28:35 +03:00
Yair Morgenstern
b64391d767 Population assigned to tiles of other cities do not auto-unassign 2020-05-10 20:32:34 +03:00
Yair Morgenstern
f605a0c00f Settler automation takes into account which tiles already belong to other civs 2020-05-10 10:55:38 +03:00
Yair Morgenstern
b012fd0df8 Fixed "isWorked" not registering for tiles worked not by the owning city 2020-05-09 22:01:15 +03:00
Yair Morgenstern
efb823c67d Optimized imports 2020-05-08 11:43:44 +03:00
uncivbot[bot]
a9f9685dc2
Translations update (#2600) 
* Update Romanian.properties (#2589)

* Translation/romanian (#2590)

* romanian translations

* romabian translation

* romanian translatiobs

* wrong diacritics

* fixed wrong diacritics

* Romanian translations

* romanian translations

* Romanian translations

* Romanian translations

* Finalized Nations translations for Romanian

* romanian translations

Co-authored-by: Beniamin Szabo <beniamin.szabo@reea.net>

* Update Brazilian_Portuguese.properties (#2591)

* Update Brazilian_Portuguese.properties

> Some fixes

* Update Brazilian_Portuguese.properties

* Update Brazilian_Portuguese.properties

* German translations 2020-05-06 (#2593)

* German translations 2020-05-06

* Fix two missing tr() calls for User-ID-from-clipboard responses

* add translation to China , USA and Japan city (#2594)

* Update Italian.properties (#2597)

* UPDATE SPANISH (#2599)

I hope this could be useful. Regards.

Co-authored-by: LynxRo <62301821+LynxRo@users.noreply.github.com>
Co-authored-by: Beniamin Szabo <szabo.farkas.beny@gmail.com>
Co-authored-by: Beniamin Szabo <beniamin.szabo@reea.net>
Co-authored-by: quantumilogic <64731997+quantumilogic@users.noreply.github.com>
Co-authored-by: SomeTroglodyte <63000004+SomeTroglodyte@users.noreply.github.com>
Co-authored-by: HI_OuO <45450852+zvn2060@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: Rakyat02 <63031405+Rakyat02@users.noreply.github.com>
 2020-05-08 11:39:05 +03:00
Väinö Mäkelä
bba289627c
Remove gdx-box2d from build files because it isn't used (#2595) 
* Remove box2d from build files because it isn't used

* Remove some unused includes to make the build work
 2020-05-08 08:05:26 +03:00
Yair Morgenstern
b309cac67b Fadeout for potentially workable tiles currently being worked by another city 
Mint icon looks much nicer
 2020-05-07 13:04:25 +03:00
Yair Morgenstern
0eb79fff82 Resolved #2588 - instead of tile ownershp being transferrable between cities, cities can now work tiles belonging to other cities. 2020-05-06 23:37:02 +03:00
Väinö Mäkelä
91c1e0ae6d
Fix the missing overlays caused by commit 0ffb038129 (#2586) 2020-05-05 20:15:13 +03:00
Jack Rainy
647a0c9ff7
Wait for autosave thread while closing (#2580) 2020-05-05 08:51:41 +03:00
SomeTroglodyte
a940eda4a9
Better Resource order in empire overview screen (#2577) 2020-05-04 22:10:24 +03:00
Yair Morgenstern
2b3a9c14bf Resolved #2576 - Clicking on "Encountering" notifications now move the map to the encounter location 2020-05-04 20:22:23 +03:00
Väinö Mäkelä
0ffb038129
Don't call canReach on the main thread when selecting a tile to move to (#2575) 2020-05-04 17:01:53 +03:00
Yair Morgenstern
d828fdaeca Maps no longer spawn ancient ruins in immediate vicinity of civ spawns 2020-05-03 21:45:23 +03:00
Yair Morgenstern
ad7d7fba60 Added missing Romanian characters 2020-05-03 20:39:08 +03:00
Yair Morgenstern
9397f3608c Fixed thread crashes due to concurrent actor changes in multiplayer update popups 2020-05-03 19:11:07 +03:00
uncivbot[bot]
b42c8672e1
Translations update (#2562) 
* Update Simplified_Chinese.properties (#2545)

* Update Romanian.properties (#2546)

* Update Russian.properties (#2547)

* Update Russian.properties

Tutorial error correction

* Update Russian.properties

Небольшие правки в Tutorial и Tutorial tasks.

* Update Russian.properties

Nations, City-states, minor translations

* Update Russian.properties

Cities

* German translations 2020-04-30 (#2548)

* Update French.properties (#2560)

* Translation/romanian (#2557)

* romanian translations

* romabian translation

* romanian translatiobs

* Update Portuguese.properties (#2558)

* Corrections to the translations (#2559)

Co-authored-by: Doubi_TS <48427744+tianshidoubi@users.noreply.github.com>
Co-authored-by: LynxRo <62301821+LynxRo@users.noreply.github.com>
Co-authored-by: BadaTheBada <64350251+BadaTheBada@users.noreply.github.com>
Co-authored-by: SomeTroglodyte <63000004+SomeTroglodyte@users.noreply.github.com>
Co-authored-by: snipe2004 <snipe2004@hotmail.com>
Co-authored-by: Beniamin Szabo <szabo.farkas.beny@gmail.com>
Co-authored-by: guilherme-peev <guilherme.peev@gmail.com>
Co-authored-by: Jack Rainy <JackRainy@users.noreply.github.com>
 2020-05-02 21:42:53 +03:00
Yair Morgenstern
f5968e678d Players has to be an ArrayList, or else it's not guaranteed to be initializable when starting mods... 2020-05-01 00:03:07 +03:00
Yair Morgenstern
af8e217e18 Merge branch 'master' of https://github.com/yairm210/Unciv 2020-04-30 15:58:02 +03:00
Yair Morgenstern
cc206494df 3.8.4-patch1 
Fixed regexes broken for Android by #2538
 2020-04-30 15:57:08 +03:00
SomeTroglodyte
3808c006ae
Translation code cleanup - purely decorative changes (#2544) 2020-04-30 14:08:08 +03:00
Yair Morgenstern
ba2e6d26e5 3.8.4 2020-04-29 19:39:38 +03:00
SomeTroglodyte
4ff1e96892
Make tr() a little faster (#2538) 
* Make tr() a little faster

* Make tr() a little faster - more consistent whitespace

* Make tr() a little faster - fix translation file generator

* Make tr() a little faster - adapted unit tests
 2020-04-29 19:02:48 +03:00
Yair Morgenstern
cee834b062 AI war motivation taked relationship level into account 2020-04-29 19:02:18 +03:00
SomeTroglodyte
44239e9e7a
TranslationFileWriter: patch to duplicate less stuff into mods (#2541) 2020-04-29 19:01:36 +03:00
Yair Morgenstern
6e3de37950 Minimap now looks good for both rectangular and hexagonal maps 2020-04-29 11:14:52 +03:00
Yair Morgenstern
8bcca39f07 WILL YOU SHUT UP ABOUT THE STUPID MINIMAP NOW 2020-04-29 10:56:31 +03:00
Yair Morgenstern
3865972737 Better declare war and city battle decisions (hopefully) for AI 2020-04-29 10:42:35 +03:00
Yair Morgenstern
38333c2600 Resolved #2536 - cities correctly expand to the last available tile 2020-04-28 12:52:18 +03:00
Yair Morgenstern
206686a4d4 Game always resume previous screen on resume(), and autosaves on pause (in case the user / Android decides later that it's closing the app completely) 2020-04-28 00:05:58 +03:00
Yair Morgenstern
e11feaea2f Fixed 'auto assign production' not working when changing from manual to auto assign 2020-04-27 23:21:14 +03:00
Väinö Mäkelä
c4f1e0f15d
Use ArrayDeque for BFS implementation (#2529) 2020-04-27 22:57:32 +03:00
Yair Morgenstern
6e03910097 Fixed crashing error when loading mods 
Load game now shows user ShowableUncivExceptions
 2020-04-27 19:23:59 +03:00
Yair Morgenstern
6fed455d76 Happiness is now a saved transient - saves about 10% of all runtime! Can't believe I hadn't thought of that before! 0_0 2020-04-27 00:01:40 +03:00
Yair Morgenstern
ba2d6fe405 Performance improvements for .nextTurn() 2020-04-26 23:09:06 +03:00
Yair Morgenstern
f0adc40e81 Fixed modification exception when destroying transported units 2020-04-26 20:50:09 +03:00
SomeTroglodyte
5e5a175f06
Terrace Farms: Bonus resource restriction (#2522) 2020-04-26 19:39:48 +03:00
SomeTroglodyte
818adbd1a3
Map editor: Placed improvement check updated: Potentially resolves #2489 (#2518) 
* Map editor: Placed improvement check updated: Potentially resolves #2489

* Map editor: Placed improvement check updated: Code readability
 2020-04-26 19:39:29 +03:00
Yair Morgenstern
f9d5cf60f8 Performance - Great general automation was taking 40% (!) of nextTurn time - decreased to 6%, which is still A LOT but much, much less 2020-04-26 11:23:09 +03:00
Yair Morgenstern
04cd1978fa Resource bonus from Fascism effective immediately 2020-04-26 09:58:24 +03:00
Yair Morgenstern
e50e2ad5d2 3.8.2 
Translations writer updated to handle new older structure
 2020-04-26 00:26:14 +03:00
SomeTroglodyte
20f37d25f1
Character set reorganized, added portuguese vowels (#2513) 2020-04-25 23:14:03 +03:00
Jack Rainy
99f4b612ec
Dynamical width of the buttons (#2496) 
* Dynamical width of the buttons

* Better alignment of icons

* Using the same style as in the game

* Compilation fix after merging
 2020-04-24 15:17:43 +03:00
Yair Morgenstern
4d75f30fd2 Can now add units in map editor! 
Support for loading maps with units added, support for starting gams with maps with preadded units added
Not supported: Starting games with maps of civ A when that civ isn't in the game
This needs a lot of work before it can be released publicly
 2020-04-24 15:04:19 +03:00
Yair Morgenstern
c2fdcb7849 Prepping for multiple rulesets - current ruleset is now is Vanilla folder 2020-04-24 14:03:41 +03:00
Yair Morgenstern
5ec9cc5f67 AI great people will no longer try to raise great improvements on tiles with existing great improvements 2020-04-24 13:47:10 +03:00
Yair Morgenstern
e3ed241b9d Iroquois movement unique only applies to friendly territory 2020-04-24 11:29:24 +03:00
Yair Morgenstern
f318df68ce Resolved #2491 - Terrace farms are not precluded by resources 2020-04-24 11:15:56 +03:00
Yair Morgenstern
5a8b6fdb19 Resolved #2503 - Resizing the game no longer returns you to the main menu 2020-04-24 11:04:11 +03:00
Yair Morgenstern
9ec721f93b New game screen adjusts to base rulesets with small amounts of civs, including barbarians 
Unknown eras no longer cause the screen to go black
 2020-04-23 23:21:25 +03:00
Yair Morgenstern
33ee29bbb2 Saving a map from the map editor screen no longer changes the screen 2020-04-23 23:03:29 +03:00
Jack Rainy
813ba5b83c
Hotfix: Do not reset the screen to the capital in the multiplayer game (#2502) 2020-04-23 22:46:07 +03:00
Yair Morgenstern
c0b1788d96 Changed main menu buttons to the default color scheme, renamed MenuScreen to MainMenuScreen 2020-04-23 20:16:14 +03:00
uncivbot[bot]
c890895f39
Translations update (#2500) 
* French translation fixes (#2484)

* Replace tile improvement term in FR to match Civ terminology

* FR fixes for tutorial

* FR fixes for buildings and diplomacy

* FR fixes for Trade, Nation and City-State

* FR fixes for Menus and notifications

* FR - Removed particles in front of civ names

* FR - fix non translated string (419 -> 335)

Most of the fixes here are city or place names.
These were extracted from Wikipedia French articles matching the
corresponding english article.

Thanks goes to https://wikipedia.org

* FR - fix space before "!", typo, translate falsely translated tutorial lines

* Translations (#2490)

* Translations are added and corrected

* Translations for the main screen

* Update Indonesian.properties (#2487)

* Update Indonesian.properties

Finished all required translations
Some tweaks and corrections
Enjoy, Indonesians

* Update Indonesian.properties

* Update Indonesian.properties

* Update Indonesian.properties

Co-authored-by: Luke Marlin <luke.marlin@viacesi.fr>
Co-authored-by: Jack Rainy <JackRainy@users.noreply.github.com>
Co-authored-by: Kensvin <63847755+Kensvin28@users.noreply.github.com>
 2020-04-23 20:09:31 +03:00
Yair Morgenstern
f2c8c04106 More concurrency problems solved 2020-04-23 20:00:08 +03:00
Yair Morgenstern
07b4dcd8ba Fixed #2492 - trading cities with units in them no longer crashes the game 2020-04-23 19:53:06 +03:00
Yair Morgenstern
4e53bb77d1 Merge branch 'master' of https://github.com/yairm210/Unciv 2020-04-23 19:39:42 +03:00
Yair Morgenstern
c73df02d76 Unified City States and City-States -> City-States #2497 2020-04-23 19:39:16 +03:00
Jack Rainy
73ffe4f44f
Decrease CPU load for multiplayer game (#2495) 
* Decrease CPU load for multiplayer game

* Misprint is corrected
 2020-04-23 19:33:14 +03:00
Yair Morgenstern
286ef707c2 Can start a new game from within a game, to copy over the game's parameters 2020-04-22 17:16:24 +03:00
Yair Morgenstern
b59cc8ab4f Fixed resource display bug in tile table in multiplayer 2020-04-22 16:25:42 +03:00
Yair Morgenstern
688b780b14 Added a repeating baclground to the menu screen 2020-04-21 23:53:33 +03:00
Yair Morgenstern
0321aed309 Solved a concurrent modification bug, a second before publish 2020-04-21 20:34:02 +03:00
Yair Morgenstern
700b1afb34 3.8.0 2020-04-21 20:28:41 +03:00
SomeTroglodyte
f774b715ab
Allow scandinavian lowercase vowels (capitalized are very rare) (#2479) 
Co-authored-by: proteus-anguinus <16001896+rh-github-2015@users.noreply.github.com>
 2020-04-21 20:01:18 +03:00
Yair Morgenstern
6bfe7ea9c7 Map editor now works with functions on the selected tiles - much cleaner! 2020-04-21 15:18:28 +03:00
Yair Morgenstern
081f8cb4a6 Getting to map editor from the main screen is much nicer 2020-04-21 14:53:34 +03:00
Yair Morgenstern
5aae57d848 Added icons to the main menu, looks much better! 2020-04-21 14:18:38 +03:00
Yair Morgenstern
4c3b9e0c14 Map editor leaves to main menu 2020-04-21 12:40:38 +03:00
Yair Morgenstern
0ed283f5e3 Can enter map editor directly, without loading a game 2020-04-21 00:35:10 +03:00
Yair Morgenstern
661ac08e5c Moved the map editor into the main menu as well 2020-04-21 00:07:05 +03:00
Yair Morgenstern
bb3a84fbe7 Removed may references to UncivGame.Current 2020-04-20 23:35:38 +03:00
Yair Morgenstern
eaf7c0a150 New players are correctly send to the language screen 2020-04-20 23:21:52 +03:00
Yair Morgenstern
a3a9bd142e Added a main menu - and it only took 3 years before I felt it was needed 
This should allow players whose game generation is crashing to be able to send us games, and a lot more besides!
 2020-04-20 23:16:58 +03:00
Yair Morgenstern
458caa8bbb Map height normalized to feasable amounts of mountains 2020-04-20 19:47:26 +03:00
Yair Morgenstern
b6fc37aad8 Resolved #1936 - can sign Declarations of Friendship in Multiplayer 2020-04-20 18:29:16 +03:00
Yair Morgenstern
09bdaeb7a8 Resolved #2360 - can now change the current user ID for multiplayer when changing devices 2020-04-20 17:35:05 +03:00
Yair Morgenstern
1a0d808b65 More toTextButton() changes 2020-04-20 17:33:46 +03:00
Yair Morgenstern
fea202dbd6 Much more turn-efficient exploration! 2020-04-20 15:46:49 +03:00
Yair Morgenstern
b6f75f0583 Better exploration - units explore to tiles adjacent to those they don't know, which solved the "I can't see the coastline" effect 
This may have a performance impact, so reduced the radius of the search significantly - beyond that, people can send them manually to explore and then automate whe they're close enough
 2020-04-20 14:31:42 +03:00
Yair Morgenstern
cbeb9a96a6 replaceAll appears to be a Java 8 feature, so rewrote the queue updating when obsoleting units 
Also added sequence changes as per @SomeTroglodyte
 2020-04-20 13:31:21 +03:00
Yair Morgenstern
bc7ee18141 More sequencing, it can only help 2020-04-20 09:24:38 +03:00
Yair Morgenstern
81097fdde9 City tiles are always contiguous, otherwise loads of wierd bugs happen 
Also, better calculation of the number of claimed tiles
In retrospect this has been plaguing us for a long time
 2020-04-20 01:46:21 +03:00
Yair Morgenstern
1564502fc2 Fixed unassigning extra specialists, and activate that at the end of each turn 2020-04-20 01:44:25 +03:00
Yair Morgenstern
3f97daf1da 3.7.6 2020-04-19 23:55:11 +03:00
Yair Morgenstern
e3b9e73c50 Merge branch 'master' of https://github.com/yairm210/Unciv 2020-04-19 22:57:04 +03:00
Yair Morgenstern
122b815fc0 small minimap fix 2020-04-19 22:55:48 +03:00
SomeTroglodyte
f99b3f574a
Minimap size may be a matter of taste (or screen size) (#2468) 2020-04-19 22:52:55 +03:00
Jack Rainy
c449e68ba7
Highlight unique offer suggestions (#2469) 2020-04-19 20:52:51 +03:00
Yair Morgenstern
e06c0f47a7 We can now support mods with no techs whatsoever! 2020-04-19 20:26:55 +03:00
Jack Rainy
c5abfc5066
Minor UI fix: city-state dropdown list has sufficient width (#2467) 2020-04-19 19:18:10 +03:00
Yair Morgenstern
5d95356e0f Can build mods without workers 2020-04-19 18:11:19 +03:00
Yair Morgenstern
95fd51acc5 Removed city center icon from Civ VI - it's not legally ours! 2020-04-19 17:17:57 +03:00
SomeTroglodyte
e599a2007e
Fix minimap mouse dragging behaviour (#2466) 
Sorry *that* ScrollPane was never meant to go *there*
 2020-04-19 16:58:13 +03:00
Jack Rainy
cd9737df9f
Display trades sorted by expiration (#2465) 2020-04-19 16:36:13 +03:00
Yair Morgenstern
14d526605f Minimap reverted to previous "see constant size" - "see everything" is of no use at al on large maps 
Feature graphic updated
 2020-04-19 14:11:09 +03:00
Yair Morgenstern
77b72cccf7 Civ picker adjusts to Scenarios with few civs 
Map generator can handle maps with no water tiles
 2020-04-19 10:10:55 +03:00
Yair Morgenstern
9b1ca770cb We don't need a special parameter for 'no barbarians'... since we can jut not include barbarians in the Nations to begin with... 
Obviously
 2020-04-19 09:16:19 +03:00
Yair Morgenstern
004bede4bb modOptions propogation now works - mods can get by without having a Barbarians civilization! 2020-04-19 00:24:50 +03:00
Yair Morgenstern
745d48c2ae Can now permanently disable barbarians in mods 2020-04-18 23:59:26 +03:00
Yair Morgenstern
4fd869dbee Tile variants! 2020-04-18 22:46:25 +03:00
Yair Morgenstern
cb2e3a1bce More .toTextButton() changes 2020-04-18 22:35:25 +03:00
Jack Rainy
77a63ce365
Citadel improvements + improved AI for the forts (#2453) 
* Allow building the citadels either next to or within friendly tiles only

* Citadel acquire the tiles around it

* AI uses the citadels to get the tiles back + improved AI for the forts
 2020-04-18 21:25:48 +03:00
Jack Rainy
d4ef5cb637
Map Editor UI improvements (#2462) 
* Better icons for "clear" tools

* Map editor layout is reworked
 2020-04-18 21:20:50 +03:00
SomeTroglodyte
4f00639969
Fix: Modded strategic resource without tech prerequisite crashes game (#2460) 2020-04-18 21:19:52 +03:00
Yair Morgenstern
885f280747 Merge tag '3.7.5-patch1' 2020-04-18 21:15:51 +03:00
Yair Morgenstern
1b4cd9c3b3 Fixed replacing obsolete units for new queue 2020-04-18 21:10:39 +03:00
Jack Rainy
6635ed5be9 Hotfix: city-state must get at least 1 starting technology (#2450) 2020-04-18 21:04:18 +03:00
SomeTroglodyte
0397cd7126
Fix city construction side effects (#2448) 2020-04-18 21:01:26 +03:00
Jack Rainy
0de947d1b9
Hotfix: city-state must get at least 1 starting technology (#2450) 2020-04-18 20:59:29 +03:00
Yair Morgenstern
75b11a0a9a Civs never start out on snow (might as well start over...) 2020-04-17 18:03:50 +03:00
Yair Morgenstern
a3843450bf Starting techs no longer hardcoded - this means that mods can have their own tech trees starting wherever 2020-04-17 17:52:45 +03:00
Yair Morgenstern
c764324e81 Unique units do not need to replace existing units 2020-04-17 17:15:21 +03:00
Yair Morgenstern
30fc110d67 More era-related fixes 2020-04-17 15:26:24 +03:00
Yair Morgenstern
eba7dc8c8c All era names changed to "... era" to fit in with what is actually translated and displayed 
Removed Era enum - too restrictive to tech tree variations (atomic era, anyone?)
As a side bonus, mods can now add their own eras, that'll be interesting?
 2020-04-17 15:11:45 +03:00
Yair Morgenstern
4c48cfe4f3 Can now specify a mod as a 'base ruleset', and the regular base ruleset will not be added 
This means that you can 'start from scratch' and build whatever you want - example "Scenario" in unciv-mod-example repo
Obviously we'll have to change around a lot of things or this to work well, but it's a start
 2020-04-17 14:42:15 +03:00
Yair Morgenstern
ffe8691df9 Disabled city-state notifications when the city state is defeated 2020-04-17 14:13:18 +03:00
Yair Morgenstern
f9e7411569 3.7.5 2020-04-17 11:58:42 +03:00
Yair Morgenstern
de1c6872fe Resolved #2444 - buying buildings no longer crashes 2020-04-17 11:33:57 +03:00
SomeTroglodyte
cb87ae94a8
Effect of rationalism was not visible in city UI: Translations patch (#2442) 
* Effect of rationalism was not visible in city UI

* Effect of rationalism was not visible in city UI - translations patch
 2020-04-17 10:21:11 +03:00
SomeTroglodyte
14991c3261
Keyboard-operated unit actions didn't play their sounds (#2438) 2020-04-17 10:18:35 +03:00
SomeTroglodyte
64ec6bd26e
Bring Legion Unit closer to wiki? (#2439) 2020-04-17 10:15:41 +03:00
SomeTroglodyte
fce4b41aaa
Keyboard: Left/Right arrows work in city screen (#2445) 2020-04-17 10:14:13 +03:00
SomeTroglodyte
bc6e2c97ef
Clarify/optimize the role of the inProgressConstructions validator (#2433) 2020-04-16 20:41:05 +03:00
SomeTroglodyte
3f7d5a5cb4
Perpetual constructions display "0 turn" in the queue (#2435) 
This gag or omitting the line entirely both look better
 2020-04-16 20:40:27 +03:00
SomeTroglodyte
ac8648216e
Tiny optimization for isCoastalTile (#2434) 
Yes benefit may be low as neighbors are already cached, but cost is negligible
 2020-04-16 20:39:45 +03:00
Jack Rainy
31134d0fe5
Disable auto building of forts while a human can do that (#2436) 
* Automate building forts for AI players only

* Using constants
 2020-04-16 20:39:05 +03:00
Yair Morgenstern
248d7b5aa6 More policy names to effects 2020-04-16 17:06:47 +03:00
Jack Rainy
038e1cadbf
Application crash after the defeat (#2427) 2020-04-16 16:15:47 +03:00
Yair Morgenstern
25b1259ab6 Resolved #2348 - construction queue is 'cleaned' after every construction 
It's much easier to validate the construction queue now as well
 2020-04-16 16:12:17 +03:00
Yair Morgenstern
1d2ec21210 There is only one true source of removing constructions from the queue, to which all other functions lead 2020-04-16 15:58:46 +03:00
GGGuenni
4fc5c5de64
New screen for "Add Game" [MultiplayerScreen] (#2431) 
* Adding AddGame Screen

Old button was confusing for new players

* Adding translation file entry
 2020-04-16 14:44:52 +03:00
Yair Morgenstern
7d3a10b6ab All constructions are now in the queue - no more separate "current construction" and "construction queue" - #2428 
That went pretty simply, compared to the magnitude of the change
 2020-04-16 13:01:45 +03:00
Yair Morgenstern
3ba20dca52 Resolved #2413 - Yes, having the hotkey always be on display does look much nicer, and I think it's more user-firendly too (no more 'wait let me hover over it to see what the hotkey is') 2020-04-16 11:59:11 +03:00
Yair Morgenstern
381f61a441 More isAdopted to hasEffect conversions 2020-04-16 11:30:22 +03:00
Yair Morgenstern
d031b2855b Merge branch 'master' of https://github.com/yairm210/Unciv 2020-04-16 11:06:58 +03:00
Yair Morgenstern
c1f0084fb0 Added a check to see if a policy effect was active - this is an important step towards "different effects for the same policy name", as happens between Vanilla and G&K/BNW 2020-04-16 11:05:49 +03:00
SomeTroglodyte
048ce0d3c3
Remove "Camp" hardcoding and allow mods to do similar things (#2417) 2020-04-16 10:41:29 +03:00
Jack Rainy
2594777b52
The original capital can not be razed (#2412) 
* Civ is not defeated while at least 1 settler is alive

* The original capital cannot be razed

* Revert "Civ is not defeated while at least 1 settler is alive"

Defeat condition is: no cities remained
 2020-04-16 10:33:58 +03:00
Jack Rainy
1203dc7f7d
Using the correct icons for the great improvements (#2425) 2020-04-15 23:36:50 +03:00
SomeTroglodyte
5033cca9c2
Next turn button had a dead color assignment statement (#2403) 
Color goes to Label instead of container
  String comparison special casing eliminated
  Clearer code structure
  Chose different colors - from standard palette but close to associated stat

Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
 2020-04-15 23:34:01 +03:00
SomeTroglodyte
966de236f4
Options: Turning on city production autoassign affects world immediately (#2401) 
* Options: Turning on city production autoassign affects world immediately

* Options: Turning on city production autoassign affects world immediately - patch
 2020-04-15 23:33:12 +03:00
Jack Rainy
ba81c3e97c
The world view top panel can open the corresponding screens (#2415) 
* Empire overview can open the requested pages

* Open the empire overview screen on the given page

* Open the tech and policies screens

* Turns counter opens the victory status screen
 2020-04-15 23:19:09 +03:00
SomeTroglodyte
fcc14ab093
EmpireOverview: A little color on the Stats page (#2419) 
* EmpireOverview: A little color on the Stats page

* EmpireOverview: Align numbers on the Stats page
 2020-04-15 23:17:03 +03:00
Jack Rainy
ed9fcc3ec1
Fix application crash when city area is too small (#2421) 2020-04-15 23:14:58 +03:00
SomeTroglodyte
9fb6ad29e5
Cultural expansion pauses when no more tiles available (#2414) 
* Cultural expansion pauses when no more tiles available

* Cultural expansion stops when city owns whole 5-tile radius
 2020-04-15 23:14:15 +03:00
Yair Morgenstern
096eb7935a Welp forgot I was on debug mode 
I should probably add in a pre-commit check
 2020-04-14 15:17:40 +03:00
Yair Morgenstern
9d24fc0ff5 Resolved #2146 - can no longer accept multiple offers in a row which invalidate each other 2020-04-14 10:52:16 +03:00
Yair Morgenstern
3174767634 Added description for continuous rendering - #2213 2020-04-14 10:46:23 +03:00
Yair Morgenstern
f5a8211574 Resolved #2322 - added city expansion tutorial 2020-04-13 23:51:27 +03:00
Yair Morgenstern
50f79f5a3a Resolved #2407 - reveal all civs when won or lost 2020-04-13 23:21:19 +03:00
Yair Morgenstern
b441d537a5 Resolved #2278 - various exploration-related improvements 2020-04-13 23:08:45 +03:00
Yair Morgenstern
dd8acda4c0 Resolved #2406 - land units prefer to be generated in land tiles 2020-04-13 23:01:20 +03:00
Yair Morgenstern
85e1476efb Moved removeImprovement up to the GameStarter, which is the only place it's needed 2020-04-13 22:52:15 +03:00
Yair Morgenstern
d936516468 Added helper function .toTextButton() an replaces a good amount of existing calls with it 2020-04-13 22:01:31 +03:00
SomeTroglodyte
72c1fa2d5c
Fix options screen leaving next turn button disabled (#2400) 
* Options Screen: Next Turn Button was left disabled if...
    any setting with 'update worldscreen' on was used

* Options Screen: Unit idle check has visible consequences
 2020-04-13 21:53:23 +03:00
Yair Morgenstern
9af3187835 Merge branch 'master' of https://github.com/yairm210/Unciv 2020-04-13 21:21:05 +03:00
Yair Morgenstern
2c824532d8 Free policies no longer 'stuck' the game when you have no adoptable policies 2020-04-13 21:20:35 +03:00
SomeTroglodyte
4f15c94766
Date and time shown bottom-left in load game now ISO (#2398) 
Replaces #2391
 2020-04-13 20:39:26 +03:00
Yair Morgenstern
13bb1eb7c7 Resolved #2285 - workers no longer try to work tiles within range of an enemy city 2020-04-13 12:40:52 +03:00
Yair Morgenstern
941bc37c59 Resolved #2221 - By updating the building costs in the final ruleset, buildings in mods can now reference techs in the original ruleset 2020-04-13 12:28:18 +03:00
Yair Morgenstern
fdb3d69869 Resolved #2381 - can now remove buildings and units as well, test'D, wiki'D and example'D 2020-04-13 11:57:49 +03:00
Yair Morgenstern
546345c353 Started solution for #2381 - added "ModOptions" file which can currently define techs to remove 
Mods correctly overrule base ruleset
 2020-04-13 11:31:52 +03:00
Yair Morgenstern
935071e206 Merge branch 'master' of https://github.com/yairm210/Unciv 2020-04-13 11:09:21 +03:00
Yair Morgenstern
efc131c863 Preserve mod order in ruleset and game parameters 2020-04-13 11:08:59 +03:00
SomeTroglodyte
fb602d01eb
Civilopedia: Graphic decoration for terrain, fix movement/impassable (#2395) 2020-04-13 10:49:32 +03:00
Jack Rainy
bd5c8130d9
Speedup of canPassThrough() method (#2394) 
* Unit tests for "canPathThrough"

* Refactoring of canEnterTiles() and isAtWarWith()

* Do not check isEmpty() twice

* Using of the cached MapUnit uniques
 2020-04-13 10:46:28 +03:00
SomeTroglodyte
9b26ab1385
Civilopedia: Init logical order, changed geometry to make better use of screen (#2396) 2020-04-13 10:41:18 +03:00
SomeTroglodyte
d3d655fe47
Map name field adjusted, map saving exceptions shouldn't crash, threaded (#2393) 
* Map name field adjusted, map saving exceptions shouldn't crash, threaded

* Map save: Deal with empty map name, name defaults to blank
 2020-04-12 21:37:51 +03:00
Jack Rainy
23c6fad5db
Take map relief into account (#2389) 2020-04-12 16:39:53 +03:00
Jack Rainy
65b7927df6
Throw exceptions for better debugging of saved games with missing mods (#2388) 
* Throw exceptions for better debugging of saved games with missing mods

* Close buttons are added
 2020-04-12 14:40:17 +03:00
Yair Morgenstern
6fa22a92a1 Merge branch 'master' of https://github.com/yairm210/Unciv 2020-04-11 22:35:28 +03:00
Yair Morgenstern
2336f4d794 Show experience tutorial on promotion screen - LOTS of people ask about "can't get more than 30 XP" 2020-04-11 22:34:52 +03:00
Jack Rainy
0624542fd8
New civilization: Denmark (#2370) 
* Enable the Denmark civilization

* Nation unique ability is implemented

* Units unique abilities are implemented

* Unit icons

* Misprint in the tech name is corrected
 2020-04-11 22:31:53 +03:00
Yair Morgenstern
cc1ae034d3 Fixed "Trade is no longer valid" problem 2020-04-11 22:26:12 +03:00
Yair Morgenstern
d092e9b6a9 Resources immediately come back after declined trades 2020-04-11 22:23:32 +03:00
proteus-anguinus
7511fc52df
Cancel improvement (#2359) 
* Bring Incas into the main game
(also changes slinger withdraw ability to inheritable)

* Update Nations.json

* For @JoshDM - Improvement Picker offers "Cancel improvement order"

* Improvement Picker offers "Cancel improvement order" - cleanup

* Improvement Picker offers "Cancel improvement order" - cleanup 2

* Improvement Picker offers "Cancel improvement order" - cleanup 3

Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
 2020-04-11 22:02:00 +03:00
Jack Rainy
bf823f5883
Display the "Natural Wonders" tutorial (#2371) 
* Update Tutorials.json

Added tutorial for Natural Wonders

* Enable displaying the Natural Wonders tutorial

* Display the tutorial when the wonder is found automatically

* Minor performance optimization

* Removing debug leftovers

See also 33da0e3a7f

Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
 2020-04-11 21:44:34 +03:00
proteus-anguinus
c866d96707
Esc/Back and popups - closing all not best idea? (#2376) 
* Bring Incas into the main game
(also changes slinger withdraw ability to inheritable)

* Update Nations.json

* ESC/Back handling with multiple popups

* ESC/Back handling with multiple popups

* ESC/Back handling with multiple popups - clearer code
 2020-04-11 21:40:08 +03:00
Jack Rainy
4cc10aa38f
Do not wake up a general or a worker if they are protected (#2383) 2020-04-11 21:37:40 +03:00
Jack Rainy
84f41341f6
Do not allow to build great improvement, if it already exists here (#2382) 2020-04-11 21:37:06 +03:00
Jack Rainy
ccd81fe69c
Woodsman promotion works as expected now (#2368) 2020-04-10 10:33:53 +03:00
proteus-anguinus
d063c4cda1
Fix for #2358 crashing newgame choose nation (#2369) 
* Bring Incas into the main game
(also changes slinger withdraw ability to inheritable)

* Update Nations.json

* Fix for #2358 JR's catch - crash after selection in nation picker
- events can fire after an actor has already been removed from its stage
 2020-04-10 10:26:08 +03:00
proteus-anguinus
323613ba02
Rework options UI (#2367) 
* Bring Incas into the main game
(also changes slinger withdraw ability to inheritable)

* Update Nations.json

* Reworked Options Menu: Clarity, No Scroll jump, less repaints

* Reworked Options Menu: Minor cosmetic change

* Reworked Options Menu: Removed test code
 2020-04-10 10:22:53 +03:00
SomeTroglodyte
25a5559969
Keyboard support for Next-button and Unit actions redone (#2372) 2020-04-10 10:16:22 +03:00
proteus-anguinus
33da0e3a7f
Optimize conditional tutorials (#2378) 
* Bring Incas into the main game
(also changes slinger withdraw ability to inheritable)

* Update Nations.json

* Optimize-Tutorial-Conditions: Measure 'Before'

* Optimize-Tutorial-Conditions: Deferred tests

* Optimize-Tutorial-Conditions: Remove instrumentation
 2020-04-10 10:13:17 +03:00
proteus-anguinus
757fa7eeb7
Language picker and new installs (#2353) 
* Bring Incas into the main game
(also changes slinger withdraw ability to inheritable)

* Update Nations.json

* Re-think of the New-Installs Language Picker

* Language picker and new installs - reworked how flag is cleared
 2020-04-10 10:11:34 +03:00
proteus-anguinus
d15abd66b6
Scroll panes get scrollfocus automatically (#2358) 
* Bring Incas into the main game
(also changes slinger withdraw ability to inheritable)

* Update Nations.json

* ScrollPanes steal and release focus automatically

* ScrollPanes steal and release focus automatically: Commented & param names
 2020-04-08 16:30:10 +03:00
proteus-anguinus
9f46ceea24
Fix Back=Leave game on Android, ESC=Back, both in Popups (#2356) 
* Bring Incas into the main game
(also changes slinger withdraw ability to inheritable)

* Update Nations.json

* Back button fix, ESC, and behaviour of them in popups

* ESC/Back now work if there's no exitEvent

* ESC/Back: JackRainy is right, exit prompt now cancellable with same key
 2020-04-08 15:55:00 +03:00
Yair Morgenstern
1ebe618761 Merge branch 'master' of https://github.com/yairm210/Unciv 2020-04-08 15:15:16 +03:00
Yair Morgenstern
eabf17186c Hopefully resolved #2361 - added libdiscord-rpc.so for 32-bit linux 2020-04-08 15:15:04 +03:00
Jack Rainy
73aeaf6ad7
Autosize of the tech buttons (#2346) 
* Autosize of the tech buttons

* Using minWidth parameter
 2020-04-07 20:53:05 +03:00
Jack Rainy
e4fab26b43
Display the crosshair in alternate color for distant targets (#2347) 2020-04-07 11:37:14 +03:00
proteus-anguinus
5cd75188b3
Fortify until healed: Disable if no more movement points (#2350) 
* Bring Incas into the main game
(also changes slinger withdraw ability to inheritable)

* Update Nations.json

* Fix: Fortify until healed shouldn't be enabled when Fortify isn't
 2020-04-07 11:36:32 +03:00
Jack Rainy
d7f5664efd
Using objects when classes are not needed (#2329) 
* Using objects when classes are not needed

* Not used code cleanup

* Using objects when classes are not needed (part 2)
 2020-04-06 20:29:41 +03:00
Jack Rainy
e869eb26f7
Display price for temporary unavailable purchases (#2344) 2020-04-06 20:06:24 +03:00
Yair Morgenstern
4bb92e2ffe Resolved #2340 - cannot open multiple 'disband unit' popups for hash hack 2020-04-06 13:57:49 +03:00
proteus-anguinus
cee794b29c
Discord thread shutdown, last Autosave singlethreaded (#2318) 
* Bring Incas into the main game
(also changes slinger withdraw ability to inheritable)

* Update Nations.json

* Discord thread is now a timer and gets notified to shut down
Solved truncated Autosaves: Made it singlethreaded within shutdown.

Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
 2020-04-06 13:43:40 +03:00
Yair Morgenstern
adb52acd24 Tutorial tests fixed, this is becoming tedious fast. 2020-04-06 11:57:45 +03:00
Yair Morgenstern
c8c2bbb00a Policy screen does not auto-open when you have a free policy, instead coming from clicking the 'next turn' button - should help us solve the "screen unresponsive when I have a free policy" problem, if not eliminate it entirely 2020-04-05 10:54:16 +03:00
Jack Rainy
29a077a803
Forts and citadels (with AI) (#2325) 
* Enabled Forts & Citadels

* Friendly territory checks

* Citadel damage & notifications

* Sprites, Icons, Translation & Atlas

* Obsolete tests are removed

* NullReferenceException code is fixed

* Refactoring: using the static object

* AI for the forts and citadels

* Display defence stats

* Exclude enemies tiles as candidates

Co-authored-by: r3versi <fluo392@gmail.com>
 2020-04-03 11:22:27 +03:00
proteus-anguinus
10762a3873
Desktop window size restore (#2319) 
* Bring Incas into the main game
(also changes slinger withdraw ability to inheritable)

* Update Nations.json

* Small version: remember window size only, and leave positioning to Gdx
 2020-04-03 10:33:46 +03:00
Yair Morgenstern
8f583732aa Not being able to read the settings file shouldn't make you crash 
Happened to 2 users out of almost 400K, but it's an easy fix so why not help the 0.005%
 2020-04-03 10:28:49 +03:00
proteus-anguinus
0289af28ce
Update GameSettings.kt (#2320) 
__This__ nuclearWeaponEnabled is now a zombie.
 2020-04-03 09:59:20 +03:00
Jack Rainy
ec0f41d015
NullReferenceException code is fixed (#2326) 2020-04-03 09:58:49 +03:00
Yair Morgenstern
2a23d1db6c Uncivbot moved to its own repo, for future hosting reasons 2020-04-02 14:50:56 +03:00
Jack Rainy
dde01738de
New wonders: Mausoleum of Halicarnassus, Statue of Zeus (#2301) 
* New wonder: Mausoleum of Halicarnassus

* New wonder: Statue of Zeus

* Obsolete tests are removed
 2020-04-01 20:12:25 +03:00
Yair Morgenstern
4ab154ea99 I forgot that tutorials have an Enum, kudos to Travis 2020-04-01 16:52:44 +03:00
Yair Morgenstern
8965074cc3 Resolved #2135 - added tutorials for Research Agreements, Combat and Experience 
The Pillaging tutorial is now available in Civilopedia
Updated translations to reflect new tutorials
 2020-04-01 16:40:07 +03:00
Yair Morgenstern
dffd377510 Nuclear weapons setting moved to a per-game parameter 2020-04-01 16:09:13 +03:00
Yair Morgenstern
567a9446ad Removed pre-3.0 deprecated fields - there's a limit to how long you can reasonably stay backwards-compatible to older saves 2020-03-31 23:10:48 +03:00
Yair Morgenstern
4e365acd6b 3.6.14-patch1 
Fixed crash when non-resource trades are made
 2020-03-31 14:15:13 +03:00
Yair Morgenstern
93e4888191 AI will not constantly bug you about research agreements 2020-03-30 23:25:35 +03:00
Jack Rainy
b212f2bfd0
UI bugfixes: city info and aircrafts (#2289) 
* Display aircraft icon even for full carriers

* Do not reveal strategic city information like aircrafts or units near by
 2020-03-30 23:06:18 +03:00
Yair Morgenstern
c04b450a70
Translations (#2288) 
* Update Polish.properties (#2275)

* Update Italian.properties (#2276)

* Update French.properties (#2279)

* Traditional Chinese Update (#2283)

Update for the traditional Chinese translations.

* Update translations + notification about generated translation files (#2280)

* Translations

* Notify about successful creation of the files

* A few more translations

* Misprint is corrected

* Translations for Inca

* Translation updates

Co-authored-by: RadioMagnetofonStereofoniczny <remixionmix@gmail.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: RobertGine <61517798+RobertGine@users.noreply.github.com>
Co-authored-by: The Bucketeer <57716526+GeneralWadaling@users.noreply.github.com>
Co-authored-by: Jack Rainy <JackRainy@users.noreply.github.com>
 2020-03-30 22:14:49 +03:00
Jack Rainy
fcd25978c9
Display the hidden units indicators (#2274) 2020-03-30 09:19:39 +03:00
proteus-anguinus
4064f2c2cf
Fix: Unit Range in Civilopedia Nation Unique Units (#2286) 
unit range when shown as difference to base unit for a unique unit is placed twice.
I haven't checked the impact on translations or playtested.
 2020-03-30 09:17:37 +03:00
Jack Rainy
0290051aa0
Ability to place the resources over the terrain features (#2270) 
* Ability to place the resources over the terrain features

* Fossils can be found under the forest

* Revert previous commit "Fossils can be found under the forest"

This reverts commit 4e1fcd8c45ffd08090ce4b808d228636bfccfc6b.

* Ignore the vegetation and spawn the resource right under it
 2020-03-29 22:41:27 +03:00
Jack Rainy
f79d01162b
Better handling of WSAD without CPU burden (#2284) 2020-03-29 21:24:09 +03:00
Jack Rainy
37e322a631
Decrease of the battery usage (#2281) 
* Decrease battery usage: no animation of damage in the health bar

* Decrease battery usage: no WSAD support for Android

Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
 2020-03-29 16:31:24 +03:00
Yair Morgenstern
0db473e5bc Constructions requiring missing resources once again shown in city construction choices 2020-03-29 16:19:07 +03:00
Yair Morgenstern
b0a74dfa86 Resolved #1964 - Construction resource consumption is explicitly stated in construction picking and queue 2020-03-29 14:50:40 +03:00
Yair Morgenstern
806a0e2269 Resources in Civilopedia state unit and buildings that consume the resource - #1964 2020-03-29 14:29:19 +03:00
Yair Morgenstern
378f56207c Resolved #1779 - Can now lock worked tiles to prevent them from being unassigned 2020-03-29 12:42:58 +03:00
Yair Morgenstern
9785cafa54 Resoved #1869 - added WASD support for map panning 2020-03-29 11:37:20 +03:00
Yair Morgenstern
387e415fe9 Resolved #1885 - Both sides of per-turn trades end at the same time, resources offered in trade requests are not considered yours for that turn 2020-03-29 10:20:50 +03:00
Yair Morgenstern
c6d054431c Cities in unit overview are translated - #2242 2020-03-29 01:51:33 +03:00
Yair Morgenstern
29624bfa12 Revealed resources generate notifications even if they're outside of your current city borders (but close enough) 2020-03-29 01:48:15 +03:00
Yair Morgenstern
4331407398 Harbors immediately connect cities to the trade network 2020-03-29 01:37:52 +03:00
Yair Morgenstern
0387ce4ff6
Translations (#2273) 
* Translations for unit ability withdraw before melee (#2255)

* update Chinese translation. (#2263)

* Update Czech.properties (#2262)

* Update Czech.properties

fixed typo, used better Iver88's translations lost due to conflict

* Update Czech.properties

correct "achaemenid" form

* Portuguese translations (#2271)

* Updated Portuguese translations

* Fixed typos and missing letters.

* Update Polish.properties (#2258)

* Update Polish.properties

* fix "x"

* hotfix v2

* Cities Translations

* Update Polish.properties

Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>

* Update Italian.properties (#2259)

* Translations (#2268)

* Translations

* Withdraw translations

* Translation file generation moved to game options,, so game modders can generate files in-game and not need to build Unciv from scratch

* Translation updates

Co-authored-by: proteus-anguinus <github2015@rheinig.de>
Co-authored-by: lishaoxia1985 <49801619+lishaoxia1985@users.noreply.github.com>
Co-authored-by: stoupa007 <60326342+stoupa007@users.noreply.github.com>
Co-authored-by: W Gomes <42829628+w-gomes@users.noreply.github.com>
Co-authored-by: RadioMagnetofonStereofoniczny <remixionmix@gmail.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: Jack Rainy <JackRainy@users.noreply.github.com>
 2020-03-28 22:32:32 +03:00
Yair Morgenstern
55ffd94af5 All cityinfo functions now work with same definition of 'food we'll get next turn', to avoid silly arithmetic errors 2020-03-28 21:51:09 +03:00
Yair Morgenstern
9f0ee0d578 Merge branch 'master' of https://github.com/yairm210/Unciv 2020-03-28 21:42:32 +03:00
Yair Morgenstern
2c83bd0896 Errors from icorrect pathing were happening in another function, so got rid of all passing around of unitTilesToDistance, for good measure 2020-03-28 21:41:14 +03:00
Jack Rainy
c749fe6188
Carrier must be a water ranged unit (#2267) 2020-03-28 21:31:33 +03:00
Yair Morgenstern
882ca6f22b Removed translation tests that are no longer necessary - 'check' passes successfully 
'Wander' now gets its own distance to tiles, solving a really niche bug
 2020-03-28 21:29:52 +03:00
Yair Morgenstern
a2a38e48ca Simplified MapParametersTable sliders 
More onChange{ } changes
 2020-03-26 15:45:59 +02:00
Yair Morgenstern
d64bd088c2 Added helper functions for onChange and selectboxes/checkboxes 2020-03-26 13:51:16 +02:00
Yair Morgenstern
ad2bf0f91b Resolved #2214 - Civilopedia entries are now left-aligned 2020-03-26 12:50:58 +02:00
Yair Morgenstern
093ee0e3a9 City stats and resources updates after creating great improvement 2020-03-26 10:43:27 +02:00
Jack Rainy
2d33273c8d
Translation of the mod's name (#2260) 2020-03-26 10:21:00 +02:00
proteus-anguinus
144d53b6df
Civilopedia: Improvement: show bonus for improvingTech (#2261) 
* Civilopedia improvement techupgrade

* Fixed overzealous cleanup

* 3 Languages for the new line
 2020-03-25 22:24:41 +02:00
Yair Morgenstern
5cdb84ca79 Wonders and national wonders cannot be enqueued/built when they are also enqueued in another city 2020-03-25 16:13:41 +02:00
Yair Morgenstern
44b69d2d87 Added progress bars for constructions in city screen 2020-03-25 14:51:18 +02:00
Yair Morgenstern
ac34b8f5ff Nicer, more consistent specialist allocation tables 2020-03-25 14:01:50 +02:00
Yair Morgenstern
b9de9a6a40 Cultural Ranking is by policies, including free policies, but not including completion policies 2020-03-25 13:43:53 +02:00
Yair Morgenstern
4b3314fe7b Stats in citystatstable are always in the same order 
turnsToGrowth and turnsToStarvation take into account food rounding on 'next turn'
 2020-03-25 13:36:14 +02:00
Yair Morgenstern
e0f14a582b City names translated in tile info table - #2228 2020-03-25 13:15:01 +02:00
proteus-anguinus
c40dd09e11
Complex ruleset merge order (#2240) 
* .gitignore: mods SaveFiles transients

* Simple transposition prevents mod improvements from appearing below roads&removals
should also move modded nations to the top in new game player picker
 2020-03-25 12:52:20 +02:00
proteus-anguinus
06af3917ce
Re-merge into fresh fork of code only from #2216 (#2252) 2020-03-25 12:48:22 +02:00
Yair Morgenstern
52612f4f32 Should now be able to read mod translations on Android - #2228 2020-03-25 11:41:32 +02:00
proteus-anguinus
8ebbd881d0
Newgame screens and mods (#2250) 
* Recreated diff for #2231

* Refactor for code readability. 4 loops instead of 2, but they hardly hurt
 2020-03-25 11:14:53 +02:00
Yair Morgenstern
f22a5723f8 Nuclear weapons enabled by default 2020-03-25 11:02:22 +02:00
Yair Morgenstern
5c81bf2534 When moving between units to units in cities, tiles they can move to are now shown 2020-03-25 10:43:33 +02:00
Jack Rainy
ea3f7f9dc0
Translations for the mods (#2228) 
* Insert the empty lines to split the nations, policies, etc.

* Read the translations from the mod folders

* Refactoring: Get local link to the translations

* Refactoring: Moving percentage calculations into the TranslationFileWriter

* Refactoring: Caching of the generated strings is removed

* Generate the languages files for the mods

* Minor refactoring

* Using local file storage
 2020-03-25 10:16:03 +02:00
Yair Morgenstern
abb59ae0d2 Performance improvements in finding cities connected to capital 2020-03-24 18:16:58 +02:00
Yair Morgenstern
fa9ccba503 Resolved some ANRs in Multiplayer 2020-03-24 17:58:34 +02:00
Yair Morgenstern
0355223c01 Got rid of useless WaterMissileCarrier promotion 
Transportation refactor
 2020-03-24 17:53:14 +02:00
Yair Morgenstern
81a4092538 Resolved #2242 - city names now translated in overview 2020-03-24 00:09:06 +02:00
Yair Morgenstern
d3165b80f1 More translation cleanup, when will it eeeeeeend 2020-03-23 10:17:04 +02:00
rh-github-2015
8aab5bb80b
Inca abilities: Great Andean Road, Terrace farm (#2218) 
* Inca abilities for Terrace farm and Great Andean Road

* Language files re-done by manual pull and merge

Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
 2020-03-23 10:13:40 +02:00
Yair Morgenstern
063486ab09 Impassible > Impassable change - #2225 2020-03-23 10:07:05 +02:00
rh-github-2015
4fb7e11354
Mod loader resilience (#2211) 
* For #2200: Avoid MacOS tripping us

* Second hidden test in packImages

* Clearer message for a specific mod error, UI message for savegames missing mods

* Fixed obsolete imports from rejected experiments

* Tiny lint issue

* Irrelevant change to test push after rebase
 2020-03-22 22:43:39 +02:00
Yair Morgenstern
3734f39101 Changed "Requires [resource]" to "Consumes 1 [resource]" to make it obvious that resource is consumed - #1964 2020-03-22 22:40:07 +02:00
rh-github-2015
c647261a18
More civilopedia info for nation and improvement (#2190) 
* A little more information in civilopedia for improvements and nations

* Differentiate civilopedia and picker use

* Missing lines in translations template

* allTranslationsEndWithASpace test

Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
 2020-03-22 21:00:18 +02:00
Yair Morgenstern
8836800957 Resolved #2224 - can no longer enter the promotions screen from the overview screen if there are no valid promotions 2020-03-22 20:42:22 +02:00
Yair Morgenstern
f6ba4cf409 Resolved #2150 - Added resource type to civilopedia description 2020-03-22 13:25:09 +02:00
Yair Morgenstern
b43e543f23 Resolved #2175 - Can no queue multiple perpetual builds 2020-03-21 21:39:07 +02:00
Yair Morgenstern
0da8cbd607 Removed "Declare war on X" trade option when there's an active peace treaty 2020-03-21 21:27:47 +02:00
Yair Morgenstern
b28a247bd0 Fixed "other civ doesn't get duration on timed trades" bug 2020-03-21 21:27:11 +02:00
Yair Morgenstern
56c547886c 3.6.10 
Unit Action buttons stick to the left  - #2214
 2020-03-21 21:11:38 +02:00
Jack Rainy
8fea884ec8
Great Improvements can be built on rough terrains (#2217) 2020-03-21 20:56:42 +02:00
Jack Rainy
9fe9a61396
Corrections to the Wonders stats (#2215) 
Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
 2020-03-21 20:56:16 +02:00
EdinCitaku
e06d537688
Feature#2081 (#2100) 
* Unit can now only be purchased if no other unit of same type is stationed in city center #2081

* #2081
Added unique to landsknecht and changed condition for movement panelty

* Refactored when statement to if
#2081

* Only one plane at a time can be purchased to a maximum of 6 that are NOT transported in a single city
#2081

* removed duplicate code
#2081

* refactor canPurchase() and now track bought units in a city in a mutableList
#2081

* refactor canPurchase() it basicly just tracks if the unit can be placed on the center tile! if it cant then we dont allow the purchase!
#2081

* Changed wording of unique and added translations
#2081

* Changed wording of unique
#2081

* removed unneeded imports
#2081

Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
 2020-03-21 20:35:30 +02:00
Jack Rainy
d7ac7f9173
Translation refactoring - part 3 (all JSONs) (#2205) 
* Refactoring: Split reading and writing of translation files

* New generator of translation strings from JSONs

* Switch to the new strings generation approach

* Using the regex for similar strings + bugfix for Submarines

* Transfer of the existing translations

* Clean up of the template file and translated files based on it

* Unit tests are updated

Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
 2020-03-21 20:32:04 +02:00
Jack Rainy
75c71700db
The link to Reddit is added (#2212) 2020-03-21 20:27:48 +02:00
rh-github-2015
27c0aedbbd
Clearer free promotions, nicer Maori Warrior, missing new UnitType translations (#2210) 2020-03-21 20:19:50 +02:00
Jack Rainy
8767342810
Double range of rebase for air units (#2154) 
* Double range of rebase for air units

* Consider carriers as rebase points

* Clean up of never used code
 2020-03-21 20:12:11 +02:00
rh-github-2015
4bd810d5dd
New columns in overview-units: promotion, health (#2187) 2020-03-19 09:57:53 +02:00
rh-github-2015
f75312f7a1
Show a mod loader exception in console (#2191) 2020-03-19 09:47:15 +02:00
rh-github-2015
497ce2366a
Clean up redundant stuff found in save files (#2192) 2020-03-19 09:43:05 +02:00
wrov
e308f1fe0c
Added logic to check Player- and Game-IDs according to new layout. (#2108) 
Backwards compatible to old format.
 2020-03-18 22:55:57 +02:00
rh-github-2015
701ddcb76b
Trade offers better sorting with user choice (#2180) 
#2152 is nice but sorts by internal key, thus translations are not
    taken into account and cities are sorted by their guid
   Also moving larger amounts to the top may not be everyone's taste
   so this offers the user a choice
 2020-03-18 10:21:50 +02:00
rh-github-2015
076821a181
Fix: Freshly improved resources often do not show up on world screen, overview or trade (#2182) 
Issue visible right at start of turn, saving and reloading viable workaround.
 2020-03-18 09:55:10 +02:00
Jack Rainy
6c5f729333
Sorted list of icons for promotions (#2164) 2020-03-16 12:55:48 +02:00
Jack Rainy
c7d020e32d
Filter for the custom maps (#2163) 2020-03-15 21:10:59 +02:00
Jack Rainy
2cbc0e93e0
Ice is impassible for all except submarines (#2158) 
* Ice is impassible for all except submarines

* Using "unique" property + simplified call of functions
 2020-03-15 18:24:52 +02:00
Yair Morgenstern
feb786c9ee Merge branch '3.6.7-patch2' 2020-03-14 21:50:09 +02:00
Yair Morgenstern
fa41e50a33 Resolves #2157 - 3.6.7-patch2 2020-03-14 21:46:45 +02:00
Jack Rainy
a18d52c82a
Sort resources by name and amount (#2152) 2020-03-14 20:13:46 +02:00
Yair Morgenstern
1978d7e707 Merge branch 'master' of https://github.com/yairm210/Unciv 2020-03-12 21:16:32 +02:00
Yair Morgenstern
d8d74b6873 Resolved #2137 - Fixed worker automation for snow tiles, AND settler automation fix 2020-03-12 21:03:36 +02:00
Jack Rainy
dd438f16c8
Translation refactoring - part 2 (Tutorials) (#2114) 
* Make TranslationFileReader as object class

* Generate strings from Tutorials.json

* Simplified storage and loading of the tutorials

* Transfer existing translations
 2020-03-12 16:38:57 +02:00
Jack Rainy
c7e8dfb8fb
Energy saving: music and sounds (#2128) 2020-03-12 08:35:45 +02:00
Jack Rainy
528392baab
Allow selection of non-buildable items (#2126) 2020-03-12 08:34:44 +02:00
Jack Rainy
e370bbc53b
Hide crosshair while city can't attack (#2124) 2020-03-12 08:33:03 +02:00
Jack Rainy
97a9a0f08c
Display an amount of gold when buying the tile (#2127) 2020-03-12 08:32:29 +02:00
lishaoxia1985
1564856391
Turn number of trade changes with game speed. (#2123) 2020-03-11 21:43:59 +02:00
Federico Luongo
2a67294554
Snow, Ice, Atoll & Map Generation (#1909) 
* Snow, Atoll & Ice

* Fix White Hexagon + Small NW refactor

* More Land in Continents #1886

* Atoll can spawn only on Coast

* Added new constants and turned Constant into an object

* Latitude and Longitude utility methods

* New MapGenerator steps

* New MapParameters & MapGenerator cleanup

* Added New Map option to MapEditor menu

* New parameters default values and limits

* archipelagos map type

* Translations & Atlas

* removing unneeded octave displacement

* Fix Archipelago

* Perlin noise parameters & no-elvis in TileMap

* Rebuilt Atlas

Co-authored-by: Eddh <remi.dufour@protonmail.com>
 2020-03-11 11:39:37 +02:00
Jack Rainy
15098d877c
Translations refactoring (#2096) 
* Rename "translationsByLanguage" folder

* Minor refactoring

* Generate Nations strings

* Use the nations strings while creating the translation files

* Clean up of Nations files

* Transfer existing translations

* Get rid of the nation's translated name

* Transfer just few nations' translations for languages without Nations_Language.json

* Clean up of not used greetings

* Correct marking of not translated strings
 2020-03-10 10:17:05 +02:00
Yair Morgenstern
30a2eda15f UnitTable no longer scrolls when unnecessary 2020-03-09 22:13:47 +02:00
Jack Rainy
13def8739e
Corrections according to #2101 (#2105) 
* College requires Phylosophy

* "Police State" influences the courthouses, not culture borders

* "Autocracy complete" has +20 attack effect

* Translations updates
 2020-03-09 00:00:32 +02:00
Jack Rainy
f769d60826
Do not recreate the window (#2107) 2020-03-08 23:58:32 +02:00
Federico Luongo
0cf27789e9
Borders made of oriented triangles rather than circles (#2104) 2020-03-08 20:36:50 +02:00