summaryrefslogtreecommitdiff
path: root/src/map/status.c
diff options
context:
space:
mode:
authorHercules.ws <Hercules@efficiently.awesome>2014-08-06 16:08:06 +0200
committerHerculesWSAPI <Hercules@efficiently.awesome>2014-08-06 16:08:06 +0200
commitec28fdbe925a0a6d2ca18d2689ba2ae5a7405597 (patch)
tree711a9a4a1d6791ec96addb84883b07a00bb4ea14 /src/map/status.c
parent356a83b11ae56778992b27b0c9b358d7d79722cd (diff)
downloadhercules-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/status.c')
-rw-r--r--src/map/status.c34
1 files changed, 17 insertions, 17 deletions
diff --git a/src/map/status.c b/src/map/status.c
index df0f65fd7..5ad096c1d 100644
--- a/src/map/status.c
+++ b/src/map/status.c
@@ -1002,7 +1002,7 @@ void initChangeTables(void) {
status->ChangeFlagTable[SC_VITATA_500] |= SCB_REGEN;
status->ChangeFlagTable[SC_EXTRACT_SALAMINE_JUICE] |= SCB_ASPD;
status->ChangeFlagTable[SC_REBOUND] |= SCB_SPEED|SCB_REGEN;
- status->ChangeFlagTable[SC_DEFSET] |= SCB_DEF|SCB_DEF2;
+ status->ChangeFlagTable[SC_DEFSET] |= SCB_DEF|SCB_DEF2;
status->ChangeFlagTable[SC_MDEFSET] |= SCB_MDEF|SCB_MDEF2;
status->ChangeFlagTable[SC_ALL_RIDING] = SCB_SPEED;
@@ -2516,7 +2516,7 @@ int status_calc_pc_(struct map_session_data* sd, enum e_status_calc_opt opt) {
+ sizeof(sd->skillfixcast)
+ sizeof(sd->skillvarcast)
+ sizeof(sd->skillfixcastrate)
- + sizeof(sd->def_set_race)
+ + sizeof(sd->def_set_race)
+ sizeof(sd->mdef_set_race)
);
@@ -4937,7 +4937,7 @@ defType status_calc_def(struct block_list *bl, struct status_change *sc, int def
def += 2 * sc->data[SC_GENTLETOUCH_REVITALIZE]->val4;
if( sc->data[SC_FORCEOFVANGUARD] )
def += def * 2 * sc->data[SC_FORCEOFVANGUARD]->val1 / 100;
- if(sc->data[SC_DEFSET])
+ if(sc->data[SC_DEFSET])
return sc->data[SC_DEFSET]->val1;
return (defType)cap_value(def,DEFTYPE_MIN,DEFTYPE_MAX);
}
@@ -5013,7 +5013,7 @@ defType status_calc_def(struct block_list *bl, struct status_change *sc, int def
if(status_get_race(bl)==RC_PLANT)
def /= 2;
}
- if(sc->data[SC_UNLIMIT])
+ if(sc->data[SC_UNLIMIT])
return 1;
return (defType)cap_value(def,DEFTYPE_MIN,DEFTYPE_MAX);
@@ -5036,7 +5036,7 @@ signed short status_calc_def2(struct block_list *bl, struct status_change *sc, i
#endif
if( sc && sc->data[SC_CAMOUFLAGE] )
def2 -= def2 * 5 * (10-sc->data[SC_CAMOUFLAGE]->val4) / 100;
- if(sc->data[SC_DEFSET])
+ if(sc->data[SC_DEFSET])
return sc->data[SC_DEFSET]->val1;
#ifdef RENEWAL
return (short)cap_value(def2,SHRT_MIN,SHRT_MAX);
@@ -5084,7 +5084,7 @@ signed short status_calc_def2(struct block_list *bl, struct status_change *sc, i
}
if (sc->data[SC_NEEDLE_OF_PARALYZE])
def2 -= def2 * sc->data[SC_NEEDLE_OF_PARALYZE]->val2 / 100;
- if (sc->data[SC_UNLIMIT])
+ if (sc->data[SC_UNLIMIT])
return 1;
#ifdef RENEWAL
return (short)cap_value(def2,SHRT_MIN,SHRT_MAX);
@@ -5101,7 +5101,7 @@ defType status_calc_mdef(struct block_list *bl, struct status_change *sc, int md
if( !viewable ){
/* some statuses that are hidden in the status window */
- if(sc->data[SC_MDEFSET])
+ if(sc->data[SC_MDEFSET])
return sc->data[SC_MDEFSET]->val1;
return (defType)cap_value(mdef,DEFTYPE_MIN,DEFTYPE_MAX);
}
@@ -5159,7 +5159,7 @@ signed short status_calc_mdef2(struct block_list *bl, struct status_change *sc,
if( !viewable ){
/* some statuses that are hidden in the status window */
- if(sc->data[SC_MDEFSET])
+ if(sc->data[SC_MDEFSET])
return sc->data[SC_MDEFSET]->val1;
if(sc->data[SC_MINDBREAKER])
mdef2 -= mdef2 * sc->data[SC_MINDBREAKER]->val3/100;
@@ -9001,11 +9001,11 @@ int status_change_start(struct block_list *src, struct block_list *bl, enum sc_t
if(val2 == MH_MD_FIGHTING) val2 = MH_MD_GRAPPLING;
else val2 = MH_MD_FIGHTING;
break;
- case SC_FULL_THROTTLE:
+ case SC_FULL_THROTTLE:
status_percent_heal(bl,100,0);
val2 = 7 - val1;
- tick_time = 1000;
- val4 = tick / tick_time;
+ tick_time = 1000;
+ val4 = tick / tick_time;
break;
case SC_KINGS_GRACE:
val2 = 3 + val1;
@@ -11253,12 +11253,12 @@ int status_change_timer(int tid, int64 tick, int id, intptr_t data) {
return 0;
}
break;
- case SC_FULL_THROTTLE:
- if( --(sce->val4) >= 0 ) {
- status_percent_damage(bl, bl, 0, sce->val2, false);
- sc_timer_next(1000 + tick, status->change_timer, bl->id, data);
- return 0;
- }
+ case SC_FULL_THROTTLE:
+ if( --(sce->val4) >= 0 ) {
+ status_percent_damage(bl, bl, 0, sce->val2, false);
+ sc_timer_next(1000 + tick, status->change_timer, bl->id, data);
+ return 0;
+ }
break;
case SC_KINGS_GRACE:
if( --(sce->val4) > 0 ) {