diff options
| author | celest <celest@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2004-11-21 14:48:28 +0000 |
|---|---|---|
| committer | celest <celest@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2004-11-21 14:48:28 +0000 |
| commit | b6e172482b1a91869c8ffd630d8b0e97c98ad8d0 (patch) | |
| tree | 1dc20e710d329b9aabada92e0ebc7fb78deeea18 /src/map/pc.c | |
| parent | 81ff879313b29ee97375d214b00f78b1f75d3d4a (diff) | |
| download | hercules-b6e172482b1a91869c8ffd630d8b0e97c98ad8d0.tar.gz hercules-b6e172482b1a91869c8ffd630d8b0e97c98ad8d0.tar.bz2 hercules-b6e172482b1a91869c8ffd630d8b0e97c98ad8d0.tar.xz hercules-b6e172482b1a91869c8ffd630d8b0e97c98ad8d0.zip | |
- Updated Basilica, Sharp Shooting, Berserk, Meditatio
- Fixed a typo with Blade Stop that was causing crashes, sorry. ^^;
- Reverted changes to Cloaking, ours is already more updated (than Freya!) ^_^
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/athena@293 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/pc.c')
| -rw-r--r-- | src/map/pc.c | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/src/map/pc.c b/src/map/pc.c index 356f2b173..799fc2f59 100644 --- a/src/map/pc.c +++ b/src/map/pc.c @@ -1452,9 +1452,9 @@ int pc_calcstatus(struct map_session_data* sd,int first) sd->speed = sd->speed *125/100; if(sd->sc_data[SC_CLOAKING].timer!=-1) { sd->critical_rate += 100; // critical increases - //sd->speed = sd->speed * (sd->sc_data[SC_CLOAKING].val3-sd->sc_data[SC_CLOAKING].val1*3) /100; - //clocking speed descreases normally - sd->speed = (sd->speed*(76+(sd->sc_data[SC_CLOAKING].val1*3)))/100; // Fixed by MiKa & Asa [Lupus] + sd->speed = sd->speed * (sd->sc_data[SC_CLOAKING].val3-sd->sc_data[SC_CLOAKING].val1*3) /100; + // Ours is accurate enough - refer skill_check_cloaking. ^^ + //sd->speed = (sd->speed*(76+(sd->sc_data[SC_CLOAKING].val1*3)))/100; // Fixed by MiKa & Asa [Lupus] } //sd->speed = (sd->speed*(76+(sd->sc_data[SC_INCREASEAGI].val1*3)))/100; if(sd->sc_data[SC_CHASEWALK].timer!=-1) @@ -1696,10 +1696,10 @@ int pc_calcstatus(struct map_session_data* sd,int first) sd->nhealsp = sd->nhealsp*sd->sprecov_rate/100; if(sd->nhealsp < 1) sd->nhealsp = 1; } - if((skill=pc_checkskill(sd,HP_MEDITATIO)) > 0) { // メディテイティオはSPRではなく自然回復にかかる + /* if((skill=pc_checkskill(sd,HP_MEDITATIO)) > 0) { // f?fffBfefCfefBfI,I'SPR,A*,I',E`,｡ｩZ((c)｡ｮR｢ｶn~.ｩｫ,E',(c),(c),e' sd->nhealsp += 3*skill*(sd->status.max_sp)/100; if(sd->nhealsp > 0x7fff) sd->nhealsp = 0x7fff; - } + } Increase natural SP regen instead of colossal SP Recovery effect [DracoRPG]*/ // 種族耐性（これでいいの？ ディバインプロテクションと同じ?理がいるかも） if( (skill=pc_checkskill(sd,SA_DRAGONOLOGY))>0 ){ // ドラゴノロジ? @@ -1937,7 +1937,7 @@ int pc_calcstatus(struct map_session_data* sd,int first) sd->mdef = sd->mdef2 = 0; sd->flee -= sd->flee*50/100; aspd_rate -= 30; - sd->base_atk *= 3; + //sd->base_atk *= 3; } if(sd->sc_data[SC_KEEPING].timer!=-1) sd->def = 100; @@ -6733,15 +6733,17 @@ struct map_session_data *pc_get_partner(struct map_session_data *sd) static int natural_heal_tick,natural_heal_prev_tick,natural_heal_diff_tick; static int pc_spheal(struct map_session_data *sd) { - int a; + int a, skill; struct guild_castle *gc = NULL; nullpo_retr(0, sd); a = natural_heal_diff_tick; if(pc_issit(sd)) a += a; - if( sd->sc_data[SC_MAGNIFICAT].timer!=-1 ) // マグニフィカ?ト - a += a; + if (sd->sc_data[SC_MAGNIFICAT].timer!=-1) // マグニフィカ?ト + a += a; + if((skill = pc_checkskill(sd,HP_MEDITATIO)) > 0) //Increase natural SP regen with Meditatio [DracoRPG] + a += a*skill*3/100; gc=guild_mapname2gc(sd->mapname); // Increased guild castle regen [Valaris] if(gc) { |