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

Merged in pool-system (pull request #12)

Browse Source 
Pool system
This commit is contained in:
Lorenc Pekaj 2018-09-15 02:07:51 +00:00
commit 0e507bad49
8 changed files with 1154 additions and 771 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gamemodes/irresistible/cnr/commands/admin/admin_six.pwn
View File

@ -260,7 +260,7 @@ CMD:setlevel( playerid, params[ ] )
iLevel iLevel
; ;
if ( !IsPlayerAdmin( playerid ) && p_AdminLevel[ playerid ] < 6 ) return SendError( playerid, ADMIN_COMMAND_REJECT ); if ( !IsPlayerAdmin( playerid ) && p_AdminLevel[ playerid ] < 6 ) return SendError( playerid, ADMIN_COMMAND_REJECT );
else if ( sscanf( params, "d", pID, iLevel ) ) SendUsage( playerid, "/setlevel [PLAYER_ID] [LEVEL]"); else if ( sscanf( params, "ud", pID, iLevel ) ) SendUsage( playerid, "/setlevel [PLAYER_ID] [LEVEL]");
else if ( iLevel < 0 || iLevel > 6 ) return SendError( playerid, "Please specify an administration level between 0 and 6." ); else if ( iLevel < 0 || iLevel > 6 ) return SendError( playerid, "Please specify an administration level between 0 and 6." );
else if ( !IsPlayerConnected( pID ) || IsPlayerNPC( pID ) ) return SendError( playerid, "Invalid Player ID." ); else if ( !IsPlayerConnected( pID ) || IsPlayerNPC( pID ) ) return SendError( playerid, "Invalid Player ID." );
else else

2
gamemodes/irresistible/cnr/features/minijobs/_minijobs.pwn
View File

@ -8,4 +8,4 @@
/* ** Includes ** */ /* ** Includes ** */
#include "irresistible\cnr\features\minijobs\meth.pwn" #include "irresistible\cnr\features\minijobs\meth.pwn"
#include "irresistible\cnr\features\minijobs\trucking.pwn" #include "irresistible\cnr\features\minijobs\trucking.pwn"
#include "irresistible\cnr\features\minijobs\pilot.pwn" // #include "irresistible\cnr\features\minijobs\pilot.pwn"

1783
gamemodes/irresistible/cnr/features/pool.pwn
View File

File diff suppressed because it is too large Load Diff

7
gamemodes/irresistible/cnr/features/visage/poker.pwn
View File

@ -1147,13 +1147,6 @@ stock UpdateInfoTextdrawsForPlayer(playerid)
return 1; return 1;
} }
stock Player_Clearchat(playerid)
{
for(new j = 0; j < 30; j++)
SendClientMessage(playerid, -1, " ");
return 1;
}
public Poker_StartGame(handle, dealer) public Poker_StartGame(handle, dealer)
{ {
TableData[handle][E_TABLE_STING_NEW_GAME] = false; TableData[handle][E_TABLE_STING_NEW_GAME] = false;

2
gamemodes/irresistible/cnr/static/player_objects.pwn
View File

@ -10102,8 +10102,6 @@ stock initializeObjects( )
SetDynamicObjectMaterial( CreateDynamicObject( 19454, -1016.496459, 1044.522705, 4.096351, 0.000000, 90.000000, 90.000000 ), 0, 9495, "vict_sfw", "newall10_seamless", 0 ); SetDynamicObjectMaterial( CreateDynamicObject( 19454, -1016.496459, 1044.522705, 4.096351, 0.000000, 90.000000, 90.000000 ), 0, 9495, "vict_sfw", "newall10_seamless", 0 );
SetDynamicObjectMaterial( CreateDynamicObject( 19454, -1021.718627, 1047.973510, 5.768362, 0.000000, 0.000000, 90.000000 ), 0, 9495, "vict_sfw", "newall10_seamless", 0 ); SetDynamicObjectMaterial( CreateDynamicObject( 19454, -1021.718627, 1047.973510, 5.768362, 0.000000, 0.000000, 90.000000 ), 0, 9495, "vict_sfw", "newall10_seamless", 0 );
SetDynamicObjectMaterial( CreateDynamicObject( 19454, -1015.137634, 1047.953491, 5.768362, 0.000000, 0.000000, 90.000000 ), 0, 9495, "vict_sfw", "newall10_seamless", 0 ); SetDynamicObjectMaterial( CreateDynamicObject( 19454, -1015.137634, 1047.953491, 5.768362, 0.000000, 0.000000, 90.000000 ), 0, 9495, "vict_sfw", "newall10_seamless", 0 );
CreateDynamicObject( 14651, -1015.541442, 1046.419067, 2.917308, 0.000000, 0.000000, 90.000000 );
CreateDynamicObject( 14651, -1021.812072, 1046.419067, 2.917308, 0.000000, 0.000000, 90.000000 );
CreateDynamicObject( 948, -1007.720397, 1060.881591, 0.792823, 0.000000, 0.000000, 0.000000 ); CreateDynamicObject( 948, -1007.720397, 1060.881591, 0.792823, 0.000000, 0.000000, 0.000000 );
CreateDynamicObject( 948, -1007.720397, 1048.316772, 0.792823, 0.000000, 0.000000, 0.000000 ); CreateDynamicObject( 948, -1007.720397, 1048.316772, 0.792823, 0.000000, 0.000000, 0.000000 );
CreateDynamicObject( 1827, -1010.351501, 1054.650146, 0.757999, 0.000000, 0.000000, 0.000000 ); CreateDynamicObject( 1827, -1010.351501, 1054.650146, 0.757999, 0.000000, 0.000000, 0.000000 );

6
gamemodes/irresistible/config/_config.pwn
View File

@ -8,3 +8,9 @@
/* ** Includes ** */ /* ** Includes ** */
#include "irresistible\config\database.pwn" // keep #1 #include "irresistible\config\database.pwn" // keep #1
#include "irresistible\config\colors.pwn" #include "irresistible\config\colors.pwn"
/* ** Configuration ** */
#define FILE_BUILD "v11.36.105"
#define SERVER_NAME "San Fierro Cops And Robbers (0.3.7)"
#define SERVER_WEBSITE "www.sfcnr.com"
#define SERVER_IP "54.36.127.43:7777"

10
gamemodes/irresistible/helpers.pwn
View File

@ -13,6 +13,7 @@
#define RandomEx(%0,%1) (random((%1) - (%0)) + (%0)) #define RandomEx(%0,%1) (random((%1) - (%0)) + (%0))
#define HOLDING(%0) ((newkeys & (%0)) == (%0)) #define HOLDING(%0) ((newkeys & (%0)) == (%0))
#define PRESSED(%0) (((newkeys & (%0)) == (%0)) && ((oldkeys & (%0)) != (%0))) #define PRESSED(%0) (((newkeys & (%0)) == (%0)) && ((oldkeys & (%0)) != (%0)))
#define RELEASED(%0) (((newkeys & (%0)) != (%0)) && ((oldkeys & (%0)) == (%0)))
#define SendUsage(%0,%1) (SendClientMessageFormatted(%0,-1,"{FFAF00}[USAGE]{FFFFFF} " # %1)) #define SendUsage(%0,%1) (SendClientMessageFormatted(%0,-1,"{FFAF00}[USAGE]{FFFFFF} " # %1))
#define SendError(%0,%1) (SendClientMessageFormatted(%0,-1,"{F81414}[ERROR]{FFFFFF} " # %1)) #define SendError(%0,%1) (SendClientMessageFormatted(%0,-1,"{F81414}[ERROR]{FFFFFF} " # %1))
#define SendServerMessage(%0,%1) (SendClientMessageFormatted(%0,-1,"{C0C0C0}[SERVER]{FFFFFF} " # %1)) #define SendServerMessage(%0,%1) (SendClientMessageFormatted(%0,-1,"{C0C0C0}[SERVER]{FFFFFF} " # %1))
@ -88,6 +89,15 @@ stock trimString( strSrc[ ] )
strdel( strSrc, 0, strPos ); strdel( strSrc, 0, strPos );
} }
// purpose: clear chat for player
stock Player_Clearchat( playerid )
{
for ( new j = 0; j < 30; j ++ ) {
SendClientMessage( playerid, -1, " " );
}
return 1;
}
// purpose: get distance between players // purpose: get distance between players
stock Float: GetDistanceBetweenPlayers( iPlayer1, iPlayer2, &Float: fDistance = Float: 0x7F800000, bool: bAllowNpc = false ) stock Float: GetDistanceBetweenPlayers( iPlayer1, iPlayer2, &Float: fDistance = Float: 0x7F800000, bool: bAllowNpc = false )
{ {

11
gamemodes/sf-cnr.pwn
View File

@ -112,13 +112,6 @@ new bool: False = false;
#define CreateBillboard(%0,%1,%2,%3,%4) SetDynamicObjectMaterialText(CreateDynamicObject(7246,%1,%2,%3,0,0,%4),0,(%0),120,"Arial",24,0,-1,-16777216,1) #define CreateBillboard(%0,%1,%2,%3,%4) SetDynamicObjectMaterialText(CreateDynamicObject(7246,%1,%2,%3,0,0,%4),0,(%0),120,"Arial",24,0,-1,-16777216,1)
/* ** Configuration ** */
#define FILE_BUILD "v11.36.105"
#define SERVER_NAME "San Fierro Cops And Robbers (0.3.7)"
#define SERVER_WEBSITE "www.sfcnr.com"
#define SERVER_IP "192.169.82.202:7777"
//#define MAX_WEAPONS 54 //#define MAX_WEAPONS 54
#define MAX_CLASS_BAN_WARNS 3 #define MAX_CLASS_BAN_WARNS 3
#define MAX_CAR_MODS 15 #define MAX_CAR_MODS 15
@ -14549,7 +14542,7 @@ function OnSafeHelperUpdate( playerid, robberyid )
Float: distance = distanceFromSafe( playerid, robberyid ) Float: distance = distanceFromSafe( playerid, robberyid )
; ;
if ( robberyid == INVALID_OBJECT_ID || distance > 100.0 || !IsPlayerConnected( playerid ) || !IsPlayerSpawned( playerid ) ) if ( robberyid == INVALID_OBJECT_ID || distance > 100.0 || ! IsPlayerConnected( playerid ) || ! IsPlayerSpawned( playerid ) || IsPlayerInCasino( playerid ) || IsPlayerPlayingPool( playerid ) )
{ {
p_SafeHelperTimer[ playerid ] = -1; p_SafeHelperTimer[ playerid ] = -1;
HidePlayerHelpDialog( playerid ); HidePlayerHelpDialog( playerid );
@ -28851,7 +28844,6 @@ stock ShowBusinessSecurityUpgrades( playerid, businessid )
return ShowPlayerDialog( playerid, DIALOG_BUSINESS_SECURITY, DIALOG_STYLE_TABLIST_HEADERS, ""COL_GREY"Business System", security, "Purchase", "Back" ); return ShowPlayerDialog( playerid, DIALOG_BUSINESS_SECURITY, DIALOG_STYLE_TABLIST_HEADERS, ""COL_GREY"Business System", security, "Purchase", "Back" );
} }
stock IsPlayerUnderCover( playerid ) { // StefiTV852, Shepard23, JamesComey stock IsPlayerUnderCover( playerid ) { // StefiTV852, Shepard23, JamesComey
return ( p_AccountID[ playerid ] == 577142 || p_AccountID[ playerid ] == 536230 || p_AccountID[ playerid ] == 668504 ) && p_PlayerLogged{ playerid }; return ( p_AccountID[ playerid ] == 577142 || p_AccountID[ playerid ] == 536230 || p_AccountID[ playerid ] == 668504 ) && p_PlayerLogged{ playerid };
} }
@ -28860,7 +28852,6 @@ stock ShowPlayerSpawnMenu( playerid ) {
return ShowPlayerDialog( playerid, DIALOG_SPAWN, DIALOG_STYLE_LIST, "{FFFFFF}Spawn Location", ""COL_GREY"Reset Back To Default\nHouse\nBusiness\nGang Facility\nVisage Casino", "Select", "Cancel" ); return ShowPlayerDialog( playerid, DIALOG_SPAWN, DIALOG_STYLE_LIST, "{FFFFFF}Spawn Location", ""COL_GREY"Reset Back To Default\nHouse\nBusiness\nGang Facility\nVisage Casino", "Select", "Cancel" );
} }
stock PlayerPlaceRandomHits( ) stock PlayerPlaceRandomHits( )
{ {
new hitman_budget = GetGVarInt( "hitman_budget" ); new hitman_budget = GetGVarInt( "hitman_budget" );