update chathooks to 1.6

x3Karma · Mar 31, 2022 · 21639f9 · 21639f9
1 parent e74d57f
commit 21639f9
Show file tree

Hide file tree

Showing 24 changed files with 229 additions and 266 deletions.
diff --git a/Karma.Abuse/mod/scripts/vscripts/_gift_admin.gnut b/Karma.Abuse/mod/scripts/vscripts/_gift_admin.gnut
@@ -1,6 +1,9 @@
 global function Gift_Admin_Init
 global function CheckAdmin
 global bool hadGift_Admin = false;
+global string Kprefix = "[\x1b[31mKarma.Abuse\x1b[0m] "
+global entity CMDsender
+global function Kprint
 
 struct {
 	array<string> Gift_Admin
@@ -48,6 +51,11 @@ void function CheckAdmin( entity player )
 	}
 }
 
+void function Kprint(entity player, string str)
+{
+    Chat_ServerPrivateMessage( player, Kprefix + str, false )
+}
+
 // chathooks requires -enablechathooks in ns_startup_args.txt
 // OUR CODE
 ClServer_MessageStruct function ChatCallback(ClServer_MessageStruct message) {
@@ -92,7 +100,7 @@ void function KCommandsInit()
     KcommandArr.append(new_KCommandStruct(["getmods", "getmod", "gm"],                        true, GetWM))
     KcommandArr.append(new_KCommandStruct(["fgetmods", "fgetmod" , "fgm"],                    true, ForceGetWM))
     KcommandArr.append(new_KCommandStruct(["getteam"],                                        true, getTeamCMD))
-    KcommandArr.append(new_KCommandStruct(["getid"],                                        true, getIDCMD))
+    KcommandArr.append(new_KCommandStruct(["getid"],                                          true, getIDCMD))
     KcommandArr.append(new_KCommandStruct(["gift"],                                           true, Gift))
     KcommandArr.append(new_KCommandStruct(["fgift", "forcegift"],                             true, ForceGift))
     KcommandArr.append(new_KCommandStruct(["health", "hp"],                                   true, HealthCMD))

diff --git a/Karma.Abuse/mod/scripts/vscripts/airaccel.nut b/Karma.Abuse/mod/scripts/vscripts/airaccel.nut
@@ -9,7 +9,7 @@ void function AirAccelCommand()
 	#if SERVER
 	AddClientCommandCallback("airaccel", AirAccelCMD);
 	AddClientCommandCallback("aa", AirAccelCMD);
-    AddCallback_OnPlayerRespawned( ApplyAirAccel )
+	AddCallback_OnPlayerRespawned( ApplyAirAccel )
 	#endif
 }
 
@@ -23,21 +23,21 @@ bool function AirAccelCMD(entity player, array<string> args)
 	CheckAdmin(player);
 	if (hadGift_Admin != true)
 	{
-		print("Admin permission not detected.");
+		Chat_ServerPrivateMessage(player, Kprefix + "Admin permission not detected.", false);
 		return true;
 	}
 
 	// if player only typed "airaccel"
 	if (args.len() == 0)
 	{
-		print("Give a valid argument.");
-		print("Example: airaccel/aa <playername/imc/militia/all> <value> [save]");
+		Chat_ServerPrivateMessage(player, Kprefix + "Give a valid argument.", false);
+		Chat_ServerPrivateMessage(player, Kprefix + "Example: airaccel/aa <playername/imc/militia/all> <value> [save]", false);
 		// print every single player's name and their id
 		int i = 0;
 		foreach (entity p in GetPlayerArray())
 		{
 			string playername = p.GetPlayerName();
-			print("[" + i.tostring() + "] " + playername);
+			Chat_ServerPrivateMessage(player, "[" + i.tostring() + "] " + playername, false);
 			i++
 		}
 		return true;
@@ -88,12 +88,11 @@ bool function AirAccelCMD(entity player, array<string> args)
 		foreach (entity p in sheep1)
         	airaccel[p] <- value
 		AirAccel(sheep1, value)
-        return false;
     }
-
+	CMDsender = player
 	if (args.len() > 3)
 	{
-		print("airaccel/aa <playername> <value> [save]")
+		Chat_ServerPrivateMessage(player, Kprefix + "airaccel/aa <playername> <value> [save]", false)
 		return false;
 	}
 	#endif
@@ -103,11 +102,16 @@ bool function AirAccelCMD(entity player, array<string> args)
 void function AirAccel( array<entity> players, int value )
 {
 	#if SERVER
+	int successfulcount = 0
     foreach(entity player in players)
-	if ( IsAlive(player) && IsValid(player) )
 	{
-        player.kv.airAcceleration = value
-    }
+		if ( IsAlive(player) && IsValid(player) )
+		{
+        	player.kv.airAcceleration = value
+    	}
+		successfulcount++
+	}
+	Chat_ServerPrivateMessage(CMDsender, Kprefix + "Successfully modified " + successfulcount.tostring() + " players' air acceleration!", false)
 	#endif
 }
 

