From c78e61e6c769b3c00714e1f57c692d7113b56f28 Mon Sep 17 00:00:00 2001 From: Damen Date: Tue, 15 Jan 2019 22:31:15 -0500 Subject: [PATCH 1/3] 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." ); From b10f171af1778956a05843bba850b25bc0b30f3e Mon Sep 17 00:00:00 2001 From: Damen Date: Tue, 15 Jan 2019 22:45:11 -0500 Subject: [PATCH 2/3] adjusts pool timer to attempt physics fix, updates updates.txt --- gamemodes/irresistible/cnr/features/pool.pwn | 2 +- scriptfiles/updates.txt | 13 ++++++------- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/gamemodes/irresistible/cnr/features/pool.pwn b/gamemodes/irresistible/cnr/features/pool.pwn index 74ae2d0..d2e610b 100644 --- a/gamemodes/irresistible/cnr/features/pool.pwn +++ b/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 ) diff --git a/scriptfiles/updates.txt b/scriptfiles/updates.txt index 048b3ce..981dd53 100644 --- a/scriptfiles/updates.txt +++ b/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. -(+) Server features are shown to newly registered players. -(/) Player money is saved on an inflow/outflow basis. Before, it saved only when you disconnected. -(/) You need 50 score to send private messages in the server. -(*) Fixed issue with cop chat behaving abnormally. -(*) You cannot use /sync in jail. -(-) Knives have been removed due to abuse. \ No newline at end of file +(/) Breaking Cuffs is now at a 75% chance success rate. +(/) Jail Multiplier is now lowered from 3 to 2. +(/) /sm is no longer capped at a 90M transaction. +(/) /ic send limit has been increased from 5,000 to 10,000. +(*) Bank Money changes now trigger it to be saved. Fixing IC & Stock selling issue. +(*) Fireworks purchasing is now functional and grants you the item upon purchase. \ No newline at end of file From d78b8dbd3ed5a94461c6f8fb1f26fa634534780c Mon Sep 17 00:00:00 2001 From: Damen Date: Wed, 16 Jan 2019 00:15:29 -0500 Subject: [PATCH 3/3] removes a line i accidentally added when removing timer on arrest --- gamemodes/irresistible/cnr/features/cop/arrest.pwn | 1 - 1 file changed, 1 deletion(-) diff --git a/gamemodes/irresistible/cnr/features/cop/arrest.pwn b/gamemodes/irresistible/cnr/features/cop/arrest.pwn index 12c075c..bf3ff32 100644 --- a/gamemodes/irresistible/cnr/features/cop/arrest.pwn +++ b/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." );