Compare commits
5 Commits
2a536e38f4
...
802d011bf4
Author | SHA1 | Date | |
---|---|---|---|
|
802d011bf4 | ||
|
a4f0c307bd | ||
|
0768ca5a24 | ||
|
dcff092244 | ||
|
ab44f5f339 |
@ -9,7 +9,7 @@
|
|||||||
#include < YSI\y_hooks >
|
#include < YSI\y_hooks >
|
||||||
|
|
||||||
/* ** Definitions ** */
|
/* ** Definitions ** */
|
||||||
#define JAIL_SECONDS_MULTIPLIER ( 2 )
|
#define JAIL_SECONDS_MULTIPLIER ( 3 )
|
||||||
#define ALCATRAZ_REQUIRED_TIME ( 150 )
|
#define ALCATRAZ_REQUIRED_TIME ( 150 )
|
||||||
|
|
||||||
#define ALCATRAZ_TIME_PAUSE ( 5 )
|
#define ALCATRAZ_TIME_PAUSE ( 5 )
|
||||||
|
@ -208,7 +208,7 @@ thread OnDisplayCrowdfundInfo( playerid, crowdfund_id )
|
|||||||
if ( strlen( cf_description ) < sizeof( cf_description ) - 1 ) {
|
if ( strlen( cf_description ) < sizeof( cf_description ) - 1 ) {
|
||||||
format( szHugeString, sizeof( szHugeString ), ""COL_WHITE"%s\n\n", cf_description );
|
format( szHugeString, sizeof( szHugeString ), ""COL_WHITE"%s\n\n", cf_description );
|
||||||
} else {
|
} else {
|
||||||
format( szHugeString, sizeof( szHugeString ), ""COL_WHITE"%s"COL_GREY"... (read more on sfcnr.com)\n\n", cf_description );
|
format( szHugeString, sizeof( szHugeString ), ""COL_WHITE"%s"COL_GREY"...\n\n", cf_description );
|
||||||
}
|
}
|
||||||
|
|
||||||
for ( new row = 0; row < rows; row ++ )
|
for ( new row = 0; row < rows; row ++ )
|
||||||
|
@ -14,7 +14,7 @@ static stock
|
|||||||
{
|
{
|
||||||
{ "{8ADE47}Stephanie:"COL_WHITE" You can buy ropes at Supa Save or a 24/7 store to tie people up!" },
|
{ "{8ADE47}Stephanie:"COL_WHITE" You can buy ropes at Supa Save or a 24/7 store to tie people up!" },
|
||||||
{ "{8ADE47}Stephanie:"COL_WHITE" Save us on your favourites so you don't miss out on the action!" },
|
{ "{8ADE47}Stephanie:"COL_WHITE" Save us on your favourites so you don't miss out on the action!" },
|
||||||
{ "{8ADE47}Stephanie:"COL_WHITE" You can catch updates on our website - "#SERVER_WEBSITE"!" },
|
// { "{8ADE47}Stephanie:"COL_WHITE" You can catch updates on our website - "#SERVER_WEBSITE"!" },
|
||||||
{ "{8ADE47}Stephanie:"COL_WHITE" Interested in getting V.I.P? Type "COL_GREY"/vip"COL_WHITE" for more details!" },
|
{ "{8ADE47}Stephanie:"COL_WHITE" Interested in getting V.I.P? Type "COL_GREY"/vip"COL_WHITE" for more details!" },
|
||||||
{ "{8ADE47}Stephanie:"COL_WHITE" Consider helping the community by donating! You will receive Coins to redeem V.I.P!" },
|
{ "{8ADE47}Stephanie:"COL_WHITE" Consider helping the community by donating! You will receive Coins to redeem V.I.P!" },
|
||||||
{ "{8ADE47}Stephanie:"COL_WHITE" Just donated? Check your e-mail for a transaction ID and redeem your coins easily with /donated!" },
|
{ "{8ADE47}Stephanie:"COL_WHITE" Just donated? Check your e-mail for a transaction ID and redeem your coins easily with /donated!" },
|
||||||
@ -37,7 +37,6 @@ static stock
|
|||||||
{ "{8ADE47}Stephanie:"COL_WHITE" Tired of a player? You can place a contract on their head with "COL_GREY"/placehit{FFFFFF}!" },
|
{ "{8ADE47}Stephanie:"COL_WHITE" Tired of a player? You can place a contract on their head with "COL_GREY"/placehit{FFFFFF}!" },
|
||||||
{ "{8ADE47}Stephanie:"COL_WHITE" Need a label on your head with an informative message? You can use "COL_GREY"/label{FFFFFF}!" },
|
{ "{8ADE47}Stephanie:"COL_WHITE" Need a label on your head with an informative message? You can use "COL_GREY"/label{FFFFFF}!" },
|
||||||
{ "{8ADE47}Stephanie:"COL_WHITE" The golden bar at the bottom right of your screen is the amount of XP you have!" },
|
{ "{8ADE47}Stephanie:"COL_WHITE" The golden bar at the bottom right of your screen is the amount of XP you have!" },
|
||||||
{ "{8ADE47}Stephanie:"COL_WHITE" Follow us on twitter! "COL_GREY"@IrresistibleDev{FFFFFF}!" },
|
|
||||||
{ "{8ADE47}Stephanie:"COL_WHITE" Holding "COL_GREY"LEFT ALT{FFFFFF} and "COL_GREY"SPACE{FFFFFF} stops the current radio you're playing." },
|
{ "{8ADE47}Stephanie:"COL_WHITE" Holding "COL_GREY"LEFT ALT{FFFFFF} and "COL_GREY"SPACE{FFFFFF} stops the current radio you're playing." },
|
||||||
{ "{8ADE47}Stephanie:"COL_WHITE" You can change your current job at the "COL_GREY"City Hall{FFFFFF}!" },
|
{ "{8ADE47}Stephanie:"COL_WHITE" You can change your current job at the "COL_GREY"City Hall{FFFFFF}!" },
|
||||||
{ "{8ADE47}Stephanie:"COL_WHITE" You can change your spawning city at the "COL_GREY"City Hall{FFFFFF}!" },
|
{ "{8ADE47}Stephanie:"COL_WHITE" You can change your spawning city at the "COL_GREY"City Hall{FFFFFF}!" },
|
||||||
|
@ -365,7 +365,7 @@ hook OnDialogResponse( playerid, dialogid, response, listitem, inputtext[ ] )
|
|||||||
|
|
||||||
if ( p_OwnedVehicles[ playerid ] < 3 ) {
|
if ( p_OwnedVehicles[ playerid ] < 3 ) {
|
||||||
ShowPlayerDialog( playerid, DIALOG_BOUGHT_VEH, DIALOG_STYLE_MSGBOX, "{FFFFFF}You've purchased a vehicle!", "{FFFFFF}Glad to see you've purchased a vehicle. Please ensure you read:\n\n* Vehicles are kept until you sell them or go two months inactive. This is not refundable.\n* Do not mispark your vehicle or it can be removed/impounded.\n* Check out /v for vehicle commands.\n* Find an acceptable place to park your new vehicle such as your house or a parking lot.", "Okay", "" );
|
ShowPlayerDialog( playerid, DIALOG_BOUGHT_VEH, DIALOG_STYLE_MSGBOX, "{FFFFFF}You've purchased a vehicle!", "{FFFFFF}Glad to see you've purchased a vehicle. Please ensure you read:\n\n* Vehicles are kept until you sell them or go two months inactive. This is not refundable.\n* Do not mispark your vehicle or it can be removed/impounded.\n* Check out /v for vehicle commands.\n* Find an acceptable place to park your new vehicle such as your house or a parking lot.", "Okay", "" );
|
||||||
SetPVarInt( playerid, "bought_veh_ts", g_iTime + 30 );
|
SetPVarInt( playerid, "bought_veh_ts", g_iTime + 10 );
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
case 1:
|
case 1:
|
||||||
|
@ -77,7 +77,7 @@ hook OnDialogResponse( playerid, dialogid, response, listitem, inputtext[ ] )
|
|||||||
return SendServerMessage( playerid, "Our anti-exploit system requires you to wait another %d seconds before redeeming.", g_redeemVipWait - g_iTime );
|
return SendServerMessage( playerid, "Our anti-exploit system requires you to wait another %d seconds before redeeming.", g_redeemVipWait - g_iTime );
|
||||||
}
|
}
|
||||||
|
|
||||||
HTTP( playerid, HTTP_GET, sprintf( "donate.sfcnr.com/validate_code/%s", inputtext ), "", "OnDonationRedemptionResponse" );
|
// HTTP( playerid, HTTP_GET, sprintf( "donate.sfcnr.com/validate_code/%s", inputtext ), "", "OnDonationRedemptionResponse" );
|
||||||
SendServerMessage( playerid, "We're now looking up this transaction. Please wait." );
|
SendServerMessage( playerid, "We're now looking up this transaction. Please wait." );
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
@ -295,7 +295,7 @@ thread OnUpdateWallOfDonors( )
|
|||||||
CMD:redeemvip( playerid, params[ ] ) return cmd_donated( playerid, params );
|
CMD:redeemvip( playerid, params[ ] ) return cmd_donated( playerid, params );
|
||||||
CMD:donated( playerid, params[ ] )
|
CMD:donated( playerid, params[ ] )
|
||||||
{
|
{
|
||||||
ShowPlayerDialog( playerid, DIALOG_VIP, DIALOG_STYLE_INPUT, ""COL_GOLD"SF-CNR Donation", ""COL_WHITE"Enter the transaction ID of your donation below.\n\n"COL_GREY"See http://forum.sfcnr.com/showthread.php?10125 for details.", "Redeem", "Close" );
|
ShowPlayerDialog( playerid, DIALOG_VIP, DIALOG_STYLE_INPUT, ""COL_GOLD"SF-CNR Donation", ""COL_WHITE"Enter the transaction ID of your donation below.", "Redeem", "Close" );
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -241,21 +241,22 @@ public OnServerUpdateTimer( )
|
|||||||
// Uncuff( playerid );
|
// Uncuff( playerid );
|
||||||
|
|
||||||
// Surfing a criminal vehicle
|
// Surfing a criminal vehicle
|
||||||
if ( p_WantedLevel[ playerid ] < 6 && p_Class[ playerid ] != CLASS_POLICE )
|
// DISABLED RN
|
||||||
{
|
// if ( p_WantedLevel[ playerid ] < 6 && p_Class[ playerid ] != CLASS_POLICE )
|
||||||
new
|
// {
|
||||||
surfing_vehicle = GetPlayerSurfingVehicleID( playerid );
|
// new
|
||||||
|
// surfing_vehicle = GetPlayerSurfingVehicleID( playerid );
|
||||||
|
|
||||||
if ( surfing_vehicle != INVALID_VEHICLE_ID )
|
// if ( surfing_vehicle != INVALID_VEHICLE_ID )
|
||||||
{
|
// {
|
||||||
new
|
// new
|
||||||
driverid = GetVehicleDriver( surfing_vehicle );
|
// driverid = GetVehicleDriver( surfing_vehicle );
|
||||||
|
|
||||||
if ( IsPlayerConnected( driverid ) && p_WantedLevel[ driverid ] > 2 && p_Class[ driverid ] != CLASS_POLICE ) {
|
// if ( IsPlayerConnected( driverid ) && p_WantedLevel[ driverid ] > 2 && p_Class[ driverid ] != CLASS_POLICE ) {
|
||||||
GivePlayerWantedLevel( playerid, 6 - p_WantedLevel[ playerid ] );
|
// GivePlayerWantedLevel( playerid, 6 - p_WantedLevel[ playerid ] );
|
||||||
}
|
// }
|
||||||
}
|
// }
|
||||||
}
|
// }
|
||||||
|
|
||||||
new
|
new
|
||||||
aiming_player = GetPlayerTargetPlayer( playerid );
|
aiming_player = GetPlayerTargetPlayer( playerid );
|
||||||
@ -267,7 +268,7 @@ public OnServerUpdateTimer( )
|
|||||||
}
|
}
|
||||||
|
|
||||||
// AFK Players
|
// AFK Players
|
||||||
if ( ( GetTickCount( ) - p_AFKTime[ playerid ] ) >= 45000 )
|
if ( ( GetTickCount( ) - p_AFKTime[ playerid ] ) >= 60 * 1000 ) // 60 secs
|
||||||
{
|
{
|
||||||
// AFK Jail
|
// AFK Jail
|
||||||
if ( p_WantedLevel[ playerid ] >= 6 && p_InHouse[ playerid ] == -1 && !IsPlayerAdminOnDuty( playerid ) && !IsPlayerInEntrance( playerid, g_VIPLounge[ CITY_SF ] ) && !IsPlayerInEntrance( playerid, g_VIPLounge[ CITY_LV ] ) && !IsPlayerInEntrance( playerid, g_VIPLounge[ CITY_LS ] ) && !IsPlayerTied( playerid ) && !IsPlayerKidnapped( playerid ) && !IsPlayerCuffed( playerid ) && !IsPlayerTazed( playerid ) && IsPlayerSpawned( playerid ) ) { // && !IsPlayerDetained( playerid )
|
if ( p_WantedLevel[ playerid ] >= 6 && p_InHouse[ playerid ] == -1 && !IsPlayerAdminOnDuty( playerid ) && !IsPlayerInEntrance( playerid, g_VIPLounge[ CITY_SF ] ) && !IsPlayerInEntrance( playerid, g_VIPLounge[ CITY_LV ] ) && !IsPlayerInEntrance( playerid, g_VIPLounge[ CITY_LS ] ) && !IsPlayerTied( playerid ) && !IsPlayerKidnapped( playerid ) && !IsPlayerCuffed( playerid ) && !IsPlayerTazed( playerid ) && IsPlayerSpawned( playerid ) ) { // && !IsPlayerDetained( playerid )
|
||||||
@ -5169,8 +5170,7 @@ public OnDialogResponse( playerid, dialogid, response, listitem, inputtext[ ] )
|
|||||||
""COL_GREY"/idof{FFFFFF} - Displays the specified player's ID and their username.\n"\
|
""COL_GREY"/idof{FFFFFF} - Displays the specified player's ID and their username.\n"\
|
||||||
""COL_GREY"/lastlogged{FFFFFF} - Shows the last played time of a user.\n"\
|
""COL_GREY"/lastlogged{FFFFFF} - Shows the last played time of a user.\n"\
|
||||||
""COL_GREY"/animlist{FFFFFF} - Shows the animation list.\n"\
|
""COL_GREY"/animlist{FFFFFF} - Shows the animation list.\n"\
|
||||||
""COL_GREY"/jaillist{FFFFFF} - Shows the jailed player list.\n"\
|
""COL_GREY"/jaillist{FFFFFF} - Shows the jailed player list.\n" );
|
||||||
""COL_GREY"/twitter{FFFFFF} - Shows the latest tweets from @IrresistibleDev\n" );
|
|
||||||
strcat( szCMDS, ""COL_GREY"/weeklytime{FFFFFF} - Shows the weekly time of a player.\n\n" );
|
strcat( szCMDS, ""COL_GREY"/weeklytime{FFFFFF} - Shows the weekly time of a player.\n\n" );
|
||||||
strcat( szCMDS, ""COL_GOLD"Communication Commands\n\n"\
|
strcat( szCMDS, ""COL_GOLD"Communication Commands\n\n"\
|
||||||
""COL_GREY"/me{FFFFFF} - Sends a message based action with yourself.\n"\
|
""COL_GREY"/me{FFFFFF} - Sends a message based action with yourself.\n"\
|
||||||
|
@ -1,3 +1,4 @@
|
|||||||
|
v11.69.217
|
||||||
v11.69.216
|
v11.69.216
|
||||||
v11.68.210
|
v11.68.210
|
||||||
v11.66.204
|
v11.66.204
|
||||||
|
5
scriptfiles/changelogs/cnr/v11.69.217.txt
Normal file
5
scriptfiles/changelogs/cnr/v11.69.217.txt
Normal file
@ -0,0 +1,5 @@
|
|||||||
|
(*) Reduce time to read rules after buying the car to 10 secs
|
||||||
|
(*) Remove few unused announcement messages
|
||||||
|
(*) Increase jail time multiplier to wanted level to 3 (before it was 2)
|
||||||
|
(*) Disable giving wanted level when surfing criminal car
|
||||||
|
(*) Increase jailing AFK player who has wanted level after 1 min of AFK instead of 45 secs
|
Loading…
Reference in New Issue
Block a user