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

- Supportive Skill Behavior for Mercenaries:

Browse Source 
* Endow skills such as Aspersio and the 4 sage endows can only be cast on the mercenary if they are the master.
* Aid Potion does not currently work on mercenaries.
* Lex Aeterna only doubles damage of regular attacks. Skill damage from mercenaries are not doubled.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13184 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
zephyrus 2008-09-01 23:14:35 +00:00
parent c562d05efc
commit 5ee4ef95e0
2 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/map/battle.c
View File

@ -395,19 +395,22 @@ int battle_calc_damage(struct block_list *src,struct block_list *bl,int damage,i
} }
//Now damage increasing effects //Now damage increasing effects
if(sc->data[SC_AETERNA] && skill_num != PF_SOULBURN){ if( sc->data[SC_AETERNA] && skill_num != PF_SOULBURN )
damage<<=1; {
//Shouldn't end until Breaker's non-weapon part connects. if( src->type != BL_MER || skill_num == 0 )
if (skill_num != ASC_BREAKER || !(flag&BF_WEAPON)) damage <<= 1; // Lex Aeterna only doubles damage of regular attacks from mercenaries
status_change_end( bl,SC_AETERNA,-1 );
if( skill_num != ASC_BREAKER || !(flag&BF_WEAPON) )
status_change_end( bl,SC_AETERNA,-1 ); //Shouldn't end until Breaker's non-weapon part connects.
} }
//Finally damage reductions.... //Finally damage reductions....
if(sc->data[SC_ASSUMPTIO]){ if( sc->data[SC_ASSUMPTIO] )
if(map_flag_vs(bl->m)) {
damage=damage*2/3; //Receive 66% damage if( map_flag_vs(bl->m) )
damage = damage*2/3; //Receive 66% damage
else else
damage>>=1; //Receive 50% damage damage >>= 1; //Receive 50% damage
} }
if(sc->data[SC_DEFENDER] && if(sc->data[SC_DEFENDER] &&
@ -3264,10 +3267,7 @@ int battle_check_target( struct block_list *src, struct block_list *target,int f
if (flag&(BCT_GUILD|BCT_ENEMY)) { if (flag&(BCT_GUILD|BCT_ENEMY)) {
int s_guild = status_get_guild_id(s_bl); int s_guild = status_get_guild_id(s_bl);
int t_guild = status_get_guild_id(t_bl); int t_guild = status_get_guild_id(t_bl);
if ( if( !(map[m].flag.pvp && map[m].flag.pvp_noguild) && s_guild && t_guild && (s_guild == t_guild || guild_isallied(s_guild, t_guild)) )
!(map[m].flag.pvp && map[m].flag.pvp_noguild) &&
s_guild && t_guild && (s_guild == t_guild || guild_isallied(s_guild, t_guild))
)
state |= BCT_GUILD; state |= BCT_GUILD;
else else
state |= BCT_ENEMY; state |= BCT_ENEMY;

18
src/map/status.c
View File

@ -1125,10 +1125,10 @@ int status_check_skilluse(struct block_list *src, struct block_list *target, int
hide_flag = flag?OPTION_HIDE:(OPTION_HIDE|OPTION_CLOAK|OPTION_CHASEWALK); hide_flag = flag?OPTION_HIDE:(OPTION_HIDE|OPTION_CLOAK|OPTION_CHASEWALK);
//You cannot hide from ground skills. //You cannot hide from ground skills.
if(skill_get_ele(skill_num,1) == ELE_EARTH) //TODO: Need Skill Lv here :/ if( skill_get_ele(skill_num,1) == ELE_EARTH ) //TODO: Need Skill Lv here :/
hide_flag &= ~OPTION_HIDE; hide_flag &= ~OPTION_HIDE;
switch (target->type) switch( target->type )
{ {
case BL_PC: case BL_PC:
{ {
@ -1146,13 +1146,13 @@ int status_check_skilluse(struct block_list *src, struct block_list *target, int
return 1; return 1;
return 0; return 0;
case BL_HOM: case BL_HOM:
//Can't use support skills on homun (only master/self can) case BL_MER:
//Placed here instead of battle_check_target because support skill if( target->type == BL_HOM && skill_num && battle_config.hom_setting&0x1 && skill_get_inf(skill_num)&INF_SUPPORT_SKILL && battle_get_master(target) != src )
//invocations don't call that function. return 0; // Can't use support skills on Homunculus (only Master/Self)
if (skill_num && battle_config.hom_setting&0x1 && if( target->type == BL_MER && (skill_num == PR_ASPERSIO || (skill_num >= SA_FLAMELAUNCHER && skill_num <= SA_SEISMICWEAPON)) && battle_get_master(target) != src )
skill_get_inf(skill_num)&INF_SUPPORT_SKILL && return 0; // Can't use Weapon endow skills on Mercenary (only Master)
battle_get_master(target) != src) if( target->type == BL_MER && skill_num == AM_POTIONPITCHER )
return 0; return 0; // Can't use Potion Pitcher on Mercenaries
default: default:
//Check for chase-walk/hiding/cloaking opponents. //Check for chase-walk/hiding/cloaking opponents.
if (tsc && tsc->option&hide_flag && !(status->mode&(MD_BOSS|MD_DETECTOR))) if (tsc && tsc->option&hide_flag && !(status->mode&(MD_BOSS|MD_DETECTOR)))