* Minor Quest/QuestManager linting
* Cache Quest and QuestName references and use them
* Nicer randomWeighted and fix UniqueType.ResourceWeighting
* Integrate @soggerr's #10739 - show tied leaders and your position if you aren't leading
* One more lint
* Bump version and create initial changelog entry
* Update French.properties (#11214)
* Update Italian.properties (#11211)
* Update Brazilian_Portuguese.properties (#11210)
* Update Indonesian.properties (#11209)
* Update Indonesian.properties
Fixed and added translation to some words.
* Update Indonesian.properties
* Update Indonesian.properties
* Added a Russian translation for the introductory text of Queen Elizabeth (#11206)
This is a translation close to the text. However, I have tried to keep the solemn style in translation, so there is a slight departure from the original.
---------
Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: Vitor Gabriel <59321138+Ranbut@users.noreply.github.com>
Co-authored-by: M792003 <158552928+M792003@users.noreply.github.com>
Co-authored-by: NoobTutorial <142553623+NoobTutorial@users.noreply.github.com>
* City buttons support right-click / long-press to enter CityScreen directly
* City r-click: Rename helper and UI tips
* City capitalization follows getCurrentTutorialTask precedent
* City capitalization change applied to existing translation keys
* Revert "City capitalization change applied to existing translation keys"
This reverts commit c3638a0daf.
* Revert "City capitalization follows getCurrentTutorialTask precedent"
This reverts commit b618f4cae3.
* City capitalization in new text follows getCurrentTutorialTask precedent
* Added escort button
* Added basic escort movement
* Improved escort movement
* Swapping breaks escorting
* Added stop escorting button
* Added link icon to unit
* getDistanceToTiles() now automatically includes escorting
* Multi-turn movement with different units works somewhat
* Escorting units persist to escort across saves
* Escorting units are only idle if their partner unit is idle as well
* Fixed multi-turn escort movement where one unit has more movement points left over
* Added basic tests
* Added a test for formation idle units
* Added some basic movement tests
* Added some canMoveTo tests
* getDistanceToTiles only caches when includeEscort is true
* added getDistanceToTiles test
* An entire commit to remove one line of white space just for you! And yes, there are no semi-colons;
* Added translations
* Added more stopEscorting() calls when the unit is removed
* Added extra comments and refactoring
* Refactored removeAllTilesNotInSet to use a mutableIterator
* Refactored code based on review
* Refactored removing tiles in PathsToTilesWithinTurn that aren't in another PathsToTilesWithinTurn
* Right-click external links to copy url
* Add hint about right-clicking links to UI Tips tutorial
* Add wiki link to about and centralize repo/wiki external link bases
* Mayan Long-Count unlock: Match translation template and existing translations to actual notification
* A TFW run adds another empty line at the end...
* Conditional for building in amount of cities
* fix order of operations
* Deprecate old require in amount cities uniques
* import
* Fix referring to the unique instead of the conditional
* Fix yield message
* I have no clue how this isn't imported, but I'mma assume this translates fine anyways
* Rename text for unique
* revert unique text
* Whoops
* Remove unnecessary puppet check
* Move additional description to it own function
* Split missing city text into its own function
* Move ToDo comment
* flip to be easier to read
* Move onlyAvailable rejections to its own function to be easier to work with
* Add in the word "of"
* Minor linting and fix folder-package mismatch
* Actually make AnimatedMenuPopup stay inside the stage in all directions (was done for bottom left only before)
* Proper keyboard bindings for AutoPlay and -menu
* Testing translations
* AutoPlay as widely used term
* Added getSpiesInCity method in EspionageManager
* Expanded stealing technology code
* Spies can now die and revive
* Added basic rigging elections
* Spies rigging elections can now be caught
* Added spy rank
* Players can now move spies to city-states
* Spies at a higher rank steal tech quicker
* EspionageAutomation now sends spies to city-states and to do counter intelligence
* Fixed some EspionageAutomation logic
* Fixed EspionageAutomation error
* Spy.location is now stored as a vector2
* Accounted for the only able to be one spy of a civ in each city
* Spies level up when successfully stealing tech.
* Increased tech steal rate by spy rank
* Increased influence gained by rigging elections
* Added a spy level cap
* Spies no longer get stuck on counter-intelligence action
* Spy automation no longer tries to rig elections in city states that it is at war with
* canMoveTo now checks if the city tile is visible
* Added espionage translations
* Changed automateSpySteal/Rig/Counter intelligence return types
* Simplifies automateSpies in EspionageAutomation
* Added blank lines before titles
* Improved spy being found and killed message phrasing
* Add modified nation descriptions
Original descriptions reworded and a bit shortened.
* Fix Greece description
* Add modified nation descriptions (vanilla)
* Improvements to Nation descriptions
Fixes and improvements by Yairm
* Improvements to Nations descriptions (vanilla)
Fixes and improvements by Yairm
* Improve startIntroPart2 for all nations
Also add fixes/improvements by Yairm.
* Improve startIntroPart2 for all nations (vanilla)
Also add fixes/improvements by Yairm.
* Experimental pathfinding - still not good enough for main branch
* Fixed strange pathfinding and impassible tiles
* Fixed weirdest bug in the history of weird bugs - remove() on an object did not remove the object
* Avoid damaging and enemy tiles for new pathfinding
* Add option for activating experimental movement
* Allow almost any mod zip download source
* Linting
* Add basic "Release page section" link capability, more linting
* Refactor: Move Github to logic
* Refactor: Split Github into files
* Refactor: centralizing all API knowledge
* Try bumping detekt version to fix false complaint
* Attempt to trick detekt to not complain about `it`
* Better overload-ambiguity-solving + detekt-compatible SAM use
* Add unique to allow for generalized great generals
* Don't add compatibility for rulesets with conditional generals
* Add to rulesets
* add in pre Kotlin 9 parenthesis
* whoops missed a parenthesis
* I guess pre Kotlin 9 parenthesis was unnecessary, whoops
* Add back old variables to clone function
* Move the list of all potential generals to Ruleset
* Move list of unit construction rejections to IConstruction
* flip !any{} to none{}
* Fix imports
* Typo
* Add Gold Growth and Production Growth Focus
New Manual Focus doesn't reallocate population
* Use Stat Names (and symbols) for focus
* Missing reassign code
* Clean up table for efficiency
* Table v2
* minor translation changes
* COMPATIBILITY
* v3 table
* Minor fixups
* Add Gold Growth and Production Growth Focus
New Manual Focus doesn't reallocate population
* Use Stat Names (and symbols) for focus
* Missing reassign code
* Clean up table for efficiency
* Table v2
* minor translation changes
* COMPATIBILITY
* v3 table
* Minor fixups
* Update to master code
Remove duplicating Food yield multiply
* Revert Compatibility Version
---------
Co-authored-by: itanasi <44038014+itanasi@users.noreply.github.com>
initialize() calls useImmersiveMode() internally, which would override the system ui visibility we manually set, leading to setting effectively being ignored on startup
Also, we can use LibGDX's builting function, which is more future-proof :)
* Bump version and create initial changelog entry
* Update Spanish.properties (#10780)
* Even more translations of Malay.properties (#10778)
I plan to finish the UI section this week. Honestly, going through and skimming a bit I've seen things I've never seen in game.
* Update Brazilian_Portuguese.properties (#10775)
* Some German translations (#10772)
* Update French.properties (#10768)
* Update Italian.properties (#10767)
---------
Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: Caballero Arepa <78449553+Caballero-Arepa@users.noreply.github.com>
Co-authored-by: Mikhail <151419244+MetaFBMI@users.noreply.github.com>
Co-authored-by: Vitor Gabriel <59321138+Ranbut@users.noreply.github.com>
Co-authored-by: SomeTroglodyte <63000004+SomeTroglodyte@users.noreply.github.com>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
* Added a new AutoPlay until end button
* Added the new AutoPlay until victory setting to translation
* Reverted some comment fixes to hopefully not have a merge conflict
* Mod compatibility - update declarations
* Mod compatibility - logic and UI changes
* Mod compatibility - flag some invalid use patterns
* RulesetValidator - lint until Studio shuts up
* Fix isBaseRuleset test in ModRequires validation
---------
Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
* Add Gold Growth and Production Growth Focus
New Manual Focus doesn't reallocate population
* Use Stat Names (and symbols) for focus
* Missing reassign code
* Clean up table for efficiency
* Table v2
* minor translation changes
* COMPATIBILITY
* v3 table
* Minor fixups
* Refactor Battle damage shadowed Label into reusable WidgetGroup
* Make Politics Overview "Grid header" fixed and some linting
* Add a Legend popup explaining line colors in the Politics Overview Diagram: Click inside
* Missing translation template
* Final decision on background didn't make it in properly
* Remove unused png - those are now in the Construction atlas
* Smaller background image
* Color and shadow choices
* Redo atlas to include both 10505 and this
* Add another confirmation when buying a religious unit in a city that doesn't follow a religion founded by the city's civ.
* There's other stuff that can be purchased with Faith. Better to use UniqueType.Religious unit I guess.
* Add string to template.properties
* One more space to make unit tests happy
* Better template.properties
* Reinsert trailing space
* Introduce Constants entry for "Cancel"
* Redo ConfirmBuyPopup
* Dev console command to tweak religion pressures
* Translation templates and one test
---------
Co-authored-by: SomeTroglodyte <63000004+SomeTroglodyte@users.noreply.github.com>
* Change per-City GPP points math and separate breakdown (producer w/ source doc) from aggregates (consumer ignoring source)
* Change CityScreen GPP list to not do aggregation itself, but show a breakdown on click
* Change "birth" city for GPP to a ***weighted*** random - no Great Mufties from cities not generating any Mufty points!
* Nicer signature for getGreatPersonPointsBreakdown
* Minor warnings linting and template for Sweden's bonus in the breakdown Popup
* Added a frigate cannon fire volley sound with crashing
* Changed the frigate and ship of the line to use shipCannonVolley.mp3
* Added proper credits
* Renamed "Volly" to "Volley"
* Start on road connect feature.
* Rough UI and tile highlighting
- Highlight visible tiles for selected unit red
-- Maybe change this to all explored tiles
- Move action firing inside WorldMapHolder
- Set begin and end tiles
* Serialize Vector2 instead of Tile
* Add road icon
* Much better UI handling
- Tile highlights go away after choosing a tile
- Added restrictions to allowed tile destination choices.
- Explored
- Land
- Passable
- Added two-tap button
* Refactor part of `onTileClicked` for readability
* Band-aid fix null pointer error
* Add RoadConnection icon
* Tentatively working connect road feature
* AStar search implementation
* AStar connect road automation
* Fix worker getting stuck in city tiles
* Heuristic should be between tiles
* Add heuristic to road connect, remove maxSize limit
* Fix predicates
* Cancel automation when worker is force moved off path
* Change valid/highlighted tiles to be friendly or neutral
* Put log back the way it was
* Fix behavior when kicked off path
* Worker no longer wastes movement points
* Workers will progress multiple tiles at a time towards the next build destination.
* Respect civs with certain tiles as roads
* Refractor ForceAutomateRoadConnection -> AutomateRoadConnection
* Connect road UI button only shows for units with UniqueType.BuildImprovements
* Connect road UI button only show when road tech is unlocked
* Add wagon sound
* Fix destination icon, add KeyboardBinding to 'c'
* UI highlight connect road path tiles orange
* Downsample wagon.mp3
* Apply migration patch, idiomatic sequence processing
* Add notifications on success and failure
* Extract movement cost function to be reusable
* Refactor road pathfinding into MapPathing.kt
* Make pathing calls more general for future extendability
* Add UI road connection tile path preview
* Keep road path highlighting when routing to a city tile
* Adjust road pathing cost function
* Path includes pillaged roads
* Repair pillaged roads along path
* Valid road path tiles now include all passable tiles (open borders)
* Add an "UI tips" civilopedia article
* Improve UI Tips article
Credits to @SomeTroglodyte and Yairm
* More improvements to UI Tips article
Credits to SomeTroglodyte
* Mention Railroad production bonus in the Civilopedia
* Railroad production bonus mention in the Civilopedia - Vainilla
* Fix little style error
* Fix another mistake
omg
* Brackets
* Brackets
* AutoPlay initial hack
* Removed extra changes
* Added canceling AutoPlay and its own button
* Victory screen showing up stops AutoPlay
* Removed AutomateTurn for the spectator
* Right Clicking AutoPlay Button starts AutoPlay immediately
* Renamed NextTurnMenu to AutoPlayMenu
* AutoPlay can now only begin on the players turn
* Added specific unit actions AutoPlay
* AutoPlay stops on VictoryScreen and GreatPersonPickerScreen
* AutoPlay now stops when loading a new game
* Hovering the mouse over the AutoPlayStatusButton now stops AutoPlay
* Removed temporary right click NextTurnButton functionality
* Removed multi-turn AutoPlay from multiplayer games
* Loading a multiplayer game now stops AutoPlay
* AutoPlayStatusButton persists over reloading WorldScreen
* Victory popup now stops autoplay
* AutoPlay now automatically picks great person
* Full AutoPlay now captures cities
* Added settings.isAutoPlaying and fixed bug with closing game in the middle of AutoPlaying a turn
* AutoPlay now correctly stops when a victory screen is shown
* AutoPlay now automates city constructions without autoAssignCityProduction being on
* Reordered NextTurnAction
* Removed extra condition for displaying AutoPlay text on next turn button
* Moved AutoPlay settings to new tab
* Changed AutoPlay slider
* Refactored Settings to have AutoPlay to be in a new subclass
* Added an show AutoPlay button setting, commented out unimplemented settings
* Opening the exit game window stops autoPlay
* Made cyclopedia entry
* Added translations
* AutoPlayStatusButton now ends with a new line
* Commented out extra code and removed extra import statements
* Fixed UncivSlider Change
* Fixed merge conflicts
* Settlers no longer stuck in endless loops wanting to found cities on tiles they can't reach @tuvus
* Support for Leader voices (#10395)
* Prepare Leader Voices: Framework
* Leader Voices: Hooks and corresponding text field comments
* Leader Voices: wiki
* Leader Voices: oops, comments
* Decouple voice play calls to make global modification easier
* Move voices to own folder and give them a separate volume setting
* Oops, template needed too
* Oops, wiki needed too
* Resolved#10366 - City centers don't provide resources you don't have tech to extract
* Add a TriggerUponDiscoveringTile unique type (#10523)
* Add a TriggerUponDiscoveringTile unique type
* Add a check for trigger presence
* Add gain stat modified by speed and improvement speed by filter uniques (#10443)
* Add gain stat modified by speed and improvement speed by filter uniques
* Fix rulesets
* Remove nonfunctional leftover resource text
* Reword improvement unqiue as suggested
* Add the SellBuilding Unique (#10514)
* Restored the SellBuilding Unique
* Rephrased SellBuilding unique
* Version rollout (#10530)
* Bump version and create initial changelog entry
* Update Brazilian_Portuguese.properties (#10528)
* Update French.properties (#10524)
* Update Italian.properties (#10522)
* Update Polish.properties (#10521)
* Update Polish.properties
* Added Fastlane_short_description
* Update Malay.properties (#10520)
Translated line 33 to line 325.
Not at all finished.
This time though I didn't mess up.
---------
Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: Vitor Gabriel <59321138+Ranbut@users.noreply.github.com>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: Lesiakower <125187776+Lesiakower@users.noreply.github.com>
Co-authored-by: Mikhail <151419244+MetaFBMI@users.noreply.github.com>
* Better performance for 'best tile to found city' (minimized canReach calls) @tuvus
* 4.9.0
* [Translation] Add back "general" unit types (#10526)
* Add back "general" unit types
These entries have been removed from translation files, making them untranslated in-game (in Civilopedia articles)
* Revert changes in template.properties
* Fix missing unit type translations
Fix by @SomeTroglodyte
* Changed some parts of GameSettings back to master.
* Changed right clicking to call startAutoPlay instead of setting it itself
* Fixed some !isHuman() conditions to also include full AutoPlay and refactored some other AutoPlay code
---------
Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
Co-authored-by: SomeTroglodyte <63000004+SomeTroglodyte@users.noreply.github.com>
Co-authored-by: Sergey <serdav74@inbox.ru>
Co-authored-by: SeventhM <127357473+SeventhM@users.noreply.github.com>
Co-authored-by: PLynx <pawelrys2011@gmail.com>
Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: Vitor Gabriel <59321138+Ranbut@users.noreply.github.com>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: Lesiakower <125187776+Lesiakower@users.noreply.github.com>
Co-authored-by: Mikhail <151419244+MetaFBMI@users.noreply.github.com>
* Rescue Bosnian.properties
* Rename and revert
* Let's minimize diff size for completionPercentages.properties from now on
* One generate translations run on Bosnian
* Add the Flag
* Add the LocaleCode
* Fix illegally tranzlahtedd placeholders
* Simplify MapOverlayToggleButton signature and let the instances use individually moddable images
* Gimp sources of new images (all from existing attributions)
* New images and atlas
* Add gain stat modified by speed and improvement speed by filter uniques
* Fix rulesets
* Remove nonfunctional leftover resource text
* Reword improvement unqiue as suggested
* Prepare Leader Voices: Framework
* Leader Voices: Hooks and corresponding text field comments
* Leader Voices: wiki
* Leader Voices: oops, comments
* Decouple voice play calls to make global modification easier
* Move voices to own folder and give them a separate volume setting
* Oops, template needed too
* Oops, wiki needed too
* UncivGame is a pure class file again, GUI split off
* Purify GameSettings step 1 - non-multiplayer nested classes
* Purify GameSettings step 2 - multiplayer nested classes
* Purify GameParameters - BaseRuleset to own file
* Rework WindowState to centralize minimum/maximum treatment
* Rename MultiplayerTurnNotifierDesktop to UncivWindowListener
* Clarifications on what the WindowListener actually does (and now the attention-getting does something on non-Windows too)
* Drop AndroidTvLauncher - unused
* Additional memory info on Android CrashScreen
* Refactor getModsAndBaseRuleset - reduce clones and put base first
* Add Permanent audiovisual Mods to CrashScreen report
* Add a secret Debug option to intentionally crash Unciv
* Make "Secret" debug OptionsPopup page available on Android w/o physical keyboard
* Add AndroidTvLauncher back in
---------
Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
* River yields moddable and Civilopedia entry
* Improve text and better fresh water explanations
* Map editor exclusion as Unique, for River and previously hardcoded Improvements
* Map editor brush to Civilopedia link, starting locations cleaned
* Some SeventhM input applied
* Reword River/Lakes/Oasis civilopediaText and comments again
* Allow typing Y and N in file names in Linux custom save file dialog
* Fix default custom save location suggestion on X11
* Minor linting
* Allow clean reactivation of custom buttons after cancelling the file chooser
* User-Cancel support on Android and non-X11 desktop
* Block custom save for online multiplayer games
* Fix X11 custom save remembering location
* Fix X11 custom save "Save" button enabling, forbid potentially bad names
* Add overwrite confirmation to X11 custom save
* Redefine how local saving of online multiplayer games is blocked
* Bump version and create initial changelog entry
* Update Catalan.properties (#10310)
* Fix Manufactory name (#10306)
* Fix Manufactory name
Like, why on earth was it called the same as the factory??
* Update Spanish.properties
* Update Spanish.properties
* Update Japanese.properties (#10269)
* Update Japanese.properties
* Update Japanese.properties
---------
Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: Joan Josep <juanjo.ng.83@gmail.com>
Co-authored-by: Caballero Arepa <78449553+Caballero-Arepa@users.noreply.github.com>
Co-authored-by: North Field <56919414+Harukin1030@users.noreply.github.com>
* Fix font "symbols" not showing
* Move Fonts.kt to sub-package
* Re-sort imports
* Move top-level constants to prepare split
* Split Fonts.kt each existing class to its own file
* Split off FontRulesetIcons
* Linting and comments
* Try to respect actual font layout, so fontSizeMultiplier works for ruleset icons too
* Replace font-based nation symbol in top bar with statically sized actor
* Reuse getReadonlyPixmap in extractPixmapFromTextureRegion
* Tweak topbar selected civ vertical align to be more pleasing to the human eye
* FasterUIDevelopment missing implementation of FontMetricsCommon
* Address hardcoded pixel coordinates comment
* Readability and comment cleanup
* More readability changes
* Bump version and create initial changelog entry
* Update Spanish.properties (#10201)
I'm not sure about using an '@' for indicating both grammatical genres.
I mean, the current use is not wrong, but it bothers me that something's genres are feminine/masculine and the article used is the opposite.
On the other side, I don't know if it looks clean, nice or professional to use these variants, not only the '@', but the '/a' as well.
But it really calms my mind.
* Add required Russian translations (#10200)
* Update Bulgarian.properties (#10193)
* Update Italian.properties (#10191)
* Update Italian.properties
* Update Italian.properties
* Update German translation (#10189)
* Update Brazilian_Portuguese.properties (#10188)
* Update Polish.properties (#10186)
* Update Polish.properties
* Update Polish.properties
* Update French.properties (#10185)
* Update Simplified_Chinese.properties (#10184)
6365 rows. The value is wrong. "Units heal 10 health per turn in enemy territory or neutral land" should translate to "在异国领土和无主的领土上，每回合会恢复10点生命值" and not "在异国领土和无主的领土上，每回合会恢复15点生命值"。
---------
Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: Caballero Arepa <78449553+Caballero-Arepa@users.noreply.github.com>
Co-authored-by: Nicolas Flamme <nclsf87@gmail.com>
Co-authored-by: Dob <100198047+dobval@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: mape6 <mape6@posteo.de>
Co-authored-by: Vitor Gabriel <59321138+Ranbut@users.noreply.github.com>
Co-authored-by: Lesiakower <125187776+Lesiakower@users.noreply.github.com>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
Co-authored-by: liweishu <44702553+liweishu@users.noreply.github.com>
* Display Pixel Unit Art in Civilopedia
* Pixel Unit Art in Civilopedia - Setting UI
* Change FormattedLine.extraImage sizing to apply to longer coordinate
* Pixel Unit Art in Civilopedia - better centering using 'crop to content'
* Giant refactoring - get rid of old religion style actions!!!
* Added special promotion to replace Great Mosque of Djenne ability
* removed double promotion added my mistake
* Added AI recognition of cities with bonus spread religion charges
* Added "disallowed for pantheon" filtering to new unit actions
* merge unit action changes with religion action changes
* Use new invokeUnitAction function for simplicity
* revert inquisitor unique change used for tests
* separate modifier side effects from old-style side effects
* Use canUSe shorthand for clarity
* Bump version and create initial changelog entry
* Update Dutch.properties (#10174)
* Update Turkish.properties (#10171)
* Update Turkish.properties
Almost fully translated up to line 950 with very few lines untranslated to that point.
(do let me know if I did anything wrong I never used github before)
(but I did read the translating text so I did not change things like [amount])
* Update Turkish.properties
Changed a few things and translated up to 1000~
* Update Turkish.properties
* Update Turkish.properties
* Update Turkish.properties
* Update Simplified_Chinese (#10168)
* Update Spanish.properties (#10166)
* Update French.properties (#10165)
* Update Polish.properties (#10164)
* Update Italian.properties (#10163)
* Update Brazilian_Portuguese.properties (#10162)
* Update Brazilian_Portuguese.properties
* Update Brazilian_Portuguese.properties
---------
Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: Lena Bullens <95299589+LenaBullens@users.noreply.github.com>
Co-authored-by: TheFighter <95092927+The-Fighter@users.noreply.github.com>
Co-authored-by: chr_56 <30681738+chr56@users.noreply.github.com>
Co-authored-by: Caballero Arepa <78449553+Caballero-Arepa@users.noreply.github.com>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
Co-authored-by: Lesiakower <125187776+Lesiakower@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: Vitor Gabriel <59321138+Ranbut@users.noreply.github.com>
* Added notifications to Civs that didn't have tiles hit by nuke
* Changed notifications based on if the nuke fails to detonate
* Moved nuke notifications above unit hit notification
* Added translations for new messages
* Moved a line of code back to preserve original order
* Changed notification messages
* Avoid the detekt false positive for typed lambda `it` and its comment
* Fix regression of what-is-a-garrison (8952)
* Initial implementation of "Status" column
* "Status" column gets a header icon
* Improved handling of "Nothing" construction
* Suppress "All" entries when you have only one city
* Global Construction Blacklist
* Reviews
* Reviews - missed renames
* Override DoF displayed on Politics table with defensive pact when applicable and added CYAN color to table and diagram.
* City-state alliances now show as CYAN in the politics table
* Fixed Civ getting two notifications of canceling their defensive pact when attacking.
* Added Defensive Pact related warnings to the Declare War popup
* Improved the warning to not include Civs that are already at war with the aggressor
* Improved the warning to not include Civs that are already at war with the aggressor
* Added defensive pact related warning translations
* Refactored removeDefensivePacts
* DeclareWarButton text now uses arrayListOf<String> and changed the for loop to a while loop
* Extracted the DeclareWarButton text to a new method.
* Some preparation refactoring
* Some preparation API extension
* Initial constructions context menu
* More CityConstructions API clarification
* Templates and KeyBindings
* Fix quirks and prettify highlighting issues
* Added "Jump To Destination" UnitActionButton for moving unit
This commit also fixes the situation where the player is unable to open the Show More unit actions list while the unit is moving and out of moves for the turn. Previously, clicking Show More in this scenario would jump to the next active unit.
* Added Jump To Destination to translation file
* Changed Jump to Destination to Show Unit Destination, updated icon, credits
* Added an Any Civ starting location brush.
* Fixed the Remove starting locations brush from being too long.
* Civs without a specific starting location given to them now use the spectator starting locations before finding a free tile.
* Removed spectator from civilizations to give a starting location.
* Added comments
* Removed accidentally added import statements.
* Added new display text to template.properties
* Replaced an inline when statement with an if statement.
* Fixed not having a space after a translation.
* Moved finding a starting location to a new function.
* Fixed GameStarter.getCivStartingLocation to return a null if it couldn't find a tile to start on.
* Bump version and create initial changelog entry
* Update Simplified_Chinese (#9938)
* Update Italian.properties (Defensive Pacts) (#9924)
* Update French.properties (#9922)
* Update Spanish.properties (#9921)
* Update Spanish.properties
* Reword
* Add missing equal sign
Co-authored-by: TommasoPetrolito <tommasouni@gmail.com>
---------
Co-authored-by: TommasoPetrolito <tommasouni@gmail.com>
* Update Brazilian_Portuguese.properties (#9919)
* Update Brazilian_Portuguese.properties
* Update Brazilian_Portuguese.properties
* Update Korean.properties (#9948)
New unciv & github user here.
I found Korean translation stopped on February and thought this would help a little bit.
It still has untranslated lines and some may be incorrect, but better than never? :)
---------
Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: chr_56 <30681738+chr56@users.noreply.github.com>
Co-authored-by: TommasoPetrolito <tommasouni@gmail.com>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
Co-authored-by: Caballero Arepa <78449553+Caballero-Arepa@users.noreply.github.com>
Co-authored-by: Vitor Gabriel <59321138+Ranbut@users.noreply.github.com>
Co-authored-by: DoosanBears82 <142787703+DoosanBears82@users.noreply.github.com>
* Added owner civ and city to the ImprovementPicker screen with translation
* Switched tileOwnerText from var to val
* Changed unowned tile message and city name link to city screen
* Victory Screen Illustrations page
* Fix WorldReligion victory disclosing random player count
* Victory screen icons and Victory types get their separately moddable path
* Merge fix and nicer wiki text
* VictoryScreenIllustrations debug run
* Fix Image sizing and some polishing
* Fix white squares on some Victory Screen Cultural milestone buttons
* Add option to enable/disable unit upgrades for automated units
* Add automated unit upgrade String to template.properties
* Change check for isPlayer to isHuman when performing upgrades for automated units
* Added warning to improvement picker buttons for improvements out of range for population to work
City population can not work tiles farther than 3 tiles from the city center. The improvement picker did not warn that improvements providing stat increases would not be workable, so the improvement might be worthless. The ImprovementPicker screen will now warn on the improvement button if the improvement provides a stat increase, but is farther than 3 tiles from the owning city center. The warning happens for all improvements that increase the tile stats, including Luxury and Strategic resource improvements. The warning does not disallow building the improvement.
* Changed methods for finding positive stat increases and added translation for warning text
* Condensed conditional for warning text in ImprovementPicker
* Defensive Pacts can now be offered.
* Signing a defensive pact now makes the Civs join all defensive wars. Any future defensive wars will force the other civ to join.
* Removed Popup Alert Defensive Pact.
* Defensive pact and Research pact now are only on the trade screen.
* AI now offers defensive pacts.
* Added AI evaluating sending and receiving Defensive Pact offers.
* Reverted some temporary changes
* Reduced the chance an AI offers a defensive pact
* Starting an offensive war now cancels all Defensive Pacts with other civilisations.
* Removed extra requirements before an AI will sign or offer a defensive pact.
* Added Defensive Pacts to the Civilopedia.
* Fixed the AI counter offering with treaties.
* Fixed a test using the old method of checking if a civ is at war.
* Fixed a previous refactor error.
* Deleted commented out Research Agreement button code.
* Fixed some spelling errors and remnant debugging code.
* Removed signing a defensive pact brings both Civ's into each others previous defensive wars.
* Refactored setFriendshipBasedModifier to look better
* Starting an offensive war now removes the defensive pact form both sides.
* Reverted changes to DiplomaticStatus
* Removed extra technology check to sign a defensive pact.
* Removed DiplomacyManager.isAtWar() completely.
* Moved setting defensivePact flags from TradeLogic.transferTrade() to DiplomacyManager.signDefensivePact.
* Changed diplomatic modifiers related to Defensive Pacts to be less extreme.
* Fixed canceling Defensive Pacts when declaring war and notifying other Civs.
* Updated the Defensive Pact entry in the Civilopedia and fixed some spelling.
* Fixed Defensive Pact behavior while attacking and defending.
* Changed a variable to a more readable name.
* Improved readability of setFriendshipBasedModifier().
* Moved the important onWarDeclared functionality to their own functions.
* Added a notification for the attacking Civ when a Civ joins war through a Defensive Pact.
* Refactored setDefensivePactBasedModifier() to be more readable.
* Increased DeclinedDefensivePact time.
* Deleted old commented code that removed the research agreement button.
* Fixed having reverting changes errors in UnitMovementTests.
* Refactored breaking treaties when declaring war.
* Removed unnecessary semicolons.
* Treat remaining untyped Uniques in default rulesets, make unit test catch them
* Change untyped filtering Uniques check to Validation by inclusion in GlobalUniques instead of UniqueType.AircraftMarker
* Wiki for untyped filtering Uniques
* Re-include the "Who knows" of Future Tech on the Tech picker
* Overhaul NUKE code to behave closer to original
* Separate garrison protection of Bomb Shelter to its own Unique
* Reduce code duplication: getNukeBlastRadius
* Disallow nuking unknown civs
* Don't show Nuke attack table when the Nuke has just been selected
* World map display of nuke blast radius and friendly fire
* Bump version and create initial changelog entry
* Update Simplified_Chinese.properties (#9835)
* more Persian UN Translation (#9832)
* Update Persian_(Pinglish-UN).properties
Added and fixed some of the translations till line 1039.
* Update Persian_(Pinglish-UN).properties
- Fixed a few till 1039.
- Added and fixed some from 1039 till 1254.
* Update Persian_(Pinglish-UN).properties
Added and fixed some till 5000
* Update Persian_(Pinglish-UN).properties
* Update Persian_(Pinglish-UN).properties
* Update Dutch.properties (#9816)
* Update Dutch.properties
* Update Dutch.properties
* Update Dutch.properties
* Update Dutch.properties
* Updated Brazilian_Portuguese.properties (#9813)
---------
Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: AutumnPizazz <114050365+AutumnPizazz@users.noreply.github.com>
Co-authored-by: Ilia <81512402+ilia-abbasi@users.noreply.github.com>
Co-authored-by: Lena Bullens <95299589+LenaBullens@users.noreply.github.com>
Co-authored-by: Vitor Gabriel <59321138+Ranbut@users.noreply.github.com>
Due to the upcoming Google Play deadline (see https://support.google.com/googleplay/android-developer/answer/11926878)
We're upgrading the target SDK and build tools for Unciv.
What this means for you, is that you need to download BOTH the new Android SDK AND the new build tools to compile to Android
If you're only doing Desktop development, this will not affect you
In Android Studio:
- Double-click shift (for search)
- "SDK manager"
- Go to SDK platforms tab, select Android 13 (Tiramisu) - this will lead to an SDK download
- Go to the SDK Tools tab
- Click 'show package details' at bottom-right
- Click 33.0.2 - this will lead to a Build Tools download
* Split off some UniqueType helper classes, make regions work in Android Studio and linting
* Fix wrong UniqueType.Stats target
* Fix two Pantheon uniques
* BeliefType a little nicer to read
* More linting
* Implement UniqueTarget validation
* Validation of UniqueTypes allowed as conditionals
* Linting and give two votes to UN owner
* Allow human player to abstain, show UN 2 votes
* More info on voting results
* AI won't vote for hated enemies
* Improve PopupAlert handling
* Translation templates
* One missing template
* Fix buildings not triggering, golden age stat updates, and units not triggering
* Forgot import, whoops
* uodate resources and city connection when removing a building
* Move building triggers to function, added unit notification to translations
* Quick edits without android studio sucks
* Add unitActionModifier check back to hasTriggerConditional
---------
Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
* Try to allow chained promotion picking
* Reorg PromotionPickerScreen into own package
* Draft for new PromotionTree
* Change PromotionPickerScreen to use new tree (picking still not done)
* Finish new PromotionPickerScreen - code
* Finish new PromotionPickerScreen - assets and linting
* Finish new PromotionPickerScreen - polish positioning and lines
* Finish new PromotionPickerScreen - fix sound
* Finish new PromotionPickerScreen - little optimization
* Finish new PromotionPickerScreen - emphasize line along path
* Finish new PromotionPickerScreen - merge fix
* Finish new PromotionPickerScreen - address comments
* Finish new PromotionPickerScreen - fix sort and update wiki
* Improve Load game error label readability
* Fix threading on load game screen
* Miscellaneous tweaks
* Compatibility with Mods using trailing dashes on Windows
* Spies now occasionally steal technologies
* Updated the UI so it doesn't show a turn counter when that cannot be provided
* Implemented changes discussed in reveiw comments
* Renamed variable
---------
Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
* Tighten mod check severity and selectivity for unit-producing triggered Uniques
* Prettify display of mod check results by suppressing dupes and hiding conditionals from tr()
* Extra confirmation to play with errors, colors, improved handling of mod checkboxes
* Tweaks to improved mod checking in new game
* Dynamic mod categories from online query
* Move Working string to Constants
* Move Mod categories to json
* Move Mod categories to json - UI
* Move Mod categories to json - initial json
* Popups get the ability to scroll only the content without the buttons
* Centralize LoadingPopup
* Split non-WorldScreenMenuPopup classes off from that file
* Linting
* Nicer music playback dialog
* Translation templates
* Unit upgrade tooltip in overview
* Unit upgrade tooltip in action table
* Unit upgrade tooltip in action table - colored Key
* Unit upgrade in Overview - reselect
* Fix merge problems and FormattedLine color markup ability
* Relax MarkupRenderer.render lines parameter type
* Skin has a getColor shortcut - use it
* Unit overview upgrade icons now open a menu instead of upgrading immediately
* Unit Overview upgrade - "Mid" buttons
* Unit Overview upgrade - reorg
* ci: improved detekt configuration
it still needs some work but it's getting there
* detekt: separated errors from warnings
Detekt doesn't currently have a mechanism for failing only on specific issues
workaround suggested by the maintainer of Detekt
* rebased on master
* fix: resolve ExplicitItLambdaParameter
* fix: fix last star import
* Bump version and create initial changelog entry
* Update Indonesian.properties (#9371)
* Update Brazilian_Portuguese.properties (#9352)
* Update Russian.properties (#9351)
There was a letter missing in the word
---------
Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: t <73392607+tsaqibfs@users.noreply.github.com>
Co-authored-by: Vitor Gabriel <59321138+Ranbut@users.noreply.github.com>
Co-authored-by: iliademid21 <132929464+iliademid21@users.noreply.github.com>
* Add `May not annex cities` unique, following same behaviour as Civ5 Venice. Hopefully this time I won't need to re-install windows.
* Add `May not annex cities` unique, following same behaviour as Civ5 Venice. Hopefully this time I won't need to re-install windows.
* Fix raze button being unavailable in city screen
* Fixed raze button being available in city screen, as per civ5
* Corrected indentation
* mayAnnex instead of canAnnex, hasUnique rather than getMatchingUniques
* AI will follow rules
* Replaced getMatchingUniques with hasUnique, for real this time
* Bump version and create initial changelog entry
* update Simplified_Chinese translation (#9289)
Co-authored-by: chr_56 <_>
* update Japanese.properties (#9286)
* Update Japanese.properties
* Update Japanese.properties
* Update Spanish.properties (#9285)
* Update Indonesian.properties (#9283)
* Update Brazilian_Portuguese.properties (#9277)
* Update Polish.properties (#9276)
* Update French.properties (#9274)
Small translation improvements:
- Remove a few past tenses which are unnecessary in French (in the context, past participle alone is enough, especially in notifications)
- More precise translation for "the defence of [cityName]", to refer to the unit garrisoned in the attacked city ("la défense" doesn't sound well)
---------
Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: chr_56 <30681738+chr56@users.noreply.github.com>
Co-authored-by: namazulake <130637228+namazulake@users.noreply.github.com>
Co-authored-by: Caballero Arepa <78449553+Caballero-Arepa@users.noreply.github.com>
Co-authored-by: t <73392607+tsaqibfs@users.noreply.github.com>
Co-authored-by: Vitor Gabriel <59321138+Ranbut@users.noreply.github.com>
Co-authored-by: Lesiakower <125187776+Lesiakower@users.noreply.github.com>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
* Bump version and create initial changelog entry
* Update Indonesian.properties (#9255)
Now, Indonesian translation is complete
* Fixing some typos in the German translation (#9236)
* Fixing some typos in the German translation
* Fixed another typo
* Fixed a huge amount of typos
Ran over it with a hunspell. Found a few other mistakes in the process.
* Fixed mistranslations in quotes
Fixed one translation that seemed to be made with a software translator.
Replaced a translation of a translation with the original quote.
---------
Co-authored-by: Birk Birkner <birkner@bbirkner.de>
* Fix typo in Polish.properties (#9233)
* Update Turkish.properties (#9227)
* Update Turkish.properties
* Add files via upload
* Update Spanish.properties (#9206)
* Update Spanish.properties
* Update Spanish.properties
---------
Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: t <73392607+tsaqibfs@users.noreply.github.com>
Co-authored-by: Knirps1 <52383078+Knirps1@users.noreply.github.com>
Co-authored-by: Birk Birkner <birkner@bbirkner.de>
Co-authored-by: bread <77245194+breadtard@users.noreply.github.com>
Co-authored-by: Enesb852 <130827350+Enesb852@users.noreply.github.com>
Co-authored-by: Caballero Arepa <78449553+Caballero-Arepa@users.noreply.github.com>
* Bump version and create initial changelog entry
* Updated Brazilian_Portuguese.properties (#9223)
* Updated Brazilian_Portuguese.properties
* Updated Brazilian_Portuguese.properties
* Update Russian localization (#9222)
* Update Russian localization
Just in case, for the "X attacked our unit Y", I have chosen to make it a bit less precise (not directly stating that "Y" is player's unit) because due to language's specifics it's practically impossible with this translation scheme to not make grammar error.
* fix
should have used copy-paste
* Update Polish.properties (#9215)
* Update Italian.properties (#9209)
---------
Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: Vitor Gabriel <59321138+Ranbut@users.noreply.github.com>
Co-authored-by: Alex <64156241+Alex-1000@users.noreply.github.com>
Co-authored-by: Lesiakower <125187776+Lesiakower@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
* Allow "selecting" notifications
* NotificationsScroll remembers position relative to topRight
* NotificationsScroll tries to scroll selection into view
* Fix notification selection and scroll-into-view
* User option to control enlarging selected notifications
* Post-merge missed changes
* Move, flip and reword "Enlarge" option
* Show a highlight for the tile that seems most suitable to found a city (can be turned off in settings)
* Don't allow players to cheat through highlighting suggested map tiles for city founding.
* Don't pass whether cheating is allowed, but just decide based on whether civ is AI or not. That way it will also work correctly for automated settlers (by human players). Also show it in the first round, because why not. If the map generator puts us on a shitty starting tile, why not tell the player?
* Address comments
* Address comments
* Resource stockpiles!
* toString extension including sign (+/-)
* Trigger uniques to provide/consume stockpiled resources
* Fixed build
* Display 'per turn' for stockpiled resources that are consumed per turn
* "Costs [amount] [resource]" works!
* Stockpile unique costs are displayed in construction button
* Added unique to prevert certain resources from being traded
* VictoryScreen with Charts by WhoIsJohannes
* VictoryScreen with Charts by WhoIsJohannes - atlas
* VictoryScreen with Charts by WhoIsJohannes - lost icon attribution
* Bump version and create initial changelog entry
* Update for Russian localization (#9068)
Translation for most of lines of text. There are some left as it's impossible to translate those correctly without context, which is not provided in a nice way, so only way to understand their meaning is finding them in-game (Which I couldn't do, unfortunately.)
* Update Spanish.properties (#9066)
* Update Filipino.properties (#9062)
* Update Filipino.properties
* Update Filipino.properties
* Update Filipino.properties
* Update Filipino.properties
* Update Filipino.properties
* Update Italian.properties (#9061)
* Update Brazilian_Portuguese.properties (#9060)
* Update Bulgarian.properties (#9053)
* Update German translation (#9049)
* Update French.properties (#9046)
* Fixed russian translation errors
---------
Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: Alex <64156241+Alex-1000@users.noreply.github.com>
Co-authored-by: Caballero Arepa <78449553+Caballero-Arepa@users.noreply.github.com>
Co-authored-by: Shann Aurelle Ripalda <shannaurelleg@gmail.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: Vitor Gabriel <59321138+Ranbut@users.noreply.github.com>
Co-authored-by: Bogomil Stefanov <101423783+vynaaa@users.noreply.github.com>
Co-authored-by: mape6 <mape6@posteo.de>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
* Displaying science overflow
* The amount of science from research agreement notification
* Check tech progress at the start of a turn
* Fixed exception
* Better remainingScienceToTech calculation
* Multiple technologies can be researched in one turn
* Small improvements
* Notification of the end of a trade in 3 and 1 turns
* Notification about the loss of an alliance is not shown if the city state is captured.
* Shortened
