diff options
author | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-03-13 14:49:16 +0000 |
---|---|---|
committer | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-03-13 14:49:16 +0000 |
commit | 5b1bc8778474458ee6993d9d124b13e4cf5af3dc (patch) | |
tree | c4d1d1205b5ef9ae35bb28f8e4b1041d76ac22ce /src/map | |
parent | b6741a82e54a01f417b52267ddadb205f08ac3f5 (diff) | |
download | hercules-5b1bc8778474458ee6993d9d124b13e4cf5af3dc.tar.gz hercules-5b1bc8778474458ee6993d9d124b13e4cf5af3dc.tar.bz2 hercules-5b1bc8778474458ee6993d9d124b13e4cf5af3dc.tar.xz hercules-5b1bc8778474458ee6993d9d124b13e4cf5af3dc.zip |
- Corrected char-server parameters so that the subnet config file is the third parameter, not the second (which was conflicting with inter_athena.conf's argument), thanks to foobar.
- Fixed TK and Soul Linker's position of their job entry in exp2.txt, thanks to Coltaro.
- Fixed NPC_GRANDDARKNESS targetting the enemy instead of yourself in mob_skill_db.
- Fixed Grandcross's hit and range entries in the skill_db (it had hit 5? that wasn't even a valid value from the description)
- PR_BENEDICTIO now ignores mdef
- Removed the status_isdead checks from status_check_skilluse, they are now done only on the skill_castend_* functions.
- Fixed NPC_SELFDESTRUCTION not doing the correct damage to oneself.
- Fixed chatlog's x/y column capacity.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@5584 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map')
-rw-r--r-- | src/map/battle.c | 1 | ||||
-rw-r--r-- | src/map/skill.c | 5 | ||||
-rw-r--r-- | src/map/status.c | 5 |
3 files changed, 5 insertions, 6 deletions
diff --git a/src/map/battle.c b/src/map/battle.c index c17977151..bf830de1a 100644 --- a/src/map/battle.c +++ b/src/map/battle.c @@ -2527,6 +2527,7 @@ struct Damage battle_calc_magic_attack( case PR_SANCTUARY:
ad.blewcount|=0x10000;
case AL_HEAL:
+ case PR_BENEDICTIO:
case WZ_FIREPILLAR:
flag.imdef = 1;
break;
diff --git a/src/map/skill.c b/src/map/skill.c index d05e845ec..716d6ef17 100644 --- a/src/map/skill.c +++ b/src/map/skill.c @@ -4097,7 +4097,7 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, in skill_get_splash(skillid, skilllv), BL_CHAR,
src, skillid, skilllv, tick, flag|BCT_ENEMY,
skill_castend_damage_id);
- battle_damage(src, src, skill_area_temp[2], 0);
+ battle_damage(src, src, status_get_max_hp(src), 0);
break;
/* パ?ティスキル */
@@ -5978,6 +5978,9 @@ int skill_castend_pos2( struct block_list *src, int x,int y,int skillid,int skil nullpo_retr(0, src);
+ if(status_isdead(src))
+ return 0;
+
if(src->type==BL_PC)
sd=(struct map_session_data *)src;
diff --git a/src/map/status.c b/src/map/status.c index 9358aad07..0edb39ccb 100644 --- a/src/map/status.c +++ b/src/map/status.c @@ -354,11 +354,6 @@ int status_check_skilluse(struct block_list *src, struct block_list *target, int int mode, race, hide_flag;
struct status_change *sc=NULL, *tsc;
- if (src && status_isdead(src))
- return 0;
- if (target && status_isdead(target) && skill_num != ALL_RESURRECTION && skill_num != PR_REDEMPTIO)
- return 0;
-
mode = src?status_get_mode(src):MD_CANATTACK;
if (!skill_num && !(mode&MD_CANATTACK))
|