Commit Graph

2342 Commits

Author SHA1 Message Date
Yair Morgenstern
9a7a0f3c7d
Translations update (#4559)
* Update Ukrainian.properties (#4550)

* Update Korean.properties (#4544)

* Update Korean.properties

* Update Korean.properties

* Update Korean.properties

* Update Simplified_Chinese.properties (#4543)

* Update Czech.properties (#4540)

* Update Czech.properties

new strings, some old tweaked for better gramar

* Update Czech.properties

tweaked word form to beter fit to usage

* Updated Swedish Translation (#4539)

* Updated Swedish Translation

Translated the last lines that needed to be translated for the Swedish translation to be complete.

* Updated 2 lines with advice from SimonCeder

* Refactor New game screen (#4538)

* Update Russian.properties (#4537)

* Update Russian.properties

* Update Russian.properties

* Update German translation (#4536)

* Refactor Diplomacy,Trade,Nations (#4535)

* Refactor Nation Picker (#4534)

* Update Indonesian.properties (#4562)

* Unit gifting (#4557)

* wonder splash screens

* wonder splash screens atlas

* reset to master

* add basic gifting to city states and major civs

* actual gifting of the unit

* add gift icon to atlas

* adjust relationship decay

* add strings to jsons

* AI and player return same object

* Update Indonesian.properties

Co-authored-by: SimonCeder <63475501+SimonCeder@users.noreply.github.com>

Co-authored-by: DuffKI <51823715+DuffLagerleff@users.noreply.github.com>
Co-authored-by: Samsaek the Calico <saud2410@naver.com>
Co-authored-by: HoleHolo <80876542+HoleHolo@users.noreply.github.com>
Co-authored-by: stoupa007 <60326342+stoupa007@users.noreply.github.com>
Co-authored-by: Alex25820 <50142558+Alex25820@users.noreply.github.com>
Co-authored-by: MartinP <77325495+Mape6@users.noreply.github.com>
Co-authored-by: sockybob <44141246+sockybob@users.noreply.github.com>
Co-authored-by: kensvin <63847755+Kensvin28@users.noreply.github.com>
Co-authored-by: SimonCeder <63475501+SimonCeder@users.noreply.github.com>
2021-07-19 22:10:37 +03:00
Xander Lenstra
c81c1b6a1b
Implemented Follower beliefs for religions (#4530)
* Minor things

* Added a few follower beliefs

* Implemented follower beliefs when founding a religion

* Added missing follower beliefs as much as possible

* Religion screen now scrolls correctly

* Buttons for chosen religions are now disabled  instead of removed, idea couresty to someTroglodyte

* Implemented requested changes
2021-07-19 21:51:34 +03:00
SomeTroglodyte
50cec97354
Spruced up Civilopedia - phase 5 - buildings (#4391)
* Spruced up Civilopedia - phase 5 - buildings

* Finish merging master into Civilopedia-Buildings

* Spruced up Civilopedia - phase 5 - buildings - patch

* Spruced up Civilopedia - phase 5 - buildings - patch2

* Spruced up Civilopedia - phase 5 - buildings - patch3

* Spruced up Civilopedia - phase 5 - buildings - patch4

* Spruced up Civilopedia - phase 5 - buildings - patch5
2021-07-19 21:48:51 +03:00
SimonCeder
118c1fc888
Unit gifting (#4557)
* wonder splash screens

* wonder splash screens atlas

* reset to master

* add basic gifting to city states and major civs

* actual gifting of the unit

* add gift icon to atlas

* adjust relationship decay

* add strings to jsons

* AI and player return same object
2021-07-19 00:30:10 +03:00
Xander Lenstra
70f34f2f85
Fixed unique of Persian immortal not working (#4547)
Fixed #4546
2021-07-17 22:18:54 +03:00
Yair Morgenstern
de582cf66a Resolved #4528 - added Polder image 2021-07-16 09:30:04 +03:00
Yair Morgenstern
60bcc8f1cf 3.15.12-patch1 2021-07-16 09:23:49 +03:00
Yair Morgenstern
357b22cec5
Translations update (#4533)
* Update Swedish.properties (#4529)

* Refactor German translation of Trades (#4527)

* Refactor Trades

* Refactor Trades

* Update German translation (#4526)

* Update Russian.properties (#4525)

* Update Russian.properties

* Update Russian.properties

* Update Korean.properties (#4524)

* Update Indonesian.properties (#4523)

* Update Indonesian.properties

* Update Indonesian.properties

* Update Indonesian.properties

* Missing translation templates from BattleDamage modifiers (#4521)

* Update Italian.properties (#4517)

* Update Spanish.properties (#4516)

Soory for being late

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

* Refactor German translation of City-States (#4512)

* Refactor City-States

* Refactor City-States

* Refactor City-States

Co-authored-by: SimonCeder <63475501+SimonCeder@users.noreply.github.com>
Co-authored-by: MartinP <77325495+Mape6@users.noreply.github.com>
Co-authored-by: sockybob <44141246+sockybob@users.noreply.github.com>
Co-authored-by: Samsaek the Calico <saud2410@naver.com>
Co-authored-by: kensvin <63847755+Kensvin28@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>
Co-authored-by: ArchDuque-Pancake <78449553+ArchDuque-Pancake@users.noreply.github.com>
2021-07-16 09:05:31 +03:00
Giuseppe D'Addio
d87db92171
Update Nations.json (#4520)
You guys misses Attila and Williem's defeated lines
2021-07-15 10:39:32 +03:00
Yair Morgenstern
df2cf711ba More deprecation 2021-07-14 23:30:47 +03:00
Yair Morgenstern
6b73a3e9d7 3.15.12 2021-07-14 22:34:11 +03:00
Yair Morgenstern
8cc407ab44
Translations update (#4515)
* Refactor Diplomatic modifiers (#4500)

* Update German translation (#4499)

* Update Russian.properties (#4497)

* Update Russian.properties

* Update Russian.properties

* Update Russian.properties

a little experiment

* Update Korean.properties (#4495)

* Update Korean.properties

* Update Korean.properties

* Update Korean.properties

* Update Korean.properties

* Update Korean.properties

* Update Portuguese.properties (#4494)

* Update Spanish.properties (#4493)

* Update Spanish.properties

* Update Spanish.properties

* Update Swedish.properties (#4492)

* Update Italian.properties (#4491)

Co-authored-by: MartinP <77325495+Mape6@users.noreply.github.com>
Co-authored-by: sockybob <44141246+sockybob@users.noreply.github.com>
Co-authored-by: Samsaek the Calico <saud2410@naver.com>
Co-authored-by: batatasmor <75855494+batatasmor@users.noreply.github.com>
Co-authored-by: ArchDuque-Pancake <78449553+ArchDuque-Pancake@users.noreply.github.com>
Co-authored-by: SimonCeder <63475501+SimonCeder@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
2021-07-14 22:22:11 +03:00
Xander Lenstra
2752c713b9
Founding Religions (#4505)
* Fixed crashes on loading save games with religion

* Added missing credit

* Religious cities now show religion icons in the city button

* Add icons for religions

* You can now found beliefs, with snazzy icons!

* Fixed bug which made prophets impossible to generate

* Added missing translatable strings

* Fixed translation tests properly

* Implemented requested changes

* Implemented part of the requested changes

* Removed SplitPane in favor of Table

* Removed unused code

* Capped the amount of foundable religions to the amount of religions
2021-07-14 22:09:51 +03:00
SomeTroglodyte
f54c76ec42
'Swap units' sound replaced (#4501) 2021-07-13 17:38:38 +03:00
Xander Lenstra
07e3a2228e
Fixed bug where effects of all aquaducts nationwide stacked in each city (#4487)
* Fixed bug where effects of all aquaducts nationwide stacked in each city

* Implemented requested changes

* Implemented requested changes better
2021-07-13 06:26:37 +03:00
Yair Morgenstern
573eacb8c9 3.15.11 2021-07-12 22:03:14 +03:00
Yair Morgenstern
85123b39a8
Translations update (#4488)
* Update Simplified_Chinese.properties (#4486)

* Update Czech.properties (#4482)

* Translating new Civilopedia entries

* More Civilopedia

* Civilopedia again

* Almost done...

* Finally done :)

* Update German translation (#4481)

* Update German translation

* Update German translation

* Update German translation

* Consistency of Great Person

* Update Swedish.properties (#4477)

* Translating more (#4474)

* Adjusting the accent

I changed a lot of phrases and words to European Portuguese as these phrases were in Brazilian Portuguese which has its own translation in another document.

* Translating more stuff

* Translating more

Translating Babylonian and Greek names.

* Translating 2 more civilizations

Translating Egypt and England

* Update Russian.properties (#4472)

* Update Russian.properties

* Update Russian.properties

* Update Russian.properties

* Update Indonesian.properties (#4468)

* Update Italian.properties (#4466)

* Update Italian.properties

* Update Italian.properties

* Update Korean.properties (#4489)

* Resolved #4484 - civs with no cities can no longer pick policies

* Update Korean.properties

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

Co-authored-by: HoleHolo <80876542+HoleHolo@users.noreply.github.com>
Co-authored-by: jahodovykolac <79529669+jahodovykolac@users.noreply.github.com>
Co-authored-by: MartinP <77325495+Mape6@users.noreply.github.com>
Co-authored-by: SimonCeder <63475501+SimonCeder@users.noreply.github.com>
Co-authored-by: batatasmor <75855494+batatasmor@users.noreply.github.com>
Co-authored-by: sockybob <44141246+sockybob@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: Samsaek the Calico <saud2410@naver.com>
2021-07-12 21:53:17 +03:00
Xander Lenstra
f97e64e54e
Fixed bug where submarines could not attack embarked units (#4459)
* Fixed bug where submarines could not attack embarked units

* Implemented requested changes

* Fixed typo
2021-07-12 19:37:56 +03:00
Yair Morgenstern
5a0eb11bd0 3.15.10 2021-07-10 23:56:06 +03:00
Yair Morgenstern
0cc3b6f550 Resolved #4457 - spelling mistakes 2021-07-10 23:22:44 +03:00
Yair Morgenstern
56111fa24c
Translations update (#4465)
* Update Simplified_Chinese.properties (#4456)

* Update Indonesian.properties (#4455)

* Update Indonesian.properties

* Update Indonesian.properties

* Update Italian.properties (#4445)

* Laid some groundwork for implementing further religions (#4444)

* Laid some groundwork for implementing further religions

* Fixed duplication of Religion object

* Update Korean.properties (#4443)

* Update Korean.properties

* Update Korean.properties

* Update Spanish translations fase 1 (#4440)

* Update Spanish translations fase 1

DO NOT merge this until I have finnished it. I run out of time today.

* Update Spanish.properties

* Update Czech.properties (#4437)

* Update Czech.properties

many new (and old) strings translated

* Update Czech.properties

tweaked some newly translated strings

* huns and netherlands strings

* Update Swedish.properties (#4436)

Back up to 100%
Also some tweaks:
Ändrade ett par enheter för att få realegenus (en/den) på så många som möjligt
t ex Pansarskepp -> Pansarbåt (historiskt korrekt benämning, även Monitor är tänkbart)
Man kan överväga även t ex Infanteri -> Infanterist, finns åsikter?

* Update German translation (#4434)

* Adjusting the accent (#4426)

I changed a lot of phrases and words to European Portuguese as these phrases were in Brazilian Portuguese which has its own translation in another document.

Co-authored-by: lishaoxia1985 <49801619+lishaoxia1985@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: Xander Lenstra <71121390+xlenstra@users.noreply.github.com>
Co-authored-by: Samsaek the Calico <saud2410@naver.com>
Co-authored-by: ArchDuque-Pancake <78449553+ArchDuque-Pancake@users.noreply.github.com>
Co-authored-by: stoupa007 <60326342+stoupa007@users.noreply.github.com>
Co-authored-by: SimonCeder <63475501+SimonCeder@users.noreply.github.com>
Co-authored-by: MartinP <77325495+Mape6@users.noreply.github.com>
Co-authored-by: batatasmor <75855494+batatasmor@users.noreply.github.com>
2021-07-10 23:02:23 +03:00
Xander Lenstra
b650b95356
Add missing pantheons, fix minor bugs (#4419)
* Added all remaining pantheons

* AI now choose pantheons, AI no longer tries to get mutually exclusive policies

* I don't know why this was changed

* Implemented requested changes
2021-07-10 22:50:50 +03:00
Xander Lenstra
253e62de72
City states give gold when met; updates to city state gold gifts (#4435)
* City States now give gold when met

* City States can now receive different amounts of gold, and the amount of influence gained from gifts follows the base game

* Implemented requested changes

* Fixed tests
2021-07-10 21:51:11 +03:00
Yair Morgenstern
d262c1a6ea Automated atomic bombs no longer cause crashes 2021-07-09 13:51:18 +03:00
Xander Lenstra
c327b54b1b
City Centers can no longer be removed by nukes (#4423)
* City Centers can no longer be removed by nukes

* Implemented requested changes

* Implemented more requested changes
2021-07-09 12:13:45 +03:00
Yair Morgenstern
df7bba02a1 Merge branch 'master' of https://github.com/yairm210/Unciv 2021-07-09 11:01:40 +03:00
Yair Morgenstern
0d328ef99a Stuffed some +/- uniques into the square brackets 2021-07-09 11:01:25 +03:00
Xander Lenstra
5376e488a0
Added a simplified version of great prophets, implemented a basic city religion UI (#4356)
* Add a very simple display for the religion in a city

* Added missing credits for shrine

* Added Great Prophet unit

* Great prophets can now be generated using faith

* Great Prophets can now construct holy sites

* Great Prophets can now spread their religion to friendly cities

* Holy site can only be constructed if the great prophet hasn't spread religion yet

* Added missing translation string

* Fixed more translation problems

* Implemented requested changes
2021-07-09 10:48:33 +03:00
Yair Morgenstern
abd877dd1b Resolved #4427 2021-07-09 10:19:21 +03:00
Yair Morgenstern
cc3146f92b Actual translations 2021-07-09 10:17:22 +03:00
Yair Morgenstern
37942a1af6
Translations update (#4433)
* Update Ukrainian.properties (#4429)

* Update Ukrainian.properties

* Update Ukrainian.properties

* Added Civilopedia Texts

* Add most of religion-related stuff and made some other edits

Also I haven't understood how to translate Goddess of Festivals and Religious Idols uniques

* Update Russian.properties (#4424)

* Update Russian.properties

Translated some of new strings

* Update Russian.properties

* Update Russian.properties

Some more translation and improvements

* Update Indonesian.properties (#4421)

* Update Indonesian.properties

* Update Indonesian.properties

* Update Korean.properties (#4420)

* Update Korean.properties

* Update Korean.properties

* Update Korean.properties

* Update Korean.properties

* Update Korean.properties

* Update Korean.properties

* Update German translation (#4413)

* Update German translation

* Update German translation Iroquois

* Update German translation

* Update German translation

* Translation of The Netherlands

* Update Swedish.properties (#4414)

* Update Swedish.properties

* Update Swedish.properties

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

Co-authored-by: DuffKI <51823715+DuffLagerleff@users.noreply.github.com>
Co-authored-by: sockybob <44141246+sockybob@users.noreply.github.com>
Co-authored-by: kensvin <63847755+Kensvin28@users.noreply.github.com>
Co-authored-by: Samsaek the Calico <saud2410@naver.com>
Co-authored-by: MartinP <77325495+Mape6@users.noreply.github.com>
Co-authored-by: SimonCeder <63475501+SimonCeder@users.noreply.github.com>
2021-07-09 09:19:02 +03:00
Xander Lenstra
21eadb39ff
Updated TranslationFileWriter to include the new values that filters can have (#4402)
* Updated TranslationFileWriter to include the new values that filters can have

* Implemented requested changes
2021-07-09 09:14:24 +03:00
SomeTroglodyte
5e01ce82b2
Quick salvage of some lost translations (#4415) 2021-07-07 23:08:20 +03:00
Xander Lenstra
fbd64b9520
Refactored the way cities determine what uniques should apply when (#4393)
* I'm so sorry for the size of this PR

* Uniques are better generalized

* Code now compiles

* Missed a line

* Some more cleaning up
2021-07-07 22:01:14 +03:00
Yair Morgenstern
ecd5ae5128 3.15.9 2021-07-07 20:54:19 +03:00
ArchDuque-Pancake
9b2460f166
Update Spanish Properties - ¡read my description! (#4404)
In the tutorials part, I am not sure if all those emojis are different or not, I can not tell. So please, check that and if you can correct it if you can.
2021-07-07 20:01:28 +03:00
SomeTroglodyte
373b42bfcf
Update "World screen" tutorial text and Home key improved (#4403) 2021-07-07 20:00:12 +03:00
Yair Morgenstern
8eb97b2ea0
Translations update (#4400)
* Update Ukrainian.properties (#4398)

* Update Simplified_Chinese.properties (#4397)

* Update Russian.properties (#4384)

* Update Russian.properties

Translated new strings

* Update Russian.properties

* Update Swedish.properties (#4383)

* Update Swedish.properties

* Update Swedish.properties

* Update Swedish.properties

* Update Swedish.properties

* Update Indonesian.properties (#4382)

* Update Indonesian.properties

* Update Indonesian.properties

* Update Indonesian.properties

* Update Indonesian.properties

* Update Indonesian.properties

* Update German translation (#4380)

* Update German translation

* Update German translation

* Update German translation

* Update German translation

* Update German translation

* Update German translation

* Update German translation

* Update German translation

* Update German translation

* Update German translation for railroad things

* Update Korean.properties (#4376)

* Update Korean.properties

* Update Korean.properties

* Update Korean.properties

Co-authored-by: DuffKI <51823715+DuffLagerleff@users.noreply.github.com>
Co-authored-by: Zkdc <Zkdc2345@qq.com>
Co-authored-by: sockybob <44141246+sockybob@users.noreply.github.com>
Co-authored-by: SimonCeder <63475501+SimonCeder@users.noreply.github.com>
Co-authored-by: kensvin <63847755+Kensvin28@users.noreply.github.com>
Co-authored-by: MartinP <77325495+Mape6@users.noreply.github.com>
Co-authored-by: Samsaek the Calico <saud2410@naver.com>
2021-07-07 19:59:14 +03:00
SomeTroglodyte
7875ec4896
Better mod download and error display (#4396)
* Better mod download and error display

* Fix Android Studio Insubordinations
2021-07-06 19:33:05 +03:00
Xander Lenstra
7d8f8b981d
Fixed bug where logistics _still_ did not work (#4388) 2021-07-05 21:09:10 +03:00
Yair Morgenstern
c1ff2e4ba7 Fixed Denmark's unique including also embarking instead of just disembarking 2021-07-05 21:06:54 +03:00
SomeTroglodyte
c42561c545
Spruced up Civilopedia - phase 4 - Visual candy, Units (#4350)
* Spruced up Civilopedia - phase 4 - Visual candy, Units

* Unified separators, CheckBox helper - patch2

* Unified separators, CheckBox helper - atlas merge

* Spruced up Civilopedia - phase 4 - rebuild atlas

* Spruced up Civilopedia - phase 4 - rebuild atlas

* Spruced up Civilopedia - phase 4 - do separator to-do
2021-07-05 16:35:41 +03:00
SomeTroglodyte
d909143a34
'Swap units' sound and more attack sounds (#4379) 2021-07-05 11:31:13 +03:00
Xander Lenstra
624fe33be1
Updated template.properties (#4377)
* Updated translation file

* Made tests happy

* Removed unused, athematic unit filter

* Added submarine unit translation
2021-07-05 11:20:12 +03:00
Xander Lenstra
957c8697ac
Added the nation of the Netherlands (#4372)
* Added the nation of the Netherlands

* Added Sea Beggar, Dutch unique unit

* Added polder improvement, Dutch unique improvement

* Added national ability
2021-07-05 09:35:04 +03:00
Yair Morgenstern
b748f92bb5 3.15.8 2021-07-04 21:09:17 +03:00
Yair Morgenstern
8a139e57b8
Translations update (#4371)
* Update Indonesian.properties (#4369)

* Update Korean.properties (#4364)

* Update German translation (#4363)

* Update German.properties

* Update German translation

* Update German translation

Co-authored-by: kensvin <63847755+Kensvin28@users.noreply.github.com>
Co-authored-by: Samsaek the Calico <saud2410@naver.com>
Co-authored-by: MartinP <77325495+Mape6@users.noreply.github.com>
2021-07-04 19:19:35 +03:00
Xander Lenstra
0d26c69710
More bug fixes (#4370)
* Fixed Air Targetting not having icon

* Fixed the huns not having battering ram unique unit

* Plundering with multiple levels of coastal raider no longer creates multiple notifications

* Implemented requested changes
2021-07-04 19:18:15 +03:00
Xander Lenstra
2a4ca74e7b
Fixed more bugs I introduced myself (#4368)
* Fix bug where mobility doesn't work

* Fixed supply _still_ not working
2021-07-04 17:34:27 +03:00
Xander Lenstra
be5345477a
Fixed bug where heal instantly would not heal (#4367) 2021-07-04 17:32:50 +03:00