* 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.
* 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
* 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
* 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 [] []"
* 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.
* -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
* -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
* 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
* 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
* 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
* 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
* 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
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
* 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
* 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
* "[+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
* 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
* 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
* 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>
* 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>
* 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
* 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>
* 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>
* 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
* 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>
* 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>
* 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>
* 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>
* 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
