diff options
| author | celest <celest@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2004-11-15 09:54:39 +0000 |
|---|---|---|
| committer | celest <celest@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2004-11-15 09:54:39 +0000 |
| commit | ab5cb3ae9f7ab77bdcbf1b57c1da8e3d82ca53cb (patch) | |
| tree | 61e9d42d58d0940fbf90be4cfebf1ee870585163 /src/map/skill.c | |
| parent | 431127c95f4443d08e0bcee53168226b5299db18 (diff) | |
| download | hercules-ab5cb3ae9f7ab77bdcbf1b57c1da8e3d82ca53cb.tar.gz hercules-ab5cb3ae9f7ab77bdcbf1b57c1da8e3d82ca53cb.tar.bz2 hercules-ab5cb3ae9f7ab77bdcbf1b57c1da8e3d82ca53cb.tar.xz hercules-ab5cb3ae9f7ab77bdcbf1b57c1da8e3d82ca53cb.zip | |
Fixed max skill levels, pc_calc_base_job, baby jobs.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/athena@190 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/skill.c')
| -rw-r--r-- | src/map/skill.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/src/map/skill.c b/src/map/skill.c index 433c03a93..dfef6c036 100644 --- a/src/map/skill.c +++ b/src/map/skill.c @@ -736,7 +736,7 @@ int skill_get_hit( int id ){ return skill_db[id].hit; } int skill_get_inf( int id ){ return skill_db[id].inf; } int skill_get_pl( int id ){ return skill_db[id].pl; } int skill_get_nk( int id ){ return skill_db[id].nk; } -int skill_get_max( int id ){ return skill_db[id].max; } +int skill_get_max( int id ){ return skill_db[id].max; } int skill_get_range( int id , int lv ){ return (lv <= 0) ? 0:skill_db[id].range[lv-1]; } int skill_get_hp( int id ,int lv ){ return (lv <= 0) ? 0:skill_db[id].hp[lv-1]; } int skill_get_sp( int id ,int lv ){ return (lv <= 0) ? 0:skill_db[id].sp[lv-1]; } @@ -754,6 +754,11 @@ int skill_get_blewcount( int id ,int lv ){ return (lv <= 0) ? 0:skill_db[id].ble int skill_get_mhp( int id ,int lv ){ return (lv <= 0) ? 0:skill_db[id].mhp[lv-1]; } int skill_get_castnodex( int id ,int lv ){ return (lv <= 0) ? 0:skill_db[id].castnodex[lv-1]; } +int skill_tree_get_max(int id, int b_class){ + struct pc_base_job s_class = pc_calc_base_job(b_class); + return skill_tree[s_class.upper][s_class.job][id].max; +} + /* プロトタイプ */ struct skill_unit_group *skill_unitsetting( struct block_list *src, int skillid,int skilllv,int x,int y,int flag); int skill_check_condition( struct map_session_data *sd,int type); @@ -2711,8 +2716,8 @@ int skill_castend_nodamage_id( struct block_list *src, struct block_list *bl,int heal=0; /* ?金蟲カ?ド（ヒ?ル量０） */ if (sd){ s_class = pc_calc_base_job(sd->status.class); - if((skill=pc_checkskill(sd,HP_MEDITATIO))>0) // メディテイティオ - heal += heal*(skill*2/100); + if((skill=pc_checkskill(sd,HP_MEDITATIO))>0) // メディテイティオ + heal += heal*(skill*2/100); if(sd && dstsd && sd->status.partner_id == dstsd->status.char_id && s_class.job == 23 && sd->status.sex == 0) //自分も?象もPC、?象が自分のパ?トナ?、自分がスパノビ、自分が♀なら heal = heal*2; //スパノビの嫁が旦那にヒ?ルすると2倍になる } |