diff options
| author | Jesusaves <cpntb1@ymail.com> | 2019-08-18 15:05:32 -0300 |
|---|---|---|
| committer | Jesusaves <cpntb1@ymail.com> | 2019-08-18 15:05:32 -0300 |
| commit | c9173a4e2e55b0fdf4df0d99920c556548a81e4b (patch) | |
| tree | 885d66f5e10289843fa71a4316fe49a454c47c01 /db/re/mob_skill_db.conf | |
| parent | 9222961a0b3b38aee2f01a1d53c8a08e174488e2 (diff) | |
| parent | 7c8417bb63afb65516852da1b9eb8ff0b4d2877f (diff) | |
| download | serverdata-c9173a4e2e55b0fdf4df0d99920c556548a81e4b.tar.gz serverdata-c9173a4e2e55b0fdf4df0d99920c556548a81e4b.tar.bz2 serverdata-c9173a4e2e55b0fdf4df0d99920c556548a81e4b.tar.xz serverdata-c9173a4e2e55b0fdf4df0d99920c556548a81e4b.zip | |
Merge branch 'master' into testserver
Conflicts solved with -X theirs
Diffstat (limited to 'db/re/mob_skill_db.conf')
| -rw-r--r-- | db/re/mob_skill_db.conf | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/db/re/mob_skill_db.conf b/db/re/mob_skill_db.conf index faf304290..018bacd2c 100644 --- a/db/re/mob_skill_db.conf +++ b/db/re/mob_skill_db.conf @@ -728,7 +728,7 @@ SKILL_COND2 = { SkillLevel: 2 Rate: 10000 CastTime: 2000 - Delay: 90000 + Delay: 180000 Cancelable: false SkillTarget: "MST_SELF" CastCondition: "MSC_LONGRANGEATTACKED" @@ -997,7 +997,7 @@ SKILL_COND2 = { MonsterKing: { NPC_SUMMONSLAVE: { SkillState: "MSS_ANYTARGET" - SkillLevel: 1 + SkillLevel: 5 Rate: 10000 CastTime: 10000 Delay: 180000 @@ -1021,14 +1021,14 @@ SKILL_COND2 = { } NPC_SUMMONSLAVE: { SkillState: "MSS_ANYTARGET" - SkillLevel: 1 + SkillLevel: 3 Rate: 9000 CastTime: 200 - Delay: 6000 + Delay: 60000 Cancelable: true SkillTarget: "MST_SELF" CastCondition: "MSC_MYHPLTMAXRATE" - ConditionData: 80 + ConditionData: 70 val0: 1064 } SM_BASH: { @@ -1052,10 +1052,10 @@ SKILL_COND2 = { } NPC_SUMMONSLAVE: { SkillState: "MSS_ANYTARGET" - SkillLevel: 1 + SkillLevel: 4 Rate: 8000 CastTime: 200 - Delay: 6000 + Delay: 60000 Cancelable: true SkillTarget: "MST_SELF" CastCondition: "MSC_ALWAYS" @@ -1063,10 +1063,10 @@ SKILL_COND2 = { } NPC_SUMMONSLAVE: { SkillState: "MSS_ANYTARGET" - SkillLevel: 1 + SkillLevel: 3 Rate: 8000 CastTime: 200 - Delay: 6000 + Delay: 60000 Cancelable: true SkillTarget: "MST_SELF" CastCondition: "MSC_ALWAYS" |