* -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
* Add fixes and localizations (#3234)
Added some translations needed and fixed some typos. Also shortened some phrases for more concise text.
* Update Italian.properties (#3235)
* Update Italian.properties
* Update Italian.properties
Co-authored-by: Rafael 'Fig Diamantino de Figueiredo <45023203+rafaeldfigueiredo@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
* 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
* Renamed some quests to better ones (Kill Camp -> Clear Barbarian Camp and Kill City State -> Conquer City State)
* Quests names are hardcoded in a enum class
* Quests.json translations automated
* 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
* parameterized "Culture cost of adopting new Policies reduced by [10]%" and "Each city founded increases culture cost of policies [33]% less than normal"
* removed old fix for abcense of "Mass Media" tech so mods can have this tech
* Update Indonesian.properties (#3168)
* Update German.properties #2 (#3169)
* Update German.properties
Minor tweaks and corrections, remove lots on unneccesary "\n", it just caused some weird formatting on computer as unciv sets breaks on in own already. Changed wording of tutorial quite a bit.
* Update German.properties
Changed and corrected the whole introduction / tutorial translations, deleted lots of unneccesary "\n" as UnCiv adds breaks on his own. Let some breaks in for a new sentence for better readability.
* More hungarian translations (#3171)
* More hungarian translations
* Fix some character
* Update Dutch.properties (#3170)
Added translations for diplomacy
Co-authored-by: Kensvin <63847755+Kensvin28@users.noreply.github.com>
Co-authored-by: Stefan <natrius@users.noreply.github.com>
Co-authored-by: Krisztian Papp <30371056+pehsa@users.noreply.github.com>
Co-authored-by: knoeier0 <71691687+knoeier0@users.noreply.github.com>
Windmill provides "+[10]% Production when constructing [Buildings]" (only regular buildings) instead of 10% to everything
Oxford University does not provide 50% science boost - it was a copying error from National College
* tweaked techs
Implemented "Reveals the entire map" unique ("Satellites" tech)
discovering a tech can trigger unique
"Remove Marsh" unlocked with "Masonry"
* 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
* Implement custom save locations for Android and Desktop
* Request write permission to save to external storage
* Fix race condition for custom saves/loads caused by autosaves
* Remove unnecessary WRITE_EXTERNAL_STORAGE permission for saving files
* Fix padding for custom save/load location buttons
* Use nullability checks as defined in coding style guide
* Use nullability checks as defined in coding style guide
* Use early return for readability
* Rename save/load completion callbacks for custom locations and implement error handling
* Major update german.properties
Straightened out the form of adress, its now the royal version ( i hope i did not miss anything), added missing translations, corrected lot of translations (i did not(!) look at #################### Lines from Tutorials #################### )
* Major update German.properties
Corrected the mistake and changed all "Felder" to "Kacheln"
* Update Indonesian.properties (#3133)
Updating some translations
* Solve Conflicts and Update Brazilian_Portuguese.properties (#3141)
* Update Brazilian_Portuguese.properties
I modified some translations of the menus and some constructions, and translate the Babylon
* Translate all Egyptian cities and remove unnecessaries "Requires translation!"
* Translate more cities and remove unnecessaries "Requires translation!"
* more updates
* a review on prepositions and update
Co-authored-by: AlexLuis <68296033+AlexLuis@users.noreply.github.com>
* more hungarian translation (#3146)
* Update Italian.properties (#3151)
* Update Italian.properties
* Update Italian.properties
* Update Japanese.properties (#3154)
Co-authored-by: Yunichi <65927826+Yunichie@users.noreply.github.com>
Co-authored-by: Lincoln V Schreiber <lincolnschreiber@gmail.com>
Co-authored-by: AlexLuis <68296033+AlexLuis@users.noreply.github.com>
Co-authored-by: Krisztian Papp <30371056+pehsa@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: paontv <57051667+paontv@users.noreply.github.com>
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
* fixed KotlinNullPointerException crash in chooseMilitaryUnit
random() is not to be used in predicate
* GodmodeCheckbox is not lockable and unchecked by default
* no great people actions if no movement points left
* unique "Can start an []-turn golden age" now has parameter and 8-turn golden ages will last 8 turns instead of 10
golden age can be started if unit is on own territory (even embarked)
* "Golden Age length increased by [50]%" - now has parameter
* tweaked changed fort and terrain defence bonuses
fort can be built on forest and jungle (vegetation will not be removed)
any open flat land gives 10% penalty
marsh gives 15% penalty
only top terrain counts, improvement bonus will be added to that
flatland + fort = 40%
hill + fort = 75%
hill = 25%
forest/jungle on flatland = 25%
forest/jungle on hill = 25%
forest on flat + fort = 75%
forest on hill + fort = 75%
forest on hill + citadel = 125%
fixed 20% penalty for attacking over river - will be displayed if unit is standing on the other side of river
"Amphibious" unique removes this penalty
* 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
* Update Italian.properties (#2942)
* Update Thai.properties (#2949)
Hmm can we change the current Thai font to the other. Maybe that would help fixing the current Thai text display problem
* Update Indonesian.properties (#2948)
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: NoNZeeZ <58921355+NoNZeeZ@users.noreply.github.com>
Co-authored-by: Kensvin <63847755+Kensvin28@users.noreply.github.com>
* 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
* Update Italian.properties (#2888)
* Update Persian_(Pinglish-DIN).properties (#2889)
Made some translations more accurate, Fixed a few mistakes and, Added some new translations.
* Update Persian_(Pinglish-UN).properties (#2890)
The same thing that I did with the PinglishDIN translations.
* Update Persian instructions.txt (#2891)
Updated the criteria
* Update Indonesian.properties (#2892)
* Update German.properties (#2899)
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: TheRNB <44290454+TheRNB@users.noreply.github.com>
Co-authored-by: Kensvin <63847755+Kensvin28@users.noreply.github.com>
Co-authored-by: scaphander <67830047+scaphander@users.noreply.github.com>
* Update Korean.properties (#2874)
Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
* Create Persian_PingilishDIN.properties (#2866)
This is the Persian translation for UnCiv, please note that since the Persian has its own alphabet (which is from right to left) I just used an alphabet derived from the DIN 31635 standard made by "Deutsches Institut für Normung"
* Create Persain_PinglishUN.properties (#2867)
This is a Persian translation for UnCiv, please note that since Persian has its own alphabet (which is written from right to left) I just used an alphabet derived from the ALA_LC standard made by "American Library Association - Library of Congress".
* Update Brazilian_Portuguese.properties (#2868)
Co-authored-by: TG <saud2410@naver.com>
Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
Co-authored-by: TheRNB <44290454+TheRNB@users.noreply.github.com>
Co-authored-by: Dalmolax <63485458+Dalmolax@users.noreply.github.com>
* Scout won't be built when research "Scientific Theory". Fix the word "Can only build water units in coastal cities".
* Fix the bugs when you delete all maps close button disappears and you can't go to main menu.
* Basictests don't check that Scout can't upgrade.
* If the unit is obsolete it will remove from construction queue.
* Basic spectator functionality.
Added as a separate nation with full visibility.
* Robots not allowed to spectate :(
* Allow multiple human spectators
* Multiple spectators allowed.
Fix crash when max players in map editor.
* At least one active (not spectator) human player needed
* - Invisible tiles vision for spectators.
- Minimum 1 active player (Human or AI) to start the game.
- temporary only 1 spectator in game
* Revert "At least one active (not spectator) human player needed"
This reverts commit d843bebe
* Add all tech to spectators for resource view
* Spectators couldn't be rolled out from "Random" civ
* Spectator is not a MajorCiv.
corrected random pick
* Small refactor
* No diplomacy button for Specators
* Add fixes from yair210 review.
* Update Japanese.properties (#2681)
* Update Japanese.properties
* Update Japanese.properties
* Update Japanese.properties
* Update Japanese.properties
* Update Japanese.properties
* Update Japanese.properties
* Update Spanish.properties (#2682)
I just checked some Grammar errors that capted my attention while playing and also translated some lines that I consider an Accurate translation
* Update Russian.properties (#2683)
* Update Russian.properties
New lines are translated
* Update Russian.properties
Translation issue closed
* Update Italian.properties (#2686)
Fix
Co-authored-by: paontv <57051667+paontv@users.noreply.github.com>
Co-authored-by: WhiteRoar <63148999+WhiteRoar@users.noreply.github.com>
Co-authored-by: Bada <64350251+BadaTheBada@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
