diff options
| author | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-08-14 19:48:16 +0000 |
|---|---|---|
| committer | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-08-14 19:48:16 +0000 |
| commit | 5a6f4e191743aca6fe6f4bbb3e371df4fe9a7100 (patch) | |
| tree | c12c5c2af8d5344166acfff7b2e7926f0c959362 /src/map/battle.c | |
| parent | b1ef0da5a7fdd3d48f758c3e8ec621a2d52650ab (diff) | |
| download | hercules-5a6f4e191743aca6fe6f4bbb3e371df4fe9a7100.tar.gz hercules-5a6f4e191743aca6fe6f4bbb3e371df4fe9a7100.tar.bz2 hercules-5a6f4e191743aca6fe6f4bbb3e371df4fe9a7100.tar.xz hercules-5a6f4e191743aca6fe6f4bbb3e371df4fe9a7100.zip | |
- Sacrifice no longer shows damage to self.
- When Asura fails, the skill display will still come off.
- Cleaned up AM_CALLHOMUN so that the required item is specified on skill_require_db
- Cleaned up function merc_call_homun and added function merc_hom_vaporize to handle the respective cases.
- Cleaned up a bit unit_remove_map/unit_free on regards to homun. it will display the /sob emotion when the homun dies due to low intimacy. Moved removal of timers and all that to unit_free
- Cleaned up function merc_hom_dead
- Simplified lots of code around by using the new merc functions.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@8279 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/battle.c')
| -rw-r--r-- | src/map/battle.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/map/battle.c b/src/map/battle.c index bd9800ffa..4f2e03e5f 100644 --- a/src/map/battle.c +++ b/src/map/battle.c @@ -1143,7 +1143,6 @@ static struct Damage battle_calc_weapon_attack( case PA_SACRIFICE: wd.damage = sstatus->max_hp* 9/100; status_zap(src, wd.damage, 0);//Damage to self is always 9% - clif_damage(src,src, gettick(), 0, 0, wd.damage, 0 , 0, 0); wd.damage2 = 0; if (sc && sc->data[SC_SACRIFICE].timer != -1) |