ChronosXYZ/sfcnr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

address issue with rdm

Browse Source
This commit is contained in:
Lorenc Pekaj 2018-09-20 21:36:16 +10:00
parent af8e995be3
commit 755f9c7307
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
gamemodes/sf-cnr.pwn
View File

@ -723,8 +723,8 @@ new
{ false, "Secure Wallet", "Protection from robberies", LIMIT_ONE, 660, 5 }, // 4 { false, "Secure Wallet", "Protection from robberies", LIMIT_ONE, 660, 5 }, // 4
{ true , "Scissors", "Automatically cut ties", LIMIT_SCISSORS, 1100, 6 }, // 5 { true , "Scissors", "Automatically cut ties", LIMIT_SCISSORS, 1100, 6 }, // 5
{ true , "Rope", "/tie", LIMIT_ROPES, 2250, 7 }, // 8 [1500] { true , "Rope", "/tie", LIMIT_ROPES, 2250, 7 }, // 8 [1500]
{ true , "Bobby Pin", "Automatically break cuffs", LIMIT_PINS, 3250, 8 }, // 6 [1000] -makecopgreatagain
{ true , "Aluminium Foil", "Automatically deflect EMP", LIMIT_FOIL, 3500, 9 }, // 9 { true , "Aluminium Foil", "Automatically deflect EMP", LIMIT_FOIL, 3500, 9 }, // 9
{ true , "Bobby Pin", "Automatically break cuffs", LIMIT_PINS, 3900, 8 }, // 6 [1000] -makecopgreatagain
{ false, "Money Case", "Increases robbing amount", LIMIT_ONE, 4500, 10 }, // 7 [1250] { false, "Money Case", "Increases robbing amount", LIMIT_ONE, 4500, 10 }, // 7 [1250]
{ true , "Thermal Drill", "Halves safe cracking time", LIMIT_ONE, 5000, 11 }, // 10 { true , "Thermal Drill", "Halves safe cracking time", LIMIT_ONE, 5000, 11 }, // 10
{ true , "Metal Melter", "/breakout", LIMIT_MELTER, 7500, 12 } // 11 { true , "Metal Melter", "/breakout", LIMIT_MELTER, 7500, 12 } // 11
@ -22443,15 +22443,14 @@ stock IsRandomDeathmatch( issuerid, damagedid )
dW = p_WantedLevel[ damagedid ], dC = p_Class[ damagedid ] dW = p_WantedLevel[ damagedid ], dC = p_Class[ damagedid ]
; ;
if ( IsPlayerInMinigame( damagedid ) || IsPlayerInMinigame( issuerid ) )
return true;
if ( IsPlayerBoxing( issuerid ) ) if ( IsPlayerBoxing( issuerid ) )
return false; return false;
if ( IsPlayerInMinigame( damagedid ) || IsPlayerInMinigame( issuerid ) ) if ( ! IsPlayerInCasino( issuerid ) || ! IsPlayerInCasino( damagedid ) )
return true; return false;
if ( IsPlayerInCasino( issuerid ) || IsPlayerInCasino( damagedid ) )
return true;
return ( !iW && iC != CLASS_POLICE && !dW && dC != CLASS_POLICE ) || ( iW && iC != CLASS_POLICE && !dW && dC != CLASS_POLICE ) || ( !iW && iC != CLASS_POLICE && dW && dC != CLASS_POLICE ) || ( !iW && iC != CLASS_POLICE && dC == CLASS_POLICE ); return ( !iW && iC != CLASS_POLICE && !dW && dC != CLASS_POLICE ) || ( iW && iC != CLASS_POLICE && !dW && dC != CLASS_POLICE ) || ( !iW && iC != CLASS_POLICE && dW && dC != CLASS_POLICE ) || ( !iW && iC != CLASS_POLICE && dC == CLASS_POLICE );
} }
@ -25658,7 +25657,7 @@ stock CuffPlayer( victimid, playerid )
if ( break_attempts >= 2 ) if ( break_attempts >= 2 )
{ {
new new
money_dropped = RandomEx( 350, 500 ) * break_attempts; money_dropped = RandomEx( 200, 400 ) * break_attempts;
SendClientMessageFormatted( playerid, -1, ""COL_GREEN"[CUFFED]{FFFFFF} %s(%d) just broke their cuffs off, and dropped %s!", ReturnPlayerName( victimid ), victimid, cash_format( money_dropped ) ); SendClientMessageFormatted( playerid, -1, ""COL_GREEN"[CUFFED]{FFFFFF} %s(%d) just broke their cuffs off, and dropped %s!", ReturnPlayerName( victimid ), victimid, cash_format( money_dropped ) );
GivePlayerCash( playerid, money_dropped ); GivePlayerCash( playerid, money_dropped );