diff options
| author | celest <celest@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2004-12-17 10:15:48 +0000 |
|---|---|---|
| committer | celest <celest@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2004-12-17 10:15:48 +0000 |
| commit | a89c7dda8ac0eded573e3c24d59684d15957646d (patch) | |
| tree | eae0f3b8223d6f61b54c4bec331ec1caa048e330 /src/map/battle.c | |
| parent | 22c197474d2aa50781523a3d20fdf7f467d5bce2 (diff) | |
| download | hercules-a89c7dda8ac0eded573e3c24d59684d15957646d.tar.gz hercules-a89c7dda8ac0eded573e3c24d59684d15957646d.tar.bz2 hercules-a89c7dda8ac0eded573e3c24d59684d15957646d.tar.xz hercules-a89c7dda8ac0eded573e3c24d59684d15957646d.zip | |
* Updated Sphere Mine
* Updated Wind Walk
* Added effect for Deadly poison bottle and Ice cream
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/branches/stable@594 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/battle.c')
| -rw-r--r-- | src/map/battle.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/map/battle.c b/src/map/battle.c index 494b7a323..c43e9bb61 100644 --- a/src/map/battle.c +++ b/src/map/battle.c @@ -931,7 +931,7 @@ int battle_get_speed(struct block_list *bl) if(sc_data[SC_CURSE].timer!=-1) speed = speed + 450; //ウィンドウォーク時はLv*2%減算 - if(sc_data[SC_WINDWALK].timer!=-1) + if(sc_data[SC_WINDWALK].timer!=-1 && sc_data[SC_INCREASEAGI].timer==-1) speed -= (speed*(sc_data[SC_WINDWALK].val1*2))/100; if(sc_data[SC_SLOWDOWN].timer!=-1) speed = speed*150/100; @@ -990,7 +990,7 @@ int battle_get_adelay(struct block_list *bl) if(sc_data[SC_STEELBODY].timer!=-1) // 金剛 aspd_rate += 25; //増速ポーション使用時は減算 - if( sc_data[i=SC_SPEEDPOTION2].timer!=-1 || sc_data[i=SC_SPEEDPOTION1].timer!=-1 || sc_data[i=SC_SPEEDPOTION0].timer!=-1) + 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) @@ -1037,7 +1037,7 @@ int battle_get_amotion(struct block_list *bl) aspd_rate += sc_data[SC_DONTFORGETME].val1*3 + sc_data[SC_DONTFORGETME].val2 + (sc_data[SC_DONTFORGETME].val3>>16); if(sc_data[SC_STEELBODY].timer!=-1) // 金剛 aspd_rate += 25; - if( sc_data[i=SC_SPEEDPOTION2].timer!=-1 || sc_data[i=SC_SPEEDPOTION1].timer!=-1 || sc_data[i=SC_SPEEDPOTION0].timer!=-1) + 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); |