Commit Graph

669 Commits

Author SHA1 Message Date
SomeTroglodyte
9ed73d0d3f
Spruced up ModManagementScreen - phase 1 (#3983)
* Spruced up ModManagementScreen - phase 1

* Spruced up ModManagementScreen - phase 1 - patch1
2021-06-01 15:21:31 +03:00
Duan Tao
205f479ffe
Declare & Revoke protection for city-state. (#3994)
* Declare protection for city-state.

* Text templates.

* Better protector text for city-states.
2021-06-01 15:02:23 +03:00
Yair Morgenstern
c45ecebb0c Yet more swedish 2021-05-28 15:07:57 +03:00
Yair Morgenstern
cc36dabde8 Merge branch 'master' of https://github.com/yairm210/Unciv 2021-05-28 15:03:50 +03:00
Yair Morgenstern
d7c0cc593a 3.14.12 2021-05-28 15:02:11 +03:00
Yair Morgenstern
42a75ad9cf
Translations update (#4009)
* Swedish translation (#4006)

* Create Swedish.properties

* Update Swedish.properties

* Update Swedish.properties

* Update Swedish.properties

* Update Swedish.properties

* Update Swedish.properties

* Update Swedish.properties

* Update German.properties (#4004)

* Update German.properties

* Update German.properties

* Update German.properties

* Update Italian.properties (#4001)

* Update Spanish.properties (#4000)

Co-authored-by: SimonCeder <63475501+SimonCeder@users.noreply.github.com>
Co-authored-by: Martin Pechstein <77325495+Mape6@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: ArchDuque-Pancake <78449553+ArchDuque-Pancake@users.noreply.github.com>
2021-05-28 14:56:00 +03:00
SomeTroglodyte
cf2be25c73
Popup gets a KeyPressDispatcher (#3973)
* Popup gets a KeyPressDispatcher

* Popup gets a KeyPressDispatcher - patch1
2021-05-27 21:49:40 +03:00
SomeTroglodyte
5f523cb548
Improved location notifications (#3992)
* Improved location notifications

* Improved location notifications - patch

* Improved location notifications - patch2

* Improved location notifications - patch3
2021-05-26 23:31:00 +03:00
Yair Morgenstern
cd6ae3dc6d 3.14.11 2021-05-26 19:37:01 +03:00
Yair Morgenstern
58d526aad0
Translations update (#3993)
* Update Simplified_Chinese.properties (#3984)

* Update Spanish.properties (#3980)

* Teutonic Translations (#3978)

* Teutonic Translations

* Teutonic Translations patch1

* Update Italian.properties (#3972)

Co-authored-by: HoleHolo <80876542+HoleHolo@users.noreply.github.com>
Co-authored-by: ArchDuque-Pancake <78449553+ArchDuque-Pancake@users.noreply.github.com>
Co-authored-by: SomeTroglodyte <63000004+SomeTroglodyte@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
2021-05-26 19:07:00 +03:00
SomeTroglodyte
8d4d05e235
Two missing translation templates (#3988) 2021-05-24 08:58:27 +03:00
Yair Morgenstern
fd5125904a 3.14.10 2021-05-20 22:49:40 +03:00
Yair Morgenstern
9fd80122e0
Translations update (#3969)
* Update Turkish.properties (#3964)

* Update Spanish.properties (#3963)

* Update Indonesian.properties (#3960)

* Update Indonesian.properties

* Update Indonesian.properties

* Update Italian.properties (#3956)

* Update Spanish.properties (#3970)

* Fix spaceship part production boosts (#3953)

Previously, the buildings and wonders that should boost spaceship part
production (Forge, Spaceship Factory and Hubble Space Telescope) would
not provide this boost (#3952). This commit fixes the issue.

The problem was caused by the fact that the spaceship part-boosting
uniques would only boost spaceship part UNITS while spaceship parts are
currently buildings.

The added comments serve as a reminder to change the uniques if
spaceship parts are ever changed into units.

* Update Spanish.properties

I had to reopen a new pull request due to conflicts the other had.

Co-authored-by: Arthur van der Staaij <32672293+avdstaaij@users.noreply.github.com>

Co-authored-by: Nazım Gediz Aydındoğmuş <nga@hotmail.com.tr>
Co-authored-by: ArchDuque-Pancake <78449553+ArchDuque-Pancake@users.noreply.github.com>
Co-authored-by: kensvin <63847755+Kensvin28@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: chriscr2 <70113017+chriscr2@users.noreply.github.com>
Co-authored-by: Arthur van der Staaij <32672293+avdstaaij@users.noreply.github.com>
2021-05-20 22:22:09 +03:00
SomeTroglodyte
7c7d4181cc
Fix custom map sizes - saves match, size obeyed, limit UI (#3965)
* Fix custom map sizes - Revive Enum MapSize and fix tech modifier for custom maps

* Fix custom map sizes - Fix saved size not matching tileset, obey custom size

* Fix custom map sizes - limiting custom size and UI

* Fix custom map sizes - linting and reduce warnings

* Fix custom map sizes - less verbose

* Popup gets a KeyPressDispatcher - templates
2021-05-20 22:17:07 +03:00
Yair Morgenstern
106cbb79c3 3.14.9 2021-05-18 01:07:17 +03:00
Yair Morgenstern
e57e7fb7d5
Translations update (#3950)
* Update Indonesian.properties (#3947)

* Update Russian.properties (Full Translation) (#3945)

* Update Russian.properties

* Update Russian.properties

* Update Russian.properties

case fix

* Update Russian.properties

* Update Russian.properties

* Update Russian.properties

* Update Simplified_Chinese translate (#3940)

* Update Simplified_Chinese.properties

* fix case problem

* Update Spanish.properties (#3924)

* Update German.properties (#3919)

* Update German.properties

* Update German.properties

* Update Italian.properties (#3917)

* Update Spanish.properties (#3928)

Co-authored-by: kensvin <63847755+Kensvin28@users.noreply.github.com>
Co-authored-by: Maksim Klimenko <77161824+Maks-gaming@users.noreply.github.com>
Co-authored-by: CrispyXYZ <64761703+CrispyXYZ@users.noreply.github.com>
Co-authored-by: ArchDuque-Pancake <78449553+ArchDuque-Pancake@users.noreply.github.com>
Co-authored-by: Martin Pechstein <77325495+Mape6@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: Chris <70113017+chriscr2@users.noreply.github.com>
2021-05-17 23:47:00 +03:00
Yair Morgenstern
d546b2b00e Caught exception when map fails to load 2021-05-13 21:43:42 +03:00
Yair Morgenstern
4f1798146c 3.14.8 2021-05-11 00:44:36 +03:00
Yair Morgenstern
6ca93f4dc9
Translations update (#3916)
* Update Spanish.properties (#3908)

* Update German.properties (#3904)

* Update Vietnamese.propreties (#3903)

* Create Vietnamese

* Update and rename Vietnamese to Vietnamese.properties

* Update Vietnamese.properties

* Update Vietnamese.properties

* Update Vietnamese.properties

* Update Vietnamese.properties

* Update Vietnamese.properties

* Update Vietnamese.properties

* Update Vietnamese.properties

* Update Vietnamese.properties

* Update Vietnamese.properties

* Update Vietnamese.properties

* Update Vietnamese.properties

* Update Vietnamese.properties

* Update Vietnamese.properties

* Update Vietnamese.properties

Come back:)

* Update Vietnamese.properties

* Update Vietnamese.properties

* Update Vietnamese.properties

* Update Vietnamese.properties

* Update Vietnamese.properties

* Update Vietnamese.properties

* Update Vietnamese.properties

* Update Vietnamese.properties

* Update Vietnamese.properties

Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>

* Update Italian.properties (#3901)

Co-authored-by: ArchDuque-Pancake <78449553+ArchDuque-Pancake@users.noreply.github.com>
Co-authored-by: Martin Pechstein <77325495+Mape6@users.noreply.github.com>
Co-authored-by: leanhquanea1234 <69520258+leanhquanea1234@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
2021-05-11 00:34:26 +03:00
Yair Morgenstern
0f0de8a221 3.14.7 2021-05-08 23:54:29 +03:00
Yair Morgenstern
8b767a10d0
Translations update (#3899)
* Update Japanese.properties (#3896)

* Update German.properties (#3894)

* Update Japanese.properties (#3880)

translation of untranslated parts and retouch

Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>

Co-authored-by: paontv <57051667+paontv@users.noreply.github.com>
Co-authored-by: Martin Pechstein <77325495+Mape6@users.noreply.github.com>
Co-authored-by: ko-chan-28 <70871262+ko-chan-28@users.noreply.github.com>
2021-05-08 23:48:15 +03:00
Yair Morgenstern
fca5b5075e Spaces 2021-05-07 12:39:44 +03:00
Yair Morgenstern
6fbb223aa5 Resolved #3888 - added template lines for mod management screen 2021-05-07 12:20:10 +03:00
Alexander Korolyov
453f5588ac
Custom map size (#2876)
* Adding custom map sizes. Initial commit

* Custom map sizes UI update

* Custom map size with rectangular shape

* Added compatibility with older Maps and Game saves

* Fixed build errors and added warning messages

Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
2021-05-06 18:39:28 +03:00
Yair Morgenstern
a6d0973324 3.14.6 2021-05-05 20:46:40 +03:00
Yair Morgenstern
c1908d0526
Translations update (#3878)
* Update German.properties (#3877)

* Update Spanish.properties (#3873)

* Changed a few minor fixes, added a lot of promotion translations (#3843)

* Update Malay.properties (#3595)

Yayay

Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>

* Should remove test fail

Co-authored-by: Martin Pechstein <77325495+Mape6@users.noreply.github.com>
Co-authored-by: ArchDuque-Pancake <78449553+ArchDuque-Pancake@users.noreply.github.com>
Co-authored-by: Xander Lenstra <71121390+xlenstra@users.noreply.github.com>
Co-authored-by: madbada99 <79025962+madbada99@users.noreply.github.com>
2021-05-05 18:59:40 +03:00
Yair Morgenstern
94c0995b23 3.14.5 2021-05-01 23:05:30 +03:00
Yair Morgenstern
9900795e02 Specify original owner when showing option to liberate city 2021-04-30 12:44:51 +03:00
Yair Morgenstern
72bf5f198d 3.14.4 2021-04-28 22:38:49 +03:00
Yair Morgenstern
14ca67ca61
Translations update (#3845)
* Update german translation (#3834)

* Update German.properties

* Update German.properties

* Update German.properties

* Update German.properties

* Update Spanish.properties (#3830)

Co-authored-by: Martin Pechstein <77325495+Mape6@users.noreply.github.com>
Co-authored-by: ArchDuque-Pancake <78449553+ArchDuque-Pancake@users.noreply.github.com>
2021-04-28 21:40:33 +03:00
Yair Morgenstern
bb34659d9c Resolved #3837 - Harad -> Harald in Denmark greeting 2021-04-27 00:15:47 +03:00
Yair Morgenstern
55ef131fb2 3.14.3 2021-04-21 22:12:46 +03:00
Yair Morgenstern
2b6c9e7ec0
Translations update (#3826)
* Chinese translation update (#3825)

* Update Czech.properties (#3815)

* Update Czech.properties

Note for czech translators:
Zakulacený svět zní divně, ale nevím, jak jinak to přeložit. Budu rád za nápady.

* Update Czech.properties

* Update Italian.properties (#3812)

Co-authored-by: lishaoxia1985 <49801619+lishaoxia1985@users.noreply.github.com>
Co-authored-by: jahodovykolac <79529669+jahodovykolac@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
2021-04-21 21:59:13 +03:00
Yair Morgenstern
e270b017d4 3.14.2 2021-04-18 21:56:18 +03:00
Yair Morgenstern
c03b139b4d
Translations update (#3811)
* Update German.properties (#3808)

* Fixed unitType parameters in changed unique

* Spanish changes by @ArchDuque-Pancake in #3787

* "[] from every []" can accomodate specialist names

* Fixed - 'Water units' now can be capitalized, as they should be.

* Added warning for world wrap for Android - I'm seeing a lot of ANRs for this, but it's not something I think I can solve

* Update German.properties

Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>

* Update Polish.properties (#3803)

* Fixed unitType parameters in changed unique

* Spanish changes by @ArchDuque-Pancake in #3787

* Update Polish.properties

* Update Polish.properties

Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>

* Update Italian.properties (#3797)

* Fixed unitType parameters in changed unique

* Spanish changes by @ArchDuque-Pancake in #3787

* Update Italian.properties

Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>

* Spanish - Added Required Translations (#3796)

* Fixed unitType parameters in changed unique

* Spanish changes by @ArchDuque-Pancake in #3787

* Required Translations Added

Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>

Co-authored-by: Martin Pechstein <77325495+Mape6@users.noreply.github.com>
Co-authored-by: GEEZET1 <67857834+GEEZET1@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: another-sapiens <80379945+another-sapiens@users.noreply.github.com>
2021-04-18 21:44:39 +03:00
Yair Morgenstern
f518c1944f Added warning for world wrap for Android - I'm seeing a lot of ANRs for this, but it's not something I think I can solve 2021-04-17 23:27:29 +03:00
Yair Morgenstern
ffd9d68bce Spanish changes by @ArchDuque-Pancake in #3787 2021-04-14 23:03:28 +03:00
Yair Morgenstern
5e1a21cd84 Fixed unitType parameters in changed unique 2021-04-14 21:57:58 +03:00
Yair Morgenstern
daab799b3a 3.14.1 2021-04-14 19:51:31 +03:00
Yair Morgenstern
bec5e2d43a
Translations update (#3793)
* Update French.properties (#3790)

* Translated: "[stats] on [param] tiles once [tech] is discovered"

* Translated: "City-center"

* Update Indonesian.properties (#3785)

Co-authored-by: Zakaria M <zak.mell45@gmail.com>
Co-authored-by: Kensvin <63847755+Kensvin28@users.noreply.github.com>
2021-04-14 19:43:51 +03:00
Yair Morgenstern
fe204e9ac0
Translations update (#3783)
* Update Italian.properties (#3779)

* Update Spanish.properties (#3778)

* Update Spanish.properties

* Update Spanish.properties

Co-authored-by: jorgman1 <jorgman1@protonmail.com>

* Update German.properties (#3777)

* Update German.properties

* Update German.properties

* Update German.properties

* Update Japanese.properties (#3776)

* Update Spanish.properties (#3782)

I have made a research, and, despite of an "arcabuz" being somewhat diferent from a musket, it´s basically the same.

* Update Russian.properties (#3792)

* Natural wonders are standalone tiles in new layering

* Can handle unique capital indicators in mods

* 'military' -> 'Military' for e.g. [Military] units, same as other unit types which are capitalized

* Differentiated between 'Land' as in 'Land unit' and 'Territory' for rankings

* Added TileSetConfigs (#3766)

* First iteration of TileSet json

* Adding json support for mods

* Renamed TilesetConfig to TileSetConfig

+ changed the config for FHex to fix the mountain natural wonder problem

* Resolved #3353 - Changed "Earn [amount]% of [param] opponent's [param2] as [stat] for kills" to "Earn [amount]% of killed [param] unit's [param2] as [stat]"

* Preparation for hill as terrain feature  (#3784)

* ensure backwards compatibility

* Added new Hill.png

* Added temp TileSetConfig to support new hill sprite

* Added missing Ancient ruins tiles

* Fixed Multiplayer bugs (#3781)

* Removed save feature from TurnChecker

* Hopefully fixed not correctly updating multiplayer games?

* Fixed "refresh list" not updating the savegame correctly

* Fixed game update when upload fails

* Revert "Fixed game update when upload fails"

This reverts commit cc9f1cf589.

* Fix Citadel not quite buildable where it should be (#3788)

* updated the Russian translation file

* Fixed typos in the Russian translation file

* Fixed [tileFilter] in Rus lang file

Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
Co-authored-by: GGGuenni <leonard@eynck.de>
Co-authored-by: SomeTroglodyte <63000004+SomeTroglodyte@users.noreply.github.com>

Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: jorgman1 <48908520+jorgman1@users.noreply.github.com>
Co-authored-by: jorgman1 <jorgman1@protonmail.com>
Co-authored-by: Martin Pechstein <77325495+Mape6@users.noreply.github.com>
Co-authored-by: paontv <57051667+paontv@users.noreply.github.com>
Co-authored-by: ArchDuque-Pancake <78449553+ArchDuque-Pancake@users.noreply.github.com>
Co-authored-by: Maxim Logaev <51446645+turbocat2001@users.noreply.github.com>
Co-authored-by: GGGuenni <leonard@eynck.de>
Co-authored-by: SomeTroglodyte <63000004+SomeTroglodyte@users.noreply.github.com>
2021-04-14 19:38:23 +03:00
Yair Morgenstern
0440a70a9c Resolved #3353 - Changed "Earn [amount]% of [param] opponent's [param2] as [stat] for kills" to "Earn [amount]% of killed [param] unit's [param2] as [stat]" 2021-04-13 22:04:00 +03:00
Yair Morgenstern
881a885c14 Differentiated between 'Land' as in 'Land unit' and 'Territory' for rankings 2021-04-13 00:13:17 +03:00
Yair Morgenstern
6e9f868cb3 'military' -> 'Military' for e.g. [Military] units, same as other unit types which are capitalized 2021-04-13 00:08:35 +03:00
Yair Morgenstern
61730ca93b Translation files generation 2021-04-10 23:14:22 +03:00
Yair Morgenstern
888d5e973c
Translations update (#3768)
* Update French.properties  (#3767)

* Create French.properties

* Update French.properties

* Update French.properties

* Update German.properties (#3764)

* Update Czech.properties (#3763)

Translated some new lines and city-states' diplomacy

* Hungarian.properties (#3761)

* Update Spanish.properties (#3774)

There were a few 'translation!' messages, I didn't check the already completed text. If any help is needed please let me know. My discord name is john2342#8925

* Deleted unnecessary space before colon, update czech.properties (#3773)

* Deleted space before colon

In VictoryScreen.kt was one extra space, looking like "Spain : 35" instead of "Spain: 35"

* Update Czech.properties

Co-authored-by: Loubard Kevin <70336598+subversive-eu@users.noreply.github.com>
Co-authored-by: Martin Pechstein <77325495+Mape6@users.noreply.github.com>
Co-authored-by: jahodovykolac <79529669+jahodovykolac@users.noreply.github.com>
Co-authored-by: JurDan775 <80947706+JurDan775@users.noreply.github.com>
Co-authored-by: juan234248 <77988217+juan234248@users.noreply.github.com>
2021-04-10 22:59:55 +03:00
Yair Morgenstern
bf596586c7
Translations update (#3759)
* Update German.properties (#3758)

* Update Turkish.properties (#3754)

* Update Turkish.properties

* Update Turkish.properties

Typo fix in line 3934: amout > amount

Co-authored-by: Martin Pechstein <77325495+Mape6@users.noreply.github.com>
Co-authored-by: omerfaruk-cakmak <32402595+omerfaruk-cakmak@users.noreply.github.com>
2021-04-04 19:30:30 +03:00
Yair Morgenstern
6e31750b55 3.13.12 2021-03-31 23:13:04 +03:00
Yair Morgenstern
dbd682fbbe
Translations update (#3751)
* Update Dutch.properties (#3750)

* Update bulgarian.properties (#3745)

* Update bulgarian.properties

Translated some of the #Required translation! rows

* Fixed error

* Update Indonesian.properties (#3744)

* Update German.properties (#3738)

* Update German.properties

* Update German.properties

* Update German.properties

* Update Italian.properties (#3737)

Co-authored-by: Aron de Jong <adj00@protonmail.com>
Co-authored-by: Tony <63195157+antonpetrov145@users.noreply.github.com>
Co-authored-by: Kensvin <63847755+Kensvin28@users.noreply.github.com>
Co-authored-by: Martin Pechstein <77325495+Mape6@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
2021-03-31 22:50:31 +03:00
Yair Morgenstern
bc5cc4e28d Added Bulgarian, by antonpetrov145! 2021-03-29 17:32:42 +03:00
Tony
751624bf41
Create Bulgarian.properties (#2365)
* Create Bulgarian.properties

This is WIP on the Bulgarian translation

* Update Bulgarian.properties

Edited with the '='

* Update Bulgarian.properties

* Update

Updated  some move values. Sorry for the long delay.

* Update Bulgarian.properties

With the help of PresleyBG

* Renamed several variables
2021-03-29 17:28:27 +03:00
Yair Morgenstern
e0d7128bc6 3.13.11 2021-03-23 23:01:00 +02:00
Yair Morgenstern
b8f1f092d6
Translations update (#3736)
* Update German.properties (#3725)

* Update German.properties

* Update German.properties

* Update Italian.properties (#3724)

Co-authored-by: Martin Pechstein <77325495+Mape6@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
2021-03-23 22:54:58 +02:00
Yair Morgenstern
cf3e517e43 3.13.10 2021-03-21 20:42:14 +02:00
Yair Morgenstern
049744c9bb
Translations update (#3723)
* Update German.properties (#3717)

* Update German.properties

* Update German.properties

* Update German.properties

* Update German.properties

* Update German.properties

* Update German.properties

* Update German.properties

* Update German.properties

* Update Indonesian.properties (#3715)

Co-authored-by: Martin Pechstein <77325495+Mape6@users.noreply.github.com>
Co-authored-by: Kensvin <63847755+Kensvin28@users.noreply.github.com>
2021-03-21 19:19:09 +02:00
Yair Morgenstern
5a5d0a980f Removed ALL color-based notifications! 2021-03-21 00:28:58 +02:00
Yair Morgenstern
87ff4c91f5 3.13.9 2021-03-18 20:59:42 +02:00
Yair Morgenstern
a49c2cc289
Translations update (#3712)
* Update Czech.properties (#3708)

- new strings
- space ship related terminology shortened and synced
- few city states transation

* Update German.properties (#3704)

* Update German.properties

* Update German.properties

* Update German.properties

* Update German.properties

* Update German.properties

* Update German.properties

* Update German.properties

* Update German.properties

* Update German.properties

* Update Italian.properties (#3701)

Co-authored-by: stoupa007 <60326342+stoupa007@users.noreply.github.com>
Co-authored-by: Martin Pechstein <77325495+Mape6@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
2021-03-18 19:48:05 +02:00
Yair Morgenstern
ecee6155e8 3.13.8 2021-03-15 22:14:08 +02:00
Yair Morgenstern
996f54367d
Translations update (#3698)
* Update Czech.properties (#3693)

Translated some city states' diplomacy.
P.S. What is the definition of 'radger'? I can't find it anywhere.

* Update Czech.properties (#3690)

diplomacy and cities: polynesia, siam, spain, songhai, mongolia, aztecs, inka, denmark

* Update German.properties (#3684)

* Update German.properties

* Update German.properties

* Update German.properties

* Update German.properties

Co-authored-by: jahodovykolac <79529669+jahodovykolac@users.noreply.github.com>
Co-authored-by: stoupa007 <60326342+stoupa007@users.noreply.github.com>
Co-authored-by: Martin Pechstein <77325495+Mape6@users.noreply.github.com>
2021-03-15 22:02:12 +02:00
lishaoxia1985
d7214b7a46
Method getImprovementIcon can Setsize for all icon (#3685)
* Method getImprovementIcon can Setsize for all icon

* categoryButton doesn't change background-color if it's disabled
2021-03-15 21:00:09 +02:00
Yair Morgenstern
a37ac74fa9 'in all coastal cities' now translated 2021-03-13 22:38:53 +02:00
Yair Morgenstern
8780107ae4 3.13.7 2021-03-11 23:49:49 +02:00
Yair Morgenstern
05a36580ba Merge branch 'master' of https://github.com/yairm210/Unciv 2021-03-11 21:22:16 +02:00
Yair Morgenstern
f6e188144e
Translations update (#3683)
* Update German.properties (#3680)

* Update German.properties

* Update German.properties

* Update German.properties

* Updated Spanish translations (#3677)

* Completed Spanish translations

* UnitTable.kt modifications to place cancel, previous idle unit and next idle unit below unit information

This was made in order to prevent previous idle unit and next idle unit keys' positions to change depending on how big the unit info box is.

* NotificationsScroll: Made notifications dark blue with white text.

* Improved Spanish translations

* Revert "NotificationsScroll: Made notifications dark blue with white text."

This reverts commit 63b8ba2e

* Completed Spanish translations

* UnitTable.kt modifications to place cancel, previous idle unit and next idle unit below unit information

This was made in order to prevent previous idle unit and next idle unit keys' positions to change depending on how big the unit info box is.

* NotificationsScroll: Made notifications dark blue with white text.

* Improved Spanish translations

* Revert "NotificationsScroll: Made notifications dark blue with white text."

This reverts commit 63b8ba2e

* Revert "UnitTable.kt modifications to place cancel, previous idle unit and next idle unit below unit information"

This reverts commit d970632b

* Improved Spanish translations

* Update German.properties (#3676)

* Replaced ß with ss in some words.

* Update German.properties

* Update TileImprovements.json

Fixed typo

* Update German.properties

* Update German.properties

* Update German.properties (#3673)

* Update German.properties (#3672)

* Update Czech.properties (#3670)

new strings, few typos
translated ottoman, kroean, iroquois and persian diplomacy and cities

Co-authored-by: Martin Pechstein <77325495+Mape6@users.noreply.github.com>
Co-authored-by: 71walceli <antonini2903@hotmail.com>
Co-authored-by: stoupa007 <60326342+stoupa007@users.noreply.github.com>
2021-03-11 21:09:58 +02:00
Yair Morgenstern
972bf2ba1c Resolved #3681 - translation fix, "in every city" -> "in all cities" 2021-03-11 21:08:48 +02:00
Yair Morgenstern
4c5d8645d6
Translations update (#3669)
* Update Czech.properties (#3666)

Fixed some translations and deleted some unnecessary text.

* Update German.properties (#3664)

* Update German translations

* Update German translations

* Update German translations

* Update German.properties

* Update German.properties

* Update Turkish.properties (#3661)

* Update Turkish.properties

* Update Turkish.properties

* Update Turkish.properties

* update German.properties (#3660)

* Update Italian.properties (#3658)

* Update Indonesian.properties (#3657)

Co-authored-by: jahodovykolac <79529669+jahodovykolac@users.noreply.github.com>
Co-authored-by: Martin Pechstein <77325495+Mape6@users.noreply.github.com>
Co-authored-by: mehmetkazim0 <69713944+mehmetkazim0@users.noreply.github.com>
Co-authored-by: Joni Arida <JoniArida@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: Kensvin <63847755+Kensvin28@users.noreply.github.com>
2021-03-08 22:10:03 +02:00
Yair Morgenstern
35ed8920e9 3.13.6 2021-03-07 13:04:11 +02:00
Yair Morgenstern
e2cf60d028
Translations update (#3656)
* update German.properties (#3650)

* update German.properties

* Update German.properties

add missing placeholder

* Update Czech.properties (#3641)

india diplomacy and cities
new strings

Co-authored-by: Joni Arida <JoniArida@users.noreply.github.com>
Co-authored-by: stoupa007 <60326342+stoupa007@users.noreply.github.com>
2021-03-07 12:57:59 +02:00
Yair Morgenstern
011c1de102 Resolved #3635 - can remove natural wonders and roads/railroads in map editor 2021-03-07 11:41:09 +02:00
lishaoxia1985
d290ca3d33
Update translation and Android studio to 4.1.2 (#3642) 2021-03-04 18:56:05 +02:00
Yair Morgenstern
153f4f98d3 3.13.5 2021-03-03 23:48:22 +02:00
Yair Morgenstern
3d0cef7af2
Translations update (#3640)
* German Translation (#3632)

* Translation

* missing !

* Update Italian.properties (#3630)

Co-authored-by: Joni Arida <JoniArida@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
2021-03-03 22:47:08 +02:00
Yair Morgenstern
639be3b01d 3.13.4 2021-03-01 21:05:53 +02:00
david.howard
12e3005294
[663] Allow unit rename on promote (#3620)
* Add nullable "instanceName" field to MapUnit to capture name for individual units
* Add "displayName" property to MapUnit which takes instanceName if set, name
  otherwise
* Add dialog to PromotionPicker to allow setting instanceName of unit, if not
  already set
2021-03-01 20:52:46 +02:00
Yair Morgenstern
237884a60d
Translations update (#3629)
* Update Czech.properties (#3627)

few tutorial/civilopaedia texts

* Update French.properties (#3625)

* Update German.properties (#3624)

* Update Czech.properties (#3623)

* Update Italian.properties (#3621)

Co-authored-by: stoupa007 <60326342+stoupa007@users.noreply.github.com>
Co-authored-by: Subcher <70058565+Subcher@users.noreply.github.com>
Co-authored-by: Johannes Schreiber <58529898+devbeutler@users.noreply.github.com>
Co-authored-by: jahodovykolac <79529669+jahodovykolac@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
2021-03-01 19:05:48 +02:00
Jack Rainy
ff05fa601d
Translations update (#3618)
* Translations update

* Minor changes to the translation
2021-02-25 19:01:58 +02:00
Giuseppe D'Addio
0501261d21
Update Italian.properties (#3613) 2021-02-24 20:43:58 +02:00
Yair Morgenstern
c9a96358da Changed "Gold" resource to be called "Gold Ore" to not conflict with the yield type for translations - #2458 2021-02-23 20:05:00 +02:00
Yair Morgenstern
b7c25f30e5 3.13.2 2021-02-20 23:26:52 +02:00
Yair Morgenstern
40a59782d0
Translations update (#3612)
* Update German.properties (#3611)

* Added Dutch translations (#3599)

* Update Dutch.properties

* Update Dutch.properties

* Update Dutch.properties

* Update Dutch.properties

Line 561 misspelled [attacker]

* Update Dutch.properties

* Update Dutch.properties

* Update Dutch.properties

* Update Dutch.properties

* Update TechPickerScreen.kt

Changed the current tech color from a grey color to a more distinguishable blue color.

* Update TechPickerScreen.kt

Co-authored-by: SRS <deringenieur71@gmail.com>
Co-authored-by: Louis Deconinck <louis.dck@gmail.com>
2021-02-20 23:08:20 +02:00
Yair Morgenstern
36949410a7 Resolved #3586 - Added 'Destroy' translation for capturing cities in one-city challenge 2021-02-18 13:20:49 +02:00
Yair Morgenstern
fda3c1053d 3.13.1 2021-02-16 20:24:50 +02:00
Yair Morgenstern
1b45f93b16
Translations update (#3602)
* Update Czech.properties (#3597)

* Update Czech.properties

new strings, american and japan diplomacy

* Update Czech.properties

fixed param typo

* Update Malay.properties (#3596)

Translate some of the tutorial phase, dialogues and other in-game selection buttons.

* Update Italian.properties (#3594)

Co-authored-by: stoupa007 <60326342+stoupa007@users.noreply.github.com>
Co-authored-by: SNN95 <41881544+SNN95@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
2021-02-16 20:19:45 +02:00
Yair Morgenstern
f2af128546 Merge branch 'master' of https://github.com/yairm210/Unciv 2021-02-13 21:53:12 +02:00
Yair Morgenstern
48a330fddc 3.13.0 2021-02-13 21:52:33 +02:00
Giuseppe D'Addio
75ef42f31e
Update Italian.properties (#3589) 2021-02-13 21:51:13 +02:00
Yair Morgenstern
e92a1dd088 Better tech descriptions for increased improvement stats 2021-02-12 14:13:11 +02:00
Yair Morgenstern
8b1778eea3 Removed Scenario Maps entirely - was not a well thought-out concept and caused more confusion than actual fun.
Case in point - 0 mods are Scenario mods.
2021-02-11 22:33:52 +02:00
Yair Morgenstern
74cc421b62 3.12.14 2021-02-09 23:17:42 +02:00
Yair Morgenstern
ae3e6524f5
Translations update (#3588)
* Update Simplified_Chinese.properties (#3585)

* Update Simplified_Chinese.properties

* fix

fix case problem

* Update Italian.properties (#3581)

* Update Portuguese.properties (#3580)

* Update Portuguese.properties

* Update Portuguese.properties

Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>

Co-authored-by: CrispyXYZ <64761703+CrispyXYZ@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: Tiger13p <58396220+Tiger13p@users.noreply.github.com>
2021-02-09 23:07:18 +02:00
Yair Morgenstern
71266b213e 3.12.13 2021-02-06 22:39:36 +02:00
Yair Morgenstern
3d683c767a Added "Consumes [amount] [resourceName]" unique for buildings 2021-02-06 21:12:44 +02:00
Yair Morgenstern
b0bf18afa0 Added custom victory conditions 2021-02-05 16:06:58 +02:00
Yair Morgenstern
1ada5aff43 Merge branch 'master' of https://github.com/yairm210/Unciv 2021-02-05 10:15:55 +02:00
GGGuenni
679ca2ba6c
changed case sensitivity (#3577)
somehow I forgot to change most of the texts
2021-02-04 21:50:44 +02:00
Yair Morgenstern
b0c9c797f6 3.12.12 2021-02-04 20:18:14 +02:00
Yair Morgenstern
31ef5fdc77
Translations update (#3576)
* Update Traditional_Chinese.properties (#3571)

* Update German.properties (#3569)

* Update Indonesian.properties (#3566)

* Update Russian.properties (#3564)

Co-authored-by: SiderealArt <30827929+SiderealArt@users.noreply.github.com>
Co-authored-by: Johannes <58529898+devbeutler@users.noreply.github.com>
Co-authored-by: Kensvin <63847755+Kensvin28@users.noreply.github.com>
Co-authored-by: Jack Rainy <JackRainy@users.noreply.github.com>
2021-02-04 19:23:08 +02:00
GGGuenni
a07e3947d2
Refactoring of MultiplayerScreen (#3572)
* Refactoring

- Removed unnecessary .tr()
- changed text case sensitivity
- changed popup to YesNoPopup
- combined multiplayerGames.remove and deleteSave into removeMultiplayerGame to reduce unnecessary try catch blocks

* Update case sensitivity translations

* adding "Game settings" entry
2021-02-04 19:13:01 +02:00
Yair Morgenstern
9d647447bc Added improvement-constructing buildings 2021-02-03 21:09:29 +02:00
GGGuenni
aa1bd3cd7e
Adding resign function for multiplayer (#3567)
* Adding give up function for multiplayer

* Update template.properties

* Reviewed changes

- Changed "give up" to "resign"
- Removed unnecessary and harmful translations
- Using YesNoPopup now

* Add missing space

* fixed first AI turn getting skipped
2021-02-02 16:43:51 +02:00
Yair Morgenstern
bc4829a424 Translation updates for new cityFilter 2021-01-30 19:46:03 +02:00
Giuseppe D'Addio
449c5e1e2b
Update Italian.properties (#3562) 2021-01-29 12:31:57 +02:00
Yair Morgenstern
aa944bad87 3.12.10 2021-01-26 22:46:47 +02:00
Yair Morgenstern
93bdb137f9
Translations update (#3559)
* Update Italian.properties (#3544)

* Update Japanese.properties (#3545)

* Update Japanese.properties

* Update Japanese.properties

* Japanese translation update (#3550)

* Update Japanese.properties

* Update Japanese.properties

* Finished translating some missing sentences in spanish (#3554)

* Turkish translation update (#3551)

* Update Turkish.properties

* Update Turkish.properties

* Update Simplified_Chinese.properties (#3546)

* Update Simplified_Chinese.properties

* Update Simplified_Chinese.properties

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: hirmonik <76709219+hirmonik@users.noreply.github.com>
Co-authored-by: marcosbach <77796076+marcosbach@users.noreply.github.com>
Co-authored-by: omerfaruk-cakmak <32402595+omerfaruk-cakmak@users.noreply.github.com>
Co-authored-by: 洛颍川 <73578868+LuoYinChuan@users.noreply.github.com>
2021-01-24 20:05:39 +02:00
Yair Morgenstern
38025785b7 3.12.9 2021-01-16 21:57:30 +02:00
Antsiferov Andrew
a0526f9afe
[Bundle] [RU] L10n Update (#3518)
* 1 new line

* show tile yields

* 1 new line

* Move to city

* 3 new lines

* The resistance in [cityName] has ended!
* +[amount]% Production when constructing [unitType] units
* Doubles Gold given to enemy if city is captured

* 4 new lines

* Receive a tech boost when scientific buildings/wonders are built in capital
* -[amount]% [param] unit maintenance costs
* Excess Food converted to Production when under construction
* Requires at least [amount] population

* 3 new lines

* New [param] units start with [amount] Experience
* All tiles cost 1 movement
* Can pass through impassable tiles
2021-01-16 21:32:55 +02:00
Yair Morgenstern
0800dbba51 Resolved #3533 - Added confirmation popup when saving over existing save 2021-01-15 13:28:29 +02:00
uncivbot[bot]
67bcc26ab7
Translations update (#3523)
* Update Italian.properties (#3509)

* Update Russian.properties (#3512)

Just a small addition to the previous request as I missed one line.

* Added Aztecs quotes translations (#3513)

Additionaly, added a few Aztec's cities names and other minor changes. Also changed some miscellaneous phrases to match context.

* Update Japanese.properties (#3515)

Improvement of Japanese translation

Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>

Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: BodyaBilder <77171011+BodyaBilder@users.noreply.github.com>
Co-authored-by: Gualter Machado <35864822+GualterMM@users.noreply.github.com>
Co-authored-by: hirmonik <76709219+hirmonik@users.noreply.github.com>
Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
2021-01-12 16:46:41 +02:00
Yair Morgenstern
c1783d8592 3.12.7 2021-01-06 23:16:43 +02:00
paontv
597bd4efd7
Update Japanese.properties (#3504) 2021-01-06 23:01:20 +02:00
stoupa007
813da94e08
Update Czech.properties (#3493)
* Update Czech.properties

new translations, some typo fixes, rome diplomacy and cities

* Update Czech.properties

arabian diplomacy and cities

* Update Czech.properties

typos fixed
2021-01-06 23:00:26 +02:00
Giuseppe D'Addio
b4c240e499
Update Italian.properties (#3462) 2020-12-29 19:59:27 +02:00
Yair Morgenstern
07c8300d61 3.12.4 2020-12-27 13:37:37 +02:00
uncivbot[bot]
44af4869d4
Translations update (#3461)
* Update Italian.properties (#3447)

* Strings translations (#3454)

* Update Indonesian.properties (#3458)

* Update Indonesian.properties

* Update Indonesian.properties

* Brazilian Portuguese language updates (#3459)

Hi, I translated everything that was missing from the list, but I didn't translate the names of the cities, it would take a long time, but the rest did everything and I hope I'm helping!

* Update Brazilian_Portuguese.properties

@Aguibizanno1 - you uncommented some comment lines, which made the tests fail. Lines starting with # are comment lines, so don't touch those :)

* Update Brazilian_Portuguese.properties

Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: Jack Rainy <JackRainy@users.noreply.github.com>
Co-authored-by: Kensvin <63847755+Kensvin28@users.noreply.github.com>
Co-authored-by: Aguibizanno <75736611+Aguibizanno1@users.noreply.github.com>
Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
2020-12-27 13:04:03 +02:00
Huichan Lee
76e9f973c5
updated translation (#3453) 2020-12-25 12:54:45 +02:00
Yair Morgenstern
8689fe0ffa Clarified Protectionism effect 2020-12-23 21:28:59 +02:00
uncivbot[bot]
24a5574359
Translations update (#3446)
* Update Italian.properties (#3439)

* Update Czech.properties (#3442)

few new translations, few fixes

* Update Indonesian.properties (#3443)

Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: stoupa007 <60326342+stoupa007@users.noreply.github.com>
Co-authored-by: Kensvin <63847755+Kensvin28@users.noreply.github.com>
2020-12-23 21:09:52 +02:00
Yair Morgenstern
585be1b2be 3.12.2 2020-12-19 22:21:09 +02:00
paontv
daa14d257f
Update Japanese.properties (#3426) 2020-12-19 21:41:13 +02:00
Yair Morgenstern
9b6dd71d22 Resolved #3422 - added fast switch between adjacent cities in city screen 2020-12-19 21:39:30 +02:00
Yair Morgenstern
1dc5111fcb 3.12.1 2020-12-16 12:33:44 +02:00
Kensvin
5e157b66d0
Update Indonesian.properties (#3419) 2020-12-16 12:23:52 +02:00
Giuseppe D'Addio
44878008f8
Update Italian.properties (#3418) 2020-12-16 12:23:42 +02:00
이휘찬
d1387a04c3
Implemented missing Korean UA (#3416)
* try to implement korean ability

* Corrected typo error

Coreect camel typo errror

* updated new korean feautre translation.

* edited korean unique text to get right sentence.

* merge duplicated code into addScience(Int)
2020-12-13 12:28:05 +02:00
Yair Morgenstern
d0df571ca5 Fixed broken translation 2020-12-13 11:30:02 +02:00
Yair Morgenstern
e7cd363b70 3.12.0 2020-12-13 10:00:22 +02:00
paontv
e6882e8223
Update Japanese.properties (#3407) 2020-12-13 09:29:08 +02:00
Giuseppe D'Addio
2708cc3309
Update Italian.properties (#3397) 2020-12-10 11:24:12 +02:00
Yair Morgenstern
8a5247324c 3.11.18 2020-12-06 22:16:03 +02:00
TG
64ad7216ca
Update Korean.properties (#3394)
* Update Korean.properties

* Update Korean.properties

* Update Korean.properties

* Update Korean.properties

* Update Korean.properties

* Update Korean.properties

* Update Korean.properties

* Update Korean.properties
2020-12-06 21:37:16 +02:00
paontv
139503ff55
Update Japanese.properties (#3392) 2020-12-06 21:27:34 +02:00
Yair Morgenstern
a9d36c073a Mods can handle removing existing buildings 2020-12-03 23:58:48 +02:00
Yair Morgenstern
c12afb4131 "have signed the peace treaty" -> "have signed a peace treaty" 2020-12-03 23:29:36 +02:00
Kensvin
b30e6e6fdd
Update Indonesian.properties (#3367) 2020-12-01 21:25:40 +02:00
Yair Morgenstern
b9f6e0deec 3.11.16 2020-11-30 23:29:29 +02:00
Giuseppe D'Addio
5830996b3b
Update Italian.properties (#3365) 2020-11-30 22:56:31 +02:00
Yair Morgenstern
c86d6e7b69 Fixed broken tests 2020-11-26 14:27:14 +02:00
Yair Morgenstern
b54fec05f1 3.11.15 2020-11-25 21:37:02 +02:00
Giuseppe D'Addio
77c8df6516
Update Italian.properties (#3362) 2020-11-24 22:55:31 +02:00
Anonymous
fc4c8c48ee
Update Polish translation (#3356) 2020-11-24 22:12:30 +02:00
Yair Morgenstern
0952a6a5a6 Test-breaking text error, good thing we have tests :) 2020-11-23 19:08:01 +02:00
Yair Morgenstern
eb7a064019 Resolved #3335 - Removed all unecessary spaces and colons 2020-11-22 22:48:38 +02:00
Yair Morgenstern
3d1e1d7936 Removed some confusing and pointless ": " at the end of translations - #3335 2020-11-22 22:41:12 +02:00
givehub99
072226ff9a
Added "All [] Cities get a free []" unique. (#3352)
* Added "All [] Cities get a free []" unique.

The first parameter is for city type. Currently "new" and "coastal" are supported.
"new" matches every city and "coastal" matches cities on a coastal tile.
"new" and "coastal" were added to template.properties for translation.

Upon city founding, the second parameter building is added to the city.

In civ 5 G&K, Carthage gets a free harbor for every coastal city.

* -Syntax changed to "Get a free [] []"
First paramater is the building and second is the city filter.
Supports "in every city" and "in every coastal city"

-new and coastal was removed from template.properties
-in every coastal city was added to template.properties

* Changed syntax to "Gain a free [] []"
2020-11-22 11:55:34 +02:00
Ivan Romanov
c33793cf81
Update Russian translation (#3351) 2020-11-19 23:42:47 +02:00
Yair Morgenstern
bf4216578a 3.11.12 2020-11-14 22:35:12 +02:00
uncivbot[bot]
8f6dca9df3
Translations update (#3339)
* Update Russian translation (#3334)

* Update Korean.properties (#3336)

Co-authored-by: Ivan Romanov <drizt72@zoho.eu>
Co-authored-by: kasterra <74085452+kasterra@users.noreply.github.com>
2020-11-14 22:12:43 +02:00
Oliver Westermann
6344e0835e
Fix german introduction (#3329)
The German name for the Great Barrier Reef is the English name, the literal translation is not used.
2020-11-11 21:22:38 +02:00
paontv
ab8b4405f2
Update Japanese.properties (#3328) 2020-11-10 22:08:38 +02:00
Yair Morgenstern
4667594731 3.11.10 2020-11-07 20:49:38 +02:00
kasterra
6c595eff50
Updated korean.properties (#3321)
Translated much of untranslated sentences. Most of translation refered to civ5 documents in namu.wiki.
번역되지 않은 많은 문장을 업데이트 하였습니다. 번역의 대부분은 나무위키 문명 5 문서들을 참고 하였습니다.
2020-11-07 20:15:57 +02:00
Yair Morgenstern
d42b93c705 3.11.9 2020-11-02 22:25:34 +02:00
Kensvin
2cddfc2b56
Update Indonesian.properties (#3313) 2020-11-02 20:39:16 +02:00
jnecus
7e7e0e8a3d
Update Simplified_Chinese.properties (#3314)
Additional Chinese translations
2020-11-02 20:39:04 +02:00
uncivbot[bot]
77af9ba80c
Translations update (#3312)
* Update Italian.properties (#3299)

* Update Spanish.properties (#3308)

Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: chriscr2 <70113017+chriscr2@users.noreply.github.com>
2020-11-01 21:50:04 +02:00
Yair Morgenstern
1d391e14e5 3.11.8 2020-10-26 23:55:20 +02:00
uncivbot[bot]
525671403b
Translations update (#3298)
* Update Italian.properties (#3287)

* Update Czech.properties (#3288)

new strings translated

* Update Japanese.properties (#3290)

* Update Japanese.properties

* Update Japanese.properties

* Update Japanese.properties

* Update Japanese.properties

* Update Japanese.properties

* Update Hungarian.properties (#3291)

Mostly fixed typos & added a few translations

* Update Indonesian.properties (#3292)

* Update German.properties (#3297)

Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: stoupa007 <60326342+stoupa007@users.noreply.github.com>
Co-authored-by: paontv <57051667+paontv@users.noreply.github.com>
Co-authored-by: borklfd <67602409+borklfd@users.noreply.github.com>
Co-authored-by: Kensvin <63847755+Kensvin28@users.noreply.github.com>
Co-authored-by: mister-bum <60568506+mister-bum@users.noreply.github.com>
2020-10-26 23:47:03 +02:00
givehub99
64fc57e6d2
Helicopter Gunship uniques (#3294)
* Preparation for Helicopter unit

-"All tiles costs 1" unique makes every tile cost 1. Used by Helicopter in CIV 5.

-"Can pass through impassable tiles" unique allows unit to pass through any tile. Used by Helicopter in CIV 5. Does not let units cross ocean if they couldn't already, just terrain that is considered "impassable"

-Mountains now do 50 damage to units that end turn on it. In civ 5 and its expansion this is what happens to any unit that is able to pass mountains.
This is "hard coded" for now. Also added the notification text to template.properties

* mountains do not give sight bonus when on them

* Revert "mountains do not give sight bonus when on them"

This reverts commit 83ad3df5d4.
2020-10-26 20:28:44 +02:00
Yair Morgenstern
35e2465f8a 3.11.7 2020-10-24 22:56:07 +03:00
uncivbot[bot]
e6b855cb6f
Translations update (#3286)
* Update Indonesian.properties (#3280)

* Update Italian.properties (#3281)

* Update Italian.properties

* Update Italian.properties

Co-authored-by: Rafsanjani Atallah <rafsan1810@gmail.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
2020-10-24 22:49:01 +03:00
Yair Morgenstern
895ed528af Resolved #3285 - added a notification when cities are no longer in resistance 2020-10-24 22:43:04 +03:00
Yair Morgenstern
8dde23aa38 3.11.6 2020-10-21 19:01:07 +03:00
uncivbot[bot]
635a12feae
Translations update (#3278)
* Update Persian_(Pinglish-UN).properties (#3273)

* Update Japanese.properties (#3276)

* Update Japanese.properties

* Update Japanese.properties

* Update Japanese.properties

* Update Japanese.properties

* Indonesian.properties updates (#3277)

I'm new to github and coding stuff so I'm really sorry if I messed some things up. I've translated all the required translations and also changed some things up to make sense a little bit more.

Co-authored-by: Mojtaba Rahimy <mojtaba.rahimy@chmail.ir>
Co-authored-by: paontv <57051667+paontv@users.noreply.github.com>
Co-authored-by: Rafsanjnai Atallah <memecenterj@gmail.com>
2020-10-20 19:48:29 +03:00
givehub99
d75541e5b4
Consolidated unit kill bonus uniques (#3267)
* -Consolidated unit kill bonus uniques.
Syntax is "Earn []% of [] opponent's [] as [] for kills" for both units and nations.

Ex.
"Earn [10]% of [military] opponent's [Cost] as [Gold] for kills"
or
"Earn [100]% of [Barbarians] opponent's [Strength] as [Culture] for kills"

Only Culture and Gold are supported as rewards now, but it can be expanded later. The pictish warrior unit in G&K gets 50% of opponent's strength as faith, so we can have the function edited to allow for faith when we get to that point.
Only Strength or Cost is supported as what the reward amount is based on.

-Policies.json and Nations.json were changed to fit the new syntax. The old syntax still works for mods for now.

-matchesCategory MapUnit function can now check if the unit is a barbarian

* -Compatibility for depecrated unit kill bonus uniques done more efficiently and counted only once (since prior to this PR, it was also counted only once)

* -Changed it to "Barbarian" instead of "Barbarians", added "Barbarian" to template.properties

* space after translation template
2020-10-18 18:10:26 +03:00
Yair Morgenstern
10818de096 3.11.5 2020-10-17 22:28:58 +03:00
uncivbot[bot]
c3205f8aff
Translations update (#3272)
* Update Italian.properties (#3266)

* Update Vietnamese.properties (#3269)

* Create Vietnamese

* Update and rename Vietnamese to Vietnamese.properties

* Update Vietnamese.properties

* Update Vietnamese.properties

* Update Vietnamese.properties

* Update Vietnamese.properties

* Update Vietnamese.properties

* Update Vietnamese.properties

* Update Vietnamese.properties

* Update Vietnamese.properties

* Update Vietnamese.properties

* Update Vietnamese.properties

* Update Vietnamese.properties

* Update Vietnamese.properties

Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>

* Update Japanese.properties (#3268)

* Update Japanese.properties

* Update Japanese.properties

Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: leanhquanea1234 <69520258+leanhquanea1234@users.noreply.github.com>
Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
Co-authored-by: paontv <57051667+paontv@users.noreply.github.com>
2020-10-17 22:18:26 +03:00
Yair Morgenstern
0aa53f07e7 3.11.4 2020-10-15 20:08:17 +03:00
uncivbot[bot]
fb984e4c38
Translations update (#3261)
* Update Italian.properties (#3253)

* Update German.properties (#3255)

* Update Indonesian.properties (#3257)

* Update Indonesian.properties

* Update Indonesian.properties

Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: Czeczki <72320003+Czeczki@users.noreply.github.com>
Co-authored-by: Kensvin <63847755+Kensvin28@users.noreply.github.com>
2020-10-14 19:25:03 +03:00
givehub99
8c51833a5a
New parameterized uniques (#3250)
* -New unit unique "Bonus as Defender []%". "+25% Combat Bonus when defending" now deprecated, but kept for now for mods. Json promotion changed to fit new syntax.
Defender Bonus modifier "Defender Bonus" added to template.properties for translation.

-"All newly-trained [] units in this city receive the [] promotion" now uses unit category checking.

-New building unique "New [] units start with [] Experience in this city"
This can used by Poland's stable unique replacement in BNW, as it gives extra xp for mounted units.
"New [] units start with [] Experience" is the new nation wide version of this.

"New military units start with [] Experience" is now deprecated, but kept for now for mods. Json policy changed to fit new syntax.

-Unit category checking can now check for "non-air", "military", "military units" and uniques.
Added "military" to template.properties for translation.

-New unit unique "No defensive terrain penalty". Admittedly this is for a mod I'm making.

* translations must have spaces after!

* -Attacker Bonus unique changed to "+[]% Strength when attacking"
Changed Units.json and and Wolf Pack from UnitPromotions.json to this syntax

-Defender Bonus unique changed to "+[]% Strength when defending"
Armor Plating promotions were changed to this syntax
2020-10-14 10:22:49 +03:00
Federico Luongo
b5a32e64ae
City-states personalities (#3259)
* City State Personality

* Introduced 4 personalities for city states: Friendly, Neutral, Hostile and Irrational.
* Influence recovery and degrade depends on city state personality.

* Quests assignement dependant on Personality and Trait

* Personality localization strings
2020-10-14 09:51:31 +03:00
Yair Morgenstern
fa41076cf2 3.11.3 2020-10-10 23:18:14 +03:00
uncivbot[bot]
27a474ddd0
Translations update (#3252)
* Update Russian.properties (#3249)

* Update Russian.properties

* Update Russian.properties

* Update Japanese.properties (#3247)

* Update Japanese.properties

* Update Japanese.properties

* Add some translations for french language (#3251)

* Update Italian.properties (#3245)

Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>

* Update Hungarian.properties (#3244)

Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>

Co-authored-by: DarkHeaven <52608694+D4rkHeaven@users.noreply.github.com>
Co-authored-by: paontv <57051667+paontv@users.noreply.github.com>
Co-authored-by: ikarris <Yan.Petit@hotmail.fr>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
Co-authored-by: Czeczki <72320003+Czeczki@users.noreply.github.com>
2020-10-10 23:03:30 +03:00
Yair Morgenstern
f7ff1bd267 Translation generation can handle multiple parameters of the same type 2020-10-09 14:39:41 +03:00
givehub99
da328c0408
Unified Unit Category Checking For Uniques (#3238)
* Starting unified unit category checking. This will increase flexibility with uniques as well as cut down on uniques that have only a slightly different way of checking unit categories.

Things currently checked by the category checking method are:
Type of unit
Name of unit
Whether unit is wounded
If the unit is land, water, or air

"Bonus vs City y%" still works currently.

Uniques that have been changed/added to use this category checking method so far are:

"Bonus vs x y%"
"[] units deal +[]% damage" (parameterization of "Wounded military units deal +25% damage")
"[] units gain the [] promotion"

If PR approved, using this method for more uniques would be a good idea.

Commented as depecrated are these uniques
"+[]% Strength vs []" (this has not been used in json files)
"Wounded military units deal +25% damage" (policies json file was updated to use parameterized version)

The following was added to template.properties for translating modifiers:

Air
Wounded

* translation ending with a space

* -Changed matchesCategory method for CityCombatant to what was suggested
-Changed matchesCategory method for MapUnitCombatant to what was suggested
-Use type.name instead of type.toString().toLowerCase()
-Lowercasing is no longer allowed for type names and unit names.

I kept the lower cased versions of wounded, land, water, and air for compatibility as several of the uniques are phrased like "Bonus vs land units 25%" and such and have entries in template.properties (ie. land units = ).

* -Lowercasing is no longer allowed. For wounded, land, water or air, you have to either use the capitalized version (ie. "Wounded") or lower case with units (ie. "wounded units"). This lets preexisting uniques that use "wounded units" etc still work while also letting people use the singular capitalized word (ie. "Wounded") for other uniques.

* fixed missing check for wounded units
2020-10-08 13:09:05 +03:00
Yair Morgenstern
4fa7c8d4c6 3.11.2 2020-10-08 12:47:08 +03:00
uncivbot[bot]
9616d1458d
Translations update (#3243)
* Add fixes and localizations (#3234)

Added some translations needed and fixed some typos. Also shortened some phrases for more concise text.

* Update Italian.properties (#3235)

* Update Italian.properties

* Update Italian.properties

Co-authored-by: Rafael 'Fig Diamantino de Figueiredo <45023203+rafaeldfigueiredo@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
2020-10-08 12:37:14 +03:00
givehub99
9ffa0bee54
Consolidated Generic Tile Bonus Uniques (including Friendly Land, Foreign Land) (#3232)
* Redid things with help from HadeanLake:

-"+[]% combat bonus in []" Unit Unique
-"+[]% combat bonus for units fighting in []" Nation Unique
-Both of these can check for terrain or Friendly Land or Foreign Land
-Function to add stacking modifiers
-Himeji Castle and Foreign Legion had uniques changed to fit this syntax
-Old way still works for now, but deprecated

* fixed comments about deprecation and the new syntax
2020-10-06 10:52:30 +03:00
Yair Morgenstern
e951ed8324 3.11.1 2020-10-06 10:43:10 +03:00
uncivbot[bot]
7ecb059e05
Translations update (#3233)
* Update Italian.properties (#3221)

* Update Italian.properties

* Update Italian.properties

Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>

* Update Simplified_Chinese.properties (#3225)

* Update German.properties (#3228)

Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
Co-authored-by: CrispyXYZ <64761703+CrispyXYZ@users.noreply.github.com>
Co-authored-by: Czeczki <72320003+Czeczki@users.noreply.github.com>
2020-10-06 10:35:41 +03:00
Yair Morgenstern
523ed10e68 Specialist names are taken from the json files 2020-10-04 16:25:07 +03:00
Yair Morgenstern
3e98e0c00f 3.11.0 2020-10-03 20:48:34 +03:00
uncivbot[bot]
047fba0f1d
Translations update (#3220)
* Update Italian.properties (#3199)

* Added more translation and fix some (#3207)

* Translations update (#3212)

* Update Japanese.properties (#3213)

* Update Persian_(Pinglish-DIN).properties (#3215)

adding more translations

Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: fab144 <58261459+fab144@users.noreply.github.com>
Co-authored-by: Jack Rainy <JackRainy@users.noreply.github.com>
Co-authored-by: paontv <57051667+paontv@users.noreply.github.com>
Co-authored-by: Mojtaba Rahimy <mojtaba.rahimy@chmail.ir>
2020-10-03 20:25:20 +03:00
Yair Morgenstern
bfa9c65700 Modding - Buildings can be rendered obsolete (unbuildable) by techs 2020-09-30 23:17:09 +03:00
Federico Luongo
adaee7e7ab
City State quests (#3183)
* City State quests

* Flag to log two civ ever been friends
* Utility functions in GameInfo
* Created Diplomacy Action for notifications
* Utility functions for map
* Can be specified a custom color for surroundWithCircle
* Translation placeholder utility
* Added Quest model
* Utility function: number of researched technologies

* Image atlas rebuilt

* Localization

* Updated DiplomaticFlags and added EverBeenFriends

Slightly reworked nextTurnFlags() for code clarity and introduced the new flag EverBeenFriends that is set as soon as two civilizations are at least friends. It never expires.

* Removed quests not implemented yet from json
2020-09-29 23:26:50 +03:00
Yair Morgenstern
847abf31d1 3.10.13 2020-09-29 15:52:39 +03:00
uncivbot[bot]
81a1bcb6ed
Translations update (#3198)
* Update Italian.properties (#3188)

* Update Italian.properties

* Update Italian.properties

* Update Italian.properties

* Update Italian.properties

* Update Czech.properties (#3193)

new parametrised strings
Babylonian, Egyptian, English cities finished
French diplomacy and cities
Russian diplomacy and cities

* Update Spanish.properties (#3195)

* Update Indonesian.properties (#3196)

* So many hungarian translations (#3197)

* So many hungarian translations

* Fixing placeholders

Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: stoupa007 <60326342+stoupa007@users.noreply.github.com>
Co-authored-by: chriscr2 <70113017+chriscr2@users.noreply.github.com>
Co-authored-by: Kensvin <63847755+Kensvin28@users.noreply.github.com>
Co-authored-by: Krisztian Papp <30371056+pehsa@users.noreply.github.com>
2020-09-29 15:45:32 +03:00
Yair Morgenstern
fa5d2b6f49 3.10.12 2020-09-26 21:25:58 +03:00
uncivbot[bot]
bfadf2943b
Translations update (#3187)
* Update Italian.properties (#3174)

* Update Italian.properties

* Update Italian.properties

* Update Italian.properties

* Update Indonesian.properties (#3176)

* Update Dutch.properties (#3182)

Added extra translations for city states, starting new game, start screen and multiplayer

* Update Czech.properties (#3185)

new strings
diplomacy and cities - Akkad, England

Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: Yunichi <65927826+Yunichie@users.noreply.github.com>
Co-authored-by: knoeier0 <71691687+knoeier0@users.noreply.github.com>
Co-authored-by: stoupa007 <60326342+stoupa007@users.noreply.github.com>
2020-09-26 21:16:54 +03:00
Yair Morgenstern
24b4997e85 3.10.11 2020-09-22 20:03:36 +03:00
uncivbot[bot]
e2ea87499e
Translations update (#3173)
* Update Indonesian.properties (#3168)

* Update German.properties #2 (#3169)

* Update German.properties

Minor tweaks and corrections, remove lots on unneccesary "\n", it just caused some weird formatting on computer as unciv sets breaks on in own already. Changed wording of tutorial quite a bit.

* Update German.properties

Changed and corrected the whole introduction / tutorial translations, deleted lots of unneccesary "\n" as UnCiv adds breaks on his own. Let some breaks in for a new sentence for better readability.

* More hungarian translations (#3171)

* More hungarian translations

* Fix some character

* Update Dutch.properties (#3170)

Added translations for diplomacy

Co-authored-by: Kensvin <63847755+Kensvin28@users.noreply.github.com>
Co-authored-by: Stefan <natrius@users.noreply.github.com>
Co-authored-by: Krisztian Papp <30371056+pehsa@users.noreply.github.com>
Co-authored-by: knoeier0 <71691687+knoeier0@users.noreply.github.com>
2020-09-22 19:46:32 +03:00
HadeanLake
f721f59734
Added national wonders, fixed some minor issues (#3163)
* fixed translation of "Owned: [amountOwned] = " line

* Tweaked culture from killing
Aztecs get melee strength of the unit killed in culture and honor opener does the same thing.
They stack. So you get culture equal to 200% of the dead unit's strength (not ranged strength).

* removed hurryCostModifier from units that should not have it

Default value of HurryCostModifier is 0
List of units with non-default HurryCostModifier:

Settler (20)
SS parts (-1) (cannot be hurried)

Frigate (20)
Ship of the Line (20)
Caravel (30)
Turtle Ship (30)

Catapult (20)
Ballista (20)

Horseman (20)
Companion Cavalry (20)

Swordsman (20)
Mohawk Warrior (20)
Legion (20)
Berserker (20)

* added missing definitions from vanilla (commented out)
added missing obsolete tech tags, etc

* tweaked hurryCostModifier, added missing vanilla buildings (commented out)

* added promotions and parametrized uniques
Morale (+[15]% Combat Strength)
Great Generals I ([Great General] is earned [50]% faster)
Great Generals II ([Great General] is earned [100]% faster)
Quick Study ([50]% Bonus XP gain)
Unretired Mass Media icon

Added Heroic Epic, National Epic and National Treasury national wonders
Heroic Epic has unique "All newly-trained [non-air] units in this city receive the [Morale] promotion" - "non-air" is valid param now

[Raising The Flag on Iwo Jima silhouette, Marine Corps War Memorial Raising the Flag on Iwo Jima Battle of Iwo Jima Washington, D.C., memorial free png](https://www.pngfuel.com/free-png/opgid) for Heroic Epic and Morale promotion
[Arc de Triomphe](https://thenounproject.com/search/?q=Arc%20de%20Triomphe&i=2936011) by iconfield for National Epic
[Bank](https://thenounproject.com/term/bank/213472/) by By P Thanga Vignesh for National Treasury
reused general icon for Great Generals and Quick Study promotions

* implemented "Cost increases by [30] per owned city of cities" unique
All vanilla national wonders that require something in all cities have it

* added uniques
"Nuclear weapon" - Game option "nuclearWeaponsEnabled" enables units with this unique
"Requires [building]" - Apollo Program, Manhattan Project etc
"Requires adopted [policy]" - in expansions Statue of Zeus will require "Honor", Prora - "Autocracy", Landsknecht - "Mercenary Army".

* merged "Requires adopted [policy]" with "Requires [Wonder]"

* Separated unique.params[0] to val filter

* Changed National Epic image
2020-09-21 21:44:52 +03:00
Yair Morgenstern
d0d0481f00 3.10.10 2020-09-20 20:21:40 +03:00
uncivbot[bot]
1dbafece02
Translations update (#3162)
* Update Italian.properties (#3156)

* Update Simplified_Chinese.properties (#3157)

* Update Simplified_Chinese.properties

* Update Simplified_Chinese.properties

* Update Simplified_Chinese.properties

* Update German.properties (#3159)

Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: CrispyXYZ <64761703+CrispyXYZ@users.noreply.github.com>
Co-authored-by: scaphander <67830047+scaphander@users.noreply.github.com>
2020-09-20 20:13:12 +03:00
Yair Morgenstern
8db955b851 3.10.10 2020-09-18 11:27:11 +03:00
Stefan
dcb1b3f1e8
Major update german.properties (#3147)
* Major update german.properties

Straightened out the form of adress, its now the royal version ( i hope i did not miss anything), added missing translations, corrected lot of translations (i did not(!) look at #################### Lines from Tutorials #################### )

* Major update German.properties

Corrected the mistake and changed all "Felder" to "Kacheln"
2020-09-18 11:18:52 +03:00
uncivbot[bot]
177bb6a973
Translations update (#3155)
* Update Indonesian.properties (#3133)

Updating some translations

* Solve Conflicts and Update Brazilian_Portuguese.properties (#3141)

* Update Brazilian_Portuguese.properties

I modified some translations of the menus and some constructions, and translate the Babylon

* Translate all Egyptian cities and remove unnecessaries "Requires translation!"

* Translate more cities and remove unnecessaries "Requires translation!"

* more updates

* a review on prepositions and update

Co-authored-by: AlexLuis <68296033+AlexLuis@users.noreply.github.com>

* more hungarian translation (#3146)

* Update Italian.properties (#3151)

* Update Italian.properties

* Update Italian.properties

* Update Japanese.properties (#3154)

Co-authored-by: Yunichi <65927826+Yunichie@users.noreply.github.com>
Co-authored-by: Lincoln V Schreiber <lincolnschreiber@gmail.com>
Co-authored-by: AlexLuis <68296033+AlexLuis@users.noreply.github.com>
Co-authored-by: Krisztian Papp <30371056+pehsa@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>
2020-09-18 11:06:42 +03:00
lishaoxia1985
9f4607635b
UI Upgrade (#3149)
* UI Update

* Replace ScrollPane with Table in Minimap
2020-09-18 10:59:18 +03:00
Yair Morgenstern
1ceb3548dd Resolved #3130 - "All policies adopted" shown in policy picker screen when relevant 2020-09-16 19:17:25 +03:00
Yair Morgenstern
76741b446b 3.10.9 2020-09-12 23:06:42 +03:00
uncivbot[bot]
02def47f1b
Translations update (#3132)
* Update Indonesian.properties (#3125)

* Update Italian.properties (#3126)

* Update Italian.properties

New translations

* Update Italian.properties

* Update Spanish.properties (#3129)

Co-authored-by: Kensvin <63847755+Kensvin28@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: chriscr2 <70113017+chriscr2@users.noreply.github.com>
2020-09-12 22:43:58 +03:00
Yair Morgenstern
7d32412646 Translation updates, with minor changes to ensure consistency 2020-09-11 11:16:31 +03:00
uncivbot[bot]
ea08a96482
Translations update (#3124)
* Update Italian.properties (#3111)

* Update Ukrainian.properties (#3120)

* Update Ukrainian.properties

* Update Ukrainian.properties

* Update Ukrainian.properties

* Update Ukrainian.properties

* Додав слово Надають

* Update Brazilian_Portuguese.properties (#3121)

* some minutes translating

pra ajudar os player br pq esse jogo é bom demais!

* Update Brazilian_Portuguese.properties

* Update Japanese.properties (#3123)

* Update Spanish.properties (#3113)

* Update Indonesian.properties (#3116)

Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>

Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: Prosta4okua <31485341+Prosta4okua@users.noreply.github.com>
Co-authored-by: ISS <27261371+4urb4nm0nk@users.noreply.github.com>
Co-authored-by: paontv <57051667+paontv@users.noreply.github.com>
Co-authored-by: chriscr2 <70113017+chriscr2@users.noreply.github.com>
Co-authored-by: Kensvin <63847755+Kensvin28@users.noreply.github.com>
Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
2020-09-11 11:07:39 +03:00
Yair Morgenstern
cb0599b9f5 Simplified "on [seacost]" and "on [tile next to fresh water]" to "next to [Coast]" and "next to [Fresh water]" 2020-09-11 09:24:08 +03:00
HadeanLake
9f48f43ad0
parameterized some uniques, fixes some minor bugs (#3122)
Fixed Moai
Wonder overlay will remove terrain overlay in default tileset
Oasis, Marsh and Atoll now have "Rare feature" unique, rare features can be added by mods
implemented TileInfo.fitsUniqueFilter(filterText:String): Boolean
parameterized uniques:
* "Must have an owned [Mountain] within [2] tiles"
* "Must be on [River]" - not to be confused with "Must be next to [River]" - the tile city on must have river at its border, not the adjacent tile
* "Must not be on [Hill]"
* "Must not be next to []"
* "Must be on [seacoast]" - next to "Coast" tile
* "Must be on [tile adjacent to source of fresh water]"
* "Must be next to [Water]" - next to any water tile, including "Lakes"
* "Must be next to [terrainFeature]"
* "Must be next to [unique]" - e.g "Must be next to [Rare feature]" - next to terrain or terrain feature having this unique
2020-09-11 07:56:56 +03:00
lishaoxia1985
9d951835d1
UI Update (#3102)
* Add "Load game" in WorldscreenMenuPopup

* UI Update

* Fix the Ottomans uniques, edit Tech description
2020-09-10 19:25:56 +03:00
Yair Morgenstern
f859259c2a 3.10.8 2020-09-08 19:34:25 +03:00
uncivbot[bot]
bf2742350d
Translations update (#3107)
* Update Italian.properties (#3090)

* Update Indonesian.properties (#3097)

* Update Indonesian.properties

* Update Indonesian.properties

* Update Japanese.properties (#3091)

* Update Japanese.properties

* Update Japanese.properties

* Update Japanese.properties

* Update Japanese.properties

* Update Spanish.properties (#3096)

* Update Simplified_Chinese.properties (#3098)

* Update Czech.properties (#3106)

Aztecs translation, scenario translation, egypt diplomacy and cities, various missing improvement names and rules

Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: Kensvin <63847755+Kensvin28@users.noreply.github.com>
Co-authored-by: paontv <57051667+paontv@users.noreply.github.com>
Co-authored-by: chriscr2 <70113017+chriscr2@users.noreply.github.com>
Co-authored-by: CrispyXYZ <64761703+CrispyXYZ@users.noreply.github.com>
Co-authored-by: stoupa007 <60326342+stoupa007@users.noreply.github.com>
2020-09-08 19:14:56 +03:00
Yair Morgenstern
3719b5c4f6 Added mod screen translation terms 2020-09-07 23:03:12 +03:00
Yair Morgenstern
ca36084e8b 3.10.7 2020-09-04 16:44:00 +03:00
uncivbot[bot]
4bc4138f2f
Translations update (#3089)
* Update Japanese.properties (#3038)

* Update Japanese.properties

* Update Japanese.properties

* Update Japanese.properties

* Update Japanese.properties

* Update Japanese.properties

* Update Italian.properties (#3074)

* Update Italian.properties

* Update Italian.properties

* Update Italian.properties

* Update Italian.properties

* Update Spanish.properties (#3084)

* Update Simplified_Chinese.properties (#3088)

* Update Hungarian.properties (#3087)

Co-authored-by: paontv <57051667+paontv@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: chriscr2 <70113017+chriscr2@users.noreply.github.com>
Co-authored-by: CrispyXYZ <64761703+CrispyXYZ@users.noreply.github.com>
Co-authored-by: Krisztian Papp <30371056+pehsa@users.noreply.github.com>
2020-09-04 16:22:32 +03:00
Yair Morgenstern
08a15a888f Fixed test 2020-09-03 17:58:24 +03:00
Yair Morgenstern
6de4300cb8 Testing how the test errors are displayed in Travis 2020-09-03 14:03:17 +03:00
HadeanLake
8f75368b99
Farms near freshwater (#3063)
* Farms near freshwater
* Farm now has unique "Can also be built on tiles adjacent to fresh water"
https://civilization.fandom.com/wiki/Farm_(Civ5)
Even snow: https://www.reddit.com/r/civ/comments/11qtko/farms_on_snow/
Hill+Farm, Snow+Farm, Tundra+Farm sprites by THE BUCKETEER and Ravignir from discord
* fields improvingTech and improvingTechStats converted into uniques
e.g.:
"[+1 Production] once [Scientific Theory] is discovered"
"[+1 Food] on [fresh water] tiles once [Civil Service] is discovered"
"[+1 Food] on [non-fresh water] tiles once [Fertilizer] is discovered"

* ai will build trading posts and farms in snow and tundra if it has no better tiles to work on

* "Provides a one-time Production bonus to the closest city when cut down" unique for forest

* update template.properties
2020-09-02 19:49:29 +03:00
Yair Morgenstern
145db68248 3.10.6 2020-09-01 22:58:52 +03:00
uncivbot[bot]
6c2d597c39
Translations update (#3072)
* Update Czech.properties (#3058)

* Update Czech.properties

tweaked consistency of "resource" term translation
nation uniques (re)translated
missing policy strings (re)translated

* Update Czech.properties

fixed typo and few minor tweaks based on actual string usage

* Add hungarian translation, First batch (#3060)

* add hungarian translation, first batch

* Fixing placeholder

* Update Indonesian.properties (#3064)

Co-authored-by: stoupa007 <60326342+stoupa007@users.noreply.github.com>
Co-authored-by: Krisztian Papp <30371056+pehsa@users.noreply.github.com>
Co-authored-by: lahdjirayhan <52926983+lahdjirayhan@users.noreply.github.com>
2020-09-01 19:34:12 +03:00
Yair Morgenstern
e111bba509 #3050 - Added "automated workers don't replace improvements" setting 2020-08-31 22:39:03 +03:00
Yair Morgenstern
c61ec2120b Separated base ruleset mods in new game screen - cannot activate multiple base ruleset mods 2020-08-31 21:24:36 +03:00
lishaoxia1985
503bf45e8d
Chinese update, Fix CityInfoTable bug (#3062)
* Chinese update, Fix CityInfoTable bug

* Delete some skin classes which are unused in Game
2020-08-31 19:49:01 +03:00
HadeanLake
e6e31b4e1a
Aztecs and some other things (#3033)
* Added icons
* [temple](https://thenounproject.com/search/?q=temple&i=28256) By Fabio Meroni for Temple of Artemis
* [Canoe](https://thenounproject.com/term/canoe/402285/) By Viktor Fedyuk (Tim P) for Floating Gardens
* [Garden](https://thenounproject.com/search/?q=garden&i=1478380) By Bharat
Aztecs by Séan https://discord.com/channels/586194543280390151/633733497277775884/727255962754351104
Jaguar by Red11

Reused slinger icon for Slinger Withdraw

* Added buildings and uniques for them
garden - bonus building of the Medieval Era. City "Must border a source of fresh water"
Temple of Artemis - World wonder of the Ancient era
Floating Gardens - Aztec unique building, replaces Water Mill

"[+1 Science] Per [2] Population in this city" - for Library and Public School
"+[]% great person generation in this city" - for garden
"Must border a source of fresh water" - "fresh water" provided by river or tiles with "Fresh water" unique. Added "Fresh water" unique to Lakes and Oasis
"+[10]% growth in all cities" - now has parameter - for Tradition Complete policy and Temple of Artemis
"+[10]% growth in capital" - now has parameter
"+[15]% Production when constructing [ranged units]"   - "ranged units" now valid param
"[stats] once [tech] is discovered" - Petra and Mughal Fort have it
"[+1 Production] from [River] tiles in this city"]  - now can use "River" - for Hydro plant

* Added Jaguar - Aztec unique unit
New unique - "+[]% combat bonus in [param]" unique - Norwegian Ski Infantry, Jaguars and Mohawks have it. param can be terrainFeature or baseTerrain, in case of baseTerrain it implies there are no features like vegetation her
Implemented "Culture for the empire from each enemy unit killed"
tweaked honor policy - it should bring half as much culture, and same as Sacrificial Captives
Fixed penalty for terrain if unit do not have "No defensive terrain bonus" unique

* Added Aztecs

* Update template.properties

* update template.properties

* update template.properties

* update template.properties
2020-08-30 21:02:59 +03:00
Yair Morgenstern
683cbb5864 3.10.5-patch1 2020-08-30 20:50:56 +03:00
uncivbot[bot]
fb38fb9da7
Translations update (#3056)
* Update Turkish.properties (#3042)

* russian & ukrainian translations update (#3043)

* russian & ukrainian translations update

* Update completionPercentages.properties

* Update Spanish.properties (#3044)

* Update Brazilian_Portuguese.properties (#3045)

I want to help =)

* Translation update, Some bug fix (#3047)

* Translation update, Some bug fix

* Remove some blank key when we use Fonts.turn

Co-authored-by: omerfaruk-cakmak <32402595+omerfaruk-cakmak@users.noreply.github.com>
Co-authored-by: DuffKI <51823715+DuffLagerleff@users.noreply.github.com>
Co-authored-by: chriscr2 <70113017+chriscr2@users.noreply.github.com>
Co-authored-by: arturT7 <70413143+arturT7@users.noreply.github.com>
Co-authored-by: lishaoxia1985 <49801619+lishaoxia1985@users.noreply.github.com>
2020-08-30 20:27:13 +03:00
HadeanLake
15ed1a608b
New uniques and stuff for mods (#3055)
* "[+1 Gold] for each adjacent [Road]" Roadstatus can be used now in tile improvement uniques

* Added hasViewableResource check to "[stats] from every [Resource]"

* Fixed translation of nation uniques

* Eras with no researchable techs will not appear in dropdown menu in new game options

* Implemented startingUnits, aiMajorCivStartingUnits and aiCityStateStartingUnits fields in difficulty

* reassignRemovedModReferences will also reassign if nation is a City-State in current ruleset
e.g. Venice will be unselected if player unselects Civ5ExpansionMod which has it as playable civ

* "Cannot be purchased" - new unique for non-wonders and units. SS parts have it

* Update template.properties

* Update Difficulty.kt
2020-08-30 15:48:00 +03:00
Yair Morgenstern
b83ad41518 3.10.5 2020-08-27 15:21:11 +03:00
uncivbot[bot]
69bdadf87b
Translations update (#3036)
* Update Italian.properties (#3030)

* German translation updates (#3031)

* Update German.properties

* Update German.properties

* Update Simplified_Chinese.properties (#3032)

* Update Simplified_Chinese.properties

* Update Simplified_Chinese.properties

* Update Spanish.properties (#3034)

Fixed some spelling errors and missing translations added.

Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: scaphander <67830047+scaphander@users.noreply.github.com>
Co-authored-by: CrispyXYZ <64761703+CrispyXYZ@users.noreply.github.com>
Co-authored-by: chriscr2 <70113017+chriscr2@users.noreply.github.com>
2020-08-27 15:03:47 +03:00
Yair Morgenstern
3fdcbeeef6 3.10.4 2020-08-25 17:17:25 +03:00
uncivbot[bot]
078b07bdb5
Translations update (#3029)
* Update Italian.properties (#3023)

* Update Spanish.properties (#3024)

Actualización de cambios del idioma español
Spanish language changes update

* Update Simplified_Chinese.properties (#3025)

Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: chriscr2 <70113017+chriscr2@users.noreply.github.com>
Co-authored-by: CrispyXYZ <64761703+CrispyXYZ@users.noreply.github.com>
2020-08-25 17:07:12 +03:00
Yair Morgenstern
45d90c0458 Unified construction filtering for civ- and city-wide uniques 2020-08-24 14:30:26 +03:00
Yair Morgenstern
6ff712b625 A mishmash of different fixes: Unit uniques and promotions, happiness calculation, etc. 2020-08-24 10:58:14 +03:00
Yair Morgenstern
21c8336563 unit.getMatchingUniques() 2020-08-24 09:48:33 +03:00
Yair Morgenstern
40f93461fa With new translation lines 2020-08-23 21:27:31 +03:00
Yair Morgenstern
9ef7d8770d Added a new test that ensures no two placeholders are the same
Fixed double 'param' parameter in existing translations
2020-08-23 21:20:17 +03:00
uncivbot[bot]
6185312fd9
Translations update (#3022)
* Update Italian.properties (#3013)

Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>

* Update Simplified_Chinese.properties and Traditional_Chinese.properties (#3019)

* Update Simplified_Chinese.properties

* Update Traditional_Chinese.properties

* Update Traditional_Chinese.properties

* Update Indonesian.properties (#3014)

Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>

* Update German.properties (#3015)

Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>

* Update Russian.properties and Ukrainian.properties (#3018)

* Update Russian.properties and Ukrainian.properties

* Update Russian.properties

* update Ukrainian.properties

* Update Ukrainian.properties

* Update Russian.properties and Ukrainian.properties

* Update Russian.properties and Ukrainian.properties

* update Ukrainian.properties after review

* Update Russian.properties and Ukrainian.properties

* Update Russian.properties and Ukrainian.properties

* Update Russian.properties and Ukrainian.properties after review

* Update Russian.properties and Ukrainian.properties

Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
Co-authored-by: CrispyXYZ <64761703+CrispyXYZ@users.noreply.github.com>
Co-authored-by: Kensvin <63847755+Kensvin28@users.noreply.github.com>
Co-authored-by: scaphander <67830047+scaphander@users.noreply.github.com>
Co-authored-by: HadeanLake <69697985+HadeanLake@users.noreply.github.com>
2020-08-23 20:29:37 +03:00
Yair Morgenstern
db7f064498 Resolved #3016 - Policy branch uniques are translated properly 2020-08-21 14:06:29 +03:00
Yair Morgenstern
270c50afd6 Generified more building uniques and merged functionality of global and city uniques when alculating tile stats 2020-08-20 23:11:53 +03:00
Yair Morgenstern
e7c0710042 3.10.2 2020-08-20 12:30:46 +03:00
uncivbot[bot]
2492c17216
Translations update (#3012)
* Update Italian.properties (#3002)

* Update Czech.properties (#3003)

lot of new strings translated

* Update German.properties (#3005)

* Update Indonesian.properties (#3004)

* Update Simplified_Chinese.properties (#3010)

* Update Simplified_Chinese.properties

* Update Simplified_Chinese.properties

* Update Simplified_Chinese.properties (#3011)

Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: stoupa007 <60326342+stoupa007@users.noreply.github.com>
Co-authored-by: scaphander <67830047+scaphander@users.noreply.github.com>
Co-authored-by: Kensvin <63847755+Kensvin28@users.noreply.github.com>
Co-authored-by: CrispyXYZ <64761703+CrispyXYZ@users.noreply.github.com>
Co-authored-by: ZGMZY <69511837+ZGMZY@users.noreply.github.com>
2020-08-20 12:09:06 +03:00
HadeanLake
764a1c3913
scenario editing mode improvements and new unique (#2999)
* scenario editing mode improvements and new uniques

* Fixed Russian nation unique - it is civ-wide bonus

* genericized "+[]% Production when building [] in this city"

* genericized "All newly-trained [] units in this city receive the [] promotion"

* changed some uniques to be able to have list of filters separated by comma as unique param

* scenario editing mode improvements:

Resource requirements when buying buildings and units are ignored

Limit for selling buildings is ignored

Workers improve tiles instantly

Units will not be disbanded if civilization has negative gold

* fix crash in scenario editing mode due to PerpetualConstruction not having a GoldCost

* undo comma separation

* implement All newly-trained [relevant] units in this city receive the [] promotion
relevant as in 'units that can receive'

* upadte template.properties

* unnecessary parentheses

* Not being annoyed by this vs less chance of forgetting to set gold before releasing scenario

* update template.properties

* add missing spaces
2020-08-18 19:20:59 +03:00
ravignir
18834d94ae
Update Polish.properties (#2998)
Fixed (hopefully) all typos
2020-08-17 23:40:54 +03:00
Yair Morgenstern
41615909df Translation tests are fixed - translators beware 2020-08-16 22:01:55 +03:00
uncivbot[bot]
da4852d954
Translations update (#2996)
* Finnish translation update (#2993)

* Add Finnish.properties

* Move Finnish.properties to right folder

* Delete Finnish.properties

* Add translations to Finnish

* Add translations to Finnish

* Translate more stuff in Finnish

* More translation to Finnish

* Update Brazilian_Portuguese.properties (#2994)

Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>

* Update Italian.properties (#2992)

* Create PolishNew (#2995)

New polish translation, should be 100% complete.

Co-authored-by: Perttu Männistö <64960796+maitovelkkis@users.noreply.github.com>
Co-authored-by: Dalmolax <63485458+Dalmolax@users.noreply.github.com>
Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: ravignir <RAVIGNIRFORATT@GMAIL.COM>
2020-08-16 20:41:51 +03:00
Yair Morgenstern
4cd4d5d89f All kinds of crazy translation fixes 2020-08-15 23:20:18 +03:00
leanhquanea1234
324f4d7a15
Update Vietnamese.properties (#2991)
* Create Vietnamese

* Update and rename Vietnamese to Vietnamese.properties

* Update Vietnamese.properties

* Update Vietnamese.properties

* Update Vietnamese.properties

* Update Vietnamese.properties

* Update Vietnamese.properties

* Update Vietnamese.properties

* Update Vietnamese.properties

* Update Vietnamese.properties

* Update Vietnamese.properties

Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
2020-08-15 21:22:28 +03:00
Yair Morgenstern
59fa4ff052 #2988 Finnish translation file expanded 2020-08-14 10:24:50 +03:00
Perttu Männistö
99f19b1f71
Move Finnish.properties to right folder (#2988)
* Add Finnish.properties

* Move Finnish.properties to right folder
2020-08-14 10:22:06 +03:00
Yair Morgenstern
24d5e08783 Translation updates for Finnish 2020-08-14 00:38:17 +03:00
uncivbot[bot]
9b13f44b2b
Translations update (#2983)
* Add Finnish.properties (#2982)

* Update Indonesian.properties (#2978)

* Update Simplified_Chinese.properties (#2977)

* Update Italian.properties (#2975)

* Update German.properties (#2984)

Co-authored-by: Perttu Männistö <64960796+maitovelkkis@users.noreply.github.com>
Co-authored-by: Kensvin <63847755+Kensvin28@users.noreply.github.com>
Co-authored-by: CrispyXYZ <64761703+CrispyXYZ@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: scaphander <67830047+scaphander@users.noreply.github.com>
2020-08-14 00:32:12 +03:00
Yair Morgenstern
451234c3bb 3.9.20 2020-08-12 19:39:45 +03:00
uncivbot[bot]
adfd44c959
Translations update (#2974)
* Update Italian.properties (#2958)

* Update Indonesian.properties (#2961)

* Update Indonesian.properties

* Update Indonesian.properties

* German translation update (#2965)

* Update German.properties

* Update German.properties

* Update German.properties

"Hinterhalt" seems more logic to me in this case

* Update Ukrainian.properties (#2963)

* Update Ukrainian.properties

* Update Ukrainian.properties

* Update Japanese.properties (#2968)

* Update Korean.properties (#2969)

* Update Simplified_Chinese.properties (#2970)

* Create Vietnamese (#2971)

* Create Vietnamese

* Update and rename Vietnamese to Vietnamese.properties

* Update Vietnamese.properties

* Update Vietnamese.properties

* Update Vietnamese.properties

Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: Kensvin <63847755+Kensvin28@users.noreply.github.com>
Co-authored-by: scaphander <67830047+scaphander@users.noreply.github.com>
Co-authored-by: Prosta4okua <31485341+Prosta4okua@users.noreply.github.com>
Co-authored-by: paontv <57051667+paontv@users.noreply.github.com>
Co-authored-by: TG <saud2410@naver.com>
Co-authored-by: ZGMZY <69511837+ZGMZY@users.noreply.github.com>
Co-authored-by: leanhquanea1234 <69520258+leanhquanea1234@users.noreply.github.com>
2020-08-12 19:15:30 +03:00
Yair Morgenstern
889d6a1587 Denounce now has a confirmation popup 2020-08-10 23:24:02 +03:00
Yair Morgenstern
3b2e813523 Ancient Ruins can now provide Culture 2020-08-10 23:12:02 +03:00
Yair Morgenstern
b8ce489ea3 3.9.19 2020-08-08 21:39:34 +03:00
uncivbot[bot]
b035571d79
Translations update (#2957)
* Update Italian.properties (#2942)

* Update Thai.properties (#2949)

Hmm can we change the current Thai font to the other. Maybe that would help fixing the current Thai text display problem

* Update Indonesian.properties (#2948)

Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: NoNZeeZ <58921355+NoNZeeZ@users.noreply.github.com>
Co-authored-by: Kensvin <63847755+Kensvin28@users.noreply.github.com>
2020-08-08 21:26:57 +03:00
Yair Morgenstern
ae60aab7e5 Resolved #2818 - Can no longer build improvements outside your borders 2020-08-07 17:22:48 +03:00
Yair Morgenstern
5cc610aa5d Persia nation uniques - also contained a translation-wide change 2020-08-06 20:24:18 +03:00
Yair Morgenstern
5e222a44b6 3.9.18 2020-08-05 22:03:53 +03:00
uncivbot[bot]
318a8fb22f
Translations update (#2941)
* Update Italian.properties (#2919)

* Update Indonesian.properties (#2927)

* Update Ukrainian.properties (#2931)

* Update Korean.properties (#2934)

Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: Kensvin <63847755+Kensvin28@users.noreply.github.com>
Co-authored-by: Prosta4okua <31485341+Prosta4okua@users.noreply.github.com>
Co-authored-by: TG <saud2410@naver.com>
2020-08-05 22:00:45 +03:00
Yair Morgenstern
a97c9bafcc Civ uniques up to Arabia converted 2020-08-02 22:03:30 +03:00
Yair Morgenstern
5aaab7e137 Civ uniques done up till Egypt 2020-08-02 17:04:11 +03:00
Yair Morgenstern
b4708b05b3 Unified regular unit and great person unit additions
First playaround with nation uniques!
2020-08-01 23:04:33 +03:00
Yair Morgenstern
9ade890ad4 3.9.17 2020-08-01 22:07:28 +03:00
uncivbot[bot]
c8ff18503b
Translations update (#2918)
* Update Japanese.properties (#2904)

* Update Italian.properties (#2906)

* Update Korean.properties (#2915)

Co-authored-by: paontv <57051667+paontv@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: TG <saud2410@naver.com>
2020-08-01 21:44:50 +03:00
lishaoxia1985
acdc6cee69
AS update to 4.0.1, Edit Diplomacy UI in Overview (#2885) 2020-08-01 21:44:32 +03:00
Alexander Korolyov
86f500b266
Fog of war implementation (#2887)
* Initial implementation fog of war for spectators

* Corrected fog of war for main map

* Fix borders seen in unexplored tiles during spectating

* Small refactor

* Fixes after code review

* Fixes after code review

* wierd bug fix, android studio "eats" spaces
2020-07-31 11:32:44 +03:00
Yair Morgenstern
8fec837e64 Modernized translations yay 2020-07-30 22:40:50 +03:00
Yair Morgenstern
ca58bb22ac 3.9.16 2020-07-30 13:37:28 +03:00
uncivbot[bot]
dfce74f020
Translations update (#2903)
* Update Italian.properties (#2888)

* Update Persian_(Pinglish-DIN).properties (#2889)

Made some translations more accurate, Fixed a few mistakes and, Added some new translations.

* Update Persian_(Pinglish-UN).properties (#2890)

The same thing that I did with  the PinglishDIN translations.

* Update Persian instructions.txt (#2891)

Updated the criteria

* Update Indonesian.properties (#2892)

* Update German.properties (#2899)

Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: TheRNB <44290454+TheRNB@users.noreply.github.com>
Co-authored-by: Kensvin <63847755+Kensvin28@users.noreply.github.com>
Co-authored-by: scaphander <67830047+scaphander@users.noreply.github.com>
2020-07-30 13:09:09 +03:00
Yair Morgenstern
f18f6d4a29 3.9.15 2020-07-26 22:07:50 +03:00
Kensvin
d57c814190
Update Indonesian.properties (#2882) 2020-07-26 21:38:38 +03:00
Giuseppe D'Addio
46cc0ed5d1
Update Italian.properties (#2883) 2020-07-26 21:38:20 +03:00
Yair Morgenstern
066dd615b4 Created stat parameter parsing and translation!
Genericified "[stats] from [terrain] tile" building unique
2020-07-24 17:47:55 +03:00
Yair Morgenstern
d9e1b58bd2 Added Pinglish translations 2020-07-24 09:55:29 +03:00
uncivbot[bot]
881aff1166
Translations update (#2880)
* Update Korean.properties (#2874)

Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>

* Create Persian_PingilishDIN.properties (#2866)

This is the Persian translation for UnCiv, please note that since the Persian has its own alphabet (which is from right to left) I just used an alphabet derived from the DIN 31635 standard made by "Deutsches Institut für Normung"

* Create Persain_PinglishUN.properties (#2867)

This is a Persian translation for UnCiv, please note that since Persian has its own alphabet (which is written from right to left) I just used an alphabet derived from the ALA_LC standard made by "American Library Association - Library of Congress".

* Update Brazilian_Portuguese.properties (#2868)

Co-authored-by: TG <saud2410@naver.com>
Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
Co-authored-by: TheRNB <44290454+TheRNB@users.noreply.github.com>
Co-authored-by: Dalmolax <63485458+Dalmolax@users.noreply.github.com>
2020-07-24 09:32:18 +03:00
Yair Morgenstern
d7bac9ed3e Genericified 'free [unit] appears] 2020-07-24 00:34:39 +03:00
Yair Morgenstern
548e107504 Generic "must be next to []" unique for buildings 2020-07-24 00:23:42 +03:00
TG
bcfcadf5bc
Update template.properties (#2875) 2020-07-23 14:40:52 +03:00
Yair Morgenstern
d8b84db3a6 Removed extraneous (for now) G&K files 2020-07-20 23:03:00 +03:00
uncivbot[bot]
d578393f65
Translations update (#2865)
* Update Simplified_Chinese.properties (#2847)

音译了一些城市名称。
Transliterated some city names.

Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>

* Update Japanese.properties (#2855)

* Update Korean.properties (#2858)

* Update Korean.properties

* Update Korean.properties

* Update Russian translations (#2859)

* Add missing Russian translations

Added missing Russian translations. One translation is still missing: "Removing Terrain Features"

* add missing

* Update Italian.properties (#2861)

* Update Indonesian.properties (#2862)

Co-authored-by: Doubi_TS <48427744+tianshidoubi@users.noreply.github.com>
Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
Co-authored-by: paontv <57051667+paontv@users.noreply.github.com>
Co-authored-by: TG <saud2410@naver.com>
Co-authored-by: Sergei Bolotov <sbolotov@microsoft.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: Kensvin <63847755+Kensvin28@users.noreply.github.com>
2020-07-20 06:22:44 +03:00
Yair Morgenstern
c402d63a68 3.9.12 2020-07-16 23:15:23 +03:00
uncivbot[bot]
9b2ef20f25
Update Russian.properties (#2846) (#2854)
Co-authored-by: Kruger-Sheppard <65571371+Kruger-Sheppard@users.noreply.github.com>
2020-07-16 22:27:22 +03:00
Giuseppe D'Addio
4f919b32de
Update template.properties (#2843)
Added new translation lines that were absent in the game
2020-07-14 14:32:55 +03:00
Yair Morgenstern
f57533bc48 3.9.11 2020-07-13 21:45:52 +03:00
uncivbot[bot]
05b32e2146
Translations update (#2842)
* Update Korean.properties (#2816)

* Update Korean.properties

* Update Korean.properties

* Update Japanese.properties (#2821)

* Update Japanese.properties

* Update Japanese.properties

* Update Indonesian.properties (#2831)

* Update Brazilian_Portuguese.properties (#2841)

Co-authored-by: TG <saud2410@naver.com>
Co-authored-by: paontv <57051667+paontv@users.noreply.github.com>
Co-authored-by: Kensvin <63847755+Kensvin28@users.noreply.github.com>
Co-authored-by: Dalmolax <63485458+Dalmolax@users.noreply.github.com>
2020-07-13 21:37:51 +03:00
Yair Morgenstern
04939feb3c 3.9.10 2020-07-08 19:39:16 +03:00
uncivbot[bot]
cf8fb3da1c
Translations update (#2814)
* Update Ukrainian.properties (#2805)

* Update Japanese.properties (#2806)

* Update Italian.properties (#2807)

* Update Korean.properties (#2812)

* German translation update II - German.properties (#2813)

* Update German.properties - fixed lost variables

* Update German.properties

- more compact notation: Geländemerkmale entfernen - "Entfernen von Geländemerkmalen" is too long / looks bad in civilopedia
- simplified spelling
- better descriptions

* Update German.properties

Vanilla Nations - Sumerians!

Co-authored-by: Prosta4okua <31485341+Prosta4okua@users.noreply.github.com>
Co-authored-by: paontv <57051667+paontv@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: TG <saud2410@naver.com>
Co-authored-by: scaphander <67830047+scaphander@users.noreply.github.com>
2020-07-08 19:32:32 +03:00
Yair Morgenstern
19bb1cdb94 Translation writer now takes from all base ruleset, and doesn't add duplicate keys - we're ready to start actual work on G&K! 2020-07-07 00:18:02 +03:00
Yair Morgenstern
58a8e358ea 3.9.9 2020-07-05 23:21:59 +03:00
uncivbot[bot]
d58b73313e
Translations update (#2804)
* Update Indonesian.properties (#2792)

* add some simplified chinese translation (#2797)

Co-authored-by: gsm988aa@gmail.com <sim.gao@lab.sra.uni-hannover.de>

* German translation update - German.properties (#2799)

* Update German.properties

* Update German.properties

* Update German.properties

- english: resource -> german: Ressource
- several Additions

* Update German.properties

* Update German.properties

* Update German.properties

* Update Chinese translation. (#2803)

Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>

Co-authored-by: Kensvin <63847755+Kensvin28@users.noreply.github.com>
Co-authored-by: gsm988aa <gsm988aa@gmail.com>
Co-authored-by: gsm988aa@gmail.com <sim.gao@lab.sra.uni-hannover.de>
Co-authored-by: scaphander <67830047+scaphander@users.noreply.github.com>
Co-authored-by: lishaoxia1985 <49801619+lishaoxia1985@users.noreply.github.com>
Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
2020-07-05 23:13:47 +03:00
Yair Morgenstern
329cad660e 3.9.8 2020-07-03 15:55:07 +03:00
uncivbot[bot]
fdbc5279e5
Translations update (#2790)
* Update Japanese.properties (#2781)

* Update Italian.properties (#2782)

Co-authored-by: paontv <57051667+paontv@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
2020-07-02 20:55:26 +03:00
Yair Morgenstern
665404db4d Removed tech exchange, as per Civ V - some of the logic is still there, to allow a gradual phase-out for games that have existing tech trades 2020-06-29 22:22:28 +03:00
Yair Morgenstern
950c761e44 Merge branch 'master' of https://github.com/yairm210/Unciv 2020-06-29 22:21:29 +03:00
Yair Morgenstern
7edd818a98 3.9.7 2020-06-29 22:20:09 +03:00
uncivbot[bot]
b182ccb307
Translations update (#2780)
* Update Italian.properties (#2767)

* Update Indonesian.properties (#2770)

* Update Korean.properties (#2771)

* Update Korean.properties

* Update Korean.properties

* Update Korean.properties

* Update Japanese.properties (#2775)

* Almost full translation in Brazilian Portuguese (#2776)

* Update Brazilian_Portuguese.properties

* Update Brazilian_Portuguese.properties

* Update Brazilian_Portuguese.properties

* Update Brazilian_Portuguese.properties

* Update Brazilian_Portuguese.properties

* Update Brazilian_Portuguese.properties

* Update Brazilian_Portuguese.properties

* Update Brazilian_Portuguese.properties

Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: Kensvin <63847755+Kensvin28@users.noreply.github.com>
Co-authored-by: TG <saud2410@naver.com>
Co-authored-by: paontv <57051667+paontv@users.noreply.github.com>
Co-authored-by: henriquepena <67446379+henriquepena@users.noreply.github.com>
2020-06-29 22:00:18 +03:00
Yair Morgenstern
29e25747a8 Resolved #2112 - Show current resource amounts on incoming trade requests 2020-06-29 21:45:00 +03:00
Yair Morgenstern
79ff8c2ecf Fixed broken tests due to 'impassible' changes 2020-06-28 20:48:51 +03:00
Yair Morgenstern
4c0a5d66ce 3.9.6 2020-06-25 23:02:23 +03:00
uncivbot[bot]
e4a5f2af18
Translations update (#2766)
* Update Korean.properties (#2755)

* Update Korean.properties

* Update Korean.properties

* Update Indonesian.properties (#2756)

* Added translation for "Great improvement" (#2760)

* Update Russian.properties (#2763)

Co-authored-by: TG <saud2410@naver.com>
Co-authored-by: Kensvin <63847755+Kensvin28@users.noreply.github.com>
Co-authored-by: alfoirazabal <49956896+alfoirazabal@users.noreply.github.com>
Co-authored-by: Bada <64350251+BadaTheBada@users.noreply.github.com>
Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
2020-06-24 23:46:36 +03:00
Yair Morgenstern
a23d9ff291 Resolved #2761 - Tutorial titles are auto-added to the translation files 2020-06-24 23:44:17 +03:00
Yair Morgenstern
0f09ed2800 3.9.5 2020-06-21 19:26:17 +03:00