diff options
| author | ultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2008-08-10 13:22:53 +0000 |
|---|---|---|
| committer | ultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2008-08-10 13:22:53 +0000 |
| commit | aed37a61e497eb8ec22d89e627882da69a8a7355 (patch) | |
| tree | 430da9df80009e8ee57b5db93434a68a26760265 | |
| parent | 1937aba62081e8d39de0f9cc80ffa19c99e6a5ce (diff) | |
| download | hercules-aed37a61e497eb8ec22d89e627882da69a8a7355.tar.gz hercules-aed37a61e497eb8ec22d89e627882da69a8a7355.tar.bz2 hercules-aed37a61e497eb8ec22d89e627882da69a8a7355.tar.xz hercules-aed37a61e497eb8ec22d89e627882da69a8a7355.zip | |
Some skill corrections based on bugreport:1945
- enabled WZ_FIREWALL and NJ_KAENSIN effect stacking (for more damage)
- blocked stacking of Warp Portal and Flip Tatami land skills
- reverted r12798's land-protector code change (incorrect and also doesn't have any effect)
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13064 54d463be-8e91-2dee-dedb-b68131a5f0ec
| -rw-r--r-- | db/skill_unit_db.txt | 8 | ||||
| -rw-r--r-- | src/map/skill.c | 3 |
2 files changed, 5 insertions, 6 deletions
diff --git a/db/skill_unit_db.txt b/db/skill_unit_db.txt index 950a79dda..c2a74fe39 100644 --- a/db/skill_unit_db.txt +++ b/db/skill_unit_db.txt @@ -25,10 +25,10 @@ // 12,0x7e, , 0, 0, -1,all, 0x003 //MG_SAFETYWALL - 18,0x7f, , -1, 0, 20,enemy, 0x018 //MG_FIREWALL + 18,0x7f, , -1, 0, 20,enemy, 0x010 //MG_FIREWALL 21,0x86, , 0, 2,1000,enemy, 0x018 //MG_THUNDERSTORM 25,0x85, , 1, 0, -1,all, 0x003 //AL_PNEUMA - 27,0x81,0x80, 0, 0, -1,all, 0x006 //AL_WARP + 27,0x81,0x80, 0, 0, -1,all, 0x00E //AL_WARP 47,0x86, , 0, 2,1000,enemy, 0x080 //AC_SHOWER 70,0x83, , -1, 1,1000,all, 0x018 //PR_SANCTUARY 79,0x84, , -1, 1,3000,enemy, 0x018 //PR_MAGNUS @@ -91,8 +91,8 @@ 488,0xb9, , 3, 0, -1,all, 0x200 //CG_HERMODE 516,0xba, , 3, 0, 100,enemy, 0x000 //GS_DESPERADO 521,0xbe, , 0, 1,1000,enemy, 0x000 //GS_GROUNDDRIFT -527,0xbc, , -1, 0,2000,enemy, 0x010 //NJ_TATAMIGAESHI -535,0xbd, , -1, 0, 20,enemy, 0x018 //NJ_KAENSIN +527,0xbc, , -1, 0,2000,enemy, 0x018 //NJ_TATAMIGAESHI +535,0xbd, , -1, 0, 20,enemy, 0x010 //NJ_KAENSIN 538,0xbb, , 1:1:1:2:2:2:3:3:3:4,0,-1,all,0x010 //NJ_SUITON 670,0xc7, , 1, 4:7:10:13:16:19:22:25:28:31,1000,all,0x008 //NPC_EVILLAND //8209,0x90, , 0, 1,1000,enemy, 0x002 //MA_SKIDTRAP diff --git a/src/map/skill.c b/src/map/skill.c index 8385754d1..01c71d52c 100644 --- a/src/map/skill.c +++ b/src/map/skill.c @@ -6586,8 +6586,7 @@ static int skill_unit_onplace (struct skill_unit *src, struct block_list *bl, un nullpo_retr(0, sg=src->group); nullpo_retr(0, ss=map_id2bl(sg->src_id)); - if (skill_get_type(sg->skill_id) == BF_MAGIC && map_getcell(bl->m, bl->x, bl->y, CELL_CHKLANDPROTECTOR) - && !skill_get_inf2(sg->skill_id) == INF2_TRAP) //Traps work on top of land protector, magical or not [Brain] + if( skill_get_type(sg->skill_id) == BF_MAGIC && map_getcell(bl->m, bl->x, bl->y, CELL_CHKLANDPROTECTOR) && sg->skill_id != SA_LANDPROTECTOR ) return 0; //AoE skills are ineffective. [Skotlex] sc = status_get_sc(bl); |