mobinfo

9 files changed, 80 insertions, 14 deletions

diff --git a/world/map/db/const.txt b/world/map/db/const.txt
index f4625294..fd8fc915 100644
--- a/world/map/db/const.txt
+++ b/world/map/db/const.txt
@@ -242,6 +242,8 @@ SC_COOLDOWN_MG         72
 SC_COOLDOWN_MT         73
 SC_COOLDOWN_R          74
 SC_COOLDOWN_AR         75
+SC_COOLDOWN_ENCH       76
+SC_COOLDOWN_KOY        77
 
 // Emotions
 EMOTE_DISGUST    1
@@ -499,3 +501,67 @@ SMSG_LEGAL            6
 SMSG_MOTD             7
 SMSG_AUTOMATIC        8
 SMSG_EVENT            9
+
+// Mob Info
+MOBINFO_ID              0
+MOBINFO_ENG_NAME        1
+MOBINFO_JAP_NAME        2
+MOBINFO_LVL             3
+MOBINFO_HP              4
+MOBINFO_SP              5
+MOBINFO_BASE_EXP        6
+MOBINFO_JOB_EXP         7
+MOBINFO_RANGE1          8
+MOBINFO_ATK1            9
+MOBINFO_ATK2           10
+MOBINFO_DEF            11
+MOBINFO_MDEF           12
+MOBINFO_STR            13
+MOBINFO_AGI            14
+MOBINFO_VIT            15
+MOBINFO_INT            16
+MOBINFO_DEX            17
+MOBINFO_LUK            18
+MOBINFO_RANGE2         19
+MOBINFO_RANGE3         20
+MOBINFO_SCALE          21
+MOBINFO_RACE           22
+MOBINFO_ELEMENT        23
+MOBINFO_ELEMENT_LVL    24
+MOBINFO_MODE           25
+MOBINFO_SPEED          26
+MOBINFO_ADELAY         27
+MOBINFO_AMOTION        28
+MOBINFO_DMOTION        29
+MOBINFO_MUTATION_NUM   30
+MOBINFO_MUTATION_POWER 31
+MOBINFO_DROPID1        32
+MOBINFO_DROPNAME1      33
+MOBINFO_DROPPERCENT1   34
+MOBINFO_DROPID2        35
+MOBINFO_DROPNAME2      36
+MOBINFO_DROPPERCENT2   37
+MOBINFO_DROPID3        38
+MOBINFO_DROPNAME3      39
+MOBINFO_DROPPERCENT3   40
+MOBINFO_DROPID4        41
+MOBINFO_DROPNAME4      42
+MOBINFO_DROPPERCENT4   43
+MOBINFO_DROPID5        44
+MOBINFO_DROPNAME5      45
+MOBINFO_DROPPERCENT5   46
+MOBINFO_DROPID6        47
+MOBINFO_DROPNAME6      48
+MOBINFO_DROPPERCENT6   49
+MOBINFO_DROPID7        50
+MOBINFO_DROPNAME7      51
+MOBINFO_DROPPERCENT7   52
+MOBINFO_DROPID8        53
+MOBINFO_DROPNAME8      54
+MOBINFO_DROPPERCENT8   55
+
+MOBINFO_DROPARRAYS_IDS      0
+MOBINFO_DROPARRAYS_NAMES    1
+MOBINFO_DROPARRAYS_PERCENTS 2
+
+MOBINFO_MAXDROPS 8
diff --git a/world/map/npc/magic/event-summon-managuardian.txt b/world/map/npc/magic/event-summon-managuardian.txt
index 4e91ee06..9a92b16a 100644
--- a/world/map/npc/magic/event-summon-managuardian.txt
+++ b/world/map/npc/magic/event-summon-managuardian.txt
@@ -11,7 +11,7 @@ OnCast:
     if (countitem("TinyManaElixir") < 1) end;
     if (!$DOOMSDAY_SUMMON) end;
 //    if (@ddcooldown > gettimetick(2)) goto L_Cooldown;
-    if (sc_check(SC_COOLDOWN_MG)) goto L_Cooldown;
+    if (sc_check (SC_COOLDOWN_MG)) goto L_Cooldown;
     if (getmap() == "033-1") goto L_SpecialRules6;
     goto L_Pay;
 
