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

speed up robbery time with thermal drill

Browse Source
This commit is contained in:
Lorenc Pekaj 2018-10-08 21:36:19 +11:00
parent 53d7f274e8
commit f0d793d4fc
3 changed files with 29 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
gamemodes/irresistible/cnr/features/robbery/safes.pwn
View File

@ -237,7 +237,16 @@ stock AttachToRobberySafe( robberyid, playerid, type )
offsetY = -1.4 * floatcos( -( rotation + 170 ), degrees ); offsetY = -1.4 * floatcos( -( rotation + 170 ), degrees );
g_robberyData[ robberyid ] [ E_DRILL_EFFECT ] = CreateDynamicObject( 18718, fX + offsetX, fY + offsetY, fZ, 90, 0, rotation, g_robberyData[ robberyid ] [ E_WORLD ] ); g_robberyData[ robberyid ] [ E_DRILL_EFFECT ] = CreateDynamicObject( 18718, fX + offsetX, fY + offsetY, fZ, 90, 0, rotation, g_robberyData[ robberyid ] [ E_WORLD ] );
g_robberyData[ robberyid ] [ E_ROBTIMER ] = SetTimerEx( "onSafeBust", 7500, false, "dddd", playerid, robberyid, type, 0 ); new
Float: speed_up = GetPlayerLevel( playerid, E_ROBBERY ) * 37.5;
if ( speed_up >= 37.5 ) {
SendServerMessage( playerid, "You have attached your thermal drill (%0.1f%s faster) on this "COL_ORANGE"safe"COL_WHITE".", ( speed_up / 7500.0 ) * 100.0, "%%" );
} else {
SendServerMessage( playerid, "You have attached your thermal drill on this "COL_ORANGE"safe"COL_WHITE"." );
}
g_robberyData[ robberyid ] [ E_ROBTIMER ] = SetTimerEx( "onSafeBust", 7500 - floatround( speed_up ), false, "dddd", playerid, robberyid, type, 0 );
p_drillStrength[ playerid ] -= 10; p_drillStrength[ playerid ] -= 10;
Streamer_Update( playerid ); Streamer_Update( playerid );
@ -298,12 +307,11 @@ stock createRobberyLootInstance( playerid, robberyid, type )
GetDynamicObjectPos( g_robberyData[ robberyid ] [ E_SAFE ], fX, fY, fZ ); GetDynamicObjectPos( g_robberyData[ robberyid ] [ E_SAFE ], fX, fY, fZ );
GetDynamicObjectRot( g_robberyData[ robberyid ] [ E_SAFE ], fRotation, fRotation, fRotation ); GetDynamicObjectRot( g_robberyData[ robberyid ] [ E_SAFE ], fRotation, fRotation, fRotation );
new businessid = g_robberyData[ robberyid ] [ E_BUSINESS_ID ]; // new businessid = g_robberyData[ robberyid ] [ E_BUSINESS_ID ];
new bool: business_robbery = businessid != -1; // new bool: business_robbery = businessid != -1;
new Float: random_chance = fRandomEx( 0.0, 101.0 ); new Float: random_chance = fRandomEx( 0.0, 101.0 );
new Float: probability = 90.0;
if ( business_robbery ) /*if ( business_robbery )
{ {
switch ( g_businessData[ businessid ] [ E_SECURITY_LEVEL ] ) switch ( g_businessData[ businessid ] [ E_SECURITY_LEVEL ] )
{ {
@ -312,10 +320,18 @@ stock createRobberyLootInstance( playerid, robberyid, type )
case 2: probability = 75.0; case 2: probability = 75.0;
case 3: probability = 101.0; // must be over 100.0% case 3: probability = 101.0; // must be over 100.0%
} }
}*/
// 100% success rate for newbs
if ( p_Robberies[ playerid ] < 10.0 ) {
random_chance = 100.0;
} }
// printf ( "[BIZ]Probability %0.3f - dice %0.3f", probability, random_chance ); // level increase chance of success
if ( business_robbery ? random_chance > probability : ( p_Robberies[ playerid ] <= 20 ? 100.0 : random_chance ) > 5.0 ) random_chance += GetPlayerLevel( playerid, E_ROBBERY ) * 0.2; // increase success rate by 0.2% per level
// potential for a 20% fail rate
if ( random_chance > 20.0 )
{ {
new Float: iRobAmount = float( g_robberyData[ robberyid ] [ E_ROB_VALUE ] ); new Float: iRobAmount = float( g_robberyData[ robberyid ] [ E_ROB_VALUE ] );
new Float: iLoot = fRandomEx( iRobAmount / 2.0, iRobAmount ); new Float: iLoot = fRandomEx( iRobAmount / 2.0, iRobAmount );
@ -325,7 +341,7 @@ stock createRobberyLootInstance( playerid, robberyid, type )
g_robberyData[ robberyid ] [ E_MULTIPLIER ] = 1.0; g_robberyData[ robberyid ] [ E_MULTIPLIER ] = 1.0;
// check if this is a business safe // check if this is a business safe
if ( business_robbery ) /*if ( business_robbery )
{ {
new Float: final_bank = float( g_businessData[ businessid ] [ E_BANK ] ); new Float: final_bank = float( g_businessData[ businessid ] [ E_BANK ] );
switch ( g_businessData[ businessid ] [ E_SECURITY_LEVEL ] ) switch ( g_businessData[ businessid ] [ E_SECURITY_LEVEL ] )
@ -345,7 +361,7 @@ stock createRobberyLootInstance( playerid, robberyid, type )
// add loot anyway under 3k // add loot anyway under 3k
if ( iLoot < 3000 ) iLoot = RandomEx( 1500, 3000 ); if ( iLoot < 3000 ) iLoot = RandomEx( 1500, 3000 );
} }*/
// Loose 50% because of impact // Loose 50% because of impact
// if ( type == ROBBERY_TYPE_C4 ) iLoot *= 0.50; // if ( type == ROBBERY_TYPE_C4 ) iLoot *= 0.50;

2
gamemodes/irresistible/cnr/progress.pwn
View File

@ -33,7 +33,7 @@ forward OnProgressCompleted( playerid, progressid, params );
/* ** Hooks ** */ /* ** Hooks ** */
hook OnPlayerConnect( playerid ) hook OnPlayerConnect( playerid )
{ {
p_ProgressBar[ playerid ] = CreatePlayerProgressBar( playerid, 251.000000, 222.000000, 142.0, 9.2 ); p_ProgressBar[ playerid ] = CreatePlayerProgressBar( playerid, 252.000000, 221.000000, 142.0, 9.2 );
p_ProgressTitle[ playerid ] = CreatePlayerTextDraw( playerid, 320.000000, 205.000000, "_" ); p_ProgressTitle[ playerid ] = CreatePlayerTextDraw( playerid, 320.000000, 205.000000, "_" );
PlayerTextDrawAlignment( playerid, p_ProgressTitle[ playerid ], 2 ); PlayerTextDrawAlignment( playerid, p_ProgressTitle[ playerid ], 2 );

6
gamemodes/sf-cnr.pwn
View File

@ -4647,7 +4647,7 @@ public OnProgressCompleted( playerid, progressid, params )
Float: distance = distanceFromSafe( playerid, robberyid ) Float: distance = distanceFromSafe( playerid, robberyid )
; ;
if ( robberyid != -1 && distance < 2.5 || distance > 0.0 ) if ( robberyid != -1 && 0.0 < distance <= 2.5 )
{ {
if ( !g_robberyData[ robberyid ] [ E_ROBBED ] && !IsValidDynamicObject( g_robberyData[ robberyid ] [ E_SAFE_MONEY ] ) ) if ( !g_robberyData[ robberyid ] [ E_ROBBED ] && !IsValidDynamicObject( g_robberyData[ robberyid ] [ E_SAFE_MONEY ] ) )
{ {
@ -17741,7 +17741,7 @@ function handlePlayerRobbery( playerid, newkeys, oldkeys )
if ( success == 0xBF ) SendError( playerid, "There is no money to rob from this business safe." ); if ( success == 0xBF ) SendError( playerid, "There is no money to rob from this business safe." );
else if ( success == 1 ) { else if ( success == 1 ) {
SendServerMessage( playerid, "You have attached your thermal drill on this "COL_ORANGE"safe"COL_WHITE"." ), p_UsingRobberySafe[ playerid ] = robberyid; p_UsingRobberySafe[ playerid ] = robberyid;
} }
} }
else else
@ -17783,7 +17783,7 @@ function handlePlayerRobbery( playerid, newkeys, oldkeys )
Float: speed_up = GetPlayerLevel( playerid, E_ROBBERY ) * 50.0; Float: speed_up = GetPlayerLevel( playerid, E_ROBBERY ) * 50.0;
if ( speed_up >= 50.0 ) { if ( speed_up >= 50.0 ) {
SendClientMessageFormatted( playerid, -1, ""COL_GOLD"[ROBBERY]"COL_WHITE" You are now picking a safe (%0.1f%s faster), please wait until you've finished. Press C to stop.", ( speed_up / 5000.0 ) * 100.0, "%%" ); SendClientMessageFormatted( playerid, -1, ""COL_GOLD"[ROBBERY]"COL_WHITE" You are now picking a safe (%0.1f%s faster), please wait until you've finished. Press C to stop.", ( speed_up / 10000.0 ) * 100.0, "%%" );
} else { } else {
SendClientMessage( playerid, -1, ""COL_GOLD"[ROBBERY]"COL_WHITE" You are now picking a safe, please wait until you've finished. Press C to stop." ); SendClientMessage( playerid, -1, ""COL_GOLD"[ROBBERY]"COL_WHITE" You are now picking a safe, please wait until you've finished. Press C to stop." );
} }