Custom specific Olympiad competition days.

L2J_Mobius_Classic_2.0_Saviors/dist/game/config/Olympiad.ini

@@ -11,7 +11,8 @@
 
 # Olympiad Start Time in Military hours Default 6pm (18) 
 # Default: 18
-AltOlyStartTime = 18
+# Classic: 20
+AltOlyStartTime = 20
 
 # Olympiad Start Time for Min's, Default 00 so at the start of the hour.
 # Default: 00
@@ -20,7 +21,8 @@ AltOlyMin = 00
 # Olympiad Competition Period, Default 6 hours.
 # (If set different, should be increment by 10mins)
 # Default: 21600000
-AltOlyCPeriod = 21600000
+# Classic: 14400000
+AltOlyCPeriod = 14400000
 
 # Olympiad Battle Period, Default 5 minutes.
 # Default: 300000
@@ -172,13 +174,14 @@ AltOlyMaxWeeklyMatchesTeam = 10
 # ---------------------------------------------------------------------------
 # Enable/disable custom period settings.
 # Default: False
-AltOlyUseCustomPeriodSettings = False
- 
+# Classic: True
+AltOlyUseCustomPeriodSettings = True
+
 # Change the type of delay between two Olympiads.
 # Available values: MONTH, WEEK, DAY
 # Default: MONTH
 AltOlyPeriodType = MONTH
- 
+
 # Change the Olympiad frequency.
 # The value is a multiplier of period type,
 # i.e. if type is MONTH and multiplier is 2,
@@ -186,3 +189,8 @@ AltOlyPeriodType = MONTH
 # Default: 1
 # Note! If type = DAY, multiplier must be >= 7!
 AltOlyPeriodMultiplier = 1
+
+# Enable competitions only on specific days.
+# Default: 1,2,3,4,5,6,7 (SUNDAY,MONDAY,TUESDAY,WEDNESDAY,THURSDAY,FRIDAY,SATURDAY)
+# Classic: 6,7
+AltOlyCompetitionDays = 6,7

L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/Config.java

@@ -545,6 +545,7 @@ public final class Config
 	public static boolean ALT_OLY_USE_CUSTOM_PERIOD_SETTINGS;
 	public static String ALT_OLY_PERIOD;
 	public static int ALT_OLY_PERIOD_MULTIPLIER;
+	public static List<Integer> ALT_OLY_COMPETITION_DAYS;
 	public static int ALT_MANOR_REFRESH_TIME;
 	public static int ALT_MANOR_REFRESH_MIN;
 	public static int ALT_MANOR_APPROVE_TIME;
@@ -2227,6 +2228,11 @@ public final class Config
 			ALT_OLY_USE_CUSTOM_PERIOD_SETTINGS = Olympiad.getBoolean("AltOlyUseCustomPeriodSettings", false);
 			ALT_OLY_PERIOD = Olympiad.getString("AltOlyPeriod", "MONTH");
 			ALT_OLY_PERIOD_MULTIPLIER = Olympiad.getInt("AltOlyPeriodMultiplier", 1);
+			ALT_OLY_COMPETITION_DAYS = new ArrayList<>();
+			for (String s : Olympiad.getString("AltOlyCompetitionDays", "1,2,3,4,5,6,7").split(","))
+			{
+				ALT_OLY_COMPETITION_DAYS.add(Integer.parseInt(s));
+			}
 			
 			final File hexIdFile = new File(HEXID_FILE);
 			if (hexIdFile.exists())

L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/olympiad/Olympiad.java

@@ -354,6 +354,36 @@ public class Olympiad extends ListenersContainer
 		}
 		
 		_compStart = Calendar.getInstance();
+		if (Config.ALT_OLY_USE_CUSTOM_PERIOD_SETTINGS)
+		{
+			final int currentDay = _compStart.get(Calendar.DAY_OF_WEEK);
+			boolean dayFound = false;
+			int dayCounter = 0;
+			for (int i = currentDay; i < 8; i++)
+			{
+				if (Config.ALT_OLY_COMPETITION_DAYS.contains(i))
+				{
+					dayFound = true;
+					break;
+				}
+				dayCounter++;
+			}
+			if (!dayFound)
+			{
+				for (int i = 1; i < 8; i++)
+				{
+					if (Config.ALT_OLY_COMPETITION_DAYS.contains(i))
+					{
+						break;
+					}
+					dayCounter++;
+				}
+			}
+			if (dayCounter > 0)
+			{
+				_compStart.add(Calendar.DAY_OF_MONTH, dayCounter);
+			}
+		}
 		_compStart.set(Calendar.HOUR_OF_DAY, COMP_START);
 		_compStart.set(Calendar.MINUTE, COMP_MIN);
 		_compEnd = _compStart.getTimeInMillis() + COMP_PERIOD;
@@ -646,6 +676,36 @@ public class Olympiad extends ListenersContainer
 	private long setNewCompBegin()
 	{
 		_compStart = Calendar.getInstance();
+		if (Config.ALT_OLY_USE_CUSTOM_PERIOD_SETTINGS)
+		{
+			final int currentDay = _compStart.get(Calendar.DAY_OF_WEEK);
+			boolean dayFound = false;
+			int dayCounter = 0;
+			for (int i = currentDay; i < 8; i++)
+			{
+				if (Config.ALT_OLY_COMPETITION_DAYS.contains(i))
+				{
+					dayFound = true;
+					break;
+				}
+				dayCounter++;
+			}
+			if (!dayFound)
+			{
+				for (int i = 1; i < 8; i++)
+				{
+					if (Config.ALT_OLY_COMPETITION_DAYS.contains(i))
+					{
+						break;
+					}
+					dayCounter++;
+				}
+			}
+			if (dayCounter > 0)
+			{
+				_compStart.add(Calendar.DAY_OF_MONTH, dayCounter);
+			}
+		}
 		_compStart.set(Calendar.HOUR_OF_DAY, COMP_START);
 		_compStart.set(Calendar.MINUTE, COMP_MIN);
 		_compStart.add(Calendar.HOUR_OF_DAY, 24);