From 0cfa9c745b6d902996d2f0dfb779d60dfcedbdaf Mon Sep 17 00:00:00 2001
From: WatchfulEye <82226864+watchful-eyes@users.noreply.github.com>
Date: Sat, 26 Oct 2024 14:36:24 +0300
Subject: [PATCH 1/2] Layers File Fix for Recent Update

Fix for the relevant issue
https://github.com/Team-Silver-Sphere/SquadJS/issues/386
---
 squad-server/layers/layer.js | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/squad-server/layers/layer.js b/squad-server/layers/layer.js
index 78bb0b08d..f7d734cc1 100644
--- a/squad-server/layers/layer.js
+++ b/squad-server/layers/layer.js
@@ -18,22 +18,23 @@ export default class Layer {
     };
     this.teams = [];
     for (const t of ['team1', 'team2']) {
+      let team = data[t] || data.teamConfigs[t];
       this.teams.push({
-        faction: data[t].faction,
-        name: data[t].teamSetupName,
-        tickets: data[t].tickets,
-        commander: data[t].commander,
-        vehicles: (data[t].vehicles || []).map((vehicle) => ({
+        faction: team.faction,
+        name: team.teamSetupName,
+        tickets: team.tickets,
+        commander: team.commander,
+        vehicles: (team.vehicles || []).map((vehicle) => ({
           name: vehicle.type,
           classname: vehicle.rawType,
           count: vehicle.count,
           spawnDelay: vehicle.delay,
           respawnDelay: vehicle.respawnTime
         })),
-        numberOfTanks: (data[t].vehicles || []).filter((v) => {
+        numberOfTanks: (team.vehicles || []).filter((v) => {
           return v.icon.match(/_tank/);
         }).length,
-        numberOfHelicopters: (data[t].vehicles || []).filter((v) => {
+        numberOfHelicopters: (team.vehicles || []).filter((v) => {
           return v.icon.match(/helo/);
         }).length
       });

From f304a793cac02621d31328a69970845f915f619a Mon Sep 17 00:00:00 2001
From: WatchfulEye <82226864+watchful-eyes@users.noreply.github.com>
Date: Sat, 26 Oct 2024 14:47:40 +0300
Subject: [PATCH 2/2] latest layer.json

---
 squad-server/layers/layer.js | 20 ++++----------------
 1 file changed, 4 insertions(+), 16 deletions(-)

diff --git a/squad-server/layers/layer.js b/squad-server/layers/layer.js
index f7d734cc1..5d00fc224 100644
--- a/squad-server/layers/layer.js
+++ b/squad-server/layers/layer.js
@@ -20,23 +20,11 @@ export default class Layer {
     for (const t of ['team1', 'team2']) {
       let team = data[t] || data.teamConfigs[t];
       this.teams.push({
-        faction: team.faction,
-        name: team.teamSetupName,
+        faction: team.defaultFactionUnit, 
+        name: team.defaultFactionUnit, // There is no other name presented in the data so in order to keep the same structure to support the old formatted codes, used the same name
         tickets: team.tickets,
-        commander: team.commander,
-        vehicles: (team.vehicles || []).map((vehicle) => ({
-          name: vehicle.type,
-          classname: vehicle.rawType,
-          count: vehicle.count,
-          spawnDelay: vehicle.delay,
-          respawnDelay: vehicle.respawnTime
-        })),
-        numberOfTanks: (team.vehicles || []).filter((v) => {
-          return v.icon.match(/_tank/);
-        }).length,
-        numberOfHelicopters: (team.vehicles || []).filter((v) => {
-          return v.icon.match(/helo/);
-        }).length
+        allowedFactionsUnitTypes: team.allowedFactionsUnitTypes,
+        allowedAlliances: team.allowedAlliances,
       });
     }
   }