Commit Graph

2043 Commits

Author SHA1 Message Date
06af3917ce Re-merge into fresh fork of code only from #2216 (#2252) 2020-03-25 12:48:22 +02:00
52612f4f32 Should now be able to read mod translations on Android - #2228 2020-03-25 11:41:32 +02:00
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
f22a5723f8 Nuclear weapons enabled by default 2020-03-25 11:02:22 +02:00
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
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
abb59ae0d2 Performance improvements in finding cities connected to capital 2020-03-24 18:16:58 +02:00
fa9ccba503 Resolved some ANRs in Multiplayer 2020-03-24 17:58:34 +02:00
0355223c01 Got rid of useless WaterMissileCarrier promotion
Transportation refactor
2020-03-24 17:53:14 +02:00
81a4092538 Resolved #2242 - city names now translated in overview 2020-03-24 00:09:06 +02:00
d3165b80f1 More translation cleanup, when will it eeeeeeend 2020-03-23 10:17:04 +02:00
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
063486ab09 Impassible > Impassable change - #2225 2020-03-23 10:07:05 +02:00
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
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
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
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
f6ba4cf409 Resolved #2150 - Added resource type to civilopedia description 2020-03-22 13:25:09 +02:00
b43e543f23 Resolved #2175 - Can no queue multiple perpetual builds 2020-03-21 21:39:07 +02:00
0da8cbd607 Removed "Declare war on X" trade option when there's an active peace treaty 2020-03-21 21:27:47 +02:00
b28a247bd0 Fixed "other civ doesn't get duration on timed trades" bug 2020-03-21 21:27:11 +02:00
56c547886c 3.6.10
Unit Action buttons stick to the left  - #2214
2020-03-21 21:11:38 +02:00
8fea884ec8 Great Improvements can be built on rough terrains (#2217) 2020-03-21 20:56:42 +02:00
9fe9a61396 Corrections to the Wonders stats (#2215)
Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
2020-03-21 20:56:16 +02:00
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
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
75c71700db The link to Reddit is added (#2212) 2020-03-21 20:27:48 +02:00
27c0aedbbd Clearer free promotions, nicer Maori Warrior, missing new UnitType translations (#2210) 2020-03-21 20:19:50 +02:00
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
4bd810d5dd New columns in overview-units: promotion, health (#2187) 2020-03-19 09:57:53 +02:00
f75312f7a1 Show a mod loader exception in console (#2191) 2020-03-19 09:47:15 +02:00
497ce2366a Clean up redundant stuff found in save files (#2192) 2020-03-19 09:43:05 +02:00
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
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
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
6c5f729333 Sorted list of icons for promotions (#2164) 2020-03-16 12:55:48 +02:00
c7d020e32d Filter for the custom maps (#2163) 2020-03-15 21:10:59 +02:00
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
feb786c9ee Merge branch '3.6.7-patch2' 2020-03-14 21:50:09 +02:00
fa41e50a33 Resolves #2157 - 3.6.7-patch2 2020-03-14 21:46:45 +02:00
a18d52c82a Sort resources by name and amount (#2152) 2020-03-14 20:13:46 +02:00
1978d7e707 Merge branch 'master' of https://github.com/yairm210/Unciv 2020-03-12 21:16:32 +02:00
d8d74b6873 Resolved #2137 - Fixed worker automation for snow tiles, AND settler automation fix 2020-03-12 21:03:36 +02:00
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
c7e8dfb8fb Energy saving: music and sounds (#2128) 2020-03-12 08:35:45 +02:00
528392baab Allow selection of non-buildable items (#2126) 2020-03-12 08:34:44 +02:00
e370bbc53b Hide crosshair while city can't attack (#2124) 2020-03-12 08:33:03 +02:00
97a9a0f08c Display an amount of gold when buying the tile (#2127) 2020-03-12 08:32:29 +02:00
1564856391 Turn number of trade changes with game speed. (#2123) 2020-03-11 21:43:59 +02:00
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