Skip to content

Commit 807ea9b

Browse files
RaidMaxRaidMax
committed
Update Pluto T6 parser
1 parent ef0534c commit 807ea9b

4 files changed

Lines changed: 55 additions & 16 deletions

File tree

‎Application/ApplicationManager.cs‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -431,6 +431,7 @@ await scriptPlugin.Initialize(this, _scriptCommandFactory, _scriptPluginServiceR
431431
foreach (var serverConfig in _appConfig.Servers)
432432
{
433433
ConfigurationMigration.ModifyLogPath020919(serverConfig);
434+
ConfigurationMigration.UpdatePlutoniumT6Parser(serverConfig);
434435

435436
if (serverConfig.RConParserVersion == null || serverConfig.EventParserVersion == null)
436437
{
@@ -447,6 +448,8 @@ await scriptPlugin.Initialize(this, _scriptCommandFactory, _scriptPluginServiceR
447448
serverConfig.ModifyParsers();
448449
}
449450
}
451+
452+
ConfigHandler.Set(_appConfig);
450453
await ConfigHandler.Save();
451454
}
452455

‎Application/Migration/ConfigurationMigration.cs‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,22 @@ public static void ModifyLogPath020919(SharedLibraryCore.Configuration.ServerCon
8686
}
8787
}
8888

