diff options
| author | shennetsind <shennetsind@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2011-12-15 06:54:26 +0000 |
|---|---|---|
| committer | shennetsind <shennetsind@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2011-12-15 06:54:26 +0000 |
| commit | 8aac2b7d32e68cf3ebbb8502ee15fafb7da7e94b (patch) | |
| tree | 7c050d91a6a0ff8d5ce6f3cb973d7dad93116f28 | |
| parent | 5bd153de6df78974797b3571df90ddc32fa5af57 (diff) | |
| download | hercules-8aac2b7d32e68cf3ebbb8502ee15fafb7da7e94b.tar.gz hercules-8aac2b7d32e68cf3ebbb8502ee15fafb7da7e94b.tar.bz2 hercules-8aac2b7d32e68cf3ebbb8502ee15fafb7da7e94b.tar.xz hercules-8aac2b7d32e68cf3ebbb8502ee15fafb7da7e94b.zip | |
Added new skill inf: INF2_NOLP, for bugreport:4347.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@15132 54d463be-8e91-2dee-dedb-b68131a5f0ec
| -rw-r--r-- | db/skill_db.txt | 5 | ||||
| -rw-r--r-- | src/map/skill.c | 2 | ||||
| -rw-r--r-- | src/map/skill.h | 1 |
3 files changed, 5 insertions, 3 deletions
diff --git a/db/skill_db.txt b/db/skill_db.txt index fc6075d76..3acef2359 100644 --- a/db/skill_db.txt +++ b/db/skill_db.txt @@ -36,6 +36,7 @@ // 0x0400- usable only on party-members (and enemies if skill is offensive) // 0x0800- usable only on guild-mates (and enemies if skill is offensive) // 0x1000- disable usage on enemies (for non-offensive skills). +// 0x2000- skill ignores land protector (e.g. arrow shower) // 13 maxcount: max amount of skill instances to place on the ground when // player_land_skill_limit/monster_land_skill_limit is enabled. For skills // that attack using a path, this is the path length to be used. @@ -89,7 +90,7 @@ 44,0,0,0,0,0,0,10,0,no,0,0,0,none,0, AC_VULTURE,Vulture's Eye 45,0,6,4,0,0x3,3,10,1,no,0,0,0,weapon,0, AC_CONCENTRATION,Improve Concentration 46,-9,8,1,-1,0,0,10,2,no,0,0,0,weapon,0, AC_DOUBLE,Double Strafe -47,-9,6,2,-1,0x2,2,10,1,no,0,0,0,weapon,2, AC_SHOWER,Arrow Shower +47,-9,6,2,-1,0x2,2,10,1,no,0,0x2000,0,weapon,2, AC_SHOWER,Arrow Shower 48,-1,8,0,-1,0,0,10,2,no,0,0,0,weapon,0, TF_DOUBLE,Double Attack 49,0,0,0,0,0,0,10,0,no,0,0,0,weapon,0, TF_MISS,Improve Dodge 50,1,6,1,0,1,0,10,1,no,0,0,0,weapon,0, TF_STEAL,Steal @@ -1095,7 +1096,7 @@ 8205,0,6,4,0,0,0,10,1,no,0,0,0,weapon,0, MS_REFLECTSHIELD,Shield_Reflect 8206,0,6,4,0,0x1,0,1,1,no,0,0,0,weapon,0, MS_BERSERK,Frenzy 8207,-9,8,1,-1,0,0,10,2,no,0,0,0,weapon,0, MA_DOUBLE,Double_Strafe -8208,-9,6,2,-1,0x2,2,10,1,no,0,0,0,weapon,2, MA_SHOWER,Arrow_Shower +8208,-9,6,2,-1,0x2,2,10,1,no,0,0x2000,0,weapon,2, MA_SHOWER,Arrow_Shower 8209,3,6,2,0,0x1,0,5,1,no,0,0x80,0,misc,6:7:8:9:10, MA_SKIDTRAP,Skid_Trap 8210,3,6,2,2,0x40,0,5,1,no,0,0x80,0,misc,0, MA_LANDMINE,Land_Mine 8211,3,6,2,0,0x3,2,5,1,no,0,0x80,0,misc,0, MA_SANDMAN,Sandman diff --git a/src/map/skill.c b/src/map/skill.c index 51f9c46b9..0a7ad5e67 100644 --- a/src/map/skill.c +++ b/src/map/skill.c @@ -12342,7 +12342,7 @@ int skill_unit_timer_sub_onplace (struct block_list* bl, va_list ap) nullpo_ret(group); - if( group->skill_id != AC_SHOWER && !(skill_get_inf2(group->skill_id)&(INF2_SONG_DANCE|INF2_TRAP)) && map_getcell(bl->m, bl->x, bl->y, CELL_CHKLANDPROTECTOR) ) + if( !(skill_get_inf2(group->skill_id)&(INF2_SONG_DANCE|INF2_TRAP|INF2_NOLP)) && map_getcell(bl->m, bl->x, bl->y, CELL_CHKLANDPROTECTOR) ) return 0; //AoE skills are ineffective. [Skotlex] if( battle_check_target(&unit->bl,bl,group->target_flag) <= 0 ) diff --git a/src/map/skill.h b/src/map/skill.h index bbcd68549..2e4a68fa4 100644 --- a/src/map/skill.h +++ b/src/map/skill.h @@ -64,6 +64,7 @@ enum e_skill_inf2 INF2_PARTY_ONLY = 0x0400, INF2_GUILD_ONLY = 0x0800, INF2_NO_ENEMY = 0x1000, + INF2_NOLP = 0x2000, // Spells that can ignore Land Protector }; //Walk intervals at which chase-skills are attempted to be triggered. |