Merge branch 'jesusalva/identify' into 'master'

Add EVOL_MONSTER_IDENTIFY skill.

See merge request evol/serverdata!217

5 files changed, 46 insertions, 1 deletions

diff --git a/conf/atcommand.conf b/conf/atcommand.conf
index eede6399..cceabb34 100644
--- a/conf/atcommand.conf
+++ b/conf/atcommand.conf
@@ -20,7 +20,7 @@ Format is
 */
 
 aliases: {
-	mobinfo: ["monsterinfo", "mi"]
+	mobinfo: ["mi"]
 	iteminfo: ["ii"]
 	time: ["date", "serverdate", "servertime"]
 	tonpc: ["npc"]
diff --git a/db/re/skill_db.conf b/db/re/skill_db.conf
index 6c190ed2..6d11918d 100644
--- a/db/re/skill_db.conf
+++ b/db/re/skill_db.conf
@@ -38642,4 +38642,14 @@ skill_db: (
         Self: true
     }
 },
+{
+    Id: 20003
+    Name: "EVOL_MONSTER_IDENTIFY"
+    Description: "Monster Identify"
+    MaxLevel: 1
+    SkillType: {
+        Self: true
+    }
+    CoolDown: 3000
+},
 )
diff --git a/db/re/skill_tree.conf b/db/re/skill_tree.conf
index 4927fb3e..f604479d 100644
--- a/db/re/skill_tree.conf
+++ b/db/re/skill_tree.conf
@@ -85,6 +85,7 @@ Human: {
 		MG_COLDBOLT: 0
 		EVOL_MASS_PROVOKE: 0
 		EVOL_PHYSICAL_SHIELD: 0
+		EVOL_MONSTER_IDENTIFY: 0
 	}
 }
 
@@ -148,6 +149,7 @@ DarkUkar: {
 		MG_COLDBOLT: 0
 		EVOL_MASS_PROVOKE: 0
 		EVOL_PHYSICAL_SHIELD: 0
+		EVOL_MONSTER_IDENTIFY: 0
 	}
 }
 
@@ -211,6 +213,7 @@ FireKralog: {
 		MG_COLDBOLT: 0
 		EVOL_MASS_PROVOKE: 0
 		EVOL_PHYSICAL_SHIELD: 0
+		EVOL_MONSTER_IDENTIFY: 0
 	}
 }
 
@@ -274,6 +277,7 @@ LightRaijin: {
 		MG_COLDBOLT: 0
 		EVOL_MASS_PROVOKE: 0
 		EVOL_PHYSICAL_SHIELD: 0
+		EVOL_MONSTER_IDENTIFY: 0
 	}
 }
 
@@ -337,6 +341,7 @@ BlueTritan: {
 		MG_COLDBOLT: 0
 		EVOL_MASS_PROVOKE: 0
 		EVOL_PHYSICAL_SHIELD: 0
+		EVOL_MONSTER_IDENTIFY: 0
 	}
 }
 
diff --git a/npc/commands/mobinfo.txt b/npc/commands/mobinfo.txt
new file mode 100644
index 00000000..691bfb68
--- /dev/null
+++ b/npc/commands/mobinfo.txt
@@ -0,0 +1,29 @@
+// The Mana World Script
+//
+// @monsterinfo <monsterAegis>
+// Sends @mobinfo with a delay (moved from atcommand.conf)
+// Requires EVOL_MONSTER_IDENTIFY
+//
+-	script	@monsterinfo	32767,{
+    end;
+
+OnCall:
+    // Check for skill level
+    if (!getskilllv(EVOL_MONSTER_IDENTIFY))
+        end;
+
+    // ...
+    if (@rsync_delay > gettimetick(2)) {
+        dispbottom l("Not doing that to prevent flood.");
+        end;
+    }
+
+    // Send @mobinfo and set a cooldown of 3 seconds.
+    atcommand("@mobinfo " + implode(.@atcmd_parameters$, " "));
+    @rsync_delay=gettimetick(2)+3;
+    end;
+
+OnInit:
+    bindatcmd "monsterinfo", "@monsterinfo::OnCall", 0, 60, 0;
+    end;
+}
diff --git a/npc/scripts.conf b/npc/scripts.conf
index 16619850..cce40899 100644
--- a/npc/scripts.conf
+++ b/npc/scripts.conf
@@ -115,6 +115,7 @@
 "npc/commands/zeny.txt",
 "npc/commands/motd-debug-text.txt",
 "npc/commands/motd.txt",
+"npc/commands/mobinfo.txt",
 "npc/commands/scheduled-broadcasts.txt",
 "npc/commands/rate-management.txt",
 "npc/commands/event.txt",