From 56360d06c1af31076192bf75828a2b45b4328059 Mon Sep 17 00:00:00 2001 From: Damen Date: Wed, 10 Apr 2019 13:40:12 -0400 Subject: [PATCH] removes MMB arrest, MOTD preset, changelog addition --- gamemodes/irresistible/cnr/features/cop/arrest.pwn | 4 ++-- gamemodes/irresistible/cnr/textdraws.pwn | 2 ++ gamemodes/sf-cnr.pwn | 2 +- scriptfiles/changelogs/cnr/_changelogs.cfg | 1 + scriptfiles/changelogs/cnr/changelog_template.txt | 4 ++++ scriptfiles/changelogs/cnr/v11.55.168.txt | 13 +++++++++++++ 6 files changed, 23 insertions(+), 3 deletions(-) create mode 100644 scriptfiles/changelogs/cnr/changelog_template.txt create mode 100644 scriptfiles/changelogs/cnr/v11.55.168.txt diff --git a/gamemodes/irresistible/cnr/features/cop/arrest.pwn b/gamemodes/irresistible/cnr/features/cop/arrest.pwn index 866e8ee..04c98fc 100644 --- a/gamemodes/irresistible/cnr/features/cop/arrest.pwn +++ b/gamemodes/irresistible/cnr/features/cop/arrest.pwn @@ -51,7 +51,7 @@ hook OnPlayerDeath( playerid, killerid, reason ) hook OnPlayerKeyStateChange( playerid, newkeys, oldkeys ) { - if ( PRESSED( KEY_LOOK_BEHIND ) ) // MMB to taze/cuff/ar + /*if ( PRESSED( KEY_LOOK_BEHIND ) ) // MMB to taze/cuff/ar { if ( p_Class[ playerid ] == CLASS_POLICE && ! IsPlayerSpawnProtected( playerid ) ) { @@ -68,7 +68,7 @@ hook OnPlayerKeyStateChange( playerid, newkeys, oldkeys ) } } } - } + }*/ return 1; } diff --git a/gamemodes/irresistible/cnr/textdraws.pwn b/gamemodes/irresistible/cnr/textdraws.pwn index b25ee89..c263eb6 100644 --- a/gamemodes/irresistible/cnr/textdraws.pwn +++ b/gamemodes/irresistible/cnr/textdraws.pwn @@ -42,6 +42,8 @@ new /* ** Hooks ** */ hook OnScriptInit( ) { + TextDrawSetString( g_MotdTD, "~w~Want more ~g~money, houses, and xp~w~? Consider donating! ~y~/vip" ); + g_currentXPTD = TextDrawCreate(529.000000, 405.000000, "Current XP"); TextDrawBackgroundColor(g_currentXPTD, 255); TextDrawFont(g_currentXPTD, 3); diff --git a/gamemodes/sf-cnr.pwn b/gamemodes/sf-cnr.pwn index c58173e..a40f0ee 100644 --- a/gamemodes/sf-cnr.pwn +++ b/gamemodes/sf-cnr.pwn @@ -16,7 +16,7 @@ #pragma option -d3 #pragma dynamic 7200000 -#define DEBUG_MODE +//#define DEBUG_MODE #if defined DEBUG_MODE #pragma option -d3 diff --git a/scriptfiles/changelogs/cnr/_changelogs.cfg b/scriptfiles/changelogs/cnr/_changelogs.cfg index 2090170..69ebaeb 100644 --- a/scriptfiles/changelogs/cnr/_changelogs.cfg +++ b/scriptfiles/changelogs/cnr/_changelogs.cfg @@ -1,3 +1,4 @@ +v11.55.168 v11.54.157 v11.53.154 v11.52.150 diff --git a/scriptfiles/changelogs/cnr/changelog_template.txt b/scriptfiles/changelogs/cnr/changelog_template.txt new file mode 100644 index 0000000..af7f2ab --- /dev/null +++ b/scriptfiles/changelogs/cnr/changelog_template.txt @@ -0,0 +1,4 @@ +(+) +(/) +(*) +(-) \ No newline at end of file diff --git a/scriptfiles/changelogs/cnr/v11.55.168.txt b/scriptfiles/changelogs/cnr/v11.55.168.txt new file mode 100644 index 0000000..bdab2d6 --- /dev/null +++ b/scriptfiles/changelogs/cnr/v11.55.168.txt @@ -0,0 +1,13 @@ +(+) You can now disable global gambling messages in /cp. +(+) /discord now displays what the discord server URL is. +(+) /cmds -> V.I.P. Commands now displays a list of V.I.P. commands. +(+) Players below 50 score, playing as a LEO, will now have a help dialog on how to arrest. +(/) The old arrest system, which is command-based, has been added back. (MMB Disabled) +(/) Regular V.I.P. players are not allowed to send IC with /ic send. +(/) /admins only requires 50 score now. +(/) The MOTD will now be preset upon server startup. +(*) Removes the ability to farm points within the Casino on a $0 payout. +(*) Fixed issue with /spawn not allowing 100+ houses to appear. +(*) A typo in /acmds has been fixed. +(*) Fixed an issue with /chatban showing the wrong player name. +(-) You are no longer able to use /perks while in an army vehicle. \ No newline at end of file