瀏覽代碼

Reworked Zaken config

CryDeS 2 年之前
父節點
當前提交
b01a2117d2

+ 15 - 19
src/main/java/com/l2jserver/gameserver/config/GrandBossConfiguration.java

@@ -22,6 +22,8 @@ import static java.util.concurrent.TimeUnit.MINUTES;
 import static org.aeonbits.owner.Config.HotReloadType.ASYNC;
 import static org.aeonbits.owner.Config.HotReloadType.ASYNC;
 import static org.aeonbits.owner.Config.LoadType.MERGE;
 import static org.aeonbits.owner.Config.LoadType.MERGE;
 
 
+import java.util.List;
+
 import org.aeonbits.owner.Config.HotReload;
 import org.aeonbits.owner.Config.HotReload;
 import org.aeonbits.owner.Config.LoadPolicy;
 import org.aeonbits.owner.Config.LoadPolicy;
 import org.aeonbits.owner.Config.Sources;
 import org.aeonbits.owner.Config.Sources;
@@ -95,25 +97,19 @@ public interface GrandBossConfiguration extends Reloadable {
 	
 	
 	@Key("BelethMinPlayers")
 	@Key("BelethMinPlayers")
 	Integer getBelethMinPlayers();
 	Integer getBelethMinPlayers();
-
+	
 	@Key("AllowZakenWithoutParty")
 	@Key("AllowZakenWithoutParty")
 	Boolean getAllowZakenWithoutParty();
 	Boolean getAllowZakenWithoutParty();
-
-	@Key("Zaken60MinPlayers")
-	Integer getZaken60MinPlayers();
-
-	@Key("Zaken60MaxPlayers")
-	Integer getZaken60MaxPlayers();
-
-	@Key("Zaken83MinPlayers")
-	Integer getZaken83MinPlayers();
-
-	@Key("Zaken83MaxPlayers")
-	Integer getZaken83MaxPlayers();
-
-	@Key("Zaken60MinPlayerLevel")
-	Integer getZaken60MinPlayerLevel();
-
-	@Key("Zaken83MinPlayerLevel")
-	Integer getZaken83MinPlayerLevel();
+	
+	@Key("ZakenMinPlayers")
+	List<Integer> getZakenMinPlayers();
+	
+	@Key("ZakenMaxPlayers")
+	List<Integer> getZakenMaxPlayers();
+	
+	@Key("ZakenMinPlayerLevel")
+	List<Integer> getZakenMinPlayerLevel();
+	
+	@Key("ZakenCanBeRevealedByAOESpells")
+	Boolean getZakenCanBeRevealedByAoeSPells();
 }
 }

+ 18 - 23
src/main/resources/config/grandboss.properties

@@ -86,26 +86,21 @@ BelethMinPlayers = 36
 # Default: False
 # Default: False
 AllowZakenWithoutParty = False
 AllowZakenWithoutParty = False
 
 
-# Zaken 60 lvl min player level
-# Default: 55
-Zaken60MinPlayerLevel = 55
-
-# Zaken 83 lvl min player level
-# Default: 78
-Zaken83MinPlayerLevel = 78
-
-# Zaken 60lvl min players
-# Default: 9
-Zaken60MinPlayers = 9
-
-# Zaken 60lvl max players
-# Default: 27
-Zaken60MaxPlayers = 27
-
-# Zaken 60lvl min players
-# Default: 9
-Zaken83MinPlayers = 9
-
-# Zaken 60lvl max players
-# Default: 27
-Zaken83MaxPlayers = 27
+# Zaken 60 (day), Zaken 83 (day) min players count, Zaken 60 (night)
+# Default: 9, 9, 72
+# Note: 72 because on retail Zaken 60 (night) required 8 parties at minimum.
+ZakenMinPlayers = 9,9,72
+
+# Zaken 60 (day), Zaken 83 (day), Zaken 60 (night) min players level
+# Default: 27,27,450
+# Note: 450 because on retail Zaken 60 (night) can handle up to 50 parties at maximum.
+ZakenMaxPlayers = 27,27,450
+
+# Zaken 60(day), Zaken 83(day), Zaken 60 (night) min player levels
+# Default: 55, 78, 55
+ZakenMinPlayerLevel = 55,78,55
+
+# Is Zaken can be revealed without candles by using AOE spells
+# Default: True
+# Note: Retail have bug when zaken can be revealed even without talking with candles just by spamming aoe spells in every room
+ZakenCanBeRevealedByAOESpells = True