summaryrefslogtreecommitdiff
path: root/conf
diff options
context:
space:
mode:
authorHaru <haru@dotalux.com>2018-02-06 20:18:07 +0100
committerGitHub <noreply@github.com>2018-02-06 20:18:07 +0100
commit19c94017a31d86f7848085162ffb741770975128 (patch)
tree33a5cf4b2a580a07f1b3868153123fe4dce49f2f /conf
parenta928f009f5a7bad77eda090ec7af551c2f647d5b (diff)
parent587dd19c0269b3c8089838a5442260a185b19ead (diff)
downloadhercules-19c94017a31d86f7848085162ffb741770975128.tar.gz
hercules-19c94017a31d86f7848085162ffb741770975128.tar.bz2
hercules-19c94017a31d86f7848085162ffb741770975128.tar.xz
hercules-19c94017a31d86f7848085162ffb741770975128.zip
Merge pull request #1718 from Murilo-BiO/clan_system
Implementation of Official Clan System
Diffstat (limited to 'conf')
-rw-r--r--conf/clans.conf48
-rw-r--r--conf/map/logs.conf5
-rw-r--r--conf/messages.conf6
3 files changed, 56 insertions, 3 deletions
diff --git a/conf/clans.conf b/conf/clans.conf
new file mode 100644
index 000000000..85ef280fe
--- /dev/null
+++ b/conf/clans.conf
@@ -0,0 +1,48 @@
+//================= Hercules Configuration ================================
+//= _ _ _
+//= | | | | | |
+//= | |_| | ___ _ __ ___ _ _| | ___ ___
+//= | _ |/ _ \ '__/ __| | | | |/ _ \/ __|
+//= | | | | __/ | | (__| |_| | | __/\__ \
+//= \_| |_/\___|_| \___|\__,_|_|\___||___/
+//================= License ===============================================
+//= This file is part of Hercules.
+//= http://herc.ws - http://github.com/HerculesWS/Hercules
+//=
+//= Copyright (C) 2017 Hercules Dev Team
+//=
+//= Hercules 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.
+//=
+//= You should have received a copy of the GNU General Public License
+//= along with this program. If not, see <http://www.gnu.org/licenses/>.
+//=========================================================================
+//= Clan System local configuration file.
+//=========================================================================
+
+clan_configuration: {
+
+ // Maximum players for each clan
+ MaxMembers: 500
+
+ // Maximum alliances/oppositions for each clan
+ MaxRelations: 6
+
+ // how many hours player must be inactive to be kicked?
+ // Disabled: 0
+ // Official: 336 (2 weeks)
+ InactivityKickTime: 336
+
+ // Checks each clan member every 'InactivityCheckTime' hour(s) (default 24h, minimum value of 1h)
+ InactivityCheckTime: 24
+
+ // Clan Database
+ @include "db/clans.conf"
+}
diff --git a/conf/map/logs.conf b/conf/map/logs.conf
index 4f3a8a4db..e2dc7fbdd 100644
--- a/conf/map/logs.conf
+++ b/conf/map/logs.conf
@@ -164,13 +164,14 @@ map_log: {
// 0x04 - Log Party messages
// 0x08 - Log Guild messages
// 0x10 - Log Main chat messages
+ // 0x20 - Log Clan messages
// Example:
// log_chat: 0x5 = logs both Whisper & Party messages
// log_chat: 0x8 = logs only Guild messages
- // log_chat: 0x1f = logs everything
+ // log_chat: 0x2f = logs everything
// FIXME: This isn't fully functional, as of now it's only checking
// if the log is active or not [Panikon]
- log_chat: 0x1f
+ log_chat: 0x2f
// Disable chat logging when WoE is running? (Note 1)
log_chat_woe_disable: false
diff --git a/conf/messages.conf b/conf/messages.conf
index 78f0c6aa9..b5a675b25 100644
--- a/conf/messages.conf
+++ b/conf/messages.conf
@@ -151,7 +151,11 @@
131: Unable to spawn clone.
132: Slave clone spawned.
133: Unable to spawn slave clone.
-//134-142 FREE (possibly for other clone types)
+//134-138 FREE (possibly for other clone types)
+139: CvC ON |
+140: You can't join in a clan if you're in a guild.
+141: CvC is already Off.
+142: CvC is already On.
143: Commands are disabled in this map.
144: Invalid e-mail. If your email hasn't been set, use a@a.com.
145: Invalid new e-mail. Please enter a real e-mail address.