Commit Graph

7140 Commits

Author SHA1 Message Date
08bfa381a1 Added exception to catch the situation causing #11404 2024-04-07 00:07:00 +03:00
027e56d6a7 Resolved #11400 - unclear settler edge case 2024-04-06 23:45:40 +03:00
5263140911 Fixed concurrent modification from triggers adding other triggers 2024-04-06 23:30:39 +03:00
8cb200ae4f Version rollout (#11390)
* Bump version and create initial changelog entry

* Update Hungarian.properties (#11381)

* Update French.properties (#11378)

* Update Italian.properties (#11377)

* Update Catalan.properties (#11376)

* Update Catalan.properties

* Update Catalan.properties

* Update Catalan.properties

* Update Indonesian.properties (#11374)

* Update Indonesian.properties

Added and fixed the translation.

* Update Indonesian.properties

* Update Indonesian.properties

* Update Indonesian.properties

* Update Indonesian.properties

* Update Indonesian.properties

* Update Indonesian.properties

* Update Indonesian.properties

* Update Indonesian.properties

* Update Indonesian.properties

* Update Indonesian.properties

* Update Indonesian.properties

* Update Indonesian.properties

* Update Indonesian.properties

* Update Indonesian.properties

* Update Indonesian.properties

* Update Indonesian.properties

* Update Indonesian.properties

* Update Indonesian.properties

* Update Indonesian.properties

---------

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: balazsszalab <balazsszalab@freemail.hu>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: Joan Josep <juanjo.ng.83@gmail.com>
Co-authored-by: M792003 <158552928+M792003@users.noreply.github.com>
2024-04-04 23:54:13 +03:00
ac35433057 Fix: New game screen, selection of mods from custom maps (#11387)
* Fix new game portrait mode geometry

* Allow updating ModCheckboxTable state from upstream

* Bubble a few notifications between NewGameScreen elements so changes can propagate better
2024-04-04 23:41:17 +03:00
d5d05ecd6d Improve diplomatic vote result screen (#11386)
* Fix wrong winner displayed for UN vote results

* Display number of received votes in DiplomaticVoteResultScreen
2024-04-04 23:41:08 +03:00
a743c4d8ff Changed the heuristic to be applicable to any unit and to use canPassThrough() (#11383) 2024-04-04 23:40:56 +03:00
455afcee75 Workboats improve resources outside of city work range (#11384)
* AI now improves luxury resources outside of city work range

* Strategic resources will now be built on as well outside of city working range

* Renamed a helper method

* Added some spaces after type declaration
2024-04-04 23:40:25 +03:00
aab6e2643e Make ESC/Back bindable (Main menu and world screen only) (#11379)
* Some Keyboard code linting

* Make ESC/BACK bindable in two places
2024-04-04 23:40:15 +03:00
48212e8c15 Allow AI to consider building stats more accurately (#11370)
* Allow AI to consider building stats more accurately

* Adjust AI value of happiness

* Move happiness valuing to the building evaluation

* Consider carry over food uniques

* Just realized I messed up my math. Yes I know about the divide by zero error
2024-04-04 23:40:00 +03:00
3ea1e4a539 Allow for replacement improvements (#11369)
* Allow for replacement improvements

* imports

* Forgot the most important change, lol

* Docs

* Replacement description, validation, and filter

* Move more into ImprovementDescriptions

* Whoops, forgot to yield

* Fix some copy-paste artifacts

* New translations

* Fix double see also

* Add space for translation engine
2024-04-04 23:39:44 +03:00
0caf0cb4fa Add configurable natural wonder discovery stat bonuses (#11249)
* Added configurable natural wonder discovery stats

* Shortened the code

* Updated the base rulesets with new unique

* Updated the El Dorado unique

* Applied the suggestions

* Reintroduced the implementation for deprecated uniques

* Changed tile.naturalWonder to naturalWonder
2024-04-04 23:39:31 +03:00
0474755a0d Better performance for reassigning population - important, since AI does this every city every turn 2024-04-03 09:21:07 +03:00
7f2b98be17 Add cache for terrain filter results 2024-04-03 09:15:38 +03:00
c2a2bcb417 4.11.0 2024-04-01 14:22:17 +03:00
ce72573504 Deprecate old uniques 2024-04-01 12:08:06 +03:00
b37c24c177 Version rollout (#11371)
* Bump version and create initial changelog entry

* Update Catalan.properties (#11363)

* Update Indonesian.properties (#11361)

* Update Indonesian.properties

Fixed the translation.

* Update Indonesian.properties

* Update Indonesian.properties

* Update Indonesian.properties

* Update Indonesian.properties

* Update Indonesian.properties

* Update Indonesian.properties

* Update Indonesian.properties

---------

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: Joan Josep <juanjo.ng.83@gmail.com>
Co-authored-by: M792003 <158552928+M792003@users.noreply.github.com>
2024-04-01 12:06:53 +03:00
5d162417ac Remove mod blacklist (#11367) 2024-04-01 12:01:41 +03:00
b5b58ab6d7 Add UnitActionModifier for Stockpile Cost (#11344)
* Initial action code
canSpendStockpileCost() doesn't work quite right yet

* Properly check if Stockpile is 0

* Flip signs for consumption

* Fix itemss from review
2024-04-01 12:01:30 +03:00
5e89e2f46d Countable comparison conditional uniques (#11308)
* Added the countable comparison conditional uniques

* Applied the suggestions of yairm

* Minor wording change
2024-04-01 12:01:20 +03:00
231ae86913 Resolved #11345 - Hide battle table after attack if we can move, but not attack again 2024-04-01 10:00:54 +03:00
7ac50ddadb Resolved #11368 - maps with mods change mods visible on new game screen accordingly 2024-04-01 09:48:52 +03:00
9f798dae2f Barbarian units always placed next to encampment, so they don't "jump over" tiles they can't enter to the other side 2024-03-27 21:30:50 +02:00
a94e85eed8 Version rollout (#11360)
* Bump version and create initial changelog entry

* Update Turkish.properties but there is a bug (#11351)

* Update Turkish.properties

* Update Turkish.properties

* Update Indonesian.properties (#11343)

* Update Indonesian.properties

Added and fixed some translation.

* Update Indonesian.properties

* Update Indonesian.properties

* Update Indonesian.properties

* Update Indonesian.properties

* Update Indonesian.properties

* Update Indonesian.properties

---------

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: ygz213 <77006222+ygz213@users.noreply.github.com>
Co-authored-by: M792003 <158552928+M792003@users.noreply.github.com>
2024-03-26 00:06:46 +02:00
f2dd64f684 Resolved #11356 - Policy tables no longer repeat on some height/width configurations 2024-03-26 00:06:34 +02:00
e17229779a Fix loop when AI is trying to remove an improvement with the same name as a terrain feature (#11352)
* Fix loop when AI is trying to remove an improvement with the same name as a terrain feature

* whoops
2024-03-25 23:20:16 +02:00
c5611e9588 Resolved #11359 - Personalities.json no longer precludes generating translations 2024-03-25 23:19:57 +02:00
88dffaa02e Resolved #11355 - discard all pending trade requests on both sides when war is declared 2024-03-25 21:51:00 +02:00
2c4d4a4b4b perf: Don't re-substring multiplayer file name every time you do anything, dammit 2024-03-25 21:37:56 +02:00
121ed8293a Version rollout (#11342)
* Bump version and create initial changelog entry

* Update Spanish.properties (#11341)

* Update French.properties (#11336)

* Update Italian.properties (#11335)

* Update German translation (#11331)

* Update Brazilian_Portuguese.properties (#11330)

* Update Indonesian.properties (#11328)

* Update Indonesian.properties

Fixed the translation.

* Update Indonesian.properties

---------

Co-authored-by: yairm210 <yairm210@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: mape6 <mape6@posteo.de>
Co-authored-by: Vitor Gabriel <59321138+Ranbut@users.noreply.github.com>
Co-authored-by: M792003 <158552928+M792003@users.noreply.github.com>
2024-03-20 00:05:28 +02:00
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