diff options
| author | celest <celest@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2005-03-25 11:08:48 +0000 |
|---|---|---|
| committer | celest <celest@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2005-03-25 11:08:48 +0000 |
| commit | ee7dda128a9c3004db9eb43b5e3376f74033ab87 (patch) | |
| tree | 29020b7e9ed87833a40179c98bc909ecec907383 /src/map | |
| parent | 009e7837dea970aca8f6e2468c9cca310198fc21 (diff) | |
| download | hercules-ee7dda128a9c3004db9eb43b5e3376f74033ab87.tar.gz hercules-ee7dda128a9c3004db9eb43b5e3376f74033ab87.tar.bz2 hercules-ee7dda128a9c3004db9eb43b5e3376f74033ab87.tar.xz hercules-ee7dda128a9c3004db9eb43b5e3376f74033ab87.zip | |
* Some minor changes to Sacrifice in battle.c
* Set the Emperium to be immune to Sacrifice
* Set the Emperium to be have max status effects immunity
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/branches/stable@1294 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map')
| -rw-r--r-- | src/map/battle.c | 4 | ||||
| -rw-r--r-- | src/map/status.c | 10 |
2 files changed, 10 insertions, 4 deletions
diff --git a/src/map/battle.c b/src/map/battle.c index 1a44dc9a7..9caa111b2 100644 --- a/src/map/battle.c +++ b/src/map/battle.c @@ -402,7 +402,7 @@ int battle_calc_damage(struct block_list *src,struct block_list *bl,int damage,i if(class_ == 1288 || class_ == 1287 || class_ == 1286 || class_ == 1285) { // if(class_ == 1288) { - if(class_ == 1288 && (flag&BF_SKILL || skill_num == ASC_BREAKER)) + if(class_ == 1288 && (flag&BF_SKILL || skill_num == ASC_BREAKER || skill_num == PA_SACRIFICE)) damage=0; if(src->type == BL_PC) { struct guild *g=guild_search(((struct map_session_data *)src)->status.guild_id); @@ -2436,6 +2436,8 @@ static struct Damage battle_calc_pc_weapon_attack( hitrate = 1000000; s_ele = 0; s_ele_ = 0; + skill_num = PA_SACRIFICE; + //clif_skill_nodamage(src,target,skill_num,skill_lv,1); // this doesn't show effect either.. hmm =/ sc_data[SC_SACRIFICE].val2 --; if (sc_data[SC_SACRIFICE].val2 == 0) status_change_end(src, SC_SACRIFICE,-1); diff --git a/src/map/status.c b/src/map/status.c index e7fcf22b3..814121be0 100644 --- a/src/map/status.c +++ b/src/map/status.c @@ -2978,9 +2978,13 @@ int status_get_sc_def(struct block_list *bl, int type) break; } - if(bl->type == BL_MOB && sc_def < 50) - sc_def = 50; - else if(bl->type == BL_PC) { + if(bl->type == BL_MOB) { + struct mob_data *md = (struct mob_data *)bl; + if (md && md->class_ == 1288) + return 0; + if (sc_def < 50) + sc_def = 50; + } else if(bl->type == BL_PC) { struct status_change* sc_data = status_get_sc_data(bl); if (sc_data && sc_data[SC_GOSPEL].timer != -1 && sc_data[SC_GOSPEL].val4 == BCT_PARTY && |