Commit Graph

5364 Commits

Author SHA1 Message Date
Yair Morgenstern
2f51436be5
Translations update (#4258)
* Fix some problems (wouldnt merge lol) (#4256)

* many new strings translated (#4255)

* Update Italian.properties (#4251)

typo

* Update Korean.properties (#4250)

* Update Korean.properties

* Update Korean.properties

* Update Korean.properties

* Update Korean.properties

* Update Korean.properties

* Update Korean.properties

* Update Spanish.properties (#4248)

* Russian Translation (#4244)

Translated new lines and fixed typo

* Update Italian.properties (#4240)

* Update German.properties (#4263)

* Update German.properties

* Update German.properties

* add edits (#4261)

This was just some additions. There are random apostrophes that end up quoting large chunks of text until a new apostrophe is found. I don't know if this can be a problem for the technical part but for now, is just a minor pain when translating because of lack of auto-complete.

* Revert "add edits (#4261)" (#4264)

This reverts commit 980ca313fa.

Co-authored-by: Miraç <56484801+logicminimal@users.noreply.github.com>
Co-authored-by: stoupa007 <60326342+stoupa007@users.noreply.github.com>
Co-authored-by: end <72604018+laok233@users.noreply.github.com>
Co-authored-by: TG <saud2410@naver.com>
Co-authored-by: ArchDuque-Pancake <78449553+ArchDuque-Pancake@users.noreply.github.com>
Co-authored-by: sockybob <44141246+sockybob@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: MartinP <77325495+Mape6@users.noreply.github.com>
Co-authored-by: Rafael 'Fig' Diamantino de Figueiredo <45023203+rafaeldfigueiredo@users.noreply.github.com>
2021-06-25 17:09:21 +03:00
Yair Morgenstern
79b3fb6de4 Resolved #4151 - Discord library load will now catch failed attempts properly 2021-06-25 16:46:18 +03:00
Xander Lenstra
e6850b857a
Generalized building of improvements (#4252)
* Generalized building of improvements

* Readded support for the deprecated unique "Can build improvements on tiles"

* Small code quality changes

* Implemented requested chagnes
2021-06-25 16:35:15 +03:00
SomeTroglodyte
06b2e7da2f
Promotion picker keeps vertical scroll pos on promote or resize (#4247)
* Promotion picker keeps vertical scroll pos on promote or resize

* Promotion picker keeps vertical scroll - without parameter
2021-06-24 21:37:50 +03:00
Xander Lenstra
af0cd0c9df
Implements the Telecommunications tech (v2) (#4249)
* Added the addPopulation() and setPopulation() functions to add population to cities and automatically reassign them

* Added the Telecommunications tech

* Added the CN tower

* Implemented Bomb Shelter

* Added icons for new buildings

* Implemented requsted changes
2021-06-24 19:07:33 +03:00
Xander Lenstra
111d11b9b2
Added Advanced Ballistics Tech, Atomic Bomb Unit, Updated how nukes work (#4211)
* Improved nukes

* Fixed build error (probably)

* Implemented reocmmended changes, fixed some other stuff, the usual

* Implemented requested changes

* Fixed Tech connections

* Fixed nuclear missiles and guided missiles being interceptable

* Missiles are no longer air units. This is, as they cannot be stationed on carriers and cannot be intercepted.
2021-06-24 16:03:59 +03:00
Xander Lenstra
1c42e1e730
Fixes bug where in some cases building improvements would increase the base yield of the tile (#4217)
* Fixes bug where in some cases building improvements would increase the base yield of the tile

* Removed unncessary test

* Implemented requested changes

* Implemented requested changes

* Fixed build errors
2021-06-24 15:55:41 +03:00
Xander Lenstra
b43257cea8
Fixes #4232 (#4245) 2021-06-24 15:54:25 +03:00
Yair Morgenstern
208ad1aa27 Resolves #3800 in a more generic way 2021-06-23 18:20:56 +03:00
Yair Morgenstern
4d6b4cd957 A possible fix for #4151 2021-06-23 11:17:58 +03:00
Yair Morgenstern
c424c681b5 Maybe resolved #4151 2021-06-23 11:12:09 +03:00
Yair Morgenstern
fc6eda364e Resolved #4200 - Cities in resistance cannot bombard 2021-06-23 10:45:49 +03:00
Yair Morgenstern
74e3b67afe 3.15.4 2021-06-23 10:29:51 +03:00
Yair Morgenstern
ba505dcfdb Deprecated 'download map' - map sharing should be done via Mods 2021-06-23 10:13:11 +03:00
Arthur van der Staaij
5b730fbc56
Added Nuclear Fusion tech and the Giant Death Robot (#4207)
* Reordered units

Consistently ordered units based on, in decreasing priority:
- Tech tree column
- Height in tech tree column

* Added Nuclear Fusion technology and GDR
2021-06-23 09:44:53 +03:00
Arthur van der Staaij
e10c52efc1
Fixed open terrain bonus working in rough terrain (#4219)
* Fixed open terrain bonus working in rough terrain

Fixed #4139 - The open terrain combat bonus no longer works in rough
terrain.

Deprecated "Open terrain" and "Rough terrain" uniques and undeprecated
"rough" property of terrains.

* Minor simplification

* Replaced "rough" with "Rough terrain" unique

* Empty commit to re-run the build checks
2021-06-23 09:41:55 +03:00
Arthur van der Staaij
300eb6f726
Fixed captured units not tp-ing out of liberated cities (#4239) 2021-06-23 09:40:55 +03:00
Arthur van der Staaij
cf9e00c589
Fixed naval units not tp-ing out of razed cities (#4238) 2021-06-23 09:40:32 +03:00
Yair Morgenstern
f745ca9421
Translations update (#4236)
* Did some translations #123456789 (#4234)

also fixed some sentenced or lines

* Update Spanish.properties (#4225)

* Update German.properties (#4223)

* Update German.properties

* Update German.properties

* Update German.properties

* Update Swedish.properties (#4220)

* Update Italian.properties (#4216)

* Russian Translation (#4215)

* Russian Translation

Translated new lines and made some impovements

* Update Russian.properties

* Update Russian.properties

Co-authored-by: Miraç <56484801+logicminimal@users.noreply.github.com>
Co-authored-by: ArchDuque-Pancake <78449553+ArchDuque-Pancake@users.noreply.github.com>
Co-authored-by: MartinP <77325495+Mape6@users.noreply.github.com>
Co-authored-by: Qweq07 <66163702+Qweq07@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: sockybob <44141246+sockybob@users.noreply.github.com>
2021-06-22 22:28:40 +03:00
Xander Lenstra
7f88844d82
Created Patronage policy branch (#4186)
* Created Patronage policy branch -- draft

* Patronage branch is now functional

* Added images for the policies

* Temporarily bandaged backwards compatability, added incompatabilities

* Implemented recommended changes

* Fixed acquirement of 'patronage complete' not being saved

* Reverted change I was unhappy with

* Implemented requested changes

* Fixed build errors

* Implemented recommended changes

* City States can now give any great person, including unique ones, conform Ravignirs tests
2021-06-22 17:25:29 +03:00
SomeTroglodyte
a025660fe0
Split off all individual OverviewScreen panes (#4184)
* Spliff off all individual OverviewScreen panes

* Spliff off all individual OverviewScreen panes - remove comment

* Spliff off all individual OverviewScreen panes - consistent file endings
2021-06-21 18:54:48 +03:00
Xander Lenstra
4586e44ba6
Fixed a bug where excess food would not be converted to production for settlers (#4221) 2021-06-21 11:00:47 +03:00
Yair Morgenstern
837d78db21 3.15.3 2021-06-20 22:00:59 +03:00
Yair Morgenstern
990074e9b0 Resolved #4209 - AI city-founding no longer plays music 2021-06-20 21:51:22 +03:00
Xander Lenstra
3d1836a081
Created Order branch with G&K policies (#4158)
* Created Order branch with G&K policies

* Implemented requested changes
2021-06-20 21:39:14 +03:00
Yair Morgenstern
da455f10b5
Translations update (#4214)
* Update Korean.properties (#4212)

* Update Spanish.properties (#4208)

* Update Swedish.properties (#4205)

* Update German translation (#4196)

* Update German.properties

* Update German.properties

* Update Spanish.properties (#4194)

* Update Spanish.properties

* Update Spanish.properties

* Russian Translation (#4190)

* Russian Translation

Translated new texts, fixed some incorrect translations and made small improvements.

* Update Russian.properties

* Update Russian.properties

Co-authored-by: TG <saud2410@naver.com>
Co-authored-by: ArchDuque-Pancake <78449553+ArchDuque-Pancake@users.noreply.github.com>
Co-authored-by: Qweq07 <66163702+Qweq07@users.noreply.github.com>
Co-authored-by: Martin Pechstein <77325495+Mape6@users.noreply.github.com>
Co-authored-by: sockybob <44141246+sockybob@users.noreply.github.com>
2021-06-20 21:37:22 +03:00
Xander Lenstra
bd850683e1
Fixes bug where coastal buildings cannot be built even if the city is coastal (#4197) 2021-06-19 21:46:20 +03:00
Arthur van der Staaij
450c185af8
Corrected many building production costs, tech requirements and wonder effects (#4201)
* Corrected building construction costs

Full changelog:
(Changes marked with a "!" deviate from the surrounding pattern)

Lighthouse         100 -> 75  (!)
Great Lighthouse   250 -> 185 (!)

Temple             120 -> 100
Burial Tomb        120 -> 100
Mud Pyramid Mosque 120 -> 100
Market             120 -> 100
Bazaar             120 -> 100
Mint               120 -> 100
Aqueduct           120 -> 100
The Oracle         300 -> 250
Petra              300 -> 250
Great Wall         300 -> 250

Monastery          160 -> 120
Workshop           160 -> 120
Forge              160 -> 120
Hagia Sophia       400 -> 300
Chichen Itza       400 -> 300
Machu Picchu       400 -> 300

Harbor             200 -> 120 (!)
University         200 -> 160
Wat                200 -> 160
Castle             200 -> 160
Mughal Fort        200 -> 150 (!)
Armory             200 -> 160
Angkor Wat         500 -> 400
Alhambra           500 -> 400
Notre Dame         500 -> 400

Observatory        250 -> 200
Opera House        250 -> 200
Bank               250 -> 200
Satrap's Court     250 -> 200
Hanse              250 -> 200
Theatre            250 -> 200
Sistine Chapel     625 -> 500
Forbidden Palace   625 -> 500
L. Tower of Pisa   625 -> 500
Himeji Castle      625 -> 500

Seaport            300 -> 250
Windmill           300 -> 250
Taj Mahal          750 -> 625
Porcelain Tower    750 -> 625

Museum             360 -> 300
Public School      360 -> 300
Arsenal            360 -> 300
Military Academy   360 -> 300
Louvre             920 -> 750
Big Ben            920 -> 750
Brandenburg Gate   920 -> 750

Hospital           500 -> 360
Stock Exchange     500 -> 360

Eiffel Tower       1250 -> 1060
Statue of Liberty  1250 -> 1060
Kremlin            1250 -> 625  (!)
Neuschwanstein     1250 -> 1060

Nuclear Plant      750  -> 500
Solar Plant        750  -> 500
Sydney Opera House 2000 -> 1250
Manhattan Project  2000 -> 750  (!)
Apollo Program     1500 -> 750  (!)

* Corrected Hanging Gardens

10 food -> 6 food.
Now provides a free Garden.

* Corrected Statue of Liberty

Now provides a free social policy.

* Corrected Angkor Wat

Now unlocked with Education instead of Chivalry.

* Corrected Cristo Redentor

Now unlocked with Plastics instead of Flight.

* Corrected Kremlin

No longer gives 12 city strength (this was removed in G&K).

* Corrected Manhattan Project

Now unlocked with Atomic Theory instead of Nuclear Fission".

This does buff nuclear missiles quite a bit, since you no longer need
Nuclear Fission, but that's only because the last part of the tech tree
is very incomplete, and provides nuclear missiles too early. We need to
start correcting it somewhere.

* Corrected Leaning Tower of Pisa

Now provides +25% great person generation in all cities.

* Corrected Kremlin some more

Now unlocked with Metallurgy instead of Railroad.

* Fixed Arsenal production cost correction

It is now actually 300, as was stated in the previous changelog.

* Reordered many buildings

Reordered many buildings to conform to the tech tree order.
In order of priority:
left to right, top to bottom, buildings to national wonders to wonders.

* Corrected production cost for Colossus

Colossus was wrongly ordered in the json file, so its production cost
was unknowingly changed from 300 to 250 (this was not noted in the
previous changelog), however, it should be even lower: 185. This commit
corrects this.

tl;dr 250 -> 185

* Corrected Hermitage

Now unlocked with Architecture instead of Archaeology.

* Corrected National Treasury

Now unlocked with Guilds instead of Currency.

* Reverted incorrect corrections

Kremlin:
Provides 12 city strength again.

Statue of Liberty:
No longer provides a free social policy.
2021-06-19 21:45:41 +03:00
SomeTroglodyte
05e6609b25
Change improvement picker key indicators to tooltip (#4174) 2021-06-19 21:43:04 +03:00
Xander Lenstra
8f26a77b2d
Fixed an issue where mods with either the 'patronage' or 'entrepreneurschip' policy would crash upon taking it (#4192) 2021-06-19 21:41:52 +03:00
Xander Lenstra
3686366156
Fixed Great Improvement bonus not working (#4193) 2021-06-19 21:41:25 +03:00
Xander Lenstra
9eb2d1fffb
Stop AI from pillaging their own tiles. Fixes #4203 (#4204) 2021-06-19 21:40:46 +03:00
Xander Lenstra
45a7b5da9c
Fixed autocracy complete bonus not continuing after updating to 3.15.2 (#4195)
* Fixed autocracy complete bonus not continuing after updating to 3.15.2

* Forgot a line
2021-06-19 21:40:06 +03:00
Yair Morgenstern
772531a35f Translation no longer breaks on multiple uses of the same parameter in a unique 2021-06-18 16:54:09 +03:00
Yair Morgenstern
655923f4cf Great improvement bonus provided properly 2021-06-18 14:34:15 +03:00
Yair Morgenstern
9668d40688 Merge branch 'master' of https://github.com/yairm210/Unciv 2021-06-18 11:29:27 +03:00
Yair Morgenstern
8f19c27e03 3.15.2-patch1 2021-06-18 11:22:55 +03:00
Yair Morgenstern
57baddc3d9
Update README.md 2021-06-18 11:21:32 +03:00
Yair Morgenstern
0393ced055 / 2021-06-18 11:17:07 +03:00
Yair Morgenstern
a105114ecc Resolved #4144 - Updated screenshots in Google Play, itch,io, and Github 2021-06-18 11:10:25 +03:00
Yair Morgenstern
6e7e05248d Fixed crash caused by #4142 2021-06-18 10:40:54 +03:00
Yair Morgenstern
243647dea6 3.15.2 2021-06-18 10:08:59 +03:00
Yair Morgenstern
c95655771c
Translations update (#4180)
* did some Turkish translations (#4175)

i mostly did some polidhing in translations and added translations to much of simpler stuff that needed translations, but the civilopedia and civilizations are mostly not done, also i couldnt figure out how to fix typos and other stuff in mining

* French translation: fix typos and translate some (#4167)

* French translation: fix typos and translate some

* French translation: Fix typo and correct mistake

* Update Russian.properties (#4166)

* Update Russian.properties

* Update Russian.properties

* Update Italian.properties (#4164)

* Update Italian.properties

* Update Italian.properties

* Update Czech.properties (#4183)

* Update Russian.properties (#4182)

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

Co-authored-by: Miraç <56484801+logicminimal@users.noreply.github.com>
Co-authored-by: Mayeul Cantan <mayeul.cantan@gmail.com>
Co-authored-by: sockybob <44141246+sockybob@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: jahodovykolac <79529669+jahodovykolac@users.noreply.github.com>
2021-06-18 09:47:34 +03:00
Xander Lenstra
d1c10c6d47
Updated Autocracy branch to G&K (#4149)
* Updated Autocracy branch to G&K

* Fxied a typo

* Implemented potentially requested changes

* Implemented requested changes

Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
2021-06-18 09:46:30 +03:00
Xander Lenstra
1d18c418e7
Updated Freedom branch to G&K (#4142)
* Updated Freedom branch to G&K

* Hotfix for autocracy policy that I accidentally added already

* Implemented recommended changes (mostly)

* Implemented recommended changes

* Implemented recommended changes better
2021-06-18 09:42:48 +03:00
SomeTroglodyte
87810b8ce8
Wake up units when enemy sighted or displaced or attacked (#4145)
Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
2021-06-18 09:40:07 +03:00
Arthur van der Staaij
d7865f4a81
Made atlas textures use mipmaps again (#4187)
A previous commit changed the atlas textures to use nearest filtering,
making the game look significantly jaggier. This commit makes them use
mipmap filtering again.

Using mipmaps with atlas textures can cause the edges of the images to
bleed into each other, an effect that was indeed present before the
filtering was changed to nearest. This commit adds some additional
padding and sets the padding to duplicate the edges of images to
mitigate this effect. Note that altough this makes some of the atlas
images look very strange, the in-game result is improved.
2021-06-18 09:25:11 +03:00
Yair Morgenstern
fc7e07aa7f Resolved #4170 - updated deprecated Polynesian unique 2021-06-17 19:57:52 +03:00
Yair Morgenstern
67820e8870 Unitfilter now accepts multiple filters (see wiki/uniques for details) 2021-06-17 19:49:20 +03:00
sockybob
6b75283f6d
Fix typo (#4168) 2021-06-17 12:13:23 +03:00