mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-01-13 00:04:38 +07:00
Code Issues Packages Projects Releases Wiki Activity
10,121 Commits 6 Branches 1,037 Tags 1.2 GiB
b7ae918434
Commit Graph

10121 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Yair Morgenstern
b7ae918434
Update stale-issues-and-prs.yaml 2024-03-14 23:14:29 +02:00
Yair Morgenstern
a7b9a179ab
Update stale-issues-and-prs.yaml 2024-03-14 22:31:18 +02:00
Yair Morgenstern
8046e0cd27
Create stale-issues-and-prs.yaml 2024-03-14 22:27:34 +02:00
Yair Morgenstern
ba9b81569f Resolved #11174 - Workers cannot repair improvements in enemy territory, thus avoiding repair-pillage exploit 2024-03-14 21:01:19 +02:00
Yair Morgenstern
83829a40da Resolved #11307 - zero-cost constructions no longer cause automation crash 2024-03-14 20:48:23 +02:00
Yair Morgenstern
0f3ff99d1f Revert "Worker automation takes city focus and civ personality into account" 
This reverts commit a9595549bc.
 2024-03-14 12:29:34 +02:00
Yair Morgenstern
0eb79c5209 4.10.18 2024-03-13 23:31:22 +02:00
Yair Morgenstern
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
SeventhM
b60dabc089
Allow resources from follower beliefs (#11252) 
* Allow resources from follower beliefs

* incorporate suggestions
 2024-03-13 23:19:18 +02:00
PLynx
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
itanasi
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
Yair Morgenstern
1542b92e63 Resolved #11289 - Free buildings granted properly when era-free cities also granted 2024-03-13 23:11:39 +02:00
Yair Morgenstern
2294b7a6b3 Resolved #11290 - "Connect road" unit action takes tiles where road is unbuildable into account 2024-03-13 22:50:25 +02:00
Yair Morgenstern
a9595549bc Worker automation takes city focus and civ personality into account 2024-03-13 22:29:20 +02:00
Yair Morgenstern
ece8fe9a5c rankStatsForCityWork doesn't need to get cityStats as a parameter 2024-03-13 22:26:11 +02:00
Yair Morgenstern
d05bb35129 rankSpecialist doesn't need to get cityStats as a parameter 2024-03-13 22:22:07 +02:00
Yair Morgenstern
31b13fc1b7 rankStatsForCityWork doesn't need to get cityStats as a parameter 2024-03-13 22:19:02 +02:00
Yair Morgenstern
b75eb52468 Resolved #11297 - Religious victory no longer causes crash 2024-03-13 21:59:21 +02:00
Yair Morgenstern
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
Yair Morgenstern
55aa3d56e6 4.10.17-patch1 2024-03-09 23:40:08 +02:00
Yair Morgenstern
9a70ad631e Don't update city stats when simulating improvement changes to see new stats! 2024-03-09 23:38:16 +02:00
Yair Morgenstern
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
Yair Morgenstern
d76ade3d44 4.10.17 2024-03-09 23:24:20 +02:00
Yair Morgenstern
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
Oskar Niesen
9d1614372e
Fixed swapping a unit with a unit that is escorting (#11268) 2024-03-09 23:05:49 +02:00
Oskar Niesen
b10ed5ff87
Next turn button reactivates after closing a popup menu (#11267) 2024-03-09 23:05:39 +02:00
SomeTroglodyte
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
Yair Morgenstern
44528d26d0 Added ruleset validation for event uniques 2024-03-09 22:59:43 +02:00
Yair Morgenstern
ec131fe7cb Added documentation and schemas for events 2024-03-09 21:54:56 +02:00
Yair Morgenstern
1fc0f0ea68 Fix table formatting in all file documentation 2024-03-09 21:38:14 +02:00
Yair Morgenstern
20b4e6674b
Events! (#11276) 
* Events!

* Whoops

* Resolved #11277 - "Upon turn end" also works for unit uniques
 2024-03-09 21:26:45 +02:00
Yair Morgenstern
86f0ed6e85 4.10.16 2024-03-05 23:38:01 +02:00
Yair Morgenstern
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
Oskar Niesen
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
SomeTroglodyte
b5a39bbb39
Centralize infinity symbol (#11257) 2024-03-05 23:05:41 +02:00
SomeTroglodyte
06a675c44f
More city filters (#11253) 2024-03-05 23:05:31 +02:00
SeventhM
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
Oskar Niesen
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
SomeTroglodyte
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
Jeremy Woo
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
Yair Morgenstern
03a30ea7c9 Doc for stats per policies 2024-03-03 21:55:24 +02:00
Yair Morgenstern
abc876f4a1 Allow multifilter uniques to count for filtering 2024-03-03 21:51:15 +02:00
Yair Morgenstern
0cfee86864 4.10.15 2024-03-03 21:29:55 +02:00
Yair Morgenstern
a0985194fb Options popup closes naturally 2024-03-03 21:28:15 +02:00
Yair Morgenstern
47e3397fae
Version rollout (#11241) 
* Bump version and create initial changelog entry

* Update Filipino.properties (#11240)

* Update Catalan.properties (#11237)

* Update French.properties (#11226)

* Update Brazilian_Portuguese.properties (#11223)

* Update Italian.properties (#11222)

* Update Indonesian.properties (#11221)

Added and fixed the translation of some words.

---------

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: Earl <86307061+Earl8D@users.noreply.github.com>
Co-authored-by: Joan Josep <juanjo.ng.83@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: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: M792003 <158552928+M792003@users.noreply.github.com>
 2024-03-03 21:12:00 +02:00
SomeTroglodyte
5e685e10aa
Fix tileset sanity check for builtin rulesets when run from jar (#11230) 
* Avoid using folder listing for tileset sanity checks for builtin rulesets from jar

* Remove an unnecessary java import

* Revert the builtin-tileset-within-jar special check, not necessary for a release
 2024-03-03 20:03:40 +02:00
SomeTroglodyte
3869f8e4a5
Improve DiplomacyScreen left side UX (nation icons) on really cramped screens (#11227) 2024-03-03 20:03:27 +02:00
SeventhM
d99bd03277
Allow city state uniques for nation descriptions (#11232) 2024-03-03 20:03:20 +02:00
PLynx
2d1e55a4d4
Add MovedToNewCapital buiding unique (#11213) 
* Added MovedToNewCapital building unique

Yet to be tested

* Applied the suggestions

Of @yairm210 and @SomeTroglodyte
 2024-03-03 20:03:12 +02:00
SomeTroglodyte
61972cd50e
Move DiplomacyScreen close button to top right (#11225) 2024-03-03 20:03:04 +02:00