Commit Graph

6800 Commits

Author SHA1 Message Date
153a90623c Add new map types (#10695)
* fractal map type

* repeat create fractal until enough land

* small changes and add map types Lakes and Small Continents

* fix for removing land at edges of hexagonal maps

* readability
2023-12-13 22:37:27 +02:00
d2dde08824 Allow arbitrary victory types for the purposes of policies (#10716) 2023-12-13 22:36:37 +02:00
a24f9d7716 Civilopedia key bindings (#10723)
* Move CivilopediaImageGetters object to own file

* Keyboard bindings for Civilopedia

* Better default key choices

* Change default Key Binding Tab visibility to ON
2023-12-13 22:36:29 +02:00
aba77b8350 Fix 'Sleep Until Healed' action missing (#10718)
Sleep until healed check unit injured logic fix
2023-12-13 22:36:20 +02:00
64a455152a Great Person Points - Rounding changes, Breakdown UI (#10714)
* 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
2023-12-13 22:36:12 +02:00
8b5c358904 Update TradeEvaluation.kt (#10713) 2023-12-13 22:36:02 +02:00
16893ced68 Added check for belief.type (#10711)
* Added check for belief.type

* Removed check for BeliefType.None

Not needed if check beforehand checks for it

* Update RulesetValidator.kt

* Update Belief.kt

* Update Belief.kt
2023-12-13 22:35:51 +02:00
9c4ba059ca (Tool) Tiny helper to load MP saves (from issues for debugging) as hotseat (#10610)
* Linting

* Another button on the "secret" debug tab: Load MP as hotseat

* Remove password wall from Debug Options (but not the Ctrl-Shift gate)
2023-12-13 22:35:38 +02:00
6d948e97ff Fix ended Leader Voice not cleared and resumed on un-pause (#10724) 2023-12-13 22:35:17 +02:00
5f22172e70 Version rollout (#10704)
* Bump version and create initial changelog entry

* Update Latin.properties (#10700)

* Update Spanish.properties (#10692)

* Update Polish.properties (#10687)

* Update Polish.properties

* Fix a typo

* Update Russian (#10685)

* Update Russian.properties

Partial translation

* Update Russian.properties

* Update Turkish.properties (#10683)

* Update Turkish.properties

Added new translations

* Update Turkish.properties

* Update Turkish.properties

* Update Turkish.properties

* Update Turkish.properties

* Update Turkish.properties

Added fastline translate

* Update Turkish.properties

* Update French.properties (#10681)

* Update Italian.properties (#10680)

* Update Brazilian_Portuguese.properties (#10679)

---------

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: Anoant <143289571+Anoant@users.noreply.github.com>
Co-authored-by: komandotayfa <53448093+komandotayfa@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>
2023-12-10 23:08:21 +02:00
06f46a44d8 Allow conditionals for unit actions (#10682) 2023-12-10 22:59:54 +02:00
69ce160ff9 Added 'relevant city' to conditionals, taking the city from the relevant tile where no city provided directly (#10684) 2023-12-10 22:59:45 +02:00
b3c7143e36 Fix connect road button for when auto unit cycle is turned on (#10696) 2023-12-10 22:59:35 +02:00
87b02e49cd Add resource support to stat gamespeed conditional (#10677)
* Tweaked the stat gamespeed conditional

Tweaked the stat gamespeed conditional to accept the resources

* Changed some names

* Fixed a double limit bug
2023-12-10 22:59:22 +02:00
e9752292eb Add null check for connect road cross-version saves (#10699)
* Add null checks to fix #10691

* Issue reference unnecessary
2023-12-10 22:59:01 +02:00
49ddbe4982 Resolved #10703 - Captured military units trigger a notification for the captured unit's civ 2023-12-10 22:48:51 +02:00
200b764b05 Resolved #10676 - Citezenship policy grants worker even without having cities 2023-12-10 22:37:35 +02:00
d213c3d78f Resolved #10697 - default white color for city-state types 2023-12-10 22:21:31 +02:00
0625cb7087 Resolved #10698 - Fixed city-state type coloring 2023-12-10 22:19:54 +02:00
2ae5a018de Added initial pathfinding tests 2023-12-08 14:48:48 +02:00
cce678800f Fixed pillage tests 2023-12-08 14:10:56 +02:00
c483c4329a Console: Added 'unit setmovement' command 2023-12-08 13:45:57 +02:00
ee8f8a3c89 Fixed compilation error 2023-12-08 13:31:34 +02:00
aa1b5af19d standardized exploration actions 2023-12-08 13:30:10 +02:00
fad06b3aec standardized pillage, sleep actions 2023-12-08 13:24:21 +02:00
840f3c2093 standardized automate action 2023-12-08 12:23:00 +02:00
2ffec93ae8 invokeUnitAction will take the first *actionable* action, instead of the first one that exists, which may not be actionable 2023-12-08 12:17:07 +02:00
40283078d4 "Can instantly construct a [improvementFilter] improvement" works with improvementFilter 2023-12-07 23:09:05 +02:00
2fbe227285 Fixed work boat automation 2023-12-07 23:01:55 +02:00
1723cc36f1 chore: city settle action readability 2023-12-07 22:49:23 +02:00
d4f53bf813 Standardized 'add in capital' action 2023-12-07 22:41:27 +02:00
612545eec5 Standardized 'spread religion' / 'remove heresy' actions 2023-12-07 19:56:34 +02:00
c4310fb0f9 Standardized 'spread religion' / 'remove heresy' actions 2023-12-07 19:54:46 +02:00
8f049f45f1 Standardized 'create improvement' uniques - need to remember to deprecate the water improvements! 2023-12-07 19:47:45 +02:00
7211c04595 Version rollout (#10678)
* Bump version and create initial changelog entry

* Update Spanish.properties (#10675)

* Update Italian.properties (#10673)

* Update French.properties (#10669)

* Update Polish.properties (#10668)

* Update Dutch.properties (#10666)

* Update Dutch.properties

* Update Dutch.properties

* Update Italian.properties

* Update Russian.properties

* Update German.properties

* Update Swedish.properties

* Update Ukrainian.properties

* Update Brazilian_Portuguese.properties

* Update Catalan.properties

* Update Czech.properties

* Update Filipino.properties

* Update Catalan.properties (#10662)

* Update Brazilian_Portuguese.properties (#10661)

---------

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: Caballero Arepa <78449553+Caballero-Arepa@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@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: Lena Bullens <95299589+LenaBullens@users.noreply.github.com>
Co-authored-by: Joan Josep <juanjo.ng.83@gmail.com>
Co-authored-by: Vitor Gabriel <59321138+Ranbut@users.noreply.github.com>
2023-12-07 10:13:59 +02:00
530a537d46 Standardised and fixed deprecration warning (#10672)
* Standardised and fixed deprecration warning

* fixed typo

* standardiswd

* lower cased "as of"
2023-12-07 10:09:42 +02:00
d15c3da0e0 Fix not getting unique unit from tile based free unit trigger (#10665) 2023-12-07 10:09:11 +02:00
8363078371 Connect roads automation (#10631)
* 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)
2023-12-07 09:15:12 +02:00
be2cbbf133 Pass-through exclude and filterUniques, respectively (#10649)
* Update BuildingDescriptions.kt

* Update BaseUnitDescriptions.kt

* Update DescriptionHelpers.kt

* Update BuildingDescriptions.kt

* Update DescriptionHelpers.kt
2023-12-07 09:14:33 +02:00
47e6b788af Add TechManager.isObsolete(unit) (#10659)
* Update TechManager.kt

* Update CityStateFunctions.kt
2023-12-04 20:26:39 +02:00
8a03f9df12 Rename BaseUnit.techsAtWhichNoLongerAvailable() (#10663)
* Update BaseUnit.kt

* Update BaseUnit.kt

* Update RulesetValidator.kt

* Update BaseUnit.kt
2023-12-04 20:26:15 +02:00
7e869a3616 Version rollout (#10658)
* Bump version and create initial changelog entry

* Update Simplified Chinese (#10652)

* Update Latin.properties (#10642)

* Update Latin.properties

* Update Latin.properties

* Update Brazilian_Portuguese.properties (#10641)

* Update Spanish.properties (#10639)

* Update Spanish.properties

* Update Spanish.properties

* Update Spanish.properties

* Update Polish.properties (#10636)

* Update Polish.properties

* Update Polish.properties

* Update French.properties (#10635)

* Update Italian.properties (#10634)

---------

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: chr_56 <30681738+chr56@users.noreply.github.com>
Co-authored-by: Lesiakower <125187776+Lesiakower@users.noreply.github.com>
Co-authored-by: Vitor Gabriel <59321138+Ranbut@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>
2023-12-03 22:26:28 +02:00
155498dc43 Wrap BaseUnit.obsoleteTech into function (#10648)
* Update BaseUnit.kt

* Update BaseUnit.kt

* Update TechManager.kt

* Update BaseUnit.kt

* Update RulesetValidator.kt

* Update BasicTests.kt
2023-12-03 22:26:16 +02:00
f8315de414 Add trigger from building improvements and trigger conditional for building improvements (#10644)
* Add trigger from building improvements and trigger conditional for building improvements

* Classic case of the forgotten import

* Fix improvement triggerables saying they aren't allowed and move the trigger to its own function

* include the tile in the civ trigger

* Update core/src/com/unciv/models/ruleset/unique/UniqueType.kt

---------

Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
2023-12-03 22:16:31 +02:00
c142d1508c Add iHasUniques.techColumn() (#10595)
* Update IHasUniques.kt

* Update IHasUniques.kt

* Update IConstruction.kt

* Update IHasUniques.kt

* Update CivInfoTransientCache.kt

* Update UnitUpgradeManager.kt

* Update WonderOverviewTab.kt

* Update IHasUniques.kt

* Update IHasUniques.kt

* Update Ruleset.kt

* Update IHasUniques.kt

* Update IHasUniques.kt

* Update IHasUniques.kt

* Update IHasUniques.kt
2023-12-03 22:14:28 +02:00
b9dd32597d Fixed trading with city-state through notifications (#10645)
* NotificationActions DiplomacyAction no longer allows trading with city-states

* Added a comment
2023-12-03 22:13:30 +02:00
96dcd584cf Dev Console: Lint, crash fix, add Stat (#10656)
* Console: linting

* Console: Commands can control message Color

* Console: `civ add gold -1`

* Console: Typo
2023-12-03 22:12:44 +02:00
5061b29197 Notification for "Policy branch unlocked" clickable (#10655)
* Ruleset-validate some Unique amounts to be positive

* Add TechAction for tech gained from Ruins

* Allow PolicyPickerScreen to highlight a Policy

* Add the 'PolicyAction' NotificationAction

* Use the new PolicyAction
2023-12-03 22:12:26 +02:00
1f47fff05d Add iHasUniques.requiredTechs (#10587)
* Update IHasUniques.kt

* Update IHasUniques.kt

* Update IConstruction.kt

* Update IHasUniques.kt
2023-12-02 22:56:00 +02:00
7fae32c595 Add iHasUniques.availableInEra() (#10594)
* Update IHasUniques.kt

* Update IHasUniques.kt

* Update IConstruction.kt

* Update IHasUniques.kt

* Update CivInfoTransientCache.kt

* Update UnitUpgradeManager.kt

* Update WonderOverviewTab.kt

* Update IHasUniques.kt

* Update IHasUniques.kt

* Update CityStateFunctions.kt

* Update CityStateFunctions.kt

* Update IHasUniques.kt

* Update CityStateFunctions.kt

* Update CityStateFunctions.kt

* Update CityStateFunctions.kt

* Update CityStateFunctions.kt
2023-12-02 22:54:52 +02:00