Commit Graph

2739 Commits

Author SHA1 Message Date
2161790f13 Gradle wrapper upgrade 2021-08-13 00:54:46 +03:00
c100d5fb09 3.16.3 2021-08-12 20:58:48 +03:00
8fec3b8345 Merge remote-tracking branch 'origin/master' 2021-08-12 20:43:15 +03:00
3b1fa58806 Resolved #4842 - solved Android/libs folder not being created on bundle, only on local assembly 2021-08-12 20:42:49 +03:00
0e8a61e07a Translations update (#4844)
* Update Swedish (#4834)

* Update Swedish.properties

* Update Swedish.properties

* Update android/assets/jsons/translations/Swedish.properties

Co-authored-by: Alex25820 <50142558+Alex25820@users.noreply.github.com>

Co-authored-by: Alex25820 <50142558+Alex25820@users.noreply.github.com>

* Update Simplified_Chinese.properties (#4831)

* Update Spanish.properties (#4824)

* Update Malay.properties (#4820)

* added and modified malay language

* update Malay.properties

* corrected wrong tags

* update Malay.properties

* update Malay.properties

* fix missing tag (thanks @xlenstra)

Co-authored-by: kyliow <kliow@kyle.astro>

* Update German translation (#4817)

* Update German translation

* Update German translation

* Update Indonesian.properties (#4816)

* Update Italian.properties (#4814)

Co-authored-by: SimonCeder <63475501+SimonCeder@users.noreply.github.com>
Co-authored-by: Alex25820 <50142558+Alex25820@users.noreply.github.com>
Co-authored-by: Jerry1962325 <60921621+Jerry1962325@users.noreply.github.com>
Co-authored-by: ArchDuque-Pancake <78449553+ArchDuque-Pancake@users.noreply.github.com>
Co-authored-by: Kong You Liow <53225674+kyliow@users.noreply.github.com>
Co-authored-by: kyliow <kliow@kyle.astro>
Co-authored-by: MartinP <77325495+Mape6@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>
2021-08-12 19:23:32 +03:00
fb266b07b2 Fixed compile error from branch merging 2021-08-11 21:15:04 +03:00
0d041ab1ef Civilopedia - Difficulty (#4789)
* Civilopedia - Difficulty

* Civilopedia - Difficulty - patch2

* Civilopedia - Difficulty - patch3
2021-08-11 21:03:43 +03:00
5d2732c656 G&K resources, resource improvement yield changes to match civ5. (#4835)
* Update Credits.md

* Add files via upload

* Add files via upload

* Update TileResources.json

* Update FantasyHex.json

* Update TileResources.json
2021-08-11 18:48:10 +03:00
ca54fac555 Add Holy Site for FantasyHex (#4828)
* Add Holy Site & Holy Place

* Delete Holy Place.png
2021-08-11 14:45:48 +03:00
4aed0f0f80 Added founder beliefs, updates to pantheon spreading (#4827)
* Added founder beliefs, minor changes to pantheons

* Fixed the tests

* Implemented recommended chances

* Implemented requested changes
2021-08-11 09:56:36 +03:00
3c4bb1a558 City screen stats double separators (#4821) 2021-08-09 15:32:30 +03:00
6d04bf424b Fixed crash when selecting certain buildings in the civilopedia (#4819) 2021-08-09 13:57:13 +03:00
bf40779605 Fix (#4813) 2021-08-09 06:34:21 +03:00
92728e9007 Added an overview screen for religions (#4808)
* Added an overview screen for religions

* Missed a thing

* Implemented requested changes
2021-08-08 23:46:39 +03:00
7cd368d024 3.16.2 2021-08-08 23:20:44 +03:00
806cd7df38 Translations update (#4812)
* Update Spanish.properties (#4787)

* Update German translation (#4783)

* Update German translation

* Update German translation

* Update German translation

* Update German translation

Co-authored-by: Martin <77325495+Mape6@users.noreply.github.co>

* Update Indonesian.properties (#4779)

* Update Indonesian.properties

* Update Indonesian.properties

* Update Italian.properties (#4778)

* Turkish translations (#4775)

* Turkish translations

* Update Turkish.properties

* fix typo

* change [unit] into [param] to fix

* add the missing ] to the [amount and finally make the pr mergeable

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: Martin <77325495+Mape6@users.noreply.github.co>
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: Miraç <56484801+logicminimal@users.noreply.github.com>
2021-08-08 23:02:44 +03:00
55d32e1bcb Added follower beliefs for buying religious buildings (#4793)
* Added follower beliefs for buying religious buildings

* Implemented recommended changes
2021-08-08 22:23:22 +03:00
92d3fa65e3 Ruins now have their own file (#4771)
* Ruins now have their own file

* Added religious rewards

* Added an option for only enabling rewards after a certain amount of turns

* You can now weigh rewards making some more likely than others

* Cleaned up some code

* Make new changes compatible with old mods

* Implemented proposed changes

* Implemented requested changes

* Implemented requested changes
2021-08-08 17:31:08 +03:00
4d0b2405e1 Missionaries are now disabled when religion is disabled (#4791) 2021-08-08 15:22:09 +03:00
b8fe46d057 Regression in template.properties (#4785)
"Advanced Settings" has been a while ago. I'm not fixing all comment/empty lines having added spaces here, later.
2021-08-07 23:47:58 +03:00
56541a6489 Pikeman upgrades only to Lancer (#4780)
Checked this in civ5.
2021-08-07 23:47:35 +03:00
a35f55db6f Added missing religion icons (#4795) 2021-08-07 23:46:55 +03:00
c56f0b3d4e Architecture is now a prerequiste of Archaeology (#4797) 2021-08-07 23:45:05 +03:00
9a24f04d56 Fixes bug where Russia's unique no longer works (#4803) 2021-08-07 23:43:47 +03:00
ad82f63794 Mod description translation (#4801) 2021-08-07 23:42:12 +03:00
124d614a9f Fix banking's required techs (#4796)
will this break a hypothetical save where someone is now researching a tech and has all required techs for now but not the new to be added requirement?
2021-08-07 22:47:19 +03:00
2a3395882f City state resources (#4755)
* Ai now cares about distance from it's cities

* Ai now cares about distance from it's cities

* Ai now cares about distance from it's cities

* Ai will pay extra pay extra for bordering cities or surrounding cities

* Ai will pay extra pay extra for bordering cities or surrounding cities

* Ai will pay extra for cities that are closer to their territory

* The code is cleaner

* The code is cleaner

* The code is cleaner

* Ai now values distance

* Ai now values distance

* Ai now values distance

* Ai now values distance

* Ai now values distance

* Ai now values distance

* Ai now values distance

* Ai now values distance

* Ai now values distance

* Ai now values distance

* Ai now values distance

* Ai now values distance

* Ai now values distance

* Ai now values distance

* Ai now values distance

* Ai now values distance

* You can now gift improvements to the ai

* You can now gift improvements to the ai

* You can now gift improvements to the ai

* Ai now cares about distance from it's cities

* Ai now cares about distance from it's cities

* Ai will pay extra pay extra for bordering cities or surrounding cities

* Ai will pay extra pay extra for bordering cities or surrounding cities

* Ai will pay extra for cities that are closer to their territory

* The code is cleaner

* The code is cleaner

* The code is cleaner

* Ai now values distance

* Ai now values distance

* Ai now values distance

* Ai now values distance

* Ai now values distance

* Ai now values distance

* Ai now values distance

* Ai now values distance

* Ai now values distance

* Ai now values distance

* Ai now values distance

* Ai now values distance

* Ai now values distance

* Ai now values distance

* Ai now values distance

* Ai now values distance

* You can now gift improvements to the ai

* You can now gift improvements to the ai

* You can now gift improvements to the ai

* You can now gift improvements to the ai

* Ai now cares about distance from it's cities

* Ai now cares about distance from it's cities

* Ai now cares about distance from it's cities

* Ai will pay extra pay extra for bordering cities or surrounding cities

* Ai will pay extra pay extra for bordering cities or surrounding cities

* Ai will pay extra for cities that are closer to their territory

* The code is cleaner

* The code is cleaner

* The code is cleaner

* Ai now values distance

* Ai now values distance

* Ai now values distance

* Ai now values distance

* Ai now values distance

* Ai now values distance

* Ai now values distance

* Ai now values distance

* Ai now values distance

* Ai now values distance

* Ai now values distance

* Ai now values distance

* Ai now values distance

* Ai now values distance

* Ai now values distance

* Ai now values distance

* You can now gift improvements to the ai

* You can now gift improvements to the ai

* You can now gift improvements to the ai

* You can now gift improvements to the ai

* You can now gift improvements to the ai

* You can now gift improvements to the ai

* You can now gift improvements to the ai

* You can now gift improvements to the ai

* You can now gift improvements to the ai

* You can now gift improvements to the ai

* You can now gift improvements to the ai

* You can now gift improvements to the ai

* You can now gift improvements to the ai

* You can now gift improvements to the ai

* You can now gift improvements to the ai

* You can now gift improvements to the ai

* You can now gift improvements to the ai

* Update template.properties
2021-08-06 16:07:38 +03:00
8394930d6d 3.16.1 2021-08-06 15:21:57 +03:00
5eec9e8e0e Translations update (#4776)
* Update German translation (#4773)

* Update Swedish.properties (#4768)

Translated the newly added lines.

* Update Italian.properties (#4763)

Co-authored-by: MartinP <77325495+Mape6@users.noreply.github.com>
Co-authored-by: Alex25820 <50142558+Alex25820@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
2021-08-06 15:12:54 +03:00
547f5a57e5 Added missionairy units, which can spread religion and bought with faith (#4568)
* Added missionairy units, which can spread religion and bought with faith

* Forgot an include, minor additions

* Forgot credit for the missionary image

* Large refactor, enabling buying with almost all stats, split IConstruction into IConstruction & INonPerpetualConstruction

* Does this fix the tests

* Fixed accidentally removing all trailing spaces in template.properties

* Thanks to someTroglodyte for paying more attention than I do :)

* Implemented requested changes

* Fixed large amount of question marks

* Missing space, of course

* Fixed function name change

* Fixed merge problems

Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
2021-08-06 14:40:48 +03:00
9499471986 Change defeat conditions (#4761)
* Change defeat conditions

* Change defeat conditions - unit tests setup

* Change defeat conditions - patch1
2021-08-05 18:12:30 +03:00
9634f7045a Replaced the last promotion effects with uniques (#4764) 2021-08-05 07:41:48 +03:00
72eee5adf3 Removed $ signs from translatable strings (#4762) 2021-08-05 07:40:13 +03:00
000ef80c0f 3.16.0-patch1 2021-08-04 18:36:43 +03:00
bcf57f8562 Translations update (#4760)
* Update Swedish.properties (#4759)

Translated the newly added lines.

* Update Indonesian.properties (#4754)

* Update Russian.properties (#4753)

* Update Spanish.properties (#4748)

* Update Spanish.properties

* Update Spanish.properties

* Update Italian.properties (#4745)

* Update Italian.properties

* Update Italian.properties

Co-authored-by: Alex25820 <50142558+Alex25820@users.noreply.github.com>
Co-authored-by: kensvin <63847755+Kensvin28@users.noreply.github.com>
Co-authored-by: sockybob <44141246+sockybob@users.noreply.github.com>
Co-authored-by: ArchDuque-Pancake <78449553+ArchDuque-Pancake@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
2021-08-04 18:12:31 +03:00
38a09096b4 MCO - Randomize Plains/Grasslands around deserts (#4746)
- Deserts are a little bit more common (but now have higher chance of being stripes)
- Slightly reduced range of Tundra.
- Slightly reduced amount of Snow.
- Grasslands can now appear next to desert tiles and huge plains areas are much less likely.
2021-08-04 14:10:23 +03:00
2c428f8269 Bugfixes from unitTypes so promotions work again (#4744) 2021-08-04 13:55:12 +03:00
c1382477e0 Mod manager concurrency (#4750)
* Mod manager concurrency

* Mod manager concurrency - tr
2021-08-04 13:53:42 +03:00
a3c9214500 3.16.0 2021-08-03 22:41:10 +03:00
4d3195ec5a Added Diplomatic victory, United Nations, Globalization (#4619)
* Added globalization tech

* Added united nations and backbone for diplomatic victory

* You can now vote with the united nations every 20 * gameSpeed turns, and the results will be displayed the turn after

* You can now win with diplomacy

* AI will now vote in the united nations

* Added the amount of turns till the next diplomatic vote in the diplomacy overview

* Added translatable strings

* Implemented most of the requested changes (rest coming soon)

* Implemented further requested changes
2021-08-03 21:48:51 +03:00
3b4b9a27bf Split up unit types to its own JSON file (#4717)
* Split off unitTypes to its own json, only containing the domain it can travel in for now

* Updated translationFileWriter to handle this file correctly

* Updated promotions file

* Implemented requested changes

* Units without a sprite use the sprite of a first unit with the same type

* Implemented proposed changes
2021-08-03 19:06:59 +03:00
c33e7ae6d2 Civilopedia phase 9 - Technologies (#4737) 2021-08-03 09:36:58 +03:00
731aec0e65 Use stat characters in Civilopedia Unit/Building costs (#4736) 2021-08-03 09:24:31 +03:00
e8876e90bf All stats available as text characters (#4734) 2021-08-02 23:35:58 +03:00
f773a547b3 Solved another teleportation concurrent modification exception 2021-08-02 23:17:28 +03:00
b62c56d175 Translations update (#4731)
* Update Spanish.properties (#4730)

* Update Spanish.properties

* Update Spanish.properties

* Update Hungarian.Translate (#4729)

just the normal amount of translates

* Update Swedish.properties (#4726)

Translated the newly added lines.

* Update Indonesian.properties (#4722)

* Update Simplified_Chinese.properties (#4719)

* Update Italian.properties (#4716)

Co-authored-by: ArchDuque-Pancake <78449553+ArchDuque-Pancake@users.noreply.github.com>
Co-authored-by: JurDan775 <80947706+JurDan775@users.noreply.github.com>
Co-authored-by: Alex25820 <50142558+Alex25820@users.noreply.github.com>
Co-authored-by: kensvin <63847755+Kensvin28@users.noreply.github.com>
Co-authored-by: HoleHolo <80876542+HoleHolo@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
2021-08-02 20:51:12 +03:00
a248a1178c Deprecate Building.cannotBeBuiltWith (Solar/Nuclear Plant exclusion now as unique, auto-displays in Civilopedia) (#4732) 2021-08-02 20:50:56 +03:00
4a434b3689 Improve Road & Railroad (again) (#4721) 2021-08-02 19:18:53 +03:00
e993f507aa Map size will modify policy cost, techUniques is initialized by UniqueMap(), Replace "effect" with "uniques" in UnitPromotions.json (#4507)
* Map size will modify policy cost, techUniques is initialized by UniqueMap()

* Replace "effect" with "uniques" in UnitPromotions.json
2021-08-02 19:17:26 +03:00
7d52cfbcab Harden map editor map loader against most bad maps (#4711)
* Harden map editor map loader against most bad maps

* Harden map editor map loader against most bad maps - patch1
2021-08-02 19:03:16 +03:00