Commit Graph

3094 Commits

Author SHA1 Message Date
deqtodo
62bcc33250
Update Russian.properties (#5699)
* Update Russian.properties

* Update Russian.properties
2021-11-21 21:10:31 +02:00
Giuseppe D'Addio
0afb5358a3
Update Italian.properties (#5693) 2021-11-21 21:10:18 +02:00
yairm210
8ddbe3b2b7 3.18.3 2021-11-19 12:13:23 +02:00
SimonCeder
891ef5b0f1
Update Swedish.properties (#5684) 2021-11-19 12:02:35 +02:00
deqtodo
db191acd73
Update Russian.properties (#5687)
* Update Russian.properties

* Update Russian.properties

* Update Russian.properties
2021-11-19 12:02:20 +02:00
Xander Lenstra
defa25f254
Updated vanilla policies and fixed a few oversights from G&K policies (#5681) 2021-11-15 18:38:49 +02:00
Xander Lenstra
b195f0b92c
Removed the religions file and favoured religions from the vanilla ruleset (#5682) 2021-11-15 15:35:45 +02:00
yairm210
38bffb6225 3.18.2 2021-11-14 21:36:03 +02:00
Yair Morgenstern
3e04950b9b
Translations update (#5676)
* Update Ukrainian.properties (#5669)

* Update Ukrainian.properties

* Update Ukrainian.properties

* Update Ukrainian.properties

* Update Ukrainian.properties

* Update Ukrainian.properties

* Update Indonesian.properties (#5667)

* Update Indonesian.properties

* Update Indonesian.properties

* Update Italian.properties (#5666)

* Update Italian.properties

* Update Italian.properties

Co-authored-by: Marerjh <40261003+Marerjh@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-11-14 20:30:44 +02:00
yairm210
eefe499fff 3.18.1 2021-11-12 00:35:57 +02:00
yairm210
57c033ff34 More error handling for out of memory errors 2021-11-12 00:19:52 +02:00
Yair Morgenstern
c45b6c8f7a
Translations update (#5665)
* Update Swedish.properties (#5661)

* Update Russian.properties (#5660)

* Update Russian.properties

* Fix translation

* Update German translation (#5659)

* Update Indonesian.properties (#5655)

* Update Indonesian.properties

* Update Indonesian.properties

* Update Italian.properties (#5653)

* Update Italian.properties

* Update Italian.properties

Co-authored-by: SimonCeder <63475501+SimonCeder@users.noreply.github.com>
Co-authored-by: AlimovAR <82767510+AlimovAR@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-11-12 00:16:08 +02:00
SimonCeder
e4f686964e
Regions part 2 - City state placements, start normalization (#5663)
* start position normalization

* assignLuxuries

* City states placement

* city state normalization

* don't consider tiny islands

* also modify the other json since they are duplicated now
2021-11-11 12:11:48 +02:00
Xander Lenstra
003f2434c1
Differentiating Vanilla & G&K (#5654)
* Fixed tests checking for mod correctness

* Update G&K jsons to current vanilla versions

* First pass over buildings & beliefs

* First pass over nations

* First pass over eras.json

* Fully updated tech tree

* First pass over units

* Second pass over buildings -- fixed techs

* Fixed last prerequisites and row numbers of tech

* Went through the entire tech tree and moved things to their correct spot

* Fixed tests
2021-11-09 06:23:30 +02:00
Xander Lenstra
ac2bc3a404
Second version of G&K / vanilla split (#5647)
* Copied files for Gods & Kings folder

* Added G&K and unified with mods in dropdown

* Split the baseruleset from the mods list in game parameters

* Mod links are checked again when selecting a mod

* The new map editor screen now also uses the base ruleset

* Updated the ruleset change dialog in the map editor; Fixed a crash

* Refactored some code and fixed some bugs
2021-11-08 22:57:09 +02:00
Xander Lenstra
2250d75b4c
Removed a wrongly implemented BNW-only building (#5649) 2021-11-08 22:14:27 +02:00
yairm210
de83383c8b 3.18.0 2021-11-08 19:52:09 +02:00
Yair Morgenstern
8ffd64a71c
Translations update (#5648)
* Update German translation (#5646)

* Update Russian.properties (#5644)

* Update Russian.properties

* Update Russian.properties

* Update Ukrainian.properties (#5638)

* Update Ukrainian.properties

* Update Ukrainian.properties

* Update Ukrainian.properties

* Update Ukrainian.properties

* Update Ukrainian.properties

* Update Swedish.properties (#5635)

* Update Indonesian.properties (#5628)

* Update Italian.properties (#5627)

Co-authored-by: MartinP <77325495+Mape6@users.noreply.github.com>
Co-authored-by: AlimovAR <82767510+AlimovAR@users.noreply.github.com>
Co-authored-by: Marerjh <40261003+Marerjh@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-11-08 19:36:24 +02:00
SimonCeder
09c40002f0
Regions part 1 - subdivide generated maps into regions, and use to place civs (#5556)
* json definitions

* create regions, define region types

* count terrains

* terrain qualities

* tilesInRectangle

* use even q coords

* major civ start locations

* move to separate file

* remove printlns

* unused imports

* strings

* strings

* reviews

* conditionalize qualities

* guess qualities of terrain types without explicit definitions

* guess qualities of terrain types without explicit definitions

* Update template.properties

* Update template.properties

* add HideInCivilopedia to technical uniques

* reviews
2021-11-05 07:59:48 +02:00
SimonCeder
010931ca42
Bombard notification (#5637)
* add notification when able to bombard

* harmonize with enemy unit notification

* use city.range
2021-11-04 18:36:50 +02:00
SimonCeder
0a0881d5bd
Quest fixes (#5629)
* quest fixes

* strings

* better placeholder for competitions
2021-11-03 13:59:13 +02:00
yairm210
8f216b3662 3.17.14 2021-11-02 18:17:20 +02:00
Yair Morgenstern
1ca17fb3a7
Translations update (#5626)
* Update translation: Simplified Chinese (#5624)

* Update Swedish.properties (#5622)

* Update Ukrainian.properties (#5621)

* Update Ukrainian.properties

* Update Ukrainian.properties

* Update German translation (#5620)

* Update German translation

* Update German translation

* Update Italian.properties (#5611)

* Update Italian.properties

* Update Italian.properties

Co-authored-by: Zoron <fralonra@aliyun.com>
Co-authored-by: SimonCeder <63475501+SimonCeder@users.noreply.github.com>
Co-authored-by: Marerjh <40261003+Marerjh@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-11-02 17:52:07 +02:00
logic
f53435e612
Made rich presence text not change with language (#5613)
* update for no reason

* bruuhhhhhhhhh

* bruuhhhhhhhhh

* rebase... this probably wont work

* bruuhhhhhhhhh

* fix comments..?

* bruuhhhhhhhhh

* equalize with upstream/master

* made the game not change the text shown in rich presence with the current language, added a language override functionality to String.tr() which is probably inefficient as hell, also the reason why i had to keep the .tr in leader name is because it showed the parantheses

* i have no idea why github or git keeps bugging me on this but this line randomly appears then disappears

* i have no idea why github or git keeps bugging me on this but this line randomly appears then disappears

* revert changes to .tr(), use what @yairm210 suggested
2021-11-02 17:24:37 +02:00
yairm210
405c561d5e Replaced "Map Height" with "Map Elevation" 2021-10-31 23:15:42 +02:00
Xander Lenstra
53a0c9b248
Reworked buying buildings & units with stats a bit (#5618)
* Reworked buying buildings & units with stats a bit

* Reviews
2021-10-31 17:59:13 +02:00
Xander Lenstra
045b52c935
Fixed a bug where hagia sophia could be build in non-faith games (#5617) 2021-10-31 14:00:24 +02:00
yairm210
c8f2d337c3 3.17.13 2021-10-30 20:41:59 +03:00
Yair Morgenstern
e53d611f4a
Translations update (#5610)
* Update translation: Simplified Chinese (#5606)

* The currently missing german lines (#5596)

* Update Indonesian.properties (#5595)

* Update Italian.properties (#5575)

* Update Swedish.properties (#5574)

Co-authored-by: Zoron <zoronlivingston@gmail.com>
Co-authored-by: SomeTroglodyte <63000004+SomeTroglodyte@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-30 20:33:21 +03:00
Yair Morgenstern
860e788fb5
Separate unit automation (#5592)
* Should resolve #5534 and the long-standing request of "move after automate" by separating the automated movement from the actual end of turn

* Added translation

* Automated units move in a separate thread to avoid UI freezing
2021-10-30 19:02:43 +03:00
SimonCeder
bfe0b68ab8
Barbarian units (#5589)
* barbarian unique units; barbarian blacklisted units

* credits

* barbarian units do not take resources

* ai fix
2021-10-29 13:33:11 +03:00
Xander Lenstra
4c053ddc99
Revert "Splitting of vanilla and gods & kings rulesets -- Part 1: Groundwork (#5577)" (#5585)
This reverts commit db6e588479.
2021-10-28 22:01:06 +03:00
Xander Lenstra
db6e588479
Splitting of vanilla and gods & kings rulesets -- Part 1: Groundwork (#5577)
* Copied files for Gods & Kings folder

* Added G&K and unified with mods in dropdown
2021-10-28 18:02:30 +03:00
yairm210
87d24e89c4 3.17.12 2021-10-27 21:23:20 +03:00
Yair Morgenstern
4466de9899
Translations update (#5572)
* Update Brazilian_Portuguese.properties (#5564)

* Update Italian.properties (#5551)

* Update French Translation (#5538)

* Update French Translation

* Update French.properties

* Filipino.properties (#5331)

* Filipino.properties

Sorry if I was not able to continue this. I will try to continue it now.

* Updated Version

I'll continue editing this whenever I have spare time.

* Update 2

Co-authored-by: PredoTop <93168287+PredoTop@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: Gloadonix <56483221+Gloadonix@users.noreply.github.com>
Co-authored-by: SunnySunset <88270612+SunnySunset@users.noreply.github.com>
2021-10-27 21:19:52 +03:00
yairm210
bc0db35077 Resolved #5571 - text-fix to "four victory types" 2021-10-27 21:16:38 +03:00
SimonCeder
446c3fb97a
Conquistadors only settle other continents (#5566)
* conquistadors only settle other continents

* make it a conditional
2021-10-27 07:08:23 +03:00
Xander Lenstra
33956673f5
Added information on the changed victory types (#5568) 2021-10-26 18:31:12 +03:00
Xander Lenstra
693cf97849
Made some improvements to the religion UI (#5561)
* Made some improvements to the religion UI

* Added translatable strings

* Added some pretty colors - code based on code provided by SomeTroglodyte way back

* I hate spaces

* Moar colourz
2021-10-26 09:01:00 +03:00
Xander Lenstra
5d9c1266d7
Fixed ruins having two faith bonuses that could apply at the same time (#5545)
* Fixed ruins having two faith bonuses that could apply at the same time

* Added turn restrictions on ruins
2021-10-25 19:09:39 +03:00
Colin Vanden Heuvel
4c19347a89
Provide more information to waiting players in multiplayer (#5508)
* Add some very small Quality-of-Life improvements for multiplayer games

- GameInfo.kt
 - Add timestamp for the start of the last turn to save info, hopefully
   this will enable a multiplayer turn timer in the near future

- MultiplayerScreen.kt
 - Current turn indicator for multiplayer games now shows for how long it
   has been the current player's turn.

- WorldScreen.kt
 - Next Turn Action will display which player we are waiting for rather
   than the generic "Waiting for other players..."

* Update text for translations and add better elapsed times

template.properties
- Add translation templates for waiting turn information

German.properties
- Provide German translation for waiting turn info

Japanese.properties
- Provide Japanese translation for waiting turn info

MultiplayerScreen.kt
- Add translation brackets for waiting turn info
- Add a function which determines whether to represent
  elapsed time in Minutes, Hours, or Days (and does so)

WorldScreen.kt
- Add translation brackets for waiting turn info

* Fix line translated endings as per request

MultiplayerScreen.kt
- Translation for the "Last refresh:/Current Turn:" display no longer
  includes line endings
- "Last refresh:/Current Turn:" display now uses LF line endings only

* Show generic "Waiting for" message in single player

WorldScreen.kt
- Place an additional condition for getNextTurnAction which selects the
  generic "Waiting for" message in single player and the civ-specific
  one in multiplayer

Co-authored-by: Colin S. Vanden Heuvel <colin.vandenheuvel@wisc.edu>
2021-10-25 19:09:03 +03:00
Yair Morgenstern
8e9b7026c0
Translations update (#5543)
* Update Swedish.properties (#5541)

* Update Simplified_Chinese.properties (#5539)

* Update Simplified_Chinese.properties

* Update Simplified_Chinese.properties

* Update German translation (#5531)

* Update German translation

* Update German translation

* Update German translation

* Update German translation

* Update Indonesian.properties (#5529)

* Update dutch translation (#5550)

* work on dutch translation

* fix missing placeholder

* fix incomplete string translation

Co-authored-by: SimonCeder <63475501+SimonCeder@users.noreply.github.com>
Co-authored-by: CrispyXYZ <64761703+CrispyXYZ@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: Inti Pelupessy <ipelupessy@users.noreply.github.com>
2021-10-24 20:51:13 +03:00
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