Merge branch 'master' of https://github.com/HerculesWS/Hercules

1 files changed, 7 insertions, 7 deletions

diff --git a/conf/battle/skill.conf b/conf/battle/skill.conf
index df419b262..bc107f3d7 100644
--- a/conf/battle/skill.conf
+++ b/conf/battle/skill.conf
@@ -20,7 +20,7 @@ delay_rate: 100
 delay_dependon_dex: no
 delay_dependon_agi: no
 
-// Minimum allowed delay for ANY skills after casting (in miliseconds) (Note 1)
+// Minimum allowed delay for ANY skills after casting (in milliseconds) (Note 1)
 // Note: Setting this to anything above 0 can stop speedhacks.
 min_skill_delay_limit: 100
 
@@ -91,7 +91,7 @@ defunit_not_enemy: no
 
 // Do skills do at least 'hits' damage when they don't miss/are blocked?
 //(for example, will firebolts always do "number of bolts" damage versus plants?)
-//Values (add as appropiate): 1 for weapon-based attacks, 2 for magic attacks, 4 for misc attacks.
+//Values (add as appropriate): 1 for weapon-based attacks, 2 for magic attacks, 4 for misc attacks.
 skill_min_damage: 6
 
 // The delay rate of monk's combo (Note 2)
@@ -128,7 +128,7 @@ traps_setting: 0
 summon_flora_setting: 3
 
 // Whether placed down skills will check walls (Note 1)
-// (Makes it so that Storm Gust/Lord of Vermillion/etc when casted next to a wall, won't hit on the other side) 
+// (Makes it so that Storm Gust/Lord of Vermillion/etc when cast next to a wall, won't hit on the other side) 
 skill_wall_check: yes
 
 // When cloaking, Whether the wall is checked or not. (Note 1)
@@ -168,7 +168,7 @@ sense_type: 1
 // 1 = Athena style (multiple consecutive attacks)
 finger_offensive_type: 0
 
-// Grandcross Settings (Dont mess with these)
+// Grandcross Settings (Don't mess with these)
 // If set to no, hit interval is increased based on the amount of mobs standing on the same cell
 // (means that when there's stacked mobs in the same cell, they won't receive all hits)
 gx_allhit: no
@@ -212,7 +212,7 @@ berserk_cancels_buffs: no
 max_heal: 9999
 max_heal_lv: 11
 
-// Emergency Recall Guild Skill setting (add as appropiate).
+// Emergency Recall Guild Skill setting (add as appropriate).
 // Note that for the skill to be usable at all, 
 // you need at least one of 1/2 and 4/8
 // 1: Skill is usable outside of woe.
@@ -223,7 +223,7 @@ max_heal_lv: 11
 //    (it will work on GVG castles even if they are set to nowarpto, though)
 emergency_call: 11
 
-// Guild Aura Skills setting (add as appropiate).
+// Guild Aura Skills setting (add as appropriate).
 // (This affects GD_LEADERSHIP, GD_GLORYWOUNDS, GD_SOULCOLD and GD_HAWKEYES)
 // Note that for the skill to be usable at all, 
 // you need at least one of 1/2 and 4/8
@@ -258,7 +258,7 @@ sg_angel_skill_ratio: 10
 skill_add_heal_rate: 7
 
 // Whether the damage of EarthQuake with a single target on screen is able to be reflected.
-// Note: On offcial server, EQ is reflectable when there is only one target on the screen, 
+// Note: On official server, EQ is reflectable when there is only one target on the screen, 
 //	 which might be an exploit to hunt the MVPs.
 eq_single_target_reflectable: yes