Commit Graph

2442 Commits

Author SHA1 Message Date
yairm210
0d4da03b7c 3.18.7 2021-12-05 21:23:04 +02:00
Yair Morgenstern
72b51d41c7
Translations update (#5758)
* Update Russian.properties (#5755)

* Update Russian.properties

* Update Russian.properties

* Update indonesian.properties (#5747)

i translate # Requires translation! in bottom but i don't change anything else

* Update Italian.properties (#5743)

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

* Update German translation (#5741)

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

Co-authored-by: deqtodo <94169613+deqtodo@users.noreply.github.com>
Co-authored-by: canneling <84187828+canneling@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-12-05 20:55:28 +02:00
yairm210
9950e963bc Resolved #5742 - removed extraneous empty lines from translation files 2021-12-04 23:13:43 +02:00
Xander Lenstra
c60381f712
Reïnstated translations that were previously added in #4820, but reversed when 3.16.3 was released (#5746)
According to a Malay speaker in discord, this resolves several curse words and similar being removed from the translation. As #4820 also changed some 3700 other lines and the file hasn't been touched since, this should also improve the translation in other ways.
I am, however, not a Malay speaker, so I personally cannot vouch for the correctness of these translations.
Additionally, all lines that have been added since 3.16.3 to be translated, have been removed from this file, making the change seem larger than it really is.
2021-12-04 18:02:17 +02:00
yairm210
9edc713d5c 3.18.6 2021-12-03 11:33:18 +02:00
Yair Morgenstern
e054863bd8
Translations update (#5730)
* Update German translation (#5724)

* Update Swedish.properties (#5719)

* Update translation: Simplified Chinese (#5717)

* Update Italian.properties (#5712)

* Update Simplified_Chinese.properties (#5714)

* Update Simplified_Chinese.properties

* Update Simplified_Chinese.properties

* Update Russian.properties (#5735)

* Fixed niche bug that let you try and capture civilians in territory you can't enter

* Resolved #5713 - AI doesn't try attacking with non-attack units

* Update Russian.properties

* Update Russian.properties

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

* Update Brazilian_Portuguese.properties (#5734)

* Fixed niche bug that let you try and capture civilians in territory you can't enter

* Resolved #5713 - AI doesn't try attacking with non-attack units

* Fixed a bug where statue off Zeus would not work (#5732)

* Update Brazilian_Portuguese.properties

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

* Update pt-br (#5733)

* Fixed niche bug that let you try and capture civilians in territory you can't enter

* Resolved #5713 - AI doesn't try attacking with non-attack units

* Fixed a bug where statue off Zeus would not work (#5732)

* Update pt-br

From a brazilian developer that loves wath u doing

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

Co-authored-by: MartinP <77325495+Mape6@users.noreply.github.com>
Co-authored-by: SimonCeder <63475501+SimonCeder@users.noreply.github.com>
Co-authored-by: Zoron <fralonra@aliyun.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: wwwxxxzzz666 <2273204577@qq.com>
Co-authored-by: deqtodo <94169613+deqtodo@users.noreply.github.com>
Co-authored-by: Samuel Barbosa <79980951+SamuelBarbosa0042@users.noreply.github.com>
Co-authored-by: Xander Lenstra <71121390+xlenstra@users.noreply.github.com>
2021-12-03 10:16:30 +02:00
itanasi
7f07bcb9e5
Recycling center (#5738)
* Add support to UniqueType.MaxNumberBuilding (including rejectionReasons)
Add Recycling Center entry to JSON
Need Graphical Icon

* Fix typo
Add TODO

* adding Recycling Center icon

* Credit update for icon
Rephrase Rejection text
Updated .atlas and .png
Add code to block showing Recycling Center

* Fix using placeholderText
Set shouldShow to True so iot still appears while under construction but not completed

* Rejection Text now working
Remove debug prints

* Remove odd extra lines

* extra lines

* Remove excessive if statement in shouldBeDisplayed
Reword text. Unique can apply to Buildings and Units
Refactor Signature since not just Buildings

* Adding code to remove building in transferred city

Co-authored-by: temurakami <spellman23@gmail.com>
2021-12-03 10:15:51 +02:00
will-ca
8060b69378
Center Agriculture in Tech tree. (#5736)
* Update Techs.json

* Update Techs.json
2021-11-30 19:01:06 +02:00
Xander Lenstra
06dd395efb
Fixed a bug where statue off Zeus would not work (#5732) 2021-11-30 14:42:19 +02:00
will-ca
f86b765d38
Show which cities are missing required buildings for National Wonders. (#5718) 2021-11-29 15:57:36 +02:00
yairm210
84e600786c 3.18.5 2021-11-27 20:08:47 +02:00
Yair Morgenstern
7ca1222678
Translations update (#5711)
* Update Russian.properties (#5708)

* Update Russian.properties

* Update Russian.properties

* Update Russian.properties

* Update German translation (#5706)

Co-authored-by: deqtodo <94169613+deqtodo@users.noreply.github.com>
Co-authored-by: MartinP <77325495+Mape6@users.noreply.github.com>
2021-11-27 20:03:31 +02:00
SpacedOutChicken
79f7319a31
Stop putting Wonders as start buildings (#5710)
This will stop the adding of Wonders as starting buildings in the Future era
2021-11-27 20:01:05 +02:00
SimonCeder
10686d1d8f
We Love The King Day (#5705)
* we love the king day

* AI improvements

* Don't break old saves

* unused import

* tutorial

* proper growth when unhappy

* reviews
2021-11-27 19:59:19 +02:00
yairm210
ce158d0c44 Fixed terrace farms not improving with Civil Service and Fertilizer techs 2021-11-24 18:43:19 +02:00
SimonCeder
2dd4415977
Counteroffer mechanic, updated trade valuations (#5702)
* counteroffer mechanic

* string template

* string template

* AI always counteroffers if able
2021-11-23 13:00:30 +02:00
itanasi
b72a2c3ebb
Make Guided Missile Free (and Maintenance overhaul) (#5698)
* Add new UniqueType.NoMaintenance to support Guided Missile

* revert gradle
Add UnitMaintenanceDiscount
Rename UnitMaintenanceDiscount->UnitMaintenanceDiscountGlobal
Rework maintenance equation to account for overlapping reductions
Add maintenance variable to MapUnit

* Add square brackets in string (apparently didn't check in?)
More robust uniques check code so not assuming only one matching unique
Use toPercent()

* Proper toPercent() math

Co-authored-by: temurakami <spellman23@gmail.com>
2021-11-22 18:21:34 +02:00
yairm210
29dfb3b20d 3.18.4 2021-11-21 21:14:42 +02:00
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
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