summaryrefslogtreecommitdiff
path: root/conf-tmpl
diff options
context:
space:
mode:
authorskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-03-03 14:38:13 +0000
committerskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-03-03 14:38:13 +0000
commitd214e16b4875f2be40c817f609d940a6ff5ef088 (patch)
tree52cd02c0d0d6c90dd74d26db0755223f3dc818c9 /conf-tmpl
parentecfd2c2ae5e714347dd86eba90d2ad051d84e447 (diff)
downloadhercules-d214e16b4875f2be40c817f609d940a6ff5ef088.tar.gz
hercules-d214e16b4875f2be40c817f609d940a6ff5ef088.tar.bz2
hercules-d214e16b4875f2be40c817f609d940a6ff5ef088.tar.xz
hercules-d214e16b4875f2be40c817f609d940a6ff5ef088.zip
- Trick dead now ends on logout
- Added mapflag nocommand which blocks @/# commands unless your gm level is above gm_skill_unconditional's level. - Fixed weapon scripts not being executed unless the weapon was forged. - gm_skill_unconditional is now a no/gm-level setting instead of yes/no git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@5446 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'conf-tmpl')
-rw-r--r--conf-tmpl/battle/gm.conf2
-rw-r--r--conf-tmpl/msg_athena.conf2
2 files changed, 2 insertions, 2 deletions
diff --git a/conf-tmpl/battle/gm.conf b/conf-tmpl/battle/gm.conf
index 2a7ef55f2..34630da1b 100644
--- a/conf-tmpl/battle/gm.conf
+++ b/conf-tmpl/battle/gm.conf
@@ -43,7 +43,7 @@ gm_all_skill_add_abra: no
gm_all_equipment: no
// [GM] Can use skills without meeting the required conditions (no
-// blue gems? no problem
+// blue gems? no or minimum GM level to bypass requirements.
gm_skill_unconditional: no
// [GM] Can join a password protected chat? (No or mimimum GM level)
diff --git a/conf-tmpl/msg_athena.conf b/conf-tmpl/msg_athena.conf
index 6099df769..af87144c1 100644
--- a/conf-tmpl/msg_athena.conf
+++ b/conf-tmpl/msg_athena.conf
@@ -149,7 +149,7 @@
140: Character's disguise applied.
141: Character's undisguise applied.
142: Character is not disguised.
-//143 Free
+143: Commands are disabled on this map.
144: Invalid actual E-mail. If you have default E-mail, type a@a.com.
145: Invalid new E-mail. Please enter a real E-mail.
146: New E-mail must be a real E-mail.