From 782201b086cf8b5ef81b9f24a85ae13693615f12 Mon Sep 17 00:00:00 2001 From: FutureRave Date: Thu, 16 Mar 2023 14:36:28 +0000 Subject: [PATCH 1/3] feature(script_plugins): boiii parser --- Plugins/ScriptPlugins/ParserBOIII.js | 52 ++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) create mode 100644 Plugins/ScriptPlugins/ParserBOIII.js diff --git a/Plugins/ScriptPlugins/ParserBOIII.js b/Plugins/ScriptPlugins/ParserBOIII.js new file mode 100644 index 000000000..d5ec19369 --- /dev/null +++ b/Plugins/ScriptPlugins/ParserBOIII.js @@ -0,0 +1,52 @@ +var rconParser; +var eventParser; + +var plugin = { + author: 'Diamante', + version: 0.1, + name: 'BOIII Parser', + isParser: true, + + onEventAsync: function(gameEvent, server) {}, + + onLoadAsync: function(manager) { + rconParser = manager.GenerateDynamicRConParser(this.name); + eventParser = manager.GenerateDynamicEventParser(this.name); + + rconParser.Configuration.Status.Pattern = '^ *([0-9]+) +-?([0-9]+) +((?:[A-Z]+|[0-9]+)) +((?:[a-z]|[0-9]){8,32}|(?:[a-z]|[0-9]){8,32}|bot[0-9]+|(?:[0-9]+)) *(.{0,32}) +(\\d+\\.\\d+\\.\\d+.\\d+\\:-*\\d{1,5}|0+.0+:-*\\d{1,5}|loopback|unknown)(?:\\(\\d+\\))? +(-*[0-9]+) *$'; + rconParser.Configuration.StatusHeader.Pattern = 'num +score +ping +xuid +name +address +qport *'; + rconParser.Configuration.CommandPrefixes.Kick = 'clientkick {0}'; + rconParser.Configuration.CommandPrefixes.Ban = 'clientkick {0}'; + rconParser.Configuration.CommandPrefixes.TempBan = 'clientkick {0}'; + rconParser.Configuration.CommandPrefixes.RConResponse = '\xff\xff\xff\xffprint '; + rconParser.Configuration.GametypeStatus.Pattern = 'Gametype: (.+)'; + rconParser.Configuration.MapStatus.Pattern = 'Map: (.+)'; + rconParser.Configuration.CommandPrefixes.RConGetInfo = undefined; // disables this, because it's useless on T7/BOIII + rconParser.Configuration.ServerNotRunningResponse = 'this is here to prevent a hibernating server from being detected as not running'; + rconParser.Configuration.DefaultRConPort = 27017; + + rconParser.Configuration.OverrideDvarNameMapping.Add('sv_hostname', 'live_steam_server_name'); + rconParser.Configuration.OverrideDvarNameMapping.Add('g_password', 'live_steam_server_password'); + rconParser.Configuration.DefaultDvarValues.Add('sv_running', '1'); + rconParser.Configuration.DefaultDvarValues.Add('g_gametype', ''); + rconParser.Configuration.DefaultDvarValues.Add('fs_basepath', ''); + rconParser.Configuration.DefaultDvarValues.Add('fs_basegame', ''); + rconParser.Configuration.DefaultDvarValues.Add('fs_homepath', ''); + rconParser.Configuration.DefaultDvarValues.Add('fs_game', ''); + + rconParser.Configuration.Status.AddMapping(105, 6); // ip address + rconParser.Configuration.GametypeStatus.AddMapping(112, 1); // gametype + rconParser.Version = '[local] ship win64 CODBUILD8-764 (3421987) Mon Dec 16 10:44:20 2019 10d27bef'; + rconParser.GameName = 8; // BO3 + rconParser.CanGenerateLogPath = false; + + eventParser.Version = '[local] ship win64 CODBUILD8-764 (3421987) Mon Dec 16 10:44:20 2019 10d27bef'; + eventParser.GameName = 8; // BO3 + eventParser.Configuration.GameDirectory = 'usermaps'; + eventParser.Configuration.Say.Pattern = '^(chat|chatteam);(?:[0-9]+);([0-9]+);([0-9]+);(.+);(.*)$'; + }, + + onUnloadAsync: function() {}, + + onTickAsync: function(server) {} +}; From b258d51863d7511ac0ec0417792a2147b5062bda Mon Sep 17 00:00:00 2001 From: Edo Date: Thu, 23 Mar 2023 18:03:54 +0000 Subject: [PATCH 2/3] fix(boiii): workaround the goofiest bug (#284) * fix(boiii): workaround the goofiest bug --- Plugins/ScriptPlugins/ParserBOIII.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Plugins/ScriptPlugins/ParserBOIII.js b/Plugins/ScriptPlugins/ParserBOIII.js index d5ec19369..0fc787c61 100644 --- a/Plugins/ScriptPlugins/ParserBOIII.js +++ b/Plugins/ScriptPlugins/ParserBOIII.js @@ -3,7 +3,7 @@ var eventParser; var plugin = { author: 'Diamante', - version: 0.1, + version: 0.2, name: 'BOIII Parser', isParser: true, @@ -18,7 +18,7 @@ var plugin = { rconParser.Configuration.CommandPrefixes.Kick = 'clientkick {0}'; rconParser.Configuration.CommandPrefixes.Ban = 'clientkick {0}'; rconParser.Configuration.CommandPrefixes.TempBan = 'clientkick {0}'; - rconParser.Configuration.CommandPrefixes.RConResponse = '\xff\xff\xff\xffprint '; + rconParser.Configuration.CommandPrefixes.RConResponse = '\xff\xff\xff\xff(\1|print) ?'; rconParser.Configuration.GametypeStatus.Pattern = 'Gametype: (.+)'; rconParser.Configuration.MapStatus.Pattern = 'Map: (.+)'; rconParser.Configuration.CommandPrefixes.RConGetInfo = undefined; // disables this, because it's useless on T7/BOIII From 710382d4326f51e30cbfc34c7cd2b47e16f94c1b Mon Sep 17 00:00:00 2001 From: HGM Date: Thu, 23 Mar 2023 18:04:09 +0000 Subject: [PATCH 3/3] Update DefaultSettings.json (#282) Update IW4x Map Names for "Modern Warfare 3 DLC Pack" --- Application/DefaultSettings.json | 38 +++++++++++++++++++++++++++++++- 1 file changed, 37 insertions(+), 1 deletion(-) diff --git a/Application/DefaultSettings.json b/Application/DefaultSettings.json index 31768ce1a..d16cecbe9 100644 --- a/Application/DefaultSettings.json +++ b/Application/DefaultSettings.json @@ -1020,7 +1020,43 @@ { "Alias": "Downpour", "Name": "mp_farm" - } + }, + { + "Alias": "Dome", + "Name": "mp_dome" + }, + { + "Alias": "Hardhat", + "Name": "mp_hardhat" + }, + { + "Alias": "Resistance", + "Name": "mp_paris" + }, + { + "Alias": "Seatown", + "Name": "mp_seatown" + }, + { + "Alias": "Mission", + "Name": "mp_bravo" + }, + { + "Alias": "Underground", + "Name": "mp_underground" + }, + { + "Alias": "Arkaden", + "Name": "mp_plaza2" + }, + { + "Alias": "Village", + "Name": "mp_village" + }, + { + "Alias": "Lockdown", + "Name": "mp_alpha" + } ] }, {