Commit Graph

2566 Commits

Author SHA1 Message Date
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
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
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
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
74e3b67afe 3.15.4 2021-06-23 10:29:51 +03:00
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
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
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
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
837d78db21 3.15.3 2021-06-20 22:00:59 +03:00
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
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
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
772531a35f Translation no longer breaks on multiple uses of the same parameter in a unique 2021-06-18 16:54:09 +03:00
655923f4cf Great improvement bonus provided properly 2021-06-18 14:34:15 +03:00
243647dea6 3.15.2 2021-06-18 10:08:59 +03:00
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
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
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
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
fc7e07aa7f Resolved #4170 - updated deprecated Polynesian unique 2021-06-17 19:57:52 +03:00
67820e8870 Unitfilter now accepts multiple filters (see wiki/uniques for details) 2021-06-17 19:49:20 +03:00
4fc2364cb0 Allow sight bonus to specifically target land military unit (#4163) 2021-06-16 11:13:21 +03:00
11af49e6da 3.15.1 2021-06-16 10:59:15 +03:00
d0227a2306 Translations update (#4154)
* did some Turkish translations (#4150)

give me translator role pls

* Update Spanish.properties (#4147)

* Update German.properties (#4141)

* Update Italian.properties (#4138)

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: Martin Pechstein <77325495+Mape6@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
2021-06-15 22:48:44 +03:00
434136e6cc Updated Commerce branch to G&K (#4129)
* Updated Commerce branch to G&K

* Implemented requested changes
2021-06-15 09:52:59 +03:00
e1c6cef111 Show promises not to settle, ask on found city action (#4148) 2021-06-15 09:49:08 +03:00
5e1803c40a FIX: unintended code slipped through (#4143) 2021-06-14 22:44:09 +03:00
fbebcdcd21 Updated Rationalism branch to G&K (#4136) 2021-06-14 15:10:49 +03:00
1c21573a42 Updated the culture victory so it now requires the Utopia Project to be built (#4060)
* Added the Utopia Project for the culture victory; AI will now build it

* Forgot to credit the icon

* Fixed a few minor issues

* Improved code quality; added translatable notifications

* Fixed mistakes; improved quality

* Changed a label

* Revert a small change which is no longer necessary

* Reverted the revert of a small change which is no longer necessary

* Made requsted changes
2021-06-14 14:48:22 +03:00
07a43f3f1a Fix crash caused by cascaded ruins unit gifts (#4133)
* Fix d1f6c5ac breaking builds

* Fix d1f6c5ac breaking builds - patch1

* Fix silent crash when ancient ruins cascade gifted units
2021-06-14 14:44:43 +03:00
60d8adce38 3.15.0 2021-06-13 22:40:12 +03:00
7e5d098068 Translations update (#4130)
* updates (#4123)

* Update Spanish.properties (#4116)

* Update Czech.properties (#4111)

* Překlad

* Další překlad

* Fixed translations without context

* Update German.properties (#4105)

* Update German.properties

* Update German.properties

* Update Italian.properties (#4102)

* Add Korean Translations (#4101)

9+ sentences added to translations
9+ 이상의 문장이 번역에 추가되었습니다. 오역을 수정하였습니다. 어순을 바꾸었습니다.

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: jahodovykolac <79529669+jahodovykolac@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: BINUBALL <66934926+binuball@users.noreply.github.com>
2021-06-13 22:26:28 +03:00
85158ab29d TradeType Enum marginal cleanup and Gold Font symbol (#4127) 2021-06-13 22:22:44 +03:00
5f66c57de5 Proposal for New borders (#4124)
* new-borders

* New Borders
2021-06-13 21:56:47 +03:00
0d79326869 Updated Tradition branch to G&K (#4106)
* Updated Tradition branch to G&K

* Small performance boost for calcualting maintenance; fix crash on next turn

* Fixed a bug where maintenance-free buildings would still cost maintenance

* Simplified some code

* I am unable to read

* Fixed a few broken uniques, including #4109

* Implemented requested changes
2021-06-13 08:14:31 +03:00
da991b5f66 Updated Honor branch to G&K (#4118)
* Updated Honor policies to G&K

* Simplified another unique

* Implemented requested changes
2021-06-13 08:11:14 +03:00
60809db065 Updated Liberty branch to G&K (#4115)
* Updated Liberty branch to G&K, improved modularity of uniques

* Updated meritocracy to only affect non-occupied cities

* Implemented requsted changes
2021-06-13 08:06:35 +03:00
583bca56b8 Obsoletion and upgrade fixes for enabled G&K units (#4121)
* Updated some unit obsoletions

* Added a missing unit upgrade

* Added some missing commas in units.json

* Replaced Military Base icon with a simpler one

The original had a bit too much detail for the size at which it is
shown.
2021-06-13 07:55:35 +03:00
eda6dece9c Implement dormant Nation.startIntroPart1+2 (#4091)
* Implement dormant Nation.startIntroPart1+2

* Implement dormant Nation.startIntroPart1+2 - translation
2021-06-10 23:16:35 +03:00
7e284f998b Redraw skin Images, edit skin load method (#4080) 2021-06-10 23:10:13 +03:00
91154aed34 Enabled various G&K buildings and units (#4092)
* Enabled Arsenal and added a new Armory icon

The old icon for Armory was much more appropriate for Arsenal, so I
added a new icon for Armory instead.

* Enabled Military Base and added an icon for it

* Enabled Petra and added an icon for it

* Enabled Composite Bowman and added an icon for it

* Enabled Mobile SAM and added an icon for it

* Enabled Jet Fighter

* Made Machine Gun upgrade to Mechanized Infantry

* Removed "Will be added in G&K" comments

Since we are now targeting G&K, these comments are no longer required.

* Fixed Aluminum/Aluminium inconsistencies
2021-06-10 15:38:40 +03:00
a5d2b2f154 3.14.16 2021-06-10 14:49:08 +03:00
cbee3b703a Translations update (#4100)
* 363 / Add translation (#4099)

Overwrite existing file? = 이미 존재하는 파일을 덮어쓰시겠습니까?

* Update Swedish.properties (#4077)

* Update Swedish.properties

* Update Swedish.properties

* Update Swedish.properties

* Update Swedish.properties

* Update German.properties (#4075)

* Update Italian.properties (#4071)

Co-authored-by: binuball <66934926+binuball@users.noreply.github.com>
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>
2021-06-10 14:32:15 +03:00
337b9c62fd Nations spellcheck (#4094) 2021-06-10 14:22:16 +03:00
856fe1174a For the F-Droid missing libgdx.so problem (#4090) 2021-06-09 21:37:27 +03:00
0b696451ce Map Generation Seedable (#4072)
* Map Generation Seedable
* Added Seed editable field in MapParametersTable
Previously, using the same set of parameters, one could not get the same map twice (i.e. negligible probability for it to happen). With this commit players can specify, alongside the usual map parameters, a long integer used to seed the RNG and get replicable results.

* Fixed Natural Wonder Spawn was not using MapGenerationRandomness hence giving not reproducible maps

* Translation strings
2021-06-08 06:42:27 +03:00
7c9b0e04b4 Map Generation Fixes and Tweaks (#4069)
* * Renamed Continents to Two Continents
* Created Four Continents map size
It spawns a vertical and a horizontal ocean to split the map in 4 major continents. Works properly on all sizes and with world wrap

* Fixed Pangea extending to boundaries in rectangular maps
* Unified Pangea for rectangular and hexagonal maps

* Fixed Default map type bias on Rectangular maps. Also removed "pangea effect" on Default: land can spawn with the same probability in the whole map.

* New map type: 4 Corners
* Reverted name change Two Continents to Continents
* Renamed Four Continents to Four Corners (to reflect original name in Civ5)
* Added translation strings

* New map type: 4 Corners
* Reverted name change Two Continents to Continents
* Renamed Four Continents to Four Corners (to reflect original name in Civ5)
* Added translation strings
2021-06-08 06:41:02 +03:00
8228d62d43 3.14.15 2021-06-07 22:47:52 +03:00
c81ee15de8 Translations update (#4070)
* Update Spanish.properties (#4059)

* Update German.properties (#4054)

* Update German.properties

* Update German.properties

* Update German.properties

* Update German.properties

* Update Italian.properties (#4052)

* Update Swedish.properties (#4051)

* Update Swedish.properties

* Update Swedish.properties

* Update Swedish.properties

* Update Swedish.properties

* Update Swedish.properties

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: SimonCeder <63475501+SimonCeder@users.noreply.github.com>
2021-06-07 22:25:44 +03:00