diff --git a/trunk/dist/game/config/General.properties b/trunk/dist/game/config/General.properties index c398f6bb9b..2b2552b080 100644 --- a/trunk/dist/game/config/General.properties +++ b/trunk/dist/game/config/General.properties @@ -877,6 +877,18 @@ HBCEFairPlay = True # Default: False HellboundWithoutQuest = False +# --------------------------------------------------------------------------- +# Arcan Ritual setings +# --------------------------------------------------------------------------- + +# If true, Arcan Ritual npcs spawn +# Default: True +ArcanRitual = True + +# Arcan Ritual change interval (in minutes) +# Default: 30 +ArcanRitualInterval = 30 + # --------------------------------------------------------------------------- # Bot Report Button settings # --------------------------------------------------------------------------- diff --git a/trunk/java/com/l2jserver/Config.java b/trunk/java/com/l2jserver/Config.java index 43d530ff18..d11b035b2f 100644 --- a/trunk/java/com/l2jserver/Config.java +++ b/trunk/java/com/l2jserver/Config.java @@ -660,6 +660,8 @@ public final class Config public static int MIN_BLOCK_CHECKER_TEAM_MEMBERS; public static boolean HBCE_FAIR_PLAY; public static boolean HELLBOUND_WITHOUT_QUEST; + public static boolean ARCAN_RITUAL; + public static int ARCAN_RITUAL_INTERVAL; public static int PLAYER_MOVEMENT_BLOCK_TIME; public static int ABILITY_MAX_POINTS; public static long ABILITY_POINTS_RESET_ADENA; @@ -2027,6 +2029,9 @@ public final class Config HBCE_FAIR_PLAY = General.getBoolean("HBCEFairPlay", false); HELLBOUND_WITHOUT_QUEST = General.getBoolean("HellboundWithoutQuest", false); + ARCAN_RITUAL = General.getBoolean("ArcanRitual", true); + ARCAN_RITUAL_INTERVAL = General.getInt("ArcanRitualInterval", 30); + NORMAL_ENCHANT_COST_MULTIPLIER = General.getInt("NormalEnchantCostMultipiler", 1); SAFE_ENCHANT_COST_MULTIPLIER = General.getInt("SafeEnchantCostMultipiler", 5); diff --git a/trunk/java/com/l2jserver/gameserver/instancemanager/ArcanRitualManager.java b/trunk/java/com/l2jserver/gameserver/instancemanager/ArcanRitualManager.java index a4e7858dd9..5a81a05b74 100644 --- a/trunk/java/com/l2jserver/gameserver/instancemanager/ArcanRitualManager.java +++ b/trunk/java/com/l2jserver/gameserver/instancemanager/ArcanRitualManager.java @@ -1,12 +1,18 @@ /* - * This program is free software: you can redistribute it and/or modify it under - * the terms of the GNU General Public License as published by the Free Software - * Foundation, either version 3 of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS - * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - * + * Copyright (C) 2004-2015 L2J Server + * + * This file is part of L2J Server. + * + * L2J Server is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * L2J Server is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ @@ -14,6 +20,7 @@ package com.l2jserver.gameserver.instancemanager; import java.util.ArrayList; +import com.l2jserver.Config; import com.l2jserver.gameserver.ThreadPoolManager; import com.l2jserver.gameserver.model.L2World; import com.l2jserver.gameserver.model.Location; @@ -35,7 +42,6 @@ public class ArcanRitualManager extends Quest { private static final int BLUE_TRIGGER = 262001; private static final int RED_TRIGGER = 262003; - private static final long DELAY = 30 * 60 * 1000L; // 30min private static final Location ARCAN_TOWN_LOC = new Location(207096, 88696, -1129); // @formatter:off static final int[][] RITUAL_NPCS = @@ -150,7 +156,10 @@ public class ArcanRitualManager extends Quest } addEnterZoneId(arcanZone.getId()); ritualStage = BLUE_TRIGGER; - ThreadPoolManager.getInstance().scheduleGeneralAtFixedRate(new ChangeStage(), DELAY, DELAY); + if (Config.ARCAN_RITUAL) + { + ThreadPoolManager.getInstance().scheduleGeneralAtFixedRate(new ChangeStage(), Config.ARCAN_RITUAL_INTERVAL, Config.ARCAN_RITUAL_INTERVAL); + } } @Override