From 8a37f1b2a9707f86824c1ab25f5819209ace73f4 Mon Sep 17 00:00:00 2001 From: Playtester Date: Tue, 3 May 2016 22:04:43 +0200 Subject: [PATCH] Marionette Control, Mechanic Back/Front Slide - Marionette Control now has a range of 7 (fixes #1239) - Mechanic Back/Front Slide skills are no longer blocked by gear that makes you knock-back immune (fixes #1227) --- db/pre-re/skill_db.txt | 2 +- db/re/skill_db.txt | 2 +- src/map/skill.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/db/pre-re/skill_db.txt b/db/pre-re/skill_db.txt index 9d69334c0c..22cc7e8d14 100644 --- a/db/pre-re/skill_db.txt +++ b/db/pre-re/skill_db.txt @@ -576,7 +576,7 @@ // Clown & Gypsy 394,9,8,1,-1,0,0,10,-9,yes,0,0,0,weapon,0,0x0, CG_ARROWVULCAN,Vulcan Arrow 395,0,0,4,0,0x1,3,1,1,yes,0,0x40,0,misc,2,0x0, CG_MOONLIT,Sheltering Bliss -396,1,6,16,0,0x1,0,1,1,yes,0,0x600,0,none,0,0x40, CG_MARIONETTE,Marionette Control +396,7,6,16,0,0x1,0,1,1,yes,0,0x600,0,none,0,0x40, CG_MARIONETTE,Marionette Control //**** // Lord Knight diff --git a/db/re/skill_db.txt b/db/re/skill_db.txt index 1eb677f724..23973c1669 100644 --- a/db/re/skill_db.txt +++ b/db/re/skill_db.txt @@ -576,7 +576,7 @@ // Clown & Gypsy 394,9,8,1,-1,0,0,10,-9,yes,0,0,0,weapon,0,0x0, CG_ARROWVULCAN,Vulcan Arrow 395,0,0,4,0,0x1,3,1,1,yes,0,0x40,0,misc,2,0x0, CG_MOONLIT,Sheltering Bliss -396,1,6,16,0,0x1,0,1,1,yes,0,0x600,0,none,0,0x40, CG_MARIONETTE,Marionette Control +396,7,6,16,0,0x1,0,1,1,yes,0,0x600,0,none,0,0x40, CG_MARIONETTE,Marionette Control //**** // Lord Knight diff --git a/src/map/skill.c b/src/map/skill.c index ad79368c31..b6c12e3e65 100755 --- a/src/map/skill.c +++ b/src/map/skill.c @@ -9430,7 +9430,7 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, ui case NC_B_SIDESLIDE: { uint8 dir = (skill_id == NC_F_SIDESLIDE) ? (unit_getdir(src)+4)%8 : unit_getdir(src); - skill_blown(src,bl,skill_get_blewcount(skill_id,skill_lv),dir,0); + skill_blown(src,bl,skill_get_blewcount(skill_id,skill_lv),dir,2); clif_skill_nodamage(src,bl,skill_id,skill_lv,1); } break;