summaryrefslogtreecommitdiff
path: root/conf
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2018-05-03 23:38:42 +0300
committerAndrei Karas <akaras@inbox.ru>2018-05-03 23:38:42 +0300
commit6206e4ccf560cb950dbbd2174ccd8a92f5526b5d (patch)
tree41cb4b0e0c0f7b518ca3926b727e224a1b91ece0 /conf
parent9b214b4bc9c8a8a84411e299344328ab44eab86c (diff)
downloadserverdata-6206e4ccf560cb950dbbd2174ccd8a92f5526b5d.tar.gz
serverdata-6206e4ccf560cb950dbbd2174ccd8a92f5526b5d.tar.bz2
serverdata-6206e4ccf560cb950dbbd2174ccd8a92f5526b5d.tar.xz
serverdata-6206e4ccf560cb950dbbd2174ccd8a92f5526b5d.zip
Update from hercules.
Add new fields into conf dbs. Convert mob_skill_db into libconf format.
Diffstat (limited to 'conf')
-rw-r--r--conf/char/char-server.conf26
-rw-r--r--conf/map/battle/feature.conf2
-rw-r--r--conf/map/battle/guild.conf9
3 files changed, 32 insertions, 5 deletions
diff --git a/conf/char/char-server.conf b/conf/char/char-server.conf
index db433244..03f333c4 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: true
+
+ // 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/feature.conf b/conf/map/battle/feature.conf
index c0c60e47..8d19539b 100644
--- a/conf/map/battle/feature.conf
+++ b/conf/map/battle/feature.conf
@@ -71,7 +71,7 @@ features: {
// false: disable
enable_homun_autofeed: true
- // Enable Attendance System for clients >= 2018-03-07bRagexeRE or 2018-04-04bRagexe
+ // Enable Attendance System for clients >= 2018-03-07bRagexeRE or 2018-04-04bRagexe or 2018-04-11aRagexe_zero
// true: enable (Default)
// false: disable
enable_attendance_system: true
diff --git a/conf/map/battle/guild.conf b/conf/map/battle/guild.conf
index c8f8db8c..90282ef5 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