Commit graph

2154 commits

Author SHA1 Message Date
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