From 2e0e74cc36165f40ea760c4bfb59c0add5123667 Mon Sep 17 00:00:00 2001 From: Lorenc Pekaj Date: Thu, 30 May 2019 22:32:13 +1000 Subject: [PATCH 1/4] rm debug --- gamemodes/irresistible/cnr/features/gangs/turfs.pwn | 1 - 1 file changed, 1 deletion(-) diff --git a/gamemodes/irresistible/cnr/features/gangs/turfs.pwn b/gamemodes/irresistible/cnr/features/gangs/turfs.pwn index f4b4e8c..ed33b22 100644 --- a/gamemodes/irresistible/cnr/features/gangs/turfs.pwn +++ b/gamemodes/irresistible/cnr/features/gangs/turfs.pwn @@ -251,7 +251,6 @@ hook OnServerGameDayEnd( ) new afk_members, online_members = GetOnlineGangMembers( g, .afk_members = afk_members ); - printf("Online %d/%d",online_members,afk_members); if ( online_members >= TAKEOVER_NEEDED_PEOPLE ) { new From b649050e7055c0274a14f0291e03480369303924 Mon Sep 17 00:00:00 2001 From: Lorenc Pekaj Date: Thu, 30 May 2019 23:14:55 +1000 Subject: [PATCH 2/4] do not attempt to include discord if its disabled --- gamemodes/irresistible/cnr/discord/discord_relay.pwn | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/gamemodes/irresistible/cnr/discord/discord_relay.pwn b/gamemodes/irresistible/cnr/discord/discord_relay.pwn index 185722f..30ec20f 100644 --- a/gamemodes/irresistible/cnr/discord/discord_relay.pwn +++ b/gamemodes/irresistible/cnr/discord/discord_relay.pwn @@ -10,10 +10,13 @@ /* ** Includes ** */ #include < YSI\y_hooks > -#tryinclude < discord-connector > -#tryinclude < discord-command > /* ** Disable if discord connector not enabled ** */ +#if !defined DISCORD_DISABLED + #tryinclude < discord-connector > + #tryinclude < discord-command > +#endif + #if !defined dcconnector_included && !defined DISCORD_DISABLED #warning "Discord is disabled as the connector is not found. (https://github.com/maddinat0r/samp-discord-connector)" #define DISCORD_DISABLED From 03ac65c92bf7cc1f6c1152489360ca53a0817d7a Mon Sep 17 00:00:00 2001 From: Lorenc Pekaj Date: Fri, 31 May 2019 00:15:31 +1000 Subject: [PATCH 3/4] bronze vip minimum --- gamemodes/irresistible/cnr/features/vip/coin_market.pwn | 2 +- scriptfiles/changelogs/cnr/v11.60.190.txt | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/gamemodes/irresistible/cnr/features/vip/coin_market.pwn b/gamemodes/irresistible/cnr/features/vip/coin_market.pwn index 2ba784b..ad508f3 100644 --- a/gamemodes/irresistible/cnr/features/vip/coin_market.pwn +++ b/gamemodes/irresistible/cnr/features/vip/coin_market.pwn @@ -493,7 +493,7 @@ CMD:irresistiblecoins( playerid, params[ ] ) 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 ( 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 > 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." ); diff --git a/scriptfiles/changelogs/cnr/v11.60.190.txt b/scriptfiles/changelogs/cnr/v11.60.190.txt index 26ff37d..6506fee 100644 --- a/scriptfiles/changelogs/cnr/v11.60.190.txt +++ b/scriptfiles/changelogs/cnr/v11.60.190.txt @@ -1,4 +1,5 @@ (+) Cloudy's advanced event system 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. -(/) Full reversion of the turf war system to how it was pre-hardpoint. \ No newline at end of file +(/) Full reversion of the turf war system to how it was pre-hardpoint. +(/) You need Bronze V.I.P to send Irresistible Coins. \ No newline at end of file From 16382e624e2e97b596c8926d63a1899fffa6e52b Mon Sep 17 00:00:00 2001 From: Lorenc Pekaj Date: Fri, 31 May 2019 00:31:24 +1000 Subject: [PATCH 4/4] make chatban .sql --- ...5_cnr_chat_ban_creation => 20190405_cnr_chat_ban_creation.sql} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename gamemodes/irresistible/config/migrations/cnr/{20190405_cnr_chat_ban_creation => 20190405_cnr_chat_ban_creation.sql} (100%) diff --git a/gamemodes/irresistible/config/migrations/cnr/20190405_cnr_chat_ban_creation b/gamemodes/irresistible/config/migrations/cnr/20190405_cnr_chat_ban_creation.sql similarity index 100% rename from gamemodes/irresistible/config/migrations/cnr/20190405_cnr_chat_ban_creation rename to gamemodes/irresistible/config/migrations/cnr/20190405_cnr_chat_ban_creation.sql