Merge branch 'master' of git.antiope.link:ChronosX88/sfcnr

.gitignore

@@ -88,6 +88,7 @@ npcmodes/**/*
 !npcmodes/secureguard.pwn
 !npcmodes/recordings/
 !npcmodes/recordings/*.rec
+!npcmodes/pawn.json
 npcmodes/recordings/mission_4.rec
 npcmodes/recordings/mission_3.rec
 npcmodes/recordings/mission_2.rec

gamemodes/irresistible/cnr/commands/admin/_admin.pwn

@@ -109,7 +109,6 @@ static stock
 		{ 3, "/countdown", 			"Countdown" },
 		{ 3, "/pingimmune", 		"Making a player immune from ping kicker" },
 		{ 3, "/ban", 				"Banning a player" },
-		{ 3, "/forceac",			"Force a player to use CAC while playing the server" },
 		{ 3, "/bring", 				"Bring a player to you" },
 		{ 3, "/chatbanlist",			"Shows a list of chat-banned players" },
 
@@ -147,7 +146,6 @@ static stock
 		{ 5, "/achangename", 		"Change a players name" },
 		{ 5, "/unbanip", 			"Unbanning a IP address" },
 		{ 5, "/unban", 				"Unban a player from the server" },
-		{ 5, "/unforceac", 			"Unforce a player from using CAC" },
 		{ 5, "/doublexp", 			"Enable/disable double XP" },
 		{ 5, "/toggleviewpm", 		"Toggle to view private messages" },
 		{ 5, "/respawnallv", 		"Respawning all server vehicles" },
@@ -160,7 +158,6 @@ static stock
 		{ 5, "/createhouse", 		"Creating a house" },
 		{ 5, "/destroyhouse", 		"Deleting a house" },
 		{ 5, "/hadminsell", 		"Selling a house (as admin)" },
-		{ 5, "/forceac", 			"Forcing a player to use SAMP-CAC" },
 		{ 5, "/createbusiness", 	"Creates a business" },
 		{ 5, "/destroybusiness", 	"Deletes a business" },
 		{ 5, "/seteventhost",		"Setting event host to player" },

gamemodes/irresistible/cnr/commands/admin/admin_one.pwn

@@ -78,7 +78,7 @@ CMD:pinfo( playerid, params[ ] )
 	else if ( !IsPlayerConnected( pID ) || IsPlayerNPC( pID ) ) return SendError( playerid, "Invalid Player ID." );
 	else
 	{
-		SendClientMessageFormatted( playerid, -1, ""COL_PINK"[ADMIN]"COL_WHITE" %s(%d): "COL_GREY"%0.2f%s packetloss, %d FPS, %d ping, from %s, SA-MP AC %s", ReturnPlayerName( pID ), pID, NetStats_PacketLossPercent( pID ), "%%", GetPlayerFPS( pID ), GetPlayerPing( pID ), GetPlayerCountryName( pID ), "DISABLED" );
+		SendClientMessageFormatted( playerid, -1, ""COL_PINK"[ADMIN]"COL_WHITE" %s(%d): "COL_GREY"%0.2f%s packetloss, %d FPS, %d ping, from %s", ReturnPlayerName( pID ), pID, NetStats_PacketLossPercent( pID ), "%%", GetPlayerFPS( pID ), GetPlayerPing( pID ), GetPlayerCountryName( pID ));
 	}
 	return 1;
 }

gamemodes/irresistible/cnr/features/vip/coin_market.pwn

@@ -99,17 +99,6 @@ static stock
 forward Float: GetPlayerIrresistibleCoins( playerid );
 
 /* ** Hooks ** */
-#if defined SERVER_PLS_DONATE_MP3
-hook OnServerGameDayEnd( )
-{
-	foreach ( new p : Player ) if ( ! p_VIPLevel[ p ] && ! IsPlayerUsingRadio( p ) )
-	{
-		PlayAudioStreamForPlayer( p, SERVER_PLS_DONATE_MP3 );
-	}
-	return 1;
-}
-#endif
-
 hook OnPlayerUpdateEx( playerid )
 {
 	CheckPlayerVipExpiry( playerid );

gamemodes/irresistible/config/server.pwn

@@ -24,10 +24,9 @@
 
 /* ** Comment line to disable feature ** */
 //#define SERVER_RULES_URL            "files.sfcnr.com/en_rules.txt"							// used for /rules (cnr\features\server_rules.pwn)
-#define SERVER_TWITTER_FEED_URL 	"files.sfcnr.com/cnr_twitter.php"						// used for /twitter (cnr\commands\cmd_twitter.pwn)
+// #define SERVER_TWITTER_FEED_URL 	"files.sfcnr.com/cnr_twitter.php"						// used for /twitter (cnr\commands\cmd_twitter.pwn)
 #define SERVER_HELP_API_URL			"sfcnr.com/api/player/help"								// used for /help (cnr\commands\cmd_help.pwn)
 #define SERVER_CHANGES_DIRECTORY 	"changelogs/cnr"										// used for /changes (cnr\changelog.pwn)
-#define SERVER_PLS_DONATE_MP3		"http://files.sfcnr.com/game_sounds/pls_donate.mp3"		// used for advertising vip (cnr\features\vip\coin_market.pwn)
 #define SERVER_MIGRATIONS_FOLDER  	"./gamemodes/irresistible/config/migrations/cnr/"		// used for migrations checking (config\migrations\_migrations.pwn)
 
 /* ** Hooks ** */

gamemodes/sf-cnr.pwn

@@ -2267,24 +2267,6 @@ CMD:vsay( playerid, params[ ] )
 	return 1;
 }
 
