Commit Graph

9632 Commits

Author SHA1 Message Date
d2148d4ea5 Mitigate #10613 - remove a !! by splitting 'getImprovementToImprove' and using it as source of truth for the improvement to start working on, INSTEAD of counting on the fact that chooseImprovement returns that improvement.
Which it looks like it won't, if somehow the improvementInProgress is NOT in the list of potentialTileImprovements.

Only case I can think of is: You captured an enemy city with a civ--unique improvement in the middle of construction. So fixed that as well.
2023-11-28 23:55:03 +02:00
09dd8c61aa 4.9.3 4.9.3 2023-11-28 14:50:33 +02:00
6a8ce41f4f Version rollout (#10611)
* Bump version and create initial changelog entry

* Update French.properties (#10604)

* Update Latin.properties + question (#10589)

* Update Latin.properties

* Update Latin.properties

* Update Latin.properties

* Update Latin.properties

* Add a space at the end

* Replaced "passus" with "gressus".

* Added relationship translations

* Update Latin.properties

* Update Latin.properties

* Fixed an error

* Corrected an error

* Corrected an error 2

---------

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
Co-authored-by: Lesiakower <125187776+Lesiakower@users.noreply.github.com>
2023-11-28 14:44:37 +02:00
57fd00ad14 Add queuing functionality (#10609) 2023-11-28 14:37:34 +02:00
4b261a9257 Initial AutoPlay implementation (#10315)
* 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>
2023-11-28 14:37:21 +02:00
03698e47ef Add IHasUniques.era() (#10593)
* Update IHasUniques.kt

* Update IHasUniques.kt

* Update IConstruction.kt

* Update IHasUniques.kt

* Update CivInfoTransientCache.kt

* Update UnitUpgradeManager.kt

* Update WonderOverviewTab.kt

* Update IHasUniques.kt
2023-11-28 14:36:45 +02:00
7162011d26 Resolves #10599 - Cities you haven't bombarded with will auto-bombard at turn end 2023-11-28 14:31:43 +02:00
e872f5ade4 Resolves #10601 - Defeated (no units/cities) hotseat multiplayer no longer appears for turns ("player X ready") 2023-11-28 13:51:34 +02:00
c3216e96eb cleanup 2023-11-28 12:20:18 +02:00
9d411a16bc 4.9.2-patch5 4.9.2-patch5 2023-11-28 10:15:53 +00:00
3c24d6d3af Update Catalan.properties (#10579) 2023-11-28 12:15:39 +02:00
d0a4111d84 I think I found the conflict - checkout ref! 2023-11-28 12:14:56 +02:00
b4b73336b3 Fix typo (#10608) 2023-11-28 12:09:47 +02:00
20fa1d3f06 (CQ) Linting and comments on TileSetStrings and ImageAttempter (#10582)
* (CQ) Linting and comments on TileSetStrings and ImageAttempter

* (CQ) Linting and comments on TileSetStrings and ImageAttempter - some more
2023-11-28 12:07:54 +02:00
50ce8b30b6 Wait after PR merge, so the versioning can be done simply 2023-11-28 12:07:16 +02:00
e022eb803a Wait after PR merge, so the versioning can be done simply 2023-11-28 12:07:16 +02:00
48ede93bfa Wesnoth map import polished up (#10580) 2023-11-28 12:01:53 +02:00
208ad8a641 ALL TOGETHER NOW 2023-11-28 11:59:12 +02:00
bc935a310c 4.9.2-patch4 4.9.2-patch4 2023-11-28 09:58:25 +00:00
0af8cb60a5 Tag does not trigger rebuild - maybe now it will 2023-11-28 11:57:48 +02:00
4b597a3c9d 4.9.2-patch3 4.9.2-patch3 2023-11-28 09:53:21 +00:00
9a2c45d9e8 You know what let's just check out the second half 2023-11-28 11:52:45 +02:00
339815fa41 damn wrong filename 2023-11-28 11:52:24 +02:00
5437c68b4c City sounds again (#10590)
* Fix City ambience sounds stopping when switching to next/previous cities

* Fix City ambience sounds no longer fade in
2023-11-28 11:50:30 +02:00
f5d74ad129 whoops 2023-11-28 11:50:10 +02:00
eb50ea4403 Readymade didn't work, trying my own github script for PR merge 2023-11-28 11:48:55 +02:00
b0e67376c6 Merge pull request properly 2023-11-28 11:38:15 +02:00
dbdabbaede Use manual access token to merge PR 2023-11-28 11:36:15 +02:00
3cf710cc58 Try using git commit created by other people 2023-11-28 11:20:58 +02:00
84e1c03547 Added patch automation step! 2023-11-28 11:06:40 +02:00
18673b02b6 Added script to update versions on patch release 2023-11-26 19:06:24 +02:00
205296aab7 Nicer command display 2023-11-26 19:06:24 +02:00
7847237677 4.9.2-patch2 4.9.2-patch2 2023-11-26 18:27:19 +02:00
10b3d69dad Fixed isGoodTileToExplore() to check if there is no enemy in range (#10586) 2023-11-26 18:24:46 +02:00
09fdd8b8e2 Wrap INonPerpetualConstruction.requiredTech into function (#10585)
* Update IConstruction.kt

* Update Building.kt

* Update BaseUnit.kt

* Update BaseUnit.kt

* Update Building.kt

* Update IConstruction.kt

* Update IConstruction.kt

* Update IConstruction.kt

* Update CityStateFunctions.kt

* Update Building.kt

* Update IConstruction.kt

* Update IConstruction.kt

* Update BaseUnit.kt

* Update RulesetValidator.kt

* Update TechnologyDescriptions.kt

* Update CityStateDiplomacyTable.kt

* Update CityStateDiplomacyTable.kt
2023-11-26 08:48:09 +02:00
acfe8a3ad1 4.9.2-patch1 4.9.2-patch1 2023-11-26 08:15:29 +02:00
17a7465ba3 Fix founding cities removing city center tile improvement (#10584)
* Fix founding cities removing city center tile improvement

* Simplify since we know the tile
2023-11-26 08:08:14 +02:00
5396c41efc 4.9.2 4.9.2 2023-11-25 22:35:40 +02:00
962c6ab7cb Version rollout (#10578)
* Bump version and create initial changelog entry

* Update Polish.properties (#10556)

* Update Polish.properties

* Update Polish.properties

* Update Polish.properties

* Update Spanish.properties (#10555)

* Update French.properties (#10553)

* Update Italian.properties (#10552)

* Update Turkish.properties (#10549)

* Update Turkish.properties

Added new translations

* Update Turkish.properties

* Update Turkish.properties

* Update Turkish.properties

* Update Turkish.properties

* Update Malay.properties (#10548)

323 - 417

* Update Brazilian_Portuguese.properties (#10547)

---------

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: Lesiakower <125187776+Lesiakower@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: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: komandotayfa <53448093+komandotayfa@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>
2023-11-25 21:56:24 +02:00
e15b6cab76 Tweak Language Pickers to scroll the selected one into view when appropriate, and allow selection with letter keys (#10569) 2023-11-25 20:11:41 +02:00
b61c9de39e Comment unique (#10575)
* Comment Unique

* Comment Unique translations

* Comment Unique more descriptive documentation

* New languages
2023-11-25 20:11:30 +02:00
f1ceaa216a Get distance to nearest enemy rework (#10481)
* Initial refactor

* Moved checking if a tile has an enemy to a new method

* Rewrote getDistanceToEnemyUnit

* changed the position of the logic of checking if the enemy is still there

* Changed some of the other methods to use the ThreatManager getClosestEnemy()

* Added a new getTilesWithEnemyUnitsInDistance method

* Added a new getEnemyMilitaryUnitsInDistance method

* Converted a few lines to use ThreatManager

* Changed Air units to use threat manager

* Fixed tileWithEnemy error

* distanceToClosestEnemyTiles now clears at the start of every turn

* Added blank lines to end of ThreatManager.kt

* Renamed tilesInRange to tilesWithEnemyUnitsInRange

* Changed ArrayList return to a MutableList

* Removed ClosestEnemyTileData being a data class

* Improved commenting

* Improved commenting2

* getEnemyMilitaryUnitsInDistance now uses a flatMap and moved getDangerousTiles to threat manager

* Created a new helper method getEnemyUnitsOnTiles

* Renamed clearThreatData to clear

* Added shortcut if maxDist is less than or equal to distanceSearched

* Fixed distanceWithNoEnemies in getTilesWithEnemyUnitsInDistance

* Fixed notFoundDistance being higher than maxDistance when takeLargerValues is false

* Added some ThreatManager tests

* Added some more ThreatManager tests

* Removed visible map after use

* getTilesWithEnemyUnitsInDistance doesn't search distances <= tileData.distanceSearched (previously was <)

* Added 3 more tests

---------

Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
2023-11-25 20:11:10 +02:00
dc7f1f703a Sound cache preloader (#10558)
* A Preloader for sounds

* Change SoundPlayer.play to never switch threads on desktop, and limit retries, but mostly better comments
2023-11-25 20:10:24 +02:00
8c7fa24123 Fixed typo (#10572)
* Fixed typo

* Fixed typo

* Fixed typo

* Update 5-Miscellaneous-JSON-files.md
2023-11-25 20:08:51 +02:00
b8facadf7a Fix OpenAL error Windows Events after application ends (#10551)
* Move exitProcess to a better place

* Fix OpenAL error Windows Events after application ends

* Extensive commenting
2023-11-25 18:22:39 +02:00
8c0693c998 Latin reboot (#10573)
* Reboot Latin

* Reboot Latin - 002

* Reboot Latin - 003

* Reboot Latin - atlas
2023-11-25 18:22:23 +02:00
59dab8992f Fix City ambient sounds (#10574)
* Fix city ambient sound not pausing when desktop version is minimized

* Fix city ambient sounds not working from jar/apk
2023-11-25 18:08:19 +02:00
3ddeb874c7 Standardise using enum instead of string (#10571)
* Standardise using enum instead of string

* Standardise enum instead of string

* Standardise enum instead of string
2023-11-25 18:07:30 +02:00
d4cd102613 Fixed typo (#10568)
* Fixed typo

* Fixed typo
2023-11-24 16:17:04 +02:00
ba5e658c9e Standardise using enum instead of string (#10570)
* Standardise using enum instead of string

* Standardise enum instead of string
2023-11-24 16:16:49 +02:00