Commit graph

3421 commits

Author SHA1 Message Date
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
Yair Morgenstern
49a0b90331 3.6.9 2020-03-19 10:30:01 +02:00
Yair Morgenstern
958d1d016d
Translations (#2198)
* Update Italian.properties (#2169)

* Update Romanian.properties (#2183)

* Update Turkish.properties (#2172)

Co-authored-by: rayray61 <54810477+rayray61@users.noreply.github.com>

* Romanian Tutorial tasks translated (#2174)

Hello, I have translated the Romanian Tutorial tasks and probably the right way this time.

* some french translations (#2185)

* Update Indonesian.properties (#2186)

Kinda lazy this time cuz i'm tired, probably gonna continue later

* Update Czech.properties (#2189)

synced translation terms
some new translations - nations, uniques, babylon, grece

* Update Simplified_Chinese.properties (#2194)

Completed the diplomatic languages of India, Germany, Iloko, Persia, etc

* Update Simplified_Chinese.properties (#2195)

Translated the city states and their diplomatic languages, as well as the diplomatic languages of Sanghai, Siam, Spain and Mongolia.

* Translation updates

Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: LynxRo <62301821+LynxRo@users.noreply.github.com>
Co-authored-by: Jack Rainy <JackRainy@users.noreply.github.com>
Co-authored-by: rayray61 <54810477+rayray61@users.noreply.github.com>
Co-authored-by: Vasile Stefan <62265162+FierulMare@users.noreply.github.com>
Co-authored-by: armandberger <hoel@free.fr>
Co-authored-by: F4R3LB3ST <superfarel2ymail.com@gmail.com>
Co-authored-by: stoupa007 <60326342+stoupa007@users.noreply.github.com>
Co-authored-by: tianshidoubi <48427744+tianshidoubi@users.noreply.github.com>
2020-03-19 10:24:57 +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
Ivan961
f1968af3e8
Update Russian.properties (#2184) 2020-03-19 09:38:15 +02:00
Freshy
bc8198d21a
Update Polish.properties (#2173)
Some more cities translated.
2020-03-19 09:37:53 +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
Yair Morgenstern
e8f63ef996 Merge branch 'master' of https://github.com/yairm210/Unciv 2020-03-17 00:14:18 +02:00
Yair Morgenstern
11e7a48d78 3.6.8 2020-03-16 23:44:15 +02:00
Yair Morgenstern
7faa890bf2
Translations (#2166)
* Update Polish.properties (#2140)

Not all cities have been translated. Too much work :)

* Update Italian.properties (#2142)

* Update Japanese.properties (#2159)

* Update Russian.properties (#2165)

* Translations update (#2153)

* Updates

Co-authored-by: Freshy <60152907+GreenFreshy@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: paontv <57051667+paontv@users.noreply.github.com>
Co-authored-by: Ivan961 <59473988+Ivan961@users.noreply.github.com>
Co-authored-by: Jack Rainy <JackRainy@users.noreply.github.com>
2020-03-16 23:41:00 +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
Yair Morgenstern
fa41e50a33 Resolves #2157 - 3.6.7-patch2 2020-03-14 21:46:45 +02:00
Jack Rainy
834e3e578c
Fix for the Knight's movement (#2151)
Resolves #2143
2020-03-14 20:15:58 +02:00
Jack Rainy
a18d52c82a
Sort resources by name and amount (#2152) 2020-03-14 20:13:46 +02:00
Yair Morgenstern
1978d7e707 Merge branch 'master' of https://github.com/yairm210/Unciv 2020-03-12 21:16:32 +02:00
Yair Morgenstern
d8d74b6873 Resolved #2137 - Fixed worker automation for snow tiles, AND settler automation fix 2020-03-12 21:03:36 +02:00
Jack Rainy
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
Jack Rainy
c7e8dfb8fb
Energy saving: music and sounds (#2128) 2020-03-12 08:35:45 +02:00
Jack Rainy
528392baab
Allow selection of non-buildable items (#2126) 2020-03-12 08:34:44 +02:00
Jack Rainy
e370bbc53b
Hide crosshair while city can't attack (#2124) 2020-03-12 08:33:03 +02:00
Jack Rainy
97a9a0f08c
Display an amount of gold when buying the tile (#2127) 2020-03-12 08:32:29 +02:00
lishaoxia1985
1564856391
Turn number of trade changes with game speed. (#2123) 2020-03-11 21:43:59 +02:00
Yair Morgenstern
c64b359fb5 3.6.7 2020-03-11 17:26:26 +02:00
Jack Rainy
a54189c7ba
Updated German.properties and Italian.properties (#2115)
* Update for German.properties

* Update for Italian.properties
2020-03-11 17:12:39 +02:00
Federico Luongo
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
Jack Rainy
15098d877c
Translations refactoring (#2096)
* Rename "translationsByLanguage" folder

* Minor refactoring

* Generate Nations strings

* Use the nations strings while creating the translation files

* Clean up of Nations files

* Transfer existing translations

* Get rid of the nation's translated name

* Transfer just few nations' translations for languages without Nations_Language.json

* Clean up of not used greetings

* Correct marking of not translated strings
2020-03-10 10:17:05 +02:00
Yair Morgenstern
c0414db381 Several users have stated that the Unciv standalone doesn't really work in Windows 32 bt, so I'm removing it from the releases to reflect that 2020-03-10 10:06:40 +02:00
Yair Morgenstern
30a2eda15f UnitTable no longer scrolls when unnecessary 2020-03-09 22:13:47 +02:00
Jack Rainy
13def8739e
Corrections according to #2101 (#2105)
* College requires Phylosophy

* "Police State" influences the courthouses, not culture borders

* "Autocracy complete" has +20 attack effect

* Translations updates
2020-03-09 00:00:32 +02:00
Jack Rainy
f769d60826
Do not recreate the window (#2107) 2020-03-08 23:58:32 +02:00
Federico Luongo
0cf27789e9
Borders made of oriented triangles rather than circles (#2104) 2020-03-08 20:36:50 +02:00
Yair Morgenstern
61565c0ee6 Reverted the UnitActions to the old setup (the new sequence yield was unnecesarily confusing),
but kept the merge of canAct and the null action and taking specific actions when necessary and not the entire list
2020-03-08 00:24:19 +02:00
Yair Morgenstern
db6031da82 Starting locations work again =) 2020-03-07 23:06:34 +02:00
Nico
58f7e06b72
Moving unique abilities to an Enum (#2095)
* Unique abilities moved to enums

* remove diplomatic victory type WIP

* Address review comments. Translations for unique abilities names aren't used anywhere as far as I can tell, but added them to relevant translation files just in case.

Co-authored-by: nmeze <nicolas.mezeret@gmail.com>
2020-03-07 22:22:20 +02:00
Yair Morgenstern
2bc590d5b5 Fixed number of strategic resources 2020-03-07 22:07:42 +02:00
Federico Luongo
296936ae53
Fix/city buy sell exploits (#2094)
* Fix erroneous removal from queue

* Buy/Sell popups disable respective button and force closure of other popups
2020-03-07 20:04:27 +02:00
Yair Morgenstern
ccc5c5ee84 3.6.6 2020-03-06 16:18:00 +02:00