Commit Graph

2916 Commits

Author SHA1 Message Date
yairm210
194c69a633 Deprecation 2021-09-05 13:18:51 +03:00
yairm210
daaab81e28 Resolved #5044 - reverted target Android SDK to 30 2021-09-05 12:55:19 +03:00
Xander Lenstra
a20baca7c2
You can now input distinct numbers when trading gold (#5072)
* Type amount of gold in trade requests

* Remove extraneous spaces in template.properties

* Implemented proposed changes

* Fixed tests
2021-09-05 12:10:57 +03:00
SomeTroglodyte
6bc58ab5a3
Tabbed options (#5081)
* Tabbed Options Screen

* Tabbed Options Screen - atlas
2021-09-04 21:30:39 +03:00
SomeTroglodyte
60500d17a6
A flag for Traditional_Chinese (#5083) 2021-09-04 21:29:28 +03:00
SomeTroglodyte
2069f227c4
Newgame Mod incompatibility toast (#5076) 2021-09-03 12:26:38 +03:00
SomeTroglodyte
5e8ecff397
Remove nonsignificant whitespace from templates (#5073) 2021-09-03 09:35:03 +03:00
SimonCeder
8cb464c9f7
Correct year shown when starting in later eras (#5070)
* json, getEquivalentTurn

* WorldScreenTopBar.kt

* affects shown year only
2021-09-03 00:13:58 +03:00
Xander Lenstra
2993ffb272
Fixed holy site sprite not showing up (#5067) 2021-09-03 00:12:54 +03:00
yairm210
7c3f8ce661 3.16.11 2021-09-02 21:03:18 +03:00
Yair Morgenstern
4dae73bbfe
Translations update (#5065)
* Update Czech.properties (#5064)

- new strings

* Update Spanish.properties (#5059)

* Update Indonesian.properties (#5056)

* Update French.properties (#5054)

* Update Italian.properties (#5035)

* Update Italian.properties

* Update Italian.properties

* Update Swedish.properties (#5034)

* Update Swedish.properties

* Update Swedish.properties

* German language updated (#5027)

* German language updated

* Anmerkungen korrigiert.

Habe alle berechtigten Anmerkungen korrigiert. Manchmal sieht man den Wald vor Bäumen nicht mehr... :D

* Update Japanese translation (#5005)

* update

* main-policies

* fix

Co-authored-by: Xander Lenstra <71121390+xlenstra@users.noreply.github.com>

Co-authored-by: stoupa007 <60326342+stoupa007@users.noreply.github.com>
Co-authored-by: ArchDuque-Pancake <78449553+ArchDuque-Pancake@users.noreply.github.com>
Co-authored-by: kensvin <63847755+Kensvin28@users.noreply.github.com>
Co-authored-by: Fireboss_05 <47520445+Fireboss05@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>
Co-authored-by: Lordsem <62795018+Lordsem@users.noreply.github.com>
Co-authored-by: yuracla <89312848+yuracla@users.noreply.github.com>
Co-authored-by: Xander Lenstra <71121390+xlenstra@users.noreply.github.com>
2021-09-02 20:54:22 +03:00
Xander Lenstra
df853504ae
Great Prophets now always have your religion as their religion (#5052)
* Great Prophets now always have your religion as their religion

* Reworded unique for clarity
2021-09-02 20:52:24 +03:00
Xander Lenstra
9575b5bf66
Implemented renaming of religions (#5057)
* Implemented renaming of religions

* Made AskForText display error on invalid input, implemented recommended changes

* Almost forgot the translatable strings in the new popup
2021-09-02 17:40:10 +03:00
Xander Lenstra
fcc335b78a
Refactor more code, hopefully increasing maintainability (#5062)
* Fixed great person gift formula, confusing boolean, "great person" filter

* Refactored getRejectionReason to return a hashSet of reasons instead of a random one
2021-09-02 16:37:40 +03:00
Xander Lenstra
186d06faf0
When spreading a religion with a great prophet, other religions are now removed (#5055) 2021-09-01 19:21:09 +03:00
Xander Lenstra
b347366d50
Refactored some code and uniques (#5051)
* Refactored some code and uniques

* Fixed compilation errors, tests and crashes

* Moved influence bounds check from add to set
2021-09-01 19:20:04 +03:00
Xander Lenstra
cffe8e441e
Finishing the later five policy trees now allows you to buy great people with faith (#5038) 2021-09-01 09:46:27 +03:00
Xander Lenstra
634f4a3533
Added Religious wonders (#5041)
* Added Grand Temple and Great Mosque of Djenne buildings

* Added uniques for Grand Temple

* Added uniques for Mosque of Djenne, refactored ability uses system to count down isntead of up
2021-08-31 22:23:02 +03:00
Xander Lenstra
9450fac423
Added UI to show what cities are holy cities to the player (#5039) 2021-08-31 16:55:29 +03:00
yairm210
a77e8015e1 3.16.10 2021-08-30 23:30:09 +03:00
Yair Morgenstern
75efe74226
Translations update (#5033)
* work on dutch.properties (#5025)

* additions to dutch translation, some minor corrections

* fixes for dutch translation

* Update Swedish.properties (#5024)

* Update Swedish.properties

Translated the newly added lines.

* Improved translation

Improved translation

* Update Indonesian.properties (#5023)

* Update German translation (#5020)

* Update German translation

* Update German translation

* Update German translation

* Update German translation

* Update German translation

* Update Italian.properties (#5015)

Co-authored-by: Inti Pelupessy <ipelupessy@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: MartinP <77325495+Mape6@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
2021-08-30 23:24:35 +03:00
SimonCeder
a7c4895985
Add Austrian civ (#5026)
* Json definition for nation, images

* Jsons, Hussar and Coffee House

* Diplomatic Marriage Button

* Implement Marriage

* AI Marriage

* template.properties

* Popups etc

* Strings

* reviews

* reviews pt 2
2021-08-30 23:21:02 +03:00
SimonCeder
a01a6270fc
Demanding tribute from city states (#4976)
* tribute willingness calculations

* implement demanding gold and workers

* Revisions

* unit power calculation

* show modifiers in the diplo screen

* template.properties

* G&K modifiers

* promotions start at 0

* notiifications, AI

* conflict

* conflict?

* template and translation, failing test?

* another missing string

* missing space

* afraid relationship status

* missing space 2

* Slight optimization

* optimization pt 2

* reviews
2021-08-30 14:17:20 +03:00
SomeTroglodyte
9c3e621b15
Atlas reorg - packer to loader via json (#5014) 2021-08-29 23:29:24 +03:00
Xander Lenstra
5094a068fe
Fixed ambush bonus amount (#5021) 2021-08-29 20:37:59 +03:00
SomeTroglodyte
5403f28c77
Remove inactive server code and music (#5017) 2021-08-29 11:33:46 +03:00
SomeTroglodyte
5a6a9c9759
Anti-Armor, negative tile yield, LoadScreen (#5018)
* Harden against negative yields, Anti-Armor

* Anti-Armor bad unitType, LoadScreen
2021-08-29 11:33:20 +03:00
yairm210
6a3fddc757 3.16.9 2021-08-29 01:43:22 +03:00
Yair Morgenstern
342eae4060
Translations update (#5013)
* Update Dutch.properties (#5008)

* work on dutch translation: new translations and some corrections

* fixes for dutch translation

* Update Italian.properties (#5006)

* Update Indonesian.properties (#5004)

* Update German translation (#4999)

* Update German translation

* Update German translation

* Update German translation

* Update German translation

* Update German translation

* Update German translation

* Update Swedish.properties (#4997)

* Update Swedish.properties

Translated the newly added lines.

* Fixed misplaced space

* Update Spanish.properties (#4992)

* Update Spanish.properties

* Update Spanish.properties

Co-authored-by: Inti Pelupessy <ipelupessy@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@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: Alex25820 <50142558+Alex25820@users.noreply.github.com>
Co-authored-by: ArchDuque-Pancake <78449553+ArchDuque-Pancake@users.noreply.github.com>
2021-08-29 01:37:59 +03:00
Xander Lenstra
1cc90a3953
Implemented the enhancing of religions (#4965)
* Generalize the concept of founding religions in preparation of enhancing

* Implemented enhancing religions

* Added all enhancer beliefs (mostly correctly, mostly tested)

* You can now found a religion without a pantheon, requiring you to choose a pantheon as well

* Parameterized 'enhance religion' action, fixed tests

* Implemented requested changes & simplified beliefContainer a lot

* Fixed rename

* Updated code to include features added in the meantime

* Merge branch 'master' into enhanceReligions

Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
2021-08-28 22:36:11 +03:00
Xander Lenstra
85e4a68ea1
Submarines are now visible to adjacent units, and once turned visible, can be attacked by all enemy units (#5001)
* Submarines are now visible to adjacent units, and once turned visible, can attack be all enemy units

* Deprecation & translation of unique saving
2021-08-27 17:00:12 +03:00
SomeTroglodyte
bf2ee91b67
Civilopedia Phase X (#5003)
* Civilopedia Phase X - Show Policies

* Civilopedia Phase X - Show City States

* Civilopedia - Loop-driven init and Cleanup

* Civilopedia - City States

* Civilopedia Phase X - Remove spurious comments
2021-08-27 16:24:23 +03:00
yairm210
30e5ac3665 3.16.8 2021-08-26 17:45:17 +03:00
SomeTroglodyte
448b04fab8
Civilopedia - Tweaks (#4990)
- Icon for BeliefType.Founder
- Religion icons inverted in Civilopedia
- Terrain icons in links and entry header centered
2021-08-26 17:29:55 +03:00
Yair Morgenstern
e442c4dcf1
Translations update (#4996)
* Update Simplified_Chinese.properties (#4991)

* Update Russian.properties (#4989)

* Update Russian.properties

* Update Russian.properties

* Update Russian.properties

Mostly corrected mistakes of the previous translator and translated some of the new strings

* Update Swedish.properties (#4988)

* Update Italian.properties (#4979)

* Update German translation (#4974)

* Update German translation

* Update German translation

* Update German translation

* Update German translation

* Update Portuguese.properties (#4957)

* Update Portuguese.properties

* Update Portuguese.properties

* Update Portuguese.properties

Co-authored-by: CrispyXYZ <64761703+CrispyXYZ@users.noreply.github.com>
Co-authored-by: sockybob <44141246+sockybob@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>
Co-authored-by: MartinP <77325495+Mape6@users.noreply.github.com>
Co-authored-by: batatasmor <75855494+batatasmor@users.noreply.github.com>
2021-08-26 17:10:18 +03:00
Xander Lenstra
86d1f143d9
Conquering a city destroys buildings inside the city (#4995)
* When conquering a city, some buildings are now destroyed

* Added missing translation for uniques
2021-08-26 17:09:55 +03:00
yairm210
935b5f8793 gradle deprecation warnings fixed 2021-08-25 00:12:19 +03:00
SomeTroglodyte
cdc63f71e8
Multi-Atlas / Image packer redo (#4959)
* Atlas reorg

* Atlas reorg - resulting atlases 1

* Atlas reorg - resulting atlases 2

* Atlas reorg - merge
2021-08-24 07:31:21 +03:00
SomeTroglodyte
b93f93ea9b
Stat Icons Redone (#4961)
* Stat Icons Redone

* Stat Icons Redone - Sources

* Stat Icons Redone - Rebuild atlas
2021-08-23 23:15:17 +03:00
yairm210
e62fdc2218 3.16.7 2021-08-23 21:11:21 +03:00
Yair Morgenstern
599a373b6d
Translations update (#4972)
* Update Indonesian.properties (#4962)

* Update Indonesian.properties

* Update Indonesian.properties

* Update Swedish.properties (#4950)

Translated the newly added lines.

* Update Simplified_Chinese.properties (#4946)

* Update Simplified_Chinese.properties

* Update Simplified_Chinese.properties

* Update Simplified_Chinese.properties

* Update German translation (#4944)

* Update German translation

* Update German translation

* Update German translation

* Update German translation

* Adding to the Polish translation. (#4942)

* Added some new translations and fixed two typos

* Reworded one bit

* New translations

* New translations, focusing mainly on system stuff

* Fixed the [stat]

* Update Japanese.properties (#4938)

* Update Japanese.properties

* Update Japanese.properties

* Update Japanese.properties

* Update Italian.properties (#4937)

Co-authored-by: kensvin <63847755+Kensvin28@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: MartinP <77325495+Mape6@users.noreply.github.com>
Co-authored-by: Marcel Zelent <79370135+MarcelZelent@users.noreply.github.com>
Co-authored-by: yuracla <89312848+yuracla@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
2021-08-23 20:41:31 +03:00
Xander Lenstra
89ea30af95
Implemented Inquisitors (#4909)
* Added inquisitor unit including image

* Inquisitor now blocks spreading of religions

* Added 'remove heresy' action

* Fixed tests

* Reworded remove heresy unique, updated sprites

* Fix Crash

* Implemented requested changes & fixed a few minor bugs

* Implemented requested changes
2021-08-23 20:26:37 +03:00
Xander Lenstra
15c4b67781
Implemented a cap for the production boost of great engineers (#4966)
* Implemented a cap for the production boost of great engineers

* Added a hybrid solution

* Adding production now shows the amount of production added
2021-08-23 20:21:28 +03:00
AdityaMH
213e648517
Improve Unit into 2.5D from BUCKETEER (#4967)
* Improve Unit into 2.5D from BUCKETEER

* Ballista

* Galley & Carrier

* Landship
2021-08-23 20:19:07 +03:00
Xander Lenstra
0868e31adb
Scouts still ignore terrain costs after upgrades (#4954)
* Scouts still ignore terrain costs after upgrades

* Added an icon for the new promotion
2021-08-22 23:27:33 +03:00
yairm210
949f45497e Gradle upgrade! 2021-08-22 22:00:34 +03:00
Xander Lenstra
40e35b2167
Fixed interpunction & typos in the tutorial (#4941)
* Fixed interpunction & typos in the tutorial

* Fixed old translations not being removed (unless words were changed)
2021-08-22 14:08:42 +03:00
yairm210
7228b2d4ae 3.16.6 2021-08-21 21:22:24 +03:00
Yair Morgenstern
0118eb6425
Translations update (#4936)
* Update Swedish.properties (#4932)

Translated the newly added lines.

* Update Portuguese.properties (#4926)

* Update Portuguese.properties

* Update Portuguese.properties

* Update Portuguese.properties

* Update Portuguese.properties

* Update Portuguese.properties

* Update Portuguese.properties

* Update Indonesian.properties (#4915)

* Update Spanish.properties (#4914)

* Update Spanish.properties

* Update Spanish.properties

* Update German translation (#4911)

Co-authored-by: Alex25820 <50142558+Alex25820@users.noreply.github.com>
Co-authored-by: batatasmor <75855494+batatasmor@users.noreply.github.com>
Co-authored-by: kensvin <63847755+Kensvin28@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>
2021-08-21 21:06:00 +03:00
SomeTroglodyte
13365e5ad6
Ancient Ruins, Civilopedia and Translations (#4907)
* Ancient Ruins, Civilopedia and Translations
- TranslationFileWriter can process Ruins.json
- Hide Religion / Civilopedia uniques hardcoded String moved to Constants
- Civilopedia display of Ruins pulls actual json rewards in code
- Manually curated rewards description removed

* Ancient Ruins, Civilopedia and Translations
- Old rewards descriptions moved to names, color
- Code now recreates old output closely
- civilopediaText allowed additionally
- TranslationFileWriter tweaked accordingly

* Ancient Ruins, Civilopedia and Translations - fix stargazers
2021-08-21 20:57:39 +03:00
Miraç
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
yairm210
510507bf9c Bumped compile and target Android SDK to 31 2021-08-20 15:06:23 +03:00
yairm210
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
yairm210
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
AdityaMH
b117681ee6
Add Inquisitor for FantasyHex from BUCKETEER (#4919) 2021-08-20 11:14:17 +03:00
AdityaMH
a0a208fc91
Improve Polder & City center (Atomic Era) from BUCKETEER (#4917) 2021-08-20 11:14:01 +03:00
AdityaMH
78b8b4b177
Modified Armored Unit into 2.5D from BUCKETEER (#4918) 2021-08-20 11:13:36 +03:00
AdityaMH
b790c40bd9
Add Natural Wonders for FantasyHex by BUCKETEER (#4916) 2021-08-20 11:12:27 +03:00
Xander Lenstra
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
Xander Lenstra
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
yairm210
eb8e76ba08 3.16.5 2021-08-19 20:49:08 +03:00
Yair Morgenstern
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
Arthur van der Staaij
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
SomeTroglodyte
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
SomeTroglodyte
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
SimonCeder
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
AdityaMH
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
Arthur van der Staaij
6ad90c31ba
Removed the sight bonus from hills (#4883) 2021-08-17 09:14:49 +03:00
Arthur van der Staaij
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
yairm210
0436e67342 3.16.4-patch1 2021-08-16 19:31:12 +03:00
Yair Morgenstern
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
yairm210
c1acda6c6b 3.16.4 2021-08-15 22:04:12 +03:00
Arthur van der Staaij
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
Miraç
377cce3348
Make naval tradition provide a general instead of an admiral for time being (#4864) 2021-08-15 20:58:35 +03:00
Yair Morgenstern
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
Xander Lenstra
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
yairm210
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
yairm210
2161790f13 Gradle wrapper upgrade 2021-08-13 00:54:46 +03:00
yairm210
c100d5fb09 3.16.3 2021-08-12 20:58:48 +03:00
yairm210
8fec3b8345 Merge remote-tracking branch 'origin/master' 2021-08-12 20:43:15 +03:00
yairm210
3b1fa58806 Resolved #4842 - solved Android/libs folder not being created on bundle, only on local assembly 2021-08-12 20:42:49 +03:00
Yair Morgenstern
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
yairm210
fb266b07b2 Fixed compile error from branch merging 2021-08-11 21:15:04 +03:00
SomeTroglodyte
0d041ab1ef
Civilopedia - Difficulty (#4789)
* Civilopedia - Difficulty

* Civilopedia - Difficulty - patch2

* Civilopedia - Difficulty - patch3
2021-08-11 21:03:43 +03:00
ravignir
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
AdityaMH
ca54fac555
Add Holy Site for FantasyHex (#4828)
* Add Holy Site & Holy Place

* Delete Holy Place.png
2021-08-11 14:45:48 +03:00
Xander Lenstra
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
SomeTroglodyte
3c4bb1a558
City screen stats double separators (#4821) 2021-08-09 15:32:30 +03:00
Xander Lenstra
6d04bf424b
Fixed crash when selecting certain buildings in the civilopedia (#4819) 2021-08-09 13:57:13 +03:00
ravignir
bf40779605
Fix (#4813) 2021-08-09 06:34:21 +03:00
Xander Lenstra
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
Yair Morgenstern
7cd368d024 3.16.2 2021-08-08 23:20:44 +03:00
Yair Morgenstern
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
Xander Lenstra
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
Xander Lenstra
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
Xander Lenstra
4d0b2405e1
Missionaries are now disabled when religion is disabled (#4791) 2021-08-08 15:22:09 +03:00
SomeTroglodyte
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
ravignir
56541a6489
Pikeman upgrades only to Lancer (#4780)
Checked this in civ5.
2021-08-07 23:47:35 +03:00
Xander Lenstra
a35f55db6f
Added missing religion icons (#4795) 2021-08-07 23:46:55 +03:00
Xander Lenstra
c56f0b3d4e
Architecture is now a prerequiste of Archaeology (#4797) 2021-08-07 23:45:05 +03:00
Xander Lenstra
9a24f04d56
Fixes bug where Russia's unique no longer works (#4803) 2021-08-07 23:43:47 +03:00
SomeTroglodyte
ad82f63794
Mod description translation (#4801) 2021-08-07 23:42:12 +03:00
Miraç
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
Interdice
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
Yair Morgenstern
8394930d6d 3.16.1 2021-08-06 15:21:57 +03:00
Yair Morgenstern
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
Xander Lenstra
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
SomeTroglodyte
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
Xander Lenstra
9634f7045a
Replaced the last promotion effects with uniques (#4764) 2021-08-05 07:41:48 +03:00
Xander Lenstra
72eee5adf3
Removed $ signs from translatable strings (#4762) 2021-08-05 07:40:13 +03:00
Yair Morgenstern
000ef80c0f 3.16.0-patch1 2021-08-04 18:36:43 +03:00
Yair Morgenstern
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
ravignir
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
Xander Lenstra
2c428f8269
Bugfixes from unitTypes so promotions work again (#4744) 2021-08-04 13:55:12 +03:00
SomeTroglodyte
c1382477e0
Mod manager concurrency (#4750)
* Mod manager concurrency

* Mod manager concurrency - tr
2021-08-04 13:53:42 +03:00
Yair Morgenstern
a3c9214500 3.16.0 2021-08-03 22:41:10 +03:00
Xander Lenstra
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
Xander Lenstra
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
SomeTroglodyte
c33e7ae6d2
Civilopedia phase 9 - Technologies (#4737) 2021-08-03 09:36:58 +03:00
SomeTroglodyte
731aec0e65
Use stat characters in Civilopedia Unit/Building costs (#4736) 2021-08-03 09:24:31 +03:00
SomeTroglodyte
e8876e90bf
All stats available as text characters (#4734) 2021-08-02 23:35:58 +03:00
Yair Morgenstern
f773a547b3 Solved another teleportation concurrent modification exception 2021-08-02 23:17:28 +03:00
Yair Morgenstern
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
SomeTroglodyte
a248a1178c
Deprecate Building.cannotBeBuiltWith (Solar/Nuclear Plant exclusion now as unique, auto-displays in Civilopedia) (#4732) 2021-08-02 20:50:56 +03:00
AdityaMH
4a434b3689
Improve Road & Railroad (again) (#4721) 2021-08-02 19:18:53 +03:00
lishaoxia1985
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
SomeTroglodyte
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
Yair Morgenstern
f3c0c5d202
Translations update (#4714)
* Turkish Translations (#4695)

* Turkish Translations

those translations are for 3.15.16, new lines could be added by then i dont know

* Update Turkish.properties

* Update Korean.properties (#4687)

* Update Russian.properties (#4684)

* Update Russian.properties

* Update Russian.properties

* Update Russian.properties

* Update Swedish.properties (#4683)

Translated the newly added lines.

* Update Italian.properties (#4681)

* Update Indonesian.properties (#4679)

* Fixed errors

Co-authored-by: Miraç <56484801+logicminimal@users.noreply.github.com>
Co-authored-by: Samsaek the Calico <saud2410@naver.com>
Co-authored-by: sockybob <44141246+sockybob@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>
Co-authored-by: kensvin <63847755+Kensvin28@users.noreply.github.com>
2021-08-01 21:25:30 +03:00
SomeTroglodyte
3cf9191d6a
Actually load and display the road texture found in FantasyHex (#4699)
* Actually load and display the road texture found in FantasyHex

* Actually load and display the road texture found in FantasyHex - patch1
2021-08-01 15:36:45 +03:00
Xander Lenstra
912a9dbb9d
Simplified a unique of petra (#4708) 2021-08-01 15:35:36 +03:00
AdityaMH
ff1a75bb13
Improve River for FantasyHex (#4704) 2021-08-01 11:30:18 +03:00
SomeTroglodyte
636b58d43c
Reduce atlas - The Huns was 4x larger than the other nations, and a dirty Hexagon dupe (#4689) 2021-07-31 23:56:55 +03:00
Miraç
e68bc128ab
Fix Hagia Sophia and CN Tower not giving civ 5 bonuses (#4682)
* Fix Hagia Sophia and CN Tower not giving civ 5 bonuses

i got the information about Hagia Sophia from @ravignir and CN Tower from civ wiki. i will also add faith to buildings that give faith in G&K but will do it as a commit, that so that it would be easily revertable if faith doesnt just get ignored when religion is disabled

* Create Buildings.json

* Delete Fix Hagia Sophia and CN Tower not giving the bonuses it gave in civ 5
2021-07-31 23:49:31 +03:00
Yair Morgenstern
692cbaa84a 3.15.17 2021-07-30 16:28:17 +03:00
JurDan775
a89d830391
Updated Hungarian Translates (#4677)
some translates done, more soon!
2021-07-30 15:55:29 +03:00
SomeTroglodyte
130c318ae0
Civilopedia phase 8 - Nations and Promotions (#4657)
* Civilopedia phase 8 - Nations and Promotions

* Civilopedia phase 8 - Nations and Promotions - AS insubordination

* Civilopedia phase 8 - Nations and Promotions - OR template

* Civilopedia phase 8 - Nations and Promotions - proofread

* Civilopedia phase 8 - Nations and Promotions - revert OR
2021-07-30 15:55:17 +03:00
Yair Morgenstern
71df35622f Resolved #4675 - Fertility Rates -> Fertility Rites 2021-07-30 15:08:32 +03:00
Yair Morgenstern
8ae4ae1cb1 AI accepts research agreement offers 2021-07-29 19:00:55 +03:00
Yair Morgenstern
cf367ad313
Translations update (#4673)
* Update German translation (#4666)

* Update German translation

* Update German translation

* Update Korean.properties (#4665)

* Update Swedish.properties (#4661)

Translated the newly added lines.

* Update Indonesian.properties (#4659)

* Update Italian.properties (#4655)

Co-authored-by: MartinP <77325495+Mape6@users.noreply.github.com>
Co-authored-by: Samsaek the Calico <saud2410@naver.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-07-29 15:30:44 +03:00
AdityaMH
04f688c0f3
And new unit pixel and some improvement. (#4660)
* And new unit pixel and some improvement.

* Improve Road & Railroad more realistic

* Unit pixel improvement

* Delete Airship.png

* Delete Stealth Bomber.png

* Re-art Missionary

* Add Rome color for ballista

* Delete Future Soldier.png
2021-07-29 15:28:12 +03:00
Giuseppe D'Addio
c3ed85c542
Update template.properties (#4670)
Added new line
2021-07-29 15:18:00 +03:00
ravignir
5be081276c
Map climate overhaul (#4669)
This should make the map look more like a civ5 map:
here is a spreadsheet i've created and used to make these changes: https://drive.google.com/file/d/18uacHvZlh4FoM8xEVH4J9jaAmtHomutr/view?usp=sharing
What it does:
- makes center of a map mostly Grassland with some bits of Plains
- next biome is Desert and Plains with a rare patches of Grasslands.
- next biome is again Grasslands and Plains (in about equal proportions)
- final biome is Tundra that turns into Snow towards poles.
- makes the whole map look less stripy.

It looks kind of messy, but i tried to make it as compact as i could.
2021-07-29 14:58:45 +03:00
Yair Morgenstern
221f45b966 3.15.16 2021-07-27 23:27:41 +03:00
Yair Morgenstern
7abaa11fd4
Translations update (#4654)
* Update Czech.properties (#4652)

* Update Czech.properties

- sweden, finished city states dipomacy and translated most of new strings

* Update Czech.properties

- fixed messy typo

* Update Indonesian.properties (#4651)

* Update Korean.properties (#4650)

* Update Simplified_Chinese.properties (#4643)

* Update Spanish.properties (#4642)

* Update Spanish.properties

* Update Spanish.properties

* Update Italian.properties (#4640)

* Update Swedish.properties (#4638)

Translated the newly added lines.

Co-authored-by: stoupa007 <60326342+stoupa007@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: HoleHolo <80876542+HoleHolo@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>
Co-authored-by: Alex25820 <50142558+Alex25820@users.noreply.github.com>
2021-07-27 22:29:22 +03:00
SimonCeder
1f6f49efd7
Mercantile CS resources (#4641)
* Added Porcelain and Jewelry, assigned to Mercantile CS

* resized Jewelry.png

* moved citystateresource, added resource overview to diplo screen

* citystateresource saved as string

* Update template.properties

Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
2021-07-27 22:28:36 +03:00
SomeTroglodyte
34717008b8
Civilopedia phase7 (#4628)
* Civilopedia phase 7 - Terrain

* Civilopedia phase 7 - Terrain - tuning

* Civilopedia phase 7 - Terrain - patch1 "for"

* Civilopedia phase 7 - Terrain - patch2 for #4641
2021-07-27 10:41:25 +03:00
ravignir
8c9e7fa7da
Petra as in G&K fix (#4645)
* Petra as in G&K fix

* Update Buildings.json

* Update Buildings.json
2021-07-27 10:38:37 +03:00
Yair Morgenstern
183b94702e Better unique for defending vs units 2021-07-27 05:02:13 +03:00
Yair Morgenstern
1271c86d03 Another unique that should be deprecated :) 2021-07-27 03:47:24 +03:00
Yair Morgenstern
4479103ccc Deprecation of Building.xpForNewUnits, in favor of an existing unique :) 2021-07-27 03:45:49 +03:00