Commit graph

3464 commits

Author SHA1 Message Date
proteus-anguinus
7591d7f2c6
Add unit ability 'withdraw before melee' to Caravel and Destroyer (#2256) 2020-03-25 22:25:30 +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
4219776329 3.6.12 2020-03-25 16:23:59 +02:00
Yair Morgenstern
476632e57a
Translations (#2254)
* Update French.properties (#2235)

* Update French.properties

* Germany

* Ottomans

* Korea

* Some more

* Some more about City-states

* Update Italian.properties (#2245)

* Update Polish.properties (#2247)

* Update Czech.properties (#2248)

typos, syncing terminology, new translations

* Czech translation (#2249)

* Civ uniques

* New mod system improvement texts

* Unification of "options"

* Options

* "nuclear" unification

* Options

* World screen UI

* "adjacent" unification

* Resources

* Unit types

* Buildings

* Nations

* "sousední" is better then "sousedící"

* "Zlatá věk" typo fix

Co-authored-by: Tomáš Tříska <tomas.triska@icloud.com>

* Translation updates

Co-authored-by: RobertGine <61517798+RobertGine@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: Freshy <60152907+GreenFreshy@users.noreply.github.com>
Co-authored-by: stoupa007 <60326342+stoupa007@users.noreply.github.com>
Co-authored-by: Iver88 <tomas.iver.triska@gmail.com>
Co-authored-by: Tomáš Tříska <tomas.triska@icloud.com>
2020-03-25 16:20:40 +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
fa7097d7c3 Republic description deambiguated 2020-03-25 11:50:46 +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
5402ae7b82 3.6.11 2020-03-23 23:58:47 +02:00
Yair Morgenstern
acca46b40e
Translations (#2243)
* Update 2 (#2223)

A major fix on some things

* Update Italian.properties (#2226)

* Update Polish.properties (#2234)

* Update Polish.properties

* Update Polish.properties

* German translations added (#2239)

* Added german translations

* Added german translations (stopped @England)

* Update Nations_German.json

Fixed unique-enums

* Updated German.properties

* Update German.properties

Co-authored-by: Fabian Wrobel <fabian.wrobel@freenet,de>

* Translation updates

Co-authored-by: Yusyf <62476990+Yusyf@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: Freshy <60152907+GreenFreshy@users.noreply.github.com>
Co-authored-by: CarpeLuxNoctem <61473456+CarpeLuxNoctem@users.noreply.github.com>
Co-authored-by: Fabian Wrobel <fabian.wrobel@freenet,de>
2020-03-23 23:54:11 +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
110f89e309 More translation fixes, this is becoming extremely tedious 2020-03-21 21:51:07 +02:00
Yusyf
5e5625a4a5
Update Turkish.properties (#2220)
A translation on many parts of the thing, going to continue tomorrow maybe

Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
2020-03-21 21:46:13 +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
Yair Morgenstern
2490943e2e All translations normalized - all new translation changes will be made to new format =) 2020-03-21 20:52:42 +02:00
armandberger
cc34576b0a
Some french translations (#2209) 2020-03-21 20:50:43 +02:00
DenysDanov
80d2bc7bed
Update Ukrainian.properties (#2208)
* Update Ukrainian.properties

Some cities was translated
Updated some tech names
Another minor fix

* Update Ukrainian.properties

Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
2020-03-21 20:50:29 +02:00
rh-github-2015
dbdd96848e
Update German.properties (#2204)
Changes to existing translations are I hope well thought out: I tried to limit myself to clear inconsistencies (e.g. marsh appears exactly twice and had two different translations before), stuff where I looked up the game context to best match what a native german would understand comfortably in the UI, and so on. There are still several inconsitencies - if I noticed one and couldn't bother to guarantee matching them all I left them.

Note I 'fixed' some spanish city names where the _english_ side is clearly wrong. Particularly Elche (https://goo.gl/maps/jtqPqGG2mkVbFxCe6). Actual translations are only about three where we krauts have fixed expectations deviating from the proper name. Mail me if I should fix those properly in jsons and template?

Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
2020-03-21 20:48:10 +02:00
rh-github-2015
627ca0ca43
New translation line for 2180 (#2201)
* Another line for translations template and its german

* Francais y espanol tambien

Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
2020-03-21 20:45:23 +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