Mirroristas/rathena
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- Finished some checks to make sure Land Protector Only blocks BF_MAGIC skills. Hammerfall is no longer blocked.

Browse Source 
- Some adjustments to what Dispel can remove.


git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@5593 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
skotlex 2006-03-13 21:04:53 +00:00
parent d842b9f68d
commit 236bb687c9
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Changelog-Trunk.txt
View File

@ -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 GOES INTO TRUNK AND WILL BE MERGED INTO STABLE BY VALARIS AND WIZPUTER. -- VALARIS
2006/03/13 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 * Fixed script command warpparty looking for an attached player even when
it is not needed. [Skotlex] it is not needed. [Skotlex]
* Shield Reflect is now passed through Devotion as well. [Skotlex] * Shield Reflect is now passed through Devotion as well. [Skotlex]

10
src/map/skill.c
View File

@ -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); clif_skill_nodamage(src,bl,skillid,skilllv,0);
break; 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, clif_skill_nodamage(src,bl,skillid,skilllv,
sc_start(bl,SC_STUN,(20 + 10 * skilllv),skilllv,skill_get_time2(skillid,skilllv))); sc_start(bl,SC_STUN,(20 + 10 * skilllv),skilllv,skill_get_time2(skillid,skilllv)));
break; 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 if(i==SC_HALLUCINATION || i==SC_WEIGHT50 || i==SC_WEIGHT90
|| i==SC_STRIPWEAPON || i==SC_STRIPSHIELD || i==SC_STRIPARMOR || i==SC_STRIPHELM || 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_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_COMBO || i==SC_DANCING || i==SC_GUILDAURA || i==SC_EDP
|| i==SC_CARTBOOST || i==SC_MELTDOWN || i==SC_MOONLIT || i==SC_AUTOBERSERK || i==SC_CARTBOOST || i==SC_MELTDOWN || i==SC_MOONLIT
) )
continue; continue;
if(i==SC_BERSERK) tsc->data[i].val4=1; //Mark a dispelled berserk to avoid setting hp to 100. 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); 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] return 0; //AoE skills are ineffective. [Skotlex]
if (battle_check_target(&unit->bl,bl,group->target_flag)<=0) if (battle_check_target(&unit->bl,bl,group->target_flag)<=0)