modulize spike strips ... left alt to deploy spike strip

This commit is contained in:
Lorenc Pekaj 2018-09-30 03:37:42 +10:00
parent a1960abe96
commit 487cecf314
3 changed files with 219 additions and 178 deletions

View File

@ -26,6 +26,7 @@
#include "irresistible\cnr\features\chuffsec.pwn" #include "irresistible\cnr\features\chuffsec.pwn"
#include "irresistible\cnr\features\gps.pwn" #include "irresistible\cnr\features\gps.pwn"
#include "irresistible\cnr\features\animations.pwn" #include "irresistible\cnr\features\animations.pwn"
#include "irresistible\cnr\features\spikestrips.pwn"
// #include "irresistible\cnr\features\pilot.pwn" // #include "irresistible\cnr\features\pilot.pwn"
// #include "irresistible\cnr\features\fishing.pwn" // #include "irresistible\cnr\features\fishing.pwn"
// #include "irresistible\cnr\features\vote.pwn" // #include "irresistible\cnr\features\vote.pwn"

View File

@ -0,0 +1,217 @@
/*
* Irresistible Gaming (c) 2018
* Developed by Lorenc Pekaj
* Module: cnr\features\spikestrips.pwn
* Purpose: spike strip system for police
*/
/* ** Includes ** */
#include < YSI\y_hooks >
/* ** Definitions ** */
#define MAX_SPIKESTRIPS ( 32 )
/* ** Variables ** */
enum E_SPIKE_STRIP_DATA
{
E_OBJECT_ID, Text3D: E_LABEL, E_SPHERE,
E_CREATOR,
Float: E_X, Float: E_Y, Float: E_Z
};
static stock
g_spikestripData [ MAX_SPIKESTRIPS ] [ E_SPIKE_STRIP_DATA ],
Iterator: spikestrips < MAX_SPIKESTRIPS >
;
/* ** Hooks ** */
hook OnPlayerKeyStateChange( playerid, newkeys, oldkeys ) {
if ( PRESSED( KEY_FIRE ) && IsPlayerInAnyVehicle( playerid ) && GetPlayerClass( playerid ) == CLASS_POLICE && p_inFBI{ playerid } ) {
return cmd_setspike( playerid, "" ), 1;
}
return 1;
}
hook OnPlayerDisconnect( playerid, reason ) {
ClearPlayerSpikeStrips( playerid, .distance_check = false );
return 1;
}
hook OnPlayerUpdateEx( playerid ) {
if ( GetPlayerClass( playerid ) == CLASS_POLICE ) {
ClearPlayerSpikeStrips( playerid );
}
return 1;
}
hook OnPlayerEnterDynArea( playerid, areaid ) {
new vehicleid = GetPlayerVehicleID( playerid );
new player_state = GetPlayerState( playerid );
if ( player_state == PLAYER_STATE_DRIVER && vehicleid != 0 )
{
foreach ( new i : spikestrips ) if ( g_spikestripData[ i ] [ E_SPHERE ] == areaid ) {
GetVehicleDamageStatus( vehicleid, panels, doors, lights, tires );
UpdateVehicleDamageStatus( vehicleid, panels, doors, lights, ( tires = encode_tires( 1, 1, 1, 1 ) ) );
destroySpikeStrip( i );
break;
}
}
return 1;
}
/* ** Commands ** */
CMD:dssall( playerid, params[ ] )
{
new removed = 0;
new is_admin = GetPlayerAdminLevel( playerid );
if ( ! p_inFBI{ playerid } && ! is_admin )
return SendError( playerid, "You are not in the FBI." );
foreach ( new handle : spikestrips )
{
if ( ! is_admin && g_spikestripData[ handle ] [ E_CREATOR ] != playerid )
continue;
new
cur = handle;
destroySpikeStrip( handle, .remove_iter = false );
Iter_SafeRemove( spikestrips, cur, handle );
removed ++;
}
if ( removed ) {
return SendServerMessage( playerid, "You have removed all your spike strips." );
} else {
return SendError( playerid, "There are no spike strips to remove by you." );
}
}
CMD:dss( playerid, params[ ] )
{
new
rbID
;
if ( !p_inFBI{ playerid } ) return SendError( playerid, "You are not in the FBI." );
else if ( sscanf( params, "d", rbID ) ) return SendUsage( playerid, "/dss [SPIKE_STRIP_ID]" );
else if ( rbID < 0 || rbID >= MAX_SPIKESTRIPS ) return SendError( playerid, "Invalid Spike Strip ID." );
else if ( !Iter_Contains( spikestrips, rbID ) ) return SendError( playerid, "Invalid Spike Strip ID." );
else if ( g_spikestripData[ rbID ] [ E_CREATOR ] != playerid ) return SendError( playerid, "You have not created this spike strip." );
else
{
destroySpikeStrip( rbID );
SendServerMessage( playerid, "You have succesfully destroyed a spike strip." );
}
return 1;
}
CMD:spike( playerid, params[ ] ) return cmd_setspike( playerid, params );
CMD:setspike( playerid, params[ ] )
{
if ( GetPlayerInterior( playerid ) != 0 || GetPlayerVirtualWorld( playerid ) != 0 ) return SendError( playerid, "You cannot place spike strips inside buildings." );
else if ( IsPlayerKidnapped( playerid ) ) return SendError( playerid, "You are kidnapped, you cannot do this." );
else if ( IsPlayerJailed( playerid ) ) return SendError( playerid, "You are jailed, you cannot do this." );
else if ( IsPlayerTied( playerid ) ) return SendError( playerid, "You are tied, you cannot do this." );
else if ( IsPlayerInWater( playerid ) ) return SendError( playerid, "You cannot use this command since you're in water." );
else if ( !p_inFBI{ playerid } ) return SendError( playerid, "You are not in the FBI." );
else
{
new
Float: X, Float: Y, Float: Z, Float: Angle;
if ( !IsPlayerInAnyVehicle( playerid ) )
{
GetXYInFrontOfPlayer( playerid, X, Y, Z, 2.0 );
GetPlayerFacingAngle( playerid, Angle );
}
else
{
new
iVehicle = GetPlayerVehicleID( playerid ),
iModel = GetVehicleModel( iVehicle )
;
if ( IsBoatVehicle( iModel ) || IsAirVehicle( iModel ) )
return SendError( playerid, "You cannot place a spike strip in this type of vehicle." );
GetVehiclePos( iVehicle, X, Y, Z );
GetVehicleZAngle( iVehicle, Angle );
X -= ( 4.1 * floatsin( -Angle, degrees ) );
Y -= ( 4.1 * floatcos( -Angle, degrees ) );
}
if ( CreateSpikeStrip( playerid, X, Y, Z + 0.15, Angle ) != -1 )
SendServerMessage( playerid, "You have succesfully created a spike strip." );
else
SendError( playerid, "Failed to place a spike strip due to a unexpected error." );
}
return 1;
}
/* ** Functions ** */
stock CreateSpikeStrip( playerid, Float: X, Float: Y, Float: Z, Float: Angle )
{
new
bVehicle = IsPlayerInAnyVehicle( playerid ),
i = Iter_Free( spikestrips )
;
if ( i != ITER_NONE )
{
DestroyDynamicArea ( g_spikestripData[ i ] [ E_SPHERE ] );
DestroyDynamicObject ( g_spikestripData[ i ] [ E_OBJECT_ID ] );
DestroyDynamic3DTextLabel ( g_spikestripData[ i ] [ E_LABEL ] );
g_spikestripData[ i ] [ E_CREATOR ] = playerid;
g_spikestripData[ i ] [ E_X ] = X;
g_spikestripData[ i ] [ E_Y ] = Y;
g_spikestripData[ i ] [ E_Z ] = Z;
g_spikestripData[ i ] [ E_LABEL ] = CreateDynamic3DTextLabel( sprintf( "Spike Strip(%d)\n"COL_GREY"Placed by %s!", i, ReturnPlayerName( playerid ) ), COLOR_GOLD, X, Y, Z, 20.0 );
g_spikestripData[ i ] [ E_OBJECT_ID ] = CreateDynamicObject( 2899, X, Y, Z - ( bVehicle ? 0.6 : 0.9 ), 0, 0, Angle - 90.0);
g_spikestripData[ i ] [ E_SPHERE ] = CreateDynamicCircle( X, Y, 4.0 );
Streamer_Update( playerid );
Iter_Add( spikestrips, i );
}
return i;
}
stock destroySpikeStrip( i, bool: remove_iter = true )
{
if ( i == -1 )
return 0;
DestroyDynamicArea ( g_spikestripData[ i ] [ E_SPHERE ] );
DestroyDynamicObject ( g_spikestripData[ i ] [ E_OBJECT_ID ] );
DestroyDynamic3DTextLabel ( g_spikestripData[ i ] [ E_LABEL ] );
g_spikestripData[ i ] [ E_SPHERE ] = 0xFFFF;
g_spikestripData[ i ] [ E_OBJECT_ID ] = INVALID_OBJECT_ID;
g_spikestripData[ i ] [ E_LABEL ] = Text3D: 0xFFFF;
if ( remove_iter ) Iter_Remove( spikestrips, i );
return 1;
}
stock ClearPlayerSpikeStrips( playerid, bool: distance_check = true )
{
foreach ( new handle : spikestrips ) if ( g_spikestripData[ handle ] [ E_CREATOR ] == playerid )
{
if ( distance_check && GetPlayerDistanceFromPoint( playerid, g_spikestripData[ handle ] [ E_X ], g_spikestripData[ handle ] [ E_Y ], g_spikestripData[ handle ] [ E_Z ] ) < 75.0 ) {
continue;
}
new
cur = handle;
destroySpikeStrip( handle, .remove_iter = false );
Iter_SafeRemove( spikestrips, cur, handle );
}
return 1;
}

