Commit Graph

2654 Commits

Author SHA1 Message Date
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