Commit Graph

2310 Commits

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