11820 Commits

Author SHA1 Message Date
EmperorPinguin
bfbb8d868a
Bugfix: puppet science cost increase (#13029) 2025-03-06 20:25:13 +02:00
SeventhM
72418972fd
Add a filter for religions (#13016)
* Add a filter for religions

* whoops

* Convert if chain to jvm switch statement

* Introduce inverse conditional

* Irrelevant optimization: Checking if it is in the ruleset and returning null it unnecessary with mapNotNull

* Add belief names to filter

* Docs
2025-03-06 20:20:36 +02:00
EmperorPinguin
7c8479326c
Fix puppet city description (#13028)
* Update English.properties

* Update AlertPopup.kt

* Update English.properties
2025-03-06 20:20:26 +02:00
yairm210
f922dcbc75 New AI resource cost uniques also work for Strategic and Bonus resources, assuming they even want to buy 2025-03-06 20:20:01 +02:00
yairm210
b4cfb50ca7 Allow trading stockpiled resources 2025-03-06 20:15:35 +02:00
yairm210
a94b6fdf18 CI: Update Brew on new releases 2025-03-06 19:42:09 +02:00
yairm210
5ee160f84f CI: Correct deploy regex to catch fake releases vs real ones 2025-03-04 09:05:13 +02:00
yairm210
fba5858c45 chore: don't print chosen civs to console 2025-03-04 07:57:33 +02:00
yairm210
01ebfc5bd5 Added option to copy MP upload game error to clipboard for debugging #12997 2025-03-02 16:48:41 +02:00
yairm210
63d02c9efe 4.15.14 4.15.14 2025-03-02 16:41:38 +02:00
Yair Morgenstern
932f44ba72
Version rollout (#13018)
* Bump version and create initial changelog entry

* Update Italian.properties (#13011)

* Update German translation (#13010)

* Update Brazilian_Portuguese.properties (#13009)

* Update French.properties (#13007)

* Update Spanish.properties (#13006)

* translate new line (#13005)

* Update Indonesian.properties (#13003)

---------

Co-authored-by: yairm210 <yairm210@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: Ouaz <Ouaz@users.noreply.github.com>
Co-authored-by: Nahuel Geno <142752140+NahuelGeno@users.noreply.github.com>
Co-authored-by: metablaster <44481081+metablaster@users.noreply.github.com>
Co-authored-by: X2003 <158255876+Xenia2003@users.noreply.github.com>
2025-03-02 16:22:05 +02:00
EmperorPinguin
2927416f48
Add tech cost uniques (#12986)
* Update UniqueType.kt

* Update TechManager.kt

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

---------

Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
2025-03-02 16:19:09 +02:00
EmperorPinguin
9f2ffa5df1
Move CS tribute modifiers to mod constants (#12989)
* Update ModConstants.kt

* Update CityStateFunctions.kt

* Update ModConstants.kt
2025-03-02 16:15:16 +02:00
Jon
905d3c7bfa
tooltip for purchase blocked by unit (#13012)
* tooltip for purchase blocked by unit

* fixup tooltip for purchase blocked by unit: translation template

* extend German translation

* fixup! fixup tooltip for purchase blocked by unit: translation template

* fixup! fixup tooltip for purchase blocked by unit: translation template

---------

Co-authored-by: Jon Witte <jon.witte@bevuta.com>
2025-03-02 16:14:57 +02:00
yairm210
b8b88935a2 Resolved #12548 - Spy stationed in city allows, but does not force, viewing the city when clicking on city button 2025-03-02 14:35:15 +02:00
yairm210
24eae9d951 Ignore 'cannot set dock image' errors 2025-02-27 23:00:52 +02:00
yairm210
132670d605 Ignore 'cannot set dock image' errors 2025-02-27 23:00:34 +02:00
yairm210
8aa8299b38 Add cli 'unciv --version' command 2025-02-27 22:19:31 +02:00
yairm210
19d67f4175 Modding: Added 'worked' and 'pillaged' tile filter options 2025-02-27 16:01:19 +02:00
yairm210
5a7813b5bd Modding: Resolved #12798 - unitFilters now catch status names properly 2025-02-27 09:36:23 +02:00
yairm210
4919368c17 Modding: before/after/while researching tech uniques accept techFilter 2025-02-27 08:43:10 +02:00
yairm210
cb6d99ae20 Resolved #12893 - Fixed crash when moving selected spies via long-click 2025-02-26 23:28:56 +02:00
yairm210
733ad64f54 Resolved #12996 - "Will not be chosen for new games" works for major nations 2025-02-26 23:21:58 +02:00
yairm210
3b2f4133c1 Resolved #12999 - Console tile checkfilter works for resources 2025-02-26 22:59:00 +02:00
yairm210
858c59a08f 4.15.13 4.15.13 2025-02-26 22:52:04 +02:00
Yair Morgenstern
fb6c731bc9
Version rollout (#13002)
* Bump version and create initial changelog entry

* Update German translation (#13001)

* Update Ukrainian translations (#12994)

Co-authored-by: Kostiantyn Ko <mormat.iam@gmail.com>

* Update Brazilian_Portuguese.properties (#12987)

* Update Spanish.properties (#12985)

* Update Croatian translation (#12981)

* translate new line and minor fix

* use capital initial letter for abbreviation for consistency

* Update French.properties (#12979)

* Update Italian.properties (#12978)

* Update Indonesian.properties (#12977)

* Update Malay Translation (#12816)

* Update Malay.properties

* Update Fix Malay.properties

---------

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: mape6 <mape6@posteo.de>
Co-authored-by: Kostiantyn Ko <test9@mormat.name>
Co-authored-by: Kostiantyn Ko <mormat.iam@gmail.com>
Co-authored-by: Vitor Gabriel <59321138+Ranbut@users.noreply.github.com>
Co-authored-by: Nahuel Geno <142752140+NahuelGeno@users.noreply.github.com>
Co-authored-by: metablaster <44481081+metablaster@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: X2003 <158255876+Xenia2003@users.noreply.github.com>
Co-authored-by: Darwish Mat Zain - Hidari Shoya <darwishzainstudio@gmail.com>
2025-02-26 21:52:02 +02:00
yairm210
574962fc90 Added AbsoluteUnits Settler-Ancient era by Basil 2025-02-26 21:46:04 +02:00
SeventhM
7fbdffed7c
Fix free populatoion buildings not working when settling cities (#12988) 2025-02-26 21:07:03 +02:00
General_E
3e6cb2c80e
Change save promotion from unitType to just baseUnit (#12960)
* 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
2025-02-26 21:06:53 +02:00
yairm210
733df5f282 Add .ico file to Windows distribution 2025-02-26 21:05:16 +02:00
yairm210
d03414e85e Update .ico files, set taskbar icon icon for MacOS 2025-02-26 17:16:00 +02:00
yairm210
86b6fbf7bc Resolved #12521 - Added 'tile setpillaged' to dev console commands 2025-02-24 09:58:55 +02:00
yairm210
a14c78f28d Resolved #12993 - Can no longer duplicate units by spamming upgrade button 2025-02-23 22:57:43 +02:00
yairm210
ae01a80a9d Resolved #12991 - "upon gaining the [promotion] promotion" activates when gaining the promotion for free as well as during promotion 2025-02-23 22:44:18 +02:00
yairm210
7dfd9f9188 Added statuses to promotion screen 2025-02-20 22:25:34 +02:00
yairm210
7a35388e7a . 2025-02-20 21:28:25 +02:00
yairm210
f872150da4 Hide 'hidden in world screen' resources from overview tab as well 2025-02-20 19:31:40 +02:00
yairm210
427abfa530 Hopefully solve ghost 'duplicate resource' bug 2025-02-20 19:17:57 +02:00
yairm210
9ba855d627 4.15.12 4.15.12 2025-02-19 16:42:01 +02:00
Yair Morgenstern
358602991a
Version rollout (#12975)
* Bump version and create initial changelog entry

* Update Catalan.properties (#12972)

* Update Brazilian_Portuguese.properties (#12970)

* Update Dutch.properties (#12968)

* Update Dutch.properties

* Update Dutch.properties

* Update Dutch.properties

* Update Dutch.properties

* Update Dutch.properties

* Update Dutch.properties

* Update Dutch.properties

* Update Dutch.properties

* Update French.properties (#12966)

* Update Spanish.properties (#12962)

* translate new lines (#12959)

* Update Italian.properties (#12958)

* galician update (#12957)

* Update Galician.properties

* Update Galician.properties

* Update Indonesian.properties (#12956)

---------

Co-authored-by: yairm210 <yairm210@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>
Co-authored-by: EmperorPinguin <99119424+EmperorPinguin@users.noreply.github.com>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
Co-authored-by: Nahuel Geno <142752140+NahuelGeno@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>
Co-authored-by: ninjum <138787523+ninjum@users.noreply.github.com>
Co-authored-by: X2003 <158255876+Xenia2003@users.noreply.github.com>
2025-02-19 16:26:48 +02:00
EmperorPinguin
878f4bcc12
Update ruleset uniques Experience -> XP (#12976)
* Update Buildings.json

* Update Policies.json

* Update Buildings.json

* Update Policies.json
2025-02-19 16:26:05 +02:00
EmperorPinguin
e3e1d0fb49
Move Spy tech steal modifiers to mod constants (#12964)
* Update ModConstants.kt

* Update Spy.kt

* Update ModConstants.kt
2025-02-19 13:09:14 +02:00
yairm210
4973488b2e chore: rename "experience" with "XP" for unified naming 2025-02-18 23:34:25 +02:00
yairm210
86522371b9 "Abundant resources" with mods with loads of resources no longer crash 2025-02-16 18:45:53 +02:00
yairm210
db6bfa8bfe 4.15.11-patch1 4.15.11-patch1 2025-02-15 18:18:40 +00:00
Yair Morgenstern
bb2c181635
Fixed golden age points (#12967) 2025-02-15 20:18:29 +02:00
yairm210
513c29339e Text fix 2025-02-14 10:46:20 +02:00
yairm210
6d278bc2fe AI: choose policy branch at random between those with the least remaining policies 2025-02-13 23:25:40 +02:00
yairm210
76320bdc44 4.15.11 4.15.11 2025-02-13 21:22:09 +02:00
Yair Morgenstern
93701b80a1
Version rollout (#12955)
* Bump version and create initial changelog entry

* Update Simplified_Chinese.properties (#12954)

* Add files via upload

* Update Simplified_Chinese.properties

* Update Spanish.properties (#12953)

* Update Thai.properties (#12950)

* Update Thai.properties

* Update Thai.properties

* A little help with the translation into pt-br (#12948)

* A little help with the translation into pt-br

* Update Brazilian_Portuguese.properties

Fixed a spell error

[outUnit] to [ourUnit]

It should work correctly now

* Update Polish.properties (#12947)

* Update French.properties (#12944)

* Update Indonesian.properties (#12942)

Translation and corrections.

* Update Croatian translation (#12940)

* translate new lines

* corrections

* Update Italian.properties (#12938)

---------

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: AutumnPizazz <114050365+AutumnPizazz@users.noreply.github.com>
Co-authored-by: Nahuel Geno <142752140+NahuelGeno@users.noreply.github.com>
Co-authored-by: Stevekun321 <95151822+Stevekun321@users.noreply.github.com>
Co-authored-by: -Kayk_Caputo- <49660516+KaykCaputo@users.noreply.github.com>
Co-authored-by: Lesiakower <125187776+Lesiakower@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-02-13 21:19:30 +02:00