summaryrefslogtreecommitdiff
path: root/conf-tmpl
diff options
context:
space:
mode:
authorskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-05-10 04:04:36 +0000
committerskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-05-10 04:04:36 +0000
commit14d2e0e61a8d2ca85f15eb0c8eb6238564edb375 (patch)
tree44b8aacfec5239f554fa2bfe4c2246e41778dc23 /conf-tmpl
parentecbca44f124c5e379c9a1ef5433c2c3c0ed07c4f (diff)
downloadhercules-14d2e0e61a8d2ca85f15eb0c8eb6238564edb375.tar.gz
hercules-14d2e0e61a8d2ca85f15eb0c8eb6238564edb375.tar.bz2
hercules-14d2e0e61a8d2ca85f15eb0c8eb6238564edb375.tar.xz
hercules-14d2e0e61a8d2ca85f15eb0c8eb6238564edb375.zip
- Rewrote/cleaned up trade.c for a more clean trading implementation.
- Added @request commands, sends a request to all connected GMs of lowest_gm_level or above as a whisper message. Defaults to gm level 20 users. - Made SC_COMBO status start delay attackabletime and walkdelay by sc's duration regardless of skill used (previously it was only for TK kicks, now it's for both those and Monk combos) git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@6542 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'conf-tmpl')
-rw-r--r--conf-tmpl/atcommand_athena.conf3
-rw-r--r--conf-tmpl/msg_athena.conf4
2 files changed, 6 insertions, 1 deletions
diff --git a/conf-tmpl/atcommand_athena.conf b/conf-tmpl/atcommand_athena.conf
index 496e6132d..0cce4e09a 100644
--- a/conf-tmpl/atcommand_athena.conf
+++ b/conf-tmpl/atcommand_athena.conf
@@ -181,6 +181,9 @@ gmotd: 20
// follow a player (including warping to them)
follow: 20
+// Sends a request to all connected GMs (via the gm whisper system)
+request: 20
+
// Disconnects a user from the server (1 command + right click menu for GM "(name) force to quit").
kick: 20
diff --git a/conf-tmpl/msg_athena.conf b/conf-tmpl/msg_athena.conf
index f604c55c3..46de6d187 100644
--- a/conf-tmpl/msg_athena.conf
+++ b/conf-tmpl/msg_athena.conf
@@ -284,7 +284,9 @@
272: You can't trade on this map
273: Commands available:
274: %d commands found.
-275: No commands found.
+275: Usage: @request <petition/message to online GMs>.
+276: (@request): %s
+277: @request sent.
// Guild Castles Number
// --------------------
299: ?? Castles