From a2348c6bd11925cdaa5ed12f7374e4255b02ba10 Mon Sep 17 00:00:00 2001
From: ect0s <73128770+ect0s@users.noreply.github.com>
Date: Thu, 25 Nov 2021 10:36:14 -0500
Subject: [PATCH] Squad Commits, Robust new Game Regex

Attempt at more Robust Regex

This regex searches for all the current information we get via the NewGame event, but with a few patterns that search deeper/different folder structures.

Appears to work on all base game content and mods that I have tested, however, mods may capture garbage information inside of mapClassname.

This will also fail if a modder puts no folders between the root of their project and their layers

/mymod/mymap

vs

/mymod/afolder/mymap

afolder would end up being the mapClassname.

https://regex101.com/r/e0Ui0K/1
---
 squad-server/log-parser/new-game.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/squad-server/log-parser/new-game.js b/squad-server/log-parser/new-game.js
index 523685ca..251285d2 100644
--- a/squad-server/log-parser/new-game.js
+++ b/squad-server/log-parser/new-game.js
@@ -1,6 +1,10 @@
 export default {
-  regex: /^\[([0-9.:-]+)]\[([ 0-9]*)]LogWorld: Bringing World \/([A-z]+)\/Maps\/([A-z]+)\/(?:Gameplay_Layers\/)?([A-z0-9_]+)/,
+  regex:
+    /^\[([0-9.:-]+)]\[([ 0-9]*)]LogWorld: Bringing World \/([A-z]+)\/(?:Maps\/)?([A-z0-9-]+)\/(?:.+\/)?([A-z0-9-]+)(?:\.[A-z0-9-]+)/,
   onMatch: (args, logParser) => {
+    if (args[5] === 'TransitionMap') {
+      return;
+    }
     const data = {
       ...logParser.eventStore.WON,
       raw: args[0],