diff options
| author | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-06-26 14:44:38 +0000 |
|---|---|---|
| committer | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-06-26 14:44:38 +0000 |
| commit | bab077c56d3f89cc65bb0b00e10046ae8bdaa83a (patch) | |
| tree | dd50254304bbbb538ae0f38e477e4591a8e0a9f1 /src/map/skill.c | |
| parent | 0fcfb97f9aab16e782440a9f785dba45e89213d4 (diff) | |
| download | hercules-bab077c56d3f89cc65bb0b00e10046ae8bdaa83a.tar.gz hercules-bab077c56d3f89cc65bb0b00e10046ae8bdaa83a.tar.bz2 hercules-bab077c56d3f89cc65bb0b00e10046ae8bdaa83a.tar.xz hercules-bab077c56d3f89cc65bb0b00e10046ae8bdaa83a.zip | |
- Merged Mitternacht's max_heal/max_heal_lv config settings.
- Removed support of packet 0xc3 on the new packet versions. Thanks to Meruru for pointing out they aren't being used anymore.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@7343 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/skill.c')
| -rw-r--r-- | src/map/skill.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/map/skill.c b/src/map/skill.c index a849e55b2..90afdf01f 100644 --- a/src/map/skill.c +++ b/src/map/skill.c @@ -801,9 +801,14 @@ int skill_get_range2 (struct block_list *bl, int id, int lv) int skill_calc_heal (struct block_list *bl, int skill_lv) { int skill, heal; + + if (skill_lv >= battle_config.max_heal_lv) + return battle_config.max_heal; + heal = ( status_get_lv(bl)+status_get_int(bl) )/8 *(4+ skill_lv*8); if(bl->type == BL_PC && (skill = pc_checkskill((TBL_PC*)bl, HP_MEDITATIO)) > 0) heal += heal * skill * 2 / 100; + return heal; } @@ -3152,8 +3157,6 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, in int heal = skill_calc_heal(src, skilllv); int heal_get_jobexp; - if (skilllv > 10) - heal = 9999; //9999ヒール if (status_isimmune(bl) || (dstmd && dstmd->class_ == MOBID_EMPERIUM)) heal=0; /* 黄金蟲カード（ヒール量０） */ if (sd) { |