diff options
| author | Hercules.ws <Hercules@efficiently.awesome> | 2014-08-06 16:08:06 +0200 |
|---|---|---|
| committer | HerculesWSAPI <Hercules@efficiently.awesome> | 2014-08-06 16:08:06 +0200 |
| commit | ec28fdbe925a0a6d2ca18d2689ba2ae5a7405597 (patch) | |
| tree | 711a9a4a1d6791ec96addb84883b07a00bb4ea14 /src/map/pc.c | |
| parent | 356a83b11ae56778992b27b0c9b358d7d79722cd (diff) | |
| download | hercules-ec28fdbe925a0a6d2ca18d2689ba2ae5a7405597.tar.gz hercules-ec28fdbe925a0a6d2ca18d2689ba2ae5a7405597.tar.bz2 hercules-ec28fdbe925a0a6d2ca18d2689ba2ae5a7405597.tar.xz hercules-ec28fdbe925a0a6d2ca18d2689ba2ae5a7405597.zip | |
HPM Hooks Update
Signed-off-by: HerculesWSAPI <Hercules@efficiently.awesome>
Diffstat (limited to 'src/map/pc.c')
| -rw-r--r-- | src/map/pc.c | 70 |
1 files changed, 35 insertions, 35 deletions
diff --git a/src/map/pc.c b/src/map/pc.c index 58a066edf..5a21c7df0 100644 --- a/src/map/pc.c +++ b/src/map/pc.c @@ -2945,12 +2945,12 @@ int pc_bonus2(struct map_session_data *sd,int type,int type2,int val) sd->left_weapon.sp_drain[RC_BOSS].type = val; } break; - case SP_SP_VANISH_RATE:
- if(sd->state.lr_flag != 2) {
- sd->bonus.sp_vanish_rate += type2;
- sd->bonus.sp_vanish_per = max(sd->bonus.sp_vanish_per,val);
- sd->bonus.sp_vanish_trigger=0;
- }
+ case SP_SP_VANISH_RATE: + if(sd->state.lr_flag != 2) { + sd->bonus.sp_vanish_rate += type2; + sd->bonus.sp_vanish_per = max(sd->bonus.sp_vanish_per,val); + sd->bonus.sp_vanish_trigger=0; + } break; case SP_GET_ZENY_NUM: if(sd->state.lr_flag != 2 && sd->bonus.get_zeny_rate < val) { @@ -3435,12 +3435,12 @@ int pc_bonus3(struct map_session_data *sd,int type,int type2,int type3,int val) if (sd->state.lr_flag != 2) pc_bonus_subele(sd, (unsigned char)type2, type3, val); break; - case SP_SP_VANISH_RATE:
- if(sd->state.lr_flag != 2) {
- sd->bonus.sp_vanish_rate += type2;
- sd->bonus.sp_vanish_per = max(sd->bonus.sp_vanish_per,type3);
- sd->bonus.sp_vanish_trigger=val;
- }
+ case SP_SP_VANISH_RATE: + if(sd->state.lr_flag != 2) { + sd->bonus.sp_vanish_rate += type2; + sd->bonus.sp_vanish_per = max(sd->bonus.sp_vanish_per,type3); + sd->bonus.sp_vanish_trigger=val; + } break; default: @@ -3483,28 +3483,28 @@ int pc_bonus4(struct map_session_data *sd,int type,int type2,int type3,int type4 pc->bonus_addeff_onskill(sd->addeff3, ARRAYLENGTH(sd->addeff3), (sc_type)type3, type4, type2, val); break; - case SP_SET_DEF_RACE: //bonus4 bSetDefRace,n,x,r,y;
- if( type2 > RC_MAX ) {
- ShowWarning("pc_bonus4 (DEF_SET): %d is not supported.\n", type2);
- break;
- }
- if(sd->state.lr_flag == 2)
- break;
- sd->def_set_race[type2].rate = type3;
- sd->def_set_race[type2].tick = type4;
- sd->def_set_race[type2].value = val;
- break;
-
- case SP_SET_MDEF_RACE: //bonus4 bSetMDefRace,n,x,r,y;
- if( type2 > RC_MAX ) {
- ShowWarning("pc_bonus4 (MDEF_SET): %d is not supported.\n", type2);
- break;
- }
- if(sd->state.lr_flag == 2)
- break;
- sd->mdef_set_race[type2].rate = type3;
- sd->mdef_set_race[type2].tick = type4;
- sd->mdef_set_race[type2].value = val;
+ case SP_SET_DEF_RACE: //bonus4 bSetDefRace,n,x,r,y; + if( type2 > RC_MAX ) { + ShowWarning("pc_bonus4 (DEF_SET): %d is not supported.\n", type2); + break; + } + if(sd->state.lr_flag == 2) + break; + sd->def_set_race[type2].rate = type3; + sd->def_set_race[type2].tick = type4; + sd->def_set_race[type2].value = val; + break; + + case SP_SET_MDEF_RACE: //bonus4 bSetMDefRace,n,x,r,y; + if( type2 > RC_MAX ) { + ShowWarning("pc_bonus4 (MDEF_SET): %d is not supported.\n", type2); + break; + } + if(sd->state.lr_flag == 2) + break; + sd->mdef_set_race[type2].rate = type3; + sd->mdef_set_race[type2].tick = type4; + sd->mdef_set_race[type2].value = val; break; default: @@ -9551,7 +9551,7 @@ int map_night_timer(int tid, int64 tick, int id, intptr_t data) { void pc_setstand(struct map_session_data *sd) { nullpo_retv(sd); -
+ status_change_end(&sd->bl, SC_TENSIONRELAX, INVALID_TIMER); clif->sc_end(&sd->bl,sd->bl.id,SELF,SI_SIT); //Reset sitting tick. |