11794 Commits

Author SHA1 Message Date
yairm210
34b6b27958 Hopefully decrease OOMs on crash screen 2025-03-17 11:57:39 +02:00
yairm210
df2c1da5b8 4.15.17 4.15.17 2025-03-16 22:48:41 +02:00
Yair Morgenstern
fcce59ca18
Version rollout (#13074)
* Bump version and create initial changelog entry

* Update Dutch.properties (#13073)

* Update Dutch.properties

* Update Dutch.properties

* Add Ukrainian translations (#13069)

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

* Update German translation (#13067)

* Update Spanish.properties (#13065)

* Update Latin translation (#13060)

* Update Latin translation

* Fix translation

* Fix translation

* Update Italian.properties (#13059)

* Update French.properties (#13057)

* Update Brazilian_Portuguese.properties (#13056)

* Update Brazilian_Portuguese.properties

* Update Brazilian_Portuguese.properties

* Update Brazilian_Portuguese.properties

* translate new line (#13055)

* Update Indonesian.properties (#13054)

---------

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: EmperorPinguin <99119424+EmperorPinguin@users.noreply.github.com>
Co-authored-by: Kostiantyn Ko <test9@mormat.name>
Co-authored-by: Kostiantyn Ko <mormat.iam@gmail.com>
Co-authored-by: mape6 <mape6@posteo.de>
Co-authored-by: Nahuel Geno <142752140+NahuelGeno@users.noreply.github.com>
Co-authored-by: sls1005 <90055573+sls1005@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: Vitor Gabriel <59321138+Ranbut@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-16 22:44:08 +02:00
k-oa
6d4778e904
Added animation for unit movement button (#13070)
Co-authored-by: K-OA <2kairu0198@gmail.com>
2025-03-16 22:39:31 +02:00
EmperorPinguin
d2c4fad210
Update MapRegions.kt (#13068) 2025-03-16 22:39:23 +02:00
General_E
a4464f5628
Update auto save promotions (#13045)
* 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

* update to auto promotion.

* Change comments

* fix misspelling.

* now removed auto promotion from city when moved

* Now applying auto promotion in a using promotion tree Node

* Remove sorted function and fix negative properly.
2025-03-16 22:39:02 +02:00
yairm210
6c351fbae6 Resolved #13058 - Science points no longer 're-bonused' on overflow 2025-03-13 21:25:48 +02:00
yairm210
3ce2399841 Resolved #13063 - Updated docs regarding event choice fields 2025-03-13 14:52:37 +02:00
k-oa
2109e25fe2
Changed the Settle sprite to match style of AbsoluteUnits (#13064)
Co-authored-by: K-OA <2kairu0198@gmail.com>
2025-03-13 10:35:24 +02:00
yairm210
a67bb57468 4.15.16 4.15.16 2025-03-11 12:29:18 +02:00
Yair Morgenstern
f070cf25b9
Version rollout (#13053)
* Bump version and create initial changelog entry

* Added more Ukrainian translations (#13051)

* Update Brazilian_Portuguese.properties (#13048)

* Update French.properties (#13046)

* Update Italian.properties (#13042)

* Update Croatian translation (#13041)

* translate new lines

* fix invalid placeholder

* Update Indonesian.properties (#13038)

* Update Indonesian.properties

* Update Indonesian.properties

---------

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: dot-sent <dot-sent@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: Giuseppe D'Addio <41149920+Smashfanful@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-11 12:24:15 +02:00
yairm210
6f6d21d653 Sort religion overview by number of followers 2025-03-11 11:09:56 +02:00
yairm210
9e658eb012 modding: "Not shown on world screen" applies to promotions and statuses 2025-03-10 09:57:13 +02:00
yairm210
b552344547 Made Prince be "truly balanced" 2025-03-09 19:22:39 +02:00
Ouaz
3f9e8a837b
Correct puppet city description (#13047)
Follows #13028
2025-03-09 16:26:55 +02:00
yairm210
937b46400f Resolved #13049 - Allow atlas generation when using --data-dir option 2025-03-09 16:15:59 +02:00
yairm210
c29617c80a "Never appears as a Barbarian unit" also affects upgrades 2025-03-09 14:04:56 +02:00
yairm210
78f6c8c602 Resolved #13043 - Remove great person point accumulation for units no longer available in this ruleset 2025-03-09 12:26:23 +02:00
yairm210
9317e896e9 CI: Use Github Actions access token (with actual permissions) and not the default GITHUB_TOKEN for brew update 2025-03-06 21:42:15 +02:00
yairm210
3c23556a0b 4.15.15 4.15.15 2025-03-06 21:08:26 +02:00
Yair Morgenstern
61154f7d1a
Update README.md 2025-03-06 21:01:23 +02:00
Yair Morgenstern
38d4b79a46
Version rollout (#13037)
* Bump version and create initial changelog entry

* Additional Ukrainian translations (#13035)

* Update Ukrainian.properties

Several simple new Ukrainian translations

* Update Ukrainian.properties

Second small set of updates to Ukrainian translation

* Update Brazilian_Portuguese.properties (#13025)

* Update Italian.properties (#13024)

* Update German translation (#13023)

* Update French.properties (#13021)

* translate new lines and few fixes (#13020)

* Update Indonesian.properties (#13019)

---------

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: dot-sent <dot-sent@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: mape6 <mape6@posteo.de>
Co-authored-by: Ouaz <Ouaz@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-06 20:54:48 +02:00
Yair Morgenstern
68d6ea6afc
Replace Macports with Brew as official MacOS source 2025-03-06 20:51:57 +02:00
General_E
805c636b71
Add unqiue change the promotion XP cost (#13015)
* 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

* Add back XPForPromotionModifier in it own branch

* change it to private

* commit new changes

* fix build error

* updated the maths
2025-03-06 20:40:30 +02:00
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