Commit Graph

7060 Commits

Author SHA1 Message Date
9d4f710a17 Fix loop when improvement is unbuildable and removements feature (#11334) 2024-03-19 23:53:08 +02:00
62ce65ec1a Resolved #11339 - Fixed ruleset-dependant building filter activating *when initializing ruleset* 2024-03-19 23:52:34 +02:00
cf0ea815d4 Resolved #11333 - Fixed endless loop when unit tries to reach a tile it can pillage, but can't 2024-03-19 23:35:58 +02:00
e04e1b8732 Resolved #11340 - rare crash on city-state diplomatic relationship update 2024-03-19 23:20:05 +02:00
2b066fa749 Version rollout (#11327)
* Bump version and create initial changelog entry

* Update Russian.properties (#11324)

* Update Russian.properties

* Update Russian.properties

* Update Russian.properties

* Update Spanish.properties (#11322)

* Update Norwegian.properties (#11317)

* Update Norwegian.properties

Added more translations

* Update Norwegian.properties

Fixed translations with missing placeholders.

* Turkish translation (#11316)

* Update Brazilian_Portuguese.properties (#11315)

* Update French.properties (#11314)

* Update Indonesian.properties (#11312)

* Update Indonesian.properties

Added and fixed the translation.

* Update Indonesian.properties

* Update Indonesian.properties

* Update Indonesian.properties

* Update Indonesian.properties

---------

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: Muxomor <69667099+Muxomor@users.noreply.github.com>
Co-authored-by: Caballero Arepa <78449553+Caballero-Arepa@users.noreply.github.com>
Co-authored-by: Floxudoxu <67422605+Floxudoxu@users.noreply.github.com>
Co-authored-by: ygz213 <77006222+ygz213@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: M792003 <158552928+M792003@users.noreply.github.com>
2024-03-17 23:27:36 +02:00
1431e3928c Fixed error message of ConditionalBuilding (#11279)
* Fixed error message of ConditionalBuilding

* Added new error messages in the translation template

* Removed old error message

* Add space at the end
2024-03-17 23:13:11 +02:00
928f0df01f Added multi filter support for BuildingFilter !! (#11319)
* Fixed policies do not grant production bonus to wonders

* Added multi-filter and tech filter for buildingFilter

* Rectification of the uniques of monument to the gods and marbles

* Fixed mod checker issued warnings regarding the techFilter in Unit and Building Filters.

* Edit Unique-parameters.md

* Undo 'Fixed policies do not grant production bonus to Wonders
2024-03-17 23:12:40 +02:00
91f87fec9f Allow improvements that don't need removal to build (#11299)
* Fix improvements that remove features only not checking for all terrains

* Allow improvements that don't need removal to build without improving resource

* spot the missing import

* Add in tests

* typo

* Assert Forest is still there
2024-03-17 23:12:24 +02:00
3af0d2c3b3 Resolves #9988 - modded units can construct improvements on impassible tiles 2024-03-17 08:54:22 +02:00
ce22f13c6f Version rollout (#11311)
* Bump version and create initial changelog entry

* Translated a bit (#11309)

* Update Brazilian_Portuguese.properties (#11306)

* Update Italian.properties (#11303)

* Update Indonesian.properties (#11302)

* Update Indonesian.properties

Added and fixed the translation.

* Update Indonesian.properties

* Update Indonesian.properties

* Update Russian.properties (#11301)

* Update Russian.properties

* Update Russian.properties

* Update Russian.properties

* Update Russian.properties

---------

Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>

---------

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: ygz213 <77006222+ygz213@users.noreply.github.com>
Co-authored-by: Vitor Gabriel <59321138+Ranbut@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: M792003 <158552928+M792003@users.noreply.github.com>
Co-authored-by: Muxomor <69667099+Muxomor@users.noreply.github.com>
2024-03-15 11:50:00 +02:00
c6058cdf73 Melee Escort Attacking Fix (#11310)
* Added a test

* Fixed melee units attack moving into tiles that the escorting unit can't move to

* Added tests

* Update core/src/com/unciv/logic/battle/TargetHelper.kt

---------

Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
2024-03-15 11:30:37 +02:00
bf047cf546 New ActionModifiers to enable Stats and Minimum Movement (#11291)
* Add variable Movement Cost

* Add new unique and support code
Modification invalidates the CanTransform
Still has debug

* Make UnitActionStatCost unique syntax
Remove debug code
Improve documentation

* Change text so we can add stockpiles later

* Rework into UnitActionModifier

* Clarifying comments

* rename

* remove bad imports
block if no City for Unit

* Add validation check to other UnitAction Uniques

* add requires and all movement
rework requirement check

* Simplify Transform code

* More efficiency. Add to TriggerUnique

* Allow by default Transform to use all movement

* Add variable Movement Cost

* Add new unique and support code
Modification invalidates the CanTransform
Still has debug

* Make UnitActionStatCost unique syntax
Remove debug code
Improve documentation

* Change text so we can add stockpiles later

* Rework into UnitActionModifier

* Clarifying comments

* rename

* remove bad imports
block if no City for Unit

* Add validation check to other UnitAction Uniques

* add requires and all movement
rework requirement check

* Simplify Transform code

* More efficiency. Add to TriggerUnique

* Allow by default Transform to use all movement

* Code cleanup

* Add variable Movement Cost

* Add new unique and support code
Modification invalidates the CanTransform
Still has debug

* Make UnitActionStatCost unique syntax
Remove debug code
Improve documentation

* Change text so we can add stockpiles later

* Rework into UnitActionModifier

* Clarifying comments

* rename

* remove bad imports
block if no City for Unit

* Add validation check to other UnitAction Uniques

* add requires and all movement
rework requirement check

* Simplify Transform code

* More efficiency. Add to TriggerUnique

* Allow by default Transform to use all movement

* Rework into UnitActionModifier

* remove bad imports
block if no City for Unit

* Code cleanup
2024-03-15 11:29:18 +02:00
0042549003 Fixed group natural wonders only spawning in single tile 2024-03-15 11:19:04 +02:00
16f506cdd6 Fixed crash entering trade from overview on other player's turn
When entering trade from overview when other player's turn (multiplayer), no longer takes "current player" as trade partner, instead takes "viewing civ"
2024-03-15 11:02:34 +02:00
307b717006 Fix visual bug in event when more than one trigger is activated by a choice 2024-03-15 10:52:23 +02:00
ba9b81569f Resolved #11174 - Workers cannot repair improvements in enemy territory, thus avoiding repair-pillage exploit 2024-03-14 21:01:19 +02:00
83829a40da Resolved #11307 - zero-cost constructions no longer cause automation crash 2024-03-14 20:48:23 +02:00
0f3ff99d1f Revert "Worker automation takes city focus and civ personality into account"
This reverts commit a9595549bc.
2024-03-14 12:29:34 +02:00
78ab65addf Version rollout (#11300)
* Bump version and create initial changelog entry

* Update Simplified_Chinese.properties (#11298)

* Update Simplified_Chinese.properties

Correct the mistranslation of the Great Mosque of Djenne and provide translations for some newly added sentences.

* Update Simplified_Chinese.properties

* Update French.properties (#11295)

* Update German translation (#11294)

* Update German translation

* Update German translation

* Update hungarian translation file (#11292)

* Update Brazilian_Portuguese.properties (#11288)

* Update Indonesian.properties (#11285)

* Update Indonesian.properties

Added and fixed translation.

* Update Indonesian.properties

* Update Indonesian.properties

* Update Indonesian.properties

* Update Indonesian.properties

* Update Indonesian.properties

* Update Indonesian.properties

* Update Italian.properties (#11284)

---------

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: AutumnPizazz <114050365+AutumnPizazz@users.noreply.github.com>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
Co-authored-by: mape6 <mape6@posteo.de>
Co-authored-by: Krisztian Papp <30371056+pehsa@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: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
2024-03-13 23:25:35 +02:00
b60dabc089 Allow resources from follower beliefs (#11252)
* Allow resources from follower beliefs

* incorporate suggestions
2024-03-13 23:19:18 +02:00
fc1e701c7f Add the unfiltered version of new era unique (#11255)
* Added the unfiltered version of new era unique

* Changed some strings according to yairm suggestions
2024-03-13 23:13:11 +02:00
e9c3350ec5 Expand CanOnlyBeBuiltInCertainCities to include Units and convert to use Conditionals (#11274)
* Remove Transform requirement checks

* Add back in requirement for OnlyAvailable
New BuildableOnly unique

* Instead of a new unique, expand CanOnlyBeBuiltInCertainCities to instead take conditionals

* Rename to notMetRejections and copy to BaseUnit
Add CanOnlyBeBuiltInSpecificCities to constructionRejectionReasonType

* Setup CanOnlyBeBuiltInCertainCities as depreciated (renamed CanOnlyBeBuiltInCertainCities_dep)

* Redirect Depreciation

* Quick Camel Case rename

* Function renaming and moving Unique to general Construction Uniques

* spelling

* Move Unique. Update Error message

* version
2024-03-13 23:12:10 +02:00
1542b92e63 Resolved #11289 - Free buildings granted properly when era-free cities also granted 2024-03-13 23:11:39 +02:00
2294b7a6b3 Resolved #11290 - "Connect road" unit action takes tiles where road is unbuildable into account 2024-03-13 22:50:25 +02:00
a9595549bc Worker automation takes city focus and civ personality into account 2024-03-13 22:29:20 +02:00
ece8fe9a5c rankStatsForCityWork doesn't need to get cityStats as a parameter 2024-03-13 22:26:11 +02:00
d05bb35129 rankSpecialist doesn't need to get cityStats as a parameter 2024-03-13 22:22:07 +02:00
31b13fc1b7 rankStatsForCityWork doesn't need to get cityStats as a parameter 2024-03-13 22:19:02 +02:00
b75eb52468 Resolved #11297 - Religious victory no longer causes crash 2024-03-13 21:59:21 +02:00
d6ac736d6e perf: Only attempt to get game ID for multiplayer game if current game is actually multiplayer 2024-03-09 23:45:09 +02:00
55aa3d56e6 4.10.17-patch1 2024-03-09 23:40:08 +02:00
9a70ad631e Don't update city stats when simulating improvement changes to see new stats! 2024-03-09 23:38:16 +02:00
1bc3c4de04 Catch error we've been encountering for a while but can't actually debug :(
Async fun, as if, async is *not* fun
2024-03-09 23:31:09 +02:00
d76ade3d44 4.10.17 2024-03-09 23:24:20 +02:00
1558a1dc6f Version rollout (#11282)
* Bump version and create initial changelog entry

* Update Catalan.properties (#11281)

* Create Norwegian.properties (#11275)

* Create Norwegian.properties

Created Norwegian.properties and some translations.

* Update Norwegian.properties

Updated and added more translations.

* Update Norwegian.properties

Added missing placeholders [civName], [city], [amount], and [mod], as well as a couple new translations.

* Update completionPercentages.properties

Added 'Norwegian = 0' to the percentages.

* Create folder /no/

Created the folder /no/ with the description files in Norwegian.

* Delete fastlane/metadata/android/no directory

Wrongfully created the folder and files.

* Update Norwegian.properties

Added Fastlane descriptions, other translations

* Added Norwegian.png

* Delete android/Images.Flags/FlagIcons/Norwegian.png

Removed for wrong size

* Create Norwegian.png

Correct size for Norwegian flag.

* Update Czech.properties (#11273)

* Translation part 1

* Translation part 2

* Translation part 3

* Fix brain not braining moment

* Translated Wesnoth map import lines

* Update French.properties (#11271)

* Update Italian.properties (#11270)

* Update Brazilian_Portuguese.properties (#11266)

* Update Brazilian_Portuguese.properties

* Update Brazilian_Portuguese.properties

* Update Indonesian.properties (#11265)

* Update Indonesian.properties

Added and fixed the translation.

* Update Indonesian.properties

* Add the Conditional Unique for checking speed (#11260)

* Added the conditionalSpeed unique

* Changed the unique wording

---------

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: Joan Josep <juanjo.ng.83@gmail.com>
Co-authored-by: Floxudoxu <67422605+Floxudoxu@users.noreply.github.com>
Co-authored-by: jahodovykolac <79529669+jahodovykolac@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: PLynx <pawelrys2011@gmail.com>
2024-03-09 23:07:39 +02:00
9d1614372e Fixed swapping a unit with a unit that is escorting (#11268) 2024-03-09 23:05:49 +02:00
b10ed5ff87 Next turn button reactivates after closing a popup menu (#11267) 2024-03-09 23:05:39 +02:00
41b29256fe River terraform (#11256)
* Allow terraformers to place Rivers

* Someone said Ruleset is not a Set

* Turn setConnectedByRiver into a public Tile API

* Follow review suggestions
2024-03-09 23:02:18 +02:00
44528d26d0 Added ruleset validation for event uniques 2024-03-09 22:59:43 +02:00
20b4e6674b Events! (#11276)
* Events!

* Whoops

* Resolved #11277 - "Upon turn end" also works for unit uniques
2024-03-09 21:26:45 +02:00
abf54c7039 Version rollout (#11263)
* Bump version and create initial changelog entry

* Update Polish.properties (#11259)

* Update Italian.properties (#11258)

* Update Ukrainian.properties - added missing translations (#11251)

* Update French.properties (#11248)

* Update Brazilian_Portuguese.properties (#11247)

* Update Indonesian.properties (#11242)

* Update Indonesian.properties

Added and fixed translation.

* Update Indonesian.properties

* Update Indonesian.properties

* Update Indonesian.properties

---------

Co-authored-by: yairm210 <yairm210@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: Mykola Makhin <mvmn.inbox@gmail.com>
Co-authored-by: Ouaz <Ouaz@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>
2024-03-05 23:31:08 +02:00
28e0e7ee2c Skip next unit button (#11244)
* Added a next turn menu to skip all the next unit actions

* Added a move automated units button

* Added whitespace

* Added unique NextTurnMenu KeyboardBindings
2024-03-05 23:06:13 +02:00
b5a39bbb39 Centralize infinity symbol (#11257) 2024-03-05 23:05:41 +02:00
06a675c44f More city filters (#11253) 2024-03-05 23:05:31 +02:00
60d93e5ff9 Allow AI to consider production bonuses when building (#11254)
* Allow AI to consider production bonuses when building

* Optimization
2024-03-05 23:05:15 +02:00
8100d0bf73 Better Unit Actions Sorting (#11243)
* Added a use frequency to UnitAction that allows for the buttons to be sorted

* Improved use frequency ordering

* Chained useFrequency to be a float
2024-03-05 23:05:01 +02:00
d5fda541ad Competition quests in progress display tied leaders (and your place if you're behind) (#11224)
* 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
2024-03-05 23:04:40 +02:00
31931d3849 Added ConditionalWhenBetweenStatResource unique (#11212)
* Added ConditionalWhenBetweenStatResource unique

* Currently the ConditionalBetweenHappiness function only applies to Happiness. Wouldn't it be more better if it could also be extended to other stats and resources. 😊

* Resolved the issue with ConditionalWhenAboveStatResource, ConditionalWhenBelowStatResource, and their modified speed versions not functioning properly on city-level stats (food & production).

This new unique has been tested using the following examples:
    1. In GlobalUniques.json:
        - "[+12]% [Gold] [in all cities] <when between [1] to [100] [Gold]>",
        - "[+24]% [Gold] [in all cities] <when between [1] to [100] [Gold] (modified by game speed)>",
    2. In Buildings.json:
        - "[+12]% [Production] [in this city] <when between [1] to [5] [Production]>",
        - "[+12]% [Food] [in this city] <when between [1] to [5] [Food]>",

* Update uniques.md

* Correct english mistake of the new unique

* Refactor checkResourceOrStatAmount function

* Unified all related functions into one
2024-03-05 22:40:27 +02:00
03a30ea7c9 Doc for stats per policies 2024-03-03 21:55:24 +02:00
abc876f4a1 Allow multifilter uniques to count for filtering 2024-03-03 21:51:15 +02:00