summaryrefslogtreecommitdiff
path: root/conf
diff options
context:
space:
mode:
authorshennetsind <ind@henn.et>2013-02-12 02:18:53 -0200
committershennetsind <ind@henn.et>2013-02-12 02:18:53 -0200
commit20abc4a94a4bd3a7428c042cc6d1c313272fbc28 (patch)
treec03c87e49d48e2e9c891f76bebd19c5bacea27d0 /conf
parent16859820551f61bf26a99139fd6e4fd9425f1154 (diff)
parente56ad900704299c53c55b8c6fd5cfc958b712090 (diff)
downloadhercules-20abc4a94a4bd3a7428c042cc6d1c313272fbc28.tar.gz
hercules-20abc4a94a4bd3a7428c042cc6d1c313272fbc28.tar.bz2
hercules-20abc4a94a4bd3a7428c042cc6d1c313272fbc28.tar.xz
hercules-20abc4a94a4bd3a7428c042cc6d1c313272fbc28.zip
Merge branch 'master' of https://github.com/HerculesWS/Hercules
Diffstat (limited to 'conf')
-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