@@ -50,7 +50,7 @@ OnDestroy:
     destroy;
 
 S_SummonAll:
-    summon .@map$, rand(.@x-2,.@x+2), rand(.@y-2,.@y+2), .master, 1138, 2, .lifetime;
+    summon .@map$, rand(.@x-2,.@x+2), rand(.@y-2,.@y+2), .master, "Mana Guardian Summon", 1138, 2, .lifetime;
     destroy;
 
 L_Cooldown:
diff --git a/world/map/npc/magic/event-summon-manatyrant.txt b/world/map/npc/magic/event-summon-manatyrant.txt
index fe1bf89b..6ac84349 100644
--- a/world/map/npc/magic/event-summon-manatyrant.txt
+++ b/world/map/npc/magic/event-summon-manatyrant.txt
@@ -51,7 +51,7 @@ OnDestroy:
     destroy;
 
 S_SummonAll:
-    summon .@map$, rand(.@x-2,.@x+2), rand(.@y-2,.@y+2), .master, 1150, 2, .lifetime;
+    summon .@map$, rand(.@x-2,.@x+2), rand(.@y-2,.@y+2), .master, "Mana Tyrant Summon", 1150, 2, .lifetime;
     destroy;
 
 L_Cooldown:
diff --git a/world/map/npc/magic/level2-summon-fluffies.txt b/world/map/npc/magic/level2-summon-fluffies.txt
index 942f48d4..84245b6a 100644
--- a/world/map/npc/magic/level2-summon-fluffies.txt
+++ b/world/map/npc/magic/level2-summon-fluffies.txt
@@ -48,7 +48,7 @@ OnDestroy:
     destroy;
 
 S_SummonAll:
-    summon .@map$, rand(.@x-2,.@x+2), rand(.@y-2,.@y+2), .master, 1020, 2, .lifetime;
+    summon .@map$, rand(.@x-2,.@x+2), rand(.@y-2,.@y+2), .master, "Fluffy Summon", 1020, 2, .lifetime;
     set .@i, .@i + 1;
     if (.@i < .count) goto S_SummonAll;
     destroy;
diff --git a/world/map/npc/magic/level2-summon-mouboo.txt b/world/map/npc/magic/level2-summon-mouboo.txt
index abf54379..e9d2740b 100644
--- a/world/map/npc/magic/level2-summon-mouboo.txt
+++ b/world/map/npc/magic/level2-summon-mouboo.txt
@@ -48,7 +48,7 @@ OnDestroy:
     destroy;
 
 S_SummonAll:
-    summon .@map$, rand(.@x-2,.@x+2), rand(.@y-2,.@y+2), .master, 1028, 2, .lifetime;
+    summon .@map$, rand(.@x-2,.@x+2), rand(.@y-2,.@y+2), .master, "Mouboo Summon", 1028, 2, .lifetime;
     set .@i, .@i + 1;
     if (.@i < .count) goto S_SummonAll;
     destroy;
diff --git a/world/map/npc/magic/level2-summon-pinkie.txt b/world/map/npc/magic/level2-summon-pinkie.txt
index 773ab0c2..0b327481 100644
--- a/world/map/npc/magic/level2-summon-pinkie.txt
+++ b/world/map/npc/magic/level2-summon-pinkie.txt
@@ -48,7 +48,7 @@ OnDestroy:
     destroy;
 
 S_SummonAll:
-    summon .@map$, rand(.@x-2,.@x+2), rand(.@y-2,.@y+2), .master, 1018, 2, .lifetime;
+    summon .@map$, rand(.@x-2,.@x+2), rand(.@y-2,.@y+2), .master, "Pinkie", 1018, 2, .lifetime;
     set .@i, .@i + 1;
     if (.@i < .count) goto S_SummonAll;
     destroy;
diff --git a/world/map/npc/magic/level2-summon-snakes.txt b/world/map/npc/magic/level2-summon-snakes.txt
index a2bd5278..c275bc59 100644
--- a/world/map/npc/magic/level2-summon-snakes.txt
+++ b/world/map/npc/magic/level2-summon-snakes.txt
@@ -51,10 +51,10 @@ OnDestroy:
 S_SummonAll:
     set .@sn, rand(0, 3);
 
