Commit Graph

2387 Commits

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