From c78e61e6c769b3c00714e1f57c692d7113b56f28 Mon Sep 17 00:00:00 2001 From: Damen Date: Tue, 15 Jan 2019 22:31:15 -0500 Subject: [PATCH] moves breakout cmd to jail module, adjusts breakcuff success rate --- .../irresistible/cnr/features/cop/arrest.pwn | 2 +- .../irresistible/cnr/features/cop/jail.pwn | 24 +++++++++++++++++++ gamemodes/sf-cnr.pwn | 24 ------------------- 3 files changed, 25 insertions(+), 25 deletions(-) diff --git a/gamemodes/irresistible/cnr/features/cop/arrest.pwn b/gamemodes/irresistible/cnr/features/cop/arrest.pwn index 75cfd61..12c075c 100644 --- a/gamemodes/irresistible/cnr/features/cop/arrest.pwn +++ b/gamemodes/irresistible/cnr/features/cop/arrest.pwn @@ -430,7 +430,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 ) { diff --git a/gamemodes/irresistible/cnr/features/cop/jail.pwn b/gamemodes/irresistible/cnr/features/cop/jail.pwn index 7351cfe..3ac22dd 100644 --- a/gamemodes/irresistible/cnr/features/cop/jail.pwn +++ b/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 ) { diff --git a/gamemodes/sf-cnr.pwn b/gamemodes/sf-cnr.pwn index feebb82..d5e3f3e 100644 --- a/gamemodes/sf-cnr.pwn +++ b/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." );