From f47d4dcc0f9dd9f74c90447baa0058400df1acdf Mon Sep 17 00:00:00 2001 From: aleos89 Date: Wed, 23 Dec 2015 14:15:07 -0500 Subject: [PATCH] Updated Hells Plant effect * Hells Plant can be removed from Crazy Weed and Land Protector. --- db/pre-re/skill_unit_db.txt | 2 +- db/re/skill_unit_db.txt | 2 +- src/map/skill.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/db/pre-re/skill_unit_db.txt b/db/pre-re/skill_unit_db.txt index 44fa2b47d3..ac09c3cde3 100644 --- a/db/pre-re/skill_unit_db.txt +++ b/db/pre-re/skill_unit_db.txt @@ -157,7 +157,7 @@ 2485,0xe7, , 0, 2,2000,enemy, 0x8098 //GN_DEMONIC_FIRE 2487,0xe8, , 2, 0, -1,enemy, 0x2000 //GN_FIRE_EXPANSION_SMOKE_POWDER 2488,0xe9, , 2, 0, -1,enemy, 0x2000 //GN_FIRE_EXPANSION_TEAR_GAS -2490,0xea, , 0, 1,1000,enemy, 0x8002 //GN_HELLS_PLANT +2490,0xea, , 0, 1,1000,enemy, 0xC002 //GN_HELLS_PLANT 2555,0x104, , 0, 1:2:2:3:3,500,enemy,0x6 //RL_B_TRAP 2567,0x105, , -1, 0,1000,enemy, 0x98 //RL_FIRE_RAIN diff --git a/db/re/skill_unit_db.txt b/db/re/skill_unit_db.txt index 4a1a3f98fc..464c95cabb 100644 --- a/db/re/skill_unit_db.txt +++ b/db/re/skill_unit_db.txt @@ -159,7 +159,7 @@ 2485,0xe7, , 0, 2,2000,enemy, 0x8098 //GN_DEMONIC_FIRE 2487,0xe8, , 2, 0, -1,enemy, 0x2000 //GN_FIRE_EXPANSION_SMOKE_POWDER 2488,0xe9, , 2, 0, -1,enemy, 0x2000 //GN_FIRE_EXPANSION_TEAR_GAS -2490,0xea, , 0, 1,1000,enemy, 0x8002 //GN_HELLS_PLANT +2490,0xea, , 0, 1,1000,enemy, 0xC002 //GN_HELLS_PLANT 2555,0x104, , 0, 1:2:2:3:3,500,enemy,0x6 //RL_B_TRAP 2567,0x105, , -1, 0,1000,enemy, 0x98 //RL_FIRE_RAIN diff --git a/src/map/skill.c b/src/map/skill.c index 654daa949d..97c6a02896 100755 --- a/src/map/skill.c +++ b/src/map/skill.c @@ -16927,7 +16927,7 @@ static int skill_cell_overlap(struct block_list *bl, va_list ap) return 1; } //It deletes everything except traps and barriers - if( (!(skill_get_inf2(unit->group->skill_id)&(INF2_TRAP)) && !(skill_get_inf3(unit->group->skill_id)&(INF3_NOLP)) ) || unit->group->skill_id == WZ_FIREPILLAR ) { + if ((!(skill_get_inf2(unit->group->skill_id)&(INF2_TRAP)) && !(skill_get_inf3(unit->group->skill_id)&(INF3_NOLP))) || unit->group->skill_id == WZ_FIREPILLAR || unit->group->skill_id == GN_HELLS_PLANT) { skill_delunit(unit); return 1; }