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

Merge pull request #4 from zeelorenc/master

Browse Source 
Merge
This commit is contained in:
Dusan 2019-05-30 16:39:45 +02:00 committed by GitHub
commit 974ed41a6f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gamemodes/irresistible/cnr/discord/discord_relay.pwn
View File

@ -10,10 +10,13 @@
/* ** Includes ** */ /* ** Includes ** */
#include < YSI\y_hooks > #include < YSI\y_hooks >
#tryinclude < discord-connector >
#tryinclude < discord-command >
/* ** Disable if discord connector not enabled ** */ /* ** Disable if discord connector not enabled ** */
#if !defined DISCORD_DISABLED
#tryinclude < discord-connector >
#tryinclude < discord-command >
#endif
#if !defined dcconnector_included && !defined DISCORD_DISABLED #if !defined dcconnector_included && !defined DISCORD_DISABLED
#warning "Discord is disabled as the connector is not found. (https://github.com/maddinat0r/samp-discord-connector)" #warning "Discord is disabled as the connector is not found. (https://github.com/maddinat0r/samp-discord-connector)"
#define DISCORD_DISABLED #define DISCORD_DISABLED

1
gamemodes/irresistible/cnr/features/gangs/turfs.pwn
View File

@ -251,7 +251,6 @@ hook OnServerGameDayEnd( )
new new
afk_members, online_members = GetOnlineGangMembers( g, .afk_members = afk_members ); afk_members, online_members = GetOnlineGangMembers( g, .afk_members = afk_members );
printf("Online %d/%d",online_members,afk_members);
if ( online_members >= TAKEOVER_NEEDED_PEOPLE ) if ( online_members >= TAKEOVER_NEEDED_PEOPLE )
{ {
new new

2
gamemodes/irresistible/cnr/features/vip/coin_market.pwn
View File

@ -493,7 +493,7 @@ CMD:irresistiblecoins( playerid, params[ ] )
if ( sscanf( params[ 5 ],"uf", senttoid, coins ) ) return SendUsage( playerid, "/irresistiblecoins send [PLAYER_ID] [COINS]" ); if ( sscanf( params[ 5 ],"uf", senttoid, coins ) ) return SendUsage( playerid, "/irresistiblecoins send [PLAYER_ID] [COINS]" );
else if ( !IsPlayerConnected( senttoid ) || IsPlayerNPC( senttoid ) ) return SendError( playerid, "Invalid Player ID." ); else if ( !IsPlayerConnected( senttoid ) || IsPlayerNPC( senttoid ) ) return SendError( playerid, "Invalid Player ID." );
else if ( p_VIPLevel[ playerid ] < VIP_REGULAR ) return SendError( playerid, "You are not a Regular V.I.P, to become one visit "COL_GREY"donate.sfcnr.com" ); else if ( p_VIPLevel[ playerid ] < VIP_BRONZE ) return SendError( playerid, "You are not a Bronze V.I.P, to become one visit "COL_GREY"donate.sfcnr.com" );
else if ( coins < 0.1 || coins > 10000.0 ) return SendError( playerid, "You can only send between 0.1 and 10,000.0 coins at a single time." ); else if ( coins < 0.1 || coins > 10000.0 ) return SendError( playerid, "You can only send between 0.1 and 10,000.0 coins at a single time." );
else if ( coins > 99999999 || coins < 0 ) return SendError( playerid, "You can only send between 0.1 and 5,000.0 coins at a single time." ); // Making cash go over billions... else if ( coins > 99999999 || coins < 0 ) return SendError( playerid, "You can only send between 0.1 and 5,000.0 coins at a single time." ); // Making cash go over billions...
else if ( GetPlayerIrresistibleCoins( playerid ) < coins ) return SendError( playerid, "You do not have this number of coins to send." ); else if ( GetPlayerIrresistibleCoins( playerid ) < coins ) return SendError( playerid, "You do not have this number of coins to send." );

0
gamemodes/irresistible/config/migrations/cnr/20190405_cnr_chat_ban_creation → gamemodes/irresistible/config/migrations/cnr/20190405_cnr_chat_ban_creation.sql
View File

1
scriptfiles/changelogs/cnr/v11.60.190.txt
View File

@ -2,3 +2,4 @@
(+) Night's discord implementation has been added. (+) Night's discord implementation has been added.
(/) Players will lose only 5% of their stock if it drops 80% in a day. (/) Players will lose only 5% of their stock if it drops 80% in a day.
(/) Full reversion of the turf war system to how it was pre-hardpoint. (/) Full reversion of the turf war system to how it was pre-hardpoint.
(/) You need Bronze V.I.P to send Irresistible Coins.