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

fixed ranking bug and goto parameter for admins

Browse Source
This commit is contained in:
Lorenc 2018-08-02 02:30:18 +02:00
parent 5b7935b345
commit 5d34049735
2 changed files with 15 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
gamemodes/sf-cnr.pwn
View File

@ -15,7 +15,7 @@
#pragma compat 1 #pragma compat 1
//#pragma option -d3 //#pragma option -d3
#pragma dynamic 7200000 #pragma dynamic 7200000
#define DEBUG_MODE //#define DEBUG_MODE
#if defined DEBUG_MODE #if defined DEBUG_MODE
#pragma option -d3 #pragma option -d3
@ -3364,7 +3364,7 @@ public OnGameModeInit()
/* ** Robbery Points ** */ /* ** Robbery Points ** */
static const ROBBERY_BOT_PAY = 2000; // max pay from robbing bots static const ROBBERY_BOT_PAY = 2000; // max pay from robbing bots
static const ROBBERY_SAFE_PAY = 7000; // max pay from robbing safes static const ROBBERY_SAFE_PAY = 6500; // max pay from robbing safes
CreateMultipleRobberies( "Bank of San Fierro - Safe 1", floatround( float( ROBBERY_SAFE_PAY ) * 1.85 ), -1400.941772, 862.858947, 984.17200, -90.00000, g_bankvaultData[ CITY_SF ] [ E_WORLD ] ); CreateMultipleRobberies( "Bank of San Fierro - Safe 1", floatround( float( ROBBERY_SAFE_PAY ) * 1.85 ), -1400.941772, 862.858947, 984.17200, -90.00000, g_bankvaultData[ CITY_SF ] [ E_WORLD ] );
CreateMultipleRobberies( "Bank of San Fierro - Safe 2", floatround( float( ROBBERY_SAFE_PAY ) * 1.85 ), -1400.941772, 861.179321, 985.07251, -90.00000, g_bankvaultData[ CITY_SF ] [ E_WORLD ] ); CreateMultipleRobberies( "Bank of San Fierro - Safe 2", floatround( float( ROBBERY_SAFE_PAY ) * 1.85 ), -1400.941772, 861.179321, 985.07251, -90.00000, g_bankvaultData[ CITY_SF ] [ E_WORLD ] );
@ -32316,7 +32316,7 @@ stock CreateGate( playerid, password[ 8 ], model, Float: speed, Float: range, Fl
g_gateData[ gID ] [ E_MOVE_RZ ] = rz; g_gateData[ gID ] [ E_MOVE_RZ ] = rz;
g_gateData[ gID ] [ E_GANG_SQL_ID ] = 0; g_gateData[ gID ] [ E_GANG_SQL_ID ] = 0;
format( szBigString, sizeof( szBigString ), "INSERT INTO `GATES` VALUES(%d,%d,'%s','Gate',%d,2000,%f,%f,%f,%f,%f,%f,%f,%f,%f,%f,%f,%f,%f,%f)", gID, playerid, mysql_escape( password ), model, speed, range, x, y, z, rx, ry, rz, x, y, z, rx, ry, rz ); format( szBigString, sizeof( szBigString ), "INSERT INTO `GATES` VALUES(%d,%d,'%s','Gate',%d,2000,%f,%f,%f,%f,%f,%f,%f,%f,%f,%f,%f,%f,%f,%f,0)", gID, playerid, mysql_escape( password ), model, speed, range, x, y, z, rx, ry, rz, x, y, z, rx, ry, rz );
mysql_single_query( szBigString ); mysql_single_query( szBigString );
g_gateData[ gID ] [ E_OBJECT ] = CreateDynamicObject( g_gateData[ gID ] [ E_MODEL ], g_gateData[ gID ] [ E_X ], g_gateData[ gID ] [ E_Y ], g_gateData[ gID ] [ E_Z ], g_gateData[ gID ] [ E_RX ], g_gateData[ gID ] [ E_RY ], g_gateData[ gID ] [ E_RZ ] ); g_gateData[ gID ] [ E_OBJECT ] = CreateDynamicObject( g_gateData[ gID ] [ E_MODEL ], g_gateData[ gID ] [ E_X ], g_gateData[ gID ] [ E_Y ], g_gateData[ gID ] [ E_Z ], g_gateData[ gID ] [ E_RX ], g_gateData[ gID ] [ E_RY ], g_gateData[ gID ] [ E_RZ ] );
@ -34357,10 +34357,11 @@ stock GivePlayerIrresistiblePoints( playerid, Float: points )
if ( fCurrentPoints < 0.0 ) if ( fCurrentPoints < 0.0 )
fCurrentPoints = 0.0; fCurrentPoints = 0.0;
if ( fCurrentPoints > 10000.0 ) new Float: upper_limit = g_aPlayerRanks[ 0 ] [ E_POINTS ] + 500.0;
fCurrentPoints = 10000.0;
if ( fCurrentPoints > upper_limit )
fCurrentPoints = upper_limit;
// gained
for( new iRank = 0; iRank < sizeof( g_aPlayerRanks ); iRank++ ) for( new iRank = 0; iRank < sizeof( g_aPlayerRanks ); iRank++ )
{ {
new new
@ -35597,10 +35598,10 @@ stock GetClosestRobberyNPC( robberyid, &Float: distance = FLOAT_INFINITY ) {
stock TriggerRobberyForClerks( playerid, robberyid ) stock TriggerRobberyForClerks( playerid, robberyid )
{ {
new new Float: distance = FLOAT_INFINITY;
clerkid = GetClosestRobberyNPC( robberyid ); new clerkid = GetClosestRobberyNPC( robberyid, distance );
if ( clerkid != -1 ) if ( clerkid != -1 && distance < 50.0 )
{ {
new new
npcid = g_robberyNpcData[ clerkid ] [ E_NPC_ID ]; npcid = g_robberyNpcData[ clerkid ] [ E_NPC_ID ];
@ -37236,9 +37237,6 @@ stock UpdateBusinessData( businessid )
stock DestroyBusiness( businessid ) stock DestroyBusiness( businessid )
{ {
if ( businessid < 0 || businessid >= MAX_GARAGES )
return 0;
if ( !Iter_Contains( business, businessid ) ) if ( !Iter_Contains( business, businessid ) )
return 0; return 0;
@ -37639,7 +37637,7 @@ stock ShowBusinessMembers( playerid, businessid )
new new
szMembers[ 96 ] = "0"; szMembers[ 96 ] = "0";
for ( new i = 0; i < MAX_BUSINESS_MEMBERS; i ++ ) if ( g_businessData[ businessid ] [ E_MEMBERS ] [ i ] != 0 ) { for ( new i = 0; i < MAX_BUSINESS_MEMBERS; i ++ ) if ( g_businessData[ businessid ] [ E_MEMBERS ] [ i ] ) {
format( szMembers, sizeof( szMembers ), "%s,%d", szMembers, g_businessData[ businessid ] [ E_MEMBERS ] [ i ] ); format( szMembers, sizeof( szMembers ), "%s,%d", szMembers, g_businessData[ businessid ] [ E_MEMBERS ] [ i ] );
} }

13
scriptfiles/updates.txt
View File

@ -1,9 +1,4 @@
(+) If you are over the slot limit for houses/vehicles, you will be required to renew in order to restore functionality. (+) Added an robbery highscore to /highscores.
(+) You can now access server /highscores. You can see top seasonal rank, top score, top kills or top arrests. (*) Fixed /goto parameter for admins.
(+) When you pick up a weapon, it will not change your gun unless you are swapping (holding TAB). (*) Fixed ranking bug with seasonal ranks.
(-) Robbery clerks from stores have been disabled due to irregular use. (*) Fixed geolocation service.
(/) Profit on safes is now increased by 25% due to clerks being reduced.
(/) You risk being shot by drug house bosses if you are not aiming at them.
(/) ChuffSec will strictly work in San Fierro for now.
(*) Weapon hack detection will not bug when someone dies.
(/) It is now 50% easier to now break ChuffSec's hinges.