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