11852 Commits

Author SHA1 Message Date
Yair Morgenstern
8cc9947c8c
Version rollout (#13444)
* Bump version and create initial changelog entry

* Update Ukrainian translation (#13441)

* Update Korean.properties (#13440)

* Update Korean.properties

* Update Korean.properties

* Update Korean.properties

* Update Korean.properties

* Update Italian.properties (#13433)

* Update Brazilian_Portuguese.properties (#13431)

* Update Indonesian.properties (#13430)

* Update French.properties (#13428)

* Update Croatian translation (#13427)

* Update Croatian translation

* corrections

* update instructions

---------

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: Kostiantyn Ko <mormat.iam@gmail.com>
Co-authored-by: Charmtese <saud2410@naver.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: X2003 <158255876+Xenia2003@users.noreply.github.com>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
Co-authored-by: metablaster <44481081+metablaster@users.noreply.github.com>
2025-06-15 12:27:51 +03:00
hackedpassword
c1562912ac
HexaRealm edges restructure (#13445) 2025-06-15 12:27:40 +03:00
metablaster
a17bbd9041
update missing world screen image annotation (#13429) 2025-06-15 11:24:55 +03:00
Rob Loach
5190604466
Allow using [relativeAmount]% Gold from Great Merchant trade missions on units (#13436)
* Apply [relativeAmount]% Gold from Great Merchant trade missions to units

* Use checkCivInfoUniques for trade mission modifier

* Fix typo
2025-06-15 11:24:07 +03:00
metablaster
79fb4b4d59
Table and colors for diplomatic relations between human players in diplomacy screen. (#13437)
* change politics diagram line colors

* defensive pact color only for major civs

* update comment

* remove unneeded line

* color DoF between human players in diagram

* human relationship table and colors

* fix spelling typo

* fix colors consistency in table
2025-06-15 11:23:57 +03:00
metablaster
a35de18455
Fix automated units not auto upgrading when enabled in options (#13434)
* fix automated ranged units not heading to enemy city

* fix distance from city typo

* Address points made in PR

* priotirize tiles without retaliation

* remove dangerous tiles logic

* resolve review with alternative approach

* faster exit if no sight

* automated units auto upgrade if enabled

* simplified condition
2025-06-15 11:23:48 +03:00
metablaster
af377058ba
Fix broken translations (#13432)
* fix broken translation

* apply suggested change

* fix untraslated string in load game screen
2025-06-15 11:23:36 +03:00
Rob Loach
f3511f99f4
Fix Civilopedia requiredBuilding links for Wonders (#13442) 2025-06-15 11:23:25 +03:00
PLynx
686180fe4f
Stacked with unit conditional unique (#13406)
* Added Stacked With Unit unique

* Deprecated the old unique

* Fixed a typo in Deprecated annotation

* Added the exception of relevant unit

* Replaced the old unique in ruleset

* Added the missing + sign

* Update android/assets/jsons/Civ V - Gods & Kings/UnitPromotions.json

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

* Swapped the conditions order

---------

Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
2025-06-15 11:23:16 +03:00
yairm210
f39f81d704 4.16.15 4.16.15 2025-06-11 17:56:21 +03:00
yairm210
d39061c336 Resolved #13405 - modding: Show status page for civilian units - By SomeTroglodyte 2025-06-11 17:48:49 +03:00
Yair Morgenstern
9ba050b56c
Version rollout (#13426)
* Bump version and create initial changelog entry

* Update German translation (#13422)

* Update Italian.properties (#13420)

* Update French.properties (#13419)

* Update Brazilian_Portuguese.properties (#13418)

* Update Korean.properties (#13416)

* Update Korean.properties

* Update Korean.properties

* Update Korean.properties

* Update Japanese.properties (#13415)

* Update Japanese.properties

Fixed a typo.

* Update Japanese.properties

Added parentheses to menu item name in text.

* Update Japanese.properties

Fixed some typo, notation fluctuations.

* Update Indonesian.properties (#13413)

* Update Indonesian.properties

* Update Indonesian.properties

* Update Indonesian.properties

* Update Indonesian.properties

* Update Croatian translation (#13412)

* Update Croatian translation

* corrections

* corrections in leader greetings

* grammar corrections

---------

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: mape6 <mape6@posteo.de>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
Co-authored-by: Vitor Gabriel <59321138+Ranbut@users.noreply.github.com>
Co-authored-by: Charmtese <saud2410@naver.com>
Co-authored-by: Jesi229 <zoo_s.horizon@zoho.com>
Co-authored-by: X2003 <158255876+Xenia2003@users.noreply.github.com>
Co-authored-by: metablaster <44481081+metablaster@users.noreply.github.com>
2025-06-11 17:45:13 +03:00
metablaster
441a1c5b31
Improved diagram colors in global politics (#13425)
* change politics diagram line colors

* defensive pact color only for major civs

* update comment

* remove unneeded line
2025-06-11 17:33:01 +03:00
metablaster
336948f31b
Fix NullPointerException on WorldScreen (#13417) 2025-06-11 17:32:47 +03:00
metablaster
19a44aaa78
Fix automated long range units not heading to enemy city (#13408)
* fix automated ranged units not heading to enemy city

* fix distance from city typo

* Address points made in PR

* priotirize tiles without retaliation

* remove dangerous tiles logic

* resolve review with alternative approach

* faster exit if no sight
2025-06-11 17:32:29 +03:00
General_E
0a41417fdd
Add don't spy on us has a demand (#13351)
* Settler settle best tile when not escort and dangerous Tiles instead of running away

Settler unit will now settle on best tile in dangerous Tiles without escort instead of running away.

* Update WorkerAutomation.kt

* Update SpecificUnitAutomation.kt

* Update WorkerAutomation.kt

* Update SpecificUnitAutomation.kt

* Now city states get mad when you steal their Lands

* new version

* change to getDiplomacyManagerOrMeet

* added text to template.properties and changed AlertPopup.kt

* Update template.properties

* with period at the end :b

* add flag now

* Made Option to declare war when a city state is bullied unavailable

* added option to change the Maximum Autosave turns stored

* remove print

* change letter

* should fix issue with building test

* update with changes

* Added UniqueType.FoundPuppetCity

with "Founds a new puppet city" in "uniques" of an unit in Units.json.
Making it so you can now settle a puppet city.

* Added save promotion

* Updated for PR

* Updated with requested changes

* Removed unnecessary check

* updated PR

* Update PromotionPickerScreen.kt to save promotion cells too

* change name and added !

* updated name of variable

* updated version from unitType to BaseUnit

* updated variable name

* Added unitType to reduce the xp cost of promotions for all units in a civ

This was a unique type that the Zulu have in civ 5

* updated name

* remove UniqueTarget.FollowerBelief

* Experience from to XP

* fix ?

* XP

* change it back to Experience because it didn't want to build on git :(

* back to XP then

* update auto promotion and fix negative XP on unit

* Fix build issues and remove the XPForPromotionModifier from xpForNextPromotion and  xpForNextNPromotions

* remove XPForPromotionModifier

* re added Statuses and remove duplicate comment

* remove some white space and 1 used import "com.unciv.ui.components.extensions.toPercent"

* remove unique from uniques.md

* update 0

* name change from spys to spies

* Now in a working state

* change println

* mini update

* final update

* update

* mini update

* Update

* updated it for the ai can bypass agreement to stop spaying on x civ

* updated addSpyingOnUsDespiteOurPromise text

text by itanasi

* fixed build issue ?

* Apply suggestions from code review

* update comment

* Update core/src/com/unciv/models/Spy.kt

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

* If true it will  return false in moveTo function

* Update

* Update AlertPopup.kt

---------

Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
2025-06-11 17:31:57 +03:00
yairm210
db60d83424 Fixed Gold being translated in trade offer with peace treaty 2025-06-08 10:23:11 +03:00
yairm210
acb7e8157c 4.16.14 4.16.14 2025-06-08 00:10:35 +03:00
Yair Morgenstern
9c98a6eaf1
Version rollout (#13410)
* Bump version and create initial changelog entry

* Update Korean.properties (#13409)

* Fix missing translation in civilopedia (#13401)

* translate new lines

* fix civilopedia entry 'AI difficulty level'

* fix 'Multiplayer > Friend List > Help' translation

* Update Italian.properties (#13394)

* Update Indonesian.properties (#13392)

* Update Brazilian_Portuguese.properties (#13391)

* Update French.properties (#13389)

* translate new lines (#13388)

---------

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: Charmtese <saud2410@naver.com>
Co-authored-by: metablaster <44481081+metablaster@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: X2003 <158255876+Xenia2003@users.noreply.github.com>
Co-authored-by: Vitor Gabriel <59321138+Ranbut@users.noreply.github.com>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
2025-06-08 00:08:39 +03:00
yairm210
380172fe92 chore: Remove unused city distance 2025-06-07 23:53:49 +03:00
Rob Loach
2bbd2e6f1d
Add uniques to remove tile resources and improvements (#13390)
* Add unique to remove tile resources and improvements

* Remove the unneeded RoadStatus import

* Add resourceFilter and improvementFilter to the remove tiles

* Use removeImprovement() and removeRoad()

* Clean up the code
2025-06-07 23:29:53 +03:00
PLynx
6cf6a99653
Upon Ending Golden Age unique (#13397)
* Added Upon Ending Golden Age unique

* Update core/src/com/unciv/logic/civilization/managers/GoldenAgeManager.kt

---------

Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
2025-06-07 23:29:22 +03:00
SomeTroglodyte
9bc57db3a0
Fix Civilopedia when opened for a religion-free ruleset without a loaded game (#13241)
* Revert "Fix opening Civilopedia from main menu when easter eggs enabled"

* Fix Civilopedia search finding hidden entries

* Fix `isHiddenFromCivilopedia` without `gameInfo`

* Better naming and extra-extensive comments
2025-06-07 23:28:38 +03:00
yairm210
454b86cdc1 modcheck: Handle case where a deprecated unique used a parameter type that no longer exists 2025-06-05 16:28:17 +03:00
yairm210
41eceeb834 Fix base rulesets 2025-06-05 11:19:07 +03:00
yairm210
b3b1fe61e0 Rename unique "remove annex unhappiness" -> "removes annex unhappiness" 2025-06-05 11:10:24 +03:00
yairm210
5d8361d400 4.16.13-patch1 4.16.13-patch1 2025-06-04 06:53:09 +00:00
Yair Morgenstern
4e74fb10ed
Catch unexpected validation exceptions (#13396) 2025-06-04 09:52:59 +03:00
yairm210
53ef48402b Add special exception for a strange bug encountered by a player 2025-06-03 23:29:29 +03:00
yairm210
0beeeaccf2 4.16.13 4.16.13 2025-06-02 23:42:44 +03:00
yairm210
9e4086563f Resolved #13382 - EventChoice inherits from UnitTriggerable which inherits from Triggerable, so all UnitTriggerables are now valid Event Choices 2025-06-02 23:36:45 +03:00
Yair Morgenstern
6b77e762f6
Version rollout (#13387)
* Bump version and create initial changelog entry

* Update German translation (#13384)

* Update Ukrainian translation (#13378)

* Update Indonesian.properties (#13377)

* Update Brazilian_Portuguese.properties (#13376)

* Update Brazilian_Portuguese.properties

* Update Brazilian_Portuguese.properties

* Update French.properties (#13374)

* translate new lines (#13373)

* Update Italian.properties (#13372)

---------

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: mape6 <mape6@posteo.de>
Co-authored-by: Kostiantyn Ko <mormat.iam@gmail.com>
Co-authored-by: X2003 <158255876+Xenia2003@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: metablaster <44481081+metablaster@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
2025-06-02 23:34:35 +03:00
yairm210
784c0ebdf6 Resolved #13386 - some triggers with city filters stopped filtering cities correctly 2025-06-02 23:33:19 +03:00
yairm210
0c4bc0f2cc doc: How do we replace uniques 2025-06-02 23:20:39 +03:00
PLynx
f8411ec220
Add buildingFilter to building maintenance unique (second attempt) (#13334)
* Added buildingFilter to building maintenance unique

* Restored the old unique

* Replaced the unique to new version in rulesets

* Changed buildingFilter parameter to lowercase

* Fixed building maintenance calculation

* Un-deprecated the old unique

* Re-added Deprecated annotation

* Removed the old unique from list again

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

---------

Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
2025-06-02 23:11:20 +03:00
ReallyBasicName
b67429d5cb
Add the option for civs to have unique dialogue when asking for a Declaration of Friendship (#13366)
* Uh, Friendship dailogue.

* Update 2-Civilization-related-JSON-files.md

* Nothing

* Yairm fixes my mistake

Sorry I didn't get to this sooner and you had to do it Yairm.

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

* Update AlertPopup.kt's friendship to declaringFriendship

* Update Nation.kt's friendship to declaringFriendship

* Update 2-Civilization-related-JSON-files.md's friendship to declaringFriendship

* Update nations.json's friendship to declaringFriendship

---------

Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
2025-06-02 23:08:17 +03:00
metablaster
f871e1f456
Improved AI road planning (#13370)
* Initial improvement of AI road planning

* fix tile caching of road plans

* fix worker not connecting city due to lower priority

* remove unnecessary code

* cleanup RoadBetweenCitiesAutomation.kt and enable harbor connection loging

* fix invalid logic in road construction

* apply reviewed changes

* sort plan list by closer cities

* apply reviewed changes and removed loging
2025-06-02 23:08:01 +03:00
EmperorPinguin
eef2aaeb3d
Update NextTurnAutomation.kt (#13385)
* Update NextTurnAutomation.kt

* Update NextTurnAutomation.kt
2025-06-02 23:07:39 +03:00
yairm210
3799098c69 Resolved #13014 - Only buildable improvements are viable comparisons for determining if a city can provide a resource 2025-06-01 12:17:26 +03:00
yairm210
a644875139 Added countables test that autocomplete values actually return valid countables 2025-06-01 11:59:04 +03:00
yairm210
30270f2014 Added "era number", "speed modifier for stat" countables by @SomeTroglodyte - see #13262 2025-06-01 11:46:35 +03:00
yairm210
2d91981440 Set tryFixUnknownUniques on RulesetValidator, for simpler function calls throughout 2025-06-01 11:04:43 +03:00
EmperorPinguin
e42e963871
Update Personalities.json (#13380) 2025-06-01 10:28:34 +03:00
EmperorPinguin
dda1febacc
Update DiplomacyFunctions.kt (#13381) 2025-06-01 10:28:21 +03:00
yairm210
11040d9557 docs: Added history documentation for Console, console doc reorg 2025-05-31 22:59:18 +03:00
yairm210
c782af55ae Fixed techs showing "0 turns" and yet not being researched 2025-05-31 21:55:47 +03:00
yairm210
d6258c06d9 4.16.12 4.16.12 2025-05-30 16:53:36 +03:00
yairm210
d1e3e1bb1a Allow clicking on the map while dev console is open 2025-05-30 16:51:44 +03:00
Yair Morgenstern
ac6f7930e0
Version rollout (#13371)
* Bump version and create initial changelog entry

* Update German translation (#13358)

* Update Brazilian_Portuguese.properties (#13357)

* Update French.properties (#13356)

* Update Indonesian.properties (#13355)

* Update Indonesian.properties

* Update Indonesian.properties

* Update Indonesian.properties

* Update Indonesian.properties

* translate new lines (#13353)

* Update Italian.properties (#13352)

---------

Co-authored-by: yairm210 <yairm210@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: Ouaz <Ouaz@users.noreply.github.com>
Co-authored-by: X2003 <158255876+Xenia2003@users.noreply.github.com>
Co-authored-by: metablaster <44481081+metablaster@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
2025-05-30 16:51:38 +03:00
SomeTroglodyte
72e0460bcb
New countable for adopted policies supports policyFilter (#13191)
* New countable: Countables.FilteredPolicies with test

* Result of doc autoupdate

* Result of doc autoupdate

* Some clarifying comments

* Remove policy filter with bad wording
2025-05-30 16:41:17 +03:00