* 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.
* 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
* 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.
* 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
* 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>
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.
* 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
* 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
* 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>
* 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>
* 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>
