mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-07-18 03:38:55 +07:00
Code Issues Packages Projects Releases Wiki Activity

Version rollout (#11282)

Browse Source 
* 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>
This commit is contained in:
Yair Morgenstern
2024-03-09 23:07:39 +02:00
committed by GitHub
parent 9d1614372e
commit 1558a1dc6f
17 changed files with 2163 additions and 226 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/com/unciv/UncivGame.kt
View File

@ -464,7 +464,7 @@ open class UncivGame(val isConsoleMode: Boolean = false) : Game(), PlatformSpeci
companion object {
//region AUTOMATICALLY GENERATED VERSION DATA - DO NOT CHANGE THIS REGION, INCLUDING THIS COMMENT
val VERSION = Version("4.10.16", 975)
val VERSION = Version("4.10.17", 976)
//endregion
lateinit var Current: UncivGame

1
core/src/com/unciv/models/ruleset/unique/Conditionals.kt
View File

@ -144,6 +144,7 @@ object Conditionals {
UniqueType.ConditionalStartingFromEra -> compareEra(condition.params[0]) { current, param -> current >= param }
UniqueType.ConditionalDuringEra -> compareEra(condition.params[0]) { current, param -> current == param }
UniqueType.ConditionalIfStartingInEra -> checkOnGameInfo { gameParameters.startingEra == condition.params[0] }
UniqueType.ConditionalSpeed -> checkOnGameInfo { gameParameters.speed == condition.params[0] }
UniqueType.ConditionalTech -> checkOnCiv { tech.isResearched(condition.params[0]) }
UniqueType.ConditionalNoTech -> checkOnCiv { !tech.isResearched(condition.params[0]) }
UniqueType.ConditionalWhileResearching -> checkOnCiv { tech.currentTechnologyName() == condition.params[0] }

8
core/src/com/unciv/models/ruleset/unique/UniqueParameterType.kt
View File

@ -439,6 +439,14 @@ enum class UniqueParameterType(
}
},
Speed("speed", "Quick", "The name of any speed") {
override fun getErrorSeverity(parameterText: String, ruleset: Ruleset):
UniqueType.UniqueParameterErrorSeverity? = when (parameterText) {
in ruleset.speeds -> null
else -> UniqueType.UniqueParameterErrorSeverity.RulesetSpecific
}
},
/** For [UniqueType.CreatesOneImprovement] */
ImprovementName("improvementName", "Trading Post", "The name of any improvement") {
override fun getErrorSeverity(parameterText: String, ruleset: Ruleset):

2
core/src/com/unciv/models/ruleset/unique/UniqueType.kt
View File

@ -634,6 +634,8 @@ enum class UniqueType(
ConditionalStartingFromEra("starting from the [era]", UniqueTarget.Conditional),
ConditionalIfStartingInEra("if starting in the [era]", UniqueTarget.Conditional),
ConditionalSpeed("on [speed] game speed", UniqueTarget.Conditional),
ConditionalFirstCivToResearch("if no other Civilization has researched this", UniqueTarget.Conditional),
ConditionalTech("after discovering [tech]", UniqueTarget.Conditional),
ConditionalNoTech("before discovering [tech]", UniqueTarget.Conditional),