Commit Graph

2231 Commits

Author SHA1 Message Date
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
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
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
935071e206 Merge branch 'master' of https://github.com/yairm210/Unciv 2020-04-13 11:09:21 +03:00
efc131c863 Preserve mod order in ruleset and game parameters 2020-04-13 11:08:59 +03:00
fb602d01eb Civilopedia: Graphic decoration for terrain, fix movement/impassable (#2395) 2020-04-13 10:49:32 +03:00
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
9b26ab1385 Civilopedia: Init logical order, changed geometry to make better use of screen (#2396) 2020-04-13 10:41:18 +03:00
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
23c6fad5db Take map relief into account (#2389) 2020-04-12 16:39:53 +03:00
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
6fa22a92a1 Merge branch 'master' of https://github.com/yairm210/Unciv 2020-04-11 22:35:28 +03:00
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
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
cc1ae034d3 Fixed "Trade is no longer valid" problem 2020-04-11 22:26:12 +03:00
d092e9b6a9 Resources immediately come back after declined trades 2020-04-11 22:23:32 +03:00
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
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
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
4cc10aa38f Do not wake up a general or a worker if they are protected (#2383) 2020-04-11 21:37:40 +03:00
84f41341f6 Do not allow to build great improvement, if it already exists here (#2382) 2020-04-11 21:37:06 +03:00
ccd81fe69c Woodsman promotion works as expected now (#2368) 2020-04-10 10:33:53 +03:00
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
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
25a5559969 Keyboard support for Next-button and Unit actions redone (#2372) 2020-04-10 10:16:22 +03:00
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
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
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
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
1ebe618761 Merge branch 'master' of https://github.com/yairm210/Unciv 2020-04-08 15:15:16 +03:00
eabf17186c Hopefully resolved #2361 - added libdiscord-rpc.so for 32-bit linux 2020-04-08 15:15:04 +03:00
73aeaf6ad7 Autosize of the tech buttons (#2346)
* Autosize of the tech buttons

* Using minWidth parameter
2020-04-07 20:53:05 +03:00
e4fab26b43 Display the crosshair in alternate color for distant targets (#2347) 2020-04-07 11:37:14 +03:00
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
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
e869eb26f7 Display price for temporary unavailable purchases (#2344) 2020-04-06 20:06:24 +03:00
4bb92e2ffe Resolved #2340 - cannot open multiple 'disband unit' popups for hash hack 2020-04-06 13:57:49 +03:00
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
adb52acd24 Tutorial tests fixed, this is becoming tedious fast. 2020-04-06 11:57:45 +03:00
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
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
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
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
0289af28ce Update GameSettings.kt (#2320)
__This__ nuclearWeaponEnabled is now a zombie.
2020-04-03 09:59:20 +03:00
ec0f41d015 NullReferenceException code is fixed (#2326) 2020-04-03 09:58:49 +03:00
2a23d1db6c Uncivbot moved to its own repo, for future hosting reasons 2020-04-02 14:50:56 +03:00
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
4ab154ea99 I forgot that tutorials have an Enum, kudos to Travis 2020-04-01 16:52:44 +03:00
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
dffd377510 Nuclear weapons setting moved to a per-game parameter 2020-04-01 16:09:13 +03:00