diff options
| author | celest <celest@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2005-04-06 11:55:55 +0000 |
|---|---|---|
| committer | celest <celest@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2005-04-06 11:55:55 +0000 |
| commit | 39d776311e6cda0692503f599ce997a77dbe700d (patch) | |
| tree | 23a1f8e7a5687ddb87d397ddef68ad041bbc3831 /src/map/status.c | |
| parent | b1a8b920af2b39f546cd3408af893741fc94e12b (diff) | |
| download | hercules-39d776311e6cda0692503f599ce997a77dbe700d.tar.gz hercules-39d776311e6cda0692503f599ce997a77dbe700d.tar.bz2 hercules-39d776311e6cda0692503f599ce997a77dbe700d.tar.xz hercules-39d776311e6cda0692503f599ce997a77dbe700d.zip | |
* Fixed a crash in clif_send when checking packet version
* Fixed a crash in Deluge, Volcano and Violent Gale
* Allow super novices to rent carts from the Kafra
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/branches/stable@1420 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/status.c')
| -rw-r--r-- | src/map/status.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/map/status.c b/src/map/status.c index 3b910c004..c5100d8bb 100644 --- a/src/map/status.c +++ b/src/map/status.c @@ -1215,7 +1215,7 @@ int status_calc_pc(struct map_session_data* sd,int first) sd->status.max_hp = battle_config.max_hp; } if(sd->sc_data[SC_DELUGE].timer!=-1 && sd->def_ele==1){ // デリュ?ジ - sd->status.max_hp += sd->status.max_hp*sd->sc_data[SC_DELUGE].val3/100; + sd->status.max_hp += sd->status.max_hp * deluge_eff[sd->sc_data[SC_DELUGE].val1-1]/100; if(sd->status.max_hp < 0 || sd->status.max_hp > battle_config.max_hp) sd->status.max_hp = battle_config.max_hp; } @@ -3335,19 +3335,19 @@ int status_change_start(struct block_list *bl,int type,int val1,int val2,int val case SC_VOLCANO: calc_flag = 1; val3 = val1*10; - val4 = val1>=5?20: (val1==4?19: (val1==3?17: ( val1==2?14:10 ) ) ); + //val4 = val1>=5?20: (val1==4?19: (val1==3?17: ( val1==2?14:10 ) ) ); break; case SC_DELUGE: calc_flag = 1; - val3 = val1>=5?15: (val1==4?14: (val1==3?12: ( val1==2?9:5 ) ) ); - val4 = val1>=5?20: (val1==4?19: (val1==3?17: ( val1==2?14:10 ) ) ); + //val3 = val1>=5?15: (val1==4?14: (val1==3?12: ( val1==2?9:5 ) ) ); + //val4 = val1>=5?20: (val1==4?19: (val1==3?17: ( val1==2?14:10 ) ) ); if (sc_data[SC_FOGWALL].timer != -1 && sc_data[SC_BLIND].timer != -1) status_change_end(bl,SC_BLIND,-1); break; case SC_VIOLENTGALE: calc_flag = 1; val3 = val1*3; - val4 = val1>=5?20: (val1==4?19: (val1==3?17: ( val1==2?14:10 ) ) ); + //val4 = val1>=5?20: (val1==4?19: (val1==3?17: ( val1==2?14:10 ) ) ); break; case SC_SPEARSQUICKEN: /* スピアクイッケン */ |