From 38b2ecb383ff878a5331d712395fab1a46021b49 Mon Sep 17 00:00:00 2001
From: Jesusaves <cpntb1@ymail.com>
Date: Sat, 5 May 2018 22:32:49 -0300
Subject: Initial part of hercules updates

---
 conf/char/char-server.conf | 26 ++++++++++++++++++++++++++
 conf/map/battle/guild.conf |  9 +++++----
 2 files changed, 31 insertions(+), 4 deletions(-)

(limited to 'conf')

diff --git a/conf/char/char-server.conf b/conf/char/char-server.conf
index db433244a..b76898b61 100644
--- a/conf/char/char-server.conf
+++ b/conf/char/char-server.conf
@@ -218,6 +218,32 @@ char_configuration: {
 		// Default: 3
 		// Maximum allowed by clientside: 3
 		max_tries: 3
+
+		// Whether or not to refuse pincodes that are blacklisted
+		// Default: true
+		check_blacklisted: false
+
+		// Blacklisted pincodes
+		blacklist: [
+			"0000",
+			"1111",
+			"2222",
+			"3333",
+			"4444",
+			"5555",
+			"6666",
+			"7777",
+			"8888",
+			"9999",
+			"0123",
+			"1234",
+			"2345",
+			"3456",
+			"4567",
+			"5678",
+			"6789",
+			"7890"
+		]
 	}
 
 }
diff --git a/conf/map/battle/guild.conf b/conf/map/battle/guild.conf
index c8f8db8c3..90282ef53 100644
--- a/conf/map/battle/guild.conf
+++ b/conf/map/battle/guild.conf
@@ -39,10 +39,11 @@ guild_exp_limit: 50
 // Maximum castles one guild can own (0 = unlimited)
 guild_max_castles: 0
 
-// Restart guild skills cooldown by relog? (Note 1)
-// When false, you relog with the same cooldown remaining as from when you
-// logged out, true restarts the cooldown upon login to its full duration. 
-guild_skill_relog_delay: false
+// How guild skills cooldown works?
+// 0 - you relog with the same cooldown remaining as from when you logged out
+// 1 - restarts the cooldown upon login to its full duration.
+// 2 - like 1, but your logged off time is also decreased from the remaining cooldown (Aegis)
+guild_skill_relog_delay: 2
 
 // Damage adjustments for WOE battles against defending Guild monsters (Note 2)
 castle_defense_rate: 100
-- 
cgit v1.2.3-60-g2f50