diff --git a/Karma.Abuse/mod/scripts/vscripts/announce.nut b/Karma.Abuse/mod/scripts/vscripts/announce.nut
@@ -65,19 +65,19 @@ bool function AnnounceCMD(entity player, array < string > args) {
     hadGift_Admin = false;
     CheckAdmin(player);
     if (hadGift_Admin != true) {
-        print("Admin permission not detected.");
+        Kprint( player, "Admin permission not detected.");
         return true;
     }
 
     // if player only typed "gift"
     if (args.len() == 0) {
-        print("Give a valid argument.");
-        print("Example: announce/a <playerId> <text1> <text2> ... / imc / militia / all");
+        Kprint( player, "Give a valid argument.");
+        Kprint( player, "Example: announce/a <playerId> <text1> <text2> ... / imc / militia / all");
         // print every single player's name and their id
         int i = 0;
         foreach(entity p in GetPlayerArray()) {
             string playername = p.GetPlayerName();
-            print("[" + i.tostring() + "] " + playername);
+            Kprint( player, "[" + i.tostring() + "] " + playername);
             i++
         }
         return true;
@@ -116,7 +116,7 @@ bool function AnnounceCMD(entity player, array < string > args) {
 
     // if player typed "gift correctId" with no further arguments
     if (args.len() == 1) {
-        print("Example: announce/a <playerId> <text>");
+        Kprint( player, "Example: announce/a <playerId> <text>");
         return true;
     }
 

diff --git a/Karma.Abuse/mod/scripts/vscripts/bubbleshield.nut b/Karma.Abuse/mod/scripts/vscripts/bubbleshield.nut
@@ -25,19 +25,19 @@ bool function BubbleShieldCMD(entity player, array<string> args)
 	CheckAdmin(player);
 	if (hadGift_Admin != true)
 	{
-		print("Admin permission not detected.");
+		Kprint( player, "Admin permission not detected.");
 		return true;
 	}
 
 	// if player only typed "gift"
 	if (args.len() == 0) {
-        print("Give a valid argument.");
-        print("Example: bs/bubbleshield <playerId> <duration> , playerId = imc / militia / all");
+        Kprint( player, "Give a valid argument.");
+        Kprint( player, "Example: bs/bubbleshield <playerId> <duration> , playerId = imc / militia / all");
         // print every single player's name and their id
         int i = 0;
         foreach(entity p in GetPlayerArray()) {
             string playername = p.GetPlayerName();
-            print("[" + i.tostring() + "] " + playername);
+            Kprint( player, "[" + i.tostring() + "] " + playername);
             i++
         }
         return true;
@@ -85,7 +85,7 @@ bool function BubbleShieldCMD(entity player, array<string> args)
 
     if (args.len() > 2 )
 	{
-		print("Only 2 arguments required.")
+		Kprint( player, "Only 2 arguments required.")
 		return true;
 	}
     foreach (entity p in sheep1)
@@ -103,19 +103,19 @@ bool function UnBubbleShieldCMD(entity player, array<string> args)
 	CheckAdmin(player);
 	if (hadGift_Admin != true)
 	{
-		print("Admin permission not detected.");
+		Kprint( player, "Admin permission not detected.");
 		return true;
 	}
 
 	// if player only typed "gift"
 	if (args.len() == 0) {
-        print("Give a valid argument.");
-        print("Example: bs/bubbleshield <playerId> <duration> , playerId = imc / militia / all");
+        Kprint( player, "Give a valid argument.");
+        Kprint( player, "Example: bs/bubbleshield <playerId> <duration> , playerId = imc / militia / all");
         // print every single player's name and their id
         int i = 0;
         foreach(entity p in GetPlayerArray()) {
             string playername = p.GetPlayerName();
-            print("[" + i.tostring() + "] " + playername);
+            Kprint( player, "[" + i.tostring() + "] " + playername);
             i++
         }
         return true;
@@ -154,11 +154,11 @@ bool function UnBubbleShieldCMD(entity player, array<string> args)
 
     if (args.len() > 1 )
 	{
-		print("Only 1 arguments required.")
+		Kprint( player, "Only 1 arguments required.")
 		return true;
 	}
-    foreach (entity p in sheep1) 
-    {  
+    foreach (entity p in sheep1)
+    {
         if (p in file.shield)
         thread DestroyBubbleShield(file.shield[p])
     }

diff --git a/Karma.Abuse/mod/scripts/vscripts/fly.nut b/Karma.Abuse/mod/scripts/vscripts/fly.nut
@@ -19,21 +19,21 @@ bool function FlyCMD(entity player, array<string> args)
 	CheckAdmin(player);
 	if (hadGift_Admin != true)
 	{
-		print("Admin permission not detected.");
+		Kprint( player, "Admin permission not detected.");
 		return true;
 	}
 
 	// if player only typed "gift"
 	if (args.len() == 0)
 	{
-		print("Give a valid argument.");
-		print("Example: fly <playerId> <playerId2> ... / imc / militia / all");
+		Kprint( player, "Give a valid argument.");
+		Kprint( player, "Example: fly <playerId> <playerId2> ... / imc / militia / all");
 		// print every single player's name and their id
 		int i = 0;
 		foreach (entity p in GetPlayerArray())
 		{
 			string playername = p.GetPlayerName();
-			print("[" + i.tostring() + "] " + playername);
+			Kprint( player, "[" + i.tostring() + "] " + playername);
 			i++
 		}
 		return true;

diff --git a/Karma.Abuse/mod/scripts/vscripts/freeze.nut b/Karma.Abuse/mod/scripts/vscripts/freeze.nut
@@ -16,19 +16,19 @@ bool function FreezeCMD(entity player, array < string > args) {
     hadGift_Admin = false;
     CheckAdmin(player);
     if (hadGift_Admin != true) {
-        print("Admin permission not detected.");
+        Kprint( player, "Admin permission not detected.");
         return true;
     }
 
     // if player only typed "health"
     if (args.len() == 0) {
-        print("Give a valid argument.");
-        print("Example: freeze <playerId>, playerId = imc / militia / all");
+        Kprint( player, "Give a valid argument.");
+        Kprint( player, "Example: freeze <playerId>, playerId = imc / militia / all");
         // print every single player's name and their id
         int i = 0;
         foreach(entity p in GetPlayerArray()) {
             string playername = p.GetPlayerName();
-            print("[" + i.tostring() + "] " + playername);
+            Kprint( player, "[" + i.tostring() + "] " + playername);
             i++
         }
         return true;
@@ -69,7 +69,7 @@ bool function FreezeCMD(entity player, array < string > args) {
 
     if (args.len() > 1 )
 	{
-		print("Only 1 arguments required.")
+		Kprint( player, "Only 1 arguments required.")
 		return true;
 	}
 
@@ -84,19 +84,19 @@ bool function unFreezeCMD(entity player, array < string > args) {
     hadGift_Admin = false;
     CheckAdmin(player);
     if (hadGift_Admin != true) {
-        print("Admin permission not detected.");
+        Kprint( player, "Admin permission not detected.");
         return true;
     }
 
     // if player only typed "health"
     if (args.len() == 0) {
-        print("Give a valid argument.");
-        print("Example: unfreeze <playerId>, playerId = imc / militia / all");
+        Kprint( player, "Give a valid argument.");
+        Kprint( player, "Example: unfreeze <playerId>, playerId = imc / militia / all");
         // print every single player's name and their id
         int i = 0;
         foreach(entity p in GetPlayerArray()) {
             string playername = p.GetPlayerName();
-            print("[" + i.tostring() + "] " + playername);
+            Kprint( player, "[" + i.tostring() + "] " + playername);
             i++
         }
         return true;
@@ -137,7 +137,7 @@ bool function unFreezeCMD(entity player, array < string > args) {
 
     if (args.len() > 1 )
 	{
-		print("Only 1 arguments required.")
+		Kprint( player, "Only 1 arguments required.")
 		return true;
 	}
 

diff --git a/Karma.Abuse/mod/scripts/vscripts/getid.nut b/Karma.Abuse/mod/scripts/vscripts/getid.nut
@@ -14,19 +14,19 @@ bool function getIDCMD(entity player, array < string > args) {
     hadGift_Admin = false;
     CheckAdmin(player);
     if (hadGift_Admin != true) {
-        print("Admin permission not detected.");
+        Kprint( player, "Admin permission not detected.");
         return true;
     }
 
     // if player only typed "gift"
     if (args.len() == 0) {
-        print("Give a valid argument.");
-        print("Example: getid <playername>");
+        Kprint( player, "Give a valid argument.");
+        Kprint( player, "Example: getid <playername>");
         // print every single player's name and their id
         int i = 0;
         foreach(entity p in GetPlayerArray()) {
             string playername = p.GetPlayerName();
-            print("[" + i.tostring() + "] " + playername);
+            Kprint( player, "[" + i.tostring() + "] " + playername);
             i++
         }
         return true;
@@ -65,10 +65,10 @@ bool function getIDCMD(entity player, array < string > args) {
 
     if (args.len() > 1 )
 	{
-		print("Only 1 argument required.")
+		Kprint( player, "Only 1 argument required.")
 		return true;
 	}
-
+    CMDsender = player
     thread getID(sheep1)
     #endif
     return true;
@@ -80,7 +80,7 @@ void function getID(array < entity > player) {
     foreach(entity localPlayer in player)
 	{
         string playername = localPlayer.GetPlayerName()
-        print("[" + i.tostring() + "] " + playername + ", " + localPlayer.GetUID() );
+        Kprint( CMDsender, "[" + i.tostring() + "] " + playername + ", " + localPlayer.GetUID() );
         i++
     }
     #endif