commit
52a4a44c70
@ -156,6 +156,7 @@ static stock
|
|||||||
{ 5, "/destroybusiness", "Deletes a business" },
|
{ 5, "/destroybusiness", "Deletes a business" },
|
||||||
{ 5, "/seteventhost", "Setting event host to player" },
|
{ 5, "/seteventhost", "Setting event host to player" },
|
||||||
{ 5, "/weather", "Settings world weather" },
|
{ 5, "/weather", "Settings world weather" },
|
||||||
|
{ 5, "/viewpolicechat", "Viewing the police radio/chat" },
|
||||||
|
|
||||||
/* ** Level 6 Commands ** */
|
/* ** Level 6 Commands ** */
|
||||||
{ 6, "/reloadeditor", "Reloads object editer script" },
|
{ 6, "/reloadeditor", "Reloads object editer script" },
|
||||||
|
@ -20,6 +20,18 @@ CMD:armorall( playerid, params[ ] )
|
|||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
CMD:viewpolicechat( playerid, params[ ] )
|
||||||
|
{
|
||||||
|
if ( p_AdminLevel[ playerid ] < 5 && !IsPlayerUnderCover( playerid ) ) return SendError( playerid, ADMIN_COMMAND_REJECT );
|
||||||
|
p_ToggleCopChat{ playerid } = !p_ToggleCopChat{ playerid };
|
||||||
|
|
||||||
|
SendClientMessageFormatted( playerid, -1, ""COL_PINK"[ADMIN]"COL_WHITE" You have %s viewing police.", p_ToggleCopChat{ playerid } == true ? ("toggled") : ("un-toggled") );
|
||||||
|
if ( !IsPlayerUnderCover( playerid ) ) {
|
||||||
|
AddAdminLogLineFormatted( "%s(%d) has %s viewing police chat", ReturnPlayerName( playerid ), playerid, p_ToggleCopChat{ playerid } == true ? ("toggled") : ("un-toggled") );
|
||||||
|
}
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
|
||||||
CMD:check( playerid, params[ ] )
|
CMD:check( playerid, params[ ] )
|
||||||
{
|
{
|
||||||
new
|
new
|
||||||
|
@ -210,7 +210,6 @@
|
|||||||
#define DIALOG_COMPONENTS_SELL 1200
|
#define DIALOG_COMPONENTS_SELL 1200
|
||||||
#define DIALOG_HOUSE_SELL 1201
|
#define DIALOG_HOUSE_SELL 1201
|
||||||
#define DIALOG_BUSINESS_SELL_CONFIRM 1202
|
#define DIALOG_BUSINESS_SELL_CONFIRM 1202
|
||||||
#define DIALOG_PASSIVE_MODE 1203
|
|
||||||
|
|
||||||
/* ** Hooks ** */
|
/* ** Hooks ** */
|
||||||
hook OnDialogResponse( playerid, dialogid, response, listitem, inputtext[ ] )
|
hook OnDialogResponse( playerid, dialogid, response, listitem, inputtext[ ] )
|
||||||
|
@ -179,7 +179,7 @@ hook OnPlayerDisconnect( playerid, reason )
|
|||||||
|
|
||||||
hook OnPlayerMovieMode( playerid, bool: toggled )
|
hook OnPlayerMovieMode( playerid, bool: toggled )
|
||||||
{
|
{
|
||||||
if ( ! toggled )
|
if ( toggled )
|
||||||
{
|
{
|
||||||
TextDrawShowForPlayer( playerid, g_CurrentRankTD );
|
TextDrawShowForPlayer( playerid, g_CurrentRankTD );
|
||||||
TextDrawShowForPlayer( playerid, g_currentXPTD );
|
TextDrawShowForPlayer( playerid, g_currentXPTD );
|
||||||
|
@ -16,9 +16,6 @@
|
|||||||
#define HIDE_FEED_DELAY ( 3000 )
|
#define HIDE_FEED_DELAY ( 3000 )
|
||||||
#define MAX_UPDATE_RATE ( 250 )
|
#define MAX_UPDATE_RATE ( 250 )
|
||||||
|
|
||||||
#define TYPE_GIVEN ( 1 )
|
|
||||||
#define TYPE_TAKEN ( 2 )
|
|
||||||
|
|
||||||
#define TEXTDRAW_ADDON ( 100.0 )
|
#define TEXTDRAW_ADDON ( 100.0 )
|
||||||
|
|
||||||
/* ** Forwards ** */
|
/* ** Forwards ** */
|
||||||
@ -49,6 +46,8 @@ static stock
|
|||||||
//g_BulletTimer [ MAX_PLAYERS ],
|
//g_BulletTimer [ MAX_PLAYERS ],
|
||||||
|
|
||||||
bool: p_GotHit [ MAX_PLAYERS char ],
|
bool: p_GotHit [ MAX_PLAYERS char ],
|
||||||
|
//bool: p_SyncingPlayer [ MAX_PLAYERS char ],
|
||||||
|
p_DamageObject [ MAX_PLAYERS ] = { -1, ... },
|
||||||
|
|
||||||
PlayerText: g_damageFeedTakenTD [ MAX_PLAYERS ] = { PlayerText: INVALID_TEXT_DRAW, ... },
|
PlayerText: g_damageFeedTakenTD [ MAX_PLAYERS ] = { PlayerText: INVALID_TEXT_DRAW, ... },
|
||||||
PlayerText: g_damageFeedGivenTD [ MAX_PLAYERS ] = { PlayerText: INVALID_TEXT_DRAW, ... },
|
PlayerText: g_damageFeedGivenTD [ MAX_PLAYERS ] = { PlayerText: INVALID_TEXT_DRAW, ... },
|
||||||
@ -83,12 +82,34 @@ hook OnPlayerConnect( playerid )
|
|||||||
PlayerTextDrawSetOutline(playerid, p_DamageTD[ playerid ], 1);
|
PlayerTextDrawSetOutline(playerid, p_DamageTD[ playerid ], 1);
|
||||||
PlayerTextDrawSetProportional(playerid, p_DamageTD[ playerid ], 1);*/
|
PlayerTextDrawSetProportional(playerid, p_DamageTD[ playerid ], 1);*/
|
||||||
|
|
||||||
|
/* ** Textdraws ** */
|
||||||
|
g_damageFeedGivenTD[ playerid ] = CreatePlayerTextDraw( playerid, ( 320.0 - TEXTDRAW_ADDON ), 340.0, "_");
|
||||||
|
PlayerTextDrawBackgroundColor(playerid, g_damageFeedGivenTD[ playerid ], 117 );
|
||||||
|
PlayerTextDrawAlignment( playerid, g_damageFeedGivenTD[ playerid ], 2 );
|
||||||
|
PlayerTextDrawFont( playerid, g_damageFeedGivenTD[ playerid ], 1 );
|
||||||
|
PlayerTextDrawLetterSize( playerid, g_damageFeedGivenTD[ playerid ], 0.200000, 0.899999 );
|
||||||
|
PlayerTextDrawColor( playerid, g_damageFeedGivenTD[ playerid ], 0xDD2020FF );
|
||||||
|
PlayerTextDrawSetOutline( playerid, g_damageFeedGivenTD[ playerid ], 1 );
|
||||||
|
PlayerTextDrawSetProportional( playerid, g_damageFeedGivenTD[ playerid ], 1 );
|
||||||
|
PlayerTextDrawSetSelectable( playerid, g_damageFeedGivenTD[ playerid ], 0 );
|
||||||
|
|
||||||
|
g_damageFeedTakenTD[ playerid ] = CreatePlayerTextDraw( playerid, ( TEXTDRAW_ADDON + 320.0 ), 340.0, "_");
|
||||||
|
PlayerTextDrawBackgroundColor(playerid, g_damageFeedTakenTD[ playerid ], 117 );
|
||||||
|
PlayerTextDrawAlignment( playerid, g_damageFeedTakenTD[ playerid ], 2 );
|
||||||
|
PlayerTextDrawFont( playerid, g_damageFeedTakenTD[ playerid ], 1 );
|
||||||
|
PlayerTextDrawLetterSize( playerid, g_damageFeedTakenTD[ playerid ], 0.200000, 0.899999 );
|
||||||
|
PlayerTextDrawColor( playerid, g_damageFeedTakenTD[ playerid ], 1069804543 );
|
||||||
|
PlayerTextDrawSetOutline( playerid, g_damageFeedTakenTD[ playerid ], 1 );
|
||||||
|
PlayerTextDrawSetProportional( playerid, g_damageFeedTakenTD[ playerid ], 1 );
|
||||||
|
PlayerTextDrawSetSelectable( playerid, g_damageFeedTakenTD[ playerid ], 0 );
|
||||||
|
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
hook OnPlayerDisconnect( playerid, reason )
|
hook OnPlayerDisconnect( playerid, reason )
|
||||||
{
|
{
|
||||||
p_HitmarkerSound{ playerid } = 0;
|
p_HitmarkerSound{ playerid } = 0;
|
||||||
|
//p_SyncingPlayer{ playerid } = false;
|
||||||
|
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
@ -143,10 +164,15 @@ public OnPlayerTakenDamage( playerid, issuerid, Float: amount, weaponid, bodypar
|
|||||||
|
|
||||||
if ( GetPlayerArmour( playerid, armour ) )
|
if ( GetPlayerArmour( playerid, armour ) )
|
||||||
{
|
{
|
||||||
SetPlayerAttachedObject( playerid, 4, armour - amount <= 0.0 ? ( 1240 ) : ( 1242 ), 1, 1.400000, -0.004999, 0.034999, 4.499999, 83.500030, -3.799998, 1.000000, 1.000000, 1.026999 );
|
DestroyObject( p_DamageObject[ playerid ] );
|
||||||
|
|
||||||
|
p_DamageObject[ playerid ] = CreateObject( armour - amount <= 0.0 ? ( 1240 ) : ( 1242 ), 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 100.0 );
|
||||||
|
AttachObjectToPlayer( p_DamageObject[ playerid ], playerid, 0.0, 0.0, 1.5, 0.0, 0.0, 0.0 );
|
||||||
|
|
||||||
|
//SetPlayerAttachedObject( playerid, 4, armour - amount <= 0.0 ? ( 1240 ) : ( 1242 ), 1, 1.400000, -0.004999, 0.034999, 4.499999, 83.500030, -3.799998, 1.000000, 1.000000, 1.026999 );
|
||||||
SetTimerEx( "HideDamageObject", 1000, false, "d", playerid );
|
SetTimerEx( "HideDamageObject", 1000, false, "d", playerid );
|
||||||
|
|
||||||
Streamer_Update( playerid, STREAMER_TYPE_OBJECT );
|
//Streamer_Update( playerid, STREAMER_TYPE_OBJECT );
|
||||||
p_GotHit{ playerid } = true;
|
p_GotHit{ playerid } = true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -170,8 +196,10 @@ public OnPlayerTakenDamage( playerid, issuerid, Float: amount, weaponid, bodypar
|
|||||||
|
|
||||||
function HideDamageObject( playerid )
|
function HideDamageObject( playerid )
|
||||||
{
|
{
|
||||||
if( IsPlayerAttachedObjectSlotUsed( playerid, 4 ) )
|
if( IsValidObject( p_DamageObject[ playerid ] ) ) {
|
||||||
RemovePlayerAttachedObject( playerid, 4 );
|
DestroyObject( p_DamageObject[ playerid ] );
|
||||||
|
p_DamageObject[ playerid ] = -1;
|
||||||
|
}
|
||||||
|
|
||||||
p_GotHit{ playerid } = false;
|
p_GotHit{ playerid } = false;
|
||||||
return 1;
|
return 1;
|
||||||
@ -188,13 +216,6 @@ public OnPlayerFeedUpdate( playerid )
|
|||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
stock CreateBulletLabel( playerid, weaponid, Float: amount )
|
|
||||||
{
|
|
||||||
if ( IsPlayerInCasino( playerid ) || IsPlayerInPaintBall( playerid ) || IsPlayerInEvent( playerid ) || IsPlayerInMinigame( playerid ) )
|
|
||||||
return;
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
stock DamageFeedAddHitGiven( playerid, issuerid, Float: amount, weaponid )
|
stock DamageFeedAddHitGiven( playerid, issuerid, Float: amount, weaponid )
|
||||||
{
|
{
|
||||||
foreach( new i : Player ) if ( p_Spectating{ i } && p_whomSpectating[ i ] == playerid && i != playerid ) {
|
foreach( new i : Player ) if ( p_Spectating{ i } && p_whomSpectating[ i ] == playerid && i != playerid ) {
|
||||||
@ -215,60 +236,6 @@ stock DamageFeedAddHitTaken( playerid, issuerid, Float: amount, weaponid )
|
|||||||
|
|
||||||
stock UpdateDamageFeed( playerid, bool: modified = false )
|
stock UpdateDamageFeed( playerid, bool: modified = false )
|
||||||
{
|
{
|
||||||
if ( !IsDamageFeedActive( playerid ) )
|
|
||||||
{
|
|
||||||
if ( g_damageFeedGivenTD[ playerid ] != PlayerText: INVALID_TEXT_DRAW ) {
|
|
||||||
PlayerTextDrawDestroy( playerid, g_damageFeedGivenTD[ playerid ] );
|
|
||||||
g_damageFeedGivenTD[ playerid ] = PlayerText: INVALID_TEXT_DRAW;
|
|
||||||
}
|
|
||||||
|
|
||||||
if ( g_damageFeedTakenTD[ playerid ] != PlayerText: INVALID_TEXT_DRAW ) {
|
|
||||||
PlayerTextDrawDestroy( playerid, g_damageFeedTakenTD[ playerid ] );
|
|
||||||
g_damageFeedTakenTD[ playerid ] = PlayerText: INVALID_TEXT_DRAW;
|
|
||||||
}
|
|
||||||
|
|
||||||
return 1;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* ** Textdraws ** */
|
|
||||||
if ( g_damageFeedGivenTD[ playerid] == PlayerText: INVALID_TEXT_DRAW )
|
|
||||||
{
|
|
||||||
new PlayerText: handle = CreatePlayerTextDraw( playerid, ( 320.0 - TEXTDRAW_ADDON ), 340.0, "_");
|
|
||||||
|
|
||||||
if ( handle == PlayerText: INVALID_TEXT_DRAW )
|
|
||||||
return print("[DAMAGE FEED ERROR]: Unable to create TD (given damage)" );
|
|
||||||
|
|
||||||
PlayerTextDrawBackgroundColor(playerid, handle, 117 );
|
|
||||||
PlayerTextDrawAlignment( playerid, handle, 2 );
|
|
||||||
PlayerTextDrawFont( playerid, handle, 1 );
|
|
||||||
PlayerTextDrawLetterSize( playerid, handle, 0.200000, 0.899999 );
|
|
||||||
PlayerTextDrawColor( playerid, handle, 0xDD2020FF );
|
|
||||||
PlayerTextDrawSetOutline( playerid, handle, 1 );
|
|
||||||
PlayerTextDrawSetProportional( playerid, handle, 1 );
|
|
||||||
PlayerTextDrawSetSelectable( playerid, handle, 0 );
|
|
||||||
|
|
||||||
g_damageFeedGivenTD[ playerid ] = handle;
|
|
||||||
}
|
|
||||||
|
|
||||||
if ( g_damageFeedTakenTD[ playerid] == PlayerText: INVALID_TEXT_DRAW )
|
|
||||||
{
|
|
||||||
new PlayerText: handle = CreatePlayerTextDraw( playerid, ( TEXTDRAW_ADDON + 320.0 ), 340.0, "_");
|
|
||||||
|
|
||||||
if ( handle == PlayerText: INVALID_TEXT_DRAW )
|
|
||||||
return print("[DAMAGE FEED ERROR]: Unable to create TD (taken damage)" );
|
|
||||||
|
|
||||||
PlayerTextDrawBackgroundColor(playerid, handle, 117 );
|
|
||||||
PlayerTextDrawAlignment( playerid, handle, 2 );
|
|
||||||
PlayerTextDrawFont( playerid, handle, 1 );
|
|
||||||
PlayerTextDrawLetterSize( playerid, handle, 0.200000, 0.899999 );
|
|
||||||
PlayerTextDrawColor( playerid, handle, 1069804543 );
|
|
||||||
PlayerTextDrawSetOutline( playerid, handle, 1 );
|
|
||||||
PlayerTextDrawSetProportional( playerid, handle, 1 );
|
|
||||||
PlayerTextDrawSetSelectable( playerid, handle, 0 );
|
|
||||||
|
|
||||||
g_damageFeedTakenTD[ playerid ] = handle;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* ** Core ** */
|
/* ** Core ** */
|
||||||
new szTick = GetTickCount( );
|
new szTick = GetTickCount( );
|
||||||
if ( szTick == 0 ) szTick = 1;
|
if ( szTick == 0 ) szTick = 1;
|
||||||
@ -509,6 +476,53 @@ stock ShowSoundsMenu( playerid )
|
|||||||
ShowPlayerDialog( playerid, DIALOG_MODIFY_HITSOUND, DIALOG_STYLE_LIST, ""COL_WHITE"Hitmarker Sound", szSounds, "Select", "Close" );
|
ShowPlayerDialog( playerid, DIALOG_MODIFY_HITSOUND, DIALOG_STYLE_LIST, ""COL_WHITE"Hitmarker Sound", szSounds, "Select", "Close" );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/*stock SyncPlayer( playerid )
|
||||||
|
{
|
||||||
|
if ( !IsPlayerConnected( playerid ) || !IsPlayerSpawned( playerid ) || p_SyncingPlayer{ playerid } == true || IsPlayerInAnyVehicle( playerid ) || IsPlayerAFK( playerid ) )
|
||||||
|
return 0;
|
||||||
|
|
||||||
|
p_SyncingPlayer{ playerid } = true;
|
||||||
|
|
||||||
|
// ** Obtaining Information **
|
||||||
|
static
|
||||||
|
Float: fX, Float: fY, Float: fZ, Float: fA, Float: iHealth, Float: iArmour,
|
||||||
|
iSkin, iInterior, iWorld, iWeapon, weaponData[ 13 ][ 2 ];
|
||||||
|
|
||||||
|
GetPlayerHealth( playerid, iHealth );
|
||||||
|
GetPlayerArmour( playerid, iArmour );
|
||||||
|
iWeapon = GetPlayerWeapon( playerid );
|
||||||
|
iWorld = GetPlayerVirtualWorld( playerid );
|
||||||
|
iInterior = GetPlayerInterior( playerid );
|
||||||
|
|
||||||
|
GetPlayerPos( playerid, fX, fY, fZ );
|
||||||
|
GetPlayerFacingAngle( playerid, fA );
|
||||||
|
|
||||||
|
for( new slotid = 0; slotid < 13; slotid ++ ) {
|
||||||
|
GetPlayerWeaponData(playerid, slotid, weaponData[ slotid ] [ 0 ], weaponData[ slotid ] [ 1 ] );
|
||||||
|
}
|
||||||
|
|
||||||
|
ClearAnimations( playerid );
|
||||||
|
|
||||||
|
// ** Reinstating Information ** *
|
||||||
|
SetSpawnInfo( playerid, GetPlayerTeam( playerid ), iSkin, fX, fY, fZ - 0.4, fA, 0, 0, 0, 0, 0, 0 );
|
||||||
|
SpawnPlayer( playerid );
|
||||||
|
|
||||||
|
SetPlayerHealth( playerid, iHealth );
|
||||||
|
SetPlayerArmour( playerid, iArmour );
|
||||||
|
|
||||||
|
SetPlayerInterior( playerid, iInterior );
|
||||||
|
SetPlayerVirtualWorld( playerid, iWorld );
|
||||||
|
|
||||||
|
for( new slotid = 0; slotid < 13; slotid ++ ) {
|
||||||
|
GivePlayerWeapon(playerid, weaponData[ slotid ] [ 0 ], weaponData[ slotid ] [ 1 ] );
|
||||||
|
}
|
||||||
|
|
||||||
|
SetPlayerArmedWeapon( playerid, iWeapon );
|
||||||
|
|
||||||
|
SendServerMessage( playerid, "You are now synced." );
|
||||||
|
return 1;
|
||||||
|
}*/
|
||||||
|
|
||||||
/* ** Commands ** */
|
/* ** Commands ** */
|
||||||
CMD:hitmarker( playerid, params[ ] )
|
CMD:hitmarker( playerid, params[ ] )
|
||||||
{
|
{
|
||||||
|
@ -39,6 +39,7 @@ new
|
|||||||
p_Ropes [ MAX_PLAYERS ],
|
p_Ropes [ MAX_PLAYERS ],
|
||||||
bool: p_Kidnapped [ MAX_PLAYERS char ],
|
bool: p_Kidnapped [ MAX_PLAYERS char ],
|
||||||
bool: p_ToggledViewPM [ MAX_PLAYERS char ],
|
bool: p_ToggledViewPM [ MAX_PLAYERS char ],
|
||||||
|
bool: p_ToggleCopChat [ MAX_PLAYERS char ],
|
||||||
p_TicketTimestamp [ MAX_PLAYERS ],
|
p_TicketTimestamp [ MAX_PLAYERS ],
|
||||||
p_TicketIssuer [ MAX_PLAYERS ] = { INVALID_PLAYER_ID, ... },
|
p_TicketIssuer [ MAX_PLAYERS ] = { INVALID_PLAYER_ID, ... },
|
||||||
p_CheckpointEnterTick [ MAX_PLAYERS ],
|
p_CheckpointEnterTick [ MAX_PLAYERS ],
|
||||||
@ -232,7 +233,7 @@ new
|
|||||||
p_PlayerAltBindTick [ MAX_PLAYERS ],
|
p_PlayerAltBindTick [ MAX_PLAYERS ],
|
||||||
p_AimedAtPolice [ MAX_PLAYERS ],
|
p_AimedAtPolice [ MAX_PLAYERS ],
|
||||||
bool: p_PassiveModeDisabled [ MAX_PLAYERS char ],
|
bool: p_PassiveModeDisabled [ MAX_PLAYERS char ],
|
||||||
//p_PassiveModeExpireTimer [ MAX_PLAYERS ] = { -1, ... },
|
p_PassiveModeExpireTimer [ MAX_PLAYERS ] = { -1, ... },
|
||||||
Text3D: p_PassiveModeLabel [ MAX_PLAYERS ] = { Text3D: INVALID_3DTEXT_ID }
|
Text3D: p_PassiveModeLabel [ MAX_PLAYERS ] = { Text3D: INVALID_3DTEXT_ID }
|
||||||
;
|
;
|
||||||
|
|
||||||
|
@ -68,9 +68,9 @@ hook OnDialogResponse( playerid, dialogid, response, listitem, inputtext[ ] )
|
|||||||
ShowPlayerTogglableTextdraws( playerid, .force = false );
|
ShowPlayerTogglableTextdraws( playerid, .force = false );
|
||||||
}
|
}
|
||||||
|
|
||||||
/*else if ( settingid == SETTING_PASSIVE_MODE ) {
|
else if ( settingid == SETTING_PASSIVE_MODE ) {
|
||||||
ResetPlayerPassiveMode( playerid, .passive_disabled = true ); // avoid abusing
|
ResetPlayerPassiveMode( playerid, .passive_disabled = true ); // avoid abusing
|
||||||
}*/
|
}
|
||||||
|
|
||||||
format( szNormalString, 68, "INSERT INTO `SETTINGS`(`USER_ID`, `SETTING_ID`) VALUES (%d, %d)", p_AccountID[ playerid ], settingid );
|
format( szNormalString, 68, "INSERT INTO `SETTINGS`(`USER_ID`, `SETTING_ID`) VALUES (%d, %d)", p_AccountID[ playerid ], settingid );
|
||||||
}
|
}
|
||||||
@ -80,15 +80,15 @@ hook OnDialogResponse( playerid, dialogid, response, listitem, inputtext[ ] )
|
|||||||
HidePlayerTogglableTextdraws( playerid, .force = false );
|
HidePlayerTogglableTextdraws( playerid, .force = false );
|
||||||
ShowPlayerTogglableTextdraws( playerid, .force = false );
|
ShowPlayerTogglableTextdraws( playerid, .force = false );
|
||||||
}
|
}
|
||||||
/*else if ( settingid == SETTING_PASSIVE_MODE ) {
|
else if ( settingid == SETTING_PASSIVE_MODE ) {
|
||||||
ResetPlayerPassiveMode( playerid, .passive_disabled = true ); // avoid abusing
|
ResetPlayerPassiveMode( playerid, .passive_disabled = true ); // avoid abusing
|
||||||
}*/
|
}
|
||||||
|
|
||||||
format( szNormalString, 64, "DELETE FROM `SETTINGS` WHERE USER_ID=%d AND SETTING_ID=%d", p_AccountID[ playerid ], settingid );
|
format( szNormalString, 64, "DELETE FROM `SETTINGS` WHERE USER_ID=%d AND SETTING_ID=%d", p_AccountID[ playerid ], settingid );
|
||||||
}
|
}
|
||||||
mysql_single_query( szNormalString );
|
mysql_single_query( szNormalString );
|
||||||
|
|
||||||
SendServerMessage( playerid, ""COL_ORANGE"%s"COL_WHITE" is now %s. Changes may take effect after spawning/relogging.", g_PlayerSettings[ settingid ], p_PlayerSettings[ playerid ] { settingid } ? ( "enabled" ) : ( "disabled" ) );
|
SendServerMessage( playerid, "You have %s "COL_GREY"%s"COL_WHITE". Changes may take effect after spawning/relogging.", p_PlayerSettings[ playerid ] { settingid } ? ( "enabled" ) : ( "disabled" ), g_PlayerSettings[ settingid ] );
|
||||||
|
|
||||||
if ( ! strmatch( inputtext, "ignore" )) {
|
if ( ! strmatch( inputtext, "ignore" )) {
|
||||||
cmd_cp( playerid, "" ); // Redirect to control panel again...
|
cmd_cp( playerid, "" ); // Redirect to control panel again...
|
||||||
|
@ -112,7 +112,7 @@ static stock InitializeServerVehicles( )
|
|||||||
AddStaticVehicle( 511, -1245.295776, -95.022689, 15.472208, 135.868728, -1, -1 );
|
AddStaticVehicle( 511, -1245.295776, -95.022689, 15.472208, 135.868728, -1, -1 );
|
||||||
AddStaticVehicle( 563, -1185.826293, 25.737642, 14.870979, 226.734649, -1, -1 );
|
AddStaticVehicle( 563, -1185.826293, 25.737642, 14.870979, 226.734649, -1, -1 );
|
||||||
AddStaticVehicle( 563, -1224.193359, -10.034203, 14.869047, 223.632965, -1, -1 );
|
AddStaticVehicle( 563, -1224.193359, -10.034203, 14.869047, 223.632965, -1, -1 );
|
||||||
AddStaticVehicle( 411, -1238.649780, 50.157535, 13.858886, 225.435058, -1, -1 );
|
//AddStaticVehicle( 411, -1238.649780, 50.157535, 13.858886, 225.435058, -1, -1 );
|
||||||
AddStaticVehicle( 522, -1241.090942, 63.254283, 13.680734, 44.845169, -1, -1 );
|
AddStaticVehicle( 522, -1241.090942, 63.254283, 13.680734, 44.845169, -1, -1 );
|
||||||
AddStaticVehicleEx( 597, -1634.655029, 651.717651, 6.954792, 180.744827, -1, -1, 240, 1 );
|
AddStaticVehicleEx( 597, -1634.655029, 651.717651, 6.954792, 180.744827, -1, -1, 240, 1 );
|
||||||
AddStaticVehicle( 497, -1682.705566, 705.820434, 30.778402, 90.953826, -1, -1 );
|
AddStaticVehicle( 497, -1682.705566, 705.820434, 30.778402, 90.953826, -1, -1 );
|
||||||
@ -227,7 +227,7 @@ static stock InitializeServerVehicles( )
|
|||||||
AddStaticVehicle( 507, -2545.616699, 642.781616, 14.280050, 88.164779, -1, -1 );
|
AddStaticVehicle( 507, -2545.616699, 642.781616, 14.280050, 88.164779, -1, -1 );
|
||||||
AddStaticVehicle( 451, -2572.311035, 658.140808, 14.159088, 92.413055, -1, -1 );
|
AddStaticVehicle( 451, -2572.311035, 658.140808, 14.159088, 92.413055, -1, -1 );
|
||||||
AddStaticVehicle( 576, -2572.658935, 647.644714, 14.062355, 89.737174, -1, -1 );
|
AddStaticVehicle( 576, -2572.658935, 647.644714, 14.062355, 89.737174, -1, -1 );
|
||||||
AddStaticVehicle( 411, -1943.248291, 487.249816, 31.713851, 90.106033, -1, -1 );
|
//AddStaticVehicle( 411, -1943.248291, 487.249816, 31.713851, 90.106033, -1, -1 );
|
||||||
AddStaticVehicle( 522, -1988.700683, 301.183624, 34.739818, 89.835449, -1, -1 );
|
AddStaticVehicle( 522, -1988.700683, 301.183624, 34.739818, 89.835449, -1, -1 );
|
||||||
AddStaticVehicle( 579, -1987.592651, 304.252044, 35.113090, 90.826240, -1, -1 );
|
AddStaticVehicle( 579, -1987.592651, 304.252044, 35.113090, 90.826240, -1, -1 );
|
||||||
AddStaticVehicle( 489, -1987.468261, 307.747619, 35.318893, 88.531921, -1, -1 );
|
AddStaticVehicle( 489, -1987.468261, 307.747619, 35.318893, 88.531921, -1, -1 );
|
||||||
|
@ -2829,10 +2829,10 @@ public OnPlayerTakePlayerDamage( playerid, issuerid, &Float: amount, weaponid, b
|
|||||||
|
|
||||||
// Passive mode enabled for player?
|
// Passive mode enabled for player?
|
||||||
if ( IsPlayerPassive( issuerid ) ) {
|
if ( IsPlayerPassive( issuerid ) ) {
|
||||||
/*if ( p_PassiveModeExpireTimer[ issuerid ] == -1 ) {
|
if ( p_PassiveModeExpireTimer[ issuerid ] == -1 ) {
|
||||||
p_PassiveModeExpireTimer[ issuerid ] = PassiveMode_Reset( issuerid, 4 ); // it will just set it to anything but -1 for now
|
p_PassiveModeExpireTimer[ issuerid ] = PassiveMode_Reset( issuerid, 4 ); // it will just set it to anything but -1 for now
|
||||||
}*/
|
}
|
||||||
return ShowPlayerHelpDialog( issuerid, 2000, "~r~You cannot deathmatch with /passive enabled." ), 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Passive mode enabled for damaged id?
|
// Passive mode enabled for damaged id?
|
||||||
@ -3427,6 +3427,14 @@ public OnPlayerText( playerid, text[ ] )
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
SendClientMessageToCops( -1, ""COL_BLUE"<Police Radio> %s(%d):"COL_WHITE" %s", ReturnPlayerName( playerid ), playerid, szBigString[ 1 ] );
|
SendClientMessageToCops( -1, ""COL_BLUE"<Police Radio> %s(%d):"COL_WHITE" %s", ReturnPlayerName( playerid ), playerid, szBigString[ 1 ] );
|
||||||
|
|
||||||
|
foreach(new i : Player)
|
||||||
|
{
|
||||||
|
if ( ( p_AdminLevel[ i ] >= 5 || IsPlayerUnderCover( i ) ) && p_ToggleCopChat{ i } == true )
|
||||||
|
{
|
||||||
|
SendClientMessageFormatted( i, -1, ""COL_BLUE"<Police Radio> %s(%d):"COL_GREY" %s", ReturnPlayerName( playerid ), playerid, szBigString[ 1 ] );
|
||||||
|
}
|
||||||
|
}
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -7668,7 +7676,6 @@ CMD:c4( playerid, params[ ] )
|
|||||||
if ( IsPlayerTied( playerid ) ) return SendError( playerid, "You cannot use this command since you're tied." );
|
if ( IsPlayerTied( playerid ) ) return SendError( playerid, "You cannot use this command since you're tied." );
|
||||||
if ( IsPlayerKidnapped( playerid ) ) return SendError( playerid, "You cannot use this command since you're kidnapped." );
|
if ( IsPlayerKidnapped( playerid ) ) return SendError( playerid, "You cannot use this command since you're kidnapped." );
|
||||||
if ( IsPlayerInCasino( playerid ) ) return SendError( playerid, "You cannot use this command since you're in a casino." );
|
if ( IsPlayerInCasino( playerid ) ) return SendError( playerid, "You cannot use this command since you're in a casino." );
|
||||||
if ( IsPlayerPassive( playerid ) ) return SendError( playerid, "You cannot use this command as an innocent player in passive mode." );
|
|
||||||
if ( IsPlayerInPaintBall( playerid ) || IsPlayerDueling( playerid ) ) return SendError( playerid, "You cannot use this command since you're in an arena." );
|
if ( IsPlayerInPaintBall( playerid ) || IsPlayerDueling( playerid ) ) return SendError( playerid, "You cannot use this command since you're in an arena." );
|
||||||
if ( p_C4Amount[ playerid ] < 1 ) return SendError( playerid, "You don't have any C4's" );
|
if ( p_C4Amount[ playerid ] < 1 ) return SendError( playerid, "You don't have any C4's" );
|
||||||
|
|
||||||
@ -10509,11 +10516,6 @@ public OnDialogResponse( playerid, dialogid, response, listitem, inputtext[ ] )
|
|||||||
}
|
}
|
||||||
|
|
||||||
TogglePlayerControllable( playerid, 1 );
|
TogglePlayerControllable( playerid, 1 );
|
||||||
|
|
||||||
if ( ! p_JobSet{ playerid } ) {
|
|
||||||
ShowPlayerDialog( playerid, DIALOG_PASSIVE_MODE, DIALOG_STYLE_LIST, "{FFFFFF}What is your type of style?", "{555555}Choose Below Below:\nI Like Roleplaying\nI Like Deathmatching", "Select", "" );
|
|
||||||
}
|
|
||||||
|
|
||||||
p_JobSet{ playerid } = true;
|
p_JobSet{ playerid } = true;
|
||||||
|
|
||||||
//if ( !p_CitySet{ playerid } )
|
//if ( !p_CitySet{ playerid } )
|
||||||
@ -10526,19 +10528,6 @@ public OnDialogResponse( playerid, dialogid, response, listitem, inputtext[ ] )
|
|||||||
TogglePlayerControllable( playerid, 0 );
|
TogglePlayerControllable( playerid, 0 );
|
||||||
ShowPlayerDialog( playerid, DIALOG_JOB, DIALOG_STYLE_LIST, "{FFFFFF}Job Selection", "Rapist\nKidnapper\nTerrorist\nHitman\nProstitute\nWeapon Dealer\nDrug Dealer\nDirty Mechanic\nBurglar", "Select", "" );
|
ShowPlayerDialog( playerid, DIALOG_JOB, DIALOG_STYLE_LIST, "{FFFFFF}Job Selection", "Rapist\nKidnapper\nTerrorist\nHitman\nProstitute\nWeapon Dealer\nDrug Dealer\nDirty Mechanic\nBurglar", "Select", "" );
|
||||||
}
|
}
|
||||||
}
|
|
||||||
if ( dialogid == DIALOG_PASSIVE_MODE )
|
|
||||||
{
|
|
||||||
if ( ! response || ! listitem ) {
|
|
||||||
ShowPlayerDialog( playerid, DIALOG_PASSIVE_MODE, DIALOG_STYLE_LIST, "{FFFFFF}What is your type of style?", "{555555}Choose Below Below:\nI Like Roleplaying\nI Like Deathmatching", "Select", "" );
|
|
||||||
}
|
|
||||||
|
|
||||||
if ( listitem == 1 ) {
|
|
||||||
SendServerMessage( playerid, "Since you like roleplay, passive mode has been automatically enabled for you!" );
|
|
||||||
} else if ( listitem == 2 ) {
|
|
||||||
CallLocalFunction( "OnDialogResponse", "dddds", playerid, DIALOG_CP_MENU, 1, SETTING_PASSIVE_MODE + 1, "ignore" ); // cunning way
|
|
||||||
SendServerMessage( playerid, "Since you like deathmatch, passive mode has been automatically enabled for you!" );
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
if ( dialogid == DIALOG_BOMB_SHOP )
|
if ( dialogid == DIALOG_BOMB_SHOP )
|
||||||
{
|
{
|
||||||
@ -17933,12 +17922,8 @@ stock DisablePlayerSpawnProtection( playerid )
|
|||||||
|
|
||||||
stock SetPlayerPassiveMode( playerid )
|
stock SetPlayerPassiveMode( playerid )
|
||||||
{
|
{
|
||||||
// disable passive mode if it is enabled
|
|
||||||
if ( IsPlayerSettingToggled( playerid, SETTING_PASSIVE_MODE ) )
|
if ( IsPlayerSettingToggled( playerid, SETTING_PASSIVE_MODE ) )
|
||||||
{
|
|
||||||
ResetPlayerPassiveMode( playerid, .passive_disabled = true );
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
|
||||||
|
|
||||||
// reset any labels etc
|
// reset any labels etc
|
||||||
ResetPlayerPassiveMode( playerid );
|
ResetPlayerPassiveMode( playerid );
|
||||||
@ -17953,21 +17938,21 @@ stock SetPlayerPassiveMode( playerid )
|
|||||||
|
|
||||||
stock IsPlayerPassive( playerid )
|
stock IsPlayerPassive( playerid )
|
||||||
{
|
{
|
||||||
return ! p_WantedLevel[ playerid ] && p_Class[ playerid ] != CLASS_POLICE && ! p_PassiveModeDisabled{ playerid };
|
return ! IsPlayerSettingToggled( playerid, SETTING_PASSIVE_MODE ) && ! p_WantedLevel[ playerid ] && p_Class[ playerid ] != CLASS_POLICE && ! p_PassiveModeDisabled{ playerid };
|
||||||
}
|
}
|
||||||
|
|
||||||
stock ResetPlayerPassiveMode( playerid, bool: passive_disabled = false )
|
stock ResetPlayerPassiveMode( playerid, bool: passive_disabled = false )
|
||||||
{
|
{
|
||||||
DestroyDynamic3DTextLabel( p_PassiveModeLabel[ playerid ] );
|
DestroyDynamic3DTextLabel( p_PassiveModeLabel[ playerid ] );
|
||||||
//KillTimer( p_PassiveModeExpireTimer[ playerid ] );
|
KillTimer( p_PassiveModeExpireTimer[ playerid ] );
|
||||||
p_PassiveModeLabel[ playerid ] = Text3D: INVALID_3DTEXT_ID;
|
p_PassiveModeLabel[ playerid ] = Text3D: INVALID_3DTEXT_ID;
|
||||||
//p_PassiveModeExpireTimer[ playerid ] = -1;
|
p_PassiveModeExpireTimer[ playerid ] = -1;
|
||||||
p_PassiveModeDisabled{ playerid } = passive_disabled;
|
p_PassiveModeDisabled{ playerid } = passive_disabled;
|
||||||
TextDrawHideForPlayer( playerid, g_PassiveModeTD );
|
TextDrawHideForPlayer( playerid, g_PassiveModeTD );
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
/*function PassiveMode_Reset( playerid, time_left )
|
function PassiveMode_Reset( playerid, time_left )
|
||||||
{
|
{
|
||||||
// if you happen to die then have a shot synced ... just reset normally
|
// if you happen to die then have a shot synced ... just reset normally
|
||||||
if ( GetPlayerState( playerid ) == PLAYER_STATE_WASTED ) {
|
if ( GetPlayerState( playerid ) == PLAYER_STATE_WASTED ) {
|
||||||
@ -17986,7 +17971,7 @@ stock ResetPlayerPassiveMode( playerid, bool: passive_disabled = false )
|
|||||||
ShowPlayerHelpDialog( playerid, 1500, "Passive mode disabled in ~r~%d seconds.", time_left );
|
ShowPlayerHelpDialog( playerid, 1500, "Passive mode disabled in ~r~%d seconds.", time_left );
|
||||||
}
|
}
|
||||||
return 1;
|
return 1;
|
||||||
}*/
|
}
|
||||||
|
|
||||||
stock SendClientMessageToCops( colour, format[ ], va_args<> ) // Conversion to foreach 14 stuffed the define, not sure how...
|
stock SendClientMessageToCops( colour, format[ ], va_args<> ) // Conversion to foreach 14 stuffed the define, not sure how...
|
||||||
{
|
{
|
||||||
|
@ -1,20 +1,12 @@
|
|||||||
(+) Newly registered players will be asked if they prefer DM or RP - if they like RP, passive mode is on.
|
|
||||||
(+) Added confirmation dialog before selling a home / business / vehicle components.
|
(+) Added confirmation dialog before selling a home / business / vehicle components.
|
||||||
(+) Pilot and train minijobs are now saved to the database (and in /highscores).
|
(+) Pilot and train minijobs are now saved to the database (and in /highscores).
|
||||||
(+) Adds some strippers in the LV brothel (for fun).
|
(+) Adds some strippers in the LV brothel (for fun).
|
||||||
(+) Adds Hide From Minimap perk (costs $25,000) ... hides you for 1 minute.
|
(+) Adds Hide From Minimap perk (costs $25,000) ... hides you for 1 minute.
|
||||||
(+) Fire tracker is now /fires ... and it shows the fires on the map as red blips.
|
(/) You can now set spikes in non-air and non-sea vehicles using your AIM key.
|
||||||
(+) New hitmarker system ... activate using /cp - Now shows taken/given damage!
|
|
||||||
(/) Passive mode now completely disables deathmatch.
|
|
||||||
(/) You can now set spikes in non-air and non-sea vehicles using your CAPSLOCK key.
|
|
||||||
(/) Car jackers now need to wait only 1 min before exporting another vehicle (before 2 min).
|
(/) Car jackers now need to wait only 1 min before exporting another vehicle (before 2 min).
|
||||||
(/) Players with level 100 in a specific level are able to accrue more XP in the level.
|
(/) Players with level 100 in a specific level are able to accrue more XP in the level.
|
||||||
(/) Explosive rounds used on vehicles will have a more significant impact.
|
|
||||||
(/) Explosive rounds require the key N to activate.
|
|
||||||
(/) Rank is now XP based now (prior score based).
|
|
||||||
(*) Should be faster to place multiple drills using left alt.
|
(*) Should be faster to place multiple drills using left alt.
|
||||||
(*) Fixes death bug with players suiciding in a vehicle.
|
(*) Fixes death bug with players suiciding in a vehicle.
|
||||||
(*) Fixed Alcatraz map escaping issues.
|
(*) Fixed Alcatraz map escaping issues.
|
||||||
(*) Addressed issue with being unable to rob ChuffSec.
|
(*) Addressed issue with being unable to rob ChuffSec.
|
||||||
(*) Fixed issue with business exports being randomly canceled.
|
|
||||||
(-) Removed a counter in cluckin' bell for ease of access to the safe.
|
(-) Removed a counter in cluckin' bell for ease of access to the safe.
|
Loading…
Reference in New Issue
Block a user