Commit Graph

335 Commits

Author SHA1 Message Date
SomeTroglodyte
3c4bb1a558
City screen stats double separators (#4821) 2021-08-09 15:32:30 +03:00
Xander Lenstra
92728e9007
Added an overview screen for religions (#4808)
* Added an overview screen for religions

* Missed a thing

* Implemented requested changes
2021-08-08 23:46:39 +03:00
Xander Lenstra
92d3fa65e3
Ruins now have their own file (#4771)
* Ruins now have their own file

* Added religious rewards

* Added an option for only enabling rewards after a certain amount of turns

* You can now weigh rewards making some more likely than others

* Cleaned up some code

* Make new changes compatible with old mods

* Implemented proposed changes

* Implemented requested changes

* Implemented requested changes
2021-08-08 17:31:08 +03:00
SomeTroglodyte
b8fe46d057
Regression in template.properties (#4785)
"Advanced Settings" has been a while ago. I'm not fixing all comment/empty lines having added spaces here, later.
2021-08-07 23:47:58 +03:00
SomeTroglodyte
ad82f63794
Mod description translation (#4801) 2021-08-07 23:42:12 +03:00
Interdice
2a3395882f
City state resources (#4755)
* Ai now cares about distance from it's cities

* Ai now cares about distance from it's cities

* Ai now cares about distance from it's cities

* Ai will pay extra pay extra for bordering cities or surrounding cities

* Ai will pay extra pay extra for bordering cities or surrounding cities

* Ai will pay extra for cities that are closer to their territory

* The code is cleaner

* The code is cleaner

* The code is cleaner

* Ai now values distance

* Ai now values distance

* Ai now values distance

* Ai now values distance

* Ai now values distance

* Ai now values distance

* Ai now values distance

* Ai now values distance

* Ai now values distance

* Ai now values distance

* Ai now values distance

* Ai now values distance

* Ai now values distance

* Ai now values distance

* Ai now values distance

* Ai now values distance

* You can now gift improvements to the ai

* You can now gift improvements to the ai

* You can now gift improvements to the ai

* Ai now cares about distance from it's cities

* Ai now cares about distance from it's cities

* Ai will pay extra pay extra for bordering cities or surrounding cities

* Ai will pay extra pay extra for bordering cities or surrounding cities

* Ai will pay extra for cities that are closer to their territory

* The code is cleaner

* The code is cleaner

* The code is cleaner

* Ai now values distance

* Ai now values distance

* Ai now values distance

* Ai now values distance

* Ai now values distance

* Ai now values distance

* Ai now values distance

* Ai now values distance

* Ai now values distance

* Ai now values distance

* Ai now values distance

* Ai now values distance

* Ai now values distance

* Ai now values distance

* Ai now values distance

* Ai now values distance

* You can now gift improvements to the ai

* You can now gift improvements to the ai

* You can now gift improvements to the ai

* You can now gift improvements to the ai

* Ai now cares about distance from it's cities

* Ai now cares about distance from it's cities

* Ai now cares about distance from it's cities

* Ai will pay extra pay extra for bordering cities or surrounding cities

* Ai will pay extra pay extra for bordering cities or surrounding cities

* Ai will pay extra for cities that are closer to their territory

* The code is cleaner

* The code is cleaner

* The code is cleaner

* Ai now values distance

* Ai now values distance

* Ai now values distance

* Ai now values distance

* Ai now values distance

* Ai now values distance

* Ai now values distance

* Ai now values distance

* Ai now values distance

* Ai now values distance

* Ai now values distance

* Ai now values distance

* Ai now values distance

* Ai now values distance

* Ai now values distance

* Ai now values distance

* You can now gift improvements to the ai

* You can now gift improvements to the ai

* You can now gift improvements to the ai

* You can now gift improvements to the ai

* You can now gift improvements to the ai

* You can now gift improvements to the ai

* You can now gift improvements to the ai

* You can now gift improvements to the ai

* You can now gift improvements to the ai

* You can now gift improvements to the ai

* You can now gift improvements to the ai

* You can now gift improvements to the ai

* You can now gift improvements to the ai

* You can now gift improvements to the ai

* You can now gift improvements to the ai

* You can now gift improvements to the ai

* You can now gift improvements to the ai

* Update template.properties
2021-08-06 16:07:38 +03:00
Xander Lenstra
547f5a57e5
Added missionairy units, which can spread religion and bought with faith (#4568)
* Added missionairy units, which can spread religion and bought with faith

* Forgot an include, minor additions

* Forgot credit for the missionary image

* Large refactor, enabling buying with almost all stats, split IConstruction into IConstruction & INonPerpetualConstruction

* Does this fix the tests

* Fixed accidentally removing all trailing spaces in template.properties

* Thanks to someTroglodyte for paying more attention than I do :)

* Implemented requested changes

* Fixed large amount of question marks

* Missing space, of course

* Fixed function name change

* Fixed merge problems

Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
2021-08-06 14:40:48 +03:00
SomeTroglodyte
9499471986
Change defeat conditions (#4761)
* Change defeat conditions

* Change defeat conditions - unit tests setup

* Change defeat conditions - patch1
2021-08-05 18:12:30 +03:00
Xander Lenstra
72eee5adf3
Removed $ signs from translatable strings (#4762) 2021-08-05 07:40:13 +03:00
SomeTroglodyte
c1382477e0
Mod manager concurrency (#4750)
* Mod manager concurrency

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

* Added united nations and backbone for diplomatic victory

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

* You can now win with diplomacy

* AI will now vote in the united nations

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

* Added translatable strings

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

* Implemented further requested changes
2021-08-03 21:48:51 +03:00
SomeTroglodyte
c33e7ae6d2
Civilopedia phase 9 - Technologies (#4737) 2021-08-03 09:36:58 +03:00
SomeTroglodyte
a248a1178c
Deprecate Building.cannotBeBuiltWith (Solar/Nuclear Plant exclusion now as unique, auto-displays in Civilopedia) (#4732) 2021-08-02 20:50:56 +03:00
SomeTroglodyte
7d52cfbcab
Harden map editor map loader against most bad maps (#4711)
* Harden map editor map loader against most bad maps

* Harden map editor map loader against most bad maps - patch1
2021-08-02 19:03:16 +03:00
SomeTroglodyte
130c318ae0
Civilopedia phase 8 - Nations and Promotions (#4657)
* Civilopedia phase 8 - Nations and Promotions

* Civilopedia phase 8 - Nations and Promotions - AS insubordination

* Civilopedia phase 8 - Nations and Promotions - OR template

* Civilopedia phase 8 - Nations and Promotions - proofread

* Civilopedia phase 8 - Nations and Promotions - revert OR
2021-07-30 15:55:17 +03:00
Giuseppe D'Addio
c3ed85c542
Update template.properties (#4670)
Added new line
2021-07-29 15:18:00 +03:00
SomeTroglodyte
34717008b8
Civilopedia phase7 (#4628)
* Civilopedia phase 7 - Terrain

* Civilopedia phase 7 - Terrain - tuning

* Civilopedia phase 7 - Terrain - patch1 "for"

* Civilopedia phase 7 - Terrain - patch2 for #4641
2021-07-27 10:41:25 +03:00
SomeTroglodyte
d0155a6ddd
Minimap Slider UI (#4634) 2021-07-25 19:08:50 +03:00
SomeTroglodyte
f9bef4a917
Newgame screen overhaul for portrait mode (#4522)
* Newgame screen scrolls nicer, mods sorted, base/ext mod clearer, unified separators

* Newgame-Mods-UI - sort Nations
2021-07-24 21:43:12 +03:00
SomeTroglodyte
e41ba0da91
A Civilopedia category for Religion (#4609)
* A Civilopedia category for Religion

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

* Civilopedia for Religion - oversight
2021-07-23 00:10:47 +03:00
Xander Lenstra
85f4840e35
Hide lesser used action buttons to free up space (#4580)
* You can now use 'h' to fortify/sleep until healed

* Hide lesser used unit actions by default

* Refactored worker actions into automate & build improvements

* Added missing translation lines

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

* Fix promotions with multiple uniques not getting translated

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

* wonder splash screens atlas

* reset to master

* Add Sweden

* add translations

* translations

* implement first part of UP

* add icons to atlas

* implement second part of swedens up

* implement first hakkapeliitta unique

* implement second hakkapeliitta unique

* gifted GPs are removed

* update sweden symbol

* translations

* review Hakkapeliitta unique

* removed unneccesary parameters

* hakka UP review

* Hakka UP part 2

* yairm's reviews

* translations for fixes

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

* Moved check for stacking unit bonus outside great general logic
2021-07-20 17:06:15 +03:00
Yair Morgenstern
05adc04a71 Added translations 2021-07-20 00:48:35 +03:00
Xander Lenstra
c81c1b6a1b
Implemented Follower beliefs for religions (#4530)
* Minor things

* Added a few follower beliefs

* Implemented follower beliefs when founding a religion

* Added missing follower beliefs as much as possible

* Religion screen now scrolls correctly

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

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

* Finish merging master into Civilopedia-Buildings

* Spruced up Civilopedia - phase 5 - buildings - patch

* Spruced up Civilopedia - phase 5 - buildings - patch2

* Spruced up Civilopedia - phase 5 - buildings - patch3

* Spruced up Civilopedia - phase 5 - buildings - patch4

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

* wonder splash screens atlas

* reset to master

* add basic gifting to city states and major civs

* actual gifting of the unit

* add gift icon to atlas

* adjust relationship decay

* add strings to jsons

* AI and player return same object
2021-07-19 00:30:10 +03:00
Yair Morgenstern
357b22cec5
Translations update (#4533)
* Update Swedish.properties (#4529)

* Refactor German translation of Trades (#4527)

* Refactor Trades

* Refactor Trades

* Update German translation (#4526)

* Update Russian.properties (#4525)

* Update Russian.properties

* Update Russian.properties

* Update Korean.properties (#4524)

* Update Indonesian.properties (#4523)

* Update Indonesian.properties

* Update Indonesian.properties

* Update Indonesian.properties

* Missing translation templates from BattleDamage modifiers (#4521)

* Update Italian.properties (#4517)

* Update Spanish.properties (#4516)

Soory for being late

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

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

* Refactor City-States

* Refactor City-States

* Refactor City-States

Co-authored-by: SimonCeder <63475501+SimonCeder@users.noreply.github.com>
Co-authored-by: MartinP <77325495+Mape6@users.noreply.github.com>
Co-authored-by: sockybob <44141246+sockybob@users.noreply.github.com>
Co-authored-by: Samsaek the Calico <saud2410@naver.com>
Co-authored-by: kensvin <63847755+Kensvin28@users.noreply.github.com>
Co-authored-by: SomeTroglodyte <63000004+SomeTroglodyte@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: ArchDuque-Pancake <78449553+ArchDuque-Pancake@users.noreply.github.com>
2021-07-16 09:05:31 +03:00
Xander Lenstra
2752c713b9
Founding Religions (#4505)
* Fixed crashes on loading save games with religion

* Added missing credit

* Religious cities now show religion icons in the city button

* Add icons for religions

* You can now found beliefs, with snazzy icons!

* Fixed bug which made prophets impossible to generate

* Added missing translatable strings

* Fixed translation tests properly

* Implemented requested changes

* Implemented part of the requested changes

* Removed SplitPane in favor of Table

* Removed unused code

* Capped the amount of foundable religions to the amount of religions
2021-07-14 22:09:51 +03:00
Xander Lenstra
253e62de72
City states give gold when met; updates to city state gold gifts (#4435)
* City States now give gold when met

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

* Implemented requested changes

* Fixed tests
2021-07-10 21:51:11 +03:00
Xander Lenstra
5376e488a0
Added a simplified version of great prophets, implemented a basic city religion UI (#4356)
* Add a very simple display for the religion in a city

* Added missing credits for shrine

* Added Great Prophet unit

* Great prophets can now be generated using faith

* Great Prophets can now construct holy sites

* Great Prophets can now spread their religion to friendly cities

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

* Added missing translation string

* Fixed more translation problems

* Implemented requested changes
2021-07-09 10:48:33 +03:00
Yair Morgenstern
abd877dd1b Resolved #4427 2021-07-09 10:19:21 +03:00
SomeTroglodyte
7875ec4896
Better mod download and error display (#4396)
* Better mod download and error display

* Fix Android Studio Insubordinations
2021-07-06 19:33:05 +03:00
Xander Lenstra
624fe33be1
Updated template.properties (#4377)
* Updated translation file

* Made tests happy

* Removed unused, athematic unit filter

* Added submarine unit translation
2021-07-05 11:20:12 +03:00
Xander Lenstra
70882b4e8b
Added Privateer unit; updated Coastal Raider promotion (#4301)
* Added privateer unit

* Privateers can now capture other naval units

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

* Added missing translatable notification

* Implemented requested changes

* Implemented requested changes _but better_

* Forgot to update a variable name
2021-07-02 10:38:45 +03:00
Xander Lenstra
c350a3c923
Fix a few bugs related to nukes (#4324)
* Fixed bugs where nukes don't work due to capitilzation issues

* Renamed existing translations

* Fixed crash happening when nuking tiles without an owner

* Added notifications to attacker for civs that have declared war as a result of the nuke dropping
2021-07-01 22:18:37 +03:00
SomeTroglodyte
4d16b3fcf8
Respect visualMods for Sound - CheckBox, formats, modchange detect (#4295)
* Respect visualMods for Sound - CheckBox, formats, modchange detect

* Respect visualMods for Sound - german patch
2021-06-29 21:31:57 +03:00
SomeTroglodyte
ca58cf1694
Translation template fixes (#4287)
* Translation template fixes

* Translation template fixes - patch

* Translation template fixes - another
2021-06-27 21:22:47 +03:00
Xander Lenstra
111d11b9b2
Added Advanced Ballistics Tech, Atomic Bomb Unit, Updated how nukes work (#4211)
* Improved nukes

* Fixed build error (probably)

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

* Implemented requested changes

* Fixed Tech connections

* Fixed nuclear missiles and guided missiles being interceptable

* Missiles are no longer air units. This is, as they cannot be stationed on carriers and cannot be intercepted.
2021-06-24 16:03:59 +03:00
Xander Lenstra
7f88844d82
Created Patronage policy branch (#4186)
* Created Patronage policy branch -- draft

* Patronage branch is now functional

* Added images for the policies

* Temporarily bandaged backwards compatability, added incompatabilities

* Implemented recommended changes

* Fixed acquirement of 'patronage complete' not being saved

* Reverted change I was unhappy with

* Implemented requested changes

* Fixed build errors

* Implemented recommended changes

* City States can now give any great person, including unique ones, conform Ravignirs tests
2021-06-22 17:25:29 +03:00
SomeTroglodyte
e1c6cef111
Show promises not to settle, ask on found city action (#4148) 2021-06-15 09:49:08 +03:00
Xander Lenstra
1c21573a42
Updated the culture victory so it now requires the Utopia Project to be built (#4060)
* Added the Utopia Project for the culture victory; AI will now build it

* Forgot to credit the icon

* Fixed a few minor issues

* Improved code quality; added translatable notifications

* Fixed mistakes; improved quality

* Changed a label

* Revert a small change which is no longer necessary

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

* Made requsted changes
2021-06-14 14:48:22 +03:00
SomeTroglodyte
eda6dece9c
Implement dormant Nation.startIntroPart1+2 (#4091)
* Implement dormant Nation.startIntroPart1+2

* Implement dormant Nation.startIntroPart1+2 - translation
2021-06-10 23:16:35 +03:00
Federico Luongo
0b696451ce
Map Generation Seedable (#4072)
* Map Generation Seedable
* Added Seed editable field in MapParametersTable
Previously, using the same set of parameters, one could not get the same map twice (i.e. negligible probability for it to happen). With this commit players can specify, alongside the usual map parameters, a long integer used to seed the RNG and get replicable results.

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

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

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

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

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

* New map type: 4 Corners
* Reverted name change Two Continents to Continents
* Renamed Four Continents to Four Corners (to reflect original name in Civ5)
* Added translation strings
2021-06-08 06:41:02 +03:00
Aron de Jong
cd58f6ace8
Refund wasted production as gold (#4058)
* Refund wasted production as gold

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

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

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

* Implement wonder refund and obsolete unit upgrade

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

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

* Shorten notification messages

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

* Implemented unit swapping

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

This change implements unit swapping for Unciv.

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

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

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

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

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

* Added some comments to existing movement functions

* Fixed a silly mistake

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

* Removed some unneeded code

* Fixed movement buttons not showing with world wrap

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

* Made the swap action only display if usable

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

* More tileFilter and improvement uniques - Translations

* Update template.properties

* More tileFilter and improvement uniques - Revert and/or inside unique parameter
2021-06-06 12:40:02 +03:00
SomeTroglodyte
52b7999c48
Map editor fix translations, a few keys (#4055) 2021-06-06 09:18:22 +03:00
Xander Lenstra
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
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
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
SomeTroglodyte
8d4d05e235
Two missing translation templates (#3988) 2021-05-24 08:58:27 +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
Yair Morgenstern
d546b2b00e Caught exception when map fails to load 2021-05-13 21:43:42 +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
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
Yair Morgenstern
9900795e02 Specify original owner when showing option to liberate city 2021-04-30 12:44:51 +03:00
Yair Morgenstern
55ef131fb2 3.14.3 2021-04-21 22:12:46 +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
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
5a5d0a980f Removed ALL color-based notifications! 2021-03-21 00:28:58 +02:00
Yair Morgenstern
a37ac74fa9 'in all coastal cities' now translated 2021-03-13 22:38:53 +02:00
Yair Morgenstern
972bf2ba1c Resolved #3681 - translation fix, "in every city" -> "in all cities" 2021-03-11 21:08:48 +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
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
Jack Rainy
ff05fa601d
Translations update (#3618)
* Translations update

* Minor changes to the translation
2021-02-25 19:01:58 +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
b7c25f30e5 3.13.2 2021-02-20 23:26:52 +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
e92a1dd088 Better tech descriptions for increased improvement stats 2021-02-12 14:13:11 +02:00
Yair Morgenstern
8b1778eea3 Removed Scenario Maps entirely - was not a well thought-out concept and caused more confusion than actual fun.
Case in point - 0 mods are Scenario mods.
2021-02-11 22:33:52 +02:00
Yair Morgenstern
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
GGGuenni
679ca2ba6c
changed case sensitivity (#3577)
somehow I forgot to change most of the texts
2021-02-04 21:50:44 +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
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
0800dbba51 Resolved #3533 - Added confirmation popup when saving over existing save 2021-01-15 13:28:29 +02:00
Huichan Lee
76e9f973c5
updated translation (#3453) 2020-12-25 12:54:45 +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
d0df571ca5 Fixed broken translation 2020-12-13 11:30:02 +02:00
Yair Morgenstern
8a5247324c 3.11.18 2020-12-06 22:16:03 +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
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
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
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
895ed528af Resolved #3285 - added a notification when cities are no longer in resistance 2020-10-24 22:43:04 +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
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
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
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
Yair Morgenstern
523ed10e68 Specialist names are taken from the json files 2020-10-04 16:25:07 +03:00
Yair Morgenstern
3e98e0c00f 3.11.0 2020-10-03 20:48:34 +03:00
Yair Morgenstern
bfa9c65700 Modding - Buildings can be rendered obsolete (unbuildable) by techs 2020-09-30 23:17:09 +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
HadeanLake
f721f59734
Added national wonders, fixed some minor issues (#3163)
* fixed translation of "Owned: [amountOwned] = " line

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

* removed hurryCostModifier from units that should not have it

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

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

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

Catapult (20)
Ballista (20)

Horseman (20)
Companion Cavalry (20)

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

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

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

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

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

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

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

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

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

* Separated unique.params[0] to val filter

* Changed National Epic image
2020-09-21 21:44:52 +03:00
Yair Morgenstern
8db955b851 3.10.10 2020-09-18 11:27:11 +03:00
lishaoxia1985
9f4607635b
UI Upgrade (#3149)
* UI Update

* Replace ScrollPane with Table in Minimap
2020-09-18 10:59:18 +03:00
Yair Morgenstern
1ceb3548dd Resolved #3130 - "All policies adopted" shown in policy picker screen when relevant 2020-09-16 19:17:25 +03:00
Yair Morgenstern
7d32412646 Translation updates, with minor changes to ensure consistency 2020-09-11 11:16:31 +03:00
Yair Morgenstern
cb0599b9f5 Simplified "on [seacost]" and "on [tile next to fresh water]" to "next to [Coast]" and "next to [Fresh water]" 2020-09-11 09:24:08 +03:00
HadeanLake
9f48f43ad0
parameterized some uniques, fixes some minor bugs (#3122)
Fixed Moai
Wonder overlay will remove terrain overlay in default tileset
Oasis, Marsh and Atoll now have "Rare feature" unique, rare features can be added by mods
implemented TileInfo.fitsUniqueFilter(filterText:String): Boolean
parameterized uniques:
* "Must have an owned [Mountain] within [2] tiles"
* "Must be on [River]" - not to be confused with "Must be next to [River]" - the tile city on must have river at its border, not the adjacent tile
* "Must not be on [Hill]"
* "Must not be next to []"
* "Must be on [seacoast]" - next to "Coast" tile
* "Must be on [tile adjacent to source of fresh water]"
* "Must be next to [Water]" - next to any water tile, including "Lakes"
* "Must be next to [terrainFeature]"
* "Must be next to [unique]" - e.g "Must be next to [Rare feature]" - next to terrain or terrain feature having this unique
2020-09-11 07:56:56 +03:00
lishaoxia1985
9d951835d1
UI Update (#3102)
* Add "Load game" in WorldscreenMenuPopup

* UI Update

* Fix the Ottomans uniques, edit Tech description
2020-09-10 19:25:56 +03:00
Yair Morgenstern
3719b5c4f6 Added mod screen translation terms 2020-09-07 23:03:12 +03:00
Yair Morgenstern
ca36084e8b 3.10.7 2020-09-04 16:44:00 +03:00
HadeanLake
8f75368b99
Farms near freshwater (#3063)
* Farms near freshwater
* Farm now has unique "Can also be built on tiles adjacent to fresh water"
https://civilization.fandom.com/wiki/Farm_(Civ5)
Even snow: https://www.reddit.com/r/civ/comments/11qtko/farms_on_snow/
Hill+Farm, Snow+Farm, Tundra+Farm sprites by THE BUCKETEER and Ravignir from discord
* fields improvingTech and improvingTechStats converted into uniques
e.g.:
"[+1 Production] once [Scientific Theory] is discovered"
"[+1 Food] on [fresh water] tiles once [Civil Service] is discovered"
"[+1 Food] on [non-fresh water] tiles once [Fertilizer] is discovered"

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

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

* update template.properties
2020-09-02 19:49:29 +03:00
Yair Morgenstern
e111bba509 #3050 - Added "automated workers don't replace improvements" setting 2020-08-31 22:39:03 +03:00
Yair Morgenstern
c61ec2120b Separated base ruleset mods in new game screen - cannot activate multiple base ruleset mods 2020-08-31 21:24:36 +03:00
HadeanLake
e6e31b4e1a
Aztecs and some other things (#3033)
* Added icons
* [temple](https://thenounproject.com/search/?q=temple&i=28256) By Fabio Meroni for Temple of Artemis
* [Canoe](https://thenounproject.com/term/canoe/402285/) By Viktor Fedyuk (Tim P) for Floating Gardens
* [Garden](https://thenounproject.com/search/?q=garden&i=1478380) By Bharat
Aztecs by Séan https://discord.com/channels/586194543280390151/633733497277775884/727255962754351104
Jaguar by Red11

Reused slinger icon for Slinger Withdraw

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

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

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

* Added Aztecs

* Update template.properties

* update template.properties

* update template.properties

* update template.properties
2020-08-30 21:02:59 +03:00
HadeanLake
15ed1a608b
New uniques and stuff for mods (#3055)
* "[+1 Gold] for each adjacent [Road]" Roadstatus can be used now in tile improvement uniques

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

* Fixed translation of nation uniques

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

* Implemented startingUnits, aiMajorCivStartingUnits and aiCityStateStartingUnits fields in difficulty

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

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

* Update template.properties

* Update Difficulty.kt
2020-08-30 15:48:00 +03:00
Yair Morgenstern
45d90c0458 Unified construction filtering for civ- and city-wide uniques 2020-08-24 14:30:26 +03:00
Yair Morgenstern
6ff712b625 A mishmash of different fixes: Unit uniques and promotions, happiness calculation, etc. 2020-08-24 10:58:14 +03:00
Yair Morgenstern
21c8336563 unit.getMatchingUniques() 2020-08-24 09:48:33 +03:00
Yair Morgenstern
40f93461fa With new translation lines 2020-08-23 21:27:31 +03:00
Yair Morgenstern
db7f064498 Resolved #3016 - Policy branch uniques are translated properly 2020-08-21 14:06:29 +03:00
Yair Morgenstern
270c50afd6 Generified more building uniques and merged functionality of global and city uniques when alculating tile stats 2020-08-20 23:11:53 +03:00
HadeanLake
764a1c3913
scenario editing mode improvements and new unique (#2999)
* scenario editing mode improvements and new uniques

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

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

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

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

* scenario editing mode improvements:

Resource requirements when buying buildings and units are ignored

Limit for selling buildings is ignored

Workers improve tiles instantly

Units will not be disbanded if civilization has negative gold

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

* undo comma separation

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

* upadte template.properties

* unnecessary parentheses

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

* update template.properties

* add missing spaces
2020-08-18 19:20:59 +03:00
Yair Morgenstern
41615909df Translation tests are fixed - translators beware 2020-08-16 22:01:55 +03:00
Yair Morgenstern
4cd4d5d89f All kinds of crazy translation fixes 2020-08-15 23:20:18 +03:00
Yair Morgenstern
889d6a1587 Denounce now has a confirmation popup 2020-08-10 23:24:02 +03:00
Yair Morgenstern
3b2e813523 Ancient Ruins can now provide Culture 2020-08-10 23:12:02 +03:00
Yair Morgenstern
ae60aab7e5 Resolved #2818 - Can no longer build improvements outside your borders 2020-08-07 17:22:48 +03:00
Yair Morgenstern
5cc610aa5d Persia nation uniques - also contained a translation-wide change 2020-08-06 20:24:18 +03:00
Yair Morgenstern
a97c9bafcc Civ uniques up to Arabia converted 2020-08-02 22:03:30 +03:00
Yair Morgenstern
5aaab7e137 Civ uniques done up till Egypt 2020-08-02 17:04:11 +03:00
Yair Morgenstern
b4708b05b3 Unified regular unit and great person unit additions
First playaround with nation uniques!
2020-08-01 23:04:33 +03:00
lishaoxia1985
acdc6cee69
AS update to 4.0.1, Edit Diplomacy UI in Overview (#2885) 2020-08-01 21:44:32 +03:00
Alexander Korolyov
86f500b266
Fog of war implementation (#2887)
* Initial implementation fog of war for spectators

* Corrected fog of war for main map

* Fix borders seen in unexplored tiles during spectating

* Small refactor

* Fixes after code review

* Fixes after code review

* wierd bug fix, android studio "eats" spaces
2020-07-31 11:32:44 +03:00
TG
bcfcadf5bc
Update template.properties (#2875) 2020-07-23 14:40:52 +03:00
Giuseppe D'Addio
4f919b32de
Update template.properties (#2843)
Added new translation lines that were absent in the game
2020-07-14 14:32:55 +03:00
Yair Morgenstern
19bb1cdb94 Translation writer now takes from all base ruleset, and doesn't add duplicate keys - we're ready to start actual work on G&K! 2020-07-07 00:18:02 +03:00
Yair Morgenstern
665404db4d Removed tech exchange, as per Civ V - some of the logic is still there, to allow a gradual phase-out for games that have existing tech trades 2020-06-29 22:22:28 +03:00
Yair Morgenstern
29e25747a8 Resolved #2112 - Show current resource amounts on incoming trade requests 2020-06-29 21:45:00 +03:00
Yair Morgenstern
79ff8c2ecf Fixed broken tests due to 'impassible' changes 2020-06-28 20:48:51 +03:00
Yair Morgenstern
a23d9ff291 Resolved #2761 - Tutorial titles are auto-added to the translation files 2020-06-24 23:44:17 +03:00
Yair Morgenstern
31b9faaf23 New translations 2020-06-05 12:40:22 +03:00
uncivbot[bot]
e314475bdc
Translations update (#2697)
* Update template.properties (#2685)

* Update template.properties

Also preparing for the Aztecs

* Update template.properties

* Update Russian.properties (#2688)

New tutorial lines are translated

* Update Italian.properties (#2695)

* Update Korean.properties (#2694)

* Update Korean.properties

* Update Korean.properties

* Update Korean.properties

* Update Japanese.properties (#2693)

* Update Japanese.properties

* Update Japanese.properties

* Update Japanese.properties

* Update Simplified_Chinese.properties (#2696)

Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: Bada <64350251+BadaTheBada@users.noreply.github.com>
Co-authored-by: saud2410 <64586749+saud2410@users.noreply.github.com>
Co-authored-by: paontv <57051667+paontv@users.noreply.github.com>
Co-authored-by: Doubi_TS <48427744+tianshidoubi@users.noreply.github.com>
2020-06-05 12:37:39 +03:00
Yair Morgenstern
9b93e4fb51 Unified capitalization in New Game screen - #2549 2020-05-20 20:46:59 +03:00
Giuseppe D'Addio
b3a7528818
Update template.properties (#2637)
* Update template.properties

Added two new translation lines

* Update template.properties

Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
2020-05-19 19:24:21 +03:00
Jack Rainy
4026c9b91d
Fix of the translation template for the start new game menu (#2623)
* Adding missing translations + corrections to existing

* Translation of the "Avoid" starting biases
2020-05-16 21:56:55 +03:00
SomeTroglodyte
9a5afced0d
One part of the options screen sticks out when using a near-100% non-English language :) (#2579) 2020-05-04 22:19:45 +03:00
uncivbot[bot]
2bc52e756f
Translations update (#2567)
* Translation/romanian (#2563)

* romanian translations

* romabian translation

* romanian translatiobs

* wrong diacritics

* fixed wrong diacritics

* Romanian translations

* romanian translations

* Update Portuguese.properties (#2565)

* Civilopedia missing strings  (#2564)

* Civilopedia missing strings

* Lost translations from #2539

* Add some polish translations, fix typos (#2566)

Co-authored-by: Beniamin Szabo <szabo.farkas.beny@gmail.com>
Co-authored-by: quantumilogic <64731997+quantumilogic@users.noreply.github.com>
Co-authored-by: Jack Rainy <JackRainy@users.noreply.github.com>
Co-authored-by: Michał Iwańczuk <miwanczuk7@gmail.com>
2020-05-03 22:01:14 +03:00
Yair Morgenstern
f318df68ce Resolved #2491 - Terrace farms are not precluded by resources 2020-04-24 11:15:56 +03:00
uncivbot[bot]
c890895f39
Translations update (#2500)
* French translation fixes (#2484)

* Replace tile improvement term in FR to match Civ terminology

* FR fixes for tutorial

* FR fixes for buildings and diplomacy

* FR fixes for Trade, Nation and City-State

* FR fixes for Menus and notifications

* FR - Removed particles in front of civ names

* FR - fix non translated string (419 -> 335)

Most of the fixes here are city or place names.
These were extracted from Wikipedia French articles matching the
corresponding english article.

Thanks goes to https://wikipedia.org

* FR - fix space before "!", typo, translate falsely translated tutorial lines

* Translations (#2490)

* Translations are added and corrected

* Translations for the main screen

* Update Indonesian.properties (#2487)

* Update Indonesian.properties

Finished all required translations
Some tweaks and corrections
Enjoy, Indonesians

* Update Indonesian.properties

* Update Indonesian.properties

* Update Indonesian.properties

Co-authored-by: Luke Marlin <luke.marlin@viacesi.fr>
Co-authored-by: Jack Rainy <JackRainy@users.noreply.github.com>
Co-authored-by: Kensvin <63847755+Kensvin28@users.noreply.github.com>
2020-04-23 20:09:31 +03:00
Yair Morgenstern
c73df02d76 Unified City States and City-States -> City-States #2497 2020-04-23 19:39:16 +03:00
Yair Morgenstern
227f7327c5 Fixed the build 2020-04-21 00:24:36 +03:00
Yair Morgenstern
b6fc37aad8 Resolved #1936 - can sign Declarations of Friendship in Multiplayer 2020-04-20 18:29:16 +03:00
uncivbot[bot]
1a8f6448f9
Translations update (#2470)
* Update Italian.properties (#2451)

* Spanish.properties (#2464)

* Update Indonesian.properties (#2457)

* Update Indonesian.properties

I've done a lot of translations and correction to some things in this Indonesian translation. May this helps. I will continue updating this in the upcoming days ASAP.

* Second update of Indonesian properties

Added: Tutorials.json translation
and some correction

* Translations (#2454)

* Translations

* Translations of era are already included from Tech.json

* More tutorial translations

Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: WillianBlack <63936035+WillianBlack@users.noreply.github.com>
Co-authored-by: Kensvin <63847755+Kensvin28@users.noreply.github.com>
Co-authored-by: Jack Rainy <JackRainy@users.noreply.github.com>
2020-04-19 22:53:29 +03:00
Jack Rainy
77a63ce365
Citadel improvements + improved AI for the forts (#2453)
* Allow building the citadels either next to or within friendly tiles only

* Citadel acquire the tiles around it

* AI uses the citadels to get the tiles back + improved AI for the forts
2020-04-18 21:25:48 +03:00
SomeTroglodyte
cb87ae94a8
Effect of rationalism was not visible in city UI: Translations patch (#2442)
* Effect of rationalism was not visible in city UI

* Effect of rationalism was not visible in city UI - translations patch
2020-04-17 10:21:11 +03:00
GGGuenni
4fc5c5de64
New screen for "Add Game" [MultiplayerScreen] (#2431)
* Adding AddGame Screen

Old button was confusing for new players

* Adding translation file entry
2020-04-16 14:44:52 +03:00
Yair Morgenstern
3174767634 Added description for continuous rendering - #2213 2020-04-14 10:46:23 +03:00
Jack Rainy
dde01738de
New wonders: Mausoleum of Halicarnassus, Statue of Zeus (#2301)
* New wonder: Mausoleum of Halicarnassus

* New wonder: Statue of Zeus

* Obsolete tests are removed
2020-04-01 20:12:25 +03:00
Yair Morgenstern
c04b450a70
Translations (#2288)
* Update Polish.properties (#2275)

* Update Italian.properties (#2276)

* Update French.properties (#2279)

* Traditional Chinese Update (#2283)

Update for the traditional Chinese translations.

* Update translations + notification about generated translation files (#2280)

* Translations

* Notify about successful creation of the files

* A few more translations

* Misprint is corrected

* Translations for Inca

* Translation updates

Co-authored-by: RadioMagnetofonStereofoniczny <remixionmix@gmail.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: RobertGine <61517798+RobertGine@users.noreply.github.com>
Co-authored-by: The Bucketeer <57716526+GeneralWadaling@users.noreply.github.com>
Co-authored-by: Jack Rainy <JackRainy@users.noreply.github.com>
2020-03-30 22:14:49 +03:00
Yair Morgenstern
b0a74dfa86 Resolved #1964 - Construction resource consumption is explicitly stated in construction picking and queue 2020-03-29 14:50:40 +03:00
Yair Morgenstern
806a0e2269 Resources in Civilopedia state unit and buildings that consume the resource - #1964 2020-03-29 14:29:19 +03:00
Yair Morgenstern
0387ce4ff6
Translations (#2273)
* Translations for unit ability withdraw before melee (#2255)

* update Chinese translation. (#2263)

* Update Czech.properties (#2262)

* Update Czech.properties

fixed typo, used better Iver88's translations lost due to conflict

* Update Czech.properties

correct "achaemenid" form

* Portuguese translations (#2271)

* Updated Portuguese translations

* Fixed typos and missing letters.

* Update Polish.properties (#2258)

* Update Polish.properties

* fix "x"

* hotfix v2

* Cities Translations

* Update Polish.properties

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

* Update Italian.properties (#2259)

* Translations (#2268)

* Translations

* Withdraw translations

* Translation file generation moved to game options,, so game modders can generate files in-game and not need to build Unciv from scratch

* Translation updates

Co-authored-by: proteus-anguinus <github2015@rheinig.de>
Co-authored-by: lishaoxia1985 <49801619+lishaoxia1985@users.noreply.github.com>
Co-authored-by: stoupa007 <60326342+stoupa007@users.noreply.github.com>
Co-authored-by: W Gomes <42829628+w-gomes@users.noreply.github.com>
Co-authored-by: RadioMagnetofonStereofoniczny <remixionmix@gmail.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: Jack Rainy <JackRainy@users.noreply.github.com>
2020-03-28 22:32:32 +03:00
Jack Rainy
2d33273c8d
Translation of the mod's name (#2260) 2020-03-26 10:21:00 +02:00
proteus-anguinus
144d53b6df
Civilopedia: Improvement: show bonus for improvingTech (#2261)
* Civilopedia improvement techupgrade

* Fixed overzealous cleanup

* 3 Languages for the new line
2020-03-25 22:24:41 +02:00
rh-github-2015
8aab5bb80b
Inca abilities: Great Andean Road, Terrace farm (#2218)
* Inca abilities for Terrace farm and Great Andean Road

* Language files re-done by manual pull and merge

Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
2020-03-23 10:13:40 +02:00
Yair Morgenstern
063486ab09 Impassible > Impassable change - #2225 2020-03-23 10:07:05 +02:00
rh-github-2015
4fb7e11354
Mod loader resilience (#2211)
* For #2200: Avoid MacOS tripping us

* Second hidden test in packImages

* Clearer message for a specific mod error, UI message for savegames missing mods

* Fixed obsolete imports from rejected experiments

* Tiny lint issue

* Irrelevant change to test push after rebase
2020-03-22 22:43:39 +02:00
Yair Morgenstern
3734f39101 Changed "Requires [resource]" to "Consumes 1 [resource]" to make it obvious that resource is consumed - #1964 2020-03-22 22:40:07 +02:00
rh-github-2015
c647261a18
More civilopedia info for nation and improvement (#2190)
* A little more information in civilopedia for improvements and nations

* Differentiate civilopedia and picker use

* Missing lines in translations template

* allTranslationsEndWithASpace test

Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
2020-03-22 21:00:18 +02:00
Jack Rainy
9fe9a61396
Corrections to the Wonders stats (#2215)
Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
2020-03-21 20:56:16 +02:00
rh-github-2015
627ca0ca43
New translation line for 2180 (#2201)
* Another line for translations template and its german

* Francais y espanol tambien

Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
2020-03-21 20:45:23 +02:00
EdinCitaku
e06d537688
Feature#2081 (#2100)
* Unit can now only be purchased if no other unit of same type is stationed in city center #2081

* #2081
Added unique to landsknecht and changed condition for movement panelty

* Refactored when statement to if
#2081

* Only one plane at a time can be purchased to a maximum of 6 that are NOT transported in a single city
#2081

* removed duplicate code
#2081

* refactor canPurchase() and now track bought units in a city in a mutableList
#2081

* refactor canPurchase() it basicly just tracks if the unit can be placed on the center tile! if it cant then we dont allow the purchase!
#2081

* Changed wording of unique and added translations
#2081

* Changed wording of unique
#2081

* removed unneeded imports
#2081

Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
2020-03-21 20:35:30 +02:00
Jack Rainy
d7ac7f9173
Translation refactoring - part 3 (all JSONs) (#2205)
* Refactoring: Split reading and writing of translation files

* New generator of translation strings from JSONs

* Switch to the new strings generation approach

* Using the regex for similar strings + bugfix for Submarines

* Transfer of the existing translations

* Clean up of the template file and translated files based on it

* Unit tests are updated

Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
2020-03-21 20:32:04 +02:00
rh-github-2015
27c0aedbbd
Clearer free promotions, nicer Maori Warrior, missing new UnitType translations (#2210) 2020-03-21 20:19:50 +02:00
Jack Rainy
c7d020e32d
Filter for the custom maps (#2163) 2020-03-15 21:10:59 +02:00
Jack Rainy
2cbc0e93e0
Ice is impassible for all except submarines (#2158)
* Ice is impassible for all except submarines

* Using "unique" property + simplified call of functions
2020-03-15 18:24:52 +02:00
Jack Rainy
97a9a0f08c
Display an amount of gold when buying the tile (#2127) 2020-03-12 08:32:29 +02:00
Federico Luongo
2a67294554
Snow, Ice, Atoll & Map Generation (#1909)
* Snow, Atoll & Ice

* Fix White Hexagon + Small NW refactor

* More Land in Continents #1886

* Atoll can spawn only on Coast

* Added new constants and turned Constant into an object

* Latitude and Longitude utility methods

* New MapGenerator steps

* New MapParameters & MapGenerator cleanup

* Added New Map option to MapEditor menu

* New parameters default values and limits

* archipelagos map type

* Translations & Atlas

* removing unneeded octave displacement

* Fix Archipelago

* Perlin noise parameters & no-elvis in TileMap

* Rebuilt Atlas

Co-authored-by: Eddh <remi.dufour@protonmail.com>
2020-03-11 11:39:37 +02:00
Jack Rainy
15098d877c
Translations refactoring (#2096)
* Rename "translationsByLanguage" folder

* Minor refactoring

* Generate Nations strings

* Use the nations strings while creating the translation files

* Clean up of Nations files

* Transfer existing translations

* Get rid of the nation's translated name

* Transfer just few nations' translations for languages without Nations_Language.json

* Clean up of not used greetings

* Correct marking of not translated strings
2020-03-10 10:17:05 +02:00