89+
public static void UpdatePlutoniumT6Parser(SharedLibraryCore.Configuration.ServerConfiguration config)
90+
{
91+
if (config.RConParserVersion != "Plutonium T6 Parser")
92+
{
93+
return;
94+
}
95+
96+
if (!"Plutonium T6 parser requires an update. Would you like to automatically update now".PromptBool())
97+
{
98+
return;
99+
}
100+
101+
config.RConParserVersion = "Plutonium T6 Parser (2024)";
102+
config.EventParserVersion = "Plutonium T6 Parser (2024)";
103+
}
104+
89105
public static void RemoveObsoletePlugins20210322()
90106
{
91107
var files = new[] {"StatsWeb.dll", "StatsWeb.Views.dll", "IW4ScriptCommands.dll"};

‎IW4MAdmin.sln‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ScriptPlugins", "ScriptPlug
3333
Plugins\ScriptPlugins\ParserIW4x.js = Plugins\ScriptPlugins\ParserIW4x.js
3434
Plugins\ScriptPlugins\ParserIW6x.js = Plugins\ScriptPlugins\ParserIW6x.js
3535
Plugins\ScriptPlugins\ParserPIW5.js = Plugins\ScriptPlugins\ParserPIW5.js
36-
Plugins\ScriptPlugins\ParserPT6.js = Plugins\ScriptPlugins\ParserPT6.js
3736
Plugins\ScriptPlugins\ParserRektT5M.js = Plugins\ScriptPlugins\ParserRektT5M.js
3837
Plugins\ScriptPlugins\ParserT4.js = Plugins\ScriptPlugins\ParserT4.js
3938
Plugins\ScriptPlugins\ParserT7.js = Plugins\ScriptPlugins\ParserT7.js

Plugins/ScriptPlugins/ParserPT6.js renamed to Plugins/ScriptPlugins/ParserPlutoniumT6.js

Lines changed: 36 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ var rconParser;
22
var eventParser;
33

44
var plugin = {
5-
author: 'RaidMax, Xerxes',
6-
version: 1.4,
7-
name: 'Plutonium T6 Parser',
5+
author: 'RaidMax, Xerxes, INSANEMODE',
6+
version: 1.0,
7+
name: 'Plutonium T6 Parser (2024)',
88
isParser: true,
99

1010
onEventAsync: function (gameEvent, server) {
@@ -14,25 +14,34 @@ var plugin = {
1414
rconParser = manager.GenerateDynamicRConParser(this.name);
1515
eventParser = manager.GenerateDynamicEventParser(this.name);
1616

17-
rconParser.Configuration.CommandPrefixes.Tell = 'tell {0} {1}';
18-
rconParser.Configuration.CommandPrefixes.Say = 'say {0}';
19-
rconParser.Configuration.CommandPrefixes.Kick = 'clientkick_for_reason {0} "{1}"';
20-
rconParser.Configuration.CommandPrefixes.Ban = 'clientkick_for_reason {0} "{1}"';
21-
rconParser.Configuration.CommandPrefixes.TempBan = 'clientkick_for_reason {0} "{1}"';
22-
rconParser.Configuration.CommandPrefixes.RConGetDvar = '\xff\xff\xff\xffrcon {0} get {1}';
23-
rconParser.Configuration.CommandPrefixes.RConGetInfo = undefined; // adding this in here temporarily until getInfo is fixed in new T6 version
17+
rconParser.Configuration.CommandPrefixes.Tell = 'tell {0} {1}';
18+
rconParser.Configuration.CommandPrefixes.Say = 'say {0}';
19+
rconParser.Configuration.CommandPrefixes.Kick = 'clientkick_for_reason {0} "{1}"';
20+
rconParser.Configuration.CommandPrefixes.Ban = 'clientkick_for_reason {0} "{1}"';
21+
rconParser.Configuration.CommandPrefixes.TempBan = 'clientkick_for_reason {0} "{1}"';
22+
rconParser.Configuration.CommandPrefixes.Mute = 'muteClient {0}';
23+
rconParser.Configuration.CommandPrefixes.Unmute = 'unmuteClient {0}';
24+
rconParser.Configuration.CommandPrefixes.RConGetDvar = '\xff\xff\xff\xffrcon {0} {1}';
25+
rconParser.Configuration.CommandPrefixes.RConSetDvar = '\xff\xff\xff\xffrcon {0} set {1}';
26+
rconParser.Configuration.CommandPrefixes.RConResponse = '\xff\xff\xff\xffprint\n';
27+
rconParser.Configuration.CommandPrefixes.RConGetStatus = '\xff\xff\xff\xffgetstatus';
28+
rconParser.Configuration.CommandPrefixes.RConGetInfo = '\xff\xff\xff\xffgetinfo';
29+
rconParser.Configuration.CommandPrefixes.RconGetInfoResponseHeader = '\xff\xff\xff\xffinfoResponse\n';
30+
rconParser.Configuration.CommandPrefixes.RConCommand = '\xff\xff\xff\xffrcon {0} {1}';
2431

25-
rconParser.Configuration.Dvar.Pattern = '^(.+) is "(.+)?"$';
32+
33+
rconParser.Configuration.Dvar.Pattern = '^(?:\\^7)?\\"(.+)\\" is: \\"(.+)?\\" default: \\"(.+)?\\"\\n?(?:latched: \\"(.+)?\\"\\n)?\\w*(.+)*$';
2634
rconParser.Configuration.Dvar.AddMapping(106, 1);
2735
rconParser.Configuration.Dvar.AddMapping(107, 2);
28-
rconParser.Configuration.WaitForResponse = false;
36+
rconParser.Configuration.WaitForResponse = false
2937
rconParser.Configuration.NoticeLineSeparator = '. ';
3038
rconParser.Configuration.DefaultRConPort = 4976;
3139
rconParser.Configuration.DefaultInstallationDirectoryHint = '{LocalAppData}/Plutonium/storage/t6';
3240
rconParser.Configuration.ShouldRemoveDiacritics = true;
3341

42+
3443
rconParser.Configuration.StatusHeader.Pattern = 'num +score +bot +ping +guid +name +lastmsg +address +qport +rate *';
35-
rconParser.Configuration.Status.Pattern = '^ *([0-9]+) +([0-9]+) +(?:[0-1]{1}) +([0-9]+) +([A-F0-9]+|0) +(.+?) +(?:[0-9]+) +(\\d+\\.\\d+\\.\\d+\\.\\d+\\:-?\\d{1,5}|0+\\.0+:-?\\d{1,5}|loopback|unknown) +(?:-?[0-9]+) +(?:[0-9]+) *$';
44+
rconParser.Configuration.Status.Pattern = '^ *([0-9]+) +([0-9]+) +(?:[0-1]{1}) +([0-9]+) +([A-F0-9]+|0) +(.+?) +(?:[0-9]+) +(\\d+\\.\\d+\\.\\d+\\.\\d+\\:-?\\d{1,5}|0+\\.0+:-?\\d{1,5}|loopback|unknown|bot) +(?:-?[0-9]+) +(?:[0-9]+) *$';
3645
rconParser.Configuration.Status.AddMapping(100, 1);
3746
rconParser.Configuration.Status.AddMapping(101, 2);
3847
rconParser.Configuration.Status.AddMapping(102, 3);
@@ -54,8 +63,20 @@ var plugin = {
5463
rconParser.Configuration.ColorCodeMapping.Add('Grey', '^9');
5564
rconParser.Configuration.ColorCodeMapping.Add('LightBlue', '^;');
5665
rconParser.Configuration.ColorCodeMapping.Add('LightYellow', '^:');
57-
58-
eventParser.Configuration.GameDirectory = '';
66+
rconParser.Configuration.ColorCodeMapping.Add('Flash', '^F');
67+
rconParser.Configuration.ColorCodeMapping.Add('MWDOWN', '^BmouseWheelDown^');
68+
rconParser.Configuration.ColorCodeMapping.Add('MWUP', '^BmouseWheelUp^');
69+
rconParser.Configuration.ColorCodeMapping.Add('MBMiddle', '^BmouseButtonMiddle^');
70+
rconParser.Configuration.ColorCodeMapping.Add('MBRight', '^BmouseButtonRight^');
71+
rconParser.Configuration.ColorCodeMapping.Add('MBLeft', '^BmouseButtonLeft^');
72+
rconParser.Configuration.ColorCodeMapping.Add('MADown', '^BMOUSE_ANIM_DOWN^');
73+
rconParser.Configuration.ColorCodeMapping.Add('MAUp', '^BMOUSE_ANIM_UP^');
74+
rconParser.Configuration.ColorCodeMapping.Add('MARight', '^BMOUSE_ANIM_RIGHT^');
75+
rconParser.Configuration.ColorCodeMapping.Add('MALeft', '^BMOUSE_ANIM_LEFT^');
76+
77+
rconParser.Configuration.FloodProtectInterval = 150;
78+
79+
eventParser.Configuration.GameDirectory = 'main';
5980
eventParser.Configuration.GuidNumberStyle = 7; // Integer
6081

6182
rconParser.Version = 'Call of Duty Multiplayer - Ship COD_T6_S MP build 1.0.44 CL(1759941) CODPCAB2 CEG Fri May 9 19:19:19 2014 win-x86 813e66d5';

0 commit comments

Comments
 (0)