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

start with just police, robbery, dm levels

Browse Source
This commit is contained in:
Lorenc Pekaj 2018-09-29 04:44:18 +10:00
parent 0c22793fb5
commit f81d656161
5 changed files with 115 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gamemodes/irresistible/cnr/commands/admin/admin_rcon.pwn
View File

@ -420,14 +420,17 @@ CMD:givexp( playerid, params [ ] )
{ {
new new
pID, pID,
level,
xp xp
; ;
if ( !IsPlayerAdmin( playerid ) || !IsPlayerLorenc( playerid ) ) return 0; if ( !IsPlayerAdmin( playerid ) || !IsPlayerLorenc( playerid ) ) return 0;
else if ( sscanf( params, "ud", pID, xp ) ) SendUsage( playerid, "/givexp [PLAYER_ID] [XP_AMOUNT]" ); else if ( sscanf( params, "udd", pID, level, xp ) ) SendUsage( playerid, "/givexp [PLAYER_ID] [XP_AMOUNT]" );
else if ( !IsPlayerConnected( pID ) ) SendError( playerid, "Invalid Player ID." ); else if ( !IsPlayerConnected( pID ) ) SendError( playerid, "Invalid Player ID." );
else else
{ {
GivePlayerXP( pID, xp ); if ( ! GivePlayerExperience( pID, E_LEVELS: level, xp, .with_dilation = false ) ) {
return SendError( playerid, "You have specified an invalid level." );
}
AddAdminLogLineFormatted( "%s(%d) has given %s(%d) %d XP", ReturnPlayerName( playerid ), playerid, ReturnPlayerName( pID ), pID, xp ); AddAdminLogLineFormatted( "%s(%d) has given %s(%d) %d XP", ReturnPlayerName( playerid ), playerid, ReturnPlayerName( pID ), pID, xp );
SendClientMessageFormatted( pID, -1, ""COL_PINK"[ADMIN]{FFFFFF} %s(%d) has given you %d XP.", ReturnPlayerName( playerid ), playerid, xp ); SendClientMessageFormatted( pID, -1, ""COL_PINK"[ADMIN]{FFFFFF} %s(%d) has given you %d XP.", ReturnPlayerName( playerid ), playerid, xp );
SendClientMessageFormatted( playerid, -1, ""COL_PINK"[ADMIN]{FFFFFF} You've given %s(%d) %d XP.", ReturnPlayerName( pID ), pID, xp ); SendClientMessageFormatted( playerid, -1, ""COL_PINK"[ADMIN]{FFFFFF} You've given %s(%d) %d XP.", ReturnPlayerName( pID ), pID, xp );

61
gamemodes/irresistible/cnr/experience.pwn
View File

@ -16,15 +16,19 @@
/* ** Constants ** */ /* ** Constants ** */
enum E_LEVELS { enum E_LEVELS {
E_LAW_ENFORCEMENT, E_POLICE,
E_DEATHMATCH, E_DEATHMATCH,
E_ROBBERY, E_ROBBERY,
E_FIREMAN,
/*E_FIREMAN,
E_PARAMEDIC,
E_HITMAN, E_HITMAN,
E_BURGLAR, E_BURGLAR,
E_TERRORIST, E_TERRORIST,
E_CAR_JACKER, E_CAR_JACKER,
E_DRUG_PRODUCTION E_DRUG_PRODUCTION,
E_MINING,
E_TRANSPORT*/
}; };
enum E_LEVEL_DATA { enum E_LEVEL_DATA {
@ -35,15 +39,18 @@ static const
g_levelData[ ] [ E_LEVEL_DATA ] = g_levelData[ ] [ E_LEVEL_DATA ] =
{ {
// Level Name Level 100 Req. XP Dilation (just to confuse user) // Level Name Level 100 Req. XP Dilation (just to confuse user)
{ "Law Enforcement", 10000.0, 9.0 }, // 10K arrests { "Police", 10000.0, 20.0 }, // 10K arrests
{ "Robbery", 50000.0, 6.0 }, // 100K robberies { "Robbery", 50000.0, 15.0 }, // 100K robberies
{ "Deathmatch", 100000.0, 3.0 }, // 100K kills { "Deathmatch", 100000.0, 10.0 } // 100K kills
/*
{ "Fireman", 10000.0, 9.0 }, // 10k fires { "Fireman", 10000.0, 9.0 }, // 10k fires
{ "Hitman", 1500.0, 4.5 }, // 1.5k contracts { "Hitman", 1500.0, 4.5 }, // 1.5k contracts
{ "Burglar", 2000.0, 7.5 }, // 2K burglaries { "Burglar", 2000.0, 7.5 }, // 2K burglaries
{ "Terrorist", 15000.0, 6.0 }, // 15k blown entities { "Terrorist", 15000.0, 6.0 }, // 15k blown entities
{ "Car Jacker", 10000.0, 6.0 }, // 10k cars jacked { "Car Jacker", 10000.0, 6.0 }, // 10k cars jacked
{ "Drug Production", 10000.0, 6.0 } // 10k exports drug related { "Drug Production", 10000.0, 6.0 }, // 10k exports drug related
{ "Mining", 1500.0, 3.0 } // 1,500 mining ores
*/
} }
; ;
@ -99,19 +106,21 @@ CMD:level( playerid, params[ ] )
new new
player_total_lvl = 0; player_total_lvl = 0;
szLargeString = ""COL_GREY"Skill\t"COL_GREY"Current Level\t"COL_GREY"% To Next Level\n"; szLargeString = ""COL_GREY"Skill\t"COL_GREY"Current Level\t"COL_GREY"XP Till Next Level\n";
for ( new level_id; level_id < sizeof( g_levelData ); level_id ++ ) for ( new level_id; level_id < sizeof( g_levelData ); level_id ++ )
{ {
new Float: current_rank = GetPlayerLevel( playerid, E_LEVELS: level_id ); new Float: current_rank = GetPlayerLevel( playerid, E_LEVELS: level_id );
new Float: progress_to_next_level = floatfract( current_rank ) * 100.0; new Float: next_rank = floatround( current_rank, floatround_floor ) + 1.0;
new Float: next_rank_xp = ( g_levelData[ level_id ] [ E_MAX_UNITS ] * g_levelData[ level_id ] [ E_XP_DILATION ] ) / ( EXP_MAX_PLAYER_LEVEL * EXP_MAX_PLAYER_LEVEL ) * ( next_rank * next_rank );
player_total_lvl += floatround( current_rank, floatround_floor ); player_total_lvl += floatround( current_rank, floatround_floor );
format( szLargeString, sizeof( szLargeString ), "%s%s Level\t%0.0f / %0.0f\t%0.1f%\n", szLargeString, g_levelData[ level_id ] [ E_NAME ], current_rank, EXP_MAX_PLAYER_LEVEL, progress_to_next_level ); format( szLargeString, sizeof( szLargeString ), "%s%s Level\t%s%0.0f / %0.0f\t"COL_PURPLE"%0.0f XP\n", szLargeString, g_levelData[ level_id ] [ E_NAME ], current_rank >= 100.0 ? ( COL_GREEN ) : ( COL_GREY ), current_rank, EXP_MAX_PLAYER_LEVEL, next_rank_xp - g_playerExperience[ playerid ] [ E_LEVELS: level_id ] );
} }
return ShowPlayerDialog( playerid, DIALOG_NULL, DIALOG_STYLE_TABLIST_HEADERS, sprintf( "{FFFFFF}Player Level - Total Level %d", player_total_lvl ), szLargeString, "Close", "" ); return ShowPlayerDialog( playerid, DIALOG_NULL, DIALOG_STYLE_TABLIST_HEADERS, sprintf( "{FFFFFF}Player Level - Total Level %d", player_total_lvl ), szLargeString, "Close", "" );
} }
CMD:givelevel( playerid, params[ ] ) { CMD:givelevel( playerid, params[ ] ) {
new rank, Float: xp; new rank, Float: xp;
sscanf( params, "df", rank, xp ); sscanf( params, "df", rank, xp );
@ -142,13 +151,22 @@ thread Experience_OnLoad( playerid )
} }
/* ** Functions ** */ /* ** Functions ** */
stock GivePlayerExperience( playerid, E_LEVELS: level, Float: default_xp = 1.0 ) stock GivePlayerExperience( playerid, E_LEVELS: level, Float: default_xp = 1.0, bool: with_dilation = true )
{ {
if ( ! IsPlayerLoggedIn( playerid ) ) if ( ! IsPlayerLoggedIn( playerid ) || ! ( 0 <= _: level < sizeof( g_levelData ) ) )
return; return 0;
// dilation is there so people see +3 when they arrest ... could trigger dopamine levels instead of constantly +1 lol // dilation is there so people see +3 when they arrest ... could trigger dopamine levels instead of constantly +1 lol
new Float: xp_earned = ( default_xp * g_levelData[ _: level ] [ E_XP_DILATION ] ) * ( IsDoubleXP() ? 2.0 : 1.0 ); new Float: xp_earned = default_xp * ( IsDoubleXP( ) ? 2.0 : 1.0 ) * ( with_dilation ? ( g_levelData[ _: level ] [ E_XP_DILATION ] ) : 1.0 );
// when a player ranks up
new next_rank = floatround( GetPlayerLevel( playerid, level ), floatround_floor ) + 1;
new Float: next_rank_xp = ( g_levelData[ _: level ] [ E_MAX_UNITS ] * g_levelData[ _: level ] [ E_XP_DILATION ] ) / ( EXP_MAX_PLAYER_LEVEL * EXP_MAX_PLAYER_LEVEL ) * float( next_rank * next_rank );
if ( g_playerExperience[ playerid ] [ level ] + xp_earned >= next_rank_xp ) {
ShowPlayerHelpDialog( playerid, 10000, "~g~~h~Congratulations!~n~~n~~w~Your %s Level is now ~y~%d.", g_levelData[ _: level ] [ E_NAME ], next_rank );
if ( !IsPlayerUsingRadio( playerid ) ) PlayAudioStreamForPlayer( playerid, "http://files.sfcnr.com/game_sounds/levelup.mp3" );
}
// check if its over 100 anyway // check if its over 100 anyway
if ( ( g_playerExperience[ playerid ] [ level ] += xp_earned ) > g_levelData[ _: level ] [ E_MAX_UNITS ] * g_levelData[ _: level ] [ E_XP_DILATION ] ) { if ( ( g_playerExperience[ playerid ] [ level ] += xp_earned ) > g_levelData[ _: level ] [ E_MAX_UNITS ] * g_levelData[ _: level ] [ E_XP_DILATION ] ) {
@ -156,18 +174,17 @@ stock GivePlayerExperience( playerid, E_LEVELS: level, Float: default_xp = 1.0 )
} }
// alert user // alert user
PlayerTextDrawSetString( playerid, p_ExperienceAwardTD[ playerid ], sprintf( "+%0.0f", xp_earned ) ); PlayerTextDrawSetString( playerid, p_ExperienceAwardTD[ playerid ], sprintf( "+%0.0f XP", xp_earned ) );
PlayerTextDrawShow( playerid, p_ExperienceAwardTD[ playerid ] ); PlayerTextDrawShow( playerid, p_ExperienceAwardTD[ playerid ] );
SetTimerEx( "Experience_HideIncrementTD", 3500, false, "d", playerid ); SetTimerEx( "Experience_HideIncrementTD", 3500, false, "d", playerid );
// TODO: on level change
// save to database // save to database
mysql_format( mysql_format(
dbHandle, szBigString, sizeof( szBigString ), dbHandle, szBigString, sizeof( szBigString ),
"INSERT INTO `USER_LEVELS` (`USER_ID`,`LEVEL_ID`,`EXPERIENCE`) VALUES(%d,%d,%d) ON DUPLICATE KEY UPDATE `EXPERIENCE`=%d", "INSERT INTO `USER_LEVELS` (`USER_ID`,`LEVEL_ID`,`EXPERIENCE`) VALUES(%d,%d,%d) ON DUPLICATE KEY UPDATE `EXPERIENCE`=%d",
GetPlayerAccountID( playerid ), _: level, g_playerExperience[ playerid ] [ level ], g_playerExperience[ playerid ] [ level ] GetPlayerAccountID( playerid ), _: level, g_playerExperience[ playerid ] [ level ], g_playerExperience[ playerid ] [ level ]
); );
return 1;
} }
function Experience_HideIncrementTD( playerid ) { function Experience_HideIncrementTD( playerid ) {
@ -191,14 +208,16 @@ stock GetPlayerTotalLevel( playerid, &level = 0 ) {
FOREIGN KEY (USER_ID) REFERENCES USERS (ID) ON DELETE CASCADE FOREIGN KEY (USER_ID) REFERENCES USERS (ID) ON DELETE CASCADE
); );
INSERT INTO USER_LEVELS (USER_ID, LEVEL_ID, EXPERIENCE) (SELECT ID as USER_ID, 0 as LEVEL_ID, ARRESTS * 9.0 AS EXPERIENCE FROM USERS); INSERT INTO USER_LEVELS (USER_ID, LEVEL_ID, EXPERIENCE) (SELECT ID as USER_ID, 0 as LEVEL_ID, ARRESTS * 20.0 AS EXPERIENCE FROM USERS);
INSERT INTO USER_LEVELS (USER_ID, LEVEL_ID, EXPERIENCE) (SELECT ID as USER_ID, 1 as LEVEL_ID, ROBBERIES * 6.0 AS EXPERIENCE FROM USERS); INSERT INTO USER_LEVELS (USER_ID, LEVEL_ID, EXPERIENCE) (SELECT ID as USER_ID, 1 as LEVEL_ID, ROBBERIES * 15.0 AS EXPERIENCE FROM USERS);
INSERT INTO USER_LEVELS (USER_ID, LEVEL_ID, EXPERIENCE) (SELECT ID as USER_ID, 2 as LEVEL_ID, KILLS * 3.0 AS EXPERIENCE FROM USERS); INSERT INTO USER_LEVELS (USER_ID, LEVEL_ID, EXPERIENCE) (SELECT ID as USER_ID, 2 as LEVEL_ID, KILLS * 10.0 AS EXPERIENCE FROM USERS);
DELETE FROM USER_LEVELS WHERE EXPERIENCE = 0;
INSERT INTO USER_LEVELS (USER_ID, LEVEL_ID, EXPERIENCE) (SELECT ID as USER_ID, 3 as LEVEL_ID, FIRES * 9.0 AS EXPERIENCE FROM USERS); INSERT INTO USER_LEVELS (USER_ID, LEVEL_ID, EXPERIENCE) (SELECT ID as USER_ID, 3 as LEVEL_ID, FIRES * 9.0 AS EXPERIENCE FROM USERS);
INSERT INTO USER_LEVELS (USER_ID, LEVEL_ID, EXPERIENCE) (SELECT ID as USER_ID, 4 as LEVEL_ID, CONTRACTS * 4.5 AS EXPERIENCE FROM USERS); INSERT INTO USER_LEVELS (USER_ID, LEVEL_ID, EXPERIENCE) (SELECT ID as USER_ID, 4 as LEVEL_ID, CONTRACTS * 4.5 AS EXPERIENCE FROM USERS);
INSERT INTO USER_LEVELS (USER_ID, LEVEL_ID, EXPERIENCE) (SELECT ID as USER_ID, 5 as LEVEL_ID, BURGLARIES * 7.5 AS EXPERIENCE FROM USERS); INSERT INTO USER_LEVELS (USER_ID, LEVEL_ID, EXPERIENCE) (SELECT ID as USER_ID, 5 as LEVEL_ID, BURGLARIES * 7.5 AS EXPERIENCE FROM USERS);
INSERT INTO USER_LEVELS (USER_ID, LEVEL_ID, EXPERIENCE) (SELECT ID as USER_ID, 6 as LEVEL_ID, (BLEW_JAILS + BLEW_VAULT) * 6.0 AS EXPERIENCE FROM USERS); INSERT INTO USER_LEVELS (USER_ID, LEVEL_ID, EXPERIENCE) (SELECT ID as USER_ID, 6 as LEVEL_ID, (BLEW_JAILS + BLEW_VAULT) * 6.0 AS EXPERIENCE FROM USERS);
INSERT INTO USER_LEVELS (USER_ID, LEVEL_ID, EXPERIENCE) (SELECT ID as USER_ID, 7 as LEVEL_ID, VEHICLES_JACKED * 6.0 AS EXPERIENCE FROM USERS); INSERT INTO USER_LEVELS (USER_ID, LEVEL_ID, EXPERIENCE) (SELECT ID as USER_ID, 7 as LEVEL_ID, VEHICLES_JACKED * 6.0 AS EXPERIENCE FROM USERS);
INSERT INTO USER_LEVELS (USER_ID, LEVEL_ID, EXPERIENCE) (SELECT ID as USER_ID, 8 as LEVEL_ID, (METH_YIELDED + (TRUCKED*0.33)) * 6.0 AS EXPERIENCE FROM USERS); INSERT INTO USER_LEVELS (USER_ID, LEVEL_ID, EXPERIENCE) (SELECT ID as USER_ID, 8 as LEVEL_ID, (METH_YIELDED + (TRUCKED*0.33)) * 6.0 AS EXPERIENCE FROM USERS);
DELETE FROM USER_LEVELS WHERE EXPERIENCE = 0;
*/ */

8
gamemodes/irresistible/cnr/features/radio.pwn
View File

@ -13,9 +13,6 @@
#error "This module requires a V.I.P system!" #error "This module requires a V.I.P system!"
#endif #endif
/* ** Definitions ** */
#define IsPlayerUsingRadio(%0) (p_UsingRadio{%0})
/* ** Variables ** */ /* ** Variables ** */
enum E_RADIO_DATA enum E_RADIO_DATA
{ {
@ -23,7 +20,7 @@ enum E_RADIO_DATA
E_URL [ 60 ] E_URL [ 60 ]
}; };
new static stock
g_RadioData[ ] [ E_RADIO_DATA ] = g_RadioData[ ] [ E_RADIO_DATA ] =
{ {
{ "Country", "http://sc3c-sjc.1.fm:7806" }, { "Country", "http://sc3c-sjc.1.fm:7806" },
@ -98,3 +95,6 @@ CMD:stopradio( playerid, params[ ] )
StopAudioStreamForPlayer( playerid ); StopAudioStreamForPlayer( playerid );
return 1; return 1;
} }
/* ** Functions ** */
stock IsPlayerUsingRadio( playerid ) return p_UsingRadio{ playerid };

1
gamemodes/irresistible/cnr/player.pwn
View File

@ -14,7 +14,6 @@
#define IsPlayerGettingBlowed(%0) (p_GettingBlowjob{%0}) #define IsPlayerGettingBlowed(%0) (p_GettingBlowjob{%0})
#define IsPlayerLoadingObjects(%0) (p_pausedToLoad{%0}) #define IsPlayerLoadingObjects(%0) (p_pausedToLoad{%0})
#define IsPlayerAdminJailed(%0) (p_AdminJailed{%0} && p_JailTime[%0]) #define IsPlayerAdminJailed(%0) (p_AdminJailed{%0} && p_JailTime[%0])
#define GetPlayerXP(%1) (p_XP[%1])
#define IsPlayerLorenc(%0) (p_AccountID[%0] == 1) #define IsPlayerLorenc(%0) (p_AccountID[%0] == 1)
/* ** Variables ** */ /* ** Variables ** */

100
gamemodes/sf-cnr.pwn
View File

@ -2469,6 +2469,7 @@ public OnPlayerTakeOutFire( playerid, fireid )
Achievement::HandleExtinguishedFires( playerid ); Achievement::HandleExtinguishedFires( playerid );
SendClientMessageToFireman( -1, "{A83434}[FIREMAN]{FFFFFF} %s(%d) has extinguished house fire %d.", ReturnPlayerName( playerid ), playerid, fireid ); SendClientMessageToFireman( -1, "{A83434}[FIREMAN]{FFFFFF} %s(%d) has extinguished house fire %d.", ReturnPlayerName( playerid ), playerid, fireid );
GivePlayerScore( playerid, 2 ); GivePlayerScore( playerid, 2 );
//GivePlayerExperience( playerid, E_FIREMAN );
GivePlayerCash( playerid, 5000 ); GivePlayerCash( playerid, 5000 );
g_fireData[ fireid ] [ E_CREATED ] = false; g_fireData[ fireid ] [ E_CREATED ] = false;
g_fireData[ fireid ] [ E_HOUSE ] = -1; g_fireData[ fireid ] [ E_HOUSE ] = -1;
@ -4956,6 +4957,7 @@ public OnPlayerDeath( playerid, killerid, reason )
new cashEarned = ( p_WantedLevel[ playerid ] < MAX_WANTED_LVL ? p_WantedLevel[ playerid ] : MAX_WANTED_LVL ) * ( reason == 38 ? 170 : 270 ); new cashEarned = ( p_WantedLevel[ playerid ] < MAX_WANTED_LVL ? p_WantedLevel[ playerid ] : MAX_WANTED_LVL ) * ( reason == 38 ? 170 : 270 );
GivePlayerCash( killerid, cashEarned ); GivePlayerCash( killerid, cashEarned );
GivePlayerScore( killerid, 2 ); GivePlayerScore( killerid, 2 );
GivePlayerExperience( killerid, E_POLICE, 0.5 );
if ( cashEarned > 20000 ) printf("[police kill] %s -> %s - %s", ReturnPlayerName( killerid ), ReturnPlayerName( playerid ), cash_format( cashEarned ) ); // 8hska7082bmahu if ( cashEarned > 20000 ) printf("[police kill] %s -> %s - %s", ReturnPlayerName( killerid ), ReturnPlayerName( playerid ), cash_format( cashEarned ) ); // 8hska7082bmahu
if ( p_WantedLevel[ playerid ] > 64 ) SendGlobalMessage( -1, ""COL_GOLD"[POLICE KILL]{FFFFFF} %s(%d) has %s %s(%d) who had a wanted level of %d!", ReturnPlayerName( killerid ), killerid, killedWords[ random( sizeof( killedWords ) ) ], ReturnPlayerName( playerid ), playerid, p_WantedLevel[ playerid ] ); if ( p_WantedLevel[ playerid ] > 64 ) SendGlobalMessage( -1, ""COL_GOLD"[POLICE KILL]{FFFFFF} %s(%d) has %s %s(%d) who had a wanted level of %d!", ReturnPlayerName( killerid ), killerid, killedWords[ random( sizeof( killedWords ) ) ], ReturnPlayerName( playerid ), playerid, p_WantedLevel[ playerid ] );
SendClientMessageFormatted( killerid, -1, ""COL_GOLD"[ACHIEVE]{FFFFFF} You have killed %s(%d) with a wanted level of %d; earning you "COL_GOLD"%s{FFFFFF} and 2 score!", ReturnPlayerName( playerid ), playerid, p_WantedLevel[ playerid ], cash_format( cashEarned ) ); SendClientMessageFormatted( killerid, -1, ""COL_GOLD"[ACHIEVE]{FFFFFF} You have killed %s(%d) with a wanted level of %d; earning you "COL_GOLD"%s{FFFFFF} and 2 score!", ReturnPlayerName( playerid ), playerid, p_WantedLevel[ playerid ], cash_format( cashEarned ) );
@ -5022,7 +5024,11 @@ public OnPlayerDeath( playerid, killerid, reason )
} }
} }
if ( p_Class[ killerid ] != CLASS_POLICE ) GivePlayerWantedLevel( killerid, 12 ), GivePlayerScore( killerid, 1, .multiplier = 0.2 ); if ( p_Class[ killerid ] != CLASS_POLICE ) {
GivePlayerWantedLevel( killerid, 12 );
GivePlayerScore( killerid, 1, .multiplier = 0.2 );
GivePlayerExperience( killerid, E_DEATHMATCH );
}
} }
else if ( IsPlayerNPC( killerid ) ) SendDeathMessage( killerid, playerid, reason ); else if ( IsPlayerNPC( killerid ) ) SendDeathMessage( killerid, playerid, reason );
else else
@ -5067,12 +5073,13 @@ public OnVehicleDeath( vehicleid, killerid )
if ( g_businessData[ businessid ] [ E_EXPORT_STARTED ] == 1 ) if ( g_businessData[ businessid ] [ E_EXPORT_STARTED ] == 1 )
{ {
printf("2.is associate %d, ticks %d", IsBusinessAssociate( attackerid, businessid ), g_iTime - g_VehicleLastAttacked[ vehicleid ] ); // printf("2.is associate %d, ticks %d", IsBusinessAssociate( attackerid, businessid ), g_iTime - g_VehicleLastAttacked[ vehicleid ] );
if ( IsPlayerConnected( attackerid ) && ! IsBusinessAssociate( attackerid, businessid ) && ( g_iTime - g_VehicleLastAttacked[ vehicleid ] ) < 8 ) if ( IsPlayerConnected( attackerid ) && ! IsBusinessAssociate( attackerid, businessid ) && ( g_iTime - g_VehicleLastAttacked[ vehicleid ] ) < 8 )
{ {
GivePlayerScore( attackerid, 2 ); GivePlayerScore( attackerid, 2 );
GivePlayerCash( attackerid, payout ); GivePlayerCash( attackerid, payout );
if ( p_Class[ attackerid ] != CLASS_POLICE ) GivePlayerWantedLevel( attackerid, 6 ); if ( p_Class[ attackerid ] != CLASS_POLICE ) GivePlayerWantedLevel( attackerid, 6 ), GivePlayerExperience( attackerid, E_ROBBERY );
else GivePlayerExperience( attackerid, E_POLICE );
SendGlobalMessage( -1, ""COL_GREY"[BUSINESS]"COL_WHITE" %s(%d) has destroyed a business vehicle and earned "COL_GOLD"%s"COL_WHITE"!", ReturnPlayerName( attackerid ), attackerid, cash_format( payout ) ); SendGlobalMessage( -1, ""COL_GREY"[BUSINESS]"COL_WHITE" %s(%d) has destroyed a business vehicle and earned "COL_GOLD"%s"COL_WHITE"!", ReturnPlayerName( attackerid ), attackerid, cash_format( payout ) );
} }
else else
@ -5083,7 +5090,8 @@ public OnVehicleDeath( vehicleid, killerid )
{ {
GivePlayerScore( killerid, 2 ); GivePlayerScore( killerid, 2 );
GivePlayerCash( killerid, payout ); GivePlayerCash( killerid, payout );
if ( p_Class[ killerid ] != CLASS_POLICE ) GivePlayerWantedLevel( killerid, 6 ); if ( p_Class[ killerid ] != CLASS_POLICE ) GivePlayerWantedLevel( killerid, 6 ), GivePlayerExperience( killerid, E_ROBBERY );
else GivePlayerExperience( killerid, E_POLICE );
SendGlobalMessage( -1, ""COL_GREY"[BUSINESS]"COL_WHITE" %s(%d) has destroyed a business vehicle and earned "COL_GOLD"%s"COL_WHITE"!", ReturnPlayerName( killerid ), killerid, cash_format( payout ) ); SendGlobalMessage( -1, ""COL_GREY"[BUSINESS]"COL_WHITE" %s(%d) has destroyed a business vehicle and earned "COL_GOLD"%s"COL_WHITE"!", ReturnPlayerName( killerid ), killerid, cash_format( payout ) );
} }
} }
@ -5625,6 +5633,7 @@ public OnProgressCompleted( playerid, progressid, params )
SendServerMessage( playerid, "Great you've mined an ore, now store it in a "COL_GREY"Dune"COL_WHITE"." ); SendServerMessage( playerid, "Great you've mined an ore, now store it in a "COL_GREY"Dune"COL_WHITE"." );
} }
//GivePlayerExperience( playerid, E_MINING );
SetPVarInt( playerid, "carrying_ore", m ); SetPVarInt( playerid, "carrying_ore", m );
SetPlayerSpecialAction( playerid, SPECIAL_ACTION_CARRY ); SetPlayerSpecialAction( playerid, SPECIAL_ACTION_CARRY );
SetPlayerAttachedObject( playerid, 4, 2936, 5, 0.000000, 0.197999, 0.133999, 113.099983, -153.799987, 57.300003, 0.631000, 0.597000, 0.659999, g_miningData[ m ] [ E_ARGB ], g_miningData[ m ] [ E_ARGB ] ); SetPlayerAttachedObject( playerid, 4, 2936, 5, 0.000000, 0.197999, 0.133999, 113.099983, -153.799987, 57.300003, 0.631000, 0.597000, 0.659999, g_miningData[ m ] [ E_ARGB ], g_miningData[ m ] [ E_ARGB ] );
@ -5660,6 +5669,7 @@ public OnProgressCompleted( playerid, progressid, params )
SendServerMessage( playerid, "You have successfully cracked this business' password. It will not be accessible in 3 minutes." ); SendServerMessage( playerid, "You have successfully cracked this business' password. It will not be accessible in 3 minutes." );
GivePlayerWantedLevel( playerid, 12 ); GivePlayerWantedLevel( playerid, 12 );
GivePlayerScore( playerid, 2 ); GivePlayerScore( playerid, 2 );
//GivePlayerExperience( playerid, E_BURGLAR );
Achievement::HandleBurglaries( playerid ); Achievement::HandleBurglaries( playerid );
} }
else else
@ -5686,6 +5696,7 @@ public OnProgressCompleted( playerid, progressid, params )
SendServerMessage( playerid, "You have successfully cracked this houses' password. You have two minutes to do your thing." ); SendServerMessage( playerid, "You have successfully cracked this houses' password. You have two minutes to do your thing." );
GivePlayerWantedLevel( playerid, 12 ); GivePlayerWantedLevel( playerid, 12 );
GivePlayerScore( playerid, 2 ); GivePlayerScore( playerid, 2 );
//GivePlayerExperience( playerid, E_BURGLAR );
Achievement::HandleBurglaries( playerid ); Achievement::HandleBurglaries( playerid );
} }
else else
@ -5760,6 +5771,7 @@ public OnProgressCompleted( playerid, progressid, params )
GivePlayerScore( playerid, 2 ); GivePlayerScore( playerid, 2 );
GivePlayerWantedLevel( playerid, 6 ); GivePlayerWantedLevel( playerid, 6 );
GivePlayerExperience( playerid, E_ROBBERY );
SplitPlayerCashForGang( playerid, float( g_robberyData[ robberyid ] [ E_SAFE_LOOT ] ) ); SplitPlayerCashForGang( playerid, float( g_robberyData[ robberyid ] [ E_SAFE_LOOT ] ) );
g_robberyData[ robberyid ] [ E_SAFE_LOOT ] = 0; g_robberyData[ robberyid ] [ E_SAFE_LOOT ] = 0;
DestroyDynamicObject( g_robberyData[ robberyid ] [ E_SAFE_MONEY ] ); DestroyDynamicObject( g_robberyData[ robberyid ] [ E_SAFE_MONEY ] );
@ -5921,6 +5933,7 @@ public OnProgressCompleted( playerid, progressid, params )
GivePlayerWantedLevel ( playerid, 24 ); GivePlayerWantedLevel ( playerid, 24 );
GivePlayerScore ( playerid, 5 ); GivePlayerScore ( playerid, 5 );
GivePlayerExperience ( playerid, E_ROBBERY, 2.0 );
if ( random( 101 ) >= 20 ) { if ( random( 101 ) >= 20 ) {
if ( IsPlayerConnected( playerid ) && p_MoneyBag{ playerid } == true ) { if ( IsPlayerConnected( playerid ) && p_MoneyBag{ playerid } == true ) {
@ -6940,6 +6953,7 @@ CMD:robitems( playerid, params[ ] )
SetPVarInt( playerid, "robitems_timestamp", g_iTime + 60 ); SetPVarInt( playerid, "robitems_timestamp", g_iTime + 60 );
GivePlayerWantedLevel( playerid, 4 ); GivePlayerWantedLevel( playerid, 4 );
GivePlayerScore( playerid, 1 ); GivePlayerScore( playerid, 1 );
GivePlayerExperience( playerid, E_ROBBERY, 0.5 );
new new
available_items[ 3 ] = { -1, -1, -1 }, available_items[ 3 ] = { -1, -1, -1 },
@ -7406,6 +7420,7 @@ CMD:acceptcure( playerid, params[ ] )
GivePlayerCash( playerid, -4875 ); GivePlayerCash( playerid, -4875 );
GivePlayerCash( p_CureDealer[ playerid ], 4875 ); GivePlayerCash( p_CureDealer[ playerid ], 4875 );
GivePlayerScore( p_CureDealer[ playerid ], 2 ); GivePlayerScore( p_CureDealer[ playerid ], 2 );
//GivePlayerExperience( p_CureDealer[ playerid ], E_PARAMEDIC );
p_LastCuredTS[ p_CureDealer[ playerid ] ] = time + 15; p_LastCuredTS[ p_CureDealer[ playerid ] ] = time + 15;
p_CureDealer[ playerid ] = INVALID_PLAYER_ID; p_CureDealer[ playerid ] = INVALID_PLAYER_ID;
} }
@ -7459,6 +7474,7 @@ CMD:acceptheal( playerid, params[ ] )
GivePlayerCash( playerid, -1200 ); GivePlayerCash( playerid, -1200 );
GivePlayerCash( p_HealDealer[ playerid ], 1200 ); GivePlayerCash( p_HealDealer[ playerid ], 1200 );
GivePlayerScore( p_HealDealer[ playerid ], 2 ); GivePlayerScore( p_HealDealer[ playerid ], 2 );
//GivePlayerExperience( p_HealDealer[ playerid ], E_PARAMEDIC );
p_LastHealedTS[ p_HealDealer[ playerid ] ] = g_iTime + 15; p_LastHealedTS[ p_HealDealer[ playerid ] ] = g_iTime + 15;
p_HealDealer[ playerid ] = INVALID_PLAYER_ID; p_HealDealer[ playerid ] = INVALID_PLAYER_ID;
} }
@ -7760,8 +7776,8 @@ CMD:mech( playerid, params[ ] )
if ( isnull( params ) ) return SendUsage( playerid, "/(mech)anic [FIX/NOS/REMP/FLIP/FLIX/PRICE/NEARBY]" ); if ( isnull( params ) ) return SendUsage( playerid, "/(mech)anic [FIX/NOS/REMP/FLIP/FLIX/PRICE/NEARBY]" );
else if ( strmatch( params, "fix" ) ) else if ( strmatch( params, "fix" ) )
{ {
if ( ( GetTickCount( ) - p_AntiMechFixSpam[ playerid ] ) < 10000 ) if ( p_AntiMechFixSpam[ playerid ] > g_iTime )
return SendError( playerid, "You must wait 10 seconds before using this feature again." ); return SendError( playerid, "You must wait %d seconds before using this feature again.", p_AntiMechFixSpam[ playerid ] - g_iTime );
if ( !IsPlayerInAnyVehicle( playerid ) ) if ( !IsPlayerInAnyVehicle( playerid ) )
return SendError( playerid, "You are not in any vehicle." ); return SendError( playerid, "You are not in any vehicle." );
@ -7769,17 +7785,19 @@ CMD:mech( playerid, params[ ] )
new new
cost = 250; cost = 250;
if ( g_isBusinessVehicle[ iVehicle ] != -1 && Iter_Contains( business, g_isBusinessVehicle[ iVehicle ] ) ) if ( g_isBusinessVehicle[ iVehicle ] != -1 && Iter_Contains( business, g_isBusinessVehicle[ iVehicle ] ) ) {
cost = IsBusinessAerialVehicle( g_isBusinessVehicle[ iVehicle ], GetVehicleModel( iVehicle ) ) ? 2500 : 750; cost = IsBusinessAerialVehicle( g_isBusinessVehicle[ iVehicle ], GetVehicleModel( iVehicle ) ) ? 5000 : 2500;
}
if ( GetPlayerCash( playerid ) < cost ) if ( GetPlayerCash( playerid ) < cost ) {
return SendError( playerid, "You need %s to fix this vehicle.", cash_format( cost ) ); return SendError( playerid, "You need %s to fix this vehicle.", cash_format( cost ) );
}
PlayerPlaySound( playerid, 1133, 0.0, 0.0, 5.0 ); PlayerPlaySound( playerid, 1133, 0.0, 0.0, 5.0 );
p_DamageSpamCount{ playerid } = 0; p_DamageSpamCount{ playerid } = 0;
RepairVehicle( iVehicle ); RepairVehicle( iVehicle );
SendServerMessage( playerid, "You have repaired this vehicle." ); SendServerMessage( playerid, "You have repaired this vehicle." );
p_AntiMechFixSpam[ playerid ] = GetTickCount( ); p_AntiMechFixSpam[ playerid ] = g_itime + 5;
GivePlayerCash( playerid, -cost ); GivePlayerCash( playerid, -cost );
} }
else if ( strmatch( params, "nos" ) ) else if ( strmatch( params, "nos" ) )
@ -7808,38 +7826,40 @@ CMD:mech( playerid, params[ ] )
} }
else if ( strmatch( params, "flip" ) ) else if ( strmatch( params, "flip" ) )
{ {
if ( ( GetTickCount( ) - p_AntiMechFlipSpam[ playerid ] ) < 10000 ) return SendError( playerid, "You must wait 10 seconds before using this feature." ); if ( p_AntiMechFlipSpam[ playerid ] > g_iTime ) return SendError( playerid, "You must wait %d seconds before using this feature.", p_AntiMechFlipSpam[ playerid ] - g_iTime );
if ( !IsPlayerInAnyVehicle( playerid ) ) return SendError( playerid, "You are not in any vehicle." ); if ( !IsPlayerInAnyVehicle( playerid ) ) return SendError( playerid, "You are not in any vehicle." );
if ( GetPlayerCash( playerid ) < 200 ) return SendError( playerid, "You need $200 to flip this vehicle." ); if ( GetPlayerCash( playerid ) < 200 ) return SendError( playerid, "You need $200 to flip this vehicle." );
PlayerPlaySound( playerid, 1133, 0.0, 0.0, 5.0 ); PlayerPlaySound( playerid, 1133, 0.0, 0.0, 5.0 );
GetVehicleZAngle( iVehicle, vZ ), SetVehicleZAngle( iVehicle, vZ ); GetVehicleZAngle( iVehicle, vZ ), SetVehicleZAngle( iVehicle, vZ );
GivePlayerCash( playerid, -200 ); GivePlayerCash( playerid, -200 );
SendServerMessage( playerid, "You have successfully flipped this vehicle." ); SendServerMessage( playerid, "You have successfully flipped this vehicle." );
p_AntiMechFlipSpam[ playerid ] = GetTickCount( ); p_AntiMechFlipSpam[ playerid ] = g_iTime + 5;
} }
else if ( strmatch( params, "flix" ) ) else if ( strmatch( params, "flix" ) )
{ {
if ( ( GetTickCount( ) - p_AntiMechFixSpam[ playerid ] ) < 10000 ) return SendError( playerid, "You must wait 10 seconds before using this feature." ); if ( p_AntiMechFixSpam[ playerid ] > g_iTime ) return SendError( playerid, "You must wait %d seconds before using this feature again.", p_AntiMechFixSpam[ playerid ] - g_iTime );
if ( ( GetTickCount( ) - p_AntiMechFlipSpam[ playerid ] ) < 10000 ) return SendError( playerid, "You must wait 10 seconds before using this feature." ); if ( p_AntiMechFlipSpam[ playerid ] > g_iTime ) return SendError( playerid, "You must wait %d seconds before using this feature.", p_AntiMechFlipSpam[ playerid ] - g_iTime );
if ( !IsPlayerInAnyVehicle( playerid ) ) return SendError( playerid, "You are not in any vehicle." ); if ( !IsPlayerInAnyVehicle( playerid ) ) return SendError( playerid, "You are not in any vehicle." );
if ( GetPlayerCash( playerid ) < 500 ) return SendError( playerid, "You need $500 to flip and fix this vehicle." ); if ( GetPlayerCash( playerid ) < 500 ) return SendError( playerid, "You need $500 to flip and fix this vehicle." );
new new
cost = 500; cost = 500;
if ( g_isBusinessVehicle[ iVehicle ] != -1 && Iter_Contains( business, g_isBusinessVehicle[ iVehicle ] ) ) if ( g_isBusinessVehicle[ iVehicle ] != -1 && Iter_Contains( business, g_isBusinessVehicle[ iVehicle ] ) ) {
cost = IsBusinessAerialVehicle( g_isBusinessVehicle[ iVehicle ], GetVehicleModel( iVehicle ) ) ? 3000 : 1250; cost = IsBusinessAerialVehicle( g_isBusinessVehicle[ iVehicle ], GetVehicleModel( iVehicle ) ) ? 6000 : 3500;
}
if ( GetPlayerCash( playerid ) < cost ) if ( GetPlayerCash( playerid ) < cost ) {
return SendError( playerid, "You need %s to fix this vehicle.", cash_format( cost ) ); return SendError( playerid, "You need %s to fix this vehicle.", cash_format( cost ) );
}
PlayerPlaySound( playerid, 1133, 0.0, 0.0, 5.0 ); PlayerPlaySound( playerid, 1133, 0.0, 0.0, 5.0 );
p_DamageSpamCount{ playerid } = 0; p_DamageSpamCount{ playerid } = 0;
RepairVehicle( iVehicle ); RepairVehicle( iVehicle );
GetVehicleZAngle( iVehicle, vZ ), SetVehicleZAngle( iVehicle, vZ ); GetVehicleZAngle( iVehicle, vZ ), SetVehicleZAngle( iVehicle, vZ );
SendServerMessage( playerid, "You have flipped and fixed this vehicle." ); SendServerMessage( playerid, "You have flipped and fixed this vehicle." );
p_AntiMechFixSpam[ playerid ] = GetTickCount( ); p_AntiMechFixSpam[ playerid ] = g_iTime + 5;
p_AntiMechFlipSpam[ playerid ] = GetTickCount( ); p_AntiMechFlipSpam[ playerid ] = g_iTime + 5;
GivePlayerCash( playerid, -cost ); GivePlayerCash( playerid, -cost );
} }
else if ( strmatch( params, "price" ) ) else if ( strmatch( params, "price" ) )
@ -8215,7 +8235,7 @@ thread OnPlayerWeeklyTime( playerid, irc, player[ ] )
CMD:xpmarket( playerid, params[ ] ) CMD:xpmarket( playerid, params[ ] )
{ {
ShowPlayerDialog(playerid, DIALOG_XPMARKET, DIALOG_STYLE_INPUT, "{FFFFFF}XP Market", ""COL_WHITE"Welcome, enter inside the input box how much XP you're willing\nto trade in for.\n\nExchange Rate: "COL_GOLD"1 XP = $"#EXCHANGE_XPCASH"", "Select", "Cancel"); ShowPlayerDialog( playerid, DIALOG_XPMARKET, DIALOG_STYLE_INPUT, "{FFFFFF}XP Market", sprintf( ""COL_WHITE"You have %d legacy XP. Current exchange rate is $10 per XP.\n\nHow many would you like to exchange?", p_XP[ playerid ] ), "Select", "Cancel");
return 1; return 1;
} }
@ -8536,9 +8556,9 @@ CMD:discordpm( playerid, params[ ] )
CMD:perks( playerid, params[ ] ) CMD:perks( playerid, params[ ] )
{ {
if ( IsPlayerInEvent( playerid ) ) return SendError( playerid, "You cannot use this command since you're in an event." ); //if ( IsPlayerInEvent( playerid ) ) return SendError( playerid, "You cannot use this command since you're in an event." );
ShowPlayerDialog( playerid, DIALOG_PERKS, DIALOG_STYLE_LIST, "{FFFFFF}Game Perks", "Player Perks\nVehicle Perks", "Select", "Cancel" ); //ShowPlayerDialog( playerid, DIALOG_PERKS, DIALOG_STYLE_LIST, "{FFFFFF}Game Perks", "Player Perks\nVehicle Perks", "Select", "Cancel" );
return 1; return SendServerMessage( playerid, "/perks is unavailable, become a dirty mechanic instead." );
} }
CMD:viewguns( playerid, params[ ] ) CMD:viewguns( playerid, params[ ] )
@ -9797,6 +9817,7 @@ CMD:payticket( playerid, params[] )
if ( IsPlayerConnected( copid ) ) { if ( IsPlayerConnected( copid ) ) {
GivePlayerScore( copid, 2 ); GivePlayerScore( copid, 2 );
GivePlayerCash( copid, 1500 ); GivePlayerCash( copid, 1500 );
GivePlayerExperience( copid, E_POLICE, 0.5 );
GameTextForPlayer( copid, "~n~~g~~h~Ticket paid!", 2000, 4 ); GameTextForPlayer( copid, "~n~~g~~h~Ticket paid!", 2000, 4 );
SendClientMessageFormatted( copid, -1, ""COL_GREEN"[TICKET]{FFFFFF} %s(%d) has paid his ticket issues, you have earned "COL_GOLD"$1,500{FFFFFF}!", ReturnPlayerName( playerid ), playerid ); SendClientMessageFormatted( copid, -1, ""COL_GREEN"[TICKET]{FFFFFF} %s(%d) has paid his ticket issues, you have earned "COL_GOLD"$1,500{FFFFFF}!", ReturnPlayerName( playerid ), playerid );
} }
@ -9947,6 +9968,7 @@ CMD:rob( playerid, params[ ] )
GivePlayerWantedLevel( playerid, 4 ); GivePlayerWantedLevel( playerid, 4 );
GivePlayerCash( victimid, -( cashRobbed ) ); GivePlayerCash( victimid, -( cashRobbed ) );
GivePlayerScore( playerid, 1 ); GivePlayerScore( playerid, 1 );
GivePlayerExperience( playerid, E_ROBBERY );
} }
else else
{ {
@ -10008,6 +10030,7 @@ CMD:rape( playerid, params[ ] )
SendClientMessageFormatted( playerid, -1, ""COL_GREEN"[RAPED]{FFFFFF} You have raped %s(%d) and infected them with "COL_RED"HIV{FFFFFF}!", ReturnPlayerName( victimid ), victimid ); SendClientMessageFormatted( playerid, -1, ""COL_GREEN"[RAPED]{FFFFFF} You have raped %s(%d) and infected them with "COL_RED"HIV{FFFFFF}!", ReturnPlayerName( victimid ), victimid );
GivePlayerScore( playerid, 2 ); GivePlayerScore( playerid, 2 );
GivePlayerWantedLevel( playerid, 5 ); GivePlayerWantedLevel( playerid, 5 );
//GivePlayerExperience( playerid, E_PARAMEDIC );
GetPlayerHealth( victimid, Health ); GetPlayerHealth( victimid, Health );
SetPlayerHealth( victimid, ( Health - 25.0 ) ); SetPlayerHealth( victimid, ( Health - 25.0 ) );
@ -10019,6 +10042,7 @@ CMD:rape( playerid, params[ ] )
SendClientMessageFormatted( victimid, -1, ""COL_RED"[RAPED]{FFFFFF} You have been raped by %s(%d)!", ReturnPlayerName( playerid ), playerid ); SendClientMessageFormatted( victimid, -1, ""COL_RED"[RAPED]{FFFFFF} You have been raped by %s(%d)!", ReturnPlayerName( playerid ), playerid );
SendClientMessageFormatted( playerid, -1, ""COL_GREEN"[RAPED]{FFFFFF} You have raped %s(%d)!", ReturnPlayerName( victimid ), victimid ); SendClientMessageFormatted( playerid, -1, ""COL_GREEN"[RAPED]{FFFFFF} You have raped %s(%d)!", ReturnPlayerName( victimid ), victimid );
GivePlayerScore( playerid, 1 ); GivePlayerScore( playerid, 1 );
//GivePlayerExperience( playerid, E_PARAMEDIC, 0.5 );
GivePlayerWantedLevel( playerid, 4 ); GivePlayerWantedLevel( playerid, 4 );
GetPlayerHealth( victimid, Health ); GetPlayerHealth( victimid, Health );
SetPlayerHealth( victimid, ( Health - 25.0 ) ); SetPlayerHealth( victimid, ( Health - 25.0 ) );
@ -11740,6 +11764,7 @@ public OnPlayerEnterDynamicCP(playerid, checkpointid)
GivePlayerWantedLevel( playerid, 6 ); GivePlayerWantedLevel( playerid, 6 );
GivePlayerCash( playerid, iCash ); GivePlayerCash( playerid, iCash );
GivePlayerScore( playerid, 2 ); GivePlayerScore( playerid, 2 );
//GivePlayerExperience( playerid, E_CAR_JACKER );
Achievement::HandleCarJacked( playerid ); Achievement::HandleCarJacked( playerid );
SetTimerEx( "ExportVehicle", 3000, false, "dd", iVehicle, i ); SetTimerEx( "ExportVehicle", 3000, false, "dd", iVehicle, i );
SendServerMessage( playerid, "You have exported your "COL_GREY"%s"COL_WHITE" for "COL_GOLD"%s"COL_WHITE".", GetVehicleName( GetVehicleModel( iVehicle ) ), cash_format( iCash ) ); SendServerMessage( playerid, "You have exported your "COL_GREY"%s"COL_WHITE" for "COL_GOLD"%s"COL_WHITE".", GetVehicleName( GetVehicleModel( iVehicle ) ), cash_format( iCash ) );
@ -11877,6 +11902,7 @@ public OnPlayerEnterDynamicRaceCP( playerid, checkpointid )
items = GetGVarInt( szItems ); items = GetGVarInt( szItems );
score = floatround( items / 2 ); score = floatround( items / 2 );
GivePlayerScore( playerid, score == 0 ? 1 : score, .multiplier = 0.4 ); GivePlayerScore( playerid, score == 0 ? 1 : score, .multiplier = 0.4 );
//GivePlayerExperience( playerid, E_BURGLAR, float( items ) * 0.2 );
DestroyDynamicMapIcon( p_PawnStoreMapIcon[ playerid ] ); DestroyDynamicMapIcon( p_PawnStoreMapIcon[ playerid ] );
p_PawnStoreMapIcon[ playerid ] = 0xFFFF; p_PawnStoreMapIcon[ playerid ] = 0xFFFF;
DestroyDynamicRaceCP( p_PawnStoreExport[ playerid ] ); DestroyDynamicRaceCP( p_PawnStoreExport[ playerid ] );
@ -11910,6 +11936,7 @@ public OnPlayerEnterDynamicRaceCP( playerid, checkpointid )
p_MiningExport[ playerid ] = 0xFFFF; p_MiningExport[ playerid ] = 0xFFFF;
GivePlayerCash( playerid, cashEarned ); GivePlayerCash( playerid, cashEarned );
GivePlayerScore( playerid, floatround( oresExported / 2 ) ); // 16 score is a bit too much for ore... so half that = 8 GivePlayerScore( playerid, floatround( oresExported / 2 ) ); // 16 score is a bit too much for ore... so half that = 8
//GivePlayerExperience( playerid, E_MINING, float( oresExported ) * 0.2 );
SendServerMessage( playerid, "You have exported %d rock ore(s) to an industry, earning you "COL_GOLD"%s"COL_WHITE".", oresExported, cash_format( cashEarned ) ); SendServerMessage( playerid, "You have exported %d rock ore(s) to an industry, earning you "COL_GOLD"%s"COL_WHITE".", oresExported, cash_format( cashEarned ) );
} }
return 1; return 1;
@ -12141,6 +12168,7 @@ public OnPlayerPickUpDynamicPickup( playerid, pickupid )
GivePlayerWantedLevel( playerid, 4 ); GivePlayerWantedLevel( playerid, 4 );
GivePlayerScore( playerid, 1 ); GivePlayerScore( playerid, 1 );
GivePlayerExperience( playerid, E_ROBBERY );
GetPlayerPos ( playerid, X, Y, Z ); GetPlayerPos ( playerid, X, Y, Z );
Get2DCity ( szCity, X, Y, Z ); Get2DCity ( szCity, X, Y, Z );
@ -14188,7 +14216,7 @@ public OnDialogResponse( playerid, dialogid, response, listitem, inputtext[ ] )
{ {
if ( p_XP[ playerid ] >= 100 ) if ( p_XP[ playerid ] >= 100 )
{ {
GivePlayerXP( playerid, -100 ); GivePlayerXP_Legacy( playerid, -100 );
for( new i; i < MAX_WEAPONS; i++ ) for( new i; i < MAX_WEAPONS; i++ )
{ {
if ( IsWeaponInAnySlot( playerid, i ) && i != 0 && !( 16 <= i <= 18 ) && i != 35 && i != 47 && i != WEAPON_BOMB ) if ( IsWeaponInAnySlot( playerid, i ) && i != 0 && !( 16 <= i <= 18 ) && i != 35 && i != 47 && i != WEAPON_BOMB )
@ -14222,7 +14250,7 @@ public OnDialogResponse( playerid, dialogid, response, listitem, inputtext[ ] )
GetVehicleZAngle( vehicleid, vZ ), SetVehicleZAngle( vehicleid, vZ ); GetVehicleZAngle( vehicleid, vZ ), SetVehicleZAngle( vehicleid, vZ );
p_DamageSpamCount{ playerid } = 0; p_DamageSpamCount{ playerid } = 0;
RepairVehicle( vehicleid ); RepairVehicle( vehicleid );
GivePlayerXP( playerid, -200 ); GivePlayerXP_Legacy( playerid, -200 );
SendServerMessage( playerid, "You have fixed and flipped your vehicle for 200 XP." ); SendServerMessage( playerid, "You have fixed and flipped your vehicle for 200 XP." );
PlayerPlaySound( playerid, 1133, 0.0, 0.0, 5.0 ); PlayerPlaySound( playerid, 1133, 0.0, 0.0, 5.0 );
} }
@ -14234,7 +14262,7 @@ public OnDialogResponse( playerid, dialogid, response, listitem, inputtext[ ] )
{ {
new Float: vZ, vehicleid = GetPlayerVehicleID( playerid ); new Float: vZ, vehicleid = GetPlayerVehicleID( playerid );
GetVehicleZAngle( vehicleid, vZ ), SetVehicleZAngle( vehicleid, vZ ); GetVehicleZAngle( vehicleid, vZ ), SetVehicleZAngle( vehicleid, vZ );
GivePlayerXP( playerid, -50 ); GivePlayerXP_Legacy( playerid, -50 );
SendServerMessage( playerid, "You have flipped your vehicle for 50 XP." ); SendServerMessage( playerid, "You have flipped your vehicle for 50 XP." );
PlayerPlaySound( playerid, 1133, 0.0, 0.0, 5.0 ); PlayerPlaySound( playerid, 1133, 0.0, 0.0, 5.0 );
} }
@ -14245,7 +14273,7 @@ public OnDialogResponse( playerid, dialogid, response, listitem, inputtext[ ] )
if ( p_XP[ playerid ] >= 80 ) if ( p_XP[ playerid ] >= 80 )
{ {
AddVehicleComponent( GetPlayerVehicleID( playerid ), 1010 ); AddVehicleComponent( GetPlayerVehicleID( playerid ), 1010 );
GivePlayerXP( playerid, -80 ); GivePlayerXP_Legacy( playerid, -80 );
SendServerMessage( playerid, "You have installed nitro on your car for 80 XP." ); SendServerMessage( playerid, "You have installed nitro on your car for 80 XP." );
PlayerPlaySound( playerid, 1133, 0.0, 0.0, 5.0 ); PlayerPlaySound( playerid, 1133, 0.0, 0.0, 5.0 );
} }
@ -14259,7 +14287,7 @@ public OnDialogResponse( playerid, dialogid, response, listitem, inputtext[ ] )
PlayerPlaySound( playerid, 1133, 0.0, 0.0, 5.0 ); PlayerPlaySound( playerid, 1133, 0.0, 0.0, 5.0 );
p_DamageSpamCount{ playerid } = 0; p_DamageSpamCount{ playerid } = 0;
RepairVehicle( vehicleid ); RepairVehicle( vehicleid );
GivePlayerXP( playerid, -120 ); GivePlayerXP_Legacy( playerid, -120 );
SendServerMessage( playerid, "You have repaired your car for 120 XP." ); SendServerMessage( playerid, "You have repaired your car for 120 XP." );
} }
else return SendError( playerid, "You don't have enough XP for this." ); else return SendError( playerid, "You don't have enough XP for this." );
@ -14461,10 +14489,10 @@ public OnDialogResponse( playerid, dialogid, response, listitem, inputtext[ ] )
if ( !strlen( inputtext ) || !IsNumeric( inputtext ) ) if ( !strlen( inputtext ) || !IsNumeric( inputtext ) )
return SendError( playerid, "The input you have entered is invalid, must be a numeric with over 0 characters." ), cmd_xpmarket( playerid, "" ), 1; return SendError( playerid, "The input you have entered is invalid, must be a numeric with over 0 characters." ), cmd_xpmarket( playerid, "" ), 1;
if ( strval( inputtext ) < 0 || strval( inputtext ) > GetPlayerXP( playerid ) || strval( inputtext ) > 99999999 ) if ( strval( inputtext ) < 0 || strval( inputtext ) > p_XP[ playerid ] || strval( inputtext ) > 99999999 )
return SendError( playerid, "Invalid amount, must be from 0 to the amount of XP you have." ), cmd_xpmarket( playerid, "" ), 1; return SendError( playerid, "Invalid amount, must be from 0 to the amount of XP you have." ), cmd_xpmarket( playerid, "" ), 1;
GivePlayerXP( playerid, -( strval( inputtext ) ) ); GivePlayerXP_Legacy( playerid, -( strval( inputtext ) ) );
GivePlayerCash( playerid, strval( inputtext ) * EXCHANGE_XPCASH ); GivePlayerCash( playerid, strval( inputtext ) * EXCHANGE_XPCASH );
printf( "[xpmarket] %s -> %s", ReturnPlayerName( playerid ), cash_format( strval( inputtext ) * EXCHANGE_XPCASH ) ); // 8hska7082bmahu printf( "[xpmarket] %s -> %s", ReturnPlayerName( playerid ), cash_format( strval( inputtext ) * EXCHANGE_XPCASH ) ); // 8hska7082bmahu
SendServerMessage( playerid, "You have successfully exchanged %d XP for %s dollars.", strval( inputtext ), cash_format( strval( inputtext ) * EXCHANGE_XPCASH ) ); SendServerMessage( playerid, "You have successfully exchanged %d XP for %s dollars.", strval( inputtext ), cash_format( strval( inputtext ) * EXCHANGE_XPCASH ) );
@ -17609,6 +17637,7 @@ stock ExplodePlayerC4s( playerid, start=0, end=MAX_C4 )
{ {
g_alcatrazTimestamp = g_iTime + 300; g_alcatrazTimestamp = g_iTime + 300;
//GivePlayerExperience( playerid, E_TERRORIST );
GivePlayerScore( playerid, 3 ); GivePlayerScore( playerid, 3 );
GivePlayerWantedLevel( playerid, 24 ); GivePlayerWantedLevel( playerid, 24 );
Achievement::HandleJailBlown( playerid ); Achievement::HandleJailBlown( playerid );
@ -17632,6 +17661,7 @@ stock ExplodePlayerC4s( playerid, start=0, end=MAX_C4 )
MoveDynamicObject( g_bankvaultData[ j ] [ E_OBJECT ], g_bankvaultData[ j ] [ E_OPEN_POS ] [ 0 ], g_bankvaultData[ j ] [ E_OPEN_POS ] [ 1 ], g_bankvaultData[ j ] [ E_OPEN_POS ] [ 2 ], 2.0, g_bankvaultData[ j ] [ E_OPEN_ROT ] [ 0 ], g_bankvaultData[ j ] [ E_OPEN_ROT ] [ 1 ], g_bankvaultData[ j ] [ E_OPEN_ROT ] [ 2 ] ); MoveDynamicObject( g_bankvaultData[ j ] [ E_OBJECT ], g_bankvaultData[ j ] [ E_OPEN_POS ] [ 0 ], g_bankvaultData[ j ] [ E_OPEN_POS ] [ 1 ], g_bankvaultData[ j ] [ E_OPEN_POS ] [ 2 ], 2.0, g_bankvaultData[ j ] [ E_OPEN_ROT ] [ 0 ], g_bankvaultData[ j ] [ E_OPEN_ROT ] [ 1 ], g_bankvaultData[ j ] [ E_OPEN_ROT ] [ 2 ] );
//GivePlayerExperience( playerid, E_TERRORIST );
GivePlayerScore( playerid, 3 ); GivePlayerScore( playerid, 3 );
GivePlayerWantedLevel( playerid, 24 ); GivePlayerWantedLevel( playerid, 24 );
Achievement::HandleBankBlown( playerid ); Achievement::HandleBankBlown( playerid );
@ -17655,6 +17685,7 @@ stock ExplodePlayerC4s( playerid, start=0, end=MAX_C4 )
g_jailData[ j ] [ E_BOMBED ] = true; g_jailData[ j ] [ E_BOMBED ] = true;
g_jailData[ j ] [ E_TIMESTAMP ] = g_iTime + 300; g_jailData[ j ] [ E_TIMESTAMP ] = g_iTime + 300;
//GivePlayerExperience( playerid, E_TERRORIST );
GivePlayerScore( playerid, 3 ); GivePlayerScore( playerid, 3 );
GivePlayerWantedLevel( playerid, 24 ); GivePlayerWantedLevel( playerid, 24 );
Achievement::HandleJailBlown( playerid ); Achievement::HandleJailBlown( playerid );
@ -17784,9 +17815,8 @@ stock GivePlayerScore( playerid, score, Float: multiplier = 0.75 )
if ( gangid != INVALID_GANG_ID ) if ( gangid != INVALID_GANG_ID )
SaveGangData( gangid ), g_gangData[ gangid ] [ E_SCORE ] += score; SaveGangData( gangid ), g_gangData[ gangid ] [ E_SCORE ] += score;
GivePlayerXP( playerid, score * 10 ); //GivePlayerXP_Legacy( playerid, score * 10 );
GivePlayerIrresistiblePoints( playerid, score < 0 ? ( score * 1.0 ) : ( score * multiplier ) ); GivePlayerIrresistiblePoints( playerid, score < 0 ? ( score * 1.0 ) : ( score * multiplier ) );
return SetPlayerScore( playerid, GetPlayerScore( playerid ) + score ); return SetPlayerScore( playerid, GetPlayerScore( playerid ) + score );
} }
@ -17974,7 +18004,7 @@ stock SetPlayerColorToTeam( playerid )
return 1; return 1;
} }
stock GivePlayerXP( playerid, amount ) stock GivePlayerXP_Legacy( playerid, amount )
{ {
if ( p_PlayerLogged{ playerid } == true ) if ( p_PlayerLogged{ playerid } == true )
{ {
@ -17987,7 +18017,7 @@ stock GivePlayerXP( playerid, amount )
p_XP[ playerid ] += amount; p_XP[ playerid ] += amount;
PlayerTextDrawSetString( playerid, p_ExperienceAwardTD[ playerid ], string ); PlayerTextDrawSetString( playerid, p_ExperienceAwardTD[ playerid ], string );
PlayerTextDrawShow( playerid, p_ExperienceAwardTD[ playerid ] ); PlayerTextDrawShow( playerid, p_ExperienceAwardTD[ playerid ] );
SetTimerEx( "ExperienceTD_hide", 3500, false, "d", playerid ); SetTimerEx( "Experience_HideIncrementTD", 3500, false, "d", playerid );
if ( p_XP[ playerid ] > 99999999 ) p_XP[ playerid ] = 99999999; if ( p_XP[ playerid ] > 99999999 ) p_XP[ playerid ] = 99999999;
autosaveStart( playerid ); // auto-save autosaveStart( playerid ); // auto-save
return 1; return 1;
@ -24851,6 +24881,7 @@ stock SellBusinessProduct( playerid, businessid, locationid )
UpdateBusinessData( businessid ); UpdateBusinessData( businessid );
UpdateBusinessProductionLabel( businessid ); UpdateBusinessProductionLabel( businessid );
//GivePlayerExperience( playerid, E_TRANSPORT );
GivePlayerScore( playerid, 2 ); GivePlayerScore( playerid, 2 );
GivePlayerWantedLevel( playerid, 6 ); GivePlayerWantedLevel( playerid, 6 );
SendServerMessage( playerid, "You have successfully exported "COL_GOLD"%s"COL_WHITE" worth of product. "COL_ORANGE"(%d/%d)", cash_format( product_amount ), drugsSold, MAX_DROPS ); SendServerMessage( playerid, "You have successfully exported "COL_GOLD"%s"COL_WHITE" worth of product. "COL_ORANGE"(%d/%d)", cash_format( product_amount ), drugsSold, MAX_DROPS );
@ -25203,6 +25234,7 @@ stock ArrestPlayer( victimid, playerid )
new totalCash = ( p_WantedLevel[ victimid ] < MAX_WANTED_LVL ? p_WantedLevel[ victimid ] : MAX_WANTED_LVL ) * ( 300 ); new totalCash = ( p_WantedLevel[ victimid ] < MAX_WANTED_LVL ? p_WantedLevel[ victimid ] : MAX_WANTED_LVL ) * ( 300 );
new totalSeconds = p_WantedLevel[ victimid ] * ( JAIL_SECONDS_MULTIPLIER ); new totalSeconds = p_WantedLevel[ victimid ] * ( JAIL_SECONDS_MULTIPLIER );
GivePlayerScore( playerid, 2, .multiplier = 1.5 ); GivePlayerScore( playerid, 2, .multiplier = 1.5 );
GivePlayerExperience( playerid, E_POLICE );
GivePlayerCash( playerid, totalCash ); GivePlayerCash( playerid, totalCash );
if ( totalCash > 20000 ) printf("[police arrest] %s -> %s - %s", ReturnPlayerName( playerid ), ReturnPlayerName( victimid ), cash_format( totalCash ) ); // 8hska7082bmahu if ( totalCash > 20000 ) printf("[police arrest] %s -> %s - %s", ReturnPlayerName( playerid ), ReturnPlayerName( victimid ), cash_format( totalCash ) ); // 8hska7082bmahu
SendClientMessageFormatted( playerid, -1, ""COL_GREEN"[ACHIEVE]{FFFFFF} You have earned "COL_GOLD"%s{FFFFFF} dollars and 2 score for arresting %s(%d)!", cash_format( totalCash ), ReturnPlayerName( victimid ), victimid ); SendClientMessageFormatted( playerid, -1, ""COL_GREEN"[ACHIEVE]{FFFFFF} You have earned "COL_GOLD"%s{FFFFFF} dollars and 2 score for arresting %s(%d)!", cash_format( totalCash ), ReturnPlayerName( victimid ), victimid );