From ca4c479719368387464fe9aeb72fe997170dffa3 Mon Sep 17 00:00:00 2001 From: Yair Morgenstern Date: Thu, 18 Jul 2024 22:25:49 +0300 Subject: [PATCH] Remove crashing holiday (#11988) --- core/src/com/unciv/logic/HolidayDates.kt | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/core/src/com/unciv/logic/HolidayDates.kt b/core/src/com/unciv/logic/HolidayDates.kt index e686ad3c49..c8151a3e29 100644 --- a/core/src/com/unciv/logic/HolidayDates.kt +++ b/core/src/com/unciv/logic/HolidayDates.kt @@ -55,16 +55,16 @@ object HolidayDates { override fun getByYear(year: Int) = DateRange.of(LocalDate.of(year, 11, 30).closestWeekday(DayOfWeek.SUNDAY)) }, - Qingming { - // https://en.wikipedia.org/wiki/Qingming_Festival - // "it falls on the first day of the fifth solar term (also called Qingming) of the traditional Chinese lunisolar calendar. - // This makes it the 15th day after the Spring Equinox, either 4, 5 or 6 April in a given year" - override fun getByYear(year: Int): DateRange { - val springEquinoxInstant = Tables.equinoxes[year] ?: return DateRange.never - val springEquinox = LocalDate.ofInstant(springEquinoxInstant, ZoneId.systemDefault()) - return DateRange.of(springEquinox.plusDays(15L)) - } - }, +// Qingming { +// // https://en.wikipedia.org/wiki/Qingming_Festival +// // "it falls on the first day of the fifth solar term (also called Qingming) of the traditional Chinese lunisolar calendar. +// // This makes it the 15th day after the Spring Equinox, either 4, 5 or 6 April in a given year" +// override fun getByYear(year: Int): DateRange { +// val springEquinoxInstant = Tables.equinoxes[year] ?: return DateRange.never +// val springEquinox = LocalDate.ofInstant(springEquinoxInstant, ZoneId.systemDefault()) +// return DateRange.of(springEquinox.plusDays(15L)) +// } +// }, Diwali(0.2f) { // https://en.wikipedia.org/wiki/Diwali#Dates // Darkest new moon night between mid-october and mid-november, then add +/- two days for a 5-day festival... @@ -125,7 +125,7 @@ object HolidayDates { abstract fun getByYear(year: Int): DateRange companion object { - fun safeValueOf(name: String) = values().firstOrNull { it.name == name } + fun safeValueOf(name: String) = entries.firstOrNull { it.name == name } } } @@ -155,7 +155,7 @@ object HolidayDates { fun getHolidayByDate(date: LocalDate = LocalDate.now()): Holidays? { return System.getProperty("easterEgg")?.let { Holidays.safeValueOf(it) - } ?: Holidays.values().firstOrNull { + } ?: Holidays.entries.firstOrNull { val range = it.getByYear(date.year) date in range && Random.nextFloat() <= it.chance }