diff options
| author | Haru <haru@dotalux.com> | 2015-12-14 19:03:48 +0100 |
|---|---|---|
| committer | Haru <haru@dotalux.com> | 2015-12-28 18:35:58 +0100 |
| commit | 943daa9da6610bd900aee9134951561e8e663a93 (patch) | |
| tree | f3d20df4bb9d4cab8225ef59378b10e116ba6b47 /src/map/status.c | |
| parent | 296e6c04a4c1a01a233c937bd198a31fa849f49c (diff) | |
| download | hercules-943daa9da6610bd900aee9134951561e8e663a93.tar.gz hercules-943daa9da6610bd900aee9134951561e8e663a93.tar.bz2 hercules-943daa9da6610bd900aee9134951561e8e663a93.tar.xz hercules-943daa9da6610bd900aee9134951561e8e663a93.zip | |
Standardized (source) mob_id enum
- MOBID_ constant names now follow the Mob DB spritenames.
- The following names were changed:
* MOBID_EMPERIUM => MOBID_EMPELIUM
* MOBID_TREAS01 => MOBID_TREASURE_BOX1
* MOBID_TREAS40 => MOBID_TREASURE_BOX40
* MOBID_BARRICADE1 => MOBID_BARRICADE
* MOBID_BARRICADE2 => MOBID_BARRICADE_
* MOBID_GUARIDAN_STONE1 => MOBID_S_EMPEL_1
* MOBID_GUARIDAN_STONE2 => MOBID_S_EMPEL_2
* MOBID_FOOD_STOR => MOBID_OBJ_A
* MOBID_BLUE_CRYST => MOBID_OBJ_A2
* MOBID_PINK_CRYST => MOBID_OBJ_B2
* MOBID_TREAS41 => MOBID_TREASURE_BOX41
* MOBID_TREAS49 => MOBID_TREASURE_BOX49
- Added several missing items
Signed-off-by: Haru <haru@dotalux.com>
Diffstat (limited to 'src/map/status.c')
| -rw-r--r-- | src/map/status.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/map/status.c b/src/map/status.c index 32e5760a7..b80f04046 100644 --- a/src/map/status.c +++ b/src/map/status.c @@ -2152,7 +2152,7 @@ int status_calc_mob_(struct mob_data* md, enum e_status_calc_opt opt) { if (!gc) ShowError("status_calc_mob: No castle set at map %s\n", map->list[md->bl.m].name); else - if(gc->castle_id < 24 || md->class_ == MOBID_EMPERIUM) { + if (gc->castle_id < 24 || md->class_ == MOBID_EMPELIUM) { #ifdef RENEWAL mstatus->max_hp += 50 * gc->defense; mstatus->max_sp += 70 * gc->defense; @@ -2165,7 +2165,7 @@ int status_calc_mob_(struct mob_data* md, enum e_status_calc_opt opt) { mstatus->def += (gc->defense+2)/3; mstatus->mdef += (gc->defense+2)/3; } - if(md->class_ != MOBID_EMPERIUM) { + if (md->class_ != MOBID_EMPELIUM) { mstatus->batk += mstatus->batk * 10*guardup_lv/100; mstatus->rhw.atk += mstatus->rhw.atk * 10*guardup_lv/100; mstatus->rhw.atk2 += mstatus->rhw.atk2 * 10*guardup_lv/100; @@ -7095,7 +7095,7 @@ int status_change_start(struct block_list *src, struct block_list *bl, enum sc_t if (bl->type == BL_MOB) { struct mob_data *md = BL_CAST(BL_MOB, bl); - if (md && (md->class_ == MOBID_EMPERIUM || mob_is_battleground(md)) && type != SC_SAFETYWALL && type != SC_PNEUMA) + if (md && (md->class_ == MOBID_EMPELIUM || mob_is_battleground(md)) && type != SC_SAFETYWALL && type != SC_PNEUMA) return 0; //Emperium/BG Monsters can't be afflicted by status changes #if 0 if (md && mob_is_gvg(md) && status->sc2scb_flag(type)&SCB_MAXHP) |