fix(misc): various fixes on techtree + uncommitted debug files

Author: MinaPecheux

Assets/Editor/TechnologyTree/TechnologyTreeNodeEditor.cs

@@ -6,7 +6,7 @@ public class TechnologyTreeNodeEditor : Editor
 {
     public override void OnInspectorGUI()
     {
-        TechnologyNodeData tree = (TechnologyNodeData) target;
+        TechnologyNodeData tree = (TechnologyNodeData)target;
         if (GUILayout.Button("Open Editor"))
         {
             if (tree.code == TechnologyNodeData.ROOT_NODE_CODE)

Assets/Resources/ScriptableObjects/TechnologyTree/AttackBooster2.asset

@@ -18,5 +18,4 @@ MonoBehaviour:
   researchCost:
   - code: 0
     amount: 800
-  children:
-  - {fileID: 11400000, guid: 1ee05e070a529436aa418f2fb8431baf, type: 2}
+  children: []

Assets/Scenes/GameScene.unity

@@ -3047,75 +3047,6 @@ MonoBehaviour:
   m_FlexibleWidth: -1
   m_FlexibleHeight: 0
   m_LayoutPriority: 1
---- !u!1 &560630152
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 560630154}
-  - component: {fileID: 560630155}
-  - component: {fileID: 560630153}
-  - component: {fileID: 560630156}
-  m_Layer: 0
-  m_Name: DEBUG
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!114 &560630153
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 560630152}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 4e2525d4f746d47e3bc2ac7f884d059d, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
---- !u!4 &560630154
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 560630152}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_Children: []
-  m_Father: {fileID: 0}
-  m_RootOrder: 2
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!114 &560630155
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 560630152}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 434f5c00dcb2846a2812af5ce87f0f28, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
---- !u!114 &560630156
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 560630152}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 4e0883f4ffde14c16bcb9b15840ea3a7, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
 --- !u!1 &581793296
 GameObject:
   m_ObjectHideFlags: 0
@@ -3621,7 +3552,7 @@ Transform:
   - {fileID: 1813139873}
   - {fileID: 238586518}
   m_Father: {fileID: 0}
-  m_RootOrder: 4
+  m_RootOrder: 3
   m_LocalEulerAnglesHint: {x: 72, y: -30, z: 0}
 --- !u!1 &688593607
 GameObject:
@@ -9017,7 +8948,7 @@ Transform:
   - {fileID: 1039973281}
   - {fileID: 1466245626}
   m_Father: {fileID: 0}
-  m_RootOrder: 7
+  m_RootOrder: 6
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &1487338832
 GameObject:
@@ -10706,7 +10637,7 @@ Transform:
   m_Children:
   - {fileID: 1454098052}
   m_Father: {fileID: 0}
-  m_RootOrder: 5
+  m_RootOrder: 4
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &1778963481
 GameObject:
@@ -12431,7 +12362,7 @@ Transform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 0}
-  m_RootOrder: 8
+  m_RootOrder: 7
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!114 &1962856543
 MonoBehaviour:
@@ -13110,7 +13041,7 @@ PrefabInstance:
     - target: {fileID: 3974308329725597486, guid: 65495319fe85a47d0bb50779e1515148,
         type: 3}
       propertyPath: m_RootOrder
-      value: 3
+      value: 2
       objectReference: {fileID: 0}
     - target: {fileID: 3974308329725597486, guid: 65495319fe85a47d0bb50779e1515148,
         type: 3}
@@ -13438,7 +13369,7 @@ Transform:
   - {fileID: 2116386695}
   - {fileID: 1215903174}
   m_Father: {fileID: 0}
-  m_RootOrder: 6
+  m_RootOrder: 5
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &2108162758
 GameObject:

Assets/Scripts/Managers/MainMenuManager.cs

@@ -228,7 +228,7 @@ public void StartNewGame()
 
         // save player parameters for this map
         // from the menu setup
-        GamePlayersParameters p = new GamePlayersParameters();
+        GamePlayersParameters p = ScriptableObject.CreateInstance<GamePlayersParameters>();
         p.players = _playersData
             .Where((KeyValuePair<int, PlayerData> p) => _activePlayers[p.Key])
             .Select((KeyValuePair<int, PlayerData> p) => p.Value)

Assets/Scripts/ScriptableObjects/TechnologyNodeData.cs

@@ -40,7 +40,10 @@ public static void LoadTechnologyTree()
 
             TECH_TREE_NODES[nodeData.code] = nodeData;
             foreach (TechnologyNodeData child in nodeData.children)
+            {
+                if (child == null) continue;
                 parents[child.code] = nodeData.code;
+            }
         }
 
         // re-assign parents after all nodes have been loaded and referenced