summaryrefslogtreecommitdiff
path: root/conf-tmpl/battle
diff options
context:
space:
mode:
authorultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec>2007-08-24 09:06:39 +0000
committerultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec>2007-08-24 09:06:39 +0000
commit66be8e2d2c939c99784302ffb224593f9a888f44 (patch)
tree6bb7831cadf13f2dd96bd5f13f46c1a32cc08fa5 /conf-tmpl/battle
parent758e7e6a9a995ea27f0ec5461a588c2278f45ec4 (diff)
downloadhercules-66be8e2d2c939c99784302ffb224593f9a888f44.tar.gz
hercules-66be8e2d2c939c99784302ffb224593f9a888f44.tar.bz2
hercules-66be8e2d2c939c99784302ffb224593f9a888f44.tar.xz
hercules-66be8e2d2c939c99784302ffb224593f9a888f44.zip
Fixed a documentation mistake in 'areamonster' (missing argument).
Fixed incorrect sprite used for twintowers event npc. Fixed a mistake in changelog. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@11074 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'conf-tmpl/battle')
-rw-r--r--conf-tmpl/battle/gm.conf10
1 files changed, 5 insertions, 5 deletions
diff --git a/conf-tmpl/battle/gm.conf b/conf-tmpl/battle/gm.conf
index 981672103..040a91ef7 100644
--- a/conf-tmpl/battle/gm.conf
+++ b/conf-tmpl/battle/gm.conf
@@ -36,8 +36,8 @@ gm_all_skill: no
// [GM] Can equip anything? (No or minimum GM level, can cause client errors.)
gm_all_equipment: no
-// [GM] Can use skills without meeting the required conditions (no
-// blue gems? no or minimum GM level to bypass requirements.
+// [GM] Can use skills without meeting the required conditions (items, etc...)?
+// 'no' or minimum GM level to bypass requirements.
gm_skill_unconditional: no
// [GM] Can join a password protected chat? (No or mimimum GM level)
@@ -54,6 +54,9 @@ atcommand_gm_only: no
// Is the character of a GM account set as the object of a display by @ command etc. or not?
hide_GM_session: no
+// At what GM level can you see GMs and Account/Char IDs in the @who command?
+who_display_aid: 40
+
// Ban people that try trade dupe.
// Duration of the ban, in minutes (default: 5). To disable the ban, set 0.
ban_hack_trade: 5
@@ -84,9 +87,6 @@ gm_cant_drop_max_lv: 0
// no/0 can be used to disable it.
disp_hpmeter: 0
-// At what GM level can users see Account/Character IDs in the @who command?
-who_display_aid: 40
-
// Players Titles (check msg_athena.conf for title strings)
// You may assign different titles for your Players and GMs
title_lvl1: 1