Merged in minor-adjustments (pull request #57)

Minor Adjustments

gamemodes/irresistible/cnr/features/cop/arrest.pwn

@@ -312,7 +312,6 @@ stock ArrestPlayer( victimid, playerid )
 		SendGlobalMessage( -1, ""COL_GOLD"[JAIL]{FFFFFF} %s(%d) has sent %s(%d) to jail for %d seconds!", ReturnPlayerName( playerid ), playerid, ReturnPlayerName( victimid ), victimid, totalSeconds );
 		JailPlayer( victimid, totalSeconds );
 		KillTimer( p_AwaitingBCAttemptTimer[ victimid ] );
-		p_AwaitingBCAttemptTimer[ playerid ] = SetTimerEx( "BreakPlayerCuffsAttempt", 3000, false, "d", victimid );
 		return 1;
  	}
  	else return SendError( playerid, "There are no players around to arrest." );
@@ -430,7 +429,7 @@ stock BreakPlayerCuffs( playerid )
 
 	if ( p_AwaitingBCAttempt{ playerid } ) p_AwaitingBCAttempt{ playerid } = false;
 
-	new probability = 60;
+	new probability = 75; // success rate probability
 
 	if ( random( 101 ) <= probability )
 	{

gamemodes/irresistible/cnr/features/cop/jail.pwn

@@ -203,6 +203,30 @@ CMD:pdjail( playerid, params[ ] )
 	return 1;
 }
 
+CMD:breakout( playerid, params[ ] )
+{
+	if ( p_Class[ playerid ] != CLASS_CIVILIAN ) return SendError( playerid, "This is restricted to civilians only." );
+	if ( !IsPlayerJailed( playerid ) ) return SendError( playerid, "You can only use this while you're in jail!" );
+	if ( IsPlayerAdminJailed( playerid ) ) return SendError( playerid, "You have been admin jailed, disallowing this." );
+	if ( p_inAlcatraz{ playerid } ) return SendError( playerid, "You are unable to break out of Alcatraz. Ask a friend to blow you out." );
+	if ( p_MetalMelter[ playerid ] > 0 )
+	{
+	    new
+			iRandom = random( 101 );
+
+		if ( p_MetalMelter[ playerid ]-- <= 3 )
+			ShowPlayerHelpDialog( playerid, 2500, "You only have %d metal melters left!", p_MetalMelter[ playerid ] );
+
+	    if ( iRandom < 80 ) {
+		  	CallLocalFunction( "OnPlayerUnjailed", "dd", playerid, 2 );
+		  	GivePlayerWantedLevel( playerid, 24 );
+	    }
+		else SendServerMessage( playerid, "You have failed to break out." );
+	}
+	else SendError( playerid, "You have no more Metal Melters available.");
+	return 1;
+}
+
 /* ** Functions ** */
 stock JailPlayer( playerid, seconds, admin = 0 )
 {

gamemodes/irresistible/cnr/features/pool.pwn

@@ -11,7 +11,7 @@
 
 /* ** Definitions ** */
 #define POCKET_RADIUS 				( 0.09 )
-#define POOL_TIMER_SPEED 			( 25 )
+#define POOL_TIMER_SPEED 			( 20 )
 #define DEFAULT_AIM 				( 0.38 )
 #define DEFAULT_POOL_STRING 		"Pool Table\n{FFFFFF}Press ENTER To Play"
 #define POOL_FEE_RATE 				( 0.02 )

gamemodes/sf-cnr.pwn

@@ -3347,30 +3347,6 @@ CMD:cmds( playerid, params[ ] )
 	return 1;
 }
 
-CMD:breakout( playerid, params[ ] )
-{
-	if ( p_Class[ playerid ] != CLASS_CIVILIAN ) return SendError( playerid, "This is restricted to civilians only." );
-	if ( !IsPlayerJailed( playerid ) ) return SendError( playerid, "You can only use this while you're in jail!" );
-	if ( IsPlayerAdminJailed( playerid ) ) return SendError( playerid, "You have been admin jailed, disallowing this." );
-	if ( p_inAlcatraz{ playerid } ) return SendError( playerid, "You are unable to break out of Alcatraz. Ask a friend to blow you out." );
-	if ( p_MetalMelter[ playerid ] > 0 )
-	{
-	    new
-			iRandom = random( 101 );
-
-		if ( p_MetalMelter[ playerid ]-- <= 3 )
-			ShowPlayerHelpDialog( playerid, 2500, "You only have %d metal melters left!", p_MetalMelter[ playerid ] );
-
-	    if ( iRandom < 80 ) {
-		  	CallLocalFunction( "OnPlayerUnjailed", "dd", playerid, 2 );
-		  	GivePlayerWantedLevel( playerid, 24 );
-	    }
-		else SendServerMessage( playerid, "You have failed to break out." );
-	}
-	else SendError( playerid, "You have no more Metal Melters available.");
-	return 1;
-}
-
 CMD:shop( playerid, params[ ] )
 {
     if ( ( !IsPlayerInEntrance( playerid, g_SupaSave ) && !IsPlayerInDynamicCP( playerid, g_Checkpoints[ CP_247_MENU ] ) ) || !GetPlayerInterior( playerid ) ) return SendError( playerid, "You must be within Supa Save or 24/7 to purchase items." );

scriptfiles/updates.txt

@@ -1,7 +1,6 @@
-(+) A percentage is showed in the top donor bar, which is the required total funding of the server for the month.
+(/) Breaking Cuffs is now at a 75% chance success rate.
-(+) Server features are shown to newly registered players.
+(/) Jail Multiplier is now lowered from 3 to 2.
-(/) Player money is saved on an inflow/outflow basis. Before, it saved only when you disconnected.
+(/) /sm is no longer capped at a 90M transaction.
-(/) You need 50 score to send private messages in the server.
+(/) /ic send limit has been increased from 5,000 to 10,000.
-(*) Fixed issue with cop chat behaving abnormally.
+(*) Bank Money changes now trigger it to be saved. Fixing IC & Stock selling issue.
-(*) You cannot use /sync in jail.
+(*) Fireworks purchasing is now functional and grants you the item upon purchase.
-(-) Knives have been removed due to abuse.