summaryrefslogtreecommitdiff
path: root/src/map
diff options
context:
space:
mode:
authorHaru <haru@dotalux.com>2015-12-14 21:30:42 +0100
committerHaru <haru@dotalux.com>2015-12-28 18:35:58 +0100
commit08fc3deb0234208b0abf3ed7fb4eadba44456fdf (patch)
tree62d7441328502a236bffe5d862f60996793fc543 /src/map
parent943daa9da6610bd900aee9134951561e8e663a93 (diff)
downloadhercules-08fc3deb0234208b0abf3ed7fb4eadba44456fdf.tar.gz
hercules-08fc3deb0234208b0abf3ed7fb4eadba44456fdf.tar.bz2
hercules-08fc3deb0234208b0abf3ed7fb4eadba44456fdf.tar.xz
hercules-08fc3deb0234208b0abf3ed7fb4eadba44456fdf.zip
Added Splendide, Manuk and Mora mobs to the mob_id enum
Signed-off-by: Haru <haru@dotalux.com>
Diffstat (limited to 'src/map')
-rw-r--r--src/map/mob.c27
-rw-r--r--src/map/mob.h27
2 files changed, 51 insertions, 3 deletions
diff --git a/src/map/mob.c b/src/map/mob.c
index 5950758a0..21ebea650 100644
--- a/src/map/mob.c
+++ b/src/map/mob.c
@@ -5010,9 +5010,30 @@ int do_final_mob(void)
void mob_defaults(void) {
// Defines the Manuk/Splendide/Mora mob groups for the status reductions [Epoque & Frost]
- const int mob_manuk[8] = { 1986, 1987, 1988, 1989, 1990, 1997, 1998, 1999 };
- const int mob_splendide[5] = { 1991, 1992, 1993, 1994, 1995 };
- const int mob_mora[5] = { 2137, 2136, 2134, 2133, 2132 };
+ const int mob_manuk[8] = {
+ MOBID_TATACHO,
+ MOBID_CENTIPEDE,
+ MOBID_NEPENTHES,
+ MOBID_HILLSRION,
+ MOBID_HARDROCK_MOMMOTH,
+ MOBID_G_TATACHO,
+ MOBID_G_HILLSRION,
+ MOBID_CENTIPEDE_LARVA,
+ };
+ const int mob_splendide[5] = {
+ MOBID_TENDRILRION,
+ MOBID_CORNUS,
+ MOBID_NAGA,
+ MOBID_LUCIOLA_VESPA,
+ MOBID_PINGUICULA,
+ };
+ const int mob_mora[5] = {
+ MOBID_POM_SPIDER,
+ MOBID_ANGRA_MANTIS,
+ MOBID_PARUS,
+ MOBID_LITTLE_FATUM,
+ MOBID_MIMING,
+ };
mob = &mob_s;
diff --git a/src/map/mob.h b/src/map/mob.h
index 342d24985..3510030f7 100644
--- a/src/map/mob.h
+++ b/src/map/mob.h
@@ -337,11 +337,38 @@ enum mob_id {
MOBID_TREASURE_BOX48 = 1945, ///< TREASURE_BOX48 / Treasure Chest
MOBID_TREASURE_BOX49 = 1946, ///< TREASURE_BOX49 / Treasure Chest
+ // Manuk
+ MOBID_TATACHO = 1986, ///< TATACHO / Tatacho
+ MOBID_CENTIPEDE = 1987, ///< CENTIPEDE / Centipede
+ MOBID_NEPENTHES = 1988, ///< NEPENTHES / Nepenthes
+ MOBID_HILLSRION = 1989, ///< HILLSRION / Hillslion
+ MOBID_HARDROCK_MOMMOTH = 1990, ///< HARDROCK_MOMMOTH / Hardrock Mammoth
+
+ // Splendide
+ MOBID_TENDRILRION = 1991, ///< TENDRILRION / Tenrillion
+ MOBID_CORNUS = 1992, ///< CORNUS / Cornus
+ MOBID_NAGA = 1993, ///< NAGA / Naga
+ MOBID_LUCIOLA_VESPA = 1994, ///< LUCIOLA_VESPA / Luciola Vespa
+ MOBID_PINGUICULA = 1995, ///< PINGUICULA / Pinguicola
+
+ // Manuk (continue)
+ MOBID_G_TATACHO = 1997, ///< G_TATACHO / Tatacho
+ MOBID_G_HILLSRION = 1998, ///< G_HILLSRION / Hillslion
+ MOBID_CENTIPEDE_LARVA = 1999, ///< CENTIPEDE_LARVA / Centipede Larva
+
MOBID_SILVERSNIPER = 2042, ///< SILVERSNIPER / Silver Sniper
MOBID_MAGICDECOY_FIRE = 2043, ///< MAGICDECOY_FIRE / Magic Decoy
MOBID_MAGICDECOY_WATER = 2044, ///< MAGICDECOY_WATER / Magic Decoy
MOBID_MAGICDECOY_EARTH = 2045, ///< MAGICDECOY_EARTH / Magic Decoy
MOBID_MAGICDECOY_WIND = 2046, ///< MAGICDECOY_WIND / Magic Decoy
+
+ // Mora
+ MOBID_POM_SPIDER = 2132, ///< POM_SPIDER / Pom Spider
+ MOBID_ANGRA_MANTIS = 2133, ///< ANGRA_MANTIS / Angra Mantis
+ MOBID_PARUS = 2134, ///< PARUS / Parus
+ //...
+ MOBID_LITTLE_FATUM = 2136, ///< LITTLE_FATUM / Little Fatum
+ MOBID_MIMING = 2137, ///< MIMING / Miming
};
// The data structures for storing delayed item drops