3b980a24bd
Made great people and boats uncapturable ( #4930 )
...
* Made great people and boats uncapturable
minus Great Prophet obviously.
Marks up one element in #4697
* included in khans as well
2021-08-21 20:55:16 +03:00
510507bf9c
Bumped compile and target Android SDK to 31
2021-08-20 15:06:23 +03:00
58a45a5a4d
Added caching to the gradle properties
...
Also added android:exported tags so that android:processDebugMainManifest doesn't fail the gradle check.
I think this is only failing locally because I bumped the compileSdkVersion to 31, but that means it'll need to go in soon anyway.
2021-08-20 14:30:45 +03:00
4e72cafc27
Removed manual kotlin-stdlib dependency
...
Kotlin 1.4+ auto-adds kotlin-stdlib dependency per https://kotlinlang.org/docs/whatsnew14.html#dependency-on-the-standard-library-added-by-default so we don't need it added manually.
Tested locally with ./gradlew desktop:dist and the jar worked.
2021-08-20 13:37:35 +03:00
b117681ee6
Add Inquisitor for FantasyHex from BUCKETEER ( #4919 )
2021-08-20 11:14:17 +03:00
a0a208fc91
Improve Polder & City center (Atomic Era) from BUCKETEER ( #4917 )
2021-08-20 11:14:01 +03:00
78b8b4b177
Modified Armored Unit into 2.5D from BUCKETEER ( #4918 )
2021-08-20 11:13:36 +03:00
b790c40bd9
Add Natural Wonders for FantasyHex by BUCKETEER ( #4916 )
2021-08-20 11:12:27 +03:00
b2e6612c0e
Added a UI for viewing the religions inside a city ( #4904 )
...
* Added a UI for viewing the religions inside a city
* Rewrote large parts of the UI, implementing @SomeTroglodyte's great advice
2021-08-20 08:59:13 +03:00
d856efac06
Implemented almost all missing founder & follower beliefs ( #4890 )
...
* Implemented almost all missing founder & follower beliefs
* Added missing negator
* Implemented requested changes
2021-08-20 01:24:28 +03:00
eb8e76ba08
3.16.5
2021-08-19 20:49:08 +03:00
1f2ea971e5
Translations update ( #4908 )
...
* korean translation update (#4906 )
* Update Russian.properties (#4898 )
* Update French.properties (#4897 )
Some traductions
* Update Hungarian.properties (#4896 )
just your basic translating
* Update German translation (#4895 )
* Update German translation
* Update German translation
* Update German translation
* Update Lithuanian.properties (#4833 )
* Update Lithuanian.properties
Added translate in the start and a bit in the middle closer to the bottom, changed some lithuanian translate found bad translate :/
* Fixed broken tag
Co-authored-by: Xander Lenstra <71121390+xlenstra@users.noreply.github.com >
* Update Spanish.properties (#4887 )
* Update Spanish.properties
* Update Spanish.properties
Co-authored-by: Huichan Lee <74085452+kasterra@users.noreply.github.com >
Co-authored-by: Grom1halo <78541732+Grom1halo@users.noreply.github.com >
Co-authored-by: Marjolain <florentin.services@protonmail.com >
Co-authored-by: JurDan775 <80947706+JurDan775@users.noreply.github.com >
Co-authored-by: MartinP <77325495+Mape6@users.noreply.github.com >
Co-authored-by: Pirdachu <88770992+Pirdachu@users.noreply.github.com >
Co-authored-by: Xander Lenstra <71121390+xlenstra@users.noreply.github.com >
Co-authored-by: ArchDuque-Pancake <78449553+ArchDuque-Pancake@users.noreply.github.com >
2021-08-19 20:40:49 +03:00
4114296cbe
Made water oil wells require the Refrigeration tech ( #4889 )
...
* Made water oil wells require the Refrigeration tech
Oil wells can now only be created on water with the refrigeration
technology.
This is not the ideal solution: it would be preferable to support
multiple improvements for a single resource, to add offshore platforms
as a separate improvement for coastal oil that requires refrigeration
and to disable building oil wells on coast. Allowing multiple
improvements for a resource would however be a much more significant
refactor.
* Added back "terrainsCanBeBuiltOn": ["Coast"]
2021-08-18 12:19:08 +03:00
03981c6242
CityScreen Buy button rework ( #4843 )
...
* CityScreen Buy button rework
- e.g. "Buy" for Missionary
- Info pane staying even when building no longer offered
- Purchase Prompt a little prettier
* Urgent Fix - noMods switch default
* CityScreen Buy button rework - patch1
2021-08-18 12:17:40 +03:00
ecd6cd92a4
City screen purchasable constructions prettier ( #4822 )
...
* City screen purchasable constructions prettier
* City screen purchasable constructions prettier - patch1
* City screen purchasable constructions prettier - mad modder edition
2021-08-17 14:00:01 +03:00
74a1da8e17
CS bonuses graded according to relationship level ( #4664 )
...
* city-state bonuses graded depending on friend or ally
* siam militaristic UP, cleaned up presentation
* fix strings
* move city state modifiers to json
* city-state bonuses graded depending on friend or ally
* siam militaristic UP, cleaned up presentation
* fix strings
* move city state modifiers to json
* Restructure eras.json
* reduce indentation in DiplomacyManager.kt
* Add fallback values in cas of missing json definitions
* review edits
* fix conflicts???
Co-authored-by: Yair Morgenstern <yairm210@hotmail.com >
2021-08-17 13:55:02 +03:00
8c97e2c6fc
Improve horse sound ( #4849 )
...
* Improve horse and construction sound
* Update Credits.md
* Convert to mp3
* Delete construction.ogg
* Improve horse sound
By https://freesound.org/people/Kubuzz/sounds/347036/
* Update Credits.md
* Bring back to old "construction" sound
* Update Credits.md
2021-08-17 13:51:58 +03:00
6ad90c31ba
Removed the sight bonus from hills ( #4883 )
2021-08-17 09:14:49 +03:00
84a62c7926
Gave anti-air units a bonus vs helicopters ( #4884 )
...
Helicopters are implemented as land units, so the anti-air units (land
anti-air and fighters) did not yet have this bonus.
Also corrected the damage bonus of triplanes and removed a redundant
"6 tiles in every direction always visible" unique.
2021-08-17 09:11:03 +03:00
0436e67342
3.16.4-patch1
2021-08-16 19:31:12 +03:00
38d50d04b3
Translations update ( #4881 )
...
* Update Indonesian.properties (#4875 )
* Update Indonesian.properties
* Update Indonesian.properties
* Update Swedish.properties (#4874 )
Translated the newly added lines.
* Update Japanese.properties (#4872 )
* Update Italian.properties (#4871 )
* Update German translation (#4866 )
Co-authored-by: kensvin <63847755+Kensvin28@users.noreply.github.com >
Co-authored-by: Alex25820 <50142558+Alex25820@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: MartinP <77325495+Mape6@users.noreply.github.com >
2021-08-16 19:24:01 +03:00
c1acda6c6b
3.16.4
2021-08-15 22:04:12 +03:00
201648a680
Zone of Control ( #4085 )
...
* Implemented Zone of Control
* Implemented "move after attacking" ZoC exception
Units that can move after attacking are not affected by zone of control
if they move because of defeating a unit.
* Implemented all missing special ZoC cases
As described in:
https://forums.civfanatics.com/resources/understanding-the-zone-of-control-vanilla.25582/
* Slightly optimized ZoC logic
* Modified the "possible optimization" comment
Added the knowledge gained from SomeTroglodyte's tests.
* Added "Ignores Zone of Control" unique
Implemented the unique and gave it to the Helicopter Gunship.
2021-08-15 21:42:47 +03:00
377cce3348
Make naval tradition provide a general instead of an admiral for time being ( #4864 )
2021-08-15 20:58:35 +03:00
4dc5cdd58a
Translations update ( #4865 )
...
* Update German translation (#4858 )
* Update Spanish.properties (#4857 )
* Update Spanish.properties
* Update Spanish.properties
* Turkish translations again (#4854 )
* Turkish translations again
* Update Turkish.properties
* Update Turkish.properties
* typo
* typoo
* Update Simplified_Chinese.properties (#4853 )
* Update Simplified_Chinese.properties
* Update Simplified_Chinese.properties
* Update Swedish.properties (#4852 )
Translated the newly added lines.
* Update Indonesian.properties (#4850 )
* Update Italian.properties (#4848 )
Co-authored-by: MartinP <77325495+Mape6@users.noreply.github.com >
Co-authored-by: ArchDuque-Pancake <78449553+ArchDuque-Pancake@users.noreply.github.com >
Co-authored-by: Miraç <56484801+logicminimal@users.noreply.github.com >
Co-authored-by: Jerry1962325 <60921621+Jerry1962325@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: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com >
2021-08-15 20:48:12 +03:00
5d249ee673
Implemented religious pressure ( #4863 )
...
* Implemented religious pressure: cities now can have more than one religion in them and religions spread between nearby cities over time.
* Implemented proposed changes
* Implemented requested changes & minor changes I forgot to include last time
* All pantheons not founded by you are now removed when you gain a new city (found this somewhere in the source code of the original, don't know if it's documented anywhere online)
2021-08-15 18:53:01 +03:00
558c1fb662
Revert "Gradle wrapper upgrade"
...
Checking the Github actions shows that this doesn't seem to work with the current Github actions due to version confllicts, we'll need to resolve those
2021-08-15 00:13:54 +03:00
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
