Commit Graph

175 Commits

Author SHA1 Message Date
a5d2b2f154 3.14.16 2021-06-10 14:49:08 +03:00
337b9c62fd Nations spellcheck (#4094) 2021-06-10 14:22:16 +03:00
8228d62d43 3.14.15 2021-06-07 22:47:52 +03:00
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
a1b0a90506 3.14.14 2021-06-04 14:33:22 +03:00
c73891cbe7 3.14.13 2021-06-01 21:19:06 +03:00
d7c0cc593a 3.14.12 2021-05-28 15:02:11 +03:00
cd6ae3dc6d 3.14.11 2021-05-26 19:37:01 +03:00
fd5125904a 3.14.10 2021-05-20 22:49:40 +03:00
106cbb79c3 3.14.9 2021-05-18 01:07:17 +03:00
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
4f1798146c 3.14.8 2021-05-11 00:44:36 +03:00
0f0de8a221 3.14.7 2021-05-08 23:54:29 +03:00
a6d0973324 3.14.6 2021-05-05 20:46:40 +03:00
94c0995b23 3.14.5 2021-05-01 23:05:30 +03:00
bb34659d9c Resolved #3837 - Harad -> Harald in Denmark greeting 2021-04-27 00:15:47 +03:00
55ef131fb2 3.14.3 2021-04-21 22:12:46 +03:00
e270b017d4 3.14.2 2021-04-18 21:56:18 +03:00
5e1a21cd84 Fixed unitType parameters in changed unique 2021-04-14 21:57:58 +03:00
daab799b3a 3.14.1 2021-04-14 19:51:31 +03:00
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
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
6e9f868cb3 'military' -> 'Military' for e.g. [Military] units, same as other unit types which are capitalized 2021-04-13 00:08:35 +03:00
61730ca93b Translation files generation 2021-04-10 23:14:22 +03:00
e0d7128bc6 3.13.11 2021-03-23 23:01:00 +02:00
cf3e517e43 3.13.10 2021-03-21 20:42:14 +02:00
87ff4c91f5 3.13.9 2021-03-18 20:59:42 +02:00
ecee6155e8 3.13.8 2021-03-15 22:14:08 +02:00
a37ac74fa9 'in all coastal cities' now translated 2021-03-13 22:38:53 +02:00
972bf2ba1c Resolved #3681 - translation fix, "in every city" -> "in all cities" 2021-03-11 21:08:48 +02:00
35ed8920e9 3.13.6 2021-03-07 13:04:11 +02:00
639be3b01d 3.13.4 2021-03-01 21:05:53 +02:00
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
b7c25f30e5 3.13.2 2021-02-20 23:26:52 +02:00
48a330fddc 3.13.0 2021-02-13 21:52:33 +02:00
71266b213e 3.12.13 2021-02-06 22:39:36 +02:00
1ada5aff43 Merge branch 'master' of https://github.com/yairm210/Unciv 2021-02-05 10:15:55 +02:00
679ca2ba6c changed case sensitivity (#3577)
somehow I forgot to change most of the texts
2021-02-04 21:50:44 +02:00
b0c9c797f6 3.12.12 2021-02-04 20:18:14 +02:00
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
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
bc4829a424 Translation updates for new cityFilter 2021-01-30 19:46:03 +02:00
aa944bad87 3.12.10 2021-01-26 22:46:47 +02:00
38025785b7 3.12.9 2021-01-16 21:57:30 +02:00
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
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
c1783d8592 3.12.7 2021-01-06 23:16:43 +02:00
07c8300d61 3.12.4 2020-12-27 13:37:37 +02:00
76e9f973c5 updated translation (#3453) 2020-12-25 12:54:45 +02:00
8689fe0ffa Clarified Protectionism effect 2020-12-23 21:28:59 +02:00