Commit Graph

2147 Commits

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