View File

@ -16,7 +16,7 @@
#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
@ -269,22 +269,6 @@ new
} }
; ;
/* ** Spike Strips ** */
#define MAX_SPIKESTRIPS ( 32 )
enum E_SPIKE_STRIP_DATA
{
E_OBJECT_ID, Text3D: E_LABEL, E_SPHERE,
E_CREATOR,
Float: E_X, Float: E_Y, Float: E_Z
};
new
g_spikestripData [ MAX_SPIKESTRIPS ] [ E_SPIKE_STRIP_DATA ],
Iterator: spikestrips < MAX_SPIKESTRIPS >
;
/* ** ATM System ** */ /* ** ATM System ** */
#if defined MAX_FACILITIES #if defined MAX_FACILITIES
#define MAX_ATMS ( 48 + MAX_FACILITIES ) #define MAX_ATMS ( 48 + MAX_FACILITIES )
@ -8811,100 +8795,6 @@ CMD:bj( playerid, params[ ] )
return 1; return 1;
} }
CMD:dssall( playerid, params[ ] )
{
new removed = 0;
new is_admin = p_AdminLevel[ playerid ];
if ( ! p_inFBI{ playerid } && ! is_admin )
return SendError( playerid, "You are not in the FBI." );
foreach ( new handle : spikestrips )
{
if ( ! is_admin && g_spikestripData[ handle ] [ E_CREATOR ] != playerid )
continue;
new
cur = handle;
destroySpikeStrip( handle, .remove_iter = false );
Iter_SafeRemove( spikestrips, cur, handle );
removed ++;
}
if ( removed ) {
return SendServerMessage( playerid, "You have removed all your spike strips." );
} else {
return SendError( playerid, "There are no spike strips to remove by you." );
}
}
CMD:dss( playerid, params[ ] )
{
new
rbID
;
if ( !p_inFBI{ playerid } ) return SendError( playerid, "You are not in the FBI." );
else if ( sscanf( params, "d", rbID ) ) return SendUsage( playerid, "/dss [SPIKE_STRIP_ID]" );
else if ( rbID < 0 || rbID >= MAX_SPIKESTRIPS ) return SendError( playerid, "Invalid Spike Strip ID." );
else if ( !Iter_Contains( spikestrips, rbID ) ) return SendError( playerid, "Invalid Spike Strip ID." );
else if ( g_spikestripData[ rbID ] [ E_CREATOR ] != playerid ) return SendError( playerid, "You have not created this spike strip." );
else
{
destroySpikeStrip( rbID );
SendServerMessage( playerid, "You have succesfully destroyed a spike strip." );
}
return 1;
}
CMD:spike( playerid, params[ ] ) return cmd_setspike( playerid, params );
CMD:setspike( playerid, params[ ] )
{
if ( GetPlayerInterior( playerid ) != 0 || GetPlayerVirtualWorld( playerid ) != 0 ) return SendError( playerid, "You cannot use this command inside buildings." );
else if ( GetPlayerScore( playerid ) < 250 ) return SendError( playerid, "You need at least 250 score to use this feature." );
else if ( IsPlayerKidnapped( playerid ) ) return SendError( playerid, "You are kidnapped, you cannot do this." );
else if ( IsPlayerJailed( playerid ) ) return SendError( playerid, "You are jailed, you cannot do this." );
else if ( IsPlayerTied( playerid ) ) return SendError( playerid, "You are tied, you cannot do this." );
else if ( IsPlayerInWater( playerid ) ) return SendError( playerid, "You cannot use this command since you're in water." );
else if ( !p_inFBI{ playerid } ) return SendError( playerid, "You are not in the FBI." );
//else if ( IsPlayerInAnyVehicle( playerid ) ) return SendError( playerid, "You cannot use this feature while in a vehicle." );
else
{
new
Float: X, Float: Y, Float: Z, Float: Angle;
if ( !IsPlayerInAnyVehicle( playerid ) )
{
GetXYInFrontOfPlayer( playerid, X, Y, Z, 2.0 );
GetPlayerFacingAngle( playerid, Angle );
}
else
{
new
iVehicle = GetPlayerVehicleID( playerid ),
iModel = GetVehicleModel( iVehicle )
;
if ( IsBoatVehicle( iModel ) || IsAirVehicle( iModel ) )
return SendError( playerid, "You cannot place a spike strip in this type of vehicle." );
GetVehiclePos( iVehicle, X, Y, Z );
GetVehicleZAngle( iVehicle, Angle );
X -= ( 4.1 * floatsin( -Angle, degrees ) );
Y -= ( 4.1 * floatcos( -Angle, degrees ) );
}
if ( CreateSpikeStrip( playerid, X, Y, Z, Angle ) != -1 )
SendServerMessage( playerid, "You have succesfully created a spike strip." );
else
SendError( playerid, "Failed to place a spike strip due to a unexpected error." );
}
return 1;
}
CMD:drball( playerid, params[ ] ) CMD:drball( playerid, params[ ] )
{ {
new removed = 0; new removed = 0;
@ -11796,14 +11686,6 @@ public OnPlayerEnterDynamicArea( playerid, areaid )
// spikes // spikes
if ( iState == PLAYER_STATE_DRIVER && vehicleid != 0 ) if ( iState == PLAYER_STATE_DRIVER && vehicleid != 0 )
{ {
// spike strip system
foreach(new i : spikestrips) if ( g_spikestripData[ i ] [ E_SPHERE ] == areaid ) {
GetVehicleDamageStatus( vehicleid, panels, doors, lights, tires );
UpdateVehicleDamageStatus( vehicleid, panels, doors, lights, ( tires = encode_tires( 1, 1, 1, 1 ) ) );
destroySpikeStrip( i );
break;
}
// alert player if hes near the drugs // alert player if hes near the drugs
if ( g_isBusinessVehicle[ vehicleid ] != -1 && Iter_Contains( business, g_isBusinessVehicle[ vehicleid ] )) if ( g_isBusinessVehicle[ vehicleid ] != -1 && Iter_Contains( business, g_isBusinessVehicle[ vehicleid ] ))
{ {
@ -12536,7 +12418,6 @@ public OnPlayerArrested( playerid, victimid, totalarrests, totalpeople )
return 1; return 1;
} }
public OnPlayerKeyStateChange( playerid, newkeys, oldkeys ) public OnPlayerKeyStateChange( playerid, newkeys, oldkeys )
{ {
static static
@ -18836,66 +18717,8 @@ stock SetObjectFacePoint(iObjectID, Float: fX, Float: fY, Float: fOffset, bool:
} }
} }
stock destroySpikeStrip( i, bool: remove_iter = true )
{
if ( i == -1 )
return 0;
DestroyDynamicArea ( g_spikestripData[ i ] [ E_SPHERE ] );
DestroyDynamicObject ( g_spikestripData[ i ] [ E_OBJECT_ID ] );
DestroyDynamic3DTextLabel ( g_spikestripData[ i ] [ E_LABEL ] );
g_spikestripData[ i ] [ E_SPHERE ] = 0xFFFF;
g_spikestripData[ i ] [ E_OBJECT_ID ] = INVALID_OBJECT_ID;
g_spikestripData[ i ] [ E_LABEL ] = Text3D: 0xFFFF;
if ( remove_iter ) Iter_Remove( spikestrips, i );
return 1;
}
stock CreateSpikeStrip( playerid, Float: X, Float: Y, Float: Z, Float: Angle )
{
new
bVehicle = IsPlayerInAnyVehicle( playerid ),
i = Iter_Free( spikestrips )
;
if ( i != ITER_NONE )
{
DestroyDynamicArea ( g_spikestripData[ i ] [ E_SPHERE ] );
DestroyDynamicObject ( g_spikestripData[ i ] [ E_OBJECT_ID ] );
DestroyDynamic3DTextLabel ( g_spikestripData[ i ] [ E_LABEL ] );
g_spikestripData[ i ] [ E_CREATOR ] = playerid;
g_spikestripData[ i ] [ E_X ] = X;
g_spikestripData[ i ] [ E_Y ] = Y;
g_spikestripData[ i ] [ E_Z ] = Z;
g_spikestripData[ i ] [ E_LABEL ] = CreateDynamic3DTextLabel( sprintf( "Spike Strip(%d)\n"COL_GREY"Placed by %s!", i, ReturnPlayerName( playerid ) ), COLOR_GOLD, X, Y, Z, 20.0 );
g_spikestripData[ i ] [ E_OBJECT_ID ] = CreateDynamicObject( 2899, X, Y, Z - ( bVehicle ? 0.6 : 0.9 ), 0, 0, Angle - 90.0);
g_spikestripData[ i ] [ E_SPHERE ] = CreateDynamicCircle( X, Y, 4.0 );
Streamer_Update( playerid );
Iter_Add( spikestrips, i );
}
return i;
}
stock ClearPlayerRoadblocks( playerid, bool: distance_check = true ) stock ClearPlayerRoadblocks( playerid, bool: distance_check = true )
{ {
// remove spike strips
foreach ( new handle : spikestrips ) if ( g_spikestripData[ handle ] [ E_CREATOR ] == playerid ) {
if ( distance_check && GetPlayerDistanceFromPoint( playerid, g_spikestripData[ handle ] [ E_X ], g_spikestripData[ handle ] [ E_Y ], g_spikestripData[ handle ] [ E_Z ] ) < 75.0 ) {
continue;
}
new
cur = handle;
destroySpikeStrip( handle, .remove_iter = false );
Iter_SafeRemove( spikestrips, cur, handle );
}
// remove roadblocks // remove roadblocks
foreach ( new handle : roadblocks ) if ( g_roadblockData[ handle ] [ E_CREATOR ] == playerid ) { foreach ( new handle : roadblocks ) if ( g_roadblockData[ handle ] [ E_CREATOR ] == playerid ) {
if ( distance_check && GetPlayerDistanceFromPoint( playerid, g_roadblockData[ handle ] [ E_X ], g_roadblockData[ handle ] [ E_Y ], g_roadblockData[ handle ] [ E_Z ] ) < 100.0 ) { if ( distance_check && GetPlayerDistanceFromPoint( playerid, g_roadblockData[ handle ] [ E_X ], g_roadblockData[ handle ] [ E_Y ], g_roadblockData[ handle ] [ E_Z ] ) < 100.0 ) {