* Fix some problems (wouldnt merge lol) (#4256)
* many new strings translated (#4255)
* Update Italian.properties (#4251)
typo
* Update Korean.properties (#4250)
* Update Korean.properties
* Update Korean.properties
* Update Korean.properties
* Update Korean.properties
* Update Korean.properties
* Update Korean.properties
* Update Spanish.properties (#4248)
* Russian Translation (#4244)
Translated new lines and fixed typo
* Update Italian.properties (#4240)
* Update German.properties (#4263)
* Update German.properties
* Update German.properties
* add edits (#4261)
This was just some additions. There are random apostrophes that end up quoting large chunks of text until a new apostrophe is found. I don't know if this can be a problem for the technical part but for now, is just a minor pain when translating because of lack of auto-complete.
* Revert "add edits (#4261)" (#4264)
This reverts commit 980ca313fa.
Co-authored-by: Miraç <56484801+logicminimal@users.noreply.github.com>
Co-authored-by: stoupa007 <60326342+stoupa007@users.noreply.github.com>
Co-authored-by: end <72604018+laok233@users.noreply.github.com>
Co-authored-by: TG <saud2410@naver.com>
Co-authored-by: ArchDuque-Pancake <78449553+ArchDuque-Pancake@users.noreply.github.com>
Co-authored-by: sockybob <44141246+sockybob@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: MartinP <77325495+Mape6@users.noreply.github.com>
Co-authored-by: Rafael 'Fig' Diamantino de Figueiredo <45023203+rafaeldfigueiredo@users.noreply.github.com>
* Generalized building of improvements
* Readded support for the deprecated unique "Can build improvements on tiles"
* Small code quality changes
* Implemented requested chagnes
* Added the addPopulation() and setPopulation() functions to add population to cities and automatically reassign them
* Added the Telecommunications tech
* Added the CN tower
* Implemented Bomb Shelter
* Added icons for new buildings
* Implemented requsted changes
* 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.
* Reordered units
Consistently ordered units based on, in decreasing priority:
- Tech tree column
- Height in tech tree column
* Added Nuclear Fusion technology and GDR
* Fixed open terrain bonus working in rough terrain
Fixed#4139 - The open terrain combat bonus no longer works in rough
terrain.
Deprecated "Open terrain" and "Rough terrain" uniques and undeprecated
"rough" property of terrains.
* Minor simplification
* Replaced "rough" with "Rough terrain" unique
* Empty commit to re-run the build checks
* 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
* Corrected building construction costs
Full changelog:
(Changes marked with a "!" deviate from the surrounding pattern)
Lighthouse 100 -> 75 (!)
Great Lighthouse 250 -> 185 (!)
Temple 120 -> 100
Burial Tomb 120 -> 100
Mud Pyramid Mosque 120 -> 100
Market 120 -> 100
Bazaar 120 -> 100
Mint 120 -> 100
Aqueduct 120 -> 100
The Oracle 300 -> 250
Petra 300 -> 250
Great Wall 300 -> 250
Monastery 160 -> 120
Workshop 160 -> 120
Forge 160 -> 120
Hagia Sophia 400 -> 300
Chichen Itza 400 -> 300
Machu Picchu 400 -> 300
Harbor 200 -> 120 (!)
University 200 -> 160
Wat 200 -> 160
Castle 200 -> 160
Mughal Fort 200 -> 150 (!)
Armory 200 -> 160
Angkor Wat 500 -> 400
Alhambra 500 -> 400
Notre Dame 500 -> 400
Observatory 250 -> 200
Opera House 250 -> 200
Bank 250 -> 200
Satrap's Court 250 -> 200
Hanse 250 -> 200
Theatre 250 -> 200
Sistine Chapel 625 -> 500
Forbidden Palace 625 -> 500
L. Tower of Pisa 625 -> 500
Himeji Castle 625 -> 500
Seaport 300 -> 250
Windmill 300 -> 250
Taj Mahal 750 -> 625
Porcelain Tower 750 -> 625
Museum 360 -> 300
Public School 360 -> 300
Arsenal 360 -> 300
Military Academy 360 -> 300
Louvre 920 -> 750
Big Ben 920 -> 750
Brandenburg Gate 920 -> 750
Hospital 500 -> 360
Stock Exchange 500 -> 360
Eiffel Tower 1250 -> 1060
Statue of Liberty 1250 -> 1060
Kremlin 1250 -> 625 (!)
Neuschwanstein 1250 -> 1060
Nuclear Plant 750 -> 500
Solar Plant 750 -> 500
Sydney Opera House 2000 -> 1250
Manhattan Project 2000 -> 750 (!)
Apollo Program 1500 -> 750 (!)
* Corrected Hanging Gardens
10 food -> 6 food.
Now provides a free Garden.
* Corrected Statue of Liberty
Now provides a free social policy.
* Corrected Angkor Wat
Now unlocked with Education instead of Chivalry.
* Corrected Cristo Redentor
Now unlocked with Plastics instead of Flight.
* Corrected Kremlin
No longer gives 12 city strength (this was removed in G&K).
* Corrected Manhattan Project
Now unlocked with Atomic Theory instead of Nuclear Fission".
This does buff nuclear missiles quite a bit, since you no longer need
Nuclear Fission, but that's only because the last part of the tech tree
is very incomplete, and provides nuclear missiles too early. We need to
start correcting it somewhere.
* Corrected Leaning Tower of Pisa
Now provides +25% great person generation in all cities.
* Corrected Kremlin some more
Now unlocked with Metallurgy instead of Railroad.
* Fixed Arsenal production cost correction
It is now actually 300, as was stated in the previous changelog.
* Reordered many buildings
Reordered many buildings to conform to the tech tree order.
In order of priority:
left to right, top to bottom, buildings to national wonders to wonders.
* Corrected production cost for Colossus
Colossus was wrongly ordered in the json file, so its production cost
was unknowingly changed from 300 to 250 (this was not noted in the
previous changelog), however, it should be even lower: 185. This commit
corrects this.
tl;dr 250 -> 185
* Corrected Hermitage
Now unlocked with Architecture instead of Archaeology.
* Corrected National Treasury
Now unlocked with Guilds instead of Currency.
* Reverted incorrect corrections
Kremlin:
Provides 12 city strength again.
Statue of Liberty:
No longer provides a free social policy.
* did some Turkish translations (#4175)
i mostly did some polidhing in translations and added translations to much of simpler stuff that needed translations, but the civilopedia and civilizations are mostly not done, also i couldnt figure out how to fix typos and other stuff in mining
* French translation: fix typos and translate some (#4167)
* French translation: fix typos and translate some
* French translation: Fix typo and correct mistake
* Update Russian.properties (#4166)
* Update Russian.properties
* Update Russian.properties
* Update Italian.properties (#4164)
* Update Italian.properties
* Update Italian.properties
* Update Czech.properties (#4183)
* Update Russian.properties (#4182)
Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
Co-authored-by: Miraç <56484801+logicminimal@users.noreply.github.com>
Co-authored-by: Mayeul Cantan <mayeul.cantan@gmail.com>
Co-authored-by: sockybob <44141246+sockybob@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: jahodovykolac <79529669+jahodovykolac@users.noreply.github.com>
* 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
* Updated Tradition branch to G&K
* Small performance boost for calcualting maintenance; fix crash on next turn
* Fixed a bug where maintenance-free buildings would still cost maintenance
* Simplified some code
* I am unable to read
* Fixed a few broken uniques, including #4109
* Implemented requested changes
* Updated Liberty branch to G&K, improved modularity of uniques
* Updated meritocracy to only affect non-occupied cities
* Implemented requsted changes
* Updated some unit obsoletions
* Added a missing unit upgrade
* Added some missing commas in units.json
* Replaced Military Base icon with a simpler one
The original had a bit too much detail for the size at which it is
shown.
* Enabled Arsenal and added a new Armory icon
The old icon for Armory was much more appropriate for Arsenal, so I
added a new icon for Armory instead.
* Enabled Military Base and added an icon for it
* Enabled Petra and added an icon for it
* Enabled Composite Bowman and added an icon for it
* Enabled Mobile SAM and added an icon for it
* Enabled Jet Fighter
* Made Machine Gun upgrade to Mechanized Infantry
* Removed "Will be added in G&K" comments
Since we are now targeting G&K, these comments are no longer required.
* Fixed Aluminum/Aluminium inconsistencies
* 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
* * 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
* 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
* 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.