-
-CMD:aclist( playerid, params[ ] )
-{
-	// new
-	// 	count = 0;
-
-	// szLargeString = ""COL_WHITE"Orange players are forced to use SA-MP AC\n";
-
-	// foreach(new i : Player) if ( IsPlayerUsingSampAC( i ) ) {
-	// 	format( szLargeString, sizeof( szLargeString ), "%s%s%s(%d)\n", szLargeString, p_forcedAnticheat[ i ] > 0 ? ( COL_ORANGE ) : ( "" ), ReturnPlayerName( i ), i );
-	//     count++;
-	// }
-    // if ( count == 0 ) return SendError( playerid, "There are no SA-MP AC users online." );
-    // if ( strlen( szLargeString ) == sizeof( szLargeString ) - 1 ) return ShowPlayerDialog( playerid, DIALOG_NULL, DIALOG_STYLE_MSGBOX, "{FFFFFF}Online SA-MP AC Users", sprintf( ""COL_WHITE"There are %d SA-MP AC users online.", count ), "Okay", "" );
-	// ShowPlayerDialog( playerid, DIALOG_NULL, DIALOG_STYLE_TABLIST_HEADERS, "{FFFFFF}Online SA-MP AC Users", szLargeString, "Okay", "" );
-	return 1;
-}
-
 CMD:viplist( playerid, params[ ] )
 {
 	new
@@ -3242,7 +3224,7 @@ CMD:r( playerid, params[ ] )
 	    new pID = p_PmResponder[ playerid ];
 
 		if ( IsPlayerServerMaintainer( pID ) && g_VipPrivateMsging && p_VIPLevel[ playerid ] < VIP_REGULAR ) {
-			return SendError( playerid, "You need to be V.I.P to PM this person, to become one visit "COL_GREY"donate.sfcnr.com" );
+			return SendError( playerid, "You need to be V.I.P to PM this person, to become one discuss with admins" );
 		}
 
 		if ( p_BlockedPM[ playerid ] [ pID ] == true ) {
@@ -3286,7 +3268,7 @@ CMD:pm( playerid, params[ ] )
 	else
 	{
 		if ( IsPlayerServerMaintainer( pID ) && g_VipPrivateMsging && p_VIPLevel[ playerid ] < VIP_REGULAR ) {
-			return SendError( playerid, "You need to be V.I.P to PM this person, to become one visit "COL_GREY"donate.sfcnr.com" );
+			return SendError( playerid, "You need to be V.I.P to PM this person, to become one discuss with admins" );
 		}
 
 		if ( p_BlockedPM[ playerid ] [ pID ] == true ) {
@@ -5503,7 +5485,7 @@ public OnDialogResponse( playerid, dialogid, response, listitem, inputtext[ ] )
 		}
 
 		if ( p_VIPLevel[ playerid ] < VIP_GOLD && listitem == MENU_SPECIAL ) {
-			SendError( playerid, "You are not Gold V.I.P, to become one visit "COL_GREY"donate.sfcnr.com" );
+			SendError( playerid, "You are not Gold V.I.P, to become one discuss with admins" );
 			return ShowAmmunationMenu( playerid, "{FFFFFF}Weapon Deal - Purchase Weapons", DIALOG_WEAPON_DEAL );
 		}
 

npcmodes/pawn.json

@@ -0,0 +1,10 @@
+{
+	"user": "ChronosXYZ",
+	"repo": "sfcnr-npcmodes",
+	"tag": "0.0.1",
+	"entry": "secureguard.pwn",
+	"output": "secureguard.amx",
+	"dependencies": [
+		"pawn-lang/samp-stdlib"
+	]
+}