summaryrefslogtreecommitdiff
path: root/conf/battle
diff options
context:
space:
mode:
authorMysteries <mysteriousragnarok@hotmail.com>2013-02-10 22:22:23 -0500
committerMysteries <mysteriousragnarok@hotmail.com>2013-02-10 22:22:23 -0500
commit56a20bb18d6fde61bb82cf160a131eb54d464148 (patch)
tree6c3aa9dfa71e3c4e464fc86f611c40088bf8edd3 /conf/battle
parenta2b070b52f1a48dc83ea540fd124c4e47022624a (diff)
downloadhercules-56a20bb18d6fde61bb82cf160a131eb54d464148.tar.gz
hercules-56a20bb18d6fde61bb82cf160a131eb54d464148.tar.bz2
hercules-56a20bb18d6fde61bb82cf160a131eb54d464148.tar.xz
hercules-56a20bb18d6fde61bb82cf160a131eb54d464148.zip
Merged rAthena Changes
- Added checkidle() command that was present in rAthena since r17126 - Documented checkidle() function - More clearly defined variables in eA Job System documentation - Added missing 'stopnpctimer' in custom Cluckers script
Diffstat (limited to 'conf/battle')
-rw-r--r--conf/battle/skill.conf6
1 files changed, 3 insertions, 3 deletions
diff --git a/conf/battle/skill.conf b/conf/battle/skill.conf
index ecb2dd00a..622ce7877 100644
--- a/conf/battle/skill.conf
+++ b/conf/battle/skill.conf
@@ -277,6 +277,6 @@ invincible.nodamage: no
dancing_weaponswitch_fix: yes
// Skill Trap Type (GvG)
-// 0: (official) traps in GvG only makes player unable to move after its walk path is complete, and it activates other traps on the way.
-// 1: trap in GvG makes player stop moving right when stepping over it.
-skill_trap_type: 0
+// 0: (official) Traps in GvG only make player stop moving after its walk path is complete, and it activates other traps on the way.
+// 1: Traps in GvG make player stop moving right when stepping over it.
+skill_trap_type: 0 \ No newline at end of file