Skip to content

Commit

Permalink
Updated Ranger Traps behavior
Browse files Browse the repository at this point in the history
* Fixes #1611.
* Magenta, Cobalt, Maize, and Verdure Traps should permanently change the element of the target.
  • Loading branch information
aleos89 authored and Lemongrass3110 committed Oct 18, 2016
1 parent 55c5627 commit 031adff
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 14 deletions.
8 changes: 4 additions & 4 deletions db/pre-re/skill_cast_db.txt
Expand Up @@ -1248,13 +1248,13 @@
//-- RA_CAMOUFLAGE
2247,0,0,0,10000,0,0
//-- RA_MAGENTATRAP
2249,0,2000,0,15000,10000,0
2249,0,2000,0,15000,0,0
//-- RA_COBALTTRAP
2250,0,2000,0,15000,10000,0
2250,0,2000,0,15000,0,0
//-- RA_MAIZETRAP
2251,0,2000,0,15000,10000,0
2251,0,2000,0,15000,0,0
//-- RA_VERDURETRAP
2252,0,2000,0,15000,10000,0
2252,0,2000,0,15000,0,0
//-- RA_FIRINGTRAP
2253,0,0,0,15000,15000,0
//-- RA_ICEBOUNDTRAP
Expand Down
8 changes: 4 additions & 4 deletions db/re/skill_cast_db.txt
Expand Up @@ -1264,13 +1264,13 @@
//-- RA_CAMOUFLAGE
2247,0,0,0,10000,0,0,-1
//-- RA_MAGENTATRAP
2249,0,2000,0,15000,10000,0,-1
2249,0,2000,0,15000,0,0,-1
//-- RA_COBALTTRAP
2250,0,2000,0,15000,10000,0,-1
2250,0,2000,0,15000,0,0,-1
//-- RA_MAIZETRAP
2251,0,2000,0,15000,10000,0,-1
2251,0,2000,0,15000,0,0,-1
//-- RA_VERDURETRAP
2252,0,2000,0,15000,10000,0,-1
2252,0,2000,0,15000,0,0,-1
//-- RA_FIRINGTRAP
2253,0,0,0,15000,15000,0,-1
//-- RA_ICEBOUNDTRAP
Expand Down
8 changes: 6 additions & 2 deletions src/map/skill.c
Expand Up @@ -17279,8 +17279,12 @@ static int skill_trap_splash(struct block_list *bl, va_list ap)
case UNT_COBALTTRAP:
case UNT_MAIZETRAP:
case UNT_VERDURETRAP:
if( bl->type != BL_PC && status_get_class_(bl) != CLASS_BOSS )
sc_start2(ss,bl,SC_ELEMENTALCHANGE,100,sg->skill_lv,skill_get_ele(sg->skill_id,sg->skill_lv),skill_get_time2(sg->skill_id,sg->skill_lv));
if( bl->type == BL_MOB && status_get_class_(bl) != CLASS_BOSS ) {
struct status_data *status = status_get_status_data(bl);

status->def_ele = skill_get_ele(sg->skill_id, sg->skill_lv);
status->ele_lv = (unsigned char)sg->skill_lv;
}
break;
case UNT_REVERBERATION: // For proper skill delay animation when used with Dominion Impulse
skill_addtimerskill(ss, tick + status_get_amotion(ss), bl->id, 0, 0, WM_REVERBERATION_MELEE, sg->skill_lv, BF_WEAPON, 0);
Expand Down
4 changes: 0 additions & 4 deletions src/map/status.c
Expand Up @@ -667,10 +667,6 @@ void initChangeTables(void)
set_sc( RA_WUGDASH , SC_WUGDASH , SI_WUGDASH , SCB_SPEED|SCB_DSPD );
set_sc( RA_WUGBITE , SC_BITE , SI_WUGBITE , SCB_NONE );
set_sc( RA_CAMOUFLAGE , SC_CAMOUFLAGE , SI_CAMOUFLAGE , SCB_SPEED|SCB_DEF|SCB_DEF2 );
add_sc( RA_MAGENTATRAP , SC_ELEMENTALCHANGE );
add_sc( RA_COBALTTRAP , SC_ELEMENTALCHANGE );
add_sc( RA_MAIZETRAP , SC_ELEMENTALCHANGE );
add_sc( RA_VERDURETRAP , SC_ELEMENTALCHANGE );
set_sc( RA_FIRINGTRAP , SC_BURNING , SI_BURNT , SCB_MDEF );
set_sc_with_vfx( RA_ICEBOUNDTRAP, SC_FREEZING , SI_FROSTMISTY , SCB_SPEED|SCB_ASPD|SCB_DEF|SCB_DEF2 );
set_sc( RA_UNLIMIT , SC_UNLIMIT , SI_UNLIMIT , SCB_DEF|SCB_DEF2|SCB_MDEF|SCB_MDEF2 );
Expand Down

0 comments on commit 031adff

Please sign in to comment.