summaryrefslogtreecommitdiff
path: root/src/map
diff options
context:
space:
mode:
authorHaru <haru@dotalux.com>2015-12-15 00:43:54 +0100
committerHaru <haru@dotalux.com>2015-12-28 18:35:59 +0100
commitcf142dc21aafd6bf0a483c87f32c219375ae116a (patch)
tree8fad3087c9bb62133f21bb0d68ab4d6b3a11d03a /src/map
parent11278d27b85a5930b548c73e20fd651558e0e1bf (diff)
downloadhercules-cf142dc21aafd6bf0a483c87f32c219375ae116a.tar.gz
hercules-cf142dc21aafd6bf0a483c87f32c219375ae116a.tar.bz2
hercules-cf142dc21aafd6bf0a483c87f32c219375ae116a.tar.xz
hercules-cf142dc21aafd6bf0a483c87f32c219375ae116a.zip
Added Poring to the mob_id enum
Signed-off-by: Haru <haru@dotalux.com>
Diffstat (limited to 'src/map')
-rw-r--r--src/map/mob.c2
-rw-r--r--src/map/mob.h2
-rw-r--r--src/map/skill.c2
-rw-r--r--src/map/status.c6
4 files changed, 7 insertions, 5 deletions
diff --git a/src/map/mob.c b/src/map/mob.c
index 48f1e531e..d3feb16b8 100644
--- a/src/map/mob.c
+++ b/src/map/mob.c
@@ -4388,7 +4388,7 @@ int mob_read_randommonster(void)
for (i = 0; i < ARRAYLENGTH(mobfile) && i < MAX_RANDOMMONSTER; i++) {
FILE *fp;
unsigned int count = 0;
- mob->db_data[0]->summonper[i] = 1002; // Default fallback value, in case the database does not provide one
+ mob->db_data[0]->summonper[i] = MOBID_PORING; // Default fallback value, in case the database does not provide one
sprintf(line, "%s/%s", map->db_path, mobfile[i]);
fp=fopen(line,"r");
if(fp==NULL){
diff --git a/src/map/mob.h b/src/map/mob.h
index 073d485ff..5485b2a91 100644
--- a/src/map/mob.h
+++ b/src/map/mob.h
@@ -272,6 +272,8 @@ enum {
* Mob IDs
*/
enum mob_id {
+ MOBID_PORING = 1002, ///< PORING / Poring
+
MOBID_HORNET = 1004, ///< HORNET / Hornet
MOBID_RED_PLANT = 1078, ///< RED_PLANT / Red Plant
diff --git a/src/map/skill.c b/src/map/skill.c
index 08c06011f..0422e277f 100644
--- a/src/map/skill.c
+++ b/src/map/skill.c
@@ -5648,7 +5648,7 @@ int skill_castend_nodamage_id(struct block_list *src, struct block_list *bl, uin
clif->skill_fail(sd,skill_id,USESKILL_FAIL_LEVEL,0);
break;
}
- class_ = skill_id==SA_MONOCELL?1002:mob->get_random_id(4, 1, 0);
+ class_ = skill_id == SA_MONOCELL ? MOBID_PORING : mob->get_random_id(4, 1, 0);
clif->skill_nodamage(src,bl,skill_id,skill_lv,1);
mob->class_change(dstmd,class_);
if( tsc && dstmd->status.mode&MD_BOSS )
diff --git a/src/map/status.c b/src/map/status.c
index b80f04046..39329d5bb 100644
--- a/src/map/status.c
+++ b/src/map/status.c
@@ -9317,7 +9317,7 @@ int status_change_start(struct block_list *src, struct block_list *bl, enum sc_t
int max = val1*3;
val3 = rnd()%(max-min)+min;
val2 = val1;
- val1 = 1002; // Monster ID
+ val1 = MOBID_PORING;
}
break;
case SC_KAGEMUSYA:
@@ -9432,8 +9432,8 @@ int status_change_start(struct block_list *src, struct block_list *bl, enum sc_t
val2 = 30 * val1;
break;
case SC_MONSTER_TRANSFORM:
- if( !mob->db_checkid(val1) )
- val1 = 1002; // default poring
+ if (!mob->db_checkid(val1))
+ val1 = MOBID_PORING;
break;
case SC_ALL_RIDING:
tick = -1;