-    if   (.@sn == 0) summon .@map$, rand(.@x-2,.@x+2), rand(.@y-2,.@y+2), .master, 1021, 2, .lifetime;
-    elif (.@sn == 1) summon .@map$, rand(.@x-2,.@x+2), rand(.@y-2,.@y+2), .master, 1010, 2, .lifetime;
-    elif (.@sn == 2) summon .@map$, rand(.@x-2,.@x+2), rand(.@y-2,.@y+2), .master, 1026, 2, .lifetime;
-    elif (.@sn == 3) summon .@map$, rand(.@x-2,.@x+2), rand(.@y-2,.@y+2), .master, 1034, 2, .lifetime;
+    if   (.@sn == 0) summon .@map$, rand(.@x-2,.@x+2), rand(.@y-2,.@y+2), .master, "Cave Snake Summon", 1021, 2, .lifetime;
+    elif (.@sn == 1) summon .@map$, rand(.@x-2,.@x+2), rand(.@y-2,.@y+2), .master, "Snake Summon", 1010, 2, .lifetime;
+    elif (.@sn == 2) summon .@map$, rand(.@x-2,.@x+2), rand(.@y-2,.@y+2), .master, "Mountain Snake Summon", 1026, 2, .lifetime;
+    elif (.@sn == 3) summon .@map$, rand(.@x-2,.@x+2), rand(.@y-2,.@y+2), .master, "Grass Snake Summon", 1034, 2, .lifetime;
     set .@i, .@i + 1;
     if (.@i < .count) goto S_SummonAll;
     destroy;
diff --git a/world/map/npc/magic/level2-summon-spiky-mushroom.txt b/world/map/npc/magic/level2-summon-spiky-mushroom.txt
index 326c0d06..b91e0b29 100644
--- a/world/map/npc/magic/level2-summon-spiky-mushroom.txt
+++ b/world/map/npc/magic/level2-summon-spiky-mushroom.txt
@@ -48,7 +48,7 @@ OnDestroy:
     destroy;
 
 S_SummonAll:
-    summon .@map$, rand(.@x-2,.@x+2), rand(.@y-2,.@y+2), .master, 1019, 2, .lifetime;
+    summon .@map$, rand(.@x-2,.@x+2), rand(.@y-2,.@y+2), .master, "Spiky Mushroom Summon", 1019, 2, .lifetime;
     set .@i, .@i + 1;
     if (.@i < .count) goto S_SummonAll;
     destroy;
diff --git a/world/map/npc/magic/level2-summon-wickedmushroom.txt b/world/map/npc/magic/level2-summon-wickedmushroom.txt
index c81904cf..175593ff 100644
--- a/world/map/npc/magic/level2-summon-wickedmushroom.txt
+++ b/world/map/npc/magic/level2-summon-wickedmushroom.txt
@@ -51,9 +51,9 @@ OnDestroy:
 S_SummonAll:
     set .@rnd, rand(0, 9);
 
-    if   (.@rnd < 6) summon .@map$, rand(.@x-2,.@x+2), rand(.@y-2,.@y+2), .master, 1106, 2, .lifetime;
-    elif (.@rnd < 9) summon .@map$, rand(.@x-2,.@x+2), rand(.@y-2,.@y+2), .master, 1130, 2, .lifetime;
-    elif (.@rnd == 9) summon .@map$, rand(.@x-2,.@x+2), rand(.@y-2,.@y+2), .master, 1013, 2, .lifetime;
+    if   (.@rnd < 6) summon .@map$, rand(.@x-2,.@x+2), rand(.@y-2,.@y+2), .master, "Wicked Mushroom Summon", 1106, 2, .lifetime;
+    elif (.@rnd < 9) summon .@map$, rand(.@x-2,.@x+2), rand(.@y-2,.@y+2), .master, "Moonshroom Summon", 1130, 2, .lifetime;
+    elif (.@rnd == 9) summon .@map$, rand(.@x-2,.@x+2), rand(.@y-2,.@y+2), .master, "Evil Mushroom Summon", 1013, 2, .lifetime;
     set .@i, .@i + 1;
     if (.@i < .count) goto S_SummonAll;
     destroy;