diff options
| author | celest <celest@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2005-04-07 13:42:03 +0000 |
|---|---|---|
| committer | celest <celest@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2005-04-07 13:42:03 +0000 |
| commit | a37f1982ac7b798b1a696908d96059ed15d62065 (patch) | |
| tree | 40a46eddd8be507719840a33a22017234a613ec7 /src/map/status.c | |
| parent | 72131e08166ade4883ed5be548060030f7fe1ba6 (diff) | |
| download | hercules-a37f1982ac7b798b1a696908d96059ed15d62065.tar.gz hercules-a37f1982ac7b798b1a696908d96059ed15d62065.tar.bz2 hercules-a37f1982ac7b798b1a696908d96059ed15d62065.tar.xz hercules-a37f1982ac7b798b1a696908d96059ed15d62065.zip | |
* Fixed HP Conversion to properly not reduce HP if SP is full
* Updated Defender
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/branches/stable@1427 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/status.c')
| -rw-r--r-- | src/map/status.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/map/status.c b/src/map/status.c index c5100d8bb..a9967d956 100644 --- a/src/map/status.c +++ b/src/map/status.c @@ -1247,9 +1247,9 @@ int status_calc_pc(struct map_session_data* sd,int first) sd->speed = (sd->speed * 125) / 100; } if(sd->sc_data[SC_DEFENDER].timer != -1) { - sd->aspd += (550 - sd->sc_data[SC_DEFENDER].val1*50); - // removed as of 12/14's patch [celest] - //sd->speed = (sd->speed * (155 - sd->sc_data[SC_DEFENDER].val1*5)) / 100; + //sd->aspd += (550 - sd->sc_data[SC_DEFENDER].val1*50); + aspd_rate += (25 - sd->sc_data[SC_DEFENDER].val1*5); + sd->speed = (sd->speed * (155 - sd->sc_data[SC_DEFENDER].val1*5)) / 100; } if(sd->sc_data[SC_ENCPOISON].timer != -1) sd->addeff[4] += sd->sc_data[SC_ENCPOISON].val2; @@ -1528,8 +1528,7 @@ int status_calc_speed (struct map_session_data *sd) sd->speed = (sd->speed * 125) / 100; } if(sd->sc_data[SC_DEFENDER].timer != -1) { - // removed as of 12/14's patch [celest] - //sd->speed = (sd->speed * (155 - sd->sc_data[SC_DEFENDER].val1*5)) / 100; + sd->speed = (sd->speed * (155 - sd->sc_data[SC_DEFENDER].val1*5)) / 100; } if( sd->sc_data[SC_DANCING].timer!=-1 ){ sd->speed = (int) ((double)sd->speed * (6.- 0.4 * pc_checkskill(sd, ((s_class.job == 19) ? BA_MUSICALLESSON : DC_DANCINGLESSON)))); @@ -2514,9 +2513,8 @@ int status_get_speed(struct block_list *bl) if(sc_data[SC_STEELBODY].timer!=-1) speed = speed*125/100; //ディフェンダー時は加算 - // removed as of 12/14's patch [celest] - /*if(sc_data[SC_DEFENDER].timer!=-1) - speed = (speed * (155 - sc_data[SC_DEFENDER].val1*5)) / 100;*/ + if(sc_data[SC_DEFENDER].timer!=-1) + speed = (speed * (155 - sc_data[SC_DEFENDER].val1*5)) / 100; //踊り状態は4倍遅い if(sc_data[SC_DANCING].timer!=-1 ) speed *= 6; @@ -2596,7 +2594,8 @@ int status_get_adelay(struct block_list *bl) aspd_rate -= sc_data[i].val2; //ディフェンダー時は加算 if(sc_data[SC_DEFENDER].timer != -1) - adelay += (1100 - sc_data[SC_DEFENDER].val1*100); + aspd_rate += (25 - sc_data[SC_DEFENDER].val1*5); + //adelay += (1100 - sc_data[SC_DEFENDER].val1*100); if(sc_data[SC_GOSPEL].timer!=-1 && sc_data[SC_GOSPEL].val4 == BCT_ENEMY && sc_data[SC_GOSPEL].val3 == 8) @@ -2652,7 +2651,8 @@ int status_get_amotion(struct block_list *bl) if( sc_data[i=SC_SPEEDPOTION3].timer!=-1 || sc_data[i=SC_SPEEDPOTION2].timer!=-1 || sc_data[i=SC_SPEEDPOTION1].timer!=-1 || sc_data[i=SC_SPEEDPOTION0].timer!=-1) aspd_rate -= sc_data[i].val2; if(sc_data[SC_DEFENDER].timer != -1) - amotion += (550 - sc_data[SC_DEFENDER].val1*50); + aspd_rate += (25 - sc_data[SC_DEFENDER].val1*5); + //amotion += (550 - sc_data[SC_DEFENDER].val1*50); } if(aspd_rate != 100) amotion = amotion*aspd_rate/100; |