mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-02-24 21:51:14 +07:00
Code Issues Packages Projects Releases Wiki Activity
6,791 Commits 6 Branches 1,054 Tags 1.1 GiB
40918db1b0
Commit Graph

3152 Commits

Author SHA1 Message Date
Xander Lenstra
b66443574e
Enumified all remaining resource & improvement uniques (#5523) 
* Added conditionals & enumified improvement stat uniques

* Enumified all the other uniques

* Fixed bug where improvemen stat icons didn't show up in tech tree & reviews
 2021-10-24 20:47:29 +03:00
SimonCeder
9b798b3588
Inner Sea map type (#5535) 
* Inner Sea map type

* space in templates
 2021-10-21 23:51:24 +03:00
yairm210
3ae6d675cd 3.17.10 2021-10-20 21:20:24 +03:00
Yair Morgenstern
f343cb2c79
Translations update (#5524) 
* Update Russian.properties (#5517)

* Update Thai.properties (#5514)

* Update Thai.properties

* Update Thai.properties

* Update Thai.properties

* Update Thai.properties

* Update German translation (#5511)

* Update Indonesian.properties (#5510)

* Update Indonesian.properties

* Update Indonesian.properties

* Update Italian.properties (#5507)

* Update Swedish.properties (#5505)

Co-authored-by: GD-alt <62538561+GD-alt@users.noreply.github.com>
Co-authored-by: Arnattha <92711795+Arnattha@users.noreply.github.com>
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>
Co-authored-by: SimonCeder <63475501+SimonCeder@users.noreply.github.com>
 2021-10-20 21:14:26 +03:00
Xander Lenstra
13859e78c1
Unified and enumified production percentage bonus uniques (#5521) 2021-10-20 16:57:55 +03:00
Xander Lenstra
c840ff99a6
Fixed belief increasing city-state influence resting point (#5502) 2021-10-17 23:02:45 +03:00
Xander Lenstra
1a6eee0d19
Fixed unit tests failing randomly (#5503) 2021-10-17 23:02:14 +03:00
yairm210
ef2f2eccde 3.17.9 2021-10-17 21:23:58 +03:00
Yair Morgenstern
d89211c6bb
Translations update (#5497) 
* Update Greek.properties (#5488)

* Update Greek.properties

* Update Greek.properties

* Update Czech.properties (#5486)

* Update Czech.properties

- many new strings translated

* Update Czech.properties

- fixed string param names

* Update Swedish.properties (#5482)

* Update German translation (#5481)

* Update German translation

* Update German translation

* Update Indonesian.properties (#5480)

* Update Italian.properties (#5478)

* Update Italian.properties

* Update Italian.properties

Co-authored-by: ASLST <89976348+ASLST@users.noreply.github.com>
Co-authored-by: stoupa007 <60326342+stoupa007@users.noreply.github.com>
Co-authored-by: SimonCeder <63475501+SimonCeder@users.noreply.github.com>
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-10-17 21:02:31 +03:00
SimonCeder
ac422d25cb
City State Barbarian Invasion and War with Major pseudo-quests (#5454) 
* barbarian invasion event

* war with major pseudo-quest

* include latecomers

* diplomacy screen

* more notifications

* fixes

* reviews
 2021-10-16 20:34:47 +03:00
Xander Lenstra
551e6e1d54
Implemented holy warriors follower belief (#5411) 
* Implemented holy warriors follower belief

* Minor fixes

* Likely fixed the tests

* Made someTroglodyte happy :)

* Removed stray println's

* Implemented requested changes
 2021-10-16 20:25:38 +03:00
yairm210
f1f2c1e932 3.17.8 2021-10-13 23:27:39 +03:00
Giuseppe D'Addio
dd8f7ed8ff
Update Nations.json (#5457) 
You put one space too much
 2021-10-13 23:24:25 +03:00
Yair Morgenstern
290318f3ad
Translations update (#5477) 
* Update German translation (#5462)

* Update German translation

* Update German translation

* Update German translation

* Update German translation

* Update Swedish.properties (#5461)

* Update Swedish.properties

* Update Swedish.properties

* Update Indonesian.properties (#5460)

* Update Indonesian.properties

* Update Indonesian.properties

* Update Indonesian.properties

* Update Indonesian.properties

* Update Italian.properties (#5459)

Co-authored-by: MartinP <77325495+Mape6@users.noreply.github.com>
Co-authored-by: SimonCeder <63475501+SimonCeder@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-10-13 23:19:33 +03:00
SimonCeder
ff67e66348
Free buildings part 2 - works for Carthage too (#5471) 
* free buildings works for Carthage too
unify "provides a free [] []" and "gain a free [] []"

* re-check at start of turn

* reviews
 2021-10-13 19:21:27 +03:00
SimonCeder
36711f70ad
Variable resource quantities (#5456) 
* implement varying resource amounts

* works on old maps

* reviews
 2021-10-12 07:38:07 +03:00
SimonCeder
1a92f9c084
Free buildings are free (#5466) 
* free buildings are free

* ai shouldn't sell free buildings either
 2021-10-12 07:34:23 +03:00
MartinP
58d335f8d4
Deleted unnecessary quotation mark (#5463) 2021-10-11 13:14:09 +03:00
Giuseppe D'Addio
f208fdf05f
Update template.properties (#5458) 
Added new translation line
 2021-10-11 09:33:52 +03:00
Arthur van der Staaij
df39dfd2a8
Fixed the visual gaps in territory borders (#5446) 
* Implemented left/right-concave border segments

* Fixed ConvexConcave border image

It was flipped horizontally.

* Implemented border left/right-concave detection

* Moved border images into their own directory

They're not really icons, after all.

* Cleaned up code a bit and added some more comments

* Applied requested change and consistified some function names

* Removed the old border images

I was sure I already did this, but apparently not.
 2021-10-11 09:23:28 +03:00
Arthur van der Staaij
f0545130e9
Fixed the base cost of the Grand Temple (#5455) 
Base cost 300->125
 2021-10-11 09:23:09 +03:00
yairm210
5468821edf 3.17.7 2021-10-10 22:41:46 +03:00
CrispyXYZ
1a63a16e59
Update Simplified_Chinese.properties (#5447) 
* Update Simplified_Chinese.properties

* Update Simplified_Chinese.properties
 2021-10-10 22:35:09 +03:00
SomeTroglodyte
7bbcb8db1a
Mayas (#5408) 
* The Maya - data and calendar

* The Maya - completed

* The Maya - notifications

* The Maya - favoredReligion

* The Maya - comments in GreatPersonManager

* The Maya - clickable notifications

* The Maya - templates

* The Maya - atlas

* The Maya - patch1
 2021-10-09 20:45:59 +03:00
SimonCeder
69e1792fa9
Return Civilians captured by Barbarians to original owner; Capture stacked civilians (#5437) 
* return captured civilians

* stacked civilian capture bug

* works on old saves

* diplomacy bonus expires on war declared

* vector bug
 2021-10-09 20:44:03 +03:00
yairm210
81ebacc310 3.17.6 2021-10-08 17:02:29 +03:00
Yair Morgenstern
f175a59e5d
Translations update (#5439) 
* Update Korean translation (#5434)

* Update Korean.properties

* Update Korean.properties

* Update Korean.properties

* Update Swedish.properties (#5419)

* Update German translation (#5418)

* Update German translation

* Update German translation

* Update German translation

* Update Italian.properties (#5417)

Co-authored-by: cjddig <67223322+cjddig@users.noreply.github.com>
Co-authored-by: SimonCeder <63475501+SimonCeder@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-10-08 16:54:48 +03:00
yairm210
5e8e23fb43 Fixed broken translations 2021-10-06 19:06:53 +03:00
yairm210
2b75124081 3.17.5 2021-10-06 18:35:41 +03:00
Yair Morgenstern
8d3be2323d
Translations update (#5413) 
* Update Ukrainian.properties (#5394)

* Update Ukrainian.properties

* Update Ukrainian.properties

* Update Ukrainian.properties

* Update Swedish.properties (#5392)

* Update German translation (#5391)

* Update German translation

* Update German translation

* Update German translation

* Update German translation

* Update Indonesian.properties (#5390)

* Update Indonesian.properties

* Update Indonesian.properties

* Update Indonesian.properties

* Update Italian.properties (#5388)

* Spain city names + dialogues (#5305)

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

Co-authored-by: Marerjh <40261003+Marerjh@users.noreply.github.com>
Co-authored-by: SimonCeder <63475501+SimonCeder@users.noreply.github.com>
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>
Co-authored-by: riioze <61903425+riioze@users.noreply.github.com>
 2021-10-06 17:43:53 +03:00
SimonCeder
b41d234db6
Barbarians capture civilians and take gold from cities (#5410) 
* ransom cities

* capture civilians

* fix bug
 2021-10-06 17:12:13 +03:00
SimonCeder
c00ce49c86
AI rationing of strategic resources; Hydro Plant re-enabled (#5401) 
* AI evaluation of resources

* optimizations

* sell or disband when needed for space victory

* use for all constructions

* use in trade evaluations

* .requiresResource()
 2021-10-06 17:11:02 +03:00
Xander Lenstra
7752e1834d
Added a label displaying religion is off when it is off (#5412) 2021-10-06 17:06:49 +03:00
Xander Lenstra
fc01fde163
Nations now have a favoured religion they try choose when available (#5406) 2021-10-05 20:38:58 +03:00
Xander Lenstra
e879bb2a14
Added an advanced system for choosing beliefs (#5400) 2021-10-05 15:33:27 +03:00
Xander Lenstra
c9f23b644a
Updated amphitheater replacements to temple replacements (#5399) 2021-10-05 09:08:56 +03:00
SomeTroglodyte
726a1942db
Sharpen unit tests for UniqueTypes (and mod checker too) (#5398) 
* Sharpen unit tests for UniqueTypes (and mod checker too)

* Sharpen unit tests for UniqueTypes - fix newly found problems
 2021-10-05 09:08:41 +03:00
Xander Lenstra
82e72ddcfa
Added in [tileFilter] tiles conditional to combat uniques (#5393) 
* Some code cleaning

* Added `in [tileFilter] tiles` conditional

* Limited Visibility -> [-1] Sight

* Fix tests and rename conditional

* Actually made the conditional functional

* Renamed conditional once again
 2021-10-04 22:30:09 +03:00
SomeTroglodyte
088e35ff13
Ethiopia - Nation (#5387) 
* Ethiopia - Nation

* Ethiopia - Unit and Stele

* Ethiopia - Graphics

* Ethiopia - color
 2021-10-04 20:56:34 +03:00
Xander Lenstra
e1b4c53573
Added two more conditionals and updated movement, sight & combat to use these (#5389) 2021-10-04 08:32:10 +03:00
Xander Lenstra
07822de375
Simplified combat uniques further (#5361) 
* Simplified combat uniques further

* Reviews & translations

* UniqueType > placeHolderText

* I can't math
 2021-10-04 00:29:46 +03:00
SomeTroglodyte
edfc66aa2f
Sort City States, replace+deprecate Dublin and Edinburgh (#5386) 2021-10-03 19:03:54 +03:00
yairm210
8ca14eac55 3.17.4 2021-10-03 12:22:38 +03:00
Yair Morgenstern
18b5da0c30
Translations update (#5383) 
* Update Ukrainian.properties (#5369)

* Update Simplified_Chinese.properties (#5366)

* Update Simplified_Chinese.properties

* Update Simplified_Chinese.properties

* Update Simplified_Chinese.properties

* Update Simplified_Chinese.properties

* Update Simplified_Chinese.properties

* Update Swedish.properties (#5363)

* Update Swedish.properties

* Update Swedish.properties

* Update German translation (#5362)

* Update German translation

* Update German translation

* Update German translation

* Update Italian.properties (#5359)

* Update Italian.properties

* Update Italian.properties

* Update Indonesian.properties (#5358)

* Update Indonesian.properties

* Update Indonesian.properties

Co-authored-by: Marerjh <40261003+Marerjh@users.noreply.github.com>
Co-authored-by: CrispyXYZ <64761703+CrispyXYZ@users.noreply.github.com>
Co-authored-by: SimonCeder <63475501+SimonCeder@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>
Co-authored-by: kensvin <63847755+Kensvin28@users.noreply.github.com>
 2021-10-03 12:05:29 +03:00
Xander Lenstra
8168c5d3a8
Missed the default minus sign for pentagon (#5384) 2021-10-03 12:04:35 +03:00
Xander Lenstra
97da979a04
Fixed bugs with fallout (#5379) 
* Fixed bugs with fallout

* Reordered uniques

* Reviews

* Added missing unique targets
 2021-10-03 12:04:15 +03:00
SomeTroglodyte
71405b93aa
The Celtic People Reboot (#5367) 
* The Celtic People Reboot

* Redid the Shamrock sword of the Pictish Warrior

* The Celtic People Reboot - one comment

Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
 2021-10-03 12:02:58 +03:00
Xander Lenstra
982d739ec8
Fixed pentagon not working (#5381) 2021-10-03 11:56:15 +03:00
SimonCeder
9016385f30
Barbarian spawning and camp placements (#5354) 
* barbarian camp placement, spawn countdowns

* separate file

* raging barbarians

* faster spawn when attacked

* Barbarian AI

* works on old saves

* template.properties

* fix percent

* no improvements unique

* fix test fail

* reviews

* reviews pt 2
 2021-10-03 11:45:02 +03:00
SimonCeder
344c96319b
Fix Fountain of Youth (#5355) 
* fix fountain of youth

* fix test fail

* reviews

* reviews
 2021-10-01 15:51:30 +03:00
SomeTroglodyte
03f374b058
Currently playing music track displayed under Options-Sound (#5357) 2021-09-30 06:35:20 +03:00
yairm210
9fe19d0d52 3.17.3 2021-09-30 01:04:08 +03:00
Yair Morgenstern
af4c4fd88a
Translations update (#5356) 
* Update Swedish.properties (#5351)

* Update Swedish.properties

* Update Swedish.properties

* Update Spanish.properties (#5339)

* Update German translation (#5330)

* Update German translation

* Update German translation

* Update Italian.properties (#5327)

Co-authored-by: SimonCeder <63475501+SimonCeder@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: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
 2021-09-30 00:41:13 +03:00
SomeTroglodyte
6cfc0a82d8
Deprecation message options only (#5352) 
* Do not show RulesetErrorSeverity.WarningOptionsOnly on new game screen

* Do not show RulesetErrorSeverity.WarningOptionsOnly on new game screen - fresh atlas
 2021-09-29 21:25:44 +03:00
SomeTroglodyte
fb30a76e85
Civilopedia category icons and keyboard navigation (#5341) 
* Civilopedia category icons and keyboard navigation

* Civilopedia category icons - white alternative
 2021-09-29 17:39:02 +03:00
GGGuenni
3220206bce
Added game name to turn notification (#5350) 2021-09-29 17:38:27 +03:00
Xander Lenstra
bb5825a325
First step into unifying strength bonuses using conditionals (#5345) 2021-09-29 08:35:37 +03:00
SomeTroglodyte
5f9bcd0d74
Coats to Coast (#5344) 2021-09-28 23:43:36 +03:00
AdityaMH
1a35ec82ed
Change NationIcon for 4 nation (#5336) 
* Change NationIcon for 4 nation

* Update Credits.md

* Resize Icon
 2021-09-28 22:42:45 +03:00
SomeTroglodyte
2e72fd52c8
Double movement unique parameterized (#5319) 
* Double movement unique parameterized

* Double movement unique - all filters
 2021-09-27 12:35:38 +03:00
Xander Lenstra
d07eed31b8
Added the Byzantine empire (#5299) 
* Added Byzantine Empire as a nation

* Added unique units

* Implemented unique ability

* Refactored out the beliefContainer

* Implemented reviews

* Credits

* Enumified the uniques & added missing translatable strings
 2021-09-26 16:58:24 +03:00
yairm210
9b2c39321c 3.17.2 2021-09-26 14:07:40 +03:00
Giuseppe D'Addio
398f9bc2f9
Update Italian.properties (#5292) 2021-09-26 14:05:59 +03:00
Yair Morgenstern
e62d0be843
Translations update (#5324) 
* Update Spanish.properties (#5318)

* Update Indonesian.properties (#5315)

* Update Indonesian.properties

* Update Indonesian.properties

* Update Czech.properties (#5314)

- new strings translated

* Update Swedish.properties (#5310)

Translated the newly added lines

* Update German translation (#5294)

* Update German translation

* Update German translation

* Update Russian.properties (#5323)

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: stoupa007 <60326342+stoupa007@users.noreply.github.com>
Co-authored-by: Alex25820 <50142558+Alex25820@users.noreply.github.com>
Co-authored-by: MartinP <77325495+Mape6@users.noreply.github.com>
Co-authored-by: sockybob <44141246+sockybob@users.noreply.github.com>
 2021-09-26 14:04:57 +03:00
SomeTroglodyte
8d33dacc3c
Softcode Fountain of Youth (#5308) 
* Softcode Rejuvenation

* Softcode Rejuvenation - comments
 2021-09-25 22:15:03 +03:00
SimonCeder
fa813f8f5e
Quests fixes and additions (#5301) 
* enable all quests

* implement more quests

* weighting for quests

* global quests

* fixes

* fixes

* Update template.properties

* general string

* reviews
 2021-09-24 10:05:30 +03:00
SomeTroglodyte
e9e0f2c55f
World and Natural Wonders Overview (#5297) 
* World and Natural Wonders Overview

* World and Natural Wonders Overview - icon

* World and Natural Wonders Overview - groups and tuning

* World and Natural Wonders Overview - atlas

* World and Natural Wonders Overview - lint
 2021-09-24 10:04:30 +03:00
SomeTroglodyte
4a83bed4ba
Nation Picker visual help where to click (#5287) 
* Nation Picker visual help where to click

* Nation Picker visual help where to click - circles
 2021-09-23 11:23:40 +03:00
AdityaMH
600f1a32fc
Fix missed sound for Sea Beggar (#5300) 2021-09-23 11:23:04 +03:00
SomeTroglodyte
a5a8ea1338
Natural Wonders un-hardcoded (#5279) 
* Natural Wonders un-hardcoded

* Natural Wonders un-hardcoded - oops testing change revert

* Natural Wonders un-hardcoded - tests OK

* Natural Wonders un-hardcoded - requests

* Natural Wonders un-hardcoded - hide from pedia

* Natural Wonders un-hardcoded - readable unique
 2021-09-23 11:21:08 +03:00
MartinP
c7d5caf08c
Correct one line in template.properties (#5302) 2021-09-23 11:20:17 +03:00
SimonCeder
318a8d99ff
regenerated game.atlas and game.png (#5295) 2021-09-22 21:41:48 +03:00
Yair Morgenstern
e3f9f849a8
Update template.properties 
Added space that ruined tests
 2021-09-22 20:26:54 +03:00
SimonCeder
0bb565fdc6
Can't trade resources from other trades or city-states (#5252) 
* can't trade resources from city-states

* display untradeable sources in trade screen

* Update template.properties

template string

* Update Swedish.properties

* Spelling, better buttons
 2021-09-22 20:21:41 +03:00
yairm210
98f14523ed Add all cityFilter strings from the 'source of truth', since many were missing from translation file 2021-09-22 19:47:31 +03:00
yairm210
0771cb1fad 3.17.1 2021-09-22 18:50:17 +03:00
Yair Morgenstern
8538573204
Translations update (#5291) 
* Update Spanish.properties (#5286)

* Update Russian.properties (#5283)

* Update Swedish.properties (#5282)

* Update Swedish.properties

* Update Swedish.properties

* Update Italian.properties (#5278)

* Update Italian.properties

* Update Italian.properties

* Update German translation (#5277)

* Update Germans translation

* Update German translation

* Update German translation

* Update German translation

* Update Indonesian.properties (#5275)

* Update Indonesian.properties

* Update Indonesian.properties

* Update Indonesian.properties

* Update Indonesian.properties

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

* Update Japanese.properties (#5274)

* Update Japanese.properties

* Update Japanese.properties

* Update Japanese.properties

* Update Japanese.properties

Co-authored-by: Yair Morgenstern <yairm210@hotmail.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: 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: kensvin <63847755+Kensvin28@users.noreply.github.com>
Co-authored-by: Xander Lenstra <71121390+xlenstra@users.noreply.github.com>
Co-authored-by: paontv <57051667+paontv@users.noreply.github.com>
 2021-09-22 18:40:02 +03:00
SomeTroglodyte
5e4aff90e9
Music controller with fade-over and mod capabilities. (#5273) 
* Music controller with fade-over and mod capabilities.
- Preparation for music following game situations
- Minimal in-game hooks for now
- Already allows mods providing music, will play randomly

* Music controller - template
 2021-09-22 09:35:33 +03:00
Xander Lenstra
b7467d3467
Added support for conditionals to some more uniques (#5280) 
* Added support for conditionals to some more uniques

* Implemented a new conditional

* Added the new conditional to the translations file

* Fixed tests

* Implemented requested changes
 2021-09-22 09:24:16 +03:00
Xander Lenstra
ce5a82c763
Fix translation tests and wrongly translated conditionals (#5272) 2021-09-20 16:04:51 +03:00
yairm210
ef7676183d 3.17.0 2021-09-19 21:04:34 +03:00
Yair Morgenstern
dbac2bfccb
Translations update (#5271) 
* Translation update (#5261)

* Update Korean.properties

* Update Korean.properties

* Update Korean.properties

* Update Korean.properties

* Update Indonesian.properties (#5260)

* Update Indonesian.properties

* Update Indonesian.properties

* Update German translation (#5258)

* Update German translation

* Update German translation

* Update Italian.properties (#5214)

* Update Italian.properties

* Update Italian.properties

Co-authored-by: cjddig <67223322+cjddig@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-09-19 20:53:20 +03:00
Xander Lenstra
f47f427b05
Adds conditionals to most of the uniques currently in the enum (#5270) 
* Moved uniques to their own folder

* Added support for conditionals to most of the uniques in the current enum

* Deprecation > removal, of course

* Fixed tests & added `.removeConditionals` before checking for placeholders
 2021-09-19 18:43:32 +03:00
Xander Lenstra
6416f397ea
Fixed a few incorrect upgrades (#5268) 2021-09-19 17:56:53 +03:00
SimonCeder
027057874d
Update and generalize Siam UP (#5237) 
* refactor and generalize Siam UP, display correct values in diplo screen

* enable preferred diplomatic victory

* allow compatibility mode

* revisions, restore timesInPlace

* don't change game.png

* don't change game.png

* objectify and enum city state bonuses

* objectify and enum city state bonuses

* template.properties

* refactored city state bonuses into Unique

* further enumization, fix toStringWithDecimals

* reviews
 2021-09-19 06:28:10 +03:00
Xander Lenstra
01bfd17594
Implementation of conditionals, but better than before (#5187) 
* Implementation of conditionals, but better than before

* Updated the unique while I was at it

* Fixed bug where conditionals would never apply

* Capitalization

* Minor code cleaning

* Better documentation & variable names

* Changed translation strategy

* Added missing import?
 2021-09-18 23:07:53 +03:00
SimonCeder
8eb24ac273
Carthage civ (#5224) 
* Add Carthage

* Implement uniques

* performance improvement, better elephant

* AI avoids taking too much damage from mountains

* more performance

* better AI

* can't settle cities on mountains

* AI improvement

* AI improvement

* revisions, damagePerTurn in Terrains.json

* terrain damage stored as unique in json, damage also works for terrain features

* don't change game.png
 2021-09-18 20:28:12 +03:00
yairm210
7e05a56e37 Tile resource uniques now work to provide stat bonuses 2021-09-17 16:05:21 +03:00
yairm210
103f1daf36 tileResources unique -> uniques 2021-09-17 15:00:19 +03:00
yairm210
b0a169cf01 Translation generation so translators won't have to merge conflicts 2021-09-17 14:12:08 +03:00
Yair Morgenstern
82104d89c1
Translations update (#5249) 
* Update German translation (#5240)

* Update Swedish.properties (#5235)

* Update Swedish.properties

* Update Swedish.properties

* Update Indonesian.properties (#5225)

* Update Indonesian.properties

* Update Indonesian.properties

* Update Indonesian.properties

* Update Spanish.properties (#5221)

* Update Russian.properties (#5232)

* Update Russian.properties

* Update Russian.properties

Co-authored-by: MartinP <77325495+Mape6@users.noreply.github.com>
Co-authored-by: SimonCeder <63475501+SimonCeder@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: SapronovMaxim <msapronov89@gmail.com>
 2021-09-17 14:11:03 +03:00
yairm210
af9e691102 Ease of deprecation, brought to you by unique types! 
*Visible*, locatable deprecated uniques!
Stated replacement uniques!
 2021-09-17 10:33:53 +03:00
SomeTroglodyte
0e88ca978b
Oversized speaker (#5243) 
* More modestly sized Sound Tab icon on the Options Screen

* More modestly sized Sound Tab icon on the Options Screen - atlas
 2021-09-17 01:05:58 +03:00
SomeTroglodyte
340bedc7ea
Implemented Unit Supply by r3versi, not by me (#5234) 
* Implemented Unit Supply

Unit Supply is a soft cap to number of units. If the number of units of a civilization exceeds the total supply, a production malus (capped at 70%) is applied.

* Warning icon & message for supply deficit

* Implemented Unit Supply - atlas merge

* Unit Supply: Malus->Penalty, lint, sumOf

* Unit Supply: Fresh atlas

Co-authored-by: r3versi <fluo392@gmail.com>
 2021-09-16 22:50:49 +03:00
SomeTroglodyte
a61efa65c9
Ask before resetting game setup to defaults (#5231) 2021-09-16 20:56:54 +03:00
Xander Lenstra
eb665a9158
Embarked units only have 1 vision (except marines) (#5215) 
* Embarked units only have 1 vision

* Embarked units always only have 1 vision, unless they don't
 2021-09-16 20:55:33 +03:00
SomeTroglodyte
5fd04f6e32
Modmanager sort and filter (#5186) 
* Mod manager portrait mode

* Mod manager portrait and auto scroll

- MM switches to stacked expanders in portrait.
- Use AutoScrollPanes.
- Disable the enter/leave listener of AutoScrollPane in Pickers which disable the default ScrollPane to roll their own - helps all such pickers.
- No expander open/close persistence on purpose.
- PickerScreen a bit cleaned 'cuz I needed to understand something.
- Marked mods from the kill-list that are already installed.
- Button sync now OK when counterpart missing (deselects other column).

* Mod Manager sorts and filters - WIP 1

* Mod Manager sorts and filters - WIP 2

* Mod Manager sorts and filters - WIP 2a

* Mod Manager sorts and filters - WIP 3

* Mod Manager sorts and filters - atlas

* Mod Manager sorts and filters - tip
 2021-09-16 20:54:47 +03:00
Xander Lenstra
f996103403
Update existing wonders to G&K stats, mostly providing faith instead of culture (#5217) 2021-09-15 14:46:33 +03:00
ravignir
827185148a
Update Mount Fuji stats (#5223) 
I forgot about Mount Fuji stat change when i updated Natural Wonders, now i rectify that.
 2021-09-15 00:45:03 +03:00
SimonCeder
672d2a3c34
Fix Khan unit (#5207) 
* fix khan unique

* fix adjacent healing bonus

* plus

* Khan heals itself also

* nerf medic
 2021-09-15 00:35:16 +03:00
SomeTroglodyte
86bbf54cc0
Civilopedia quickie: Units show other direction of upgrade path (#5209) 
* Civilopedia quickie: Units show other direction of upgrade path

* Civilopedia quickie: Units show other direction of upgrade path - spacing
 2021-09-15 00:34:20 +03:00
yairm210
f9e0c39021 3.16.15 2021-09-14 11:37:20 +03:00
Yair Morgenstern
02930fcbda
Translations update (#5213) 
* Update Spanish.properties (#5208)

I'll check for grammar errors later. Hopefully there aren't anny nor a new release comes out today.

* Update Italian.properties (#5196)

* New polish translations (#5194)

* Update Polish.properties

Translated some unit names, and some other translations

* Update Polish.properties

Some random translations of short lines

* Update Polish.properties

Few random translations again

* Update Romanian.properties (#5191)

* Update German translation (#5189)

* Update German translation

* Update German translation

* Update German translation

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: PLynx <pawelrys2011@gmail.com>
Co-authored-by: Vortexon <88623583+V0rtexon@users.noreply.github.com>
Co-authored-by: MartinP <77325495+Mape6@users.noreply.github.com>
 2021-09-14 11:12:18 +03:00
SimonCeder
7bd555ac95
City-States Influence rates; Wary status; Proximity calculations (#5198) 
* Rates for natural influence change

* Minor civ wariness, proximity calculation

* CS can declare permanent war

* CS can in fact not declare permanent war

* adjustments, template.properties

* neater code

* fix failing test? .

* move proximity code, for reals fix failing check

* now?

* revisions

* BFS only once, better check for water map

* assign continents on pre-made maps as well

* now works on all pre-made maps
 2021-09-14 11:01:43 +03:00
Interdice
297618706c
Adding religous city states to unciv! (#5136) 
* Adding religous city states to unciv!

* Adding religous city states to unciv!

* Adding religous city states to unciv!

* Adding religous city states to unciv!

* Adding religous city states to unciv!

* Adding religous city states to unciv!

* Adding religous city states to unciv!

* Adding religous city states to unciv!

* Adding religous city states to unciv!

* Adding religous city states to unciv!

* Adding religous city states to unciv!

* Adding religous city states to unciv!

* Adding religous city states to unciv!

* Adding religous city states to unciv!

* Adding religous city states to unciv!

* Adding religous city states to unciv!

* Adding religous city states to unciv!

* Adding religous city states to unciv!

* Adding religous city states to unciv!

* Adding religous city states to unciv!

* Adding religous city states to unciv!

* Adding religous city states to unciv!

* Adding religous city states to unciv!

* Adding religous city states to unciv!

* Adding religous city states to unciv!

* Adding religous city states to unciv!

* Adding religous city states to unciv!

* Adding religous city states to unciv!

* Adding religous city states to unciv!

* Adding religous city states to unciv!

* Adding religous city states to unciv!

* Adding religous city states to unciv!
 2021-09-14 10:49:38 +03:00
Xander Lenstra
0f805fbac4
Made CN tower functional, and free buildings are removed on capture (#5206) 
* Refactored free buildings from civ.policies to civ.constructions

* Made CN tower function like in the base game

* Fixed random buildings being marked culture buildings
 2021-09-14 10:12:08 +03:00
SomeTroglodyte
31f81288a8
Panzer can upgrade according to fandom wiki (#5210) 2021-09-14 09:44:40 +03:00
ravignir
893f41a0ed
Add missing Natural Wonders (#5204) 
* Add files via upload

* Add files via upload

* Add files via upload

* Update Terrains.json

* Update Constants.kt

* Update Constants.kt

* Update NaturalWonderGenerator.kt

* Update Constants.kt

* Update NaturalWonderGenerator.kt

* Natural Wonders generation fixes.
 2021-09-13 20:49:46 +03:00
Xander Lenstra
33ce6a7f3e
Fixed crash from new piety policy (#5202) 2021-09-13 10:51:47 +03:00
ravignir
337ab6999a
Made camps buildable on jungles. (#5203) 2021-09-13 10:51:30 +03:00
Xander Lenstra
9c66154a44
Updated piety policy tree (#5195) 
* Added piety policy tree

* Misread an ability

* Fixed filter
 2021-09-12 21:48:28 +03:00
SomeTroglodyte
af20124e5d
Handle maps with invalid mapSize more gracefully (#5190) 
* Handle maps with invalid mapSize more gracefully

* Handle maps with invalid mapSize more gracefully - new game exception handling

* Handle maps with invalid mapSize more gracefully - moved version save init
 2021-09-12 19:15:21 +03:00
yairm210
70c3b4bd65 3.16.14 2021-09-11 23:18:35 +03:00
Yair Morgenstern
ac2ce8ada7
Translations update (#5184) 
* Update Polish.properties (#5180)

Translated names of:

- All religions
- Untranslated civilization names
- Some Leaders

Co-authored-by: PLynx <pawelrys2011@gmail.com>

* Update Spanish.properties (#5176)

I'm back

* Update Swedish.properties (#5163)

Translated the newly added lines

* Update Indonesian.properties (#5155)

* Update German translation (#5153)

* Update Italian.properties (#5148)

Co-authored-by: Xander Lenstra <71121390+xlenstra@users.noreply.github.com>
Co-authored-by: PLynx <pawelrys2011@gmail.com>
Co-authored-by: ArchDuque-Pancake <78449553+ArchDuque-Pancake@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-09-11 23:10:06 +03:00
SimonCeder
d59fe45f51
Proper implementation of pledge to protect (#5165) 
* penalties for attacking

* proper timers on penalties

* template.properties

* space

* Player can pick sides when protected civs attacked/bullied
Protect gives resting point 10 for influence

* correct string
 2021-09-11 21:10:45 +03:00
SimonCeder
83050c2b11
Militaristic city states can give unique unit; refactor city state initialization (#5147) 
* Pick unique unit for militaristic CS

* Provide unique unit when able

* refactor some code

* remove debug

* template.properties

* fix failing build

* Add variance to spawning rate, add ≈ to string, better formatting.
 2021-09-09 21:30:12 +03:00
SimonCeder
cbd3c2910e
Icons for city states (#5160) 
* Add city state icons

* Add the icons

* Get filename from cityStateType.name

* less padding

* Icon names in enum, icons in diplomacy screen
 2021-09-09 21:28:30 +03:00
Xander Lenstra
94fa48c4b5
Fix Civil Society policy (#5164) 2021-09-09 20:12:53 +03:00
SomeTroglodyte
38a545e9a6
An icon for BeliefType.Enhancer (#5159) 2021-09-09 20:06:20 +03:00
SomeTroglodyte
bebfe92fb1
Mod manager portrait and auto scroll (#5138) 
* Mod manager portrait mode

* Mod manager portrait and auto scroll

- MM switches to stacked expanders in portrait.
- Use AutoScrollPanes.
- Disable the enter/leave listener of AutoScrollPane in Pickers which disable the default ScrollPane to roll their own - helps all such pickers.
- No expander open/close persistence on purpose.
- PickerScreen a bit cleaned 'cuz I needed to understand something.
- Marked mods from the kill-list that are already installed.
- Button sync now OK when counterpart missing (deselects other column).

* Mod manager portrait - template
 2021-09-09 07:24:00 +03:00
Xander Lenstra
9c876ad84e
Wrote an extensive tutorial documenting most of religion (#5130) 
* Wrote an extensive tutorial documenting most of religion

* Fixed spelling and improved clarity

* Fixed typo (Thanks for noticing!)

* Reworded and split up tutorials, fixed grammer/spelling mistakes

* Added missing quote mark
 2021-09-09 06:22:43 +03:00
Xander Lenstra
9ff8435a21
Removed non-baserule mods from blacklist 2021-09-08 22:50:13 +02:00
yairm210
e81d8ff646 3.16.13 2021-09-08 23:06:10 +03:00
Yair Morgenstern
7c20edda43
Translations update (#5144) 
* Update Japanese.properties (#5132)

religion
tech

* Update Swedish.properties (#5112)

Translated the newly added lines.

* Update Italian.properties (#5106)

* Update Indonesian.properties (#5105)

* Update Greek.properties (#5104)

* Update Greek.properties

* Update Greek.properties

* Update Greek.properties

* Update Greek.properties

* Update Greek.properties

* Update German translation (#5100)

* Update German translation

* Update Germans translation

* Update German translation

* work on dutch translation (#5087)

* work on dutch translation

* translation fixes

Co-authored-by: yuracla <89312848+yuracla@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>
Co-authored-by: ASLST <89976348+ASLST@users.noreply.github.com>
Co-authored-by: MartinP <77325495+Mape6@users.noreply.github.com>
Co-authored-by: Inti Pelupessy <ipelupessy@users.noreply.github.com>
 2021-09-08 23:00:15 +03:00
Xander Lenstra
d247cacbca
Added "in other cities" as a cityFilter (#5131) 2021-09-08 21:41:57 +03:00
Xander Lenstra
3722fab38d
From the indstrial era onwards, things change in religion (#5095) 
* Improved redability

* From the industrial era onwards, religion goes into 'second phase'

* Fixed tests

* Fixed formula for buying great prophets starting from the industrial era

* Added `getMatchingUniques`, `hasUnique` to `IHasUniques`, cleaned up some code

* Fix compilation errors
 2021-09-08 21:24:26 +03:00
SomeTroglodyte
65695496f3
Greek flag (#5124) 2021-09-08 21:19:46 +03:00
SomeTroglodyte
e0fe788e28
Add a "Reset to defaults" button to the Newgame screen (#5141) 
* Add a reset to defaults button to the new game screen

* Add a reset to defaults button to the new game screen - template
 2021-09-08 20:46:18 +03:00
SimonCeder
2ca42a705f
Force ranking, bullying improvements (#5102) 
* Proper demand tribute thresholds

* Proper calculation for Force rankings

* debug strings

* use new force ranking for AI threatAssessment

* use new force ranking for AI threatAssessment, pt 2
 2021-09-06 15:50:39 +03:00
Xander Lenstra
486e2a7a8a
Deprecate all mods without an eras.json file (#4809) 
* Enforce the existence of an eras.json file for mods

* Merged `getEra()` and `getEraObject()`

* Hide mods we have deemed outdated

* Fixed compile errors that I didn't notice before

* Fixed unit tests
 2021-09-06 14:50:38 +03:00
SimonCeder
c7264556ea
City state intrusion anger (#5090) 
* move functions, greece UP

* CS influence from killing barbs

* Greece healing in CS territory

* move diplomacy bonuses into CityStateFunctions.kt

* Split filter in Battle.kt, nicer code
 2021-09-05 21:22:02 +03:00
yairm210
2474c6a635 Re-upgraded Kotlin to 1.5.30, and together with it - minSdk and source&target compatibility to 1.8. 
We've finally advanced to 2015 (when 1.7 was deprecated)
 2021-09-05 19:36:35 +03:00
Yair Morgenstern
3693311572
Fixed "space at end of translation" error 2021-09-05 17:51:31 +03:00
yairm210
6567088efe 3.16.12 2021-09-05 15:10:21 +03:00
Yair Morgenstern
3d272bc561
Translations update (#5093) 
* Update Indonesian.properties (#5086)

* Update Swedish.properties (#5078)

Translated the newly added lines.

* Create Greek.properties (#5069)

* Create Greek.properties

* Update Greek.properties

* Update Greek.properties

* Update Greek.properties

* Update Italian.properties (#5068)

* Update Italian.properties

* Update Italian.properties

Co-authored-by: kensvin <63847755+Kensvin28@users.noreply.github.com>
Co-authored-by: Alex25820 <50142558+Alex25820@users.noreply.github.com>
Co-authored-by: ASLST <89976348+ASLST@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
 2021-09-05 14:58:55 +03:00
yairm210
5170a27e07 Fixed crash where deleting mods meant you could never start a game again 
If the last game you created used a mod that you later removed from the the device it could never be removed from the new game parameters
Caught exceptions from quickstart failing
 2021-09-05 14:57:21 +03:00
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