Commit Graph

4528 Commits

Author SHA1 Message Date
SomeTroglodyte
816e542e1c
Notifications not scrollable far enough after in-turn notifications got added (#6796) 2022-05-14 23:19:02 +03:00
Yair Morgenstern
e94d109166 4.0.16 2022-05-13 13:00:20 +03:00
Yair Morgenstern
66abc2f779
Version rollout (#6789)
* Bump version and create initial changelog entry

* Update Russian.properties (#6787)

* Update Russian.properties

* Fix translation

* Update Spanish.properties (#6782)

511 - Yes, the double space is intentional

* Add Fastlane_short_description translations (#6781)

Also added Civ V - Vanilla and Civ V - Gods and Kings translation.

* Update German translation (#6778)

* Update French.properties (#6769)

* Update Indonesian.properties (#6768)

* Update Simplified_Chinese.properties (#6766)

* Update Simplified_Chinese.properties

* Make 2 translation together (#1)

* Fetch the latest update
* Update Simplified_Chinese.properties

Correct language defects and ambiguities and fill in gaps

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

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

* Update Italian.properties (#6765)

* Update Korean.properties (#6754)

* Update Korean.properties

* Update Korean.properties

* Update Korean.properties

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

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: deqtodo <94169613+deqtodo@users.noreply.github.com>
Co-authored-by: Caballero Arepa <78449553+ArchDuque-Pancake@users.noreply.github.com>
Co-authored-by: nilleh <72703236+niltok64@users.noreply.github.com>
Co-authored-by: MartinP <77325495+Mape6@users.noreply.github.com>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
Co-authored-by: kensvin <63847755+Kensvin28@users.noreply.github.com>
Co-authored-by: heipizhu4 <100454479+heipizhu4@users.noreply.github.com>
Co-authored-by: Xander Lenstra <71121390+xlenstra@users.noreply.github.com>
Co-authored-by: xk730 <40309144+xk730@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: Auvergne <97716654+ARPD-release@users.noreply.github.com>
2022-05-13 12:52:53 +03:00
SomeTroglodyte
345ca0ec25
Pedia from mainmenu (#6788)
* Make Civilopedia independent of worldScreen or gameInfo

* Make Civilopedia callable from Main Menu

* Era category for Civilopedia

* Era category for Civilopedia - atlas
2022-05-13 12:36:06 +03:00
Leonard Günther
09b4e82589
Rate limit handling for Dropbox (#6416)
* Added rate limit handling to dropbox

+ some refactor to make the whole file one object

* Added error messages on rate limit reached

+ refactored some popup code to reduce repetition

* Fixed merge error

* Made variables private

* Fixed file upload not working

because of missing override flag for dropbox

* Stop multiplayer refresher if rate limit reached

* Fixed typo

* Various code changes/fixes

- ErrorResponse var name has to be `error` because that's how DropBox's json property is named
- Change FileStorageRateLimitReached exception to store the seconds remaining as its own property instead of in the message
- Use toIntOrNull to avoid setting defaults in two places

* Fixed missed exception message

Co-authored-by: Azzurite <azzurite@gmail.com>
2022-05-13 09:16:52 +03:00
Yair Morgenstern
3e63be5376 4.0.15-patch1
Extra images fixed and HexaRealm added :)
2022-05-11 17:58:30 +03:00
The Bucketeer
e9ffe7667c
Proposal to add the current HexaRealm tileset as the built-in tileset. (for serious this time.) (#6756)
* Create posh

* HexaRealm tile sprites upload (part 1)

* HexaRealm tile sprites upload (part2)

* HexaRealm tile sprites upload (part 3)

* Upload HexaRealm.json

Should have no problem in terms of most of the layering!

* Delete posh

* Delete bana.png
2022-05-11 17:34:46 +03:00
Yair Morgenstern
cd002699f3 4.0.15 2022-05-11 17:22:31 +03:00
Yair Morgenstern
97b8bd106a
Version rollout (#6762)
* Bump version and create initial changelog entry

* Update Simplified_Chinese.properties (#6753)

Correct some translation errors

* Update Romanian.properties (#6748)

* 1

* 2 - most city names don't have a translation

* 3 - more cities

* Update Turkish.properties (#6746)

* Update French.properties (#6738)

* Update Italian.properties (#6734)

* Update Indonesian.properties (#6733)

* Update German translation (#6732)

* Update Filipino.properties (#6729)

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: xk730 <40309144+xk730@users.noreply.github.com>
Co-authored-by: alexban011 <alexban011@gmail.com>
Co-authored-by: omerfaruk-cakmak <32402595+omerfaruk-cakmak@users.noreply.github.com>
Co-authored-by: Ouaz <Ouaz@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: Shann Aurelle Ripalda <shannaurelleg@gmail.com>
2022-05-11 17:05:17 +03:00
alexban011
dc8dadfcab
Fixed proxy issues when starting a new multiplayer game (#6757)
* vpn/proxy issues when creating new mp game

replaced redundant ping with opening a connection to dropbox to fix the proxy issue

* updated error message to include dropbox

* check multiplayerServer url if the user is playing on it

* use `https://content.dropboxapi.com` instead of `https://www.dropbox.com`

* fixed proxy issues on android

if connected to proxy but no internet access it will freeze for a couple seconds (until it finishes the for loop) but it works

* forgot to add the imports

* removed android sdk network check to fix proxy issues

* check for internet now separate from check for multiplayerServer
removed frunctions from PlatformSpecificHelpers__

* added improvements made by touhidurrr

* removed unused imports and replaced setter with property access syntax

Co-authored-by: Md. Touhidur Rahman <46617994+touhidurrr@users.noreply.github.com>
2022-05-11 16:58:20 +03:00
Yair Morgenstern
e348a20d2e Extracted policies, religions, nations and promotions to separate png files in order to fit HexaRealm tileset into the main file - see #6756 2022-05-11 16:57:39 +03:00
SomeTroglodyte
eb5e8ae226
Switchable gzipping of saved games (#6735)
* Switchable gzipping of saved games

* Switchable gzipping of saved games - consensus says default off
2022-05-11 16:23:11 +03:00
Xander Lenstra
8fcfbf752b
Improved clarity and moddability of building improvements (#6712)
* Renamed tile.hasUnique, deprecated `Indestructable`, unique for citadels
Also refactored the consumption of (great) people out of UnitActions.

* Reworked when improvements can be build somewhere for more clarity

* Made resources improvable by multiple improvements; Offshore Platform

* Fix compatability

* WIP

* Fixed the tests, but better

* I suppose I might as well update this now that we're a version later
2022-05-11 00:35:21 +02:00
SomeTroglodyte
7b4833741d
Fix missing translatables, again (#6705) 2022-05-11 00:21:38 +03:00
Yair Morgenstern
ba96bea556 4.0.14 2022-05-08 21:42:19 +03:00
Yair Morgenstern
4fe775c0f5
Version rollout (#6726)
* Bump version and create initial changelog entry

* Update Filipino.properties (#6714)

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Romanian.properties (#6713)

* Fixed issue #6649 by checking for internet connection before starting the game if "online multiplayer" is selected
Many thanks to @SomeTroglodyte for most of the code and for explanations

* Revert "Fixed issue #6649 by checking for internet connection before starting the game if "online multiplayer" is selected"

This reverts commit bae7d7c07f.

* some translations

* merging with 4.0.13

* fixed a little error

* fixed github check error

* Update German translation (#6710)

* Update German translation

* Update German translation

* Update German translation

* Update Italian.properties (#6708)

* Update French.properties (#6697)

* Update French.properties

* Update French.properties to 4.0.13

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: Shann Aurelle Ripalda <shannaurelleg@gmail.com>
Co-authored-by: alexban011 <alexban011@gmail.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: Ouaz <Ouaz@users.noreply.github.com>
2022-05-08 21:29:33 +03:00
SomeTroglodyte
3ea9c6503b
Font choice rework (#6670)
* Font choice rework

* Font choice rework - naming

* Font choice rework - fix default font selection
2022-05-08 21:22:23 +03:00
SomeTroglodyte
4b7edca7a8
Rework of the "Creates improvement on a specific tile" Unique (#6687)
* Make Citadel tile takeover a unique

* CreatesOneImprovement unique overhaul step 1

* CreatesOneImprovement unique overhaul - increase highlights alpha

* Fix missing translatables, again

* CreatesOneImprovement unique overhaul - review suggestions

Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
2022-05-08 21:22:01 +03:00
Jack Rainy
d00b72806b
Leftovers from previous PRs (#6725)
* Leftovers from #6698

* Leftovers from #6718

* Better naming
2022-05-08 21:19:55 +03:00
Timo T
86d5011da1
In-depth serialization improvement, fixes Barbarian Camps revealed by Honor not showing immediately in multiplayer
* Fix Barbarian Camp Spawned notification not revealing the camp on the map in multiplayer

* Fix lastSeenImprovement not being cloned

* Use HashMapVector2 in BarbarianManager

* Fix value not having its class written out for proper deserializing

* Refactor: various code improvements
2022-05-08 12:35:41 +02:00
Yair Morgenstern
806d58074c 4.0.13 2022-05-06 10:15:38 +03:00
Yair Morgenstern
621099b315
Version rollout (#6707)
* Bump version and create initial changelog entry

* Update Filipino.properties (#6703)

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Italian.properties (#6693)

* Update German translation (#6691)

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: Shann Aurelle Ripalda <shannaurelleg@gmail.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: MartinP <77325495+Mape6@users.noreply.github.com>
2022-05-06 10:07:20 +03:00
Ouaz
822ce5e041
Update healing values in "Injured Units" article (#6704)
- Based on merged commit "Healing parity" (c8be00b)
2022-05-05 21:07:11 +02:00
letstalkaboutdune
035b6528a7
New Demographics Scoreboard (#6645)
* Healing parity

Adjusted healing values for parity with CV

* New Demographics system for victory screen rankings

Added a new game setup checkbox option to use a ranking system on the victory screen which is more in line with the Civ V Demographics window. Created the UI element and game parameter but the demographics screen still needs to be implemented.

Also removed unnecessary comments from adjustments to healing values in a previous update.

* Demographics table init

Beginning to build structure of Demographics rankings table.

* Update VictoryScreen.kt

Attempt at getting more of the Demographics table implemented

* Update VictoryScreen.kt

Continued building the structure of the Demographics table

* Demographics first implementation

Finished first pass of Demographics screen.

* Minor text formatting

Improved some text formatting in code and comments.

* Update MapUnit.kt

Minor comment cleanup.

* SomeTroglodyte's Feedback, pt. 1

Implemented feedback given by SomeTroglodyte in PR #6645.

* Organized into functions

Split up Rankings table creation and Demographics table creation into new functions

* Update template.properties

Fixed missing space.

* Implementing more PR #6645 feedback

Added needed translation templates, used enum class instead of array for headers, moved checkbox to Options -> Display instead of new game

* Implemented rest of PR #6645 feedback

Simplified logic for finding player's rank, value, best/worst civ value, and filtered out defeated civs from the display and calculations

* Dead Civs get 0 in all categories

Added simple check if a civ is dead when computing score. If they are dead then they get 0 and go to the bottom of the scoreboard.

* Update VictoryScreen.kt

Further cleaned up code for better reuse and simpler logic with fewer loops.

* Update CivilizationInfo.kt

Simplified implementation of return 0 for stats when civ is defeated.

* Update CivilizationInfo.kt

Removed commented-out line of code.

* Fixed duplicate rank bug

Adjusted method of determining best and worst civs so that duplicates don't occur.

* Update VictoryScreen.kt

One-lined the handling of logic in buildDemographicsTable()

* Update VictoryScreen.kt

Moved static header row to new function.
2022-05-05 14:42:35 +02:00
MartinP
342367c72c
Fix typo in new translation line (#6692) 2022-05-05 01:23:22 +03:00
Yair Morgenstern
760aace923 4.0.12 2022-05-04 10:56:17 +03:00
Yair Morgenstern
204d80fbe2
Version rollout (#6689)
* Bump version and create initial changelog entry

* Rework German descriptions for F-Droid (#6688)

* Update French.properties (#6678)

* Update German translation (#6674)

* Update Traditional_Chinese.properties (#6673)

* Update Indonesian.properties (#6663)

* Update Simplified_Chinese.properties (#6660)

* Update Simplified_Chinese.properties

* Fix errors

I wonder who translated 'wonder ' into “奇迹”. I bet he/she used machine translating. Pretty annoying

* Update Simplified_Chinese.properties

* Update Simplified_Chinese.properties

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: MartinP <77325495+Mape6@users.noreply.github.com>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
Co-authored-by: Chia-Hung Ni <jameseses@gmail.com>
Co-authored-by: kensvin <63847755+Kensvin28@users.noreply.github.com>
Co-authored-by: heipizhu4 <100454479+heipizhu4@users.noreply.github.com>
2022-05-04 10:48:41 +03:00
SomeTroglodyte
cec9975b4d
Implement fastlane step 2: Translating (#6643)
* Implement fastlane step 2: Translating

* Placing the Font family Label before the Thread is nicer
2022-05-03 09:16:22 +02:00
heipizhu4
0d80929945
Make 'Followers of this religion" translatable (#6662)
First time editing the template. Is this the correct way to do so?
2022-05-03 08:07:41 +03:00
SomeTroglodyte
515c9bbcae
Show available resources from CityScreen (bottom right info only) (#6667) 2022-05-03 07:59:42 +03:00
Xander Lenstra
c55b14eaa7
Implemented most easy things from comments on moddable victory PR (#6600)
* Implemented most easy things from comments on moddable victory PR
Also added religious victory condition

* Fixed tests

* Fixed compile problems & missing string

* Fixed typo
2022-05-03 07:56:24 +03:00
SomeTroglodyte
345114ed93
Unciv Adaptive Android Icon (#6672)
* Use both icon and roundIcon properties

* Studio-generated Android Icon

* Studio-generated Android Icon to fastlane

Co-authored-by: JackRainy <JackRainy@users.noreply.github.com>
2022-05-03 07:55:55 +03:00
alexban011
898b1ca056
check for internet before starting a mp game to avoid freeze (#6679)
* Fixed issue #6649 by checking for internet connection before starting the game if "online multiplayer" is selected
Many thanks to SomeTroglodyte for most of the code and for explanations

* check for internet before starting a mp game to avoid freeze

Fixed issue #6649 by checking for internet connection before starting the game if "online multiplayer" is selected.

Many thanks to SomeTroglodyte for most of the code and for explanations. A slight modification has been done to the code to catch an error caused by InetAddress

* Revert "Merge remote-tracking branch 'origin/master-noInternet' into master-noInternet"

This reverts commit bd6474b50d, reversing
changes made to f52ad60b51.
2022-05-02 23:41:08 +02:00
Yair Morgenstern
3eb3324848 4.0.11 2022-05-01 00:23:18 +03:00
Yair Morgenstern
058a3e8211
Version rollout (#6658)
* Bump version and create initial changelog entry

* Update Filipino.properties (#6655)

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update French.properties (#6642)

* Update Italian.properties (#6629)

* Update Simplified_Chinese.properties (#6628)

* Update Simplified_Chinese.properties

* Update Simplified_Chinese.properties

* Update Indonesian.properties (#6626)

* Update Indonesian.properties

* Update Indonesian.properties

* Update Indonesian.properties

* Update Indonesian.properties

* Update German translation (#6625)

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: Shann Aurelle Ripalda <shannaurelleg@gmail.com>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: heipizhu4 <100454479+heipizhu4@users.noreply.github.com>
Co-authored-by: kensvin <63847755+Kensvin28@users.noreply.github.com>
Co-authored-by: MartinP <77325495+Mape6@users.noreply.github.com>
2022-05-01 00:17:32 +03:00
SomeTroglodyte
52586a2101
Map editor2.2 (#6641)
* Readability overloads for `getComplexRuleset`

* Enable loading maps containing missing ruleset objects with fix and message

* Fix bungled `noMapsAvailable` and follow minor criticism
2022-04-30 23:58:03 +03:00
Yair Morgenstern
3d9a53329e 4.0.10 2022-04-27 09:23:45 +03:00
Yair Morgenstern
0a6bdaa54d
Version rollout (#6624)
* Bump version and create initial changelog entry

* Update translation for Simplified_Chinese (#6616)

* Update Simplified_Chinese.properties

* Fix errors in Simplified_Chinsese translation

Including several accidentally deleted space & add 2 translation

* Update French.properties (#6607)

* Update French.properties

* Fix placeholder

* Update Spanish.properties (#6605)

* Update Italian.properties (#6603)

* Update German translation (#6598)

* Update German translation

* Update German translation

* Update German translation

* Update Filipino.properties (#6595)

* Update Filipino.properties

* Update Filipino.properties

* Translations for the Ukrainian language (#6593)

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: heipizhu4 <100454479+heipizhu4@users.noreply.github.com>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
Co-authored-by: Caballero Arepa <78449553+ArchDuque-Pancake@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: Shann Aurelle Ripalda <shannaurelleg@gmail.com>
Co-authored-by: Jack Rainy <JackRainy@users.noreply.github.com>
2022-04-27 09:19:11 +03:00
SomeTroglodyte
8891883998
Resources UI (#6596)
* More info for Resources in Civilopedia

* Remove duplicates for Resource requirements in Civilopedia

* Resource overview link resource label to Civilopedia

* Resource overview stay if clicking can't notify (resources not existing on map)

* Resource overview display of resources produced by buildings
2022-04-27 09:15:49 +03:00
Xander Lenstra
933e769d8e
Changed milestone build globally text to make it more understandable (#6613)
* Changed milestone build globally text to make it more understandable

* Actually this is probably just as clear, gramatically more correct and
more imperative like the other milestones

* Fixed tests

* Reworded again
2022-04-27 09:15:33 +03:00
SomeTroglodyte
996c58e1fb
Some improvements to Map Editor - step 1 (#6622) 2022-04-27 08:19:04 +03:00
Md. Touhidur Rahman
c23387981a
Fix typo in vanilla (#6621)
https://yairm210.github.io/Unciv/Modders/uniques/
2022-04-26 22:37:14 +03:00
MartinP
00b1feb2c2
Added missing "s" (#6599) 2022-04-25 23:13:01 +03:00
Yair Morgenstern
0792d58434 4.0.9 2022-04-24 23:00:59 +03:00
Yair Morgenstern
6b2629c5b9
Version rollout (#6592)
* Bump version and create initial changelog entry

* Update Turkish.properties (#6591)

* Update French.properties (#6581)

* Translations for Ukrainian language (#6580)

* Translations for Ukrainian language

* Revert of accidental renaming of the placeholder

* Additional translations

* More additional translations

* Simplified_Chinese translation update  (#6578)

* translation update 4.0.8 part1

* Simplified_Chinsese translation 4.0.8 part2

* Update Simplified_Chinese.properties

Fix errors

* Update Spanish.properties (#6574)

* Update German translation (#6573)

* Update Filipino.properties (#6572)

* Update Italian.properties (#6571)

* Update Italian.properties

* Update Italian.properties

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: BerAfk <98158661+BerAfk@users.noreply.github.com>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
Co-authored-by: Jack Rainy <JackRainy@users.noreply.github.com>
Co-authored-by: heipizhu4 <100454479+heipizhu4@users.noreply.github.com>
Co-authored-by: Caballero Arepa <78449553+ArchDuque-Pancake@users.noreply.github.com>
Co-authored-by: MartinP <77325495+Mape6@users.noreply.github.com>
Co-authored-by: Shann Aurelle Ripalda <shannaurelleg@gmail.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
2022-04-24 22:54:47 +03:00
Xander Lenstra
34105efdda
Moddable victories (#6161)
* Added a moddable (but not yet functional) file for victories

* Spaceship parts are units now

* Fixed tests

* Added milestone objects

* Made 'our status' table in VictoryScreen dependend on file

* Updated VictoryManager to use the new Milestone system

* Fixed bug where in vanilla too many spaceship parts could beb uild

* Whoops

* Updated global victory table to use the jsons

* Updated the new game screen to show the new victory types
Also started with the deprecation of VictorType

* Did some translation stuff, also finally fixed the tests

* Removed VictoryType and reworked AI to use Milestones instead

* Add some checks for the victory file; tested that custom victories work
Also moves some code to a better spot and fixes compilation errors

* Fixed some things I thought about while falling asleep
Most notably: built -> build; fixed spaceship part construction 
priority; removed more code for the old system

* Fixed translation issues on the victory screen
2022-04-24 22:45:38 +03:00
Xander Lenstra
382707a6a5
Fixed a problem with the ordering of the vanilla policies (#6582) 2022-04-24 22:44:41 +03:00
Yair Morgenstern
e1363d92f9 4.0.8 2022-04-19 15:32:45 +03:00
Yair Morgenstern
88e9d9c618
Version rollout (#6570)
* Bump version and create initial changelog entry

* Update Simplified_Chinese.properties (#6568)

* Update French.properties (#6567)

* Update Italian.properties (#6566)

* Update Filipino.properties (#6562)

* Update German translation (#6561)

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: heipizhu4 <100454479+heipizhu4@users.noreply.github.com>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: Shann Aurelle Ripalda <shannaurelleg@gmail.com>
Co-authored-by: MartinP <77325495+Mape6@users.noreply.github.com>
2022-04-19 15:27:17 +03:00
Yair Morgenstern
1069b0933e
Added "Vegetation" unique so that vegetation spawn is not limited to just jungle and forest (#6569) 2022-04-19 15:25:33 +03:00
SomeTroglodyte
9e3df8605e
Request for take-over: Rewritten Map Editor (#5694)
* New Map editor - attempts 1

* New Map editor - attempts 2

* New Map editor - attempts 3

* New Map editor - attempts 4

* New Map editor - attempts 5

* New Map editor - attempts 6

* New Map editor - attempts 7

* New Map editor - attempts 8

* New Map editor - attempts 9

* New Map editor - attempts 10

* New Map editor - merge

* Revert included Stat icons in favour of #f90b22a

* Adapt to renamed TileGroup methods

* Manual merge of some baseruleset code for the map loader only

* Kludge for disappeared `getBaseRuleset`

* Fix after-merge conflicts, run convertTerrains in stepwise map generation

* Fix merge error

* Adapt to latest merge

* Baseruleset control - unpolished draft + max zoom out

* MapEditorV2 - merge fixes, base ruleset and mod control, texture loader fix, pedia links, translation, load mod maps, continent visualization, minor improvements and fixes

* MapEditorV2 - removed old editor
2022-04-19 13:17:44 +03:00
Xander Lenstra
a92057eed5
Made 'go to on map' translatable & fixed crash (#6565) 2022-04-18 11:48:03 +03:00
Yair Morgenstern
06569e6c5f Clearer "owned" resource 2022-04-17 14:18:16 +03:00
Yair Morgenstern
0f70d8360d 4.0.7 2022-04-17 13:45:59 +03:00
Yair Morgenstern
dedd19cff8
Version rollout (#6557)
* Bump version and create initial changelog entry

* Update Spanish.properties (#6550)

* Update Spanish.properties

* Update Spanish.properties

Maybe I have left some grammar mistakes. I have to go, hopefully I'll fix them before the update.

* fix typos

* Update Simplified_Chinese translation (#6545)

* 4.0.6 translation 1

* 4.0.6 translation 2

* Update Simplified_Chinese.properties

* Update Filipino.properties (#6539)

* Update Filipino.properties

* Update Filipino.properties

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: Caballero Arepa <78449553+ArchDuque-Pancake@users.noreply.github.com>
Co-authored-by: heipizhu4 <100454479+heipizhu4@users.noreply.github.com>
Co-authored-by: Shann Aurelle Ripalda <shannaurelleg@gmail.com>
2022-04-17 13:41:22 +03:00
Xander Lenstra
7ced78f6a2
Fixed vanilla policies regression (#6552)
* Fixed the vanilla piety tree

* Fixed more regression errors

* Removed unique
2022-04-16 23:04:28 +03:00
Yair Morgenstern
8a32be0ca2 4.0.6 2022-04-13 18:53:46 +03:00
Yair Morgenstern
9d0c4c117c
Version rollout (#6538)
* Bump version and create initial changelog entry

* Update Italian.properties (#6535)

* Update Filipino.properties (#6532)

* Update Filipino.properties

* Update Filipino.properties

* Update Simplified_Chinese.properties (#6529)

* Update Simplified_Chinese.properties

v4.0.5 translation 1

* 4.0.5 Simpified_Chinese translation 2

4.0.5 Simpified_Chinese translation 2

* Update French.properties (#6524)

* Update Polish.properties (#6523)

* Update Spanish.properties (#6517)

Several rewordings, fixes and homogeneization of terms.

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: Shann Aurelle Ripalda <shannaurelleg@gmail.com>
Co-authored-by: heipizhu4 <100454479+heipizhu4@users.noreply.github.com>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
Co-authored-by: Derdotox <103372983+Derdotox@users.noreply.github.com>
Co-authored-by: Phoenix7g <102632435+Phoenix7g@users.noreply.github.com>
2022-04-13 18:48:10 +03:00
Yair Morgenstern
9fa3d8de2f 4.0.5 2022-04-09 22:41:12 +03:00
Yair Morgenstern
5447f01f1d
Version rollout (#6514)
* Bump version and create initial changelog entry

* Update Spanish.properties (#6505)

* Update French.properties (#6503)

* Update German translation (#6501)

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: Caballero Arepa <78449553+ArchDuque-Pancake@users.noreply.github.com>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
Co-authored-by: MartinP <77325495+Mape6@users.noreply.github.com>
2022-04-09 22:37:23 +03:00
SomeTroglodyte
fe82f773da
Make Icons clickable in religions per city display (#6497)
* Make Icons clickable in religions per city display

* Add tutorial mention of the religious icon click feature

* Fix merge import mistakes
2022-04-09 22:18:19 +03:00
Yair Morgenstern
286e800b96 Resolved #6492 - package reorg 2022-04-08 13:01:37 +03:00
Leonard Günther
a2a8c0aab5
Fixed turn checker crashes (#6508)
* Fixed turn checker failure

when UncivGame.current goes out of scope

* Cleanup

* Less changed lines

* Added documentation
2022-04-08 12:26:29 +03:00
Yair Morgenstern
b728748cfa 4.0.4 2022-04-06 23:43:29 +03:00
Yair Morgenstern
4080718cc3
Version rollout (#6498)
* Bump version and create initial changelog entry

* Update Filipino.properties (#6496)

* Update Filipino.properties

Added a few

* Update Filipino.properties

* Update Filipino.properties

fixed errors

* Update Simplified_Chinese.properties (#6494)

4.0.3 translation 1

* Update Dutch.properties (#6489)

Added some missing translations
Changed the translations of Mercantile and Cultured as those translations did not fit in the context

* Update Indonesian.properties (#6487)

* Update French.properties (#6482)

* Update Russian.properties (#6480)

* Update Russian.properties

* Update Russian.properties

* Update Italian.properties (#6477)

* Update German translation (#6476)

* Update Spanish.properties (#6475)

General grammar improvement and some rewordings.

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: Shann Aurelle Ripalda <shannaurelleg@gmail.com>
Co-authored-by: heipizhu4 <100454479+heipizhu4@users.noreply.github.com>
Co-authored-by: SrirachaGamer87 <58479947+SrirachaGamer87@users.noreply.github.com>
Co-authored-by: kensvin <63847755+Kensvin28@users.noreply.github.com>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
Co-authored-by: deqtodo <94169613+deqtodo@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: Phoenix7g <102632435+Phoenix7g@users.noreply.github.com>
2022-04-06 23:25:24 +03:00
Ouaz
b65d30a8ae
Update template.properties (#6484)
* Update template.properties

- Fix untranslatable entry "Revoke protection for" (see comment in #6131)

* Fix capitalization for "protection"
2022-04-06 23:20:02 +03:00
Yair Morgenstern
360d739b97 Resolved ANRs when opening Options menu
Was due to system fonts taking a long time to load
2022-04-06 22:57:27 +03:00
SomeTroglodyte
83327dabe8
Fix Goddess of Protection - maybe (#6493)
* Fix Goddess of Protection - maybe

* Improve TextSimilarity for case-only differences
2022-04-06 20:24:35 +03:00
Yair Morgenstern
73b6ee9af0 4.0.3 2022-03-31 23:17:09 +03:00
SomeTroglodyte
357800a80e
Missing translations cleanup (#6452) 2022-03-31 23:14:35 +03:00
Yair Morgenstern
443a15dd9b
Version rollout (#6473)
* Bump version and create initial changelog entry

* Update Finnish.properties (#6472)

* Update Indonesian.properties (#6462)

* Update Spanish.properties (#6461)

Some unpleasing grammar mistakes fixed.

* Update French.properties (#6459)

* Update Spanish.properties (#6457)

* Update German translation (#6450)

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: Tom K <tom.kostiainen@andritz.com>
Co-authored-by: kensvin <63847755+Kensvin28@users.noreply.github.com>
Co-authored-by: Phoenix7g <102632435+Phoenix7g@users.noreply.github.com>
Co-authored-by: Ouaz <Ouaz@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>
2022-03-31 23:14:04 +03:00
Xander Lenstra
72b4d2069e
Typed denmarks unique and generalized it (#6463)
* Typed denmarks unique and generalized it

* Added support for deprecated unique
2022-03-31 23:05:37 +03:00
SomeTroglodyte
90a172ab02
Remove re-orientation for OptionsPopup (#6466) 2022-03-31 23:03:57 +03:00
Yair Morgenstern
6315a16d98 Changed server connection to URL-based to allow connection to uncivserver.xyz 2022-03-31 23:03:14 +03:00
Yair Morgenstern
5ab44dd945 4.0.2 2022-03-28 22:03:23 +03:00
Yair Morgenstern
69603bc528 4.0.2 2022-03-28 17:55:36 +03:00
Yair Morgenstern
7abb982657
Version rollout (#6449)
* Bump version and create initial changelog entry

* Update Simplified_Chinese.properties (#6444)

4.0.1 translation 1

* Update Spanish.properties (#6431)

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

* Update Filipino.properties (#6429)

* Update Japanese.properties (#6422)

* Update Russian.properties (#6432)

* Update Russian.properties

* Update Russian.properties

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

* Update French.properties (#6440)

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

* Update Indonesian.properties (#6436)

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

* Update Simplified_Chinese.properties (#6428)

* Simplified_Chinese.properties

* Update Simplified_Chinese.properties

4.0.1 translation 1

* Remove `# Requires translation!`.

Co-authored-by: heipizhu4 <100454479+heipizhu4@users.noreply.github.com>
Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: heipizhu4 <100454479+heipizhu4@users.noreply.github.com>
Co-authored-by: ArchDuque-Pancake <78449553+ArchDuque-Pancake@users.noreply.github.com>
Co-authored-by: IDontHaveANam3 <92687952+IDontHaveANam3@users.noreply.github.com>
Co-authored-by: kobon2015 <63530082+kobon2015@users.noreply.github.com>
Co-authored-by: deqtodo <94169613+deqtodo@users.noreply.github.com>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
Co-authored-by: kensvin <63847755+Kensvin28@users.noreply.github.com>
Co-authored-by: Tang <1024830255@qq.com>
2022-03-28 17:50:28 +03:00
Xander Lenstra
8820ae6dad
Generalized a few nation uniques (#6443)
* Generalized a few nation uniques

* Fixed a bug and made random less random

* Implemented requested changes
2022-03-28 17:33:31 +03:00
SomeTroglodyte
7526114281
Empire overview resources (#6442)
* Empire Overview Resources: Vertical option

* Empire Overview Resources: Extra Info

* Empire Overview Resources: Tweaks

Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
2022-03-28 17:31:19 +03:00
SomeTroglodyte
870659d142
Translation writer conditionals (#6433)
* TranslationFileWriter processes Conditionals

* TranslationFileWriter processes Conditionals - wiki and reprocessed language files
2022-03-28 17:30:16 +03:00
Yair Morgenstern
2ef8581b52 4.0.1 2022-03-25 17:48:12 +03:00
Yair Morgenstern
926d3bcf4c
Version rollout (#6426)
* Bump version and create initial changelog entry

* Update Japanese.properties (#6417)

* Update Japanese.properties (#6410)

* Update Filipino.properties (#6409)

* Update Filipino.properties

* Update Filipino.properties

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: kobon2015 <63530082+kobon2015@users.noreply.github.com>
Co-authored-by: IDontHaveANam3 <92687952+IDontHaveANam3@users.noreply.github.com>
2022-03-25 17:45:31 +03:00
청하늘
84561e7ad4
Add Moddable Policy Priorities (#6390)
* Fixed G&K policy eras

Patronage should be Medieval and Freedom should be Industrial in G&K

* Added 'priorities' object to policy branch entries

* Fixed Vanilla policy eras

Also set testing priorities in advance

* Partial code formatting

* Reworked how the AI chooses a policy to newly adopt

* Removed debugging codes

* Update Civilization-related-JSON-files.md

Added Branch priorities

* Assigned actual priorities to each branch

Also fixed a debugging value in Ruleset.kt (-1 -> 0)
2022-03-25 17:33:42 +03:00
SomeTroglodyte
0b50715fb3
Improve TranslationFileWriter (less hardcoding, fixes PolicyBranch) (#6421)
* Allow TranslationFileWriter to follow several superclass levels (fixes PolicyBranch names)

* Bring German and template up to par as baseline

* Framework to feed TranslationFileWriter from UniqueParameterType, also fixes Fountain of Youth

* TranslationFileWriter legacy guessing now _much_ simpler

* Fix "chance to be destroyed by nukes" case

* Fix tests (allTranslationsHaveCorrectPlaceholders goes cross-language)
2022-03-25 17:27:25 +03:00
Yair Morgenstern
5fa10348b5 4.0.0 2022-03-21 21:29:55 +02:00
Yair Morgenstern
7a337dea4d
Version rollout (#6399)
* Bump version and create initial changelog entry

* Update Indonesian.properties (#6386)

* Update French.properties (#6371)

* Update Italian.properties (#6370)

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: kensvin <63847755+Kensvin28@users.noreply.github.com>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
2022-03-21 21:18:37 +02:00
Tang
c1737b6183
Custom desktop font (#6377)
* Custom desktop font

* Add `getDesktopAllFonts` to setting custom desktop font.

* Custom font.
`desktopFontFamily` change to `fontFamily`.
Add GameSettings.getSettingsForPlatformLaunchers().

* Add `Custom font` setting UI.

* Add `Custom font` on Android.

* `Default Font` use translations.

* format

* remove open fun.

Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
2022-03-21 21:12:16 +02:00
SomeTroglodyte
cf21ade76e
Moddable Ice generation (any impassable feature on Water possible) (#6329)
Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
2022-03-21 21:08:25 +02:00
Xander Lenstra
367a427436
Unified two uniques into one more descriptive unique (#6380)
* Unified two uniques into one more descriptive unique

* Fixed fallout generation & typo
2022-03-21 21:05:54 +02:00
Xander Lenstra
984c4d9b2d
Unified & generalized a few uniques (#6379)
* Generalized trade route percent bonuses

* Unified two uniques using populationFilter; deprecated a deprecated uniq

* Made some renamings to improve clarity & fixed tests

* Fixed tests again

* Fixed typo
2022-03-21 21:05:20 +02:00
Yair Morgenstern
2b1251258c
Unciv server (#6384)
* Background implementation for Unciv server with ktor.

Server ip in settings, able to copy your own ip and copy ip from clipboard for easy sharing, created stub for the client-server data transfer. No actual data storage or server implementation.

* Unciv server round 2 - implementing crud for files and it works!
metadata seems to only be in use for mutex, which is currently unused
That's all for today

* When starting a new multiplayer game the files are correctly saved in the server, and the server can return the files, but the function in the game to retrieve the game info is non-blocking so it doesn't work. Still, progress!

* Changed the Gdx http to basic Java http, as used for Dropbox, and now everything works!!!!

* Documentation for running and using the server

* Better texts, translations, etc

* Trog is right this should be a PUT not POST
2022-03-21 21:05:02 +02:00
Xander Lenstra
1df49749f2
Split 6 tiles visible unique into its parts, making it more moddable (#6389)
* Split sight unique into its parts, making it more moddable

* Standardized unique ordering
2022-03-21 21:03:33 +02:00
Yair Morgenstern
4b55882019 3.19.18 2022-03-17 23:37:33 +02:00
Yair Morgenstern
635d588711 More untranslated items fixed - #6131 2022-03-17 23:34:39 +02:00
Yair Morgenstern
bf0a44413f
Version rollout (#6365)
* Bump version and create initial changelog entry

* Update Simplified_Chinese.properties (#6359)

* Update Filipino.properties (#6358)

* Update Spanish.properties (#6356)

* Update French.properties (#6352)

* Update Indonesian.properties (#6351)

* Update Italian.properties (#6350)

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: heipizhu4 <100454479+heipizhu4@users.noreply.github.com>
Co-authored-by: SOULTAKER1011 <90161631+SOULTAKER1011@users.noreply.github.com>
Co-authored-by: ArchDuque-Pancake <78449553+ArchDuque-Pancake@users.noreply.github.com>
Co-authored-by: Ouaz <Ouaz@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>
2022-03-17 22:52:03 +02:00
Yair Morgenstern
f66930ed68 3.19.17 2022-03-13 22:57:55 +02:00
Yair Morgenstern
b8ef6725eb
Version rollout (#6349)
* Commit from GitHub Actions (UncivBot)

* Update Spanish.properties (#6348)

* Update Simplified_Chinese.properties (#6338)

translation2

* Update French.properties (#6336)

* Update Italian.properties (#6334)

* Update Simplified_Chinese.properties (#6331)

3.19.16 translation1

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: ArchDuque-Pancake <78449553+ArchDuque-Pancake@users.noreply.github.com>
Co-authored-by: heipizhu4 <100454479+heipizhu4@users.noreply.github.com>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
2022-03-13 22:53:45 +02:00
Yair Morgenstern
97787bd397
Resolved #6335 - now shows conditionals precluding construction of units (#6346)
* Resolved #6335 - now shows conditionals precluding construction of units

Built simply so that if we decide to expand the conditionals that should be shown it will simply be building a hashset of conditionalsToShow

* Added an instance wrapper, so the enum has the default values and the class has the actual values

* minor lint
2022-03-13 22:45:39 +02:00
Leonard Günther
cea63eb114
Multiplayer code cleanup (#6330)
* Fixed reviewed comments of PR 6273

* Cleanup of Dropbox.kt

- moved Dropbox.kt from ui\worldscreen\mainmenu to logic\multiplayer
- moved ServerMutex and OnlineMultiplayer to own files
- changed DropBoxFileConflictException to FileStorageConflictException to match FileStorage scheme
- merged FolderListEntry with DropboxMetaData as they were basicly the same
- introduced IFileMetaData to match FileStorage scheme and modified DropboxMetaData to use it
- removed some unused imports
2022-03-13 22:44:02 +02:00
SomeTroglodyte
d8e9563a7c
Religion overview improved (#6303)
* Improve handling of Religion PickerScreen with long lists

* Fix mouseover graying Labels bug

* Update Pantheon chooser visuals

* Some Color.lerp simplification

* Religion pickers - Merge common stuff of Pantheon and Religion Pickers

* Religion pickers - Linting

* Religion pickers - Move ReligionOverviewTable extra lines capability to Belief, Fix FormattedLine link+center

* Religion pickers - Belief Civilopedia linked description

* Religion overview tweaked

* Religion overview tweaked - patch1
2022-03-13 22:43:40 +02:00
SomeTroglodyte
ae0628a55e
Add Filipino.png since the Translation file is already there (#6343) 2022-03-12 22:36:23 +02:00
Yair Morgenstern
f73916ac3b 3.19.16 2022-03-10 19:52:29 +02:00
ArchDuque-Pancake
3ea8e8bd60
Update Spanish.properties (#6308)
* Update Spanish.properties

* Update Spanish.properties
2022-03-10 19:49:16 +02:00
Yair Morgenstern
dbca233a45
Version rollout (#6326)
* Commit from GitHub Actions (UncivBot)

* Update Brazillian_Portuguese.properties (#6325)

* Tradução mais avançada para português

* Update Brazilian_Portuguese.properties

* Add files via upload

* Update Indonesian.properties (#6324)

* Update French.properties (#6322)

* Update Czech.properties (#6321)

* Update German translation (#6311)

* Update Spanish.properties (#6307)

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: RivolviOcelot <73536178+Lufims@users.noreply.github.com>
Co-authored-by: kensvin <63847755+Kensvin28@users.noreply.github.com>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
Co-authored-by: jahodovykolac <79529669+jahodovykolac@users.noreply.github.com>
Co-authored-by: MartinP <77325495+Mape6@users.noreply.github.com>
Co-authored-by: Hello200000 <98656089+Hello200000@users.noreply.github.com>
2022-03-10 19:48:53 +02:00
SomeTroglodyte
e5b36f5b9f
Unique units abilities that should be inherited by upgrades (#6304)
* Unique units abilities that should be inherited by upgrades

* Unique units abilities that should be inherited by upgrades - xlt

* Unique units abilities that should be inherited by upgrades - wiki
2022-03-10 19:45:32 +02:00
SpacedOutChicken
44b4cb7e9b
Add Amphibious promotion to Songhai units (#6306)
* Destroy Arsenal when city is captured

* Update vanilla Songhai

* Add Amphibious promotion to all Songhai units

In Gods and Kings, all Songhai Land units have the Amphibious promotion. This brings our Gods and Kings up to speed with the original.
2022-03-10 19:43:34 +02:00
Yair Morgenstern
83e9aaf1d3
testy (#6312) (#6313) 2022-03-09 14:31:17 +02:00
SpacedOutChicken
43ebab9050
Petra fix (#6305)
* Destroy Arsenal when city is captured

* Fix Petra culture wiht city filter

Change Petra's culture bonus to city-specific bonus instead of empire-wide bonus
2022-03-08 20:21:41 +02:00
Yair Morgenstern
eaf5e453ba 3.19.15 2022-03-08 14:32:01 +02:00
ArchDuque-Pancake
05869e8ec7
Translation: Update Spanish.Properties (#6299) 2022-03-08 14:25:02 +02:00
Yair Morgenstern
fef2797341 3.19.14-patch1 2022-03-07 13:06:58 +02:00
Yair Morgenstern
5bae8d37b3
Translations update (#6295)
* Update French.properties (#6283)

* Update Indonesian.properties (#6280)

* Update Simplified_Chinese.properties (#6278)

* Update Italian.properties (#6276)

* Adding more polish translations (#6250)

* adding more polish translations

* Update Polish.properties

* Update Polish.properties

Fixed typo in line 189

Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
Co-authored-by: kensvin <63847755+Kensvin28@users.noreply.github.com>
Co-authored-by: heipizhu4 <100454479+heipizhu4@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: simur407 <szymon.bartczak@op.pl>
2022-03-07 13:03:08 +02:00
SomeTroglodyte
28ab45ae40
Fix Mughal Fort using UniqueType Stats instead of StatsPerCity (#6289) 2022-03-07 10:22:01 +02:00
Yair Morgenstern
03aa489dca 3.19.14 2022-03-05 20:26:01 +02:00
Yair Morgenstern
490fb3314c
Translations update (#6275)
* Update Simplified_Chinese.properties (#6274)

* Update Czech.properties (#6272)

* Update Indonesian.properties (#6269)

* Update German translation (#6258)

* Update Italian.properties (#6257)

* Update Japanese.properties (#6256)

* Update French.properties (#6252)

* Update Spanish.properties (#6251)

* Update Polish.properties - translation (#6268)

* Update Polish.properties

* Update Polish.properties

Previous ones were made bad 'cause of my mistake, but this one should be okay as for first day:)

Co-authored-by: heipizhu4 <100454479+heipizhu4@users.noreply.github.com>
Co-authored-by: jahodovykolac <79529669+jahodovykolac@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>
Co-authored-by: Mic <100757255+Mic0217@users.noreply.github.com>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
Co-authored-by: ArchDuque-Pancake <78449553+ArchDuque-Pancake@users.noreply.github.com>
Co-authored-by: FancyDot <100958790+FancyDot@users.noreply.github.com>
2022-03-05 20:17:52 +02:00
SomeTroglodyte
fb7cb707e0
WLTK decorations (#6253)
* WLTK decoration png's and atlas

* UncivTooltip anchor to stage so tips won't get clipped by some ScrollPane

* Empire Overview Cities add WLTK column

* Make WLTK line on CityScreen stats box link to Civilopedia

* Make Civilopedia return to previous screen for _both_ ESC/Back and the Close Button

* Revive Civilopedia links in WorldScreen.TileInfoTable

* Festive decoration for WLTK day on CityScreen
2022-03-05 20:10:03 +02:00
SomeTroglodyte
2f980abd72
Locate Mod Errors choose base ruleset to do complex check against (#6263)
* Some Ruleset linting

* Mod-check display remove unnecessary FormattedLine

* Mod-check can run on selectable base ruleset instead of Vanilla only

* Mod-check show final severity on Expander

* Mod-check base selectbox translatable
2022-03-05 20:03:28 +02:00
Leonard Günther
0e26ea2cc8
Added deep link to multiplayer games (#6273) 2022-03-05 20:00:56 +02:00
Yair Morgenstern
00c5ecb6a6 3.19.13 2022-02-28 22:49:11 +02:00
Yair Morgenstern
c9dfd4062d 3.19.13 2022-02-28 19:49:50 +02:00
Yair Morgenstern
a96934dc7c
Translations update (#6248)
* Translation: Update Spanish.Properties (#6243)

* Translation: Update Spanish.Properties

Mosaicos? Pero si yá está el estandar de "Casilla"?...

* Update Spanish.properties

* Update Spanish.properties

* Create Spanish.properties

* Update Spanish.properties

* Update German translation (#6242)

* Update Indonesian.properties (#6241)

* Update French.properties (#6236)

* Update Simplified_Chinese.properties (#6233)

* Update Simplified_Chinese.properties

I have translated all I can, but there're still some of them out of my ability. Note: How to translate ID?

* Update Simplified_Chinese.properties

* Update Italian.properties (#6228)

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: kensvin <63847755+Kensvin28@users.noreply.github.com>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
Co-authored-by: heipizhu4 <100454479+heipizhu4@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
2022-02-28 19:47:05 +02:00
SomeTroglodyte
bca3d5645a
Fix Spaceship production boni (and key binding) (#6247)
* Fix spaceship part boni

* Key binding for 'Add part to spaceship'
2022-02-28 19:42:02 +02:00
SomeTroglodyte
651dcff581
Fix Polynesia's Wayfinding (#6238)
* Fix Polynesia's Wayfinding

* Fix mod option to use other unit filters with UnitsMayEnterOcean
2022-02-28 19:41:22 +02:00
itanasi
f360eda047
Align (reduce) Embarked Defense Strength per Era (#6231)
* Change Embarked Defending Strength per era. Update Tutorial a little

* Use JSON implementation of EmbarkDefense

Co-authored-by: itanasi <spellman23@gmail.com>
2022-02-28 19:41:13 +02:00
Yair Morgenstern
db1304ee35 3.19.12 2022-02-25 13:48:47 +02:00
Yair Morgenstern
79699a0ba7
Translations update (#6227)
* Update Indonesian.properties (#6225)

* Update French.properties (#6218)

* Update Spanish.properties (#6217)

UPDATE

* Update Italian.properties (#6216)

* Update German translation (#6215)

Co-authored-by: kensvin <63847755+Kensvin28@users.noreply.github.com>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
Co-authored-by: Hello200000 <98656089+Hello200000@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>
2022-02-25 13:43:38 +02:00
Yair Morgenstern
ae2b91dd67 Moved wiki links to new site links 2022-02-23 21:40:20 +02:00
Yair Morgenstern
09089cb60d Added uniques and deprecations for "Requires" and "Unlocked by" uniques - #6165 2022-02-22 16:55:37 +02:00
Yair Morgenstern
162ed35255 3.19.11 2022-02-22 11:41:06 +02:00
Yair Morgenstern
d01203fcdc
Translations update (#6214)
* Update Italian.properties (#6209)

* Update Japanese.properties (#6207)

* translate ConditionalsPlacement

* Update German translation (#6206)

* Translation: Update of Spanish (#6204)

* Translation: Update of Spanish

* Update Spanish.properties

* Update French.properties (#6200)

* Update Indonesian.properties (#6198)

Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: nukurette <nukurette@gmail.com>
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: Ouaz <Ouaz@users.noreply.github.com>
Co-authored-by: kensvin <63847755+Kensvin28@users.noreply.github.com>
2022-02-22 11:38:28 +02:00
Xander Lenstra
e0345bcb52
Reorganized the way city states grant resources & rounded a float to an int (#6210)
* Reorganized the way city states grant resources & rounded a float to an int

* Reworded a string so it sounds nicer
2022-02-22 11:30:33 +02:00
Xander Lenstra
90386bd4e7
Made spaceship parts units instead of buildings (#6203)
* Spaceship parts are units now

* Fixed tests

* Removed commented out lines

* `Spaceship Part` unique can also go on buildings in ods
2022-02-22 11:30:20 +02:00
itanasi
ae77ff0f16
Updating Embarking Tutorial with more details (#6205)
* Add Amphibious penalty to Land attacking into Water and vice versa

* Replace Landing with Amphibious in all translation files

* Fix trailing whitespace

* Revert translation files

* Change working of Amphibious
Set penalty to Landing and Boarding

* Type-ify Unique and add Depreciated
Add Promotion to Melee Naval
Add exception that Landing penalty is NOT against cities

* Fix Vanilla

* Rename to Landing Party
Icon doesn't work

* Properly regenerated game.atlas/game.png

* Fox naval unit Landind penalty is for attacking on to land

* Only Land unit should have Boarding penalty

* Unbreak logic

* Adding more information to the Embarking Tutorial

* More info

Co-authored-by: itanasi <spellman23@gmail.com>
2022-02-22 11:30:10 +02:00
Yair Morgenstern
5b50f32505 Great Admiral movement removed from NAval Tradition - per #6131 2022-02-19 23:10:15 +02:00
Yair Morgenstern
970e535e62 3.19.10 2022-02-19 19:57:23 +02:00
Yair Morgenstern
f7f21d0cbf
Translations update (#6196)
* Update Russian.properties (#6191)

* Update Korean.properties (#6183)

* Update Korean.properties

* Update Korean.properties

* Update French.properties (#6174)

* Update Spanish.properties (#6173)

TRANSLATION

* Update Italian.properties (#6172)

* Update Italian.properties

* Update Italian.properties

* Update Indonesian.properties (#6171)

* Update German translation (#6170)

* Update Japanese translation (#6169)

* Update Japanese.properties

* fix translation

* Translation: Update Spanish 3.19.10 (#6182)

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

* Update Brazilian_Portuguese.properties (#6190)

Co-authored-by: deqtodo <94169613+deqtodo@users.noreply.github.com>
Co-authored-by: Samsaek the Calico <saud2410@naver.com>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
Co-authored-by: Hello200000 <98656089+Hello200000@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: nukurette <76560753+nukurette@users.noreply.github.com>
Co-authored-by: ArchDuque-Pancake <78449553+ArchDuque-Pancake@users.noreply.github.com>
Co-authored-by: Rodolfz147 <100000475+Rodolfz147@users.noreply.github.com>
2022-02-19 19:40:16 +02:00
Yair Morgenstern
6d48f99206
Trigger uniques by sacrificing units with conditional (#6157)
* Triggered uniques currently come from researching techs, adopting policies, and building buildings.
This adds a third way of triggering uniques, by attaching them to units with a "by consuming this unit" conditional, which will be added as a possible unit action.
So for example, "[amount] Free Technologies <by consuming this unit>", "Reveals the entire map <by consuming this unit>" etc.

* Added a new uniquetype for triggerable uniques, to make them separate from regular global uniques, so that triggerable uniques can become unit uniques when necessary

* And added translations so the tests will pass
2022-02-19 19:38:39 +02:00
itanasi
402a9ba825
Show Improvements that are buildable after Removing TerrainFeature (#6149)
* Initial working version!

* More comments

* Add missing .tr() translation calls

* add brackets

* Fixed

* Optimize checking for removable last feature
More complete tileInfo.clone()

Co-authored-by: itanasi <spellman23@gmail.com>
2022-02-19 19:34:27 +02:00
Yair Morgenstern
9d0db40bbf 3.19.9 2022-02-15 11:52:56 +02:00
Yair Morgenstern
23585832b5
Translations update (#6166)
* Update Spanish.properties (#6163)

* Update Spanish.properties

translation

* Update Spanish.properties

* Update Korean.properties (#6158)

* Update Korean.properties

* Update Korean.properties

* Update Traditional_Chinese.properties (#6156)

* Update French.properties (#6155)

* Update German translation (#6154)

* Update German translation

* Update German translation

* Update German translation

* Update and rename Spanish.properties  (#6153)

* Update and rename Spanish.properties to español.properties

Fixed some bugs in translations

* Rename español.properties to Spanish.properties

* Update Spanish.properties

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

Co-authored-by: Hello200000 <98656089+Hello200000@users.noreply.github.com>
Co-authored-by: Samsaek the Calico <saud2410@naver.com>
Co-authored-by: Chia-Hung Ni <jameseses@gmail.com>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
Co-authored-by: MartinP <77325495+Mape6@users.noreply.github.com>
2022-02-15 11:51:00 +02:00
Yair Morgenstern
86cbe895be
In Civ VI there are certain units available only if a specific building is built, and this was raised as a request by modders as well. (#6160)
Instead of expanding the existing 'requires building' unique to units and adding limiters, it's both easier and more generalizable to add conditionals for cities with and without certain buildings to replace the uniques entirely
2022-02-15 11:40:47 +02:00
Yair Morgenstern
97d74a3aef Enabled type check checking for uniques whose deprecation leads to multiple uniques!
This also enables auto-deprecating the Embark+Ocean unique
2022-02-15 11:29:32 +02:00
itanasi
9d1f463310
Add Amphibious penalty to Land attacking into Water and vice versa (#6127)
* Add Amphibious penalty to Land attacking into Water and vice versa

* Replace Landing with Amphibious in all translation files

* Fix trailing whitespace

* Revert translation files

* Change working of Amphibious
Set penalty to Landing and Boarding

* Type-ify Unique and add Depreciated
Add Promotion to Melee Naval
Add exception that Landing penalty is NOT against cities

* Fix Vanilla

* Rename to Landing Party
Icon doesn't work

* Properly regenerated game.atlas/game.png

Co-authored-by: itanasi <spellman23@gmail.com>
2022-02-14 19:21:53 +01:00
Yair Morgenstern
3fbcf64371 Apparently Android Studio was autoremoving the whitespace because it thought it knows better than me. Disabled by Editor > General > On save > disable Remove trailing whitespace 2022-02-13 11:19:45 +02:00
Yair Morgenstern
e6555741be Resolved untranslated texts as per #6131
- "Ampitheatre"
- Fixed tests
2022-02-13 11:04:28 +02:00
Yair Morgenstern
4b2bde0365 Resolved untranslated texts as per #6131
- "Resources" in city-state diplomacy screen
- "When Friends"/"When Allies" in same
- "Enhance religion"
- "Choose a Religion" in religion screen
- Religion name in religion screen
- Translated drilldown items in city screen
- "null for wheat" in improvement Civilopedia entry
- "Type" and others in city-state civilopedia entry
2022-02-13 10:58:47 +02:00
Yair Morgenstern
0d3a0ef7e3 Resolved untranslated texts as per #6131
- Added unique targets as lines to translate so they'll appear in BattleTable
2022-02-13 10:34:50 +02:00
Yair Morgenstern
47dea93775 Resolved untranslated texts as per #6131
- Requires more population
- Religious
- "Requires" in Policy civilopedia text
- "for" in improvement civilopedia text
- Untranslated conditionals in battle table (listed as "when fighting in [tileFilter] tiles")
2022-02-13 10:30:31 +02:00
Yair Morgenstern
c498426715 3.19.8 2022-02-12 19:25:12 +02:00
Yair Morgenstern
f03a6bd6b3
Translations update (#6150)
* Translation: Actualizar Español (#6141)

* Update Russian.properties (#6139)

* Update Italian.properties (#6138)

* Update French.properties (#6135)

Co-authored-by: ArchDuque-Pancake <78449553+ArchDuque-Pancake@users.noreply.github.com>
Co-authored-by: deqtodo <94169613+deqtodo@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
2022-02-12 19:03:43 +02:00
Yair Morgenstern
e72dcc8b0d
Unified "X is only available under Y conditions" into a single unique (#6133)
* Unified "X is only available under Y conditions" into a single unique

There were a few problems with existing uniques - they weren't really composable, the offered things they didn't keep, etc

For example, "Incompatible with [policy/tech/promotion]", UniqueTarget.Policy, UniqueTarget.Tech, UniqueTarget.Promotion. In fact, promotions only checked promotion incompatibility, promotions - promotion incompat, etc

Additionally, with a few more changes, this could cover several other uniques - "Hidden until [amount] social policy branches have been completed", "Requires at least [amount] population", perhaps others

I have to say I think conditionals are the best thing ever and they make amazing composability possible :)

* Autoupdate correctly recognizes parameters
Updated ruleset jsons

* Deprecation texts should be allowed to forward to other deprecated uniques so we only need to change the leaves when introducing new uniques, not go through the whole tree
2022-02-12 19:03:30 +02:00
Yair Morgenstern
4fb4722e3a
Arbitrary conditionals can become timed conditionals! (#6134)
* Arbitrary conditionals can become timed conditionals!
triggerCivwideUniques is activated in 3 situations:
- Tech complete
- Policy adopted
- Building complete

So for each of the unique containers for these I added a catch saying 'if this unique is a temporary unique then don't save it yourself

This has been lying around in todos for a while and generalizes one of the nasty hardcoded messes that I hate about Civ V. Why would you introduce ONE timed effect in the whole game?! You can use them all the time like Humankind or never use them like Civ IV, but why have just one whyyy

One more thing in this PR, that needed to be solved by the by, is allowing parameters to have a '2' on the end so we can autoreplace multiple parameters of the same type.
Using a regex is slightly more inefficient, but since this is A. only used once per UniqueType.kt, and B. allows us to have as many 'amount's as we want which is important if we have a lot of conditionals, I feel this is justified.

* Fixed comments from PR
2022-02-12 19:03:11 +02:00
Yair Morgenstern
13f052878b Merged all arrow images into one
Removed unnecessary filterNotNull from getTileBaseImageLocation
2022-02-09 16:59:05 +02:00
Yair Morgenstern
09ea1a869d 3.19.7 2022-02-09 12:31:08 +02:00
Yair Morgenstern
c54438ef9f
Translations update (#6132)
* Update Spanish.properties (#6130)

nothing important

* Update French.properties (#6126)

* Update Russian.properties (#6124)

* Update Japanese.properties (#6123)

* Update Portuguese.properties (#6121)

* Update Portuguese.properties

* Update Portuguese.properties

Sorry, corrected, I had overlooked that error.

* Update Italian.properties (#6119)

Co-authored-by: Hello200000 <98656089+Hello200000@users.noreply.github.com>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
Co-authored-by: deqtodo <94169613+deqtodo@users.noreply.github.com>
Co-authored-by: nukurette <76560753+nukurette@users.noreply.github.com>
Co-authored-by: Chacal <chacal_exodius@hotmail.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
2022-02-09 12:26:11 +02:00
itanasi
1420ad845c
Notify when Barbs don't give more XP (#6115)
* Updates to allow BarbXP gain check

* Remove from ICombatant

* Revert Battle.kt

* Fix code in BattleTable

* Add template.properties entry

* Fix space issue

* Silly autoformatting

Co-authored-by: temurakami <spellman23@gmail.com>
2022-02-08 11:42:24 +02:00
Yair Morgenstern
8fda18db42 3.19.6 2022-02-07 11:27:51 +02:00
Yair Morgenstern
e9d7ed168f
Translations update (#6118)
* Big update for French.properties (#6112)

* Big update for French.properties

- Try as much as possible to match Civ 5 french translation
- Modify some translations to better fit the UI
- Modify some translations to improve some original Civ 5 french entries which were poorly translated
- Make translations consistent through all the file
- Fix all broken translations due to bad word/key ordering
- Some quotes are now real quotes from french books (when available) rather than translated from english quotes
- Fix many typos

* Fix translation error

* Translatión: Actualización del Español (#6109)

Also deleted the extra resource icons I originally put 'xD

* Update Korean.properties (#6108)

* Update Korean.properties

* Update Korean.properties

* Update Korean.properties

* Update Korean.properties

* Update Korean.properties

* Update Korean.properties

* Update Korean.properties

* Update Korean.properties

* Update Japanese.properties (#6107)

* Update Indonesian.properties (#6103)

* Update Indonesian.properties

* Update Indonesian.properties

Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
Co-authored-by: ArchDuque-Pancake <78449553+ArchDuque-Pancake@users.noreply.github.com>
Co-authored-by: Samsaek the Calico <saud2410@naver.com>
Co-authored-by: yuracla <89312848+yuracla@users.noreply.github.com>
Co-authored-by: kensvin <63847755+Kensvin28@users.noreply.github.com>
2022-02-07 11:21:18 +02:00
Yair Morgenstern
c9d487638c Added button to reload all rulesets - very helpful if you're working on mods and adding things gradually :) 2022-02-06 22:07:56 +02:00
Yair Morgenstern
3661ad8d5b
Find all replaceable uniques, generate replacement text, check for compatibility, and replace! (#6105)
* Find all replaceable uniques, generate replacement text, check for compatibility, and replace!

All of the work up until now has lead up to this point - since we already know what's out and what to replace it with, we can do 90%+ of the work ourselves and spare the sanity of our modders

For an example run:
- Download your favorite mod
- Check its deprecated uniques in the options menu
- Run the autoupdater from the same menu
- See how they disappear
- Bask in the glory

* A few unreplaced uniques raised problems in some of the replacement texts

* Old unusable deprecated uniques are suddenly important again, because they can help autoupdate mods!

I'm wondering if to remove outdated mods entirely from the uniques.md, since they're going to keep accumulating

* Padding for the 'autoupdate' button

* Only display autoupdate button if there are unique to update
Also, fixed some of the revived deprecated unique's replacement text thanks to fancy new tests :)
Tech uniques autoupdate!

* Toast now pops correctly, added translation entries
2022-02-03 14:58:17 +02:00
Yair Morgenstern
37c0092284 3.19.5 2022-02-03 10:34:51 +02:00
Yair Morgenstern
0e9e4dc279
Translations update (#6102)
* Update Dutch translation (#6100)

* Update Dutch.properties

* Update Dutch.properties

* Taalfout verbeterd

* Taalfouten verbeterd

* Meer taalverbeteringen

* Laatste taalverbetering

* Update German translation (#6098)

Co-authored-by: Blubvis725 <62372520+Blubvis725@users.noreply.github.com>
Co-authored-by: MartinP <77325495+Mape6@users.noreply.github.com>
2022-02-03 10:26:50 +02:00
Yair Morgenstern
9696fa59f5
Added unique to convert terrain to other terrain if adjacent to something (#6094)
* Added unique to convert terrain to other terrain if adjacent to something

Terrain converting to other terrain when adjacent to rivers was using hardcoded stuff, so I un-hardcoded it
I thought I could use this to replace the 'coast' hardcoding, and if it wasn't for the maxCoastExtension then I could.
Modders CAN therefore add their own coast (Lava tiles and Ash tiles I dunno) but it will only be for directly close terrains.
This enables Deciv Redux to spawn huge maps.

* Also for Vanilla, which apparently had a different number of tabs than G&K for no apparent reason.

* Apparently terrain name wasn't a uniquetype yet

(cherry picked from commit 593fc257b5)
2022-02-02 00:59:37 -08:00
Yair Morgenstern
4f421dc44f 3.19.4 2022-02-01 10:06:47 +02:00
Yair Morgenstern
78e8dba2b5
Translations update (#6091)
* Update Spanish.properties (#6082)

* Update Spanish.properties

the only thing i didn't translate were the names of the cities if you have any problem contact me on discord like: lostxxxxx

* Update Spanish.properties

problem solved

* Update Japanese translation (#6075)

* Update Japanese.properties

* Update Japanese.properties

* Update Italian.properties (#6074)

Co-authored-by: Hello200000 <98656089+Hello200000@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>
2022-02-01 09:53:22 +02:00
Xander Lenstra
6bc41a627c
Typed all healing uniques (#6087)
* Typed all healing uniques

* Fixed tests by replacing placeholder texts by types in BeliefAutomation
2022-02-01 09:43:37 +02:00
SpacedOutChicken
d11fe43d2b
Fix art for farms on hills (#6080)
* Fix art for farms on hills

This makes hills with farms on them change appearance.

* Refine fix for farms on hills
2022-02-01 09:42:41 +02:00
Yair Morgenstern
16855f66f6
Gradle build tools upgrade (#6085)
* Gradle build tools upgrade
Apparently the magic is rewriting a specific line in the Android build file and downloading Android SDK 30.0.3

* Added wiki change, isn't that nice :)
2022-01-31 15:05:42 +02:00
Yair Morgenstern
0f4449f2e9 3.19.3 2022-01-29 23:40:43 +02:00
Yair Morgenstern
fc5dd86007
Translations update (#6073)
* Update Ukrainian.properties (#6068)

* Update Czech.properties  (#6060)

* Update Czech.properties

many new strings trsanslated

* Update Czech.properties

- fixed accidental typos

* Update German translation (#6059)

* Update Italian.properties (#6056)

Co-authored-by: StepanIvasyn <57094070+StepanIvasyn@users.noreply.github.com>
Co-authored-by: stoupa007 <60326342+stoupa007@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>
2022-01-29 23:32:22 +02:00
Xander Lenstra
a237e7bf82
Typed all remaining uniques using CityInfo.GetMatchingUniques and removed that function (#6071)
* Typed all remaining uniques using CityInfo.GetMatchingUniques and removed that function

* Fixed two NullPtrExceptions

* Fixed syntax
2022-01-29 23:27:48 +02:00
Md. Touhidur Rahman
1b01ee3802
updated Caravel.png, resolves #5317 (#6069)
* updated Caravel.png, resolves #5317

* Update Credits.md
2022-01-29 18:36:05 +02:00
Yair Morgenstern
6855a52466 3.19.2 2022-01-26 22:55:30 +02:00
Yair Morgenstern
dddba4d969
Translations update (#6054)
* Update Indonesian.properties (#6048)

* Update German translation (#6037)

* Update German translation

* Update German translation

* Update German translation

* Update German translation

* Update Italian.properties (#6035)

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>
2022-01-26 22:42:19 +02:00
will-ca
824efcb1a9
Try to fix potential typos in stock rulesets. (#6028)
* Make mod checker pass status message translatable.

* Try to fix some possibly broken Uniques.

Move comma.
2022-01-26 22:36:24 +02:00
ravignir
74cb3245a5
Update improved resource stats to fully match civ5 (#6038)
* Update improved resource stats to fully match civ5

* More fixes

* Update TileResources.json
2022-01-26 11:20:13 +01:00
Xander Lenstra
6a5d44c3e9
Adressed comments on the happiness PR after it was merged (#6047) 2022-01-24 22:23:26 +00:00
will-ca
4215ca7a51
Make Indirect Fire a starting promotion instead of Unique for Artillery, Battleship, etc. (#6042) 2022-01-24 21:02:15 +01:00
Xander Lenstra
b69507255f
Fixed the problems with the food carry-over unique (#6040) 2022-01-24 19:52:35 +02:00
Xander Lenstra
f6cb2bd0d7
Made unhappiness effects moddable by adding a global uniques json; added revolts when < -20 happiness (#5932)
* Added a json file for unhappiness effects

* Change existing code to handle these effects

* Made a weird and unexpendable way to add unhappiness effects to the civilopedia

* Add the default unhappinesseffects to mods without the json

* Added revolts when at very low happiness

* Renamed a few often-used functions

* Added a file for uniques that are always active

* Fixed tests

* Nullifies [Food] -> Nullifies Growth
2022-01-24 17:19:51 +00:00
Yair Morgenstern
336e190ff0 3.19.1 2022-01-24 11:56:00 +02:00
Yair Morgenstern
67592747a9
Translations update (#6034)
* Update Italian.properties (#6029)

* more word change (#6010)

* more word change

* Added that space

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

Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: fab144 <58261459+fab144@users.noreply.github.com>
Co-authored-by: Xander Lenstra <71121390+xlenstra@users.noreply.github.com>
2022-01-24 11:10:32 +02:00
itanasi
003c4197a5
Update Copper Mine to add only 1 production (match Civ 5) (#6033)
Co-authored-by: temurakami <spellman23@gmail.com>
2022-01-24 11:04:58 +02:00
Xander Lenstra
39ed8bd269
Typed some uniques, added more examples for parameters in unique documentation (#6020)
* Typed some uniques, etc.

* Missed a few square braces

* Missed a parameter

* Missed another parameter

* Made a conditional, spelling, added check to `isStatRelated`

Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
2022-01-24 11:03:40 +02:00
SpacedOutChicken
f483f0a345
Destroy Arsenal when city is captured (#6031)
* Destroy Arsenal when city is captured

* Destroy Arsenal when city is captured
2022-01-24 10:34:32 +02:00
will-ca
8461032a52
Try to fix a potentially miscapitalized/broken policy cost unique. (#6016)
* Try to fix a potentially miscapitalized/broken policy cost unique.

* Deprecate old capitalization.
2022-01-23 18:08:59 +01:00
Yair Morgenstern
f9c05997dd
Typified some building uniques (#6017)
* Typified some building uniques
I noticed that the code allows "[stats] from every [buildingFilter]" but the UniqueType was limited to "[stats] from every [buildingName]", so now that that's available we don't actually need the "[stats] from every Wonder" unique :)

* buildings-only unique moved to buildings section
2022-01-23 06:03:50 -08:00
will-ca
fe67dfa1c4
Make "Help" button clearer and translatable, random nation indicators and labels translatable. (#6013)
* Make unknown nation placeholder translatable.

* Make MultiplayerScreen help button clearer and translatable.

* Use `Constants.spectator` more.

* Make random/unknown nation icon translatable.
2022-01-23 09:39:28 +01:00
Yair Morgenstern
7e4a2944c3 3.19.0 2022-01-22 21:58:23 +02:00
Yair Morgenstern
f4bfcbab7c
Translations update (#6011)
* Update French.properties (#6006)

* Update French.properties

* Update French.properties

* Update Indonesian.properties (#6002)

* Update Indonesian.properties

* Update Indonesian.properties

* Update Indonesian.properties

Co-authored-by: Newexae <96820363+Newexae@users.noreply.github.com>
Co-authored-by: kensvin <63847755+Kensvin28@users.noreply.github.com>
2022-01-22 20:44:19 +02:00
yairm210
682d65f02e 3.18.19 2022-01-19 14:47:43 +02:00
Yair Morgenstern
a82d330c02
Translations update (#6001)
* Update Simplified_Chinese.properties (#5997)

* Update Italian.properties (#5990)

* Update Simplified_Chinese.properties (#6000)

* Update Simplified_Chinese.properties

* Create Simplified_Chinese.properties

* update bad translate

Co-authored-by: wwwxxxzzz666 <2273204577@qq.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: ThebestkillerTBK <62250232+ThebestkillerTBK@users.noreply.github.com>
2022-01-19 14:41:40 +02:00
will-ca
e477e4917a
Missing template.properties fields for AddMultiplayerGameScreen. (#5993) 2022-01-17 22:23:56 +02:00
yairm210
21fbaf4814 3.18.18 2022-01-16 19:51:33 +02:00
Yair Morgenstern
838b797699
Translations update (#5986)
* Update English.properties. (Remove no-op translations.) (#5977)

* Update Spanish.properties (#5970)

* Update Italian.properties (#5966)

* I made some changes to the simplified Chinese translation file.  (#5987)

* Minor polishing up for accuracy and some translation

* Additional translation

* Update Simplified_Chinese.properties

Co-authored-by: will-ca <willchencontact@gmail.com>
Co-authored-by: ArchDuque-Pancake <78449553+ArchDuque-Pancake@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: unciv-translation <97832928+unciv-translation@users.noreply.github.com>
2022-01-16 19:50:07 +02:00
yairm210
dd90b2bacc NewGameScreen threading normalized.
The NewGameScreen was written by a past version of myself that had no idea how to handle threading, and thus was extremely strange. Checking an object _on render_ and if it's set then activate? Totally clueless.
2022-01-16 19:10:30 +02:00
will-ca
9b121a478a
Clean up refactored pixel unit resolving. (#5979) 2022-01-16 18:43:49 +02:00
will-ca
f68c41e369
Explain when cities can't be razed. (#5976)
* Explain when cities can't be razed.

* Light refactoring and reword.

* Add update notice in translation strings.
2022-01-16 18:43:33 +02:00
Yair Morgenstern
b813e0b38a
Fixed assumption that the current game is in the list of games gathered from preview files (#5981) 2022-01-16 18:42:45 +02:00
yairm210
a2f5941927 chore - Minor improvements to science and culture tutorial capitalization 2022-01-15 22:09:33 +02:00
yairm210
8311e65120 Victory types capitalized 2022-01-14 12:21:53 +02:00
yairm210
e7042d24ea City state permutations normalized to "City-State"
#5963
2022-01-14 12:16:16 +02:00
yairm210
462ae2dad0 3.18.17 2022-01-14 10:49:22 +02:00
Yair Morgenstern
6e95a07572
More unit unique typing (#5952)
* There are so many of these my gosh

* Fixed, good thing we have tests :)

* Fixed
2022-01-14 10:43:13 +02:00
Yair Morgenstern
aaeb4f36d8
Translations update (#5965)
* Polish translations (#5964)

* Update Polish.properties

Translated some technology names

* Update Polish.properties

Some translations of:
- City names
- Temples
- Buildings

* Update Polish.properties

Some random translations

* Update Indonesian.properties (#5948)

Co-authored-by: PLynx <pawelrys2011@gmail.com>
Co-authored-by: kensvin <63847755+Kensvin28@users.noreply.github.com>
2022-01-14 10:37:35 +02:00
Xander Lenstra
7cb58eb82d
Typed all policy uniques (#5955)
* Typed all policy uniques

* Reworded golden age length
2022-01-14 10:11:30 +02:00
Xander Lenstra
b8a437ed8c
Added a few missing template strings from the 'about' page of the settings (#5949) 2022-01-11 21:06:05 +02:00
AdityaMH
7a83f5091a
Fix incorrect Archer obsolete (#5947)
* Fix incorrect Archer obsolete

* Sorry, from previous

* Bring back

* Fix other "Archer" forK
2022-01-11 17:04:19 +02:00
Xander Lenstra
d809f3a132
Made all the other constants determining the strength of cities moddable (#5940) 2022-01-10 13:55:22 -08:00
Xander Lenstra
0349e0a776
Updated the natural wonders for vanilla (#5943)
* Updated the natural wonders for vanilla

* Might as well remove the faith ruins bonuses
2022-01-10 13:28:05 -08:00
yairm210
480beb83b3 3.18.16 2022-01-09 22:34:44 +02:00
Yair Morgenstern
32ab5f32bd
Translations update (#5937)
* Update German.properties (#5936)

* Update German.properties

Some additional translation and corrections

* Update German.properties

* Create German.properties

corrections

* Update Ukrainian.properties (#5935)

Translate Crash screen messages

* Update French.properties (#5934)

* Update French.properties

* Add files via upload

* Add files via upload

* Delete French.properties

* Update French.properties

* Update French.properties

* Update German translation (#5931)

* Update Spanish.properties (#5929)

* Update Spanish.properties

I´m back... kind of.

* Update Spanish.properties

* Crash Screen Translated (#5926)

I have translated the Crash Screen.

Co-authored-by: Sauvegarde13 <47331543+Sauvegarde13@users.noreply.github.com>

Co-authored-by: jacer2010 <96766494+jacer2010@users.noreply.github.com>
Co-authored-by: StepanIvasyn <57094070+StepanIvasyn@users.noreply.github.com>
Co-authored-by: Newexae <96820363+Newexae@users.noreply.github.com>
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: F. García <47331543+FranMer13@users.noreply.github.com>
Co-authored-by: Sauvegarde13 <47331543+Sauvegarde13@users.noreply.github.com>
2022-01-09 21:46:24 +02:00
will-ca
24dfad696c
New crash handler screen Part 2: Threads, runnables, more informative reports. (#5810)
* Add crashHandlingThread.

* Replace all uses of `thread` with `crashHandlingThread`.

* Add `postCrashHandlingRunnable`.

* Replace all uses of `Gdx.app.postRunnable` with `postCrashHandlingRunnable`.

* Remove CrashController and CrashReport; Strip down CrashReportSender to CrashReportSysInfo; Fold their functionality into CrashScreen.

* Typo in comments, rename `SafeCrashStage` to `CrashHandlingStage`.

* Tweak docs.

* Tweak docs, comments, text. Undo an accidentally recursive Replace All change.

* Remove replaced translations.

* More readable indentation handling in report template.
2022-01-09 11:33:45 +02:00
AdityaMH
b2870bc130
Fix missing siege unit resources needs for vanilla (#5925)
* Fix missing siege unit resources needs for vanilla

* Fix unique siege unit who no resources needs
2022-01-07 14:28:08 +02:00
yairm210
9b431a9bf7 3.18.15 2022-01-07 11:15:19 +02:00
Giuseppe D'Addio
51c3c2a4e2
Update Italian.properties (#5907) 2022-01-07 11:07:53 +02:00
Md. Touhidur Rahman
8d2b282cef
Revert "Remove periodic saving again (#5880)" (#5883)
This reverts commit 2404749bba.
2022-01-06 23:00:56 +01:00
Xander Lenstra
483dd2e871
Fixed border image alpha (#5912) 2022-01-04 18:57:02 +02:00
Giuseppe D'Addio
e123a699ac
Update Nations.json (#5908)
Removed superfluous spaces
2022-01-04 17:43:05 +01:00
xlenstra
e68bd143d9 3.18.14 2022-01-02 21:56:24 +01:00
Xander Lenstra
0f258d5638
Translations update (#5881)
* Update Portuguese.properties

# Language settings

# Equivalent of a space in your language
# If your language doesn't use spaces, just add "" as a translation, otherwise " "
 # Requires translation!
" " = 

# If the first word in a sentence starts with a capital in your language, 
# put the english word 'true' behind the '=', otherwise 'false'.
# Don't translate these words to your language, only put 'true' or 'false'.
 # Requires translation!
StartWithCapitalLetter = 


# Starting from here normal translations start, as written on
# https://github.com/yairm210/Unciv/wiki/Translating

# Tutorial tasks

* Update Simplified_Chinese.properties (#5890)

* Merged some uniques and added a new one for not allowing to build units (#5731)

* Print stacktraces in more cases when crashing, useful for debugging

* Conditionalized no oceans before astronomy unique

* Cannot be built on tile before tech conditionalized

* Added "Cannot build unitFilter units" unique

* Fixed tests failing

* Merge branch master into some-uniques

* Fixed typo

* Apparently I made the same mistake twice

* Globalized unique

* Allowed follower beliefs to have more uniques, merged a unique and globalized some uniques (#5882)

* Regenerate atlas. #5884. (#5885)

* Update Simplified_Chinese.properties

* Fixed translation tests failing

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

* Update Simplified_Chinese.properties (#5889)

* Merged some uniques and added a new one for not allowing to build units (#5731)

* Print stacktraces in more cases when crashing, useful for debugging

* Conditionalized no oceans before astronomy unique

* Cannot be built on tile before tech conditionalized

* Added "Cannot build unitFilter units" unique

* Fixed tests failing

* Merge branch master into some-uniques

* Fixed typo

* Apparently I made the same mistake twice

* Globalized unique

* Allowed follower beliefs to have more uniques, merged a unique and globalized some uniques (#5882)

* Regenerate atlas. #5884. (#5885)

* Update Simplified_Chinese.properties

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

* Update Brazillian_portuguese.properties (#5887)

* Merged some uniques and added a new one for not allowing to build units (#5731)

* Print stacktraces in more cases when crashing, useful for debugging

* Conditionalized no oceans before astronomy unique

* Cannot be built on tile before tech conditionalized

* Added "Cannot build unitFilter units" unique

* Fixed tests failing

* Merge branch master into some-uniques

* Fixed typo

* Apparently I made the same mistake twice

* Globalized unique

* Allowed follower beliefs to have more uniques, merged a unique and globalized some uniques (#5882)

* Regenerate atlas. #5884. (#5885)

* Update Brazillian_portuguese.properties

I translated some sentences.

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

* Update Czech.properties (#5875)

- translated lot of new strings

* Some French translations (#5871)

* Some French translations

* Update French.properties

* Update Italian.properties (#5869)

* Update Dutch.properties (#5858)

* Update Dutch.properties

* Voorgestelde verbeteringen toegevoegd

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

* Actually fixed the atlas generation

* Update Turkish.properties (#5903)

* Delete Ship Of The Line.png

* GH Actions: Check user privileges before running bots. (#5895)

* Revamped nukes again to closer match the original (#5892)

* Update Turkish.properties

I translated again.This time i translated somra error scripts

Co-authored-by: hundun <wwj.hddjj@gmail.com>
Co-authored-by: Xander Lenstra <71121390+xlenstra@users.noreply.github.com>
Co-authored-by: will-ca <willchencontact@gmail.com>

Co-authored-by: sidneybr <95696905+sidneybr@users.noreply.github.com>
Co-authored-by: ZGMZY <69511837+ZGMZY@users.noreply.github.com>
Co-authored-by: will-ca <willchencontact@gmail.com>
Co-authored-by: Ustklm <58632848+Ustklm@users.noreply.github.com>
Co-authored-by: stoupa007 <60326342+stoupa007@users.noreply.github.com>
Co-authored-by: Newexae <96820363+Newexae@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: Peter Bos <55184696+Peter1306@users.noreply.github.com>
Co-authored-by: HariboSever <96971269+HariboSever@users.noreply.github.com>
Co-authored-by: hundun <wwj.hddjj@gmail.com>
2022-01-02 19:07:09 +01:00
hundun
e9afc6402c
Delete Ship Of The Line.png 2022-01-02 18:17:15 +08:00
will-ca
34e5033293
Border images in Default. (#5886) 2022-01-01 15:43:55 +00:00
will-ca
1f153cc86e
Regenerate atlas. #5884. (#5885) 2021-12-31 13:55:41 +00:00
Xander Lenstra
f06242ebe1
Allowed follower beliefs to have more uniques, merged a unique and globalized some uniques (#5882) 2021-12-31 13:47:52 +02:00
Xander Lenstra
687ecb83f1
Merged some uniques and added a new one for not allowing to build units (#5731)
* Print stacktraces in more cases when crashing, useful for debugging

* Conditionalized no oceans before astronomy unique

* Cannot be built on tile before tech conditionalized

* Added "Cannot build unitFilter units" unique

* Fixed tests failing

* Merge branch master into some-uniques

* Fixed typo

* Apparently I made the same mistake twice

* Globalized unique
2021-12-31 12:13:09 +02:00
Leonard Günther
2404749bba
Remove periodic saving again (#5880) 2021-12-31 11:08:19 +02:00
Xander Lenstra
ee65adb5e4
Fixed a bug where all global unit discounts would always apply, despite only being for certain units (#5879) 2021-12-31 11:07:59 +02:00
will-ca
1a8a86cb2c
Unify and improve moddability of more tile-based images. (#5873) 2021-12-29 18:21:34 +02:00
will-ca
7581b7b621
Arrows in Default tileset. (#5872) 2021-12-29 17:37:49 +02:00
will-ca
0056eba408
Move BorderImages to tileset. Set origin in setHexagonImageSize(). (#5868) 2021-12-29 00:05:56 +02:00
yairm210
0d78659e49 3.18.13 2021-12-29 00:01:42 +02:00
Yair Morgenstern
9ee073fe55
Translations update (#5864)
* Update German.properties (#5863)

* Update Italian.properties (#5851)

* Update Romanian.properties (#5806)

* Update Romanian.properties

I made a contribution to Romanian translation. Up to rougly line 800 should be translated until now. I'd be happy you introduced  these translation to the game!

* Update Romanian.properties

Mostly typos, that hopefully have been fixed.

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

Co-authored-by: jacer2010 <96766494+jacer2010@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: Cosmin Burada <77898829+cosylynx@users.noreply.github.com>
Co-authored-by: Xander Lenstra <71121390+xlenstra@users.noreply.github.com>
2021-12-28 23:42:26 +02:00
will-ca
005c465ee4
Use tileset fallbacks for missing images. (#5852)
* Use tileset fallbacks for missing images.

* Disable tileset fallback for FantasyHex.

* Tweak docs, remove debug signature.
2021-12-27 21:05:33 +02:00
Xander Lenstra
f03918f610
Fixed a few combat bugs and changed the religions founded label (#5846)
* Fixed a bug where bonusses applying 'in friendly tiles' would not apply

* Reworded something so it actually makes sense

* Fixed capitalization error leading to autocracy complete bonus no longer working

* Fixed save serialization errors and finally correctly implemented the time limit for autocracy bonus

* Made value const and static
2021-12-26 07:31:07 +02:00
yairm210
c62006cf72 3.18.12 2021-12-25 23:57:42 +02:00
yairm210
6325b3c3a2 3.18.12 2021-12-25 23:28:07 +02:00
yairm210
b8b5f79ee0 3.18.12 2021-12-25 22:51:41 +02:00
will-ca
af941754cd
Show arrows on map for unit actions: Asset files. (#5825)
* Show arrows on map for unit actions.

* Don't wrap arrows unless world wrap is actually enabled.

* Fix transported air units always being treated like teleports.

* Simple reviews.

* Separate movement arrow visibility checks from WorldScreen.

* Assets for map arrows overlay.

Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
2021-12-25 22:29:19 +02:00
Yair Morgenstern
2898a64606
Translations update (#5850)
* Update Swedish.properties (#5841)

* Update Indonesian.properties (#5832)

* Update Italian.properties (#5831)

* Update Italian.properties

* Update Italian.properties

* Update Russian.properties (#5849)

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>
Co-authored-by: deqtodo <94169613+deqtodo@users.noreply.github.com>
2021-12-25 22:23:33 +02:00
will-ca
e672bfb6d3
Show arrows on map for unit actions. (#5824)
* Show arrows on map for unit actions.

* Don't wrap arrows unless world wrap is actually enabled.

* Fix transported air units always being treated like teleports.

* Simple reviews.

* Separate movement arrow visibility checks from WorldScreen.

Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
2021-12-25 22:20:29 +02:00
Xander Lenstra
ecadfb53fa
Typed some uniques and fixed a policy not working (#5848)
* Typed some uniques, fixing a policy not working

* Repurposed an unused function to remove .unit in some places

* Fixed compilation errors
2021-12-25 17:55:14 +02:00
Xander Lenstra
759366c912
Added score and time victory (#5842)
* Added a score calculation

* Added the score in multiple places of the UI

* Added time victory and a max turns

* Made time victory functional

* Added translation files
2021-12-24 14:31:36 +02:00
yairm210
c70ac334bd 3.18.11 2021-12-20 21:25:17 +02:00
Yair Morgenstern
1152d8b0f7
Translations update (#5830)
* Update German translation (#5829)

* Update German translation

* Update German translation

* Update Russian.properties (#5813)

* Update Russian.properties

* Update Russian.properties

* Update Russian.properties

* Update Italian.properties (#5807)

* typo (#5805)

Co-authored-by: MartinP <77325495+Mape6@users.noreply.github.com>
Co-authored-by: deqtodo <94169613+deqtodo@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: Joni Arida <JoniArida@users.noreply.github.com>
2021-12-20 21:17:07 +02:00
will-ca
723aaf779c
Add new universal crash handlers and error reporting screen. (#5804)
* Add new crash handler and error reporting screen.

* Minor cleanup.

* Word choice.

* Rename `SafeCrashStage` to `CrashHandlingStage`.

* Reviews.

* Reference stack traces in comments for thread and postRunnable exceptions.

* Remove excessive line breaks, superfluous .apply{}.
2021-12-20 20:55:58 +02:00
Xander Lenstra
b7804c0bf6
Removed double space in template.properties
This lead to failed tests for new languages, as the second space would be seen as the translated string, which obviously doesn't contain the placeholder tags.
2021-12-20 11:59:54 +01:00
Xander Lenstra
75ef6f6c8d
Changed remove heresy sound effect (#5821) 2021-12-18 20:05:11 +02:00
Xander Lenstra
17b382a614
Replaced illegal / questionably legal assets (#5819)
* Replaced illegal / questionably legal assets

* Resized policy icon to correct size
2021-12-18 17:53:21 +02:00
Xander Lenstra
58cc3b517e
Fixed an infinite loop where foreign legion upgraded to the unit it replaced (#5808)
* Fixed an infinite loop where foreign legion upgraded to the unit it replaced

* Changed the wrong variable

* Maybe it is useful to also change its unlock tech

* Whoops, should only be for non-null values
2021-12-16 17:50:10 +02:00
yairm210
a7b880c033 3.18.10 2021-12-15 23:12:28 +02:00
Yair Morgenstern
7830eda9a1
Translations update (#5800)
* Update German translation (#5797)

* Update Russian.properties (#5788)

* Update Russian.properties

* Fix translation

* Update indonesian.properties (#5787)

* Update French.properties (#5786)

* Update Swedish.properties (#5783)

Co-authored-by: MartinP <77325495+Mape6@users.noreply.github.com>
Co-authored-by: deqtodo <94169613+deqtodo@users.noreply.github.com>
Co-authored-by: canneling <84187828+canneling@users.noreply.github.com>
Co-authored-by: RONDEAU Felix <79422543+xil-f-dev@users.noreply.github.com>
Co-authored-by: SimonCeder <63475501+SimonCeder@users.noreply.github.com>
2021-12-15 23:02:53 +02:00
Giuseppe D'Addio
408bea9fe8
Update Nations.json (#5778)
Took out two unecessary spaces
2021-12-15 23:01:09 +02:00
Xander Lenstra
b1390cd6db
Moved Coal discovery back to industrialization (#5799) 2021-12-15 14:30:12 +02:00
GGGuenni
28d3c12142
Improvements to TurnChecker data usage (#5789)
* Added necessary utils

Added the FileNotFoundException which is also part of #5593

* Added preview download to MultiplayerScreen

* Added preview download to TurnChecker

* Fixed uncomplete commit

* Removed debug print in MultiplayerScreen
2021-12-13 21:14:30 +02:00
will-ca
270c26c850
Raise minSdk to 21. (#5792) 2021-12-13 20:12:53 +02:00
yairm210
0c1509bfe8 Resolved problem in new uniques with multiple parameters of the same name
Relevant to #5783 and #5781
2021-12-11 20:23:31 +02:00
yairm210
2889d1c24f Merge remote-tracking branch 'origin/master' 2021-12-11 19:49:13 +02:00
yairm210
72d16dbcd4 3.18.9-patch1 2021-12-11 19:48:34 +02:00
SimonCeder
1c01cd27da
Add a couple missing template strings (#5784)
* missing templates

* Update template.properties
2021-12-11 19:30:35 +02:00
yairm210
b537f9e386 Resolved #5779 - uniques and conditionals for translating are taken directly from the uniquetypes 2021-12-10 15:34:17 +02:00
yairm210
3872a46519 Resolved #5691 - enabled code minify, if we see that this ruins stuff we can always turn it back off again with an appropriate comment 2021-12-09 20:47:33 +02:00
yairm210
3dfb0aec70 3.18.8 2021-12-07 22:12:05 +02:00
Yair Morgenstern
312bc3d405
Translations update (#5769)
* Update Indonesian.properties (#5763)

* Update Turkish.properties (#5759)

Co-authored-by: kensvin <63847755+Kensvin28@users.noreply.github.com>
Co-authored-by: omerfaruk-cakmak <32402595+omerfaruk-cakmak@users.noreply.github.com>
2021-12-07 21:45:49 +02:00
SimonCeder
24bd2b66b0
Regions part 3 - resource placement, resource settings (#5690)
* placeLuxuries

* map resource settings

* strategic and bonus resources

* terrain fixes

* slight optimizations

* vanilla jsons

* fix luxury terrain distribution

* also for vanilla

* fix ruleset bug

* terrainfilter
2021-12-07 07:25:16 +02:00
Xander Lenstra
10be481524
Added an icon for the telegraph tech (#5765) 2021-12-06 11:53:29 +02:00
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
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
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
SomeTroglodyte
c1382477e0
Mod manager concurrency (#4750)
* Mod manager concurrency

* Mod manager concurrency - tr
2021-08-04 13:53:42 +03:00
Yair Morgenstern
a3c9214500 3.16.0 2021-08-03 22:41:10 +03:00
Xander Lenstra
4d3195ec5a
Added Diplomatic victory, United Nations, Globalization (#4619)
* Added globalization tech

* Added united nations and backbone for diplomatic victory

* You can now vote with the united nations every 20 * gameSpeed turns, and the results will be displayed the turn after

* You can now win with diplomacy

* AI will now vote in the united nations

* Added the amount of turns till the next diplomatic vote in the diplomacy overview

* Added translatable strings

* Implemented most of the requested changes (rest coming soon)

* Implemented further requested changes
2021-08-03 21:48:51 +03:00
Xander Lenstra
3b4b9a27bf
Split up unit types to its own JSON file (#4717)
* Split off unitTypes to its own json, only containing the domain it can travel in for now

* Updated translationFileWriter to handle this file correctly

* Updated promotions file

* Implemented requested changes

* Units without a sprite use the sprite of a first unit with the same type

* Implemented proposed changes
2021-08-03 19:06:59 +03:00
SomeTroglodyte
c33e7ae6d2
Civilopedia phase 9 - Technologies (#4737) 2021-08-03 09:36:58 +03:00
SomeTroglodyte
731aec0e65
Use stat characters in Civilopedia Unit/Building costs (#4736) 2021-08-03 09:24:31 +03:00
SomeTroglodyte
e8876e90bf
All stats available as text characters (#4734) 2021-08-02 23:35:58 +03:00
Yair Morgenstern
f773a547b3 Solved another teleportation concurrent modification exception 2021-08-02 23:17:28 +03:00
Yair Morgenstern
b62c56d175
Translations update (#4731)
* Update Spanish.properties (#4730)

* Update Spanish.properties

* Update Spanish.properties

* Update Hungarian.Translate (#4729)

just the normal amount of translates

* Update Swedish.properties (#4726)

Translated the newly added lines.

* Update Indonesian.properties (#4722)

* Update Simplified_Chinese.properties (#4719)

* Update Italian.properties (#4716)

Co-authored-by: ArchDuque-Pancake <78449553+ArchDuque-Pancake@users.noreply.github.com>
Co-authored-by: JurDan775 <80947706+JurDan775@users.noreply.github.com>
Co-authored-by: Alex25820 <50142558+Alex25820@users.noreply.github.com>
Co-authored-by: kensvin <63847755+Kensvin28@users.noreply.github.com>
Co-authored-by: HoleHolo <80876542+HoleHolo@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
2021-08-02 20:51:12 +03:00
SomeTroglodyte
a248a1178c
Deprecate Building.cannotBeBuiltWith (Solar/Nuclear Plant exclusion now as unique, auto-displays in Civilopedia) (#4732) 2021-08-02 20:50:56 +03:00
AdityaMH
4a434b3689
Improve Road & Railroad (again) (#4721) 2021-08-02 19:18:53 +03:00
lishaoxia1985
e993f507aa
Map size will modify policy cost, techUniques is initialized by UniqueMap(), Replace "effect" with "uniques" in UnitPromotions.json (#4507)
* Map size will modify policy cost, techUniques is initialized by UniqueMap()

* Replace "effect" with "uniques" in UnitPromotions.json
2021-08-02 19:17:26 +03:00
SomeTroglodyte
7d52cfbcab
Harden map editor map loader against most bad maps (#4711)
* Harden map editor map loader against most bad maps

* Harden map editor map loader against most bad maps - patch1
2021-08-02 19:03:16 +03:00
Yair Morgenstern
f3c0c5d202
Translations update (#4714)
* Turkish Translations (#4695)

* Turkish Translations

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

* Update Turkish.properties

* Update Korean.properties (#4687)

* Update Russian.properties (#4684)

* Update Russian.properties

* Update Russian.properties

* Update Russian.properties

* Update Swedish.properties (#4683)

Translated the newly added lines.

* Update Italian.properties (#4681)

* Update Indonesian.properties (#4679)

* Fixed errors

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

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

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

* Create Buildings.json

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

* Civilopedia phase 8 - Nations and Promotions - AS insubordination

* Civilopedia phase 8 - Nations and Promotions - OR template

* Civilopedia phase 8 - Nations and Promotions - proofread

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

* Update German translation

* Update German translation

* Update Korean.properties (#4665)

* Update Swedish.properties (#4661)

Translated the newly added lines.

* Update Indonesian.properties (#4659)

* Update Italian.properties (#4655)

Co-authored-by: MartinP <77325495+Mape6@users.noreply.github.com>
Co-authored-by: Samsaek the Calico <saud2410@naver.com>
Co-authored-by: Alex25820 <50142558+Alex25820@users.noreply.github.com>
Co-authored-by: kensvin <63847755+Kensvin28@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
2021-07-29 15:30:44 +03:00
AdityaMH
04f688c0f3
And new unit pixel and some improvement. (#4660)
* And new unit pixel and some improvement.

* Improve Road & Railroad more realistic

* Unit pixel improvement

* Delete Airship.png

* Delete Stealth Bomber.png

* Re-art Missionary

* Add Rome color for ballista

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

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

* Update Czech.properties

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

* Update Czech.properties

- fixed messy typo

* Update Indonesian.properties (#4651)

* Update Korean.properties (#4650)

* Update Simplified_Chinese.properties (#4643)

* Update Spanish.properties (#4642)

* Update Spanish.properties

* Update Spanish.properties

* Update Italian.properties (#4640)

* Update Swedish.properties (#4638)

Translated the newly added lines.

Co-authored-by: stoupa007 <60326342+stoupa007@users.noreply.github.com>
Co-authored-by: kensvin <63847755+Kensvin28@users.noreply.github.com>
Co-authored-by: Samsaek the Calico <saud2410@naver.com>
Co-authored-by: HoleHolo <80876542+HoleHolo@users.noreply.github.com>
Co-authored-by: ArchDuque-Pancake <78449553+ArchDuque-Pancake@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: Alex25820 <50142558+Alex25820@users.noreply.github.com>
2021-07-27 22:29:22 +03:00
SimonCeder
1f6f49efd7
Mercantile CS resources (#4641)
* Added Porcelain and Jewelry, assigned to Mercantile CS

* resized Jewelry.png

* moved citystateresource, added resource overview to diplo screen

* citystateresource saved as string

* Update template.properties

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

* Civilopedia phase 7 - Terrain - tuning

* Civilopedia phase 7 - Terrain - patch1 "for"

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

* Update Buildings.json

* Update Buildings.json
2021-07-27 10:38:37 +03:00
Yair Morgenstern
183b94702e Better unique for defending vs units 2021-07-27 05:02:13 +03:00
Yair Morgenstern
1271c86d03 Another unique that should be deprecated :) 2021-07-27 03:47:24 +03:00
Yair Morgenstern
4479103ccc Deprecation of Building.xpForNewUnits, in favor of an existing unique :) 2021-07-27 03:45:49 +03:00
ravignir
eae17b67b4
Update Policies.json (#4646) 2021-07-26 14:31:25 +03:00
Yair Morgenstern
c5ffec9ade Replaced "Building.providesFreeBuilding" field with generic unique 2021-07-26 14:29:43 +03:00
Yair Morgenstern
bc1455de2a 3.15.15 2021-07-25 19:49:39 +03:00
Yair Morgenstern
197bfc40bd
Translations update (#4637)
* Add files via upload (#4632)

* Update Finnish.properties (#4627)

* Update Finnish.properties

* Update Finnish.properties

* Update Finnish.properties

* Update Hungarian.properties (#4625)

* Update Swedish.properties (#4621)

* Update Korean.properties (#4614)

* Update Korean.properties

* Update Korean.properties

* Update Korean.properties

* Update Korean.properties

* Update Korean.properties

스웨덴 문명 추가됨. 아래 주목. (#4566)
> I took the liberty of redoing the city name list. The new list includes only cities in modern Sweden (so no Finland), and no Viking Age settlements that are not currently inhabited.
도시 목록을 모던 스웨덴 기준으로 했다는데, 말이 좋아 그렇지 걍 좃대로 한걸로밖엔 생각되지 않음. Unciv가 문5 따라가는 겜인데, 문5 도시목록에 중대한 오류가 있지 않은 이상 그대로 가주는게 맞는거지. 근데 내가 역사덕후도 아니고 이사람은 스웨덴어 번역(swedish.properties)도 한거보면 현지인인거 같아서 일단 번역은 해놈. 내가 하는 한국어번역부터가 문5를 그렇게 완벽히 리스펙하진 않으니 또이또이기도 하고 걍 내가 귀찮은거 뿐이니까.

도시 목록 번역에는 국립국어원 외래어 표기법을 참고함.
국립국어원 https://www.korean.go.kr/front/main.do
국립국어원 어문규범 https://kornorms.korean.go.kr//main/main.do
국립국어원의 존재의의가 어문규범인데 홈페이지 분리하는 클라스... 그렇지.. 정부기관 홈페이지는 이렇게 지저분해야 제맛이지
스웨덴어 표기법은 알아서 찾아드가시고

실제로 본 페이지는 여기임. 구글링해서 나온거고 내용물은 같은데 레이아웃이 달라버림 ㅋㅋ
스웨덴어 표기 일람표 https://www.korean.go.kr/front/page/pageView.do?page_id=P000115&mn_id=97
스웨덴어 표기 세칙 https://www.korean.go.kr/front/page/pageView.do?page_id=P000136&mn_id=97

도시 목록을 한글로 옮긴 결과물은 다음과 같음
ㅇ : 예시에 있어서 복붙한거
v : 규정에 맞춰서 짜맞추는데 성공한거
?? : 도시이름이 현지표기랑 다르거나(예테보리는 원래 Göteborg), 규정대로 적었는데 구글링 결과가 시원찮은거(그렌나는 영문검색결과도 Granna Granaa 가 더 많음)
Stockholm = 스톡홀름 ㅇ
Uppsala = 웁살라 ㅇ
Gothenburg = 예테보리 ??
Malmö = 말뫼 ㅇ
Linköping = 린셰핑 ㅇ
Kalmar = 칼마르 v
Skara = 스카라 v
Västerås = 베스테로스 ㅇ
Jönköping = 옌셰핑 ㅇ
Visby = 비스뷔 ㅇ
Falun = 팔룬 ㅇ
Norrköping = 노르셰핑 ㅇ
Gävle = 예블레 v
Halmstad = 할름스타드 ㅇ
Karlskrona = 칼스크로나 v
Hudiksvall = 후딕스발 v
Örebro = 외레브로 ㅇ
Umeå = 우메오 ㅇ
Karlstad = 칼스타드 v
Helsingborg = 헬싱보리 v
Härnösand = 헤르뇌산드 v
Vadstena = 바드스테나 v
Lund = 룬드 ㅇ
Västervik = 베스테르비크 v
Enköping = 엔셰핑 ㅇ
Skövde = 셰브데 ㅇ
Eskilstuna = 에실스투나 v
Luleå = 룰레오 ㅇ
Lidköping = 리드셰핑 v
Södertälje = 쇠데르텔리에 ㅇ
Mariestad = 마리에스타드 v
Östersund = 외스테르순드 ㅇ
Borås = 보로스 v
Sundsvall = 순스발 ㅇ
Vimmerby = 빔머뷔 v
Köping = 셰핑 v
Mora = 모라 v
Arboga = 아르보가 v
Växjö = 벡셰 v
Gränna = 그렌나 ??
Kiruna = 키루나 ㅇ
Borgholm = 보르그홀름 v
Strängnäs = 스트렝네스 v
Sveg = 스베그 v

맨날 꺼무위키 보고 작업하다가 해보니까 번역다운 번역 한거같아서 나름 재미있었고, 한국어 정발명이 외래어 표기법에 맞지 않는 경우도 있다는걸 알게됨
( i.e. Jönköping = 옌셰핑 은 문5에도 있는 도시명인데 꺼무에는 이엔최핑이라 되있음 🤦‍♂️ )
그래도 돌발적인 행동은 안해줬으면 좋겠다... 머리터지는줄

* Update Indonesian.properties (#4613)

* Update Indonesian.properties

* Update Indonesian.properties

* Update Indonesian.properties

* Update Italian.properties (#4610)

* Update Russian.properties (#4608)

* Update Russian.properties

* Update Russian.properties

* Translating more (#4604)

* Translating keys and more

* Translating more

* Update Portuguese.properties

* Translating

* Update Portuguese.properties

* Update Portuguese.properties

* Translating civilizations: China, France and Rome

Translating phrases and cities from China, France and Rome.

* Translating the United States and Japan

* Translating Indian and German civilizations

Translating what is missing from the Indian and German civilizations

* Update Portuguese.properties

* Update Portuguese.properties

* Update Portuguese.properties

* Update Portuguese.properties

Co-authored-by: HoleHolo <80876542+HoleHolo@users.noreply.github.com>
Co-authored-by: AcridBrimistic <acridbrimistic@protonmail.com>
Co-authored-by: JurDan775 <80947706+JurDan775@users.noreply.github.com>
Co-authored-by: SimonCeder <63475501+SimonCeder@users.noreply.github.com>
Co-authored-by: Samsaek the Calico <saud2410@naver.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: sockybob <44141246+sockybob@users.noreply.github.com>
Co-authored-by: batatasmor <75855494+batatasmor@users.noreply.github.com>
2021-07-25 19:16:37 +03:00
SomeTroglodyte
d0155a6ddd
Minimap Slider UI (#4634) 2021-07-25 19:08:50 +03:00
SomeTroglodyte
3e482182b3
Unit name translation (#4635) 2021-07-25 19:05:56 +03:00
SomeTroglodyte
966f70d0d4
Rename Railroad tech to Railroads (#4567)
* Rename Railroad tech to Railroads

* Rename Railroad tech to Railroads - force check

* Rename Railroad tech to Railroads - patch1

* Rename Railroad tech to Railroads - atlas

* Rename Railroad tech to Railroads - patch2
2021-07-25 19:04:51 +03:00
SomeTroglodyte
f9bef4a917
Newgame screen overhaul for portrait mode (#4522)
* Newgame screen scrolls nicer, mods sorted, base/ext mod clearer, unified separators

* Newgame-Mods-UI - sort Nations
2021-07-24 21:43:12 +03:00
Yair Morgenstern
7a42ab3e99 Resolved #4394 - corrected misspelled city names 2021-07-23 16:34:04 +03:00
Yair Morgenstern
570ec1c326 Converted Specialist GPP to Counter
Changed jsons of Buildings and Specialists to Great Person names
2021-07-23 16:15:31 +03:00
SomeTroglodyte
6791dd3340
Deprecate "Can only be built on coastal tiles" unique (#4581)
* Deprecate "Can only be built on Coastal tiles"

* Deprecate "Cannot be built on bonus resource"

* Deprecate "Can only be built on Coastal tiles" - bump 'as of'
2021-07-23 13:19:35 +03:00
SomeTroglodyte
2b3afb5acf
Civilopedia for Religion - atlas (#4616) 2021-07-23 09:30:05 +03:00
SomeTroglodyte
e41ba0da91
A Civilopedia category for Religion (#4609)
* A Civilopedia category for Religion

* Civilopedia for Religion - rename cat, template and EOF linting

* Civilopedia for Religion - oversight
2021-07-23 00:10:47 +03:00
Yair Morgenstern
f2697ee8a1 3.15.14 2021-07-22 20:39:24 +03:00
Yair Morgenstern
5a9e4cfb85
Translations update (#4596)
* Update Russian.properties (#4594)

* Update Swedish.properties (#4592)

* Refactor German translation of Multiplayer (#4591)

* Update German translation (#4590)

* Update Spanish.properties (#4586)

* Update Indonesian.properties (#4577)

* Update Italian.properties (#4571)

* Update Korean.properties (#4569)

* Update Korean.properties

* Update Korean.properties

Co-authored-by: sockybob <44141246+sockybob@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: ArchDuque-Pancake <78449553+ArchDuque-Pancake@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: Samsaek the Calico <saud2410@naver.com>
2021-07-22 19:44:51 +03:00
SomeTroglodyte
61204db01c
Resolve #4589 (#4605) 2021-07-22 19:42:19 +03:00
SimonCeder
2971e6bba3
Map generation and start locations (#4588)
* cellular automata for mountains and hills

* cellular automata for mountains and hills

* tweaks

* spawn location algorithm

* consolation prizes

* improve city state spawns

* AI settle in place if possible

* make heightmap generation mod agnostic
2021-07-21 14:41:48 +03:00
Xander Lenstra
e48ae69927
Implemented temples (#4585) 2021-07-21 12:21:24 +03:00
Xander Lenstra
85f4840e35
Hide lesser used action buttons to free up space (#4580)
* You can now use 'h' to fortify/sleep until healed

* Hide lesser used unit actions by default

* Refactored worker actions into automate & build improvements

* Added missing translation lines

* Fixed translations
2021-07-21 10:43:55 +03:00
Xander Lenstra
3d13680602
Update translationFileWriter to include missing strings (#4578)
* Update translationFileWriter to include strings from new json files

* Fix promotions with multiple uniques not getting translated

* Add missing translatable strings (thanks to DuffLagerleff for finding these)
2021-07-20 17:07:15 +03:00
SimonCeder
239a406bc4
Added Sweden Civ (#4566)
* wonder splash screens

* wonder splash screens atlas

* reset to master

* Add Sweden

* add translations

* translations

* implement first part of UP

* add icons to atlas

* implement second part of swedens up

* implement first hakkapeliitta unique

* implement second hakkapeliitta unique

* gifted GPs are removed

* update sweden symbol

* translations

* review Hakkapeliitta unique

* removed unneccesary parameters

* hakka UP review

* Hakka UP part 2

* yairm's reviews

* translations for fixes

* removed [great person generation] parameter as it's hardcoded anyway

* Moved check for stacking unit bonus outside great general logic
2021-07-20 17:06:15 +03:00
Yair Morgenstern
05adc04a71 Added translations 2021-07-20 00:48:35 +03:00
Yair Morgenstern
bdf46ea66c 3.15.13 2021-07-19 22:31:55 +03:00
Yair Morgenstern
9a7a0f3c7d
Translations update (#4559)
* Update Ukrainian.properties (#4550)

* Update Korean.properties (#4544)

* Update Korean.properties

* Update Korean.properties

* Update Korean.properties

* Update Simplified_Chinese.properties (#4543)

* Update Czech.properties (#4540)

* Update Czech.properties

new strings, some old tweaked for better gramar

* Update Czech.properties

tweaked word form to beter fit to usage

* Updated Swedish Translation (#4539)

* Updated Swedish Translation

Translated the last lines that needed to be translated for the Swedish translation to be complete.

* Updated 2 lines with advice from SimonCeder

* Refactor New game screen (#4538)

* Update Russian.properties (#4537)

* Update Russian.properties

* Update Russian.properties

* Update German translation (#4536)

* Refactor Diplomacy,Trade,Nations (#4535)

* Refactor Nation Picker (#4534)

* Update Indonesian.properties (#4562)

* Unit gifting (#4557)

* wonder splash screens

* wonder splash screens atlas

* reset to master

* add basic gifting to city states and major civs

* actual gifting of the unit

* add gift icon to atlas

* adjust relationship decay

* add strings to jsons

* AI and player return same object

* Update Indonesian.properties

Co-authored-by: SimonCeder <63475501+SimonCeder@users.noreply.github.com>

Co-authored-by: DuffKI <51823715+DuffLagerleff@users.noreply.github.com>
Co-authored-by: Samsaek the Calico <saud2410@naver.com>
Co-authored-by: HoleHolo <80876542+HoleHolo@users.noreply.github.com>
Co-authored-by: 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>
Co-authored-by: kensvin <63847755+Kensvin28@users.noreply.github.com>
Co-authored-by: SimonCeder <63475501+SimonCeder@users.noreply.github.com>
2021-07-19 22:10:37 +03:00
Xander Lenstra
c81c1b6a1b
Implemented Follower beliefs for religions (#4530)
* Minor things

* Added a few follower beliefs

* Implemented follower beliefs when founding a religion

* Added missing follower beliefs as much as possible

* Religion screen now scrolls correctly

* Buttons for chosen religions are now disabled  instead of removed, idea couresty to someTroglodyte

* Implemented requested changes
2021-07-19 21:51:34 +03:00
SomeTroglodyte
50cec97354
Spruced up Civilopedia - phase 5 - buildings (#4391)
* Spruced up Civilopedia - phase 5 - buildings

* Finish merging master into Civilopedia-Buildings

* Spruced up Civilopedia - phase 5 - buildings - patch

* Spruced up Civilopedia - phase 5 - buildings - patch2

* Spruced up Civilopedia - phase 5 - buildings - patch3

* Spruced up Civilopedia - phase 5 - buildings - patch4

* Spruced up Civilopedia - phase 5 - buildings - patch5
2021-07-19 21:48:51 +03:00
SimonCeder
118c1fc888
Unit gifting (#4557)
* wonder splash screens

* wonder splash screens atlas

* reset to master

* add basic gifting to city states and major civs

* actual gifting of the unit

* add gift icon to atlas

* adjust relationship decay

* add strings to jsons

* AI and player return same object
2021-07-19 00:30:10 +03:00
Xander Lenstra
70f34f2f85
Fixed unique of Persian immortal not working (#4547)
Fixed #4546
2021-07-17 22:18:54 +03:00
Yair Morgenstern
de582cf66a Resolved #4528 - added Polder image 2021-07-16 09:30:04 +03:00
Yair Morgenstern
60bcc8f1cf 3.15.12-patch1 2021-07-16 09:23:49 +03:00
Yair Morgenstern
357b22cec5
Translations update (#4533)
* Update Swedish.properties (#4529)

* Refactor German translation of Trades (#4527)

* Refactor Trades

* Refactor Trades

* Update German translation (#4526)

* Update Russian.properties (#4525)

* Update Russian.properties

* Update Russian.properties

* Update Korean.properties (#4524)

* Update Indonesian.properties (#4523)

* Update Indonesian.properties

* Update Indonesian.properties

* Update Indonesian.properties

* Missing translation templates from BattleDamage modifiers (#4521)

* Update Italian.properties (#4517)

* Update Spanish.properties (#4516)

Soory for being late

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

* Refactor German translation of City-States (#4512)

* Refactor City-States

* Refactor City-States

* Refactor City-States

Co-authored-by: SimonCeder <63475501+SimonCeder@users.noreply.github.com>
Co-authored-by: MartinP <77325495+Mape6@users.noreply.github.com>
Co-authored-by: sockybob <44141246+sockybob@users.noreply.github.com>
Co-authored-by: Samsaek the Calico <saud2410@naver.com>
Co-authored-by: kensvin <63847755+Kensvin28@users.noreply.github.com>
Co-authored-by: SomeTroglodyte <63000004+SomeTroglodyte@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: ArchDuque-Pancake <78449553+ArchDuque-Pancake@users.noreply.github.com>
2021-07-16 09:05:31 +03:00
Giuseppe D'Addio
d87db92171
Update Nations.json (#4520)
You guys misses Attila and Williem's defeated lines
2021-07-15 10:39:32 +03:00
Yair Morgenstern
df2cf711ba More deprecation 2021-07-14 23:30:47 +03:00
Yair Morgenstern
6b73a3e9d7 3.15.12 2021-07-14 22:34:11 +03:00
Yair Morgenstern
8cc407ab44
Translations update (#4515)
* Refactor Diplomatic modifiers (#4500)

* Update German translation (#4499)

* Update Russian.properties (#4497)

* Update Russian.properties

* Update Russian.properties

* Update Russian.properties

a little experiment

* Update Korean.properties (#4495)

* Update Korean.properties

* Update Korean.properties

* Update Korean.properties

* Update Korean.properties

* Update Korean.properties

* Update Portuguese.properties (#4494)

* Update Spanish.properties (#4493)

* Update Spanish.properties

* Update Spanish.properties

* Update Swedish.properties (#4492)

* Update Italian.properties (#4491)

Co-authored-by: MartinP <77325495+Mape6@users.noreply.github.com>
Co-authored-by: sockybob <44141246+sockybob@users.noreply.github.com>
Co-authored-by: Samsaek the Calico <saud2410@naver.com>
Co-authored-by: batatasmor <75855494+batatasmor@users.noreply.github.com>
Co-authored-by: ArchDuque-Pancake <78449553+ArchDuque-Pancake@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>
2021-07-14 22:22:11 +03:00
Xander Lenstra
2752c713b9
Founding Religions (#4505)
* Fixed crashes on loading save games with religion

* Added missing credit

* Religious cities now show religion icons in the city button

* Add icons for religions

* You can now found beliefs, with snazzy icons!

* Fixed bug which made prophets impossible to generate

* Added missing translatable strings

* Fixed translation tests properly

* Implemented requested changes

* Implemented part of the requested changes

* Removed SplitPane in favor of Table

* Removed unused code

* Capped the amount of foundable religions to the amount of religions
2021-07-14 22:09:51 +03:00
SomeTroglodyte
f54c76ec42
'Swap units' sound replaced (#4501) 2021-07-13 17:38:38 +03:00
Xander Lenstra
07e3a2228e
Fixed bug where effects of all aquaducts nationwide stacked in each city (#4487)
* Fixed bug where effects of all aquaducts nationwide stacked in each city

* Implemented requested changes

* Implemented requested changes better
2021-07-13 06:26:37 +03:00
Yair Morgenstern
573eacb8c9 3.15.11 2021-07-12 22:03:14 +03:00
Yair Morgenstern
85123b39a8
Translations update (#4488)
* Update Simplified_Chinese.properties (#4486)

* Update Czech.properties (#4482)

* Translating new Civilopedia entries

* More Civilopedia

* Civilopedia again

* Almost done...

* Finally done :)

* Update German translation (#4481)

* Update German translation

* Update German translation

* Update German translation

* Consistency of Great Person

* Update Swedish.properties (#4477)

* Translating more (#4474)

* Adjusting the accent

I changed a lot of phrases and words to European Portuguese as these phrases were in Brazilian Portuguese which has its own translation in another document.

* Translating more stuff

* Translating more

Translating Babylonian and Greek names.

* Translating 2 more civilizations

Translating Egypt and England

* Update Russian.properties (#4472)

* Update Russian.properties

* Update Russian.properties

* Update Russian.properties

* Update Indonesian.properties (#4468)

* Update Italian.properties (#4466)

* Update Italian.properties

* Update Italian.properties

* Update Korean.properties (#4489)

* Resolved #4484 - civs with no cities can no longer pick policies

* Update Korean.properties

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

Co-authored-by: HoleHolo <80876542+HoleHolo@users.noreply.github.com>
Co-authored-by: jahodovykolac <79529669+jahodovykolac@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: batatasmor <75855494+batatasmor@users.noreply.github.com>
Co-authored-by: sockybob <44141246+sockybob@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: Samsaek the Calico <saud2410@naver.com>
2021-07-12 21:53:17 +03:00
Xander Lenstra
f97e64e54e
Fixed bug where submarines could not attack embarked units (#4459)
* Fixed bug where submarines could not attack embarked units

* Implemented requested changes

* Fixed typo
2021-07-12 19:37:56 +03:00
Yair Morgenstern
5a0eb11bd0 3.15.10 2021-07-10 23:56:06 +03:00
Yair Morgenstern
0cc3b6f550 Resolved #4457 - spelling mistakes 2021-07-10 23:22:44 +03:00
Yair Morgenstern
56111fa24c
Translations update (#4465)
* Update Simplified_Chinese.properties (#4456)

* Update Indonesian.properties (#4455)

* Update Indonesian.properties

* Update Indonesian.properties

* Update Italian.properties (#4445)

* Laid some groundwork for implementing further religions (#4444)

* Laid some groundwork for implementing further religions

* Fixed duplication of Religion object

* Update Korean.properties (#4443)

* Update Korean.properties

* Update Korean.properties

* Update Spanish translations fase 1 (#4440)

* Update Spanish translations fase 1

DO NOT merge this until I have finnished it. I run out of time today.

* Update Spanish.properties

* Update Czech.properties (#4437)

* Update Czech.properties

many new (and old) strings translated

* Update Czech.properties

tweaked some newly translated strings

* huns and netherlands strings

* Update Swedish.properties (#4436)

Back up to 100%
Also some tweaks:
Ändrade ett par enheter för att få realegenus (en/den) på så många som möjligt
t ex Pansarskepp -> Pansarbåt (historiskt korrekt benämning, även Monitor är tänkbart)
Man kan överväga även t ex Infanteri -> Infanterist, finns åsikter?

* Update German translation (#4434)

* Adjusting the accent (#4426)

I changed a lot of phrases and words to European Portuguese as these phrases were in Brazilian Portuguese which has its own translation in another document.

Co-authored-by: lishaoxia1985 <49801619+lishaoxia1985@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: Xander Lenstra <71121390+xlenstra@users.noreply.github.com>
Co-authored-by: Samsaek the Calico <saud2410@naver.com>
Co-authored-by: ArchDuque-Pancake <78449553+ArchDuque-Pancake@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: batatasmor <75855494+batatasmor@users.noreply.github.com>
2021-07-10 23:02:23 +03:00
Xander Lenstra
b650b95356
Add missing pantheons, fix minor bugs (#4419)
* Added all remaining pantheons

* AI now choose pantheons, AI no longer tries to get mutually exclusive policies

* I don't know why this was changed

* Implemented requested changes
2021-07-10 22:50:50 +03:00
Xander Lenstra
253e62de72
City states give gold when met; updates to city state gold gifts (#4435)
* City States now give gold when met

* City States can now receive different amounts of gold, and the amount of influence gained from gifts follows the base game

* Implemented requested changes

* Fixed tests
2021-07-10 21:51:11 +03:00
Yair Morgenstern
d262c1a6ea Automated atomic bombs no longer cause crashes 2021-07-09 13:51:18 +03:00
Xander Lenstra
c327b54b1b
City Centers can no longer be removed by nukes (#4423)
* City Centers can no longer be removed by nukes

* Implemented requested changes

* Implemented more requested changes
2021-07-09 12:13:45 +03:00
Yair Morgenstern
df7bba02a1 Merge branch 'master' of https://github.com/yairm210/Unciv 2021-07-09 11:01:40 +03:00
Yair Morgenstern
0d328ef99a Stuffed some +/- uniques into the square brackets 2021-07-09 11:01:25 +03:00
Xander Lenstra
5376e488a0
Added a simplified version of great prophets, implemented a basic city religion UI (#4356)
* Add a very simple display for the religion in a city

* Added missing credits for shrine

* Added Great Prophet unit

* Great prophets can now be generated using faith

* Great Prophets can now construct holy sites

* Great Prophets can now spread their religion to friendly cities

* Holy site can only be constructed if the great prophet hasn't spread religion yet

* Added missing translation string

* Fixed more translation problems

* Implemented requested changes
2021-07-09 10:48:33 +03:00
Yair Morgenstern
abd877dd1b Resolved #4427 2021-07-09 10:19:21 +03:00
Yair Morgenstern
cc3146f92b Actual translations 2021-07-09 10:17:22 +03:00
Yair Morgenstern
37942a1af6
Translations update (#4433)
* Update Ukrainian.properties (#4429)

* Update Ukrainian.properties

* Update Ukrainian.properties

* Added Civilopedia Texts

* Add most of religion-related stuff and made some other edits

Also I haven't understood how to translate Goddess of Festivals and Religious Idols uniques

* Update Russian.properties (#4424)

* Update Russian.properties

Translated some of new strings

* Update Russian.properties

* Update Russian.properties

Some more translation and improvements

* Update Indonesian.properties (#4421)

* Update Indonesian.properties

* Update Indonesian.properties

* Update Korean.properties (#4420)

* Update Korean.properties

* Update Korean.properties

* Update Korean.properties

* Update Korean.properties

* Update Korean.properties

* Update Korean.properties

* Update German translation (#4413)

* Update German translation

* Update German translation Iroquois

* Update German translation

* Update German translation

* Translation of The Netherlands

* Update Swedish.properties (#4414)

* Update Swedish.properties

* Update Swedish.properties

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

Co-authored-by: DuffKI <51823715+DuffLagerleff@users.noreply.github.com>
Co-authored-by: sockybob <44141246+sockybob@users.noreply.github.com>
Co-authored-by: kensvin <63847755+Kensvin28@users.noreply.github.com>
Co-authored-by: Samsaek the Calico <saud2410@naver.com>
Co-authored-by: MartinP <77325495+Mape6@users.noreply.github.com>
Co-authored-by: SimonCeder <63475501+SimonCeder@users.noreply.github.com>
2021-07-09 09:19:02 +03:00
Xander Lenstra
21eadb39ff
Updated TranslationFileWriter to include the new values that filters can have (#4402)
* Updated TranslationFileWriter to include the new values that filters can have

* Implemented requested changes
2021-07-09 09:14:24 +03:00
SomeTroglodyte
5e01ce82b2
Quick salvage of some lost translations (#4415) 2021-07-07 23:08:20 +03:00
Xander Lenstra
fbd64b9520
Refactored the way cities determine what uniques should apply when (#4393)
* I'm so sorry for the size of this PR

* Uniques are better generalized

* Code now compiles

* Missed a line

* Some more cleaning up
2021-07-07 22:01:14 +03:00
Yair Morgenstern
ecd5ae5128 3.15.9 2021-07-07 20:54:19 +03:00
ArchDuque-Pancake
9b2460f166
Update Spanish Properties - ¡read my description! (#4404)
In the tutorials part, I am not sure if all those emojis are different or not, I can not tell. So please, check that and if you can correct it if you can.
2021-07-07 20:01:28 +03:00
SomeTroglodyte
373b42bfcf
Update "World screen" tutorial text and Home key improved (#4403) 2021-07-07 20:00:12 +03:00
Yair Morgenstern
8eb97b2ea0
Translations update (#4400)
* Update Ukrainian.properties (#4398)

* Update Simplified_Chinese.properties (#4397)

* Update Russian.properties (#4384)

* Update Russian.properties

Translated new strings

* Update Russian.properties

* Update Swedish.properties (#4383)

* Update Swedish.properties

* Update Swedish.properties

* Update Swedish.properties

* Update Swedish.properties

* Update Indonesian.properties (#4382)

* Update Indonesian.properties

* Update Indonesian.properties

* Update Indonesian.properties

* Update Indonesian.properties

* Update Indonesian.properties

* Update German translation (#4380)

* Update German translation

* Update German translation

* Update German translation

* Update German translation

* Update German translation

* Update German translation

* Update German translation

* Update German translation

* Update German translation

* Update German translation for railroad things

* Update Korean.properties (#4376)

* Update Korean.properties

* Update Korean.properties

* Update Korean.properties

Co-authored-by: DuffKI <51823715+DuffLagerleff@users.noreply.github.com>
Co-authored-by: Zkdc <Zkdc2345@qq.com>
Co-authored-by: sockybob <44141246+sockybob@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: MartinP <77325495+Mape6@users.noreply.github.com>
Co-authored-by: Samsaek the Calico <saud2410@naver.com>
2021-07-07 19:59:14 +03:00
SomeTroglodyte
7875ec4896
Better mod download and error display (#4396)
* Better mod download and error display

* Fix Android Studio Insubordinations
2021-07-06 19:33:05 +03:00
Xander Lenstra
7d8f8b981d
Fixed bug where logistics _still_ did not work (#4388) 2021-07-05 21:09:10 +03:00
Yair Morgenstern
c1ff2e4ba7 Fixed Denmark's unique including also embarking instead of just disembarking 2021-07-05 21:06:54 +03:00
SomeTroglodyte
c42561c545
Spruced up Civilopedia - phase 4 - Visual candy, Units (#4350)
* Spruced up Civilopedia - phase 4 - Visual candy, Units

* Unified separators, CheckBox helper - patch2

* Unified separators, CheckBox helper - atlas merge

* Spruced up Civilopedia - phase 4 - rebuild atlas

* Spruced up Civilopedia - phase 4 - rebuild atlas

* Spruced up Civilopedia - phase 4 - do separator to-do
2021-07-05 16:35:41 +03:00
SomeTroglodyte
d909143a34
'Swap units' sound and more attack sounds (#4379) 2021-07-05 11:31:13 +03:00
Xander Lenstra
624fe33be1
Updated template.properties (#4377)
* Updated translation file

* Made tests happy

* Removed unused, athematic unit filter

* Added submarine unit translation
2021-07-05 11:20:12 +03:00
Xander Lenstra
957c8697ac
Added the nation of the Netherlands (#4372)
* Added the nation of the Netherlands

* Added Sea Beggar, Dutch unique unit

* Added polder improvement, Dutch unique improvement

* Added national ability
2021-07-05 09:35:04 +03:00
Yair Morgenstern
b748f92bb5 3.15.8 2021-07-04 21:09:17 +03:00
Yair Morgenstern
8a139e57b8
Translations update (#4371)
* Update Indonesian.properties (#4369)

* Update Korean.properties (#4364)

* Update German translation (#4363)

* Update German.properties

* Update German translation

* Update German translation

Co-authored-by: kensvin <63847755+Kensvin28@users.noreply.github.com>
Co-authored-by: Samsaek the Calico <saud2410@naver.com>
Co-authored-by: MartinP <77325495+Mape6@users.noreply.github.com>
2021-07-04 19:19:35 +03:00
Xander Lenstra
0d26c69710
More bug fixes (#4370)
* Fixed Air Targetting not having icon

* Fixed the huns not having battering ram unique unit

* Plundering with multiple levels of coastal raider no longer creates multiple notifications

* Implemented requested changes
2021-07-04 19:18:15 +03:00
Xander Lenstra
2a4ca74e7b
Fixed more bugs I introduced myself (#4368)
* Fix bug where mobility doesn't work

* Fixed supply _still_ not working
2021-07-04 17:34:27 +03:00
Xander Lenstra
be5345477a
Fixed bug where heal instantly would not heal (#4367) 2021-07-04 17:32:50 +03:00
Xander Lenstra
aa132c8bf8
Fixed more bugs (#4360)
* Fixed city states spawning with multiple settlers

* Renamed icon for the huns
2021-07-04 00:25:20 +03:00
Yair Morgenstern
c91e94ae03 Translations update 2021-07-03 23:02:41 +03:00
Yair Morgenstern
8ca6fc0a08
Translations update (#4359)
* Update Korean.properties (#4346)

* Update Korean.properties

* Update Korean.properties

* Update Korean.properties

* Update Simplified_Chinese.properties (#4342)

* Update Simplified_Chinese.properties

* Update Simplified_Chinese.properties

* Update Swedish.properties (#4339)

* Update German.properties (#4338)

* Update German.properties

* Update German.properties

* Russian Translation (#4337)

Translated new strings and made slight improvements

* Update Italian.properties (#4333)

Co-authored-by: Samsaek the Calico <saud2410@naver.com>
Co-authored-by: HoleHolo <80876542+HoleHolo@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: sockybob <44141246+sockybob@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
2021-07-03 22:57:58 +03:00
Xander Lenstra
6c221cd56b
Fix multiple bugs resulting from updating promotions and implementing missile cruisers (#4355)
* Fixed carriers in mods no longer working

* Fixed scouting prerequisites

* Fixed surivialism not having icon or prerequisites

* Fix logistics in mods not working

* Added image for supply promotion
2021-07-03 22:26:03 +03:00
SomeTroglodyte
8fdb4f413e
Spruced up Civilopedia - phase 3 - Interface, flavour text, new Tutorial (#4334) 2021-07-02 19:22:38 +03:00
Xander Lenstra
b8d79dc23d
Split off properties of era's to another JSON file (#4336)
* Added Era.json and imported the data to the ruleset

* Units at start are now also determined by eras.json

* Research agreement costs now determined by json file

* Gold and Culture provided at the start are now awarded

* Can no longer build wonders that are more than two eras older than the starting era

* Default population and buildings for settlers can now be added

* Added checks for validity of eras.json file in mods

* Colors for the icons of technologies are no also saved in eras.json

* Removed constants for all era's as they have been generalized away by this PR

* Removed spurios println's

* Added compatibility for mods

* Updated the military unit you get from ruines to be the military unit you received at the start of the game
2021-07-02 15:45:18 +03:00
Xander Lenstra
d94a1d1432
Updated and generalized more promotions (#4331)
* Generalized "[1] extra interceptions may be made per turn"

* Generalized and rephrased Cover promotion (requires #4311 to work)

* Generalized Logistics

* According to the civilopedia the defence value of cover has also risen, apparently

* Updated Ambush strength values

* Split up Targeting and Air Targeting (different strength bonus)

* Generalized Haka War Dance

* Added Supply promotion

* Renamed a unique so it matches other uniques

* Implemented May heal outside of friendly territory better

* Implemented requested changes
2021-07-02 14:02:20 +03:00
Xander Lenstra
70882b4e8b
Added Privateer unit; updated Coastal Raider promotion (#4301)
* Added privateer unit

* Privateers can now capture other naval units

* Updated Coastal Raider promotion to include the gold gained from damaging cities

* Added missing translatable notification

* Implemented requested changes

* Implemented requested changes _but better_

* Forgot to update a variable name
2021-07-02 10:38:45 +03:00
Xander Lenstra
afdc2ffbd5
Adds the nation of The Huns (#4311)
* Added the nation of The Huns

* Added unique units of The Huns

* Removed MountedRanged unitType

* Implemented requested changes

* Fixed some typo's, split up a very long function for redability

Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
2021-07-01 22:53:00 +03:00
Xander Lenstra
c6fac03067
Added a few pantheons; religion uniques affect cities instead of civs; updated pantheon picker screen (#4296)
* Added a few simple beliefs for testing

* Moved CityReligion to its own file

* Created a picker screen for choosing pantheons

* Pantheon uniques are now calculated only for cities with the specific pantheon

* Added all the pantheon beliefs that can easily be added and commments for the ones still missing

* Games only have religion if either the user specifically asked for it, or uses a mod with religion

* Implemented requested changes
2021-07-01 22:48:18 +03:00
Yair Morgenstern
95ae1cea30 3.15.7 2021-07-01 22:44:36 +03:00
Yair Morgenstern
19314bf197
Translations update (#4332)
* Update Swedish.properties (#4328)

* Update Swedish.properties

* Update Swedish.properties

* Update Swedish.properties

* Update Korean.properties (#4322)

* Update German Translation (#4320)

* Update German.properties

* Update German.properties

* Update German.properties

* Update German.properties

* Russian Translation (#4314)

* Russian Translation

Translated new strings

* Update Russian.properties

* Update Russian.properties

Made some improvements

* Update Spanish.properties (#4312)

* Update Italian.properties (#4308)

* Update Italian.properties

* Update Italian.properties

Co-authored-by: SimonCeder <63475501+SimonCeder@users.noreply.github.com>
Co-authored-by: Samsaek the Calico <saud2410@naver.com>
Co-authored-by: MartinP <77325495+Mape6@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-07-01 22:34:55 +03:00
Xander Lenstra
c350a3c923
Fix a few bugs related to nukes (#4324)
* Fixed bugs where nukes don't work due to capitilzation issues

* Renamed existing translations

* Fixed crash happening when nuking tiles without an owner

* Added notifications to attacker for civs that have declared war as a result of the nuke dropping
2021-07-01 22:18:37 +03:00
Yair Morgenstern
74fd80416c Merge branch 'master' of https://github.com/yairm210/Unciv 2021-06-30 21:02:57 +03:00
Yair Morgenstern
aeceead616 Removed final vestiges of old Bonus/Penalty effects.
Friendship ended with Regex, now Unique is my best friend.
2021-06-30 21:02:53 +03:00
SomeTroglodyte
a69776cafa
The GDR needs an impressive attack sound. (#4317)
* The GDR needs an impressive attack sound.

* The GDR needs an impressive attack sound - alt

* The GDR needs an impressive attack sound - alt2
2021-06-30 20:41:43 +03:00
Xander Lenstra
a0cf30831c
Updated promotions - make more generalizable, update to G&K (#4292)
* Generalized the "Heal Instantly" promotion

* Extended "Indirect Fire" to WaterRanged units, conform the main game

* Generalized Extend Range, Operational Range

* Generalized "logistics"

* Typo

* Generalized the healing from "Medic"

* Implemented requested changes

* Generalized "[amount] Movement"; "[amount] Visibility Range"

* Added survavalism promotions

* Updated Boarding Party strength bonus values to G&K

* Implemented requested changes
2021-06-30 17:09:02 +03:00
SomeTroglodyte
8b7804b19a
Quickfix unit tests failing (#4309) 2021-06-30 15:13:18 +03:00
Yair Morgenstern
0b6510a39c 3.15.6 2021-06-29 23:15:57 +03:00
Yair Morgenstern
c380d6e7b7
Translations update (#4306)
* Update Korean.properties (#4305)

* Missing single quotation mark in quote (#4297)

* Missing single quotation mark in quote

Inserted ' in quote of Advanced Ballistics

* Changed quote in all language files

* Update Swedish.properties (#4282)

* Update Swedish.properties

* Update Swedish.properties

* Update Swedish.properties

* Update Swedish.properties

* Update Swedish.properties

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

* Update Russian.properties (#4269)

* Update Russian.properties

Translated new strings

* Update Russian.properties

Some fixes and improvements

* Update Russian.properties

Made some improvements

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

* Update Italian.properties (#4267)

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

* Update German.properties (#4281)

* Update German.properties

* Update German.properties

* Update German.properties

* Update German.properties

* Update German.properties

* Update German.properties

* Update German.properties

* Update German.properties

* Update German.properties

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

Co-authored-by: Samsaek the Calico <saud2410@naver.com>
Co-authored-by: MartinP <77325495+Mape6@users.noreply.github.com>
Co-authored-by: SimonCeder <63475501+SimonCeder@users.noreply.github.com>
Co-authored-by: sockybob <44141246+sockybob@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
2021-06-29 22:35:42 +03:00
SomeTroglodyte
4d16b3fcf8
Respect visualMods for Sound - CheckBox, formats, modchange detect (#4295)
* Respect visualMods for Sound - CheckBox, formats, modchange detect

* Respect visualMods for Sound - german patch
2021-06-29 21:31:57 +03:00
Xander Lenstra
168f984a65
Added Shrine, option for enabling religion (#4291)
* Added option in-game to enable faith (highly discouraged)

* Added shrine for generating Faith

* Made Shrine hidden in games without religion
2021-06-28 14:25:34 +03:00
SomeTroglodyte
ca58cf1694
Translation template fixes (#4287)
* Translation template fixes

* Translation template fixes - patch

* Translation template fixes - another
2021-06-27 21:22:47 +03:00
Arthur van der Staaij
0f0abad5ea
Added Stealth tech and Stealth Bombers (#4271)
* Changed some interception-related uniques

- "Can not be intercepted" -> "Cannot be intercepted"
  This really irked me, and the new version is also how it is written
  in the wiki.
- "Reduces damage taken from interception by 50%" ->
  "Damage taken from interception reduced by [50]%"

* Added "Cannot be carried by [unitFilter] units" unique

* Added an icon for Stealth

* Added Stealth technology and the Stealth Bomber

* Possibly fixed incorrect rounding for interception damage bonus

* Various code style changes

* Made Stealth Bomber interceptable, but with 100% damage reduction
2021-06-27 08:57:11 +03:00
Arthur van der Staaij
784092c56c
Added Drama and Poetry tech and replaced Temples with Amphitheaters (#4254)
* Added Drama and Poetry tech

* Moved not-in-ruleset check to building replacement function

* Updated a version number
2021-06-26 23:36:39 +03:00
Xander Lenstra
1c079bcef3
Added Nuclear Submarines & Missile Cruisers, capable of transporting missiles (#4260)
* Implemented Nuclear Submarine and Missile Cruiser units

* Information Era -> Atomic Era; Future Era -> Information Era, conform G&K

* Fixed deprecated uniques still working

* Implemented requested changes
2021-06-26 22:47:27 +03:00
Yair Morgenstern
7b7101b0b7 3.15.5 2021-06-25 17:42:35 +03:00
Yair Morgenstern
2f51436be5
Translations update (#4258)
* Fix some problems (wouldnt merge lol) (#4256)

* many new strings translated (#4255)

* Update Italian.properties (#4251)

typo

* Update Korean.properties (#4250)

* Update Korean.properties

* Update Korean.properties

* Update Korean.properties

* Update Korean.properties

* Update Korean.properties

* Update Korean.properties

* Update Spanish.properties (#4248)

* Russian Translation (#4244)

Translated new lines and fixed typo

* Update Italian.properties (#4240)

* Update German.properties (#4263)

* Update German.properties

* Update German.properties

* add edits (#4261)

This was just some additions. There are random apostrophes that end up quoting large chunks of text until a new apostrophe is found. I don't know if this can be a problem for the technical part but for now, is just a minor pain when translating because of lack of auto-complete.

* Revert "add edits (#4261)" (#4264)

This reverts commit 980ca313fa.

Co-authored-by: Miraç <56484801+logicminimal@users.noreply.github.com>
Co-authored-by: stoupa007 <60326342+stoupa007@users.noreply.github.com>
Co-authored-by: end <72604018+laok233@users.noreply.github.com>
Co-authored-by: TG <saud2410@naver.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: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: MartinP <77325495+Mape6@users.noreply.github.com>
Co-authored-by: Rafael 'Fig' Diamantino de Figueiredo <45023203+rafaeldfigueiredo@users.noreply.github.com>
2021-06-25 17:09:21 +03:00
Xander Lenstra
e6850b857a
Generalized building of improvements (#4252)
* Generalized building of improvements

* Readded support for the deprecated unique "Can build improvements on tiles"

* Small code quality changes

* Implemented requested chagnes
2021-06-25 16:35:15 +03:00
Xander Lenstra
af0cd0c9df
Implements the Telecommunications tech (v2) (#4249)
* Added the addPopulation() and setPopulation() functions to add population to cities and automatically reassign them

* Added the Telecommunications tech

* Added the CN tower

* Implemented Bomb Shelter

* Added icons for new buildings

* Implemented requsted changes
2021-06-24 19:07:33 +03:00
Xander Lenstra
111d11b9b2
Added Advanced Ballistics Tech, Atomic Bomb Unit, Updated how nukes work (#4211)
* Improved nukes

* Fixed build error (probably)

* Implemented reocmmended changes, fixed some other stuff, the usual

* Implemented requested changes

* Fixed Tech connections

* Fixed nuclear missiles and guided missiles being interceptable

* Missiles are no longer air units. This is, as they cannot be stationed on carriers and cannot be intercepted.
2021-06-24 16:03:59 +03:00
Yair Morgenstern
74e3b67afe 3.15.4 2021-06-23 10:29:51 +03:00
Arthur van der Staaij
5b730fbc56
Added Nuclear Fusion tech and the Giant Death Robot (#4207)
* Reordered units

Consistently ordered units based on, in decreasing priority:
- Tech tree column
- Height in tech tree column

* Added Nuclear Fusion technology and GDR
2021-06-23 09:44:53 +03:00
Arthur van der Staaij
e10c52efc1
Fixed open terrain bonus working in rough terrain (#4219)
* Fixed open terrain bonus working in rough terrain

Fixed #4139 - The open terrain combat bonus no longer works in rough
terrain.

Deprecated "Open terrain" and "Rough terrain" uniques and undeprecated
"rough" property of terrains.

* Minor simplification

* Replaced "rough" with "Rough terrain" unique

* Empty commit to re-run the build checks
2021-06-23 09:41:55 +03:00
Yair Morgenstern
f745ca9421
Translations update (#4236)
* Did some translations #123456789 (#4234)

also fixed some sentenced or lines

* Update Spanish.properties (#4225)

* Update German.properties (#4223)

* Update German.properties

* Update German.properties

* Update German.properties

* Update Swedish.properties (#4220)

* Update Italian.properties (#4216)

* Russian Translation (#4215)

* Russian Translation

Translated new lines and made some impovements

* Update Russian.properties

* Update Russian.properties

Co-authored-by: Miraç <56484801+logicminimal@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: Qweq07 <66163702+Qweq07@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: sockybob <44141246+sockybob@users.noreply.github.com>
2021-06-22 22:28:40 +03:00
Xander Lenstra
7f88844d82
Created Patronage policy branch (#4186)
* Created Patronage policy branch -- draft

* Patronage branch is now functional

* Added images for the policies

* Temporarily bandaged backwards compatability, added incompatabilities

* Implemented recommended changes

* Fixed acquirement of 'patronage complete' not being saved

* Reverted change I was unhappy with

* Implemented requested changes

* Fixed build errors

* Implemented recommended changes

* City States can now give any great person, including unique ones, conform Ravignirs tests
2021-06-22 17:25:29 +03:00
Yair Morgenstern
837d78db21 3.15.3 2021-06-20 22:00:59 +03:00
Xander Lenstra
3d1836a081
Created Order branch with G&K policies (#4158)
* Created Order branch with G&K policies

* Implemented requested changes
2021-06-20 21:39:14 +03:00
Yair Morgenstern
da455f10b5
Translations update (#4214)
* Update Korean.properties (#4212)

* Update Spanish.properties (#4208)

* Update Swedish.properties (#4205)

* Update German translation (#4196)

* Update German.properties

* Update German.properties

* Update Spanish.properties (#4194)

* Update Spanish.properties

* Update Spanish.properties

* Russian Translation (#4190)

* Russian Translation

Translated new texts, fixed some incorrect translations and made small improvements.

* Update Russian.properties

* Update Russian.properties

Co-authored-by: TG <saud2410@naver.com>
Co-authored-by: ArchDuque-Pancake <78449553+ArchDuque-Pancake@users.noreply.github.com>
Co-authored-by: Qweq07 <66163702+Qweq07@users.noreply.github.com>
Co-authored-by: Martin Pechstein <77325495+Mape6@users.noreply.github.com>
Co-authored-by: sockybob <44141246+sockybob@users.noreply.github.com>
2021-06-20 21:37:22 +03:00
Arthur van der Staaij
450c185af8
Corrected many building production costs, tech requirements and wonder effects (#4201)
* Corrected building construction costs

Full changelog:
(Changes marked with a "!" deviate from the surrounding pattern)

Lighthouse         100 -> 75  (!)
Great Lighthouse   250 -> 185 (!)

Temple             120 -> 100
Burial Tomb        120 -> 100
Mud Pyramid Mosque 120 -> 100
Market             120 -> 100
Bazaar             120 -> 100
Mint               120 -> 100
Aqueduct           120 -> 100
The Oracle         300 -> 250
Petra              300 -> 250
Great Wall         300 -> 250

Monastery          160 -> 120
Workshop           160 -> 120
Forge              160 -> 120
Hagia Sophia       400 -> 300
Chichen Itza       400 -> 300
Machu Picchu       400 -> 300

Harbor             200 -> 120 (!)
University         200 -> 160
Wat                200 -> 160
Castle             200 -> 160
Mughal Fort        200 -> 150 (!)
Armory             200 -> 160
Angkor Wat         500 -> 400
Alhambra           500 -> 400
Notre Dame         500 -> 400

Observatory        250 -> 200
Opera House        250 -> 200
Bank               250 -> 200
Satrap's Court     250 -> 200
Hanse              250 -> 200
Theatre            250 -> 200
Sistine Chapel     625 -> 500
Forbidden Palace   625 -> 500
L. Tower of Pisa   625 -> 500
Himeji Castle      625 -> 500

Seaport            300 -> 250
Windmill           300 -> 250
Taj Mahal          750 -> 625
Porcelain Tower    750 -> 625

Museum             360 -> 300
Public School      360 -> 300
Arsenal            360 -> 300
Military Academy   360 -> 300
Louvre             920 -> 750
Big Ben            920 -> 750
Brandenburg Gate   920 -> 750

Hospital           500 -> 360
Stock Exchange     500 -> 360

Eiffel Tower       1250 -> 1060
Statue of Liberty  1250 -> 1060
Kremlin            1250 -> 625  (!)
Neuschwanstein     1250 -> 1060

Nuclear Plant      750  -> 500
Solar Plant        750  -> 500
Sydney Opera House 2000 -> 1250
Manhattan Project  2000 -> 750  (!)
Apollo Program     1500 -> 750  (!)

* Corrected Hanging Gardens

10 food -> 6 food.
Now provides a free Garden.

* Corrected Statue of Liberty

Now provides a free social policy.

* Corrected Angkor Wat

Now unlocked with Education instead of Chivalry.

* Corrected Cristo Redentor

Now unlocked with Plastics instead of Flight.

* Corrected Kremlin

No longer gives 12 city strength (this was removed in G&K).

* Corrected Manhattan Project

Now unlocked with Atomic Theory instead of Nuclear Fission".

This does buff nuclear missiles quite a bit, since you no longer need
Nuclear Fission, but that's only because the last part of the tech tree
is very incomplete, and provides nuclear missiles too early. We need to
start correcting it somewhere.

* Corrected Leaning Tower of Pisa

Now provides +25% great person generation in all cities.

* Corrected Kremlin some more

Now unlocked with Metallurgy instead of Railroad.

* Fixed Arsenal production cost correction

It is now actually 300, as was stated in the previous changelog.

* Reordered many buildings

Reordered many buildings to conform to the tech tree order.
In order of priority:
left to right, top to bottom, buildings to national wonders to wonders.

* Corrected production cost for Colossus

Colossus was wrongly ordered in the json file, so its production cost
was unknowingly changed from 300 to 250 (this was not noted in the
previous changelog), however, it should be even lower: 185. This commit
corrects this.

tl;dr 250 -> 185

* Corrected Hermitage

Now unlocked with Architecture instead of Archaeology.

* Corrected National Treasury

Now unlocked with Guilds instead of Currency.

* Reverted incorrect corrections

Kremlin:
Provides 12 city strength again.

Statue of Liberty:
No longer provides a free social policy.
2021-06-19 21:45:41 +03:00
Yair Morgenstern
772531a35f Translation no longer breaks on multiple uses of the same parameter in a unique 2021-06-18 16:54:09 +03:00
Yair Morgenstern
655923f4cf Great improvement bonus provided properly 2021-06-18 14:34:15 +03:00
Yair Morgenstern
243647dea6 3.15.2 2021-06-18 10:08:59 +03:00
Yair Morgenstern
c95655771c
Translations update (#4180)
* did some Turkish translations (#4175)

i mostly did some polidhing in translations and added translations to much of simpler stuff that needed translations, but the civilopedia and civilizations are mostly not done, also i couldnt figure out how to fix typos and other stuff in mining

* French translation: fix typos and translate some (#4167)

* French translation: fix typos and translate some

* French translation: Fix typo and correct mistake

* Update Russian.properties (#4166)

* Update Russian.properties

* Update Russian.properties

* Update Italian.properties (#4164)

* Update Italian.properties

* Update Italian.properties

* Update Czech.properties (#4183)

* Update Russian.properties (#4182)

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

Co-authored-by: Miraç <56484801+logicminimal@users.noreply.github.com>
Co-authored-by: Mayeul Cantan <mayeul.cantan@gmail.com>
Co-authored-by: sockybob <44141246+sockybob@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: jahodovykolac <79529669+jahodovykolac@users.noreply.github.com>
2021-06-18 09:47:34 +03:00
Xander Lenstra
d1c10c6d47
Updated Autocracy branch to G&K (#4149)
* Updated Autocracy branch to G&K

* Fxied a typo

* Implemented potentially requested changes

* Implemented requested changes

Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
2021-06-18 09:46:30 +03:00
Xander Lenstra
1d18c418e7
Updated Freedom branch to G&K (#4142)
* Updated Freedom branch to G&K

* Hotfix for autocracy policy that I accidentally added already

* Implemented recommended changes (mostly)

* Implemented recommended changes

* Implemented recommended changes better
2021-06-18 09:42:48 +03:00
Arthur van der Staaij
d7865f4a81
Made atlas textures use mipmaps again (#4187)
A previous commit changed the atlas textures to use nearest filtering,
making the game look significantly jaggier. This commit makes them use
mipmap filtering again.

Using mipmaps with atlas textures can cause the edges of the images to
bleed into each other, an effect that was indeed present before the
filtering was changed to nearest. This commit adds some additional
padding and sets the padding to duplicate the edges of images to
mitigate this effect. Note that altough this makes some of the atlas
images look very strange, the in-game result is improved.
2021-06-18 09:25:11 +03:00
Yair Morgenstern
fc7e07aa7f Resolved #4170 - updated deprecated Polynesian unique 2021-06-17 19:57:52 +03:00
Yair Morgenstern
67820e8870 Unitfilter now accepts multiple filters (see wiki/uniques for details) 2021-06-17 19:49:20 +03:00
SpacedOutChicken
4fc2364cb0
Allow sight bonus to specifically target land military unit (#4163) 2021-06-16 11:13:21 +03:00
Yair Morgenstern
11af49e6da 3.15.1 2021-06-16 10:59:15 +03:00
Yair Morgenstern
d0227a2306
Translations update (#4154)
* did some Turkish translations (#4150)

give me translator role pls

* Update Spanish.properties (#4147)

* Update German.properties (#4141)

* Update Italian.properties (#4138)

Co-authored-by: Miraç <56484801+logicminimal@users.noreply.github.com>
Co-authored-by: ArchDuque-Pancake <78449553+ArchDuque-Pancake@users.noreply.github.com>
Co-authored-by: Martin Pechstein <77325495+Mape6@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
2021-06-15 22:48:44 +03:00
Xander Lenstra
434136e6cc
Updated Commerce branch to G&K (#4129)
* Updated Commerce branch to G&K

* Implemented requested changes
2021-06-15 09:52:59 +03:00
SomeTroglodyte
e1c6cef111
Show promises not to settle, ask on found city action (#4148) 2021-06-15 09:49:08 +03:00
Federico Luongo
5e1803c40a
FIX: unintended code slipped through (#4143) 2021-06-14 22:44:09 +03:00
Xander Lenstra
fbebcdcd21
Updated Rationalism branch to G&K (#4136) 2021-06-14 15:10:49 +03:00
Xander Lenstra
1c21573a42
Updated the culture victory so it now requires the Utopia Project to be built (#4060)
* Added the Utopia Project for the culture victory; AI will now build it

* Forgot to credit the icon

* Fixed a few minor issues

* Improved code quality; added translatable notifications

* Fixed mistakes; improved quality

* Changed a label

* Revert a small change which is no longer necessary

* Reverted the revert of a small change which is no longer necessary

* Made requsted changes
2021-06-14 14:48:22 +03:00
SomeTroglodyte
07a43f3f1a
Fix crash caused by cascaded ruins unit gifts (#4133)
* Fix d1f6c5ac breaking builds

* Fix d1f6c5ac breaking builds - patch1

* Fix silent crash when ancient ruins cascade gifted units
2021-06-14 14:44:43 +03:00
Yair Morgenstern
60d8adce38 3.15.0 2021-06-13 22:40:12 +03:00
Yair Morgenstern
7e5d098068
Translations update (#4130)
* updates (#4123)

* Update Spanish.properties (#4116)

* Update Czech.properties (#4111)

* Překlad

* Další překlad

* Fixed translations without context

* Update German.properties (#4105)

* Update German.properties

* Update German.properties

* Update Italian.properties (#4102)

* Add Korean Translations (#4101)

9+ sentences added to translations
9+ 이상의 문장이 번역에 추가되었습니다. 오역을 수정하였습니다. 어순을 바꾸었습니다.

Co-authored-by: Miraç <56484801+logicminimal@users.noreply.github.com>
Co-authored-by: ArchDuque-Pancake <78449553+ArchDuque-Pancake@users.noreply.github.com>
Co-authored-by: jahodovykolac <79529669+jahodovykolac@users.noreply.github.com>
Co-authored-by: Martin Pechstein <77325495+Mape6@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: BINUBALL <66934926+binuball@users.noreply.github.com>
2021-06-13 22:26:28 +03:00
SomeTroglodyte
85158ab29d
TradeType Enum marginal cleanup and Gold Font symbol (#4127) 2021-06-13 22:22:44 +03:00
Federico Luongo
5f66c57de5
Proposal for New borders (#4124)
* new-borders

* New Borders
2021-06-13 21:56:47 +03:00
Xander Lenstra
0d79326869
Updated Tradition branch to G&K (#4106)
* Updated Tradition branch to G&K

* Small performance boost for calcualting maintenance; fix crash on next turn

* Fixed a bug where maintenance-free buildings would still cost maintenance

* Simplified some code

* I am unable to read

* Fixed a few broken uniques, including #4109

* Implemented requested changes
2021-06-13 08:14:31 +03:00
Xander Lenstra
da991b5f66
Updated Honor branch to G&K (#4118)
* Updated Honor policies to G&K

* Simplified another unique

* Implemented requested changes
2021-06-13 08:11:14 +03:00
Xander Lenstra
60809db065
Updated Liberty branch to G&K (#4115)
* Updated Liberty branch to G&K, improved modularity of uniques

* Updated meritocracy to only affect non-occupied cities

* Implemented requsted changes
2021-06-13 08:06:35 +03:00
Arthur van der Staaij
583bca56b8
Obsoletion and upgrade fixes for enabled G&K units (#4121)
* Updated some unit obsoletions

* Added a missing unit upgrade

* Added some missing commas in units.json

* Replaced Military Base icon with a simpler one

The original had a bit too much detail for the size at which it is
shown.
2021-06-13 07:55:35 +03:00
SomeTroglodyte
eda6dece9c
Implement dormant Nation.startIntroPart1+2 (#4091)
* Implement dormant Nation.startIntroPart1+2

* Implement dormant Nation.startIntroPart1+2 - translation
2021-06-10 23:16:35 +03:00
lishaoxia1985
7e284f998b
Redraw skin Images, edit skin load method (#4080) 2021-06-10 23:10:13 +03:00
Arthur van der Staaij
91154aed34
Enabled various G&K buildings and units (#4092)
* Enabled Arsenal and added a new Armory icon

The old icon for Armory was much more appropriate for Arsenal, so I
added a new icon for Armory instead.

* Enabled Military Base and added an icon for it

* Enabled Petra and added an icon for it

* Enabled Composite Bowman and added an icon for it

* Enabled Mobile SAM and added an icon for it

* Enabled Jet Fighter

* Made Machine Gun upgrade to Mechanized Infantry

* Removed "Will be added in G&K" comments

Since we are now targeting G&K, these comments are no longer required.

* Fixed Aluminum/Aluminium inconsistencies
2021-06-10 15:38:40 +03:00
Yair Morgenstern
a5d2b2f154 3.14.16 2021-06-10 14:49:08 +03:00
Yair Morgenstern
cbee3b703a
Translations update (#4100)
* 363 / Add translation (#4099)

Overwrite existing file? = 이미 존재하는 파일을 덮어쓰시겠습니까?

* Update Swedish.properties (#4077)

* Update Swedish.properties

* Update Swedish.properties

* Update Swedish.properties

* Update Swedish.properties

* Update German.properties (#4075)

* Update Italian.properties (#4071)

Co-authored-by: binuball <66934926+binuball@users.noreply.github.com>
Co-authored-by: SimonCeder <63475501+SimonCeder@users.noreply.github.com>
Co-authored-by: Martin Pechstein <77325495+Mape6@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
2021-06-10 14:32:15 +03:00
SomeTroglodyte
337b9c62fd
Nations spellcheck (#4094) 2021-06-10 14:22:16 +03:00
SomeTroglodyte
856fe1174a
For the F-Droid missing libgdx.so problem (#4090) 2021-06-09 21:37:27 +03:00
Federico Luongo
0b696451ce
Map Generation Seedable (#4072)
* Map Generation Seedable
* Added Seed editable field in MapParametersTable
Previously, using the same set of parameters, one could not get the same map twice (i.e. negligible probability for it to happen). With this commit players can specify, alongside the usual map parameters, a long integer used to seed the RNG and get replicable results.

* Fixed Natural Wonder Spawn was not using MapGenerationRandomness hence giving not reproducible maps

* Translation strings
2021-06-08 06:42:27 +03:00
Federico Luongo
7c9b0e04b4
Map Generation Fixes and Tweaks (#4069)
* * Renamed Continents to Two Continents
* Created Four Continents map size
It spawns a vertical and a horizontal ocean to split the map in 4 major continents. Works properly on all sizes and with world wrap

* Fixed Pangea extending to boundaries in rectangular maps
* Unified Pangea for rectangular and hexagonal maps

* Fixed Default map type bias on Rectangular maps. Also removed "pangea effect" on Default: land can spawn with the same probability in the whole map.

* New map type: 4 Corners
* Reverted name change Two Continents to Continents
* Renamed Four Continents to Four Corners (to reflect original name in Civ5)
* Added translation strings

* New map type: 4 Corners
* Reverted name change Two Continents to Continents
* Renamed Four Continents to Four Corners (to reflect original name in Civ5)
* Added translation strings
2021-06-08 06:41:02 +03:00
Yair Morgenstern
8228d62d43 3.14.15 2021-06-07 22:47:52 +03:00
Yair Morgenstern
c81ee15de8
Translations update (#4070)
* Update Spanish.properties (#4059)

* Update German.properties (#4054)

* Update German.properties

* Update German.properties

* Update German.properties

* Update German.properties

* Update Italian.properties (#4052)

* Update Swedish.properties (#4051)

* Update Swedish.properties

* Update Swedish.properties

* Update Swedish.properties

* Update Swedish.properties

* Update Swedish.properties

Co-authored-by: ArchDuque-Pancake <78449553+ArchDuque-Pancake@users.noreply.github.com>
Co-authored-by: Martin Pechstein <77325495+Mape6@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-06-07 22:25:44 +03:00
Aron de Jong
cd58f6ace8
Refund wasted production as gold (#4058)
* Refund wasted production as gold

Any wasted production, from for instance a partially completed wonder or
obsolete units, will now be refunded as gold (in a 1:1 ratio).

We update both at the start and end of the user turn. Updating at the
start to account for wonders completed after our previous turn and
updating at the end to account for obsolete buildings/units as a
consequence of our own turn.

When obsolete units get replaced by their upgraded version (as in civ 5)
this code should probably be updated.

* Implement wonder refund and obsolete unit upgrade

If a wonder is built somewhere else but the user has production in this
wonder, the production will be refunded as gold in a 1:1 ratio. A
notification will be shown to indicate this. This reflects the behaviour
in Civ 5.

If a unit becomes obsolete and an upgrade is available, the production
put into this unit will now be transferred to the upgraded version. If
the unit is queued, the queued unit will also be changed to the new
version and the user will be notified via notification.

* Shorten notification messages

* Update alerts: been obsolete -> become obsolete
2021-06-07 22:04:33 +03:00
SomeTroglodyte
7a5b88923d
Cosmetic: Convenience shortcuts, some linting (#4067) 2021-06-07 07:26:01 +03:00
Arthur van der Staaij
a7afc0718c
Unit swapping (#4049)
* Added an icon for unit swapping

* Implemented unit swapping

In the original Civ V, unit swapping is a supported mechanic.
If you try to move a unit to a tile with another of your units, and both
units have enough movement points left to reach the other's tile, they
will swap places. They will consume only the movement points needed to
reach the other's tile in this way.

This change implements unit swapping for Unciv.

To prevent all kinds of problems from arising with automatic unit
movement, unit swapping can only be done explicitly. This also means
that it can only be done if the unit-swap movement is possible in a
single turn. It is however not limited to adjacent units.

Because Unciv supports mobile devices, there is in general no separation
between a unit-selection click and a movement click. Clicking on another
unit while a unit is selected simply selects that other unit. Because we
do not want to make it more difficult to select other units in this way,
unit swapping is implemented as a separate "movement mode": to toggle
this mode on or off, the new unit action "Swap units" must be used.
Newly selected units still always start in the normal movement mode.

In the unit-swap movement mode, the possible swap tiles are highlighted
instead of the possible movement and attack tiles. Clicking on a
highlighted tile will display a swap button, similar to the movement
button, or instantly perform the swap if single-click-movement is
enabled. This new behavior overrides the selection of the unit on the
target tile: if the user wants to select the unit instead, they have to
exit the unit-swapping mode first.

The swapping code is robust, it can even handle swaps that involve a
paradrop!

An option to always swap-move when an eligible tile is clicked instead
of requiring the unit-swapping mode, similar to the existing
single-click-movement option, could perhaps be added in later.

* Added some comments to existing movement functions

* Fixed a silly mistake

Fixed a silly mistake which caused the unit-swapping eligibility
detection to sometimes remove units from the world.

* Removed some unneeded code

* Fixed movement buttons not showing with world wrap

Fixed a bug where the "move here" and "swap with" buttons would only
show on the leftmost copy of the world when world wrap was enabled.

* Made the swap action only display if usable

Made the unit swapping button only display if there is at least one
possible swap movement.
2021-06-06 22:56:25 +03:00
SomeTroglodyte
298dbcb3ee
More power to improvement uniques (resourceTerrainAllow-be-gone) (#4024)
* More flexibility for modding improvements (tileFilter), deprecate resourceTerrainAllow

* More tileFilter and improvement uniques - Translations

* Update template.properties

* More tileFilter and improvement uniques - Revert and/or inside unique parameter
2021-06-06 12:40:02 +03:00
SomeTroglodyte
52b7999c48
Map editor fix translations, a few keys (#4055) 2021-06-06 09:18:22 +03:00
Xander Lenstra
d7b2436bcf
Fixed a few bugs noted in #4057 (#4062) 2021-06-06 09:15:22 +03:00
Yair Morgenstern
a1b0a90506 3.14.14 2021-06-04 14:33:22 +03:00
Yair Morgenstern
94d7908092
Translations update (#4050)
* Update Swedish.properties (#4043)

* Update Swedish.properties

* Update Swedish.properties

* Update Indonesian.properties (#4037)

* Update Spanish.properties (#4036)

* Update Italian.properties (#4034)

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: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
2021-06-04 14:03:56 +03:00
Yair Morgenstern
6614d1050d Wheat farms include wheat image 2021-06-03 22:25:52 +03:00
Yair Morgenstern
98d551559b Resolves #3926 - Wheat+Farm gets location-appropriate farm 2021-06-03 21:50:30 +03:00
Xander Lenstra
aa9dda2eea
Added the paratrooper unit (#4025)
* Added the paratrooper unit

* Reverted accidental reordering of action table

* Fixed Github build errors

* Hopefully actually fixed the build errors

* Added a Dutch translation, finally fixing the error

* Paratroopers can no longer actually paradrop on a tile they shouldn't be able to paradrop onto

* Removed double update action
2021-06-03 07:33:38 +03:00
Arthur van der Staaij
a765caa97c
Add global alerts for certain constructions (#4039)
* Add global alerts for certain constructions

In the original game, certain constructions alert all players upon
their completion. This commit introduces a new unique for this behavior
and adds this unique to the relevant constructions.

The code that implements the new unique is placed in
Building.postBuildEvent, so it can only be activated by buildings. If
other kinds of constructions require a global alert as well, the code
could be moved to CityConstructions.constructionComplete.

* Removed redundant line in template.properties

* Moved global alert logic to CityConstructions

Moved the implementation of "Triggers a global alert upon completion"
from Building.postBuildEvent to CityConstructions.constructionComplete,
close to the similar Wonder notification logic.
2021-06-03 07:31:39 +03:00
ravignir
4adbd81b3a
Change to Temple of Artemis bonuses to reflect civ5 behavior (#4032)
As per wikia: https://civilization.fandom.com/wiki/Temple_of_Artemis_(Civ5)
2021-06-02 12:52:44 +03:00
Yair Morgenstern
c73891cbe7 3.14.13 2021-06-01 21:19:06 +03:00
Yair Morgenstern
16af00c15c
Translations update (#4030)
* Update Indonesian.properties (#4027)

* Update Swedish.properties (#4023)

* Update Swedish.properties

* Update Swedish.properties

* Update German.properties (#4022)

* Update Spanish.properties (#4012)

Spanish 100%???

* Update Italian.properties (#4010)

Co-authored-by: kensvin <63847755+Kensvin28@users.noreply.github.com>
Co-authored-by: SimonCeder <63475501+SimonCeder@users.noreply.github.com>
Co-authored-by: Martin Pechstein <77325495+Mape6@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-06-01 20:07:54 +03:00
SomeTroglodyte
9ed73d0d3f
Spruced up ModManagementScreen - phase 1 (#3983)
* Spruced up ModManagementScreen - phase 1

* Spruced up ModManagementScreen - phase 1 - patch1
2021-06-01 15:21:31 +03:00
Duan Tao
205f479ffe
Declare & Revoke protection for city-state. (#3994)
* Declare protection for city-state.

* Text templates.

* Better protector text for city-states.
2021-06-01 15:02:23 +03:00
SomeTroglodyte
55f943f428
Fix two sound credits - missing file (#4026) 2021-05-31 12:17:02 +03:00
SomeTroglodyte
a51978c960
Smaller mp3's for the new files from #4013 (#4019) 2021-05-30 18:53:13 +03:00
SomeTroglodyte
589ed4e423
Sound upgrade - enable BaseUnit.attackSound, a few extras (#4013) 2021-05-30 10:18:42 +03:00
Xander Lenstra
432e937474
Added the amphibious promotion and the marine unit (#3987)
* Technology and construction bars no longer extend past their maximum

* Fixed compile errors

* actually fixed the issue

* Added the marine unit

* Moved amphibious promotion effect to unique

* Added icons for Amphibious promotion and Marine unit

* aaah
2021-05-29 23:42:04 +03:00
Yair Morgenstern
c45ecebb0c Yet more swedish 2021-05-28 15:07:57 +03:00
Yair Morgenstern
cc36dabde8 Merge branch 'master' of https://github.com/yairm210/Unciv 2021-05-28 15:03:50 +03:00
Yair Morgenstern
d7c0cc593a 3.14.12 2021-05-28 15:02:11 +03:00
Yair Morgenstern
42a75ad9cf
Translations update (#4009)
* Swedish translation (#4006)

* Create Swedish.properties

* Update Swedish.properties

* Update Swedish.properties

* Update Swedish.properties

* Update Swedish.properties

* Update Swedish.properties

* Update Swedish.properties

* Update German.properties (#4004)

* Update German.properties

* Update German.properties

* Update German.properties

* Update Italian.properties (#4001)

* Update Spanish.properties (#4000)

Co-authored-by: SimonCeder <63475501+SimonCeder@users.noreply.github.com>
Co-authored-by: Martin Pechstein <77325495+Mape6@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: ArchDuque-Pancake <78449553+ArchDuque-Pancake@users.noreply.github.com>
2021-05-28 14:56:00 +03:00
Yair Morgenstern
d7941924be Better camera square 2021-05-28 14:53:21 +03:00
SomeTroglodyte
cf2be25c73
Popup gets a KeyPressDispatcher (#3973)
* Popup gets a KeyPressDispatcher

* Popup gets a KeyPressDispatcher - patch1
2021-05-27 21:49:40 +03:00
SomeTroglodyte
5f523cb548
Improved location notifications (#3992)
* Improved location notifications

* Improved location notifications - patch

* Improved location notifications - patch2

* Improved location notifications - patch3
2021-05-26 23:31:00 +03:00
Yair Morgenstern
cd6ae3dc6d 3.14.11 2021-05-26 19:37:01 +03:00
Yair Morgenstern
58d526aad0
Translations update (#3993)
* Update Simplified_Chinese.properties (#3984)

* Update Spanish.properties (#3980)

* Teutonic Translations (#3978)

* Teutonic Translations

* Teutonic Translations patch1

* Update Italian.properties (#3972)

Co-authored-by: HoleHolo <80876542+HoleHolo@users.noreply.github.com>
Co-authored-by: ArchDuque-Pancake <78449553+ArchDuque-Pancake@users.noreply.github.com>
Co-authored-by: SomeTroglodyte <63000004+SomeTroglodyte@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
2021-05-26 19:07:00 +03:00
ravignir
2feefeb4af
Changes to terrain combat bonuses (#3990)
as in civ5, all base terrain have no penalty/bonuses, mountain has +25%.
2021-05-24 20:44:53 +03:00
SomeTroglodyte
8d4d05e235
Two missing translation templates (#3988) 2021-05-24 08:58:27 +03:00
Yair Morgenstern
fd5125904a 3.14.10 2021-05-20 22:49:40 +03:00
Yair Morgenstern
9fd80122e0
Translations update (#3969)
* Update Turkish.properties (#3964)

* Update Spanish.properties (#3963)

* Update Indonesian.properties (#3960)

* Update Indonesian.properties

* Update Indonesian.properties

* Update Italian.properties (#3956)

* Update Spanish.properties (#3970)

* Fix spaceship part production boosts (#3953)

Previously, the buildings and wonders that should boost spaceship part
production (Forge, Spaceship Factory and Hubble Space Telescope) would
not provide this boost (#3952). This commit fixes the issue.

The problem was caused by the fact that the spaceship part-boosting
uniques would only boost spaceship part UNITS while spaceship parts are
currently buildings.

The added comments serve as a reminder to change the uniques if
spaceship parts are ever changed into units.

* Update Spanish.properties

I had to reopen a new pull request due to conflicts the other had.

Co-authored-by: Arthur van der Staaij <32672293+avdstaaij@users.noreply.github.com>

Co-authored-by: Nazım Gediz Aydındoğmuş <nga@hotmail.com.tr>
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: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: chriscr2 <70113017+chriscr2@users.noreply.github.com>
Co-authored-by: Arthur van der Staaij <32672293+avdstaaij@users.noreply.github.com>
2021-05-20 22:22:09 +03:00
SomeTroglodyte
7c7d4181cc
Fix custom map sizes - saves match, size obeyed, limit UI (#3965)
* Fix custom map sizes - Revive Enum MapSize and fix tech modifier for custom maps

* Fix custom map sizes - Fix saved size not matching tileset, obey custom size

* Fix custom map sizes - limiting custom size and UI

* Fix custom map sizes - linting and reduce warnings

* Fix custom map sizes - less verbose

* Popup gets a KeyPressDispatcher - templates
2021-05-20 22:17:07 +03:00
Arthur van der Staaij
1f2dbb9a4e
Fix spaceship part production boosts (#3953)
Previously, the buildings and wonders that should boost spaceship part
production (Forge, Spaceship Factory and Hubble Space Telescope) would
not provide this boost (#3952). This commit fixes the issue.

The problem was caused by the fact that the spaceship part-boosting
uniques would only boost spaceship part UNITS while spaceship parts are
currently buildings.

The added comments serve as a reminder to change the uniques if
spaceship parts are ever changed into units.
2021-05-20 18:19:33 +03:00
Duan Tao
3d062e3424
Add guided missile which acts differently from nuclear missile. (#3957)
* Add guided missile which acts differently from nuclear missile.

* Clean png.
2021-05-20 12:33:39 +03:00
SomeTroglodyte
3e3bda42e5
Follow screen rotation even to Portrait on Android with Opt-in (#3936) 2021-05-19 23:27:23 +03:00
Yair Morgenstern
106cbb79c3 3.14.9 2021-05-18 01:07:17 +03:00
Yair Morgenstern
e57e7fb7d5
Translations update (#3950)
* Update Indonesian.properties (#3947)

* Update Russian.properties (Full Translation) (#3945)

* Update Russian.properties

* Update Russian.properties

* Update Russian.properties

case fix

* Update Russian.properties

* Update Russian.properties

* Update Russian.properties

* Update Simplified_Chinese translate (#3940)

* Update Simplified_Chinese.properties

* fix case problem

* Update Spanish.properties (#3924)

* Update German.properties (#3919)

* Update German.properties

* Update German.properties

* Update Italian.properties (#3917)

* Update Spanish.properties (#3928)

Co-authored-by: kensvin <63847755+Kensvin28@users.noreply.github.com>
Co-authored-by: Maksim Klimenko <77161824+Maks-gaming@users.noreply.github.com>
Co-authored-by: CrispyXYZ <64761703+CrispyXYZ@users.noreply.github.com>
Co-authored-by: ArchDuque-Pancake <78449553+ArchDuque-Pancake@users.noreply.github.com>
Co-authored-by: Martin Pechstein <77325495+Mape6@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: Chris <70113017+chriscr2@users.noreply.github.com>
2021-05-17 23:47:00 +03:00
Yair Morgenstern
d546b2b00e Caught exception when map fails to load 2021-05-13 21:43:42 +03:00
Yair Morgenstern
4f1798146c 3.14.8 2021-05-11 00:44:36 +03:00
Yair Morgenstern
6ca93f4dc9
Translations update (#3916)
* Update Spanish.properties (#3908)

* Update German.properties (#3904)

* Update Vietnamese.propreties (#3903)

* Create Vietnamese

* Update and rename Vietnamese to Vietnamese.properties

* Update Vietnamese.properties

* Update Vietnamese.properties

* Update Vietnamese.properties

* Update Vietnamese.properties

* Update Vietnamese.properties

* Update Vietnamese.properties

* Update Vietnamese.properties

* Update Vietnamese.properties

* Update Vietnamese.properties

* Update Vietnamese.properties

* Update Vietnamese.properties

* Update Vietnamese.properties

* Update Vietnamese.properties

* Update Vietnamese.properties

Come back:)

* Update Vietnamese.properties

* Update Vietnamese.properties

* Update Vietnamese.properties

* Update Vietnamese.properties

* Update Vietnamese.properties

* Update Vietnamese.properties

* Update Vietnamese.properties

* Update Vietnamese.properties

* Update Vietnamese.properties

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

* Update Italian.properties (#3901)

Co-authored-by: ArchDuque-Pancake <78449553+ArchDuque-Pancake@users.noreply.github.com>
Co-authored-by: Martin Pechstein <77325495+Mape6@users.noreply.github.com>
Co-authored-by: leanhquanea1234 <69520258+leanhquanea1234@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
2021-05-11 00:34:26 +03:00
Yair Morgenstern
61c8ab3a8f New line-of-sight rules, with new "Blocks line-of-sight from tiles at same elevation" unique! 2021-05-11 00:29:37 +03:00
Yair Morgenstern
482f9ae9e5 Linting - Optimized imports 2021-05-10 22:45:29 +03:00
GGGuenni
278962c37d
Fixed Forest on Hill does not show (#3909)
* Removed Duplicates and HillForest

since the Image HillForest got renamed to Forest to reduce ruleVariants

* reorganized legacy variants

* Added "Offshore Platform" for oil well on water
2021-05-10 12:47:41 +03:00
Yair Morgenstern
3065cca5e1 More fantasyhex combinations 2021-05-09 23:49:07 +03:00
GGGuenni
54deb60f1b
FantasyHex update first iteration (#3884)
Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
2021-05-09 23:44:39 +03:00
Yair Morgenstern
413c0b077b Fixed terrace farm's 'fresh water' bonus - kudos @1.7.4 2021-05-09 00:28:32 +03:00
Yair Morgenstern
0f0de8a221 3.14.7 2021-05-08 23:54:29 +03:00
Yair Morgenstern
8b767a10d0
Translations update (#3899)
* Update Japanese.properties (#3896)

* Update German.properties (#3894)

* Update Japanese.properties (#3880)

translation of untranslated parts and retouch

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

Co-authored-by: paontv <57051667+paontv@users.noreply.github.com>
Co-authored-by: Martin Pechstein <77325495+Mape6@users.noreply.github.com>
Co-authored-by: ko-chan-28 <70871262+ko-chan-28@users.noreply.github.com>
2021-05-08 23:48:15 +03:00
Yair Morgenstern
b0f3d30d79 Fixed double consumption of resources for "Comsumes [amount] [resource]" unique 2021-05-08 23:35:52 +03:00
Yair Morgenstern
60fb38dfc3 New SDK versions, gradle properties, and androidx - this seems to solve the previous problems! 2021-05-08 23:24:57 +03:00
Yair Morgenstern
619d02d2b6 Hopefully will solve the github action fails 2021-05-08 22:54:11 +03:00
Yair Morgenstern
3a22a1127e Gradle upgrade 2021-05-07 13:18:48 +03:00
Yair Morgenstern
fca5b5075e Spaces 2021-05-07 12:39:44 +03:00
Yair Morgenstern
6fbb223aa5 Resolved #3888 - added template lines for mod management screen 2021-05-07 12:20:10 +03:00
Yair Morgenstern
7e7f72ed2f Tradition works again 2021-05-07 12:03:13 +03:00
Alexander Korolyov
453f5588ac
Custom map size (#2876)
* Adding custom map sizes. Initial commit

* Custom map sizes UI update

* Custom map size with rectangular shape

* Added compatibility with older Maps and Game saves

* Fixed build errors and added warning messages

Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
2021-05-06 18:39:28 +03:00
SomeTroglodyte
d11cf286b4
Worldscreen key bindings (#3875)
* WorldScreen most Civ5 key bindings

* WorldScreen keys - Overview button key hint

* WorldScreen most Civ5 key bindings - v2

* WorldScreen most Civ5 key bindings - civilopedia

Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
2021-05-06 16:04:24 +03:00
Yair Morgenstern
e8d4767b6d Height of terrains is now defined by a unique 2021-05-06 15:27:30 +03:00
Yair Morgenstern
c601f7f9ec Genericized "No Maintenance costs for improvements in [] tiles" 2021-05-06 14:34:40 +03:00
Yair Morgenstern
34bed66198 Genericized hill's "extra sight for land units" to a unique 2021-05-06 14:28:54 +03:00
Yair Morgenstern
8d2629088f Hill city-strength bonus genericized 2021-05-06 14:27:12 +03:00
Yair Morgenstern
4cb5a8c912 3.14.6-patch2 2021-05-06 11:47:41 +03:00
Yair Morgenstern
a6d0973324 3.14.6 2021-05-05 20:46:40 +03:00
Yair Morgenstern
c1908d0526
Translations update (#3878)
* Update German.properties (#3877)

* Update Spanish.properties (#3873)

* Changed a few minor fixes, added a lot of promotion translations (#3843)

* Update Malay.properties (#3595)

Yayay

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

* Should remove test fail

Co-authored-by: Martin Pechstein <77325495+Mape6@users.noreply.github.com>
Co-authored-by: ArchDuque-Pancake <78449553+ArchDuque-Pancake@users.noreply.github.com>
Co-authored-by: Xander Lenstra <71121390+xlenstra@users.noreply.github.com>
Co-authored-by: madbada99 <79025962+madbada99@users.noreply.github.com>
2021-05-05 18:59:40 +03:00
Yair Morgenstern
fb93e3f7ee Hills are converted to terrains that surround them 2021-05-05 18:00:07 +03:00
GGGuenni
b35d5d3121
changed hill to terrain Feature (#3707)
* changed hill to terrain Feature

* Update Terrains.json

* Update Terrains.json

* Snow with capital S

* Fixed tests failing

* Added check for ruleset supports hill as terrain feature
2021-05-05 17:48:47 +03:00
SomeTroglodyte
a25777f380
Overview screen category decoration + key hint (#3872)
* OverviewScreen: Category buttons decorated / key indicator

* OverviewScreen: Category buttons decorated / key indicator: Images
2021-05-04 12:10:34 +03:00
SomeTroglodyte
f2a08719e2
ImprovementPicker: R key 'moves' from Road to Railroad patch (#3871) 2021-05-04 11:59:08 +03:00
Yair Morgenstern
f2a25b26ab Tilegroup accepts tile config also for *only the terrain part*, making all the extra "hill = grassland+hill" in the tileconfig json unnecessary!
@ravignir
2021-05-02 21:07:32 +03:00
Yair Morgenstern
94c0995b23 3.14.5 2021-05-01 23:05:30 +03:00
Yair Morgenstern
8c098a7fd4 New layering is in da house!
FantasyHex-New is now FantasyHex!
2021-04-30 15:23:24 +03:00
Yair Morgenstern
d4b63950ac The new tileset is ready for rollout! 2021-04-30 15:00:37 +03:00
Yair Morgenstern
9900795e02 Specify original owner when showing option to liberate city 2021-04-30 12:44:51 +03:00
Yair Morgenstern
81c1e34f0f Added "Self-destructs when attacking" unique 2021-04-30 12:11:49 +03:00
Yair Morgenstern
4db97dcd1a Added construction production info to city screen 2021-04-29 14:02:27 +03:00
Yair Morgenstern
72bf5f198d 3.14.4 2021-04-28 22:38:49 +03:00
Yair Morgenstern
14ca67ca61
Translations update (#3845)
* Update german translation (#3834)

* Update German.properties

* Update German.properties

* Update German.properties

* Update German.properties

* Update Spanish.properties (#3830)

Co-authored-by: Martin Pechstein <77325495+Mape6@users.noreply.github.com>
Co-authored-by: ArchDuque-Pancake <78449553+ArchDuque-Pancake@users.noreply.github.com>
2021-04-28 21:40:33 +03:00
Yair Morgenstern
bb34659d9c Resolved #3837 - Harad -> Harald in Denmark greeting 2021-04-27 00:15:47 +03:00
Yair Morgenstern
55ef131fb2 3.14.3 2021-04-21 22:12:46 +03:00
Yair Morgenstern
2b6c9e7ec0
Translations update (#3826)
* Chinese translation update (#3825)

* Update Czech.properties (#3815)

* Update Czech.properties

Note for czech translators:
Zakulacený svět zní divně, ale nevím, jak jinak to přeložit. Budu rád za nápady.

* Update Czech.properties

* Update Italian.properties (#3812)

Co-authored-by: lishaoxia1985 <49801619+lishaoxia1985@users.noreply.github.com>
Co-authored-by: jahodovykolac <79529669+jahodovykolac@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
2021-04-21 21:59:13 +03:00
SomeTroglodyte
e2c6ae450d
Make city center unpillagable using a unique (#3818) 2021-04-19 20:18:20 +03:00
Yair Morgenstern
e270b017d4 3.14.2 2021-04-18 21:56:18 +03:00
Yair Morgenstern
c03b139b4d
Translations update (#3811)
* Update German.properties (#3808)

* Fixed unitType parameters in changed unique

* Spanish changes by @ArchDuque-Pancake in #3787

* "[] from every []" can accomodate specialist names

* Fixed - 'Water units' now can be capitalized, as they should be.

* Added warning for world wrap for Android - I'm seeing a lot of ANRs for this, but it's not something I think I can solve

* Update German.properties

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

* Update Polish.properties (#3803)

* Fixed unitType parameters in changed unique

* Spanish changes by @ArchDuque-Pancake in #3787

* Update Polish.properties

* Update Polish.properties

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

* Update Italian.properties (#3797)

* Fixed unitType parameters in changed unique

* Spanish changes by @ArchDuque-Pancake in #3787

* Update Italian.properties

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

* Spanish - Added Required Translations (#3796)

* Fixed unitType parameters in changed unique

* Spanish changes by @ArchDuque-Pancake in #3787

* Required Translations Added

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

Co-authored-by: Martin Pechstein <77325495+Mape6@users.noreply.github.com>
Co-authored-by: GEEZET1 <67857834+GEEZET1@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: another-sapiens <80379945+another-sapiens@users.noreply.github.com>
2021-04-18 21:44:39 +03:00
Yair Morgenstern
f518c1944f Added warning for world wrap for Android - I'm seeing a lot of ANRs for this, but it's not something I think I can solve 2021-04-17 23:27:29 +03:00
Yair Morgenstern
6045e0d5a4 "[] from every []" can accomodate specialist names 2021-04-15 12:50:30 +03:00
Yair Morgenstern
ffd9d68bce Spanish changes by @ArchDuque-Pancake in #3787 2021-04-14 23:03:28 +03:00
Yair Morgenstern
5e1a21cd84 Fixed unitType parameters in changed unique 2021-04-14 21:57:58 +03:00
Yair Morgenstern
daab799b3a 3.14.1 2021-04-14 19:51:31 +03:00
Yair Morgenstern
bec5e2d43a
Translations update (#3793)
* Update French.properties (#3790)

* Translated: "[stats] on [param] tiles once [tech] is discovered"

* Translated: "City-center"

* Update Indonesian.properties (#3785)

Co-authored-by: Zakaria M <zak.mell45@gmail.com>
Co-authored-by: Kensvin <63847755+Kensvin28@users.noreply.github.com>
2021-04-14 19:43:51 +03:00
Yair Morgenstern
fe204e9ac0
Translations update (#3783)
* Update Italian.properties (#3779)

* Update Spanish.properties (#3778)

* Update Spanish.properties

* Update Spanish.properties

Co-authored-by: jorgman1 <jorgman1@protonmail.com>

* Update German.properties (#3777)

* Update German.properties

* Update German.properties

* Update German.properties

* Update Japanese.properties (#3776)

* Update Spanish.properties (#3782)

I have made a research, and, despite of an "arcabuz" being somewhat diferent from a musket, it´s basically the same.

* Update Russian.properties (#3792)

* Natural wonders are standalone tiles in new layering

* Can handle unique capital indicators in mods

* 'military' -> 'Military' for e.g. [Military] units, same as other unit types which are capitalized

* Differentiated between 'Land' as in 'Land unit' and 'Territory' for rankings

* Added TileSetConfigs (#3766)

* First iteration of TileSet json

* Adding json support for mods

* Renamed TilesetConfig to TileSetConfig

+ changed the config for FHex to fix the mountain natural wonder problem

* Resolved #3353 - Changed "Earn [amount]% of [param] opponent's [param2] as [stat] for kills" to "Earn [amount]% of killed [param] unit's [param2] as [stat]"

* Preparation for hill as terrain feature  (#3784)

* ensure backwards compatibility

* Added new Hill.png

* Added temp TileSetConfig to support new hill sprite

* Added missing Ancient ruins tiles

* Fixed Multiplayer bugs (#3781)

* Removed save feature from TurnChecker

* Hopefully fixed not correctly updating multiplayer games?

* Fixed "refresh list" not updating the savegame correctly

* Fixed game update when upload fails

* Revert "Fixed game update when upload fails"

This reverts commit cc9f1cf589.

* Fix Citadel not quite buildable where it should be (#3788)

* updated the Russian translation file

* Fixed typos in the Russian translation file

* Fixed [tileFilter] in Rus lang file

Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
Co-authored-by: GGGuenni <leonard@eynck.de>
Co-authored-by: SomeTroglodyte <63000004+SomeTroglodyte@users.noreply.github.com>

Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: jorgman1 <48908520+jorgman1@users.noreply.github.com>
Co-authored-by: jorgman1 <jorgman1@protonmail.com>
Co-authored-by: Martin Pechstein <77325495+Mape6@users.noreply.github.com>
Co-authored-by: paontv <57051667+paontv@users.noreply.github.com>
Co-authored-by: ArchDuque-Pancake <78449553+ArchDuque-Pancake@users.noreply.github.com>
Co-authored-by: Maxim Logaev <51446645+turbocat2001@users.noreply.github.com>
Co-authored-by: GGGuenni <leonard@eynck.de>
Co-authored-by: SomeTroglodyte <63000004+SomeTroglodyte@users.noreply.github.com>
2021-04-14 19:38:23 +03:00
Yair Morgenstern
496b27d6b5 Fixed terrain error 2021-04-14 19:35:38 +03:00
Yair Morgenstern
18e15ee1d8 Converted all "Bonus vs unitType" unit uniques to "+[amount]% Strength vs [unitType]" 2021-04-14 18:59:57 +03:00
Yair Morgenstern
d825352bf4 Converted all "Bonus vs unitType" effects to "+[amount]% Strength vs [unitType]"
Open terrain and rough terrain bonuses are now generic and uniques
2021-04-14 18:52:10 +03:00
Yair Morgenstern
b312d24d4a Rough terrain specified through uniques 2021-04-14 18:32:39 +03:00
Yair Morgenstern
e424ec4a91 "+[]% combat bonus in []" -> "+[]% Strength in []" 2021-04-14 18:25:37 +03:00
SomeTroglodyte
83427fec85
Fix Citadel not quite buildable where it should be (#3788) 2021-04-14 11:28:13 +03:00
GGGuenni
3efbbc716e
Fixed Multiplayer bugs (#3781)
* Removed save feature from TurnChecker

* Hopefully fixed not correctly updating multiplayer games?

* Fixed "refresh list" not updating the savegame correctly

* Fixed game update when upload fails

* Revert "Fixed game update when upload fails"

This reverts commit cc9f1cf589.
2021-04-13 22:57:39 +03:00
GGGuenni
00ec000d50
Preparation for hill as terrain feature (#3784)
* ensure backwards compatibility

* Added new Hill.png

* Added temp TileSetConfig to support new hill sprite

* Added missing Ancient ruins tiles
2021-04-13 22:05:06 +03:00
Yair Morgenstern
0440a70a9c Resolved #3353 - Changed "Earn [amount]% of [param] opponent's [param2] as [stat] for kills" to "Earn [amount]% of killed [param] unit's [param2] as [stat]" 2021-04-13 22:04:00 +03:00
GGGuenni
b7d6bacc5b
Added TileSetConfigs (#3766)
* First iteration of TileSet json

* Adding json support for mods

* Renamed TilesetConfig to TileSetConfig

+ changed the config for FHex to fix the mountain natural wonder problem
2021-04-13 07:49:49 +03:00
Yair Morgenstern
881a885c14 Differentiated between 'Land' as in 'Land unit' and 'Territory' for rankings 2021-04-13 00:13:17 +03:00
Yair Morgenstern
6e9f868cb3 'military' -> 'Military' for e.g. [Military] units, same as other unit types which are capitalized 2021-04-13 00:08:35 +03:00
Yair Morgenstern
25565f189d Natural wonders are standalone tiles in new layering 2021-04-12 23:31:54 +03:00
SomeTroglodyte
b6fe55778a
Making game data a little more JSON compliant (#3780) 2021-04-12 06:23:44 +03:00
Yair Morgenstern
61730ca93b Translation files generation 2021-04-10 23:14:22 +03:00
Yair Morgenstern
888d5e973c
Translations update (#3768)
* Update French.properties  (#3767)

* Create French.properties

* Update French.properties

* Update French.properties

* Update German.properties (#3764)

* Update Czech.properties (#3763)

Translated some new lines and city-states' diplomacy

* Hungarian.properties (#3761)

* Update Spanish.properties (#3774)

There were a few 'translation!' messages, I didn't check the already completed text. If any help is needed please let me know. My discord name is john2342#8925

* Deleted unnecessary space before colon, update czech.properties (#3773)

* Deleted space before colon

In VictoryScreen.kt was one extra space, looking like "Spain : 35" instead of "Spain: 35"

* Update Czech.properties

Co-authored-by: Loubard Kevin <70336598+subversive-eu@users.noreply.github.com>
Co-authored-by: Martin Pechstein <77325495+Mape6@users.noreply.github.com>
Co-authored-by: jahodovykolac <79529669+jahodovykolac@users.noreply.github.com>
Co-authored-by: JurDan775 <80947706+JurDan775@users.noreply.github.com>
Co-authored-by: juan234248 <77988217+juan234248@users.noreply.github.com>
2021-04-10 22:59:55 +03:00
Yair Morgenstern
8ff2a79e9b New fantasy hex layering works well with natural wonders 2021-04-04 19:32:16 +03:00
Yair Morgenstern
bf596586c7
Translations update (#3759)
* Update German.properties (#3758)

* Update Turkish.properties (#3754)

* Update Turkish.properties

* Update Turkish.properties

Typo fix in line 3934: amout > amount

Co-authored-by: Martin Pechstein <77325495+Mape6@users.noreply.github.com>
Co-authored-by: omerfaruk-cakmak <32402595+omerfaruk-cakmak@users.noreply.github.com>
2021-04-04 19:30:30 +03:00
Yair Morgenstern
187eea82a4 Base FantasyHex now contains all of the NewFantasyHex, for easier handoff (first 'use new layering rules' and then 'change tileset') 2021-04-02 10:02:56 +03:00
Yair Morgenstern
bc1c9ad921 Tileset for new layering is now in base game
New layering now supports natural wonders
2021-04-01 23:19:07 +03:00
Yair Morgenstern
8c7c0a0f91 Added new experimental tile layering - see #3716 2021-04-01 22:08:29 +03:00
Yair Morgenstern
9cb017c8a5 Added Faith icon and display for games with Religion 2021-04-01 20:44:27 +03:00
Yair Morgenstern
6e31750b55 3.13.12 2021-03-31 23:13:04 +03:00
Yair Morgenstern
dbd682fbbe
Translations update (#3751)
* Update Dutch.properties (#3750)

* Update bulgarian.properties (#3745)

* Update bulgarian.properties

Translated some of the #Required translation! rows

* Fixed error

* Update Indonesian.properties (#3744)

* Update German.properties (#3738)

* Update German.properties

* Update German.properties

* Update German.properties

* Update Italian.properties (#3737)

Co-authored-by: Aron de Jong <adj00@protonmail.com>
Co-authored-by: Tony <63195157+antonpetrov145@users.noreply.github.com>
Co-authored-by: Kensvin <63847755+Kensvin28@users.noreply.github.com>
Co-authored-by: Martin Pechstein <77325495+Mape6@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
2021-03-31 22:50:31 +03:00
lishaoxia1985
807444d2c5
Replace padding with leftAndRightPadding & topAndBottomPadding in TileGroupMap (#3742)
* Replace padding with leftAndRightPadding & topAndBottomPadding in class TileGroupMap, edit MainMenuScreen

* Remove TableBackground.png
2021-03-29 18:21:31 +03:00
Yair Morgenstern
bf9954a042 Un-blurred the tile images 2021-03-29 18:18:23 +03:00
Yair Morgenstern
bc5cc4e28d Added Bulgarian, by antonpetrov145! 2021-03-29 17:32:42 +03:00
Tony
751624bf41
Create Bulgarian.properties (#2365)
* Create Bulgarian.properties

This is WIP on the Bulgarian translation

* Update Bulgarian.properties

Edited with the '='

* Update Bulgarian.properties

* Update

Updated  some move values. Sorry for the long delay.

* Update Bulgarian.properties

With the help of PresleyBG

* Renamed several variables
2021-03-29 17:28:27 +03:00
Yair Morgenstern
eda9ceb140 Custom improvements for water resources now moddable 2021-03-25 10:46:45 +02:00
Yair Morgenstern
e0d7128bc6 3.13.11 2021-03-23 23:01:00 +02:00
Yair Morgenstern
b8f1f092d6
Translations update (#3736)
* Update German.properties (#3725)

* Update German.properties

* Update German.properties

* Update Italian.properties (#3724)

Co-authored-by: Martin Pechstein <77325495+Mape6@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
2021-03-23 22:54:58 +02:00
lishaoxia1985
b5c12ec17c
Carrier cannot attack, AS update to 4.1.3 (#3700) 2021-03-23 20:20:38 +02:00
Yair Morgenstern
cf3e517e43 3.13.10 2021-03-21 20:42:14 +02:00
Yair Morgenstern
049744c9bb
Translations update (#3723)
* Update German.properties (#3717)

* Update German.properties

* Update German.properties

* Update German.properties

* Update German.properties

* Update German.properties

* Update German.properties

* Update German.properties

* Update German.properties

* Update Indonesian.properties (#3715)

Co-authored-by: Martin Pechstein <77325495+Mape6@users.noreply.github.com>
Co-authored-by: Kensvin <63847755+Kensvin28@users.noreply.github.com>
2021-03-21 19:19:09 +02:00
Yair Morgenstern
5a5d0a980f Removed ALL color-based notifications! 2021-03-21 00:28:58 +02:00
Yair Morgenstern
d4b19a7bb3 Many notification conversions 2021-03-20 23:49:33 +02:00
Yair Morgenstern
50d5b0d7ce Added specific icons to certain notification types 2021-03-19 11:26:54 +02:00
Yair Morgenstern
ba51222841 Barbarians only heal by pillaging, simplified barbarian automation 2021-03-19 10:39:55 +02:00
Yair Morgenstern
87ff4c91f5 3.13.9 2021-03-18 20:59:42 +02:00
Yair Morgenstern
a49c2cc289
Translations update (#3712)
* Update Czech.properties (#3708)

- new strings
- space ship related terminology shortened and synced
- few city states transation

* Update German.properties (#3704)

* Update German.properties

* Update German.properties

* Update German.properties

* Update German.properties

* Update German.properties

* Update German.properties

* Update German.properties

* Update German.properties

* Update German.properties

* Update Italian.properties (#3701)

Co-authored-by: stoupa007 <60326342+stoupa007@users.noreply.github.com>
Co-authored-by: Martin Pechstein <77325495+Mape6@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
2021-03-18 19:48:05 +02:00
Yair Morgenstern
3bbac04303 Deprecated uniques replaced in 3.12.10 2021-03-15 22:37:07 +02:00
Yair Morgenstern
ecee6155e8 3.13.8 2021-03-15 22:14:08 +02:00
Yair Morgenstern
996f54367d
Translations update (#3698)
* Update Czech.properties (#3693)

Translated some city states' diplomacy.
P.S. What is the definition of 'radger'? I can't find it anywhere.

* Update Czech.properties (#3690)

diplomacy and cities: polynesia, siam, spain, songhai, mongolia, aztecs, inka, denmark

* Update German.properties (#3684)

* Update German.properties

* Update German.properties

* Update German.properties

* Update German.properties

Co-authored-by: jahodovykolac <79529669+jahodovykolac@users.noreply.github.com>
Co-authored-by: stoupa007 <60326342+stoupa007@users.noreply.github.com>
Co-authored-by: Martin Pechstein <77325495+Mape6@users.noreply.github.com>
2021-03-15 22:02:12 +02:00
lishaoxia1985
d7214b7a46
Method getImprovementIcon can Setsize for all icon (#3685)
* Method getImprovementIcon can Setsize for all icon

* categoryButton doesn't change background-color if it's disabled
2021-03-15 21:00:09 +02:00
Yair Morgenstern
a37ac74fa9 'in all coastal cities' now translated 2021-03-13 22:38:53 +02:00
Yair Morgenstern
8780107ae4 3.13.7 2021-03-11 23:49:49 +02:00
Yair Morgenstern
01877fee7c Fixed Great Barrier Reef spawn rules 2021-03-11 22:17:59 +02:00
Yair Morgenstern
c7e424d661 Merge branch 'master' of https://github.com/yairm210/Unciv 2021-03-11 21:58:19 +02:00
lishaoxia1985
b3a62f4b1a
Withdraw before melee is the same as original game (#3674) 2021-03-11 21:40:44 +02:00
Yair Morgenstern
05a36580ba Merge branch 'master' of https://github.com/yairm210/Unciv 2021-03-11 21:22:16 +02:00
Yair Morgenstern
f6e188144e
Translations update (#3683)
* Update German.properties (#3680)

* Update German.properties

* Update German.properties

* Update German.properties

* Updated Spanish translations (#3677)

* Completed Spanish translations

* UnitTable.kt modifications to place cancel, previous idle unit and next idle unit below unit information

This was made in order to prevent previous idle unit and next idle unit keys' positions to change depending on how big the unit info box is.

* NotificationsScroll: Made notifications dark blue with white text.

* Improved Spanish translations

* Revert "NotificationsScroll: Made notifications dark blue with white text."

This reverts commit 63b8ba2e

* Completed Spanish translations

* UnitTable.kt modifications to place cancel, previous idle unit and next idle unit below unit information

This was made in order to prevent previous idle unit and next idle unit keys' positions to change depending on how big the unit info box is.

* NotificationsScroll: Made notifications dark blue with white text.

* Improved Spanish translations

* Revert "NotificationsScroll: Made notifications dark blue with white text."

This reverts commit 63b8ba2e

* Revert "UnitTable.kt modifications to place cancel, previous idle unit and next idle unit below unit information"

This reverts commit d970632b

* Improved Spanish translations

* Update German.properties (#3676)

* Replaced ß with ss in some words.

* Update German.properties

* Update TileImprovements.json

Fixed typo

* Update German.properties

* Update German.properties

* Update German.properties (#3673)

* Update German.properties (#3672)

* Update Czech.properties (#3670)

new strings, few typos
translated ottoman, kroean, iroquois and persian diplomacy and cities

Co-authored-by: Martin Pechstein <77325495+Mape6@users.noreply.github.com>
Co-authored-by: 71walceli <antonini2903@hotmail.com>
Co-authored-by: stoupa007 <60326342+stoupa007@users.noreply.github.com>
2021-03-11 21:09:58 +02:00
Yair Morgenstern
972bf2ba1c Resolved #3681 - translation fix, "in every city" -> "in all cities" 2021-03-11 21:08:48 +02:00
Martin Pechstein
daa6eec283
Update TileImprovements.json (#3679)
Fixed typo
2021-03-11 21:01:17 +02:00
Yair Morgenstern
4c5d8645d6
Translations update (#3669)
* Update Czech.properties (#3666)

Fixed some translations and deleted some unnecessary text.

* Update German.properties (#3664)

* Update German translations

* Update German translations

* Update German translations

* Update German.properties

* Update German.properties

* Update Turkish.properties (#3661)

* Update Turkish.properties

* Update Turkish.properties

* Update Turkish.properties

* update German.properties (#3660)

* Update Italian.properties (#3658)

* Update Indonesian.properties (#3657)

Co-authored-by: jahodovykolac <79529669+jahodovykolac@users.noreply.github.com>
Co-authored-by: Martin Pechstein <77325495+Mape6@users.noreply.github.com>
Co-authored-by: mehmetkazim0 <69713944+mehmetkazim0@users.noreply.github.com>
Co-authored-by: Joni Arida <JoniArida@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-03-08 22:10:03 +02:00
Yair Morgenstern
35ed8920e9 3.13.6 2021-03-07 13:04:11 +02:00
Yair Morgenstern
e2cf60d028
Translations update (#3656)
* update German.properties (#3650)

* update German.properties

* Update German.properties

add missing placeholder

* Update Czech.properties (#3641)

india diplomacy and cities
new strings

Co-authored-by: Joni Arida <JoniArida@users.noreply.github.com>
Co-authored-by: stoupa007 <60326342+stoupa007@users.noreply.github.com>
2021-03-07 12:57:59 +02:00
Yair Morgenstern
011c1de102 Resolved #3635 - can remove natural wonders and roads/railroads in map editor 2021-03-07 11:41:09 +02:00
lishaoxia1985
d290ca3d33
Update translation and Android studio to 4.1.2 (#3642) 2021-03-04 18:56:05 +02:00
Yair Morgenstern
153f4f98d3 3.13.5 2021-03-03 23:48:22 +02:00
Yair Morgenstern
3d0cef7af2
Translations update (#3640)
* German Translation (#3632)

* Translation

* missing !

* Update Italian.properties (#3630)

Co-authored-by: Joni Arida <JoniArida@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
2021-03-03 22:47:08 +02:00
Yair Morgenstern
639be3b01d 3.13.4 2021-03-01 21:05:53 +02:00
david.howard
12e3005294
[663] Allow unit rename on promote (#3620)
* Add nullable "instanceName" field to MapUnit to capture name for individual units
* Add "displayName" property to MapUnit which takes instanceName if set, name
  otherwise
* Add dialog to PromotionPicker to allow setting instanceName of unit, if not
  already set
2021-03-01 20:52:46 +02:00
Yair Morgenstern
237884a60d
Translations update (#3629)
* Update Czech.properties (#3627)

few tutorial/civilopaedia texts

* Update French.properties (#3625)

* Update German.properties (#3624)

* Update Czech.properties (#3623)

* Update Italian.properties (#3621)

Co-authored-by: stoupa007 <60326342+stoupa007@users.noreply.github.com>
Co-authored-by: Subcher <70058565+Subcher@users.noreply.github.com>
Co-authored-by: Johannes Schreiber <58529898+devbeutler@users.noreply.github.com>
Co-authored-by: jahodovykolac <79529669+jahodovykolac@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
2021-03-01 19:05:48 +02:00
Yair Morgenstern
7eeeee5212 Strength bonus from capital is now part of the Palace bonuses to make it moddable 2021-02-28 22:40:54 +02:00
Yair Morgenstern
ed8d642036 3.13.3-patch1 2021-02-27 23:47:08 +02:00
Jack Rainy
ff05fa601d
Translations update (#3618)
* Translations update

* Minor changes to the translation
2021-02-25 19:01:58 +02:00
Yair Morgenstern
19c7a87371 Renamed "Siege" image to "Besiege" - #3617 2021-02-24 21:31:07 +02:00
Giuseppe D'Addio
0501261d21
Update Italian.properties (#3613) 2021-02-24 20:43:58 +02:00
Yair Morgenstern
e464ba5328 Map generation parameters are moddable, allowing players to create custom terrains for map generation! 2021-02-24 20:34:01 +02:00
Yair Morgenstern
ccae026df2 Resolved #1804 - Renamed "Siege" promotion to "Besiege". Closes #2458 2021-02-23 20:07:49 +02:00
Yair Morgenstern
c9a96358da Changed "Gold" resource to be called "Gold Ore" to not conflict with the yield type for translations - #2458 2021-02-23 20:05:00 +02:00
Yair Morgenstern
4bd40125b0 All resource stats from buildings converted to building uniques 2021-02-22 23:00:48 +02:00
Yair Morgenstern
0ef44fc4da Changed deprecated StringBuilder.appendln with .appendLine 2021-02-22 21:13:16 +02:00
Yair Morgenstern
b7c25f30e5 3.13.2 2021-02-20 23:26:52 +02:00
Yair Morgenstern
40a59782d0
Translations update (#3612)
* Update German.properties (#3611)

* Added Dutch translations (#3599)

* Update Dutch.properties

* Update Dutch.properties

* Update Dutch.properties

* Update Dutch.properties

Line 561 misspelled [attacker]

* Update Dutch.properties

* Update Dutch.properties

* Update Dutch.properties

* Update Dutch.properties

* Update TechPickerScreen.kt

Changed the current tech color from a grey color to a more distinguishable blue color.

* Update TechPickerScreen.kt

Co-authored-by: SRS <deringenieur71@gmail.com>
Co-authored-by: Louis Deconinck <louis.dck@gmail.com>
2021-02-20 23:08:20 +02:00
Yair Morgenstern
36949410a7 Resolved #3586 - Added 'Destroy' translation for capturing cities in one-city challenge 2021-02-18 13:20:49 +02:00
Yair Morgenstern
fda3c1053d 3.13.1 2021-02-16 20:24:50 +02:00
Yair Morgenstern
1b45f93b16
Translations update (#3602)
* Update Czech.properties (#3597)

* Update Czech.properties

new strings, american and japan diplomacy

* Update Czech.properties

fixed param typo

* Update Malay.properties (#3596)

Translate some of the tutorial phase, dialogues and other in-game selection buttons.

* Update Italian.properties (#3594)

Co-authored-by: stoupa007 <60326342+stoupa007@users.noreply.github.com>
Co-authored-by: SNN95 <41881544+SNN95@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
2021-02-16 20:19:45 +02:00
Johannes Schreiber
1e981abe53
Display scroll position on minimap (#3593) 2021-02-14 11:48:57 +02:00
Yair Morgenstern
f2af128546 Merge branch 'master' of https://github.com/yairm210/Unciv 2021-02-13 21:53:12 +02:00
Yair Morgenstern
48a330fddc 3.13.0 2021-02-13 21:52:33 +02:00
Giuseppe D'Addio
75ef42f31e
Update Italian.properties (#3589) 2021-02-13 21:51:13 +02:00
Yair Morgenstern
e92a1dd088 Better tech descriptions for increased improvement stats 2021-02-12 14:13:11 +02:00
Yair Morgenstern
8b1778eea3 Removed Scenario Maps entirely - was not a well thought-out concept and caused more confusion than actual fun.
Case in point - 0 mods are Scenario mods.
2021-02-11 22:33:52 +02:00
Yair Morgenstern
74cc421b62 3.12.14 2021-02-09 23:17:42 +02:00
Yair Morgenstern
ae3e6524f5
Translations update (#3588)
* Update Simplified_Chinese.properties (#3585)

* Update Simplified_Chinese.properties

* fix

fix case problem

* Update Italian.properties (#3581)

* Update Portuguese.properties (#3580)

* Update Portuguese.properties

* Update Portuguese.properties

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

Co-authored-by: CrispyXYZ <64761703+CrispyXYZ@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: Tiger13p <58396220+Tiger13p@users.noreply.github.com>
2021-02-09 23:07:18 +02:00
Yair Morgenstern
5328efa233 Updated to latest LibGDX and Kotlin versions 2021-02-06 23:25:48 +02:00
Yair Morgenstern
71266b213e 3.12.13 2021-02-06 22:39:36 +02:00
Yair Morgenstern
3d683c767a Added "Consumes [amount] [resourceName]" unique for buildings 2021-02-06 21:12:44 +02:00
Yair Morgenstern
b0bf18afa0 Added custom victory conditions 2021-02-05 16:06:58 +02:00
Yair Morgenstern
84c200bd32 New cityFilter for cities connected to capital 2021-02-05 15:34:20 +02:00
Yair Morgenstern
1e6c8dacff Deprecated old uniques 2021-02-05 12:22:47 +02:00
Yair Morgenstern
45b43849bd Resolved #3578 - More readable colors for Korea civ, kudos @ravignir 2021-02-05 10:27:31 +02:00
Yair Morgenstern
1ada5aff43 Merge branch 'master' of https://github.com/yairm210/Unciv 2021-02-05 10:15:55 +02:00
GGGuenni
679ca2ba6c
changed case sensitivity (#3577)
somehow I forgot to change most of the texts
2021-02-04 21:50:44 +02:00
Yair Morgenstern
b0c9c797f6 3.12.12 2021-02-04 20:18:14 +02:00
Yair Morgenstern
31ef5fdc77
Translations update (#3576)
* Update Traditional_Chinese.properties (#3571)

* Update German.properties (#3569)

* Update Indonesian.properties (#3566)

* Update Russian.properties (#3564)

Co-authored-by: SiderealArt <30827929+SiderealArt@users.noreply.github.com>
Co-authored-by: Johannes <58529898+devbeutler@users.noreply.github.com>
Co-authored-by: Kensvin <63847755+Kensvin28@users.noreply.github.com>
Co-authored-by: Jack Rainy <JackRainy@users.noreply.github.com>
2021-02-04 19:23:08 +02:00
GGGuenni
a07e3947d2
Refactoring of MultiplayerScreen (#3572)
* Refactoring

- Removed unnecessary .tr()
- changed text case sensitivity
- changed popup to YesNoPopup
- combined multiplayerGames.remove and deleteSave into removeMultiplayerGame to reduce unnecessary try catch blocks

* Update case sensitivity translations

* adding "Game settings" entry
2021-02-04 19:13:01 +02:00
Yair Morgenstern
9d647447bc Added improvement-constructing buildings 2021-02-03 21:09:29 +02:00
SpacedOutChicken
55b4298cec
New uniques for border expansion - "-[]% Gold cost of acquiring tiles []" and "-[]% Culture cost of acquiring tiles []" (#3565)
* no message

* Revert "no message"

This reverts commit 9ece60bd58.

* Renamed Haka War Dance effect to Intimidation, to make it more applicable to non-Maori Warrior units.

* no message

* Parameterized civUnique for extra experience from combat

* Update build.gradle.kts

* Update BattleDamage.kt

* Update Policies.json

* Update Battle.kt

* Fully parameterized nationwide XP gain

* New parameterized uniques for border expansion - "-[]% Gold cost of acquiring tiles []" and "-[]% Culture cost of acquiring tiles []"

* Parameterized uniques for acquiring new tiles via either culture or gold

* Parameterizing expansion unique - improved calculation method

* Improved parameterization for border expansion uniques
2021-02-03 13:06:53 +02:00
GGGuenni
aa1bd3cd7e
Adding resign function for multiplayer (#3567)
* Adding give up function for multiplayer

* Update template.properties

* Reviewed changes

- Changed "give up" to "resign"
- Removed unnecessary and harmful translations
- Using YesNoPopup now

* Add missing space

* fixed first AI turn getting skipped
2021-02-02 16:43:51 +02:00
Yair Morgenstern
bc4829a424 Translation updates for new cityFilter 2021-01-30 19:46:03 +02:00
Giuseppe D'Addio
449c5e1e2b
Update Italian.properties (#3562) 2021-01-29 12:31:57 +02:00
SpacedOutChicken
457588a2c9
Parameterize Civ Unique for increased XP gain (#3561)
* no message

* Revert "no message"

This reverts commit 9ece60bd58.

* Renamed Haka War Dance effect to Intimidation, to make it more applicable to non-Maori Warrior units.

* no message

* Parameterized civUnique for extra experience from combat

* Update build.gradle.kts

* Update BattleDamage.kt

* Update Policies.json

* Update Battle.kt

* Fully parameterized nationwide XP gain
2021-01-29 12:31:52 +02:00
Yair Morgenstern
1a576539e0 Implemented Cultural Diplomacy policy 2021-01-29 12:06:16 +02:00
Yair Morgenstern
2f121983cf Implemented Scholasticism 2021-01-29 12:01:25 +02:00
Yair Morgenstern
4e2aaa76dc Started implementing Patronage branch. Parametrized some uniques, city-states can handle different resting points for different civs. 2021-01-29 11:54:23 +02:00
Yair Morgenstern
9c725d74ae Parametrized "Maintenance on roads & railroads reduced by []%" 2021-01-29 10:35:01 +02:00
Yair Morgenstern
bcab751f7c Linting 2021-01-28 16:21:25 +02:00
Yair Morgenstern
18f4d4e53e Added city filter, and gerenicised several uniques to work with the city filter.
Deleted some deprecated uniques
2021-01-28 14:26:42 +02:00
Yair Morgenstern
aa944bad87 3.12.10 2021-01-26 22:46:47 +02:00
Yair Morgenstern
0c89986af4 Resolved #3436 - parametrized "+[]% [] in all cities" 2021-01-25 20:47:50 +02:00
Yair Morgenstern
93bdb137f9
Translations update (#3559)
* Update Italian.properties (#3544)

* Update Japanese.properties (#3545)

* Update Japanese.properties

* Update Japanese.properties

* Japanese translation update (#3550)

* Update Japanese.properties

* Update Japanese.properties

* Finished translating some missing sentences in spanish (#3554)

* Turkish translation update (#3551)

* Update Turkish.properties

* Update Turkish.properties

* Update Simplified_Chinese.properties (#3546)

* Update Simplified_Chinese.properties

* Update Simplified_Chinese.properties

Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: paontv <57051667+paontv@users.noreply.github.com>
Co-authored-by: hirmonik <76709219+hirmonik@users.noreply.github.com>
Co-authored-by: marcosbach <77796076+marcosbach@users.noreply.github.com>
Co-authored-by: omerfaruk-cakmak <32402595+omerfaruk-cakmak@users.noreply.github.com>
Co-authored-by: 洛颍川 <73578868+LuoYinChuan@users.noreply.github.com>
2021-01-24 20:05:39 +02:00
GGGuenni
3037ce4141
multiple game support for TurnChecker (#3540)
* TurnChecker now checks every multiplayer game

Not just the currently open game

* Adding game saving to turn checker

so multiplayerScreen stays up to date

* remove unused imports

* removing unused functions
2021-01-24 16:12:44 +02:00
Yair Morgenstern
38025785b7 3.12.9 2021-01-16 21:57:30 +02:00
Antsiferov Andrew
a0526f9afe
[Bundle] [RU] L10n Update (#3518)
* 1 new line

* show tile yields

* 1 new line

* Move to city

* 3 new lines

* The resistance in [cityName] has ended!
* +[amount]% Production when constructing [unitType] units
* Doubles Gold given to enemy if city is captured

* 4 new lines

* Receive a tech boost when scientific buildings/wonders are built in capital
* -[amount]% [param] unit maintenance costs
* Excess Food converted to Production when under construction
* Requires at least [amount] population

* 3 new lines

* New [param] units start with [amount] Experience
* All tiles cost 1 movement
* Can pass through impassable tiles
2021-01-16 21:32:55 +02:00
Yair Morgenstern
0800dbba51 Resolved #3533 - Added confirmation popup when saving over existing save 2021-01-15 13:28:29 +02:00
uncivbot[bot]
67bcc26ab7
Translations update (#3523)
* Update Italian.properties (#3509)

* Update Russian.properties (#3512)

Just a small addition to the previous request as I missed one line.

* Added Aztecs quotes translations (#3513)

Additionaly, added a few Aztec's cities names and other minor changes. Also changed some miscellaneous phrases to match context.

* Update Japanese.properties (#3515)

Improvement of Japanese translation

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

Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: BodyaBilder <77171011+BodyaBilder@users.noreply.github.com>
Co-authored-by: Gualter Machado <35864822+GualterMM@users.noreply.github.com>
Co-authored-by: hirmonik <76709219+hirmonik@users.noreply.github.com>
Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
2021-01-12 16:46:41 +02:00
Yair Morgenstern
617e7aea93 Removed placeholder science and production boost from Computers tech
New games start by default with city states
2021-01-11 20:56:31 +02:00
ravignir
0bb40d842a
changed default tiles colors (#3508)
* changed default tiles colors

I hope the new colors are better :)

* Update Terrains.json

2nd commit, ocean changed
2021-01-07 16:33:38 +02:00
Yair Morgenstern
c1783d8592 3.12.7 2021-01-06 23:16:43 +02:00
paontv
597bd4efd7
Update Japanese.properties (#3504) 2021-01-06 23:01:20 +02:00
stoupa007
813da94e08
Update Czech.properties (#3493)
* Update Czech.properties

new translations, some typo fixes, rome diplomacy and cities

* Update Czech.properties

arabian diplomacy and cities

* Update Czech.properties

typos fixed
2021-01-06 23:00:26 +02:00
Yair Morgenstern
2a262c506a Resolved #3469 - more readable Inca colors 2021-01-06 22:24:01 +02:00
Yair Morgenstern
26c817a4a1 Resolved #3483 - settlers require at least 2 population to construct, as per Civ V 2021-01-01 13:29:03 +02:00
Giuseppe D'Addio
b4c240e499
Update Italian.properties (#3462) 2020-12-29 19:59:27 +02:00
Yair Morgenstern
07c8300d61 3.12.4 2020-12-27 13:37:37 +02:00
uncivbot[bot]
44af4869d4
Translations update (#3461)
* Update Italian.properties (#3447)

* Strings translations (#3454)

* Update Indonesian.properties (#3458)

* Update Indonesian.properties

* Update Indonesian.properties

* Brazilian Portuguese language updates (#3459)

Hi, I translated everything that was missing from the list, but I didn't translate the names of the cities, it would take a long time, but the rest did everything and I hope I'm helping!

* Update Brazilian_Portuguese.properties

@Aguibizanno1 - you uncommented some comment lines, which made the tests fail. Lines starting with # are comment lines, so don't touch those :)

* Update Brazilian_Portuguese.properties

Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: Jack Rainy <JackRainy@users.noreply.github.com>
Co-authored-by: Kensvin <63847755+Kensvin28@users.noreply.github.com>
Co-authored-by: Aguibizanno <75736611+Aguibizanno1@users.noreply.github.com>
Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
2020-12-27 13:04:03 +02:00
Huichan Lee
76e9f973c5
updated translation (#3453) 2020-12-25 12:54:45 +02:00
Yair Morgenstern
8689fe0ffa Clarified Protectionism effect 2020-12-23 21:28:59 +02:00
uncivbot[bot]
24a5574359
Translations update (#3446)
* Update Italian.properties (#3439)

* Update Czech.properties (#3442)

few new translations, few fixes

* Update Indonesian.properties (#3443)

Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: stoupa007 <60326342+stoupa007@users.noreply.github.com>
Co-authored-by: Kensvin <63847755+Kensvin28@users.noreply.github.com>
2020-12-23 21:09:52 +02:00
Yair Morgenstern
c7d79ad179 Replaced hardcoded Settler references with unique
Tech uniques now saved in tech object for less regex parsing per turn
2020-12-22 23:31:29 +02:00
Yair Morgenstern
b47af60ade Added road and railroad costs to improvement description 2020-12-21 21:15:07 +02:00
Yair Morgenstern
213e71a97b Reversed requiredBuilding migration to unique 2020-12-21 20:35:02 +02:00
Yair Morgenstern
585be1b2be 3.12.2 2020-12-19 22:21:09 +02:00
paontv
daa14d257f
Update Japanese.properties (#3426) 2020-12-19 21:41:13 +02:00
Yair Morgenstern
9b6dd71d22 Resolved #3422 - added fast switch between adjacent cities in city screen 2020-12-19 21:39:30 +02:00
Yair Morgenstern
e3f1c33654 Building.requiredBuildingInAllCities -> "Requires a [] in all cities" unique 2020-12-17 15:46:17 +02:00
Yair Morgenstern
32a2c784fe Fixed tests 2020-12-16 20:23:31 +02:00
Yair Morgenstern
f40584b1ec requiredBuilding parameter migrated to "Requires a [] in this city" unique 2020-12-16 20:14:36 +02:00
Yair Morgenstern
1dc5111fcb 3.12.1 2020-12-16 12:33:44 +02:00
Kensvin
5e157b66d0
Update Indonesian.properties (#3419) 2020-12-16 12:23:52 +02:00
Giuseppe D'Addio
44878008f8
Update Italian.properties (#3418) 2020-12-16 12:23:42 +02:00
이휘찬
d1387a04c3
Implemented missing Korean UA (#3416)
* try to implement korean ability

* Corrected typo error

Coreect camel typo errror

* updated new korean feautre translation.

* edited korean unique text to get right sentence.

* merge duplicated code into addScience(Int)
2020-12-13 12:28:05 +02:00
Yair Morgenstern
d0df571ca5 Fixed broken translation 2020-12-13 11:30:02 +02:00
Yair Morgenstern
e7cd363b70 3.12.0 2020-12-13 10:00:22 +02:00
paontv
e6882e8223
Update Japanese.properties (#3407) 2020-12-13 09:29:08 +02:00
Yair Morgenstern
963fee3552 Added much-needed "+[]% Production when constructing [] units" unique 2020-12-13 09:27:31 +02:00
Yair Morgenstern
4c48522de2 Removed unused "effects" from the policy file 2020-12-11 14:26:40 +02:00
Yair Morgenstern
d0774db030 Resolved #3408 - Unit maintenance cost reduction generalized, now works for Ottomans 2020-12-11 14:24:09 +02:00
Giuseppe D'Addio
2708cc3309
Update Italian.properties (#3397) 2020-12-10 11:24:12 +02:00
Yair Morgenstern
ceef8bd7ad Fixed self-made bug of missing helicopters... 2020-12-08 21:02:40 +02:00
Yair Morgenstern
8a5247324c 3.11.18 2020-12-06 22:16:03 +02:00
Yair Morgenstern
e66fbd61fa Merge branch 'master' of https://github.com/yairm210/Unciv 2020-12-06 21:51:18 +02:00
Yair Morgenstern
b50c129e2d "+[] Movement for all [] units" now respects all unit categories 2020-12-06 21:50:46 +02:00
TG
64ad7216ca
Update Korean.properties (#3394)
* Update Korean.properties

* Update Korean.properties

* Update Korean.properties

* Update Korean.properties

* Update Korean.properties

* Update Korean.properties

* Update Korean.properties

* Update Korean.properties
2020-12-06 21:37:16 +02:00
paontv
139503ff55
Update Japanese.properties (#3392) 2020-12-06 21:27:34 +02:00
Yair Morgenstern
22b3f563f3 Crash reports contain the game version for easy filtering
Added helper function cityInfo.isWorked(tile)
2020-12-05 22:54:16 +02:00
givehub99
6a73909c67
Helicopter Gunship (#3385)
* -Helicopter Gunship Implemented
-Anti-Tank Gun upgrades to it

* unit atlas

* "All tiles cost 1 movement"
2020-12-04 14:20:24 +02:00
Yair Morgenstern
a9d36c073a Mods can handle removing existing buildings 2020-12-03 23:58:48 +02:00
Yair Morgenstern
c12afb4131 "have signed the peace treaty" -> "have signed a peace treaty" 2020-12-03 23:29:36 +02:00
Yair Morgenstern
0feb9bdefc First attempt at making Unciv Android-TV-compatible 2020-12-01 23:26:01 +02:00
Kensvin
b30e6e6fdd
Update Indonesian.properties (#3367) 2020-12-01 21:25:40 +02:00
Yair Morgenstern
b9f6e0deec 3.11.16 2020-11-30 23:29:29 +02:00
Giuseppe D'Addio
5830996b3b
Update Italian.properties (#3365) 2020-11-30 22:56:31 +02:00
Yair Morgenstern
c86d6e7b69 Fixed broken tests 2020-11-26 14:27:14 +02:00
Yair Morgenstern
b54fec05f1 3.11.15 2020-11-25 21:37:02 +02:00
Giuseppe D'Addio
77c8df6516
Update Italian.properties (#3362) 2020-11-24 22:55:31 +02:00
Anonymous
fc4c8c48ee
Update Polish translation (#3356) 2020-11-24 22:12:30 +02:00
ravignir
323c593d6e
Fixed Free Thought trading post bonus. (#3361)
It should provide Science instead of Gold.
2020-11-24 10:52:02 +02:00
Yair Morgenstern
0952a6a5a6 Test-breaking text error, good thing we have tests :) 2020-11-23 19:08:01 +02:00
Yair Morgenstern
eb7a064019 Resolved #3335 - Removed all unecessary spaces and colons 2020-11-22 22:48:38 +02:00
Yair Morgenstern
3d1e1d7936 Removed some confusing and pointless ": " at the end of translations - #3335 2020-11-22 22:41:12 +02:00
Yair Morgenstern
6d7d698dad Prepacked flag, unit and building images in altas files, so they'll be readable from the jar files 2020-11-22 21:47:46 +02:00
givehub99
072226ff9a
Added "All [] Cities get a free []" unique. (#3352)
* Added "All [] Cities get a free []" unique.

The first parameter is for city type. Currently "new" and "coastal" are supported.
"new" matches every city and "coastal" matches cities on a coastal tile.
"new" and "coastal" were added to template.properties for translation.

Upon city founding, the second parameter building is added to the city.

In civ 5 G&K, Carthage gets a free harbor for every coastal city.

* -Syntax changed to "Get a free [] []"
First paramater is the building and second is the city filter.
Supports "in every city" and "in every coastal city"

-new and coastal was removed from template.properties
-in every coastal city was added to template.properties

* Changed syntax to "Gain a free [] []"
2020-11-22 11:55:34 +02:00
Ivan Romanov
c33793cf81
Update Russian translation (#3351) 2020-11-19 23:42:47 +02:00
Yair Morgenstern
35554f3ec6 Resolved #3330 - Texture is back to 2048*2048, by taking flags buldings and units out of the main image.
The cost is that there are texture swaps, and so framerate is hurt.
2020-11-19 21:44:09 +02:00
Yair Morgenstern
bf4216578a 3.11.12 2020-11-14 22:35:12 +02:00
uncivbot[bot]
8f6dca9df3
Translations update (#3339)
* Update Russian translation (#3334)

* Update Korean.properties (#3336)

Co-authored-by: Ivan Romanov <drizt72@zoho.eu>
Co-authored-by: kasterra <74085452+kasterra@users.noreply.github.com>
2020-11-14 22:12:43 +02:00
Oliver Westermann
6344e0835e
Fix german introduction (#3329)
The German name for the Great Barrier Reef is the English name, the literal translation is not used.
2020-11-11 21:22:38 +02:00
paontv
ab8b4405f2
Update Japanese.properties (#3328) 2020-11-10 22:08:38 +02:00
Yair Morgenstern
86c6624f8e Resolved #3326 - Settling a city removes the improvement in progress 2020-11-09 21:26:26 +02:00
Yair Morgenstern
4667594731 3.11.10 2020-11-07 20:49:38 +02:00
kasterra
6c595eff50
Updated korean.properties (#3321)
Translated much of untranslated sentences. Most of translation refered to civ5 documents in namu.wiki.
번역되지 않은 많은 문장을 업데이트 하였습니다. 번역의 대부분은 나무위키 문명 5 문서들을 참고 하였습니다.
2020-11-07 20:15:57 +02:00
Yair Morgenstern
65524cb7dd Removed exitEvent from the UncivGameParameters, since Gdx.app.exit() does the same thing :) 2020-11-04 00:09:11 +02:00
Yair Morgenstern
d42b93c705 3.11.9 2020-11-02 22:25:34 +02:00
Kensvin
2cddfc2b56
Update Indonesian.properties (#3313) 2020-11-02 20:39:16 +02:00
jnecus
7e7e0e8a3d
Update Simplified_Chinese.properties (#3314)
Additional Chinese translations
2020-11-02 20:39:04 +02:00
uncivbot[bot]
77af9ba80c
Translations update (#3312)
* Update Italian.properties (#3299)

* Update Spanish.properties (#3308)

Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: chriscr2 <70113017+chriscr2@users.noreply.github.com>
2020-11-01 21:50:04 +02:00
Yair Morgenstern
247350d6a1
Revert "-Terracotta Army, Alhambra, Hanse, Leaning Tower of Pisa, Neuschwanstein, and Hubble Space Telescope are no longer buildable or displayed in the pedia since they are not part of vanilla Civ 5. (#3300)" (#3301)
This reverts commit 49cdf09b44.
2020-10-27 00:22:02 +02:00
givehub99
49cdf09b44
-Terracotta Army, Alhambra, Hanse, Leaning Tower of Pisa, Neuschwanstein, and Hubble Space Telescope are no longer buildable or displayed in the pedia since they are not part of vanilla Civ 5. (#3300)
Their entries were kept in the json files so as to not break pre-existing save files.

-Units and buildings that are unbuildable are not shown in the pedia or tech picker as being unlockable by tech
2020-10-27 00:20:48 +02:00
Yair Morgenstern
1d391e14e5 3.11.8 2020-10-26 23:55:20 +02:00
uncivbot[bot]
525671403b
Translations update (#3298)
* Update Italian.properties (#3287)

* Update Czech.properties (#3288)

new strings translated

* Update Japanese.properties (#3290)

* Update Japanese.properties

* Update Japanese.properties

* Update Japanese.properties

* Update Japanese.properties

* Update Japanese.properties

* Update Hungarian.properties (#3291)

Mostly fixed typos & added a few translations

* Update Indonesian.properties (#3292)

* Update German.properties (#3297)

Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: stoupa007 <60326342+stoupa007@users.noreply.github.com>
Co-authored-by: paontv <57051667+paontv@users.noreply.github.com>
Co-authored-by: borklfd <67602409+borklfd@users.noreply.github.com>
Co-authored-by: Kensvin <63847755+Kensvin28@users.noreply.github.com>
Co-authored-by: mister-bum <60568506+mister-bum@users.noreply.github.com>
2020-10-26 23:47:03 +02:00
givehub99
64fc57e6d2
Helicopter Gunship uniques (#3294)
* Preparation for Helicopter unit

-"All tiles costs 1" unique makes every tile cost 1. Used by Helicopter in CIV 5.

-"Can pass through impassable tiles" unique allows unit to pass through any tile. Used by Helicopter in CIV 5. Does not let units cross ocean if they couldn't already, just terrain that is considered "impassable"

-Mountains now do 50 damage to units that end turn on it. In civ 5 and its expansion this is what happens to any unit that is able to pass mountains.
This is "hard coded" for now. Also added the notification text to template.properties

* mountains do not give sight bonus when on them

* Revert "mountains do not give sight bonus when on them"

This reverts commit 83ad3df5d4.
2020-10-26 20:28:44 +02:00
Yair Morgenstern
3713923caf Added mods to crash report, many crashes are caused by incorrectly defined mods 2020-10-24 23:16:16 +03:00
Yair Morgenstern
35e2465f8a 3.11.7 2020-10-24 22:56:07 +03:00
uncivbot[bot]
e6b855cb6f
Translations update (#3286)
* Update Indonesian.properties (#3280)

* Update Italian.properties (#3281)

* Update Italian.properties

* Update Italian.properties

Co-authored-by: Rafsanjani Atallah <rafsan1810@gmail.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
2020-10-24 22:49:01 +03:00
Yair Morgenstern
895ed528af Resolved #3285 - added a notification when cities are no longer in resistance 2020-10-24 22:43:04 +03:00
Yair Morgenstern
88eab17e9e New snow-versions of existing tiles :) 2020-10-24 22:10:47 +03:00
Yair Morgenstern
8dde23aa38 3.11.6 2020-10-21 19:01:07 +03:00
uncivbot[bot]
635a12feae
Translations update (#3278)
* Update Persian_(Pinglish-UN).properties (#3273)

* Update Japanese.properties (#3276)

* Update Japanese.properties

* Update Japanese.properties

* Update Japanese.properties

* Update Japanese.properties

* Indonesian.properties updates (#3277)

I'm new to github and coding stuff so I'm really sorry if I messed some things up. I've translated all the required translations and also changed some things up to make sense a little bit more.

Co-authored-by: Mojtaba Rahimy <mojtaba.rahimy@chmail.ir>
Co-authored-by: paontv <57051667+paontv@users.noreply.github.com>
Co-authored-by: Rafsanjnai Atallah <memecenterj@gmail.com>
2020-10-20 19:48:29 +03:00
givehub99
d75541e5b4
Consolidated unit kill bonus uniques (#3267)
* -Consolidated unit kill bonus uniques.
Syntax is "Earn []% of [] opponent's [] as [] for kills" for both units and nations.

Ex.
"Earn [10]% of [military] opponent's [Cost] as [Gold] for kills"
or
"Earn [100]% of [Barbarians] opponent's [Strength] as [Culture] for kills"

Only Culture and Gold are supported as rewards now, but it can be expanded later. The pictish warrior unit in G&K gets 50% of opponent's strength as faith, so we can have the function edited to allow for faith when we get to that point.
Only Strength or Cost is supported as what the reward amount is based on.

-Policies.json and Nations.json were changed to fit the new syntax. The old syntax still works for mods for now.

-matchesCategory MapUnit function can now check if the unit is a barbarian

* -Compatibility for depecrated unit kill bonus uniques done more efficiently and counted only once (since prior to this PR, it was also counted only once)

* -Changed it to "Barbarian" instead of "Barbarians", added "Barbarian" to template.properties

* space after translation template
2020-10-18 18:10:26 +03:00
Yair Morgenstern
10818de096 3.11.5 2020-10-17 22:28:58 +03:00
uncivbot[bot]
c3205f8aff
Translations update (#3272)
* Update Italian.properties (#3266)

* Update Vietnamese.properties (#3269)

* Create Vietnamese

* Update and rename Vietnamese to Vietnamese.properties

* Update Vietnamese.properties

* Update Vietnamese.properties

* Update Vietnamese.properties

* Update Vietnamese.properties

* Update Vietnamese.properties

* Update Vietnamese.properties

* Update Vietnamese.properties

* Update Vietnamese.properties

* Update Vietnamese.properties

* Update Vietnamese.properties

* Update Vietnamese.properties

* Update Vietnamese.properties

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

* Update Japanese.properties (#3268)

* Update Japanese.properties

* Update Japanese.properties

Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: leanhquanea1234 <69520258+leanhquanea1234@users.noreply.github.com>
Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
Co-authored-by: paontv <57051667+paontv@users.noreply.github.com>
2020-10-17 22:18:26 +03:00
Yair Morgenstern
a6642cb536 Resolved #3265 - added keyboard shortcuts to tile improvements 2020-10-17 22:06:50 +03:00
Yair Morgenstern
3bf045d354 One high-stakes, no-holds-barred, to-the-death profiling later, and we're left with a much less laggy main screen and a much more profile-able citybutton/ 2020-10-16 00:39:58 +03:00
Yair Morgenstern
0aa53f07e7 3.11.4 2020-10-15 20:08:17 +03:00
Yair Morgenstern
c75f0162d5 Added city images by The Bucketeer for all eras up to Modern 2020-10-15 20:01:25 +03:00
uncivbot[bot]
fb984e4c38
Translations update (#3261)
* Update Italian.properties (#3253)

* Update German.properties (#3255)

* Update Indonesian.properties (#3257)

* Update Indonesian.properties

* Update Indonesian.properties

Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: Czeczki <72320003+Czeczki@users.noreply.github.com>
Co-authored-by: Kensvin <63847755+Kensvin28@users.noreply.github.com>
2020-10-14 19:25:03 +03:00
givehub99
8c51833a5a
New parameterized uniques (#3250)
* -New unit unique "Bonus as Defender []%". "+25% Combat Bonus when defending" now deprecated, but kept for now for mods. Json promotion changed to fit new syntax.
Defender Bonus modifier "Defender Bonus" added to template.properties for translation.

-"All newly-trained [] units in this city receive the [] promotion" now uses unit category checking.

-New building unique "New [] units start with [] Experience in this city"
This can used by Poland's stable unique replacement in BNW, as it gives extra xp for mounted units.
"New [] units start with [] Experience" is the new nation wide version of this.

"New military units start with [] Experience" is now deprecated, but kept for now for mods. Json policy changed to fit new syntax.

-Unit category checking can now check for "non-air", "military", "military units" and uniques.
Added "military" to template.properties for translation.

-New unit unique "No defensive terrain penalty". Admittedly this is for a mod I'm making.

* translations must have spaces after!

* -Attacker Bonus unique changed to "+[]% Strength when attacking"
Changed Units.json and and Wolf Pack from UnitPromotions.json to this syntax

-Defender Bonus unique changed to "+[]% Strength when defending"
Armor Plating promotions were changed to this syntax
2020-10-14 10:22:49 +03:00
Federico Luongo
b5a32e64ae
City-states personalities (#3259)
* City State Personality

* Introduced 4 personalities for city states: Friendly, Neutral, Hostile and Irrational.
* Influence recovery and degrade depends on city state personality.

* Quests assignement dependant on Personality and Trait

* Personality localization strings
2020-10-14 09:51:31 +03:00
Yair Morgenstern
fa41076cf2 3.11.3 2020-10-10 23:18:14 +03:00
uncivbot[bot]
27a474ddd0
Translations update (#3252)
* Update Russian.properties (#3249)

* Update Russian.properties

* Update Russian.properties

* Update Japanese.properties (#3247)

* Update Japanese.properties

* Update Japanese.properties

* Add some translations for french language (#3251)

* Update Italian.properties (#3245)

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

* Update Hungarian.properties (#3244)

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

Co-authored-by: DarkHeaven <52608694+D4rkHeaven@users.noreply.github.com>
Co-authored-by: paontv <57051667+paontv@users.noreply.github.com>
Co-authored-by: ikarris <Yan.Petit@hotmail.fr>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
Co-authored-by: Czeczki <72320003+Czeczki@users.noreply.github.com>
2020-10-10 23:03:30 +03:00
Yair Morgenstern
f7ff1bd267 Translation generation can handle multiple parameters of the same type 2020-10-09 14:39:41 +03:00
Yair Morgenstern
e292c210c8 Added "Must be next to []" unique for tile improvements 2020-10-08 17:35:25 +03:00
Federico Luongo
fea342a31b
Clear Barbarian Camp quest (#3246) 2020-10-08 16:29:56 +03:00
givehub99
da328c0408
Unified Unit Category Checking For Uniques (#3238)
* Starting unified unit category checking. This will increase flexibility with uniques as well as cut down on uniques that have only a slightly different way of checking unit categories.

Things currently checked by the category checking method are:
Type of unit
Name of unit
Whether unit is wounded
If the unit is land, water, or air

"Bonus vs City y%" still works currently.

Uniques that have been changed/added to use this category checking method so far are:

"Bonus vs x y%"
"[] units deal +[]% damage" (parameterization of "Wounded military units deal +25% damage")
"[] units gain the [] promotion"

If PR approved, using this method for more uniques would be a good idea.

Commented as depecrated are these uniques
"+[]% Strength vs []" (this has not been used in json files)
"Wounded military units deal +25% damage" (policies json file was updated to use parameterized version)

The following was added to template.properties for translating modifiers:

Air
Wounded

* translation ending with a space

* -Changed matchesCategory method for CityCombatant to what was suggested
-Changed matchesCategory method for MapUnitCombatant to what was suggested
-Use type.name instead of type.toString().toLowerCase()
-Lowercasing is no longer allowed for type names and unit names.

I kept the lower cased versions of wounded, land, water, and air for compatibility as several of the uniques are phrased like "Bonus vs land units 25%" and such and have entries in template.properties (ie. land units = ).

* -Lowercasing is no longer allowed. For wounded, land, water or air, you have to either use the capitalized version (ie. "Wounded") or lower case with units (ie. "wounded units"). This lets preexisting uniques that use "wounded units" etc still work while also letting people use the singular capitalized word (ie. "Wounded") for other uniques.

* fixed missing check for wounded units
2020-10-08 13:09:05 +03:00
Yair Morgenstern
4fa7c8d4c6 3.11.2 2020-10-08 12:47:08 +03:00
uncivbot[bot]
9616d1458d
Translations update (#3243)
* Add fixes and localizations (#3234)

Added some translations needed and fixed some typos. Also shortened some phrases for more concise text.

* Update Italian.properties (#3235)

* Update Italian.properties

* Update Italian.properties

Co-authored-by: Rafael 'Fig Diamantino de Figueiredo <45023203+rafaeldfigueiredo@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
2020-10-08 12:37:14 +03:00
Federico Luongo
7aedb6d4df
Find Player quest (#3237)
* Find Player quest

* Sequences
2020-10-08 12:25:58 +03:00
Yair Morgenstern
a485ad5fa5 Merge branch '3.11.1-patch1' 2020-10-07 14:13:30 +03:00
Yair Morgenstern
e690e3bcea Copied files in Android should now overwrite existing files 2020-10-07 14:02:38 +03:00
givehub99
b96cdae232
Polynesia's unique was fixed to match the syntax of the unique, which is "+[]% Strength if within [] tiles of a []". The 2 was put in brackets. (#3241) 2020-10-07 13:25:44 +03:00
Federico Luongo
1dd82f6f58
Find Natural Wonder Quest implemented (#3211)
* Find Natural Wonder Quest implemented

* List to sequence to list
2020-10-06 13:59:54 +03:00
Yair Morgenstern
fa59d4888a Era-specific city tiles for Ancient, Classical and Medieval 2020-10-06 12:22:55 +03:00
givehub99
9ffa0bee54
Consolidated Generic Tile Bonus Uniques (including Friendly Land, Foreign Land) (#3232)
* Redid things with help from HadeanLake:

-"+[]% combat bonus in []" Unit Unique
-"+[]% combat bonus for units fighting in []" Nation Unique
-Both of these can check for terrain or Friendly Land or Foreign Land
-Function to add stacking modifiers
-Himeji Castle and Foreign Legion had uniques changed to fit this syntax
-Old way still works for now, but deprecated

* fixed comments about deprecation and the new syntax
2020-10-06 10:52:30 +03:00
Federico Luongo
f9ebc8aa0f
Acquire Great Person Quest implemented (#3210)
* Acquire Great Person Quest implemented

* List to sequence to list
2020-10-06 10:48:59 +03:00
Yair Morgenstern
e951ed8324 3.11.1 2020-10-06 10:43:10 +03:00
uncivbot[bot]
7ecb059e05
Translations update (#3233)
* Update Italian.properties (#3221)

* Update Italian.properties

* Update Italian.properties

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

* Update Simplified_Chinese.properties (#3225)

* Update German.properties (#3228)

Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
Co-authored-by: CrispyXYZ <64761703+CrispyXYZ@users.noreply.github.com>
Co-authored-by: Czeczki <72320003+Czeczki@users.noreply.github.com>
2020-10-06 10:35:41 +03:00
Yair Morgenstern
0e327012a7 Fixed Windmill unique 2020-10-05 22:51:55 +03:00
Yair Morgenstern
010497e095 Don't delete existing mods when copying mods from the external diretory on Android app startup 2020-10-05 14:40:23 +03:00
Giuseppe D'Addio
5e9ffcd22a
Update Quests.json (#3224)
* Update Quests.json

* Update Quests.json
2020-10-05 12:01:50 +03:00
Yair Morgenstern
523ed10e68 Specialist names are taken from the json files 2020-10-04 16:25:07 +03:00
Yair Morgenstern
c70c860437 All specialist slots in jsons converted to proper name 2020-10-04 16:23:35 +03:00
Federico Luongo
2d6c322856
Connect Resource Quest implemented (#3209)
* Removed superfluous filters in getResourceForQuest
2020-10-04 15:01:57 +03:00
Yair Morgenstern
3e98e0c00f 3.11.0 2020-10-03 20:48:34 +03:00
uncivbot[bot]
047fba0f1d
Translations update (#3220)
* Update Italian.properties (#3199)

* Added more translation and fix some (#3207)

* Translations update (#3212)

* Update Japanese.properties (#3213)

* Update Persian_(Pinglish-DIN).properties (#3215)

adding more translations

Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: fab144 <58261459+fab144@users.noreply.github.com>
Co-authored-by: Jack Rainy <JackRainy@users.noreply.github.com>
Co-authored-by: paontv <57051667+paontv@users.noreply.github.com>
Co-authored-by: Mojtaba Rahimy <mojtaba.rahimy@chmail.ir>
2020-10-03 20:25:20 +03:00
Federico Luongo
300c7179e7
Various Quest relted (#3206)
* Renamed some quests to better ones (Kill Camp -> Clear Barbarian Camp and Kill City State -> Conquer City State)
* Quests names are hardcoded in a enum class
* Quests.json translations automated
2020-10-01 21:08:26 +03:00
Yair Morgenstern
bfa9c65700 Modding - Buildings can be rendered obsolete (unbuildable) by techs 2020-09-30 23:17:09 +03:00
Yair Morgenstern
0cb29d64f4 New unit images by The bucketeer! 2020-09-30 20:32:02 +03:00
Yair Morgenstern
aa2486c896 Great person points come from the json! The only things that still happen directly to the specialists stats is the assign/unassign, this is as close as we'll get without changing the rest of it! 2020-09-30 20:18:52 +03:00
Yair Morgenstern
5677fb494a Added helper function colorFromRGB(List<Int>) 2020-09-30 19:26:20 +03:00
Yair Morgenstern
e983be0325 Started converting specialists to by-json and by-name 2020-09-30 13:10:02 +03:00
Federico Luongo
adaee7e7ab
City State quests (#3183)
* City State quests

* Flag to log two civ ever been friends
* Utility functions in GameInfo
* Created Diplomacy Action for notifications
* Utility functions for map
* Can be specified a custom color for surroundWithCircle
* Translation placeholder utility
* Added Quest model
* Utility function: number of researched technologies

* Image atlas rebuilt

* Localization

* Updated DiplomaticFlags and added EverBeenFriends

Slightly reworked nextTurnFlags() for code clarity and introduced the new flag EverBeenFriends that is set as soon as two civilizations are at least friends. It never expires.

* Removed quests not implemented yet from json
2020-09-29 23:26:50 +03:00
Yair Morgenstern
847abf31d1 3.10.13 2020-09-29 15:52:39 +03:00
uncivbot[bot]
81a1bcb6ed
Translations update (#3198)
* Update Italian.properties (#3188)

* Update Italian.properties

* Update Italian.properties

* Update Italian.properties

* Update Italian.properties

* Update Czech.properties (#3193)

new parametrised strings
Babylonian, Egyptian, English cities finished
French diplomacy and cities
Russian diplomacy and cities

* Update Spanish.properties (#3195)

* Update Indonesian.properties (#3196)

* So many hungarian translations (#3197)

* So many hungarian translations

* Fixing placeholders

Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: stoupa007 <60326342+stoupa007@users.noreply.github.com>
Co-authored-by: chriscr2 <70113017+chriscr2@users.noreply.github.com>
Co-authored-by: Kensvin <63847755+Kensvin28@users.noreply.github.com>
Co-authored-by: Krisztian Papp <30371056+pehsa@users.noreply.github.com>
2020-09-29 15:45:32 +03:00
Yair Morgenstern
fa5d2b6f49 3.10.12 2020-09-26 21:25:58 +03:00
uncivbot[bot]
bfadf2943b
Translations update (#3187)
* Update Italian.properties (#3174)

* Update Italian.properties

* Update Italian.properties

* Update Italian.properties

* Update Indonesian.properties (#3176)

* Update Dutch.properties (#3182)

Added extra translations for city states, starting new game, start screen and multiplayer

* Update Czech.properties (#3185)

new strings
diplomacy and cities - Akkad, England

Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: Yunichi <65927826+Yunichie@users.noreply.github.com>
Co-authored-by: knoeier0 <71691687+knoeier0@users.noreply.github.com>
Co-authored-by: stoupa007 <60326342+stoupa007@users.noreply.github.com>
2020-09-26 21:16:54 +03:00
HadeanLake
0f97c5eb59
parameterized few uniques, fixed "Mass Media" tech in mods (#3184)
* parameterized "Culture cost of adopting new Policies reduced by [10]%" and "Each city founded increases culture cost of policies [33]% less than normal"

* removed old fix for abcense of "Mass Media" tech so mods can have this tech
2020-09-26 20:59:22 +03:00
Yair Morgenstern
24b4997e85 3.10.11 2020-09-22 20:03:36 +03:00
uncivbot[bot]
e2ea87499e
Translations update (#3173)
* Update Indonesian.properties (#3168)

* Update German.properties #2 (#3169)

* Update German.properties

Minor tweaks and corrections, remove lots on unneccesary "\n", it just caused some weird formatting on computer as unciv sets breaks on in own already. Changed wording of tutorial quite a bit.

* Update German.properties

Changed and corrected the whole introduction / tutorial translations, deleted lots of unneccesary "\n" as UnCiv adds breaks on his own. Let some breaks in for a new sentence for better readability.

* More hungarian translations (#3171)

* More hungarian translations

* Fix some character

* Update Dutch.properties (#3170)

Added translations for diplomacy

Co-authored-by: Kensvin <63847755+Kensvin28@users.noreply.github.com>
Co-authored-by: Stefan <natrius@users.noreply.github.com>
Co-authored-by: Krisztian Papp <30371056+pehsa@users.noreply.github.com>
Co-authored-by: knoeier0 <71691687+knoeier0@users.noreply.github.com>
2020-09-22 19:46:32 +03:00
HadeanLake
4ee3dae134
* tweaked some buildings (#3172)
Windmill provides "+[10]% Production when constructing [Buildings]" (only regular buildings) instead of 10% to everything
Oxford University does not provide 50% science boost - it was a copying error from National College
* tweaked techs
Implemented "Reveals the entire map" unique ("Satellites" tech)
discovering a tech can trigger unique
"Remove Marsh" unlocked with "Masonry"
2020-09-22 15:17:04 +03:00
HadeanLake
f721f59734
Added national wonders, fixed some minor issues (#3163)
* fixed translation of "Owned: [amountOwned] = " line

* Tweaked culture from killing
Aztecs get melee strength of the unit killed in culture and honor opener does the same thing.
They stack. So you get culture equal to 200% of the dead unit's strength (not ranged strength).

* removed hurryCostModifier from units that should not have it

Default value of HurryCostModifier is 0
List of units with non-default HurryCostModifier:

Settler (20)
SS parts (-1) (cannot be hurried)

Frigate (20)
Ship of the Line (20)
Caravel (30)
Turtle Ship (30)

Catapult (20)
Ballista (20)

Horseman (20)
Companion Cavalry (20)

Swordsman (20)
Mohawk Warrior (20)
Legion (20)
Berserker (20)

* added missing definitions from vanilla (commented out)
added missing obsolete tech tags, etc

* tweaked hurryCostModifier, added missing vanilla buildings (commented out)

* added promotions and parametrized uniques
Morale (+[15]% Combat Strength)
Great Generals I ([Great General] is earned [50]% faster)
Great Generals II ([Great General] is earned [100]% faster)
Quick Study ([50]% Bonus XP gain)
Unretired Mass Media icon

Added Heroic Epic, National Epic and National Treasury national wonders
Heroic Epic has unique "All newly-trained [non-air] units in this city receive the [Morale] promotion" - "non-air" is valid param now

[Raising The Flag on Iwo Jima silhouette, Marine Corps War Memorial Raising the Flag on Iwo Jima Battle of Iwo Jima Washington, D.C., memorial free png](https://www.pngfuel.com/free-png/opgid) for Heroic Epic and Morale promotion
[Arc de Triomphe](https://thenounproject.com/search/?q=Arc%20de%20Triomphe&i=2936011) by iconfield for National Epic
[Bank](https://thenounproject.com/term/bank/213472/) by By P Thanga Vignesh for National Treasury
reused general icon for Great Generals and Quick Study promotions

* implemented "Cost increases by [30] per owned city of cities" unique
All vanilla national wonders that require something in all cities have it

* added uniques
"Nuclear weapon" - Game option "nuclearWeaponsEnabled" enables units with this unique
"Requires [building]" - Apollo Program, Manhattan Project etc
"Requires adopted [policy]" - in expansions Statue of Zeus will require "Honor", Prora - "Autocracy", Landsknecht - "Mercenary Army".

* merged "Requires adopted [policy]" with "Requires [Wonder]"

* Separated unique.params[0] to val filter

* Changed National Epic image
2020-09-21 21:44:52 +03:00
Billy Brawner
205b5ccfea
Implement custom save locations for Android and Desktop (#3160)
* Implement custom save locations for Android and Desktop

* Request write permission to save to external storage

* Fix race condition for custom saves/loads caused by autosaves

* Remove unnecessary WRITE_EXTERNAL_STORAGE permission for saving files

* Fix padding for custom save/load location buttons

* Use nullability checks as defined in coding style guide

* Use nullability checks as defined in coding style guide

* Use early return for readability

* Rename save/load completion callbacks for custom locations and implement error handling
2020-09-20 23:22:07 +03:00
Yair Morgenstern
d0d0481f00 3.10.10 2020-09-20 20:21:40 +03:00
uncivbot[bot]
1dbafece02
Translations update (#3162)
* Update Italian.properties (#3156)

* Update Simplified_Chinese.properties (#3157)

* Update Simplified_Chinese.properties

* Update Simplified_Chinese.properties

* Update Simplified_Chinese.properties

* Update German.properties (#3159)

Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: CrispyXYZ <64761703+CrispyXYZ@users.noreply.github.com>
Co-authored-by: scaphander <67830047+scaphander@users.noreply.github.com>
2020-09-20 20:13:12 +03:00
Yair Morgenstern
8db955b851 3.10.10 2020-09-18 11:27:11 +03:00
Stefan
dcb1b3f1e8
Major update german.properties (#3147)
* Major update german.properties

Straightened out the form of adress, its now the royal version ( i hope i did not miss anything), added missing translations, corrected lot of translations (i did not(!) look at #################### Lines from Tutorials #################### )

* Major update German.properties

Corrected the mistake and changed all "Felder" to "Kacheln"
2020-09-18 11:18:52 +03:00
uncivbot[bot]
177bb6a973
Translations update (#3155)
* Update Indonesian.properties (#3133)

Updating some translations

* Solve Conflicts and Update Brazilian_Portuguese.properties (#3141)

* Update Brazilian_Portuguese.properties

I modified some translations of the menus and some constructions, and translate the Babylon

* Translate all Egyptian cities and remove unnecessaries "Requires translation!"

* Translate more cities and remove unnecessaries "Requires translation!"

* more updates

* a review on prepositions and update

Co-authored-by: AlexLuis <68296033+AlexLuis@users.noreply.github.com>

* more hungarian translation (#3146)

* Update Italian.properties (#3151)

* Update Italian.properties

* Update Italian.properties

* Update Japanese.properties (#3154)

Co-authored-by: Yunichi <65927826+Yunichie@users.noreply.github.com>
Co-authored-by: Lincoln V Schreiber <lincolnschreiber@gmail.com>
Co-authored-by: AlexLuis <68296033+AlexLuis@users.noreply.github.com>
Co-authored-by: Krisztian Papp <30371056+pehsa@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: paontv <57051667+paontv@users.noreply.github.com>
2020-09-18 11:06:42 +03:00
lishaoxia1985
9f4607635b
UI Upgrade (#3149)
* UI Update

* Replace ScrollPane with Table in Minimap
2020-09-18 10:59:18 +03:00
Yair Morgenstern
a0d18889e0 Generified "[X] free [] units"
Barbarians don't try to attack with civilian units (classic Mod)
2020-09-16 20:46:34 +03:00
Yair Morgenstern
1ceb3548dd Resolved #3130 - "All policies adopted" shown in policy picker screen when relevant 2020-09-16 19:17:25 +03:00
Yair Morgenstern
76741b446b 3.10.9 2020-09-12 23:06:42 +03:00
uncivbot[bot]
02def47f1b
Translations update (#3132)
* Update Indonesian.properties (#3125)

* Update Italian.properties (#3126)

* Update Italian.properties

New translations

* Update Italian.properties

* Update Spanish.properties (#3129)

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: chriscr2 <70113017+chriscr2@users.noreply.github.com>
2020-09-12 22:43:58 +03:00
Yair Morgenstern
7d32412646 Translation updates, with minor changes to ensure consistency 2020-09-11 11:16:31 +03:00
uncivbot[bot]
ea08a96482
Translations update (#3124)
* Update Italian.properties (#3111)

* Update Ukrainian.properties (#3120)

* Update Ukrainian.properties

* Update Ukrainian.properties

* Update Ukrainian.properties

* Update Ukrainian.properties

* Додав слово Надають

* Update Brazilian_Portuguese.properties (#3121)

* some minutes translating

pra ajudar os player br pq esse jogo é bom demais!

* Update Brazilian_Portuguese.properties

* Update Japanese.properties (#3123)

* Update Spanish.properties (#3113)

* Update Indonesian.properties (#3116)

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

Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: Prosta4okua <31485341+Prosta4okua@users.noreply.github.com>
Co-authored-by: ISS <27261371+4urb4nm0nk@users.noreply.github.com>
Co-authored-by: paontv <57051667+paontv@users.noreply.github.com>
Co-authored-by: chriscr2 <70113017+chriscr2@users.noreply.github.com>
Co-authored-by: Kensvin <63847755+Kensvin28@users.noreply.github.com>
Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
2020-09-11 11:07:39 +03:00
Yair Morgenstern
265e6416f9 Ottoman unique is back to how it should be in Vanilla - @lishaoxia1985 don't slip gameplay changes into a UI commit please. 2020-09-11 09:29:56 +03:00
Yair Morgenstern
cb0599b9f5 Simplified "on [seacost]" and "on [tile next to fresh water]" to "next to [Coast]" and "next to [Fresh water]" 2020-09-11 09:24:08 +03:00
HadeanLake
9f48f43ad0
parameterized some uniques, fixes some minor bugs (#3122)
Fixed Moai
Wonder overlay will remove terrain overlay in default tileset
Oasis, Marsh and Atoll now have "Rare feature" unique, rare features can be added by mods
implemented TileInfo.fitsUniqueFilter(filterText:String): Boolean
parameterized uniques:
* "Must have an owned [Mountain] within [2] tiles"
* "Must be on [River]" - not to be confused with "Must be next to [River]" - the tile city on must have river at its border, not the adjacent tile
* "Must not be on [Hill]"
* "Must not be next to []"
* "Must be on [seacoast]" - next to "Coast" tile
* "Must be on [tile adjacent to source of fresh water]"
* "Must be next to [Water]" - next to any water tile, including "Lakes"
* "Must be next to [terrainFeature]"
* "Must be next to [unique]" - e.g "Must be next to [Rare feature]" - next to terrain or terrain feature having this unique
2020-09-11 07:56:56 +03:00
lishaoxia1985
9d951835d1
UI Update (#3102)
* Add "Load game" in WorldscreenMenuPopup

* UI Update

* Fix the Ottomans uniques, edit Tech description
2020-09-10 19:25:56 +03:00
Yair Morgenstern
f859259c2a 3.10.8 2020-09-08 19:34:25 +03:00
uncivbot[bot]
bf2742350d
Translations update (#3107)
* Update Italian.properties (#3090)

* Update Indonesian.properties (#3097)

* Update Indonesian.properties

* Update Indonesian.properties

* Update Japanese.properties (#3091)

* Update Japanese.properties

* Update Japanese.properties

* Update Japanese.properties

* Update Japanese.properties

* Update Spanish.properties (#3096)

* Update Simplified_Chinese.properties (#3098)

* Update Czech.properties (#3106)

Aztecs translation, scenario translation, egypt diplomacy and cities, various missing improvement names and rules

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: paontv <57051667+paontv@users.noreply.github.com>
Co-authored-by: chriscr2 <70113017+chriscr2@users.noreply.github.com>
Co-authored-by: CrispyXYZ <64761703+CrispyXYZ@users.noreply.github.com>
Co-authored-by: stoupa007 <60326342+stoupa007@users.noreply.github.com>
2020-09-08 19:14:56 +03:00
Yair Morgenstern
3719b5c4f6 Added mod screen translation terms 2020-09-07 23:03:12 +03:00
HadeanLake
8ac3a88cec
fixed #3066, crash in chooseMilitaryUnit and some great people actions (#3099)
* fixed KotlinNullPointerException crash in chooseMilitaryUnit
random() is not to be used in predicate
* GodmodeCheckbox is not lockable and unchecked by default
* no great people actions if no movement points left
* unique "Can start an []-turn golden age" now has parameter and 8-turn golden ages will last 8 turns instead of 10
golden age can be started if unit is on own territory (even embarked)
* "Golden Age length increased by [50]%" - now has parameter
* tweaked changed fort and terrain defence bonuses
fort can be built on forest and jungle (vegetation will not be removed)
any open flat land gives 10%  penalty
marsh gives 15% penalty
only top terrain counts, improvement bonus will be added to that
flatland + fort = 40%
hill + fort = 75%
hill = 25%
forest/jungle on flatland = 25%
forest/jungle on hill = 25%
forest on flat + fort = 75%
forest on hill + fort = 75%
forest on hill + citadel = 125%
fixed 20% penalty for attacking over river - will be displayed if unit is standing on the other side of river
"Amphibious" unique removes this penalty
2020-09-05 20:32:27 +03:00
Yair Morgenstern
ca36084e8b 3.10.7 2020-09-04 16:44:00 +03:00
uncivbot[bot]
4bc4138f2f
Translations update (#3089)
* Update Japanese.properties (#3038)

* Update Japanese.properties

* Update Japanese.properties

* Update Japanese.properties

* Update Japanese.properties

* Update Japanese.properties

* Update Italian.properties (#3074)

* Update Italian.properties

* Update Italian.properties

* Update Italian.properties

* Update Italian.properties

* Update Spanish.properties (#3084)

* Update Simplified_Chinese.properties (#3088)

* Update Hungarian.properties (#3087)

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: chriscr2 <70113017+chriscr2@users.noreply.github.com>
Co-authored-by: CrispyXYZ <64761703+CrispyXYZ@users.noreply.github.com>
Co-authored-by: Krisztian Papp <30371056+pehsa@users.noreply.github.com>
2020-09-04 16:22:32 +03:00
Yair Morgenstern
08a15a888f Fixed test 2020-09-03 17:58:24 +03:00
Yair Morgenstern
6de4300cb8 Testing how the test errors are displayed in Travis 2020-09-03 14:03:17 +03:00
Yair Morgenstern
3eb9b36550 Restored techButton visualization 2020-09-03 12:37:04 +03:00
lishaoxia1985
def96071e7
Use NinePatch in getRoundedEdgeTableBackground (#3080) 2020-09-02 20:51:21 +03:00
HadeanLake
8f75368b99
Farms near freshwater (#3063)
* Farms near freshwater
* Farm now has unique "Can also be built on tiles adjacent to fresh water"
https://civilization.fandom.com/wiki/Farm_(Civ5)
Even snow: https://www.reddit.com/r/civ/comments/11qtko/farms_on_snow/
Hill+Farm, Snow+Farm, Tundra+Farm sprites by THE BUCKETEER and Ravignir from discord
* fields improvingTech and improvingTechStats converted into uniques
e.g.:
"[+1 Production] once [Scientific Theory] is discovered"
"[+1 Food] on [fresh water] tiles once [Civil Service] is discovered"
"[+1 Food] on [non-fresh water] tiles once [Fertilizer] is discovered"

* ai will build trading posts and farms in snow and tundra if it has no better tiles to work on

* "Provides a one-time Production bonus to the closest city when cut down" unique for forest

* update template.properties
2020-09-02 19:49:29 +03:00
Yair Morgenstern
145db68248 3.10.6 2020-09-01 22:58:52 +03:00
uncivbot[bot]
6c2d597c39
Translations update (#3072)
* Update Czech.properties (#3058)

* Update Czech.properties

tweaked consistency of "resource" term translation
nation uniques (re)translated
missing policy strings (re)translated

* Update Czech.properties

fixed typo and few minor tweaks based on actual string usage

* Add hungarian translation, First batch (#3060)

* add hungarian translation, first batch

* Fixing placeholder

* Update Indonesian.properties (#3064)

Co-authored-by: stoupa007 <60326342+stoupa007@users.noreply.github.com>
Co-authored-by: Krisztian Papp <30371056+pehsa@users.noreply.github.com>
Co-authored-by: lahdjirayhan <52926983+lahdjirayhan@users.noreply.github.com>
2020-09-01 19:34:12 +03:00
Yair Morgenstern
e111bba509 #3050 - Added "automated workers don't replace improvements" setting 2020-08-31 22:39:03 +03:00
Yair Morgenstern
c61ec2120b Separated base ruleset mods in new game screen - cannot activate multiple base ruleset mods 2020-08-31 21:24:36 +03:00
Yair Morgenstern
ce8e410969 Resolved #2886 - new Plains+Forest tiles by The Bucketeer that don't hide the rivers behind them :) 2020-08-31 21:02:50 +03:00
Yair Morgenstern
697e193f51 Resolved #3065 - Ottomans' unique is now according to Vanilla 2020-08-31 20:42:50 +03:00
lishaoxia1985
503bf45e8d
Chinese update, Fix CityInfoTable bug (#3062)
* Chinese update, Fix CityInfoTable bug

* Delete some skin classes which are unused in Game
2020-08-31 19:49:01 +03:00
HadeanLake
e6e31b4e1a
Aztecs and some other things (#3033)
* Added icons
* [temple](https://thenounproject.com/search/?q=temple&i=28256) By Fabio Meroni for Temple of Artemis
* [Canoe](https://thenounproject.com/term/canoe/402285/) By Viktor Fedyuk (Tim P) for Floating Gardens
* [Garden](https://thenounproject.com/search/?q=garden&i=1478380) By Bharat
Aztecs by Séan https://discord.com/channels/586194543280390151/633733497277775884/727255962754351104
Jaguar by Red11

Reused slinger icon for Slinger Withdraw

* Added buildings and uniques for them
garden - bonus building of the Medieval Era. City "Must border a source of fresh water"
Temple of Artemis - World wonder of the Ancient era
Floating Gardens - Aztec unique building, replaces Water Mill

"[+1 Science] Per [2] Population in this city" - for Library and Public School
"+[]% great person generation in this city" - for garden
"Must border a source of fresh water" - "fresh water" provided by river or tiles with "Fresh water" unique. Added "Fresh water" unique to Lakes and Oasis
"+[10]% growth in all cities" - now has parameter - for Tradition Complete policy and Temple of Artemis
"+[10]% growth in capital" - now has parameter
"+[15]% Production when constructing [ranged units]"   - "ranged units" now valid param
"[stats] once [tech] is discovered" - Petra and Mughal Fort have it
"[+1 Production] from [River] tiles in this city"]  - now can use "River" - for Hydro plant

* Added Jaguar - Aztec unique unit
New unique - "+[]% combat bonus in [param]" unique - Norwegian Ski Infantry, Jaguars and Mohawks have it. param can be terrainFeature or baseTerrain, in case of baseTerrain it implies there are no features like vegetation her
Implemented "Culture for the empire from each enemy unit killed"
tweaked honor policy - it should bring half as much culture, and same as Sacrificial Captives
Fixed penalty for terrain if unit do not have "No defensive terrain bonus" unique

* Added Aztecs

* Update template.properties

* update template.properties

* update template.properties

* update template.properties
2020-08-30 21:02:59 +03:00
Yair Morgenstern
683cbb5864 3.10.5-patch1 2020-08-30 20:50:56 +03:00
uncivbot[bot]
fb38fb9da7
Translations update (#3056)
* Update Turkish.properties (#3042)

* russian & ukrainian translations update (#3043)

* russian & ukrainian translations update

* Update completionPercentages.properties

* Update Spanish.properties (#3044)

* Update Brazilian_Portuguese.properties (#3045)

I want to help =)

* Translation update, Some bug fix (#3047)

* Translation update, Some bug fix

* Remove some blank key when we use Fonts.turn

Co-authored-by: omerfaruk-cakmak <32402595+omerfaruk-cakmak@users.noreply.github.com>
Co-authored-by: DuffKI <51823715+DuffLagerleff@users.noreply.github.com>
Co-authored-by: chriscr2 <70113017+chriscr2@users.noreply.github.com>
Co-authored-by: arturT7 <70413143+arturT7@users.noreply.github.com>
Co-authored-by: lishaoxia1985 <49801619+lishaoxia1985@users.noreply.github.com>
2020-08-30 20:27:13 +03:00
HadeanLake
15ed1a608b
New uniques and stuff for mods (#3055)
* "[+1 Gold] for each adjacent [Road]" Roadstatus can be used now in tile improvement uniques

* Added hasViewableResource check to "[stats] from every [Resource]"

* Fixed translation of nation uniques

* Eras with no researchable techs will not appear in dropdown menu in new game options

* Implemented startingUnits, aiMajorCivStartingUnits and aiCityStateStartingUnits fields in difficulty

* reassignRemovedModReferences will also reassign if nation is a City-State in current ruleset
e.g. Venice will be unselected if player unselects Civ5ExpansionMod which has it as playable civ

* "Cannot be purchased" - new unique for non-wonders and units. SS parts have it

* Update template.properties

* Update Difficulty.kt
2020-08-30 15:48:00 +03:00
Yair Morgenstern
b83ad41518 3.10.5 2020-08-27 15:21:11 +03:00
uncivbot[bot]
69bdadf87b
Translations update (#3036)
* Update Italian.properties (#3030)

* German translation updates (#3031)

* Update German.properties

* Update German.properties

* Update Simplified_Chinese.properties (#3032)

* Update Simplified_Chinese.properties

* Update Simplified_Chinese.properties

* Update Spanish.properties (#3034)

Fixed some spelling errors and missing translations added.

Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: scaphander <67830047+scaphander@users.noreply.github.com>
Co-authored-by: CrispyXYZ <64761703+CrispyXYZ@users.noreply.github.com>
Co-authored-by: chriscr2 <70113017+chriscr2@users.noreply.github.com>
2020-08-27 15:03:47 +03:00
Yair Morgenstern
353b6e71f8 Added initial mod management screen
Changed turn icon to hourglass, per the change in the Discord poll
2020-08-25 18:43:05 +03:00
Yair Morgenstern
3fdcbeeef6 3.10.4 2020-08-25 17:17:25 +03:00
uncivbot[bot]
078b07bdb5
Translations update (#3029)
* Update Italian.properties (#3023)

* Update Spanish.properties (#3024)

Actualización de cambios del idioma español
Spanish language changes update

* Update Simplified_Chinese.properties (#3025)

Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: chriscr2 <70113017+chriscr2@users.noreply.github.com>
Co-authored-by: CrispyXYZ <64761703+CrispyXYZ@users.noreply.github.com>
2020-08-25 17:07:12 +03:00
Yair Morgenstern
a253a97940 Added Unzip functionality - we should soon be ready for mod management from within the game! 2020-08-25 16:38:55 +03:00
Yair Morgenstern
a6b89b9885 More minor emoji changes
They do make the whole setup seem much more professional
2020-08-24 23:17:34 +03:00
Yair Morgenstern
bed7fe4c64 Added unit symbols for Strength, Ranged Strength, Range and Movement as 'emojis' 2020-08-24 22:48:00 +03:00
Yair Morgenstern
1f3b77d038 All 'Turn' and 'Turns' texts changed to a turns icon, much cleaner! 2020-08-24 19:45:53 +03:00
Yair Morgenstern
45d90c0458 Unified construction filtering for civ- and city-wide uniques 2020-08-24 14:30:26 +03:00
Yair Morgenstern
cdde27d74d Can remove tile features outside your borders 2020-08-24 11:01:15 +03:00
Yair Morgenstern
6ff712b625 A mishmash of different fixes: Unit uniques and promotions, happiness calculation, etc. 2020-08-24 10:58:14 +03:00
Yair Morgenstern
21c8336563 unit.getMatchingUniques() 2020-08-24 09:48:33 +03:00
Yair Morgenstern
8203549aea Removed UniqueAbility from Nations 2020-08-23 22:33:31 +03:00
Yair Morgenstern
40f93461fa With new translation lines 2020-08-23 21:27:31 +03:00
Yair Morgenstern
9ef7d8770d Added a new test that ensures no two placeholders are the same
Fixed double 'param' parameter in existing translations
2020-08-23 21:20:17 +03:00
uncivbot[bot]
6185312fd9
Translations update (#3022)
* Update Italian.properties (#3013)

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

* Update Simplified_Chinese.properties and Traditional_Chinese.properties (#3019)

* Update Simplified_Chinese.properties

* Update Traditional_Chinese.properties

* Update Traditional_Chinese.properties

* Update Indonesian.properties (#3014)

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

* Update German.properties (#3015)

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

* Update Russian.properties and Ukrainian.properties (#3018)

* Update Russian.properties and Ukrainian.properties

* Update Russian.properties

* update Ukrainian.properties

* Update Ukrainian.properties

* Update Russian.properties and Ukrainian.properties

* Update Russian.properties and Ukrainian.properties

* update Ukrainian.properties after review

* Update Russian.properties and Ukrainian.properties

* Update Russian.properties and Ukrainian.properties

* Update Russian.properties and Ukrainian.properties after review

* Update Russian.properties and Ukrainian.properties

Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
Co-authored-by: CrispyXYZ <64761703+CrispyXYZ@users.noreply.github.com>
Co-authored-by: Kensvin <63847755+Kensvin28@users.noreply.github.com>
Co-authored-by: scaphander <67830047+scaphander@users.noreply.github.com>
Co-authored-by: HadeanLake <69697985+HadeanLake@users.noreply.github.com>
2020-08-23 20:29:37 +03:00
Yair Morgenstern
002d0cc7f6 Settler 'by name' recognition changed to 'by unique' recognition, allowing for modded settler-like units 2020-08-23 00:28:55 +03:00
Yair Morgenstern
db7f064498 Resolved #3016 - Policy branch uniques are translated properly 2020-08-21 14:06:29 +03:00
Yair Morgenstern
02c2da9347 generified []# of food is carried over 2020-08-20 23:45:44 +03:00
Yair Morgenstern
408077cd5f Roads and railoads can be removed outside your borders 2020-08-20 23:21:12 +03:00
Yair Morgenstern
270c50afd6 Generified more building uniques and merged functionality of global and city uniques when alculating tile stats 2020-08-20 23:11:53 +03:00
Yair Morgenstern
e7c0710042 3.10.2 2020-08-20 12:30:46 +03:00
uncivbot[bot]
2492c17216
Translations update (#3012)
* Update Italian.properties (#3002)

* Update Czech.properties (#3003)

lot of new strings translated

* Update German.properties (#3005)

* Update Indonesian.properties (#3004)

* Update Simplified_Chinese.properties (#3010)

* Update Simplified_Chinese.properties

* Update Simplified_Chinese.properties

* Update Simplified_Chinese.properties (#3011)

Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: stoupa007 <60326342+stoupa007@users.noreply.github.com>
Co-authored-by: scaphander <67830047+scaphander@users.noreply.github.com>
Co-authored-by: Kensvin <63847755+Kensvin28@users.noreply.github.com>
Co-authored-by: CrispyXYZ <64761703+CrispyXYZ@users.noreply.github.com>
Co-authored-by: ZGMZY <69511837+ZGMZY@users.noreply.github.com>
2020-08-20 12:09:06 +03:00
HadeanLake
a12c1ada26
Fixed AI being stuck doing science or gold per turn (#3006)
* AI will no longer get stuck doing science or gold per turn

* added missing commas in jsons
2020-08-18 20:53:16 +03:00
HadeanLake
764a1c3913
scenario editing mode improvements and new unique (#2999)
* scenario editing mode improvements and new uniques

* Fixed Russian nation unique - it is civ-wide bonus

* genericized "+[]% Production when building [] in this city"

* genericized "All newly-trained [] units in this city receive the [] promotion"

* changed some uniques to be able to have list of filters separated by comma as unique param

* scenario editing mode improvements:

Resource requirements when buying buildings and units are ignored

Limit for selling buildings is ignored

Workers improve tiles instantly

Units will not be disbanded if civilization has negative gold

* fix crash in scenario editing mode due to PerpetualConstruction not having a GoldCost

* undo comma separation

* implement All newly-trained [relevant] units in this city receive the [] promotion
relevant as in 'units that can receive'

* upadte template.properties

* unnecessary parentheses

* Not being annoyed by this vs less chance of forgetting to set gold before releasing scenario

* update template.properties

* add missing spaces
2020-08-18 19:20:59 +03:00
ravignir
18834d94ae
Update Polish.properties (#2998)
Fixed (hopefully) all typos
2020-08-17 23:40:54 +03:00
Yair Morgenstern
2c8074bfe4 Converted the "special power" of the Future Tech to a unique than can be applied to any tech 2020-08-17 23:07:58 +03:00
Yair Morgenstern
41615909df Translation tests are fixed - translators beware 2020-08-16 22:01:55 +03:00
Yair Morgenstern
7cdad3c882 Merge branch 'master' of https://github.com/yairm210/Unciv 2020-08-16 20:43:41 +03:00
Yair Morgenstern
574e588711 City-wide bonuses are clearly marked as such to differentiate them from civ-wide bonuses 2020-08-16 20:43:19 +03:00
uncivbot[bot]
da4852d954
Translations update (#2996)
* Finnish translation update (#2993)

* Add Finnish.properties

* Move Finnish.properties to right folder

* Delete Finnish.properties

* Add translations to Finnish

* Add translations to Finnish

* Translate more stuff in Finnish

* More translation to Finnish

* Update Brazilian_Portuguese.properties (#2994)

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

* Update Italian.properties (#2992)

* Create PolishNew (#2995)

New polish translation, should be 100% complete.

Co-authored-by: Perttu Männistö <64960796+maitovelkkis@users.noreply.github.com>
Co-authored-by: Dalmolax <63485458+Dalmolax@users.noreply.github.com>
Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: ravignir <RAVIGNIRFORATT@GMAIL.COM>
2020-08-16 20:41:51 +03:00
Yair Morgenstern
f2f14b6570 Revert "Changed all "[] from [] tiles" to "[] from every []""
This reverts commit c89041e2d4.
2020-08-16 20:16:01 +03:00
Yair Morgenstern
4cd4d5d89f All kinds of crazy translation fixes 2020-08-15 23:20:18 +03:00
Yair Morgenstern
c89041e2d4 Changed all "[] from [] tiles" to "[] from every []" 2020-08-15 21:58:26 +03:00
leanhquanea1234
324f4d7a15
Update Vietnamese.properties (#2991)
* Create Vietnamese

* Update and rename Vietnamese to Vietnamese.properties

* Update Vietnamese.properties

* Update Vietnamese.properties

* Update Vietnamese.properties

* Update Vietnamese.properties

* Update Vietnamese.properties

* Update Vietnamese.properties

* Update Vietnamese.properties

* Update Vietnamese.properties

* Update Vietnamese.properties

Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
2020-08-15 21:22:28 +03:00
Yair Morgenstern
4046837a3e AI chooses to fortify in non-bombardable tiles if possible
Can choose replacement building for Palace to indicate the capital city
2020-08-14 13:43:28 +03:00
Yair Morgenstern
59fa4ff052 #2988 Finnish translation file expanded 2020-08-14 10:24:50 +03:00
Perttu Männistö
99f19b1f71
Move Finnish.properties to right folder (#2988)
* Add Finnish.properties

* Move Finnish.properties to right folder
2020-08-14 10:22:06 +03:00
Yair Morgenstern
5c0eaa18dd Resolved #2986 - Knight now obsoletes properly 2020-08-14 10:16:50 +03:00
Yair Morgenstern
24d5e08783 Translation updates for Finnish 2020-08-14 00:38:17 +03:00
uncivbot[bot]
9b13f44b2b
Translations update (#2983)
* Add Finnish.properties (#2982)

* Update Indonesian.properties (#2978)

* Update Simplified_Chinese.properties (#2977)

* Update Italian.properties (#2975)

* Update German.properties (#2984)

Co-authored-by: Perttu Männistö <64960796+maitovelkkis@users.noreply.github.com>
Co-authored-by: Kensvin <63847755+Kensvin28@users.noreply.github.com>
Co-authored-by: CrispyXYZ <64761703+CrispyXYZ@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: scaphander <67830047+scaphander@users.noreply.github.com>
2020-08-14 00:32:12 +03:00
Yair Morgenstern
451234c3bb 3.9.20 2020-08-12 19:39:45 +03:00
uncivbot[bot]
adfd44c959
Translations update (#2974)
* Update Italian.properties (#2958)

* Update Indonesian.properties (#2961)

* Update Indonesian.properties

* Update Indonesian.properties

* German translation update (#2965)

* Update German.properties

* Update German.properties

* Update German.properties

"Hinterhalt" seems more logic to me in this case

* Update Ukrainian.properties (#2963)

* Update Ukrainian.properties

* Update Ukrainian.properties

* Update Japanese.properties (#2968)

* Update Korean.properties (#2969)

* Update Simplified_Chinese.properties (#2970)

* Create Vietnamese (#2971)

* Create Vietnamese

* Update and rename Vietnamese to Vietnamese.properties

* Update Vietnamese.properties

* Update Vietnamese.properties

* Update Vietnamese.properties

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: scaphander <67830047+scaphander@users.noreply.github.com>
Co-authored-by: Prosta4okua <31485341+Prosta4okua@users.noreply.github.com>
Co-authored-by: paontv <57051667+paontv@users.noreply.github.com>
Co-authored-by: TG <saud2410@naver.com>
Co-authored-by: ZGMZY <69511837+ZGMZY@users.noreply.github.com>
Co-authored-by: leanhquanea1234 <69520258+leanhquanea1234@users.noreply.github.com>
2020-08-12 19:15:30 +03:00
Yair Morgenstern
889d6a1587 Denounce now has a confirmation popup 2020-08-10 23:24:02 +03:00
Yair Morgenstern
3b2e813523 Ancient Ruins can now provide Culture 2020-08-10 23:12:02 +03:00
Yair Morgenstern
be51735fdf Fixed broken tests 2020-08-09 21:37:09 +03:00
Yair Morgenstern
38490ca1cc Forts can also be built outside your borders 2020-08-08 23:16:28 +03:00
Yair Morgenstern
b8ce489ea3 3.9.19 2020-08-08 21:39:34 +03:00
uncivbot[bot]
b035571d79
Translations update (#2957)
* Update Italian.properties (#2942)

* Update Thai.properties (#2949)

Hmm can we change the current Thai font to the other. Maybe that would help fixing the current Thai text display problem

* Update Indonesian.properties (#2948)

Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: NoNZeeZ <58921355+NoNZeeZ@users.noreply.github.com>
Co-authored-by: Kensvin <63847755+Kensvin28@users.noreply.github.com>
2020-08-08 21:26:57 +03:00
Yair Morgenstern
ae60aab7e5 Resolved #2818 - Can no longer build improvements outside your borders 2020-08-07 17:22:48 +03:00
Yair Morgenstern
faaab3173b Resolved #2944 - Air units intercept range fixed 2020-08-07 14:56:42 +03:00
Yair Morgenstern
376079100d Tile Improvements get parametrized Uniques! 2020-08-07 14:48:14 +03:00
Yair Morgenstern
0a30e99359 All nations uniqueified! 2020-08-06 23:29:49 +03:00
Yair Morgenstern
de97e1c32f All nations up till Mongols - almost done! 2020-08-06 20:53:40 +03:00
Yair Morgenstern
5cc610aa5d Persia nation uniques - also contained a translation-wide change 2020-08-06 20:24:18 +03:00
Yair Morgenstern
ce0985d077 All nation uniques up to Iroquois 2020-08-06 20:15:59 +03:00
Yair Morgenstern
9f5b8d157a Converted civ uniques up to India 2020-08-06 19:53:29 +03:00
Yair Morgenstern
1fb566ec30 RIP PolicyManager.PolicyEffects 2020-08-06 18:40:35 +03:00
Yair Morgenstern
5e222a44b6 3.9.18 2020-08-05 22:03:53 +03:00
uncivbot[bot]
318a8fb22f
Translations update (#2941)
* Update Italian.properties (#2919)

* Update Indonesian.properties (#2927)

* Update Ukrainian.properties (#2931)

* Update Korean.properties (#2934)

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: Prosta4okua <31485341+Prosta4okua@users.noreply.github.com>
Co-authored-by: TG <saud2410@naver.com>
2020-08-05 22:00:45 +03:00
Yair Morgenstern
a97c9bafcc Civ uniques up to Arabia converted 2020-08-02 22:03:30 +03:00
Yair Morgenstern
5aaab7e137 Civ uniques done up till Egypt 2020-08-02 17:04:11 +03:00
Yair Morgenstern
04d4c9c9bf Resolved #2929 - Can no longer destroy original capitals by nuke 2020-08-02 16:17:20 +03:00
Yair Morgenstern
ebb8432dcb Changed how great unit recognition works 2020-08-02 13:53:27 +03:00
Yair Morgenstern
b4708b05b3 Unified regular unit and great person unit additions
First playaround with nation uniques!
2020-08-01 23:04:33 +03:00
Yair Morgenstern
9ade890ad4 3.9.17 2020-08-01 22:07:28 +03:00
Yair Morgenstern
f88e2f2bb7 Merge remote-tracking branch 'origin/master' 2020-08-01 21:46:27 +03:00
uncivbot[bot]
c8ff18503b
Translations update (#2918)
* Update Japanese.properties (#2904)

* Update Italian.properties (#2906)

* Update Korean.properties (#2915)

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: TG <saud2410@naver.com>
2020-08-01 21:44:50 +03:00
lishaoxia1985
acdc6cee69
AS update to 4.0.1, Edit Diplomacy UI in Overview (#2885) 2020-08-01 21:44:32 +03:00
Yair Morgenstern
fbf4312973 All policies converted! 2020-07-31 19:09:56 +03:00
Alexander Korolyov
86f500b266
Fog of war implementation (#2887)
* Initial implementation fog of war for spectators

* Corrected fog of war for main map

* Fix borders seen in unexplored tiles during spectating

* Small refactor

* Fixes after code review

* Fixes after code review

* wierd bug fix, android studio "eats" spaces
2020-07-31 11:32:44 +03:00
Yair Morgenstern
0f727e1929 Moar policies! Policy stat changes can now happen from wonders as well! 2020-07-31 00:25:48 +03:00
Yair Morgenstern
8fec837e64 Modernized translations yay 2020-07-30 22:40:50 +03:00
Yair Morgenstern
c0a9690d2a Finished Rationalism tree! 2020-07-30 22:39:52 +03:00
Yair Morgenstern
0eaad31ce1 Getting used to multi-param placeholders ;) 2020-07-30 22:26:15 +03:00
Yair Morgenstern
362ca7c1e3 More policy conversions, only 3 trees left! 2020-07-30 22:07:05 +03:00
Yair Morgenstern
0444a28657 Policy transformation 2020-07-30 19:56:43 +03:00
Yair Morgenstern
654a355666 Resolved #2907 - University unique registers properly 2020-07-30 19:15:11 +03:00
Yair Morgenstern
8dfc147bb1 Added civ-wide per-building stat bonus 2020-07-30 19:05:07 +03:00
Yair Morgenstern
ca58bb22ac 3.9.16 2020-07-30 13:37:28 +03:00
uncivbot[bot]
dfce74f020
Translations update (#2903)
* Update Italian.properties (#2888)

* Update Persian_(Pinglish-DIN).properties (#2889)

Made some translations more accurate, Fixed a few mistakes and, Added some new translations.

* Update Persian_(Pinglish-UN).properties (#2890)

The same thing that I did with  the PinglishDIN translations.

* Update Persian instructions.txt (#2891)

Updated the criteria

* Update Indonesian.properties (#2892)

* Update German.properties (#2899)

Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: TheRNB <44290454+TheRNB@users.noreply.github.com>
Co-authored-by: Kensvin <63847755+Kensvin28@users.noreply.github.com>
Co-authored-by: scaphander <67830047+scaphander@users.noreply.github.com>
2020-07-30 13:09:09 +03:00
Yair Morgenstern
406959c771 Resolved #3901 - nuclear weapon setting remains between games 2020-07-29 23:33:30 +03:00
Yair Morgenstern
97def95817 Can now handle multiple civ-wide uniques of the same type! 2020-07-28 19:56:57 +03:00
Yair Morgenstern
5fbfa637f2 All improvement placing units are automated in the same way - this allows for the AI to control modded units that place other improvements! 2020-07-28 19:26:02 +03:00
Yair Morgenstern
b816d1036d Resolved #2894 - Map editor button only opens popup once 2020-07-27 19:53:50 +03:00
Yair Morgenstern
f18f6d4a29 3.9.15 2020-07-26 22:07:50 +03:00
Kensvin
d57c814190
Update Indonesian.properties (#2882) 2020-07-26 21:38:38 +03:00
Giuseppe D'Addio
46cc0ed5d1
Update Italian.properties (#2883) 2020-07-26 21:38:20 +03:00
Yair Morgenstern
4758beffa6 More policy conversions 2020-07-25 23:03:21 +03:00
Yair Morgenstern
627283b10b Converted policies up to Collective Rule 2020-07-25 22:36:15 +03:00
Yair Morgenstern
8463d0a884 Welp, missed a spot 2020-07-24 18:21:03 +03:00
Yair Morgenstern
e7639c93c4 Step 2 - started POC breakdown of policy effects to constituent uniques
This will allow mix&matching of policy effects, AND allow them to be used as building uniques as well!
2020-07-24 18:18:17 +03:00
Yair Morgenstern
bf874fe749 [stat] from [terrain] tiles applied to all existing buildings 2020-07-24 17:56:59 +03:00
Yair Morgenstern
066dd615b4 Created stat parameter parsing and translation!
Genericified "[stats] from [terrain] tile" building unique
2020-07-24 17:47:55 +03:00
Yair Morgenstern
d9e1b58bd2 Added Pinglish translations 2020-07-24 09:55:29 +03:00
uncivbot[bot]
881aff1166
Translations update (#2880)
* Update Korean.properties (#2874)

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

* Create Persian_PingilishDIN.properties (#2866)

This is the Persian translation for UnCiv, please note that since the Persian has its own alphabet (which is from right to left) I just used an alphabet derived from the DIN 31635 standard made by "Deutsches Institut für Normung"

* Create Persain_PinglishUN.properties (#2867)

This is a Persian translation for UnCiv, please note that since Persian has its own alphabet (which is written from right to left) I just used an alphabet derived from the ALA_LC standard made by "American Library Association - Library of Congress".

* Update Brazilian_Portuguese.properties (#2868)

Co-authored-by: TG <saud2410@naver.com>
Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
Co-authored-by: TheRNB <44290454+TheRNB@users.noreply.github.com>
Co-authored-by: Dalmolax <63485458+Dalmolax@users.noreply.github.com>
2020-07-24 09:32:18 +03:00
Yair Morgenstern
d7bac9ed3e Genericified 'free [unit] appears] 2020-07-24 00:34:39 +03:00
Yair Morgenstern
548e107504 Generic "must be next to []" unique for buildings 2020-07-24 00:23:42 +03:00
TG
bcfcadf5bc
Update template.properties (#2875) 2020-07-23 14:40:52 +03:00
Yair Morgenstern
1a558a70d2 Buildings that are missing resources are still displayed in city constructions 2020-07-23 12:54:26 +03:00
Yair Morgenstern
aa2f9726ac Unit 'unbuildable' parameter converted to unique 2020-07-20 23:36:54 +03:00
Yair Morgenstern
d8b84db3a6 Removed extraneous (for now) G&K files 2020-07-20 23:03:00 +03:00
uncivbot[bot]
d578393f65
Translations update (#2865)
* Update Simplified_Chinese.properties (#2847)

音译了一些城市名称。
Transliterated some city names.

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

* Update Japanese.properties (#2855)

* Update Korean.properties (#2858)

* Update Korean.properties

* Update Korean.properties

* Update Russian translations (#2859)

* Add missing Russian translations

Added missing Russian translations. One translation is still missing: "Removing Terrain Features"

* add missing

* Update Italian.properties (#2861)

* Update Indonesian.properties (#2862)

Co-authored-by: Doubi_TS <48427744+tianshidoubi@users.noreply.github.com>
Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
Co-authored-by: paontv <57051667+paontv@users.noreply.github.com>
Co-authored-by: TG <saud2410@naver.com>
Co-authored-by: Sergei Bolotov <sbolotov@microsoft.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: Kensvin <63847755+Kensvin28@users.noreply.github.com>
2020-07-20 06:22:44 +03:00
Yair Morgenstern
c402d63a68 3.9.12 2020-07-16 23:15:23 +03:00
uncivbot[bot]
9b2ef20f25
Update Russian.properties (#2846) (#2854)
Co-authored-by: Kruger-Sheppard <65571371+Kruger-Sheppard@users.noreply.github.com>
2020-07-16 22:27:22 +03:00
lishaoxia1985
59f6e10511
some bug fix (#2817)
* Scout won't be built when research "Scientific Theory". Fix the word "Can only build water units in coastal cities".

* Fix the bugs when you delete all maps close button disappears and you can't go to main menu.

* Basictests don't check that Scout can't upgrade.

* If the unit is obsolete it will remove from construction queue.
2020-07-16 22:22:47 +03:00
Yair Morgenstern
6309bc2fba Main menu buttons no longer require scrolling 2020-07-15 21:52:42 +03:00
Giuseppe D'Addio
4f919b32de
Update template.properties (#2843)
Added new translation lines that were absent in the game
2020-07-14 14:32:55 +03:00
Yair Morgenstern
e179f1a472 Added Water Mill building 2020-07-13 22:42:30 +03:00
Giuseppe D'Addio
0c7d4b296a
Update Nations.json (#2815)
Typo fix
2020-07-13 22:37:01 +03:00
Yair Morgenstern
f57533bc48 3.9.11 2020-07-13 21:45:52 +03:00
uncivbot[bot]
05b32e2146
Translations update (#2842)
* Update Korean.properties (#2816)

* Update Korean.properties

* Update Korean.properties

* Update Japanese.properties (#2821)

* Update Japanese.properties

* Update Japanese.properties

* Update Indonesian.properties (#2831)

* Update Brazilian_Portuguese.properties (#2841)

Co-authored-by: TG <saud2410@naver.com>
Co-authored-by: paontv <57051667+paontv@users.noreply.github.com>
Co-authored-by: Kensvin <63847755+Kensvin28@users.noreply.github.com>
Co-authored-by: Dalmolax <63485458+Dalmolax@users.noreply.github.com>
2020-07-13 21:37:51 +03:00
Alexander Korolyov
c51879cc5f
OptionsPopup with two experimental switches: Spectator mode, Extended Map editor. (#2834) 2020-07-12 12:59:32 +03:00
Yair Morgenstern
04939feb3c 3.9.10 2020-07-08 19:39:16 +03:00
uncivbot[bot]
cf8fb3da1c
Translations update (#2814)
* Update Ukrainian.properties (#2805)

* Update Japanese.properties (#2806)

* Update Italian.properties (#2807)

* Update Korean.properties (#2812)

* German translation update II - German.properties (#2813)

* Update German.properties - fixed lost variables

* Update German.properties

- more compact notation: Geländemerkmale entfernen - "Entfernen von Geländemerkmalen" is too long / looks bad in civilopedia
- simplified spelling
- better descriptions

* Update German.properties

Vanilla Nations - Sumerians!

Co-authored-by: Prosta4okua <31485341+Prosta4okua@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: TG <saud2410@naver.com>
Co-authored-by: scaphander <67830047+scaphander@users.noreply.github.com>
2020-07-08 19:32:32 +03:00
Yair Morgenstern
19bb1cdb94 Translation writer now takes from all base ruleset, and doesn't add duplicate keys - we're ready to start actual work on G&K! 2020-07-07 00:18:02 +03:00
Yair Morgenstern
58a8e358ea 3.9.9 2020-07-05 23:21:59 +03:00
uncivbot[bot]
d58b73313e
Translations update (#2804)
* Update Indonesian.properties (#2792)

* add some simplified chinese translation (#2797)

Co-authored-by: gsm988aa@gmail.com <sim.gao@lab.sra.uni-hannover.de>

* German translation update - German.properties (#2799)

* Update German.properties

* Update German.properties

* Update German.properties

- english: resource -> german: Ressource
- several Additions

* Update German.properties

* Update German.properties

* Update German.properties

* Update Chinese translation. (#2803)

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

Co-authored-by: Kensvin <63847755+Kensvin28@users.noreply.github.com>
Co-authored-by: gsm988aa <gsm988aa@gmail.com>
Co-authored-by: gsm988aa@gmail.com <sim.gao@lab.sra.uni-hannover.de>
Co-authored-by: scaphander <67830047+scaphander@users.noreply.github.com>
Co-authored-by: lishaoxia1985 <49801619+lishaoxia1985@users.noreply.github.com>
Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
2020-07-05 23:13:47 +03:00
Yair Morgenstern
81f88087fe Merge branch 'master' of https://github.com/yairm210/Unciv 2020-07-04 23:33:49 +03:00
Yair Morgenstern
46c6e3b464 Vanilla and G&K rulesets now coexist - this is a big step towards multiple base rulesets! 2020-07-04 23:33:25 +03:00
Alexander Korolyov
eef5cdb584
Basic spectator functionality. (#2765)
* Basic spectator functionality.
Added as a separate nation with full visibility.

* Robots not allowed to spectate :(

* Allow multiple human spectators

* Multiple spectators allowed.
Fix crash when max players in map editor.

* At least one active (not spectator) human player needed

* - Invisible tiles vision for spectators.
- Minimum 1 active player (Human or AI) to start the game.
- temporary only 1 spectator in game

* Revert "At least one active (not spectator) human player needed"

This reverts commit d843bebe

* Add all tech to spectators for resource view

* Spectators couldn't be rolled out from "Random" civ

* Spectator is not a MajorCiv.
corrected random pick

* Small refactor

* No diplomacy button for Specators

* Add fixes from yair210 review.
2020-07-04 23:29:20 +03:00
Yair Morgenstern
329cad660e 3.9.8 2020-07-03 15:55:07 +03:00
uncivbot[bot]
fdbc5279e5
Translations update (#2790)
* Update Japanese.properties (#2781)

* Update Italian.properties (#2782)

Co-authored-by: paontv <57051667+paontv@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
2020-07-02 20:55:26 +03:00
Yair Morgenstern
665404db4d Removed tech exchange, as per Civ V - some of the logic is still there, to allow a gradual phase-out for games that have existing tech trades 2020-06-29 22:22:28 +03:00
Yair Morgenstern
950c761e44 Merge branch 'master' of https://github.com/yairm210/Unciv 2020-06-29 22:21:29 +03:00
Yair Morgenstern
7edd818a98 3.9.7 2020-06-29 22:20:09 +03:00
uncivbot[bot]
b182ccb307
Translations update (#2780)
* Update Italian.properties (#2767)

* Update Indonesian.properties (#2770)

* Update Korean.properties (#2771)

* Update Korean.properties

* Update Korean.properties

* Update Korean.properties

* Update Japanese.properties (#2775)

* Almost full translation in Brazilian Portuguese (#2776)

* Update Brazilian_Portuguese.properties

* Update Brazilian_Portuguese.properties

* Update Brazilian_Portuguese.properties

* Update Brazilian_Portuguese.properties

* Update Brazilian_Portuguese.properties

* Update Brazilian_Portuguese.properties

* Update Brazilian_Portuguese.properties

* Update Brazilian_Portuguese.properties

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: TG <saud2410@naver.com>
Co-authored-by: paontv <57051667+paontv@users.noreply.github.com>
Co-authored-by: henriquepena <67446379+henriquepena@users.noreply.github.com>
2020-06-29 22:00:18 +03:00
Yair Morgenstern
29e25747a8 Resolved #2112 - Show current resource amounts on incoming trade requests 2020-06-29 21:45:00 +03:00
Alexander Korolyov
5356e63249
Refactor UncivGame initialization - add UncivGameParameters. (#2779) 2020-06-29 20:05:58 +03:00
Yair Morgenstern
79ff8c2ecf Fixed broken tests due to 'impassible' changes 2020-06-28 20:48:51 +03:00
Yair Morgenstern
18b2c5868b Hopefully mitigated some very odd multiplayer-checker-related crashes 2020-06-27 23:57:22 +03:00
Yair Morgenstern
3a42be7b77 Merge tag '3.9.6' 2020-06-25 23:04:21 +03:00
Yair Morgenstern
4c0a5d66ce 3.9.6 2020-06-25 23:02:23 +03:00
Alexander Korolyov
aa677042dd
New icon for "Load Scenario" (#2768)
* New icon for "Load Scenario"

* Javadoc comments
2020-06-25 22:30:39 +03:00
uncivbot[bot]
e4a5f2af18
Translations update (#2766)
* Update Korean.properties (#2755)

* Update Korean.properties

* Update Korean.properties

* Update Indonesian.properties (#2756)

* Added translation for "Great improvement" (#2760)

* Update Russian.properties (#2763)

Co-authored-by: TG <saud2410@naver.com>
Co-authored-by: Kensvin <63847755+Kensvin28@users.noreply.github.com>
Co-authored-by: alfoirazabal <49956896+alfoirazabal@users.noreply.github.com>
Co-authored-by: Bada <64350251+BadaTheBada@users.noreply.github.com>
Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
2020-06-24 23:46:36 +03:00
Yair Morgenstern
a23d9ff291 Resolved #2761 - Tutorial titles are auto-added to the translation files 2020-06-24 23:44:17 +03:00
Yair Morgenstern
0f09ed2800 3.9.5 2020-06-21 19:26:17 +03:00
uncivbot[bot]
acedcc6da4
Translations update (#2752)
* Update Italian.properties (#2740)

* Update Japanese.properties (#2741)

* Update Japanese.properties

* Update Japanese.properties

* Update Korean.properties (#2743)

* Update Korean.properties

* Update Korean.properties

* Update Ukrainian.properties (#2751)

Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: paontv <57051667+paontv@users.noreply.github.com>
Co-authored-by: TG <saud2410@naver.com>
Co-authored-by: Prosta4okua <31485341+Prosta4okua@users.noreply.github.com>
2020-06-21 19:21:24 +03:00
Yair Morgenstern
288e6877ba 3.9.4 2020-06-17 20:05:55 +03:00
uncivbot[bot]
ac59584caf
Translations update (#2738)
* Update Japanese.properties (#2731)

* Minor update Russian.properties (#2737)

* Update Indonesian.properties (#2734)

Co-authored-by: paontv <57051667+paontv@users.noreply.github.com>
Co-authored-by: Bada <64350251+BadaTheBada@users.noreply.github.com>
Co-authored-by: Kensvin <63847755+Kensvin28@users.noreply.github.com>
2020-06-17 20:01:52 +03:00
Yair Morgenstern
ac0c874061 Great improvements are marked as such in the Civilopedia 2020-06-15 20:20:48 +03:00
Yair Morgenstern
46dd66d343 3.9.3 2020-06-14 23:53:11 +03:00
uncivbot[bot]
a372ed7ed9
Translations update (#2728)
* Update Russian.properties (#2709)

New lines are translated

* Update Ukrainian.properties (#2711)

* Update Ukrainian.properties

* Update Ukrainian.properties

* Update Ukrainian.properties

* Update Ukrainian.properties

* Update Ukrainian.properties

* Update Ukrainian.properties

* Update Ukrainian.properties

* Update Ukrainian.properties

* Update Ukrainian.properties

* Update Indonesian.properties (#2720)

* Update Korean.properties (#2712)

* Update Korean.properties

* Update Korean.properties

* Update Korean.properties

* Update Korean.properties

* Update Japanese.properties (#2721)

* Update Japanese.properties

* Update Japanese.properties

* Update Japanese.properties

* Update Japanese.properties

* Update Japanese.properties

* Update Japanese.properties

* Update Japanese.properties

* Update Japanese.properties

* Update Japanese.properties

* Update Japanese.properties

* Update Japanese.properties

* Update Japanese.properties

* Update Japanese.properties

* Update Brazilian_Portuguese.properties (#2727)

Co-authored-by: Bada <64350251+BadaTheBada@users.noreply.github.com>
Co-authored-by: Prosta4okua <31485341+Prosta4okua@users.noreply.github.com>
Co-authored-by: Mulaiz Jorigo <66756998+NexVanca@users.noreply.github.com>
Co-authored-by: TG <saud2410@naver.com>
Co-authored-by: paontv <57051667+paontv@users.noreply.github.com>
Co-authored-by: Werlichz <66792554+Werlichz@users.noreply.github.com>
2020-06-14 23:39:35 +03:00
Yair Morgenstern
1961aa7245 Code for era-based city images is go, the current era city images hide the rivers behind them so it's temporarily disabled 2020-06-10 22:00:32 +03:00
Yair Morgenstern
86d54bd3fe Resolved #2708 - added rivers to plain tileset 2020-06-08 19:34:25 +03:00
Yair Morgenstern
4cbd279713 Resolved #2704 - Rome starts avoid extreme temperatures 2020-06-07 21:55:31 +03:00
Yair Morgenstern
f03c0c6de2 Translation updates 2020-06-07 21:52:29 +03:00
uncivbot[bot]
258b2f587c
Translations update (#2707)
* Update Korean.properties (#2700)

* Update Korean.properties

* Update Korean.properties

* Update Korean.properties

* Update Korean.properties

* Update Italian.properties (#2698)

* Finish spansih translation (#2705)

* Lithuanian.properties (#2692)

* Lithuanian.properties

fixed several errors in the text, added translation of diplomacy and cities of states

* Update Lithuanian.properties

Co-authored-by: TG <saud2410@naver.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: Álvaro Ferrero <alfedi3867@hotmail.com>
Co-authored-by: teodor24 <65969302+teodor24-real@users.noreply.github.com>
2020-06-07 21:36:35 +03:00
Yair Morgenstern
31b9faaf23 New translations 2020-06-05 12:40:22 +03:00
uncivbot[bot]
e314475bdc
Translations update (#2697)
* Update template.properties (#2685)

* Update template.properties

Also preparing for the Aztecs

* Update template.properties

* Update Russian.properties (#2688)

New tutorial lines are translated

* Update Italian.properties (#2695)

* Update Korean.properties (#2694)

* Update Korean.properties

* Update Korean.properties

* Update Korean.properties

* Update Japanese.properties (#2693)

* Update Japanese.properties

* Update Japanese.properties

* Update Japanese.properties

* Update Simplified_Chinese.properties (#2696)

Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: Bada <64350251+BadaTheBada@users.noreply.github.com>
Co-authored-by: saud2410 <64586749+saud2410@users.noreply.github.com>
Co-authored-by: paontv <57051667+paontv@users.noreply.github.com>
Co-authored-by: Doubi_TS <48427744+tianshidoubi@users.noreply.github.com>
2020-06-05 12:37:39 +03:00
Yair Morgenstern
677a258375 3.9.1 2020-06-03 19:36:42 +03:00
uncivbot[bot]
6bb555a666
Translations update (#2687)
* Update Japanese.properties (#2681)

* Update Japanese.properties

* Update Japanese.properties

* Update Japanese.properties

* Update Japanese.properties

* Update Japanese.properties

* Update Japanese.properties

* Update Spanish.properties (#2682)

I just checked some Grammar errors that capted my attention while playing and also translated some lines that I consider an Accurate translation

* Update Russian.properties (#2683)

* Update Russian.properties

New lines are translated

* Update Russian.properties

Translation issue closed

* Update Italian.properties (#2686)

Fix

Co-authored-by: paontv <57051667+paontv@users.noreply.github.com>
Co-authored-by: WhiteRoar <63148999+WhiteRoar@users.noreply.github.com>
Co-authored-by: Bada <64350251+BadaTheBada@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
2020-06-03 19:26:53 +03:00