diff options
| author | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-03-13 21:04:53 +0000 |
|---|---|---|
| committer | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-03-13 21:04:53 +0000 |
| commit | 0423d10ea926ab9181107a380c0e0e16e9cf7ca0 (patch) | |
| tree | 60aa7c82c1e5f9505b86297508a10f28e54d3a70 | |
| parent | a8b9071b2e42a7f0e365f187e2dfe222a104ec5b (diff) | |
| download | hercules-0423d10ea926ab9181107a380c0e0e16e9cf7ca0.tar.gz hercules-0423d10ea926ab9181107a380c0e0e16e9cf7ca0.tar.bz2 hercules-0423d10ea926ab9181107a380c0e0e16e9cf7ca0.tar.xz hercules-0423d10ea926ab9181107a380c0e0e16e9cf7ca0.zip | |
- Finished some checks to make sure Land Protector Only blocks BF_MAGIC skills. Hammerfall is no longer blocked.
- Some adjustments to what Dispel can remove.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@5593 54d463be-8e91-2dee-dedb-b68131a5f0ec
| -rw-r--r-- | Changelog-Trunk.txt | 2 | ||||
| -rw-r--r-- | src/map/skill.c | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt index fa1405bb0..cd461575d 100644 --- a/Changelog-Trunk.txt +++ b/Changelog-Trunk.txt @@ -5,6 +5,8 @@ IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK. EV GOES INTO TRUNK AND WILL BE MERGED INTO STABLE BY VALARIS AND WIZPUTER. -- VALARIS
2006/03/13
+ * Finished some checks to make sure Land Protector Only blocks BF_MAGIC
+ skills. Hammerfall is no longer blocked. [Skotlex]
* Fixed script command warpparty looking for an attached player even when
it is not needed. [Skotlex]
* Shield Reflect is now passed through Devotion as well. [Skotlex]
diff --git a/src/map/skill.c b/src/map/skill.c index c88666ea3..0498d04c0 100644 --- a/src/map/skill.c +++ b/src/map/skill.c @@ -4002,9 +4002,6 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, in clif_skill_nodamage(src,bl,skillid,skilllv,0);
break;
}
- if(map_getcell(bl->m,bl->x,bl->y,CELL_CHKLANDPROTECTOR))
- break; //Land Protector blocks Hammer Fall [Skotlex]
-
clif_skill_nodamage(src,bl,skillid,skilllv,
sc_start(bl,SC_STUN,(20 + 10 * skilllv),skilllv,skill_get_time2(skillid,skilllv)));
break;
@@ -4709,8 +4706,8 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, in if(i==SC_HALLUCINATION || i==SC_WEIGHT50 || i==SC_WEIGHT90
|| i==SC_STRIPWEAPON || i==SC_STRIPSHIELD || i==SC_STRIPARMOR || i==SC_STRIPHELM
|| i==SC_CP_WEAPON || i==SC_CP_SHIELD || i==SC_CP_ARMOR || i==SC_CP_HELM
- || i==SC_COMBO || i==SC_DANCING || i==SC_GUILDAURA || i==SC_STEELBODY || i==SC_EDP
- || i==SC_CARTBOOST || i==SC_MELTDOWN || i==SC_MOONLIT
+ || i==SC_COMBO || i==SC_DANCING || i==SC_GUILDAURA || i==SC_EDP
+ || i==SC_AUTOBERSERK || i==SC_CARTBOOST || i==SC_MELTDOWN || i==SC_MOONLIT
)
continue;
if(i==SC_BERSERK) tsc->data[i].val4=1; //Mark a dispelled berserk to avoid setting hp to 100.
@@ -10257,7 +10254,8 @@ int skill_unit_timer_sub_onplace( struct block_list *bl, va_list ap ) nullpo_retr(0, group=unit->group);
- if (map_getcell(bl->m, bl->x, bl->y, CELL_CHKLANDPROTECTOR))
+ if (skill_get_type(group->skill_id)==BF_MAGIC
+ && 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)
|