Get rid of some old code, make set_aggro function

2 files changed, 11 insertions, 29 deletions

diff --git a/npc/functions/clientversion.txt b/npc/functions/clientversion.txt
index 78fd2c4eb..f21de5c5c 100644
--- a/npc/functions/clientversion.txt
+++ b/npc/functions/clientversion.txt
@@ -168,35 +168,6 @@ function	script	clientupdater	{
     // ter fev 19 12:15:00 -03 2019
     if (UPDATE < 1550589300) {
         UPDATE=1550589300;
-        if (strcharinfo(0) == "msawis") {
-            .@dg=1;
-            showavatar NPC_LOF_RICH;
-            mesn ("TMW2 Staff");
-            mesc l("Hello, @@! We just looked up and found out that you were affected by BotCheck Logout rules!", strcharinfo(0)), 3;
-            mesc l("First of, you didn't logged in. Without you online, WE CANNOT UNJAIL YOU! We tried with SQL but it didn't budge."), 3;
-            mesc l("Due this bug, when you logged off on the BotCheck Area, @@. We wanted to deliver you a token of apology!", b(l("the server jailed you"))), 3;
-            mesc l("Sorry, and enjoy the game! Your TMW2 Staff Team."), 3;
-            mesc l("Token Of Apology: 1x @@, 1x @@", getitemlink(SupremeGift), getitemlink(MercBoxC));
-            mes "";
-            mesc l("Please contact @@ to clear this misunderstanding.", b("Jesusalva")), 1;
-            getitem SupremeGift, 1;
-            getitem MercBoxC, 1;
-
-            // Better safe than sorry
-            atcommand "@unjail msawis";
-            // I dunno if my SQL query broke something so...........
-            sc_end SC_JAILED;
-            if (getmap() ~= "sec_pri")
-                warp "Save", 0, 0;
-            next;
-        }
-        if (strcharinfo(0) == "vilbou") {
-            atcommand "@unjail vilbou";
-            sc_end SC_JAILED;
-            if (getmap() ~= "sec_pri")
-                warp "Save", 0, 0;
-            getitem MercBoxC, 1;
-        }
         // Unclaimed Rewards
         // 2000283 Msawis 10 points
         // 2000552 Mrhedx 4 points
diff --git a/npc/functions/util.txt b/npc/functions/util.txt
index a95bdad76..342df1531 100644
--- a/npc/functions/util.txt
+++ b/npc/functions/util.txt
@@ -1161,6 +1161,17 @@ function	script	RegEasterEgg	{
     return;
 }
 
+// Makes a monster aggro
+// set_aggro( monster{, mode=MD_AGGRESSIVE} )
+function	script	set_aggro	{
+    .@m=getarg(0);
+    .@x=getarg(1, MD_AGGRESSIVE);
+    .@op=getunitdata(.@m, UDT_MODE);
+    .@op=.@op|.@x;
+    setunitdata(.@m, UDT_MODE, .@op);
+    return;
+}
+
 // Special function which makes a date as a number
 // numdate( - )
 function	script	numdate	{