diff options
| author | shennetsind <ind@henn.et> | 2013-09-28 12:49:51 -0300 |
|---|---|---|
| committer | shennetsind <ind@henn.et> | 2013-09-28 12:49:51 -0300 |
| commit | 8bed1531de1deceae20e09bc2d59470f586a94f6 (patch) | |
| tree | 5909c98606ebb26a70c15e16b6a26c8cac081088 /src/map/status.c | |
| parent | e4b0f270ad0fabab869c1a803fa8e4a73f198760 (diff) | |
| parent | f8f073bc7ebd1bc5cf19e8ea9b72a54bba7fab8b (diff) | |
| download | hercules-8bed1531de1deceae20e09bc2d59470f586a94f6.tar.gz hercules-8bed1531de1deceae20e09bc2d59470f586a94f6.tar.bz2 hercules-8bed1531de1deceae20e09bc2d59470f586a94f6.tar.xz hercules-8bed1531de1deceae20e09bc2d59470f586a94f6.zip | |
Merge branch 'master' of https://github.com/HerculesWS/Hercules
Diffstat (limited to 'src/map/status.c')
| -rw-r--r-- | src/map/status.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/map/status.c b/src/map/status.c index d8356264c..0b69ae2ef 100644 --- a/src/map/status.c +++ b/src/map/status.c @@ -2278,7 +2278,7 @@ static unsigned int status_base_pc_maxhp(struct map_session_data *sd, struct sta uint64 val = pc->class2idx(sd->status.class_); val = 35 + sd->status.base_level*(int64)hp_coefficient2[val]/100 + hp_sigma_val[val][sd->status.base_level]; - if((sd->class_&MAPID_UPPERMASK) == MAPID_NINJA || (sd->class_&MAPID_UPPERMASK) == MAPID_GUNSLINGER) + if((sd->class_&MAPID_UPPERMASK) == MAPID_NINJA || (sd->class_&MAPID_UPPERMASK) == MAPID_GUNSLINGER || (sd->class_&MAPID_UPPERMASK) == MAPID_REBELLION) val += 100; //Since their HP can't be approximated well enough without this. if((sd->class_&MAPID_UPPERMASK) == MAPID_TAEKWON && sd->status.base_level >= 90 && pc->famerank(sd->status.char_id, MAPID_TAEKWON)) val *= 3; //Triple max HP for top ranking Taekwons over level 90. |