From f4fb487fbd563ead914ebdc64ae8074650469375 Mon Sep 17 00:00:00 2001 From: shenhuyong Date: Sat, 5 Oct 2013 11:59:41 +0800 Subject: * Follow up dedec165eaeb0d291279b1d5b53fac242bcf7b4c -Update pre-re/skill_db.txt * Updated the const.txt to support the newest common status, as well as the latest NPC's. * Fixed a issue where the Dark Collector's assigned MAPID was incorrect. * Updated all Rebellion skills to have official ranges and SP requirements. -Also updated the skill_db entrys for these skills to have near official settings. --- src/map/skill.c | 1 + 1 file changed, 1 insertion(+) (limited to 'src/map/skill.c') diff --git a/src/map/skill.c b/src/map/skill.c index a55fb2937..de07cd599 100644 --- a/src/map/skill.c +++ b/src/map/skill.c @@ -9805,6 +9805,7 @@ int skill_castend_pos2(struct block_list* src, int x, int y, uint16 skill_id, ui case MH_STEINWAND: case MH_XENO_SLASHER: case NC_MAGMA_ERUPTION: + case RL_B_TRAP: flag|=1;//Set flag to 1 to prevent deleting ammo (it will be deleted on group-delete). case GS_GROUNDDRIFT: //Ammo should be deleted right away. skill->unitsetting(src,skill_id,skill_lv,x,y,0); -- cgit v1.2.3-70-g09d2 From 9f48e3c6318a3b2ec024b4ba4010cf140086817e Mon Sep 17 00:00:00 2001 From: cannelle Date: Mon, 7 Oct 2013 03:05:49 -0500 Subject: Fixed baby experience skill not showing effect. --- src/map/skill.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'src/map/skill.c') diff --git a/src/map/skill.c b/src/map/skill.c index 5c4dddc6f..fac465df6 100644 --- a/src/map/skill.c +++ b/src/map/skill.c @@ -6968,8 +6968,14 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, ui return 0; } status->change_start(bl,SC_STUN,10000,skill_lv,0,0,0,skill->get_time2(skill_id,skill_lv),8); - if (f_sd) sc_start(&f_sd->bl,type,100,skill_lv,skill->get_time(skill_id,skill_lv)); - if (m_sd) sc_start(&m_sd->bl,type,100,skill_lv,skill->get_time(skill_id,skill_lv)); + if (f_sd) { + sc_start(&f_sd->bl,type,100,skill_lv,skill->get_time(skill_id,skill_lv)); + clif->specialeffect(&f_sd->bl,408,AREA); + } + if (m_sd) { + sc_start(&m_sd->bl,type,100,skill_lv,skill->get_time(skill_id,skill_lv)); + clif->specialeffect(&m_sd->bl,408,AREA); + } } break; -- cgit v1.2.3-70-g09d2 From d40381f3f4f5dd41337fff6a4449e85db7ee75f1 Mon Sep 17 00:00:00 2001 From: shennetsind Date: Mon, 7 Oct 2013 19:48:52 -0300 Subject: Updated/Fixed Clearance Updated Clearance success rate; Fixed it affecting guild members. Thanks to Rytech/3CeaM Closes #152 Signed-off-by: shennetsind --- db/pre-re/skill_db.txt | 2 +- db/re/skill_db.txt | 2 +- src/map/skill.c | 6 +++++- 3 files changed, 7 insertions(+), 3 deletions(-) (limited to 'src/map/skill.c') diff --git a/db/pre-re/skill_db.txt b/db/pre-re/skill_db.txt index 13417db9a..d401b1b08 100644 --- a/db/pre-re/skill_db.txt +++ b/db/pre-re/skill_db.txt @@ -737,7 +737,7 @@ 2049,0,0,0,0,0,0,10,0,no,0,0,0,none,0, AB_EUCHARISTICA,Eucharistica 2050,11,6,16,6,0x1,0,1,1,yes,0,0,0,magic,0, AB_RENOVATIO,Renovatio 2051,11,6,16,6,0x21,0,5,1,yes,0,0,0,magic,0, AB_HIGHNESSHEAL,Highness Heal //CHECK Info shows this has magic attack. -2052,11,6,1,0,0x1,0,5,1,yes,0,0xA00,0,magic,0, AB_CLEARANCE,Clearance //CHECK Also shows this as a magic attack. Why? +2052,11,6,1,0,0x1,0,5,1,yes,0,0,0,magic,0, AB_CLEARANCE,Clearance //CHECK Also shows this as a magic attack. Why? 2053,0,6,16,0,0x1,0,5,1,yes,0,0,0,magic,0, AB_EXPIATIO,Expiatio //CHECK Does this also give the buff to party members? 2054,0,6,4,6,0x1,0,10,1,yes,0,0,0,none,0, AB_DUPLELIGHT,Duple Light //CHECK Had issues adding a skill level check to make the % go higher with the skills level. Will do later. 2055,-1,6,1,-1,0,0,10,1,no,0,0,0,weapon,0, AB_DUPLELIGHT_MELEE,Duple Light Melee diff --git a/db/re/skill_db.txt b/db/re/skill_db.txt index 4f7bbdf06..1d80ddd9d 100644 --- a/db/re/skill_db.txt +++ b/db/re/skill_db.txt @@ -749,7 +749,7 @@ 2049,0,0,0,0,0,0,10,0,no,0,0,0,none,0, AB_EUCHARISTICA,Eucharistica 2050,11,6,16,6,0x1,0,1,1,yes,0,0,0,magic,0, AB_RENOVATIO,Renovatio 2051,11,6,16,6,0x21,0,5,1,yes,0,0,0,magic,0, AB_HIGHNESSHEAL,Highness Heal //CHECK Info shows this has magic attack. -2052,11,6,1,0,0x1,0,5,1,yes,0,0xA00,0,magic,0, AB_CLEARANCE,Clearance //CHECK Also shows this as a magic attack. Why? +2052,11,6,1,0,0x1,0,5,1,yes,0,0,0,magic,0, AB_CLEARANCE,Clearance //CHECK Also shows this as a magic attack. Why? 2053,0,6,16,0,0x1,0,5,1,yes,0,0,0,magic,0, AB_EXPIATIO,Expiatio //CHECK Does this also give the buff to party members? 2054,0,6,4,6,0x1,0,10,1,yes,0,0,0,none,0, AB_DUPLELIGHT,Duple Light //CHECK Had issues adding a skill level check to make the % go higher with the skills level. Will do later. 2055,-1,6,1,-1,0,0,10,1,no,0,0,0,weapon,0, AB_DUPLELIGHT_MELEE,Duple Light Melee diff --git a/src/map/skill.c b/src/map/skill.c index 5269c83e8..8b821653f 100644 --- a/src/map/skill.c +++ b/src/map/skill.c @@ -7976,8 +7976,12 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, ui case AB_CLEARANCE: if( flag&1 || (i = skill->get_splash(skill_id, skill_lv)) < 1 ) { //As of the behavior in official server Clearance is just a super version of Dispell skill. [Jobbie] + if( bl->type != BL_MOB && battle->check_target(src,bl,BCT_PARTY) <= 0 ) // Only affect mob or party. + break; + clif->skill_nodamage(src,bl,skill_id,skill_lv,1); - if((dstsd && (dstsd->class_&MAPID_UPPERMASK) == MAPID_SOUL_LINKER) || rnd()%100 >= 30 + 10 * skill_lv) { + + if((dstsd && (dstsd->class_&MAPID_UPPERMASK) == MAPID_SOUL_LINKER) || rnd()%100 >= 60 + 8 * skill_lv) { if (sd) clif->skill_fail(sd,skill_id,USESKILL_FAIL_LEVEL,0); break; -- cgit v1.2.3-70-g09d2 From bbaf8692374a82323858c4468f345d03cd05216d Mon Sep 17 00:00:00 2001 From: shennetsind Date: Mon, 7 Oct 2013 20:09:51 -0300 Subject: Fixed Bug #5085 Fixed decrease agility duration for the level 48 (used by mvps) -- It'll take the benefits of lvl 48 (e.g. rate) but the duration will be equal to the one of lvl 10. http://hercules.ws/board/tracker/issue-5085-monster-decrease-agility/ Closes #154 Signed-off-by: shennetsind --- src/map/skill.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'src/map/skill.c') diff --git a/src/map/skill.c b/src/map/skill.c index 8b821653f..521748bb9 100644 --- a/src/map/skill.c +++ b/src/map/skill.c @@ -5110,9 +5110,15 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, ui break; case AL_DECAGI: + clif->skill_nodamage (src, bl, skill_id, skill_lv, + sc_start(bl, type, (40 + skill_lv * 2 + (status->get_lv(src) + sstatus->int_)/5), skill_lv, + /* monsters using lvl 48 get the rate benefit but the duration of lvl 10 */ + ( src->type == BL_MOB && skill_lv == 48 ) ? skill->get_time(skill_id,skill_lv) : skill->get_time(skill_id,skill_lv))); + break; + case MER_DECAGI: clif->skill_nodamage (src, bl, skill_id, skill_lv, - sc_start(bl, type, (40 + skill_lv * 2 + (status->get_lv(src) + sstatus->int_)/5), skill_lv, skill->get_time(skill_id,skill_lv))); + sc_start(bl, type, (40 + skill_lv * 2 + (status->get_lv(src) + sstatus->int_)/5), skill_lv, skill->get_time(skill_id,skill_lv))); break; case AL_CRUCIS: -- cgit v1.2.3-70-g09d2 From 77c4315d08461368cd1cca2630f18cd29d590707 Mon Sep 17 00:00:00 2001 From: shennetsind Date: Tue, 8 Oct 2013 18:45:05 -0300 Subject: Follow up bbaf8692374a82323858c4468f345d03cd05216d Thanks to malufett. Signed-off-by: shennetsind --- src/map/skill.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/map/skill.c') diff --git a/src/map/skill.c b/src/map/skill.c index 521748bb9..248e19e77 100644 --- a/src/map/skill.c +++ b/src/map/skill.c @@ -5113,7 +5113,7 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, ui clif->skill_nodamage (src, bl, skill_id, skill_lv, sc_start(bl, type, (40 + skill_lv * 2 + (status->get_lv(src) + sstatus->int_)/5), skill_lv, /* monsters using lvl 48 get the rate benefit but the duration of lvl 10 */ - ( src->type == BL_MOB && skill_lv == 48 ) ? skill->get_time(skill_id,skill_lv) : skill->get_time(skill_id,skill_lv))); + ( src->type == BL_MOB && skill_lv == 48 ) ? skill->get_time(skill_id,10) : skill->get_time(skill_id,skill_lv))); break; case MER_DECAGI: -- cgit v1.2.3-70